Skip to content

Commit

Permalink
Prepare DCO-only release 2.6.10-I004
Browse files Browse the repository at this point in the history
We need to bump something to get a tag, so bump
INSTALLER_BUILD even though we will not publish
a new Windows installer at this point.

Signed-off-by: Frank Lichtenheld <[email protected]>
  • Loading branch information
flichtenheld committed Jun 14, 2024
1 parent 91d0cf0 commit 4d24eab
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
6 changes: 6 additions & 0 deletions debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240612
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
openvpn-dco-dkms (0.2.20240612-debian0) stable; urgency=medium

* ovpn-dco: add net/gso.h existance check for RedHat 9.4 (Antonio Quartulli, c4c4f80)
* ovpn-dco: add compatibility for SUSE Linux Enterprise and openSUSE Leap (Jeff Mahoney, 879d252)

-- Frank Lichtenheld <[email protected]> Tue, 21 May 2024 22:31:39 +0200
2 changes: 1 addition & 1 deletion debian-sbuild/openvpn/changelog-2.6.10
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ openvpn (2.6.10-debian0) stable; urgency=medium
* Fix typo --data-cipher-fallback (Frank Lichtenheld, 6e3fb0f2)
* Document that auth-user-pass may be inlined (Selva Nair, 2aac80e4)

-- Yuriy Darnobyt <yuriy.darnobyt@openvpn.net> Tue, 19 Mar 2024 22:19:35 +0100
-- Frank Lichtenheld <frank.lichtenheld@openvpn.net> Tue, 19 Mar 2024 22:19:35 +0100
10 changes: 5 additions & 5 deletions release/vars.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ GPG_KEY_ID="F554A3687412CFFEBDEFE0A312F5F7B42F2B01E7"
# This also helps catch various problems with expired subkeys and public
# keys.
GPG_OPTS="--no-default-keyring --keyring ~/[email protected]/pubring.kbx"
GIT_AUTHOR="Yuriy Darnobyt <yuriy.darnobyt@openvpn.net>"
GIT_AUTHOR="Frank Lichtenheld <frank.lichtenheld@openvpn.net>"

WINDOWS_SIGNING_KEY_FP="31DA19926259519C9EA312C71935B13C33FC6E7E"

# Sometimes we release MSI build only with new INSTALLER_BUILD version
# It does not require to tag and push OpenVPN sources again
# It also does not require to re-build linux packages
# With MSI_BUILD_ONLY="YES" we can skip all that steps
MSI_BUILD_ONLY="YES"
MSI_BUILD_ONLY="NO"

# Version numbers
OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.9}"
Expand All @@ -35,12 +35,12 @@ OPENVPN_GUI_CURRENT_MIN_VERSION=48
OPENVPN_GUI_CURRENT_FULL_VERSION="$OPENVPN_GUI_CURRENT_MAJ_VERSION.$OPENVPN_GUI_CURRENT_MIN_VERSION.0.0"
OPENVPN_GUI_BRANCH="master"

OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20231117}"
OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20240320}"
OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20240320}"
OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20240612}"
OPENVPN_DCO_CURRENT_TAG="${OPENVPN_DCO_CURRENT_TAG:-refs/tags/v$OPENVPN_DCO_CURRENT_VERSION}"
OPENVPN_DCO_PREVIOUS_TAG="refs/tags/v$OPENVPN_DCO_PREVIOUS_VERSION"

INSTALLER_BUILD=3
INSTALLER_BUILD=4
INSTALLER_VERSION="I"$(printf "%03d\n" $INSTALLER_BUILD)
# Debian packaging scripts do not allow underscores (e.g "2.4_alpha2")
DEBIAN_UPSTREAM_VERSION=`echo $OPENVPN_CURRENT_VERSION|sed s/"_"/"-"/g`
Expand Down
6 changes: 3 additions & 3 deletions windows-msi/version.m4
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ define([PRODUCT_NAME], [OpenVPN])
define([PRODUCT_PUBLISHER], [OpenVPN, Inc.])

dnl The package version as displayed by UI and used in filenames (no spaces, please).
define([PACKAGE_VERSION], [2.6.10-I003])
define([PACKAGE_VERSION], [2.6.10-I004])

dnl The MSI product version in the form of n[.n[.n]] (numbers only).
dnl The third field is 100*openvpn bugfix release + MSI build number.
dnl So for the 2nd MSI build for OpenVPN 2.6.3 use 2.6.302
define([PRODUCT_VERSION], [2.6.1003])
define([PRODUCT_VERSION], [2.6.1004])

dnl The MSI product code MUST change on each product release.
define([PRODUCT_CODE], [{C6A541CB-538F-4399-A145-B5E148FF88BF}])
define([PRODUCT_CODE], [{7BEBE28C-FC55-4F3B-B7A1-38DABE3E987F}])

dnl The MSI upgrade codes MUST persist for all versions of the same product line.
dnl Please use own upgrade codes when deploying a non-official OpenVPN release.
Expand Down

0 comments on commit 4d24eab

Please sign in to comment.