Make OpenAFS 1.6.21.1

Update configure version strings for 1.6.21.1. Note that macos kext
can be of form XXXX.YY[.ZZ[(d|a|b|fc)NNN]] where d dev, a alpha,
b beta, f final candidate so we have no way to represent 1.6.21.1.
Switch to 1.6.22 dev 1 for macOs.

Change-Id: I73ebd481fdfe0d096b67138d4cb0f7b0d53e9e59
Reviewed-on: https://gerrit.openafs.org/12713
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/configure-libafs.ac b/configure-libafs.ac
index d0e1764fa974783779d6efd8502f7f0e4a1d87eb..40a67931ecc788006490361d977119b7d19e2ecf 100644 (file)
--- a/configure-libafs.ac
+++ b/configure-libafs.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR(src/libafs/Makefile.common.in)
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.6.21
+MACOS_VERSION=1.6.22d1
 
 AC_SUBST(MACOS_VERSION)
 

diff --git a/configure.ac b/configure.ac
index e9bbc81155375ef079c9f0e701ff6ee9363a8a84..bc3cd59c0cf390c4001943da34c38d357f04ac8b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ AC_CONFIG_SRCDIR([src/config/stds.h])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.6.21
-LINUX_PKGVER=1.6.21
+MACOS_VERSION=1.6.22d1
+LINUX_PKGVER=1.6.21.1
 
 dnl Debian wants the release candidate version in the main upstream version,
 dnl and wants ~ before it.

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 4df5d77494f2aae5d80f480cc2176b5a7a29cb92..52079d21a5cf5149bb6c39d99db8b8ea13664792 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -90,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=6
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=2101
+AFSPRODUCT_VER_PATCH=2102
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index e2dab12e699ae46f0b4d2480980773f4e91332a6..cffb7d3d12a72f703061811532b2b4a27fb723ec 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -90,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=6
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=2101
+AFSPRODUCT_VER_PATCH=2102
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 48fdb69a4c8e1e0d3a862e3f8f948ec00a892f2c..b123237ee34c9dbc43fdc1b4e8ba6ae98bdc2002 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -94,7 +94,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=6
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=2101
+AFSPRODUCT_VER_PATCH=2102
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0