From 910f3dd3480248ff97454169836b799ab8be22b1 Mon Sep 17 00:00:00 2001
From: Lars Müller <lmuelle@samba.org>
Date: Thu, 4 Aug 2005 02:59:19 +0000
Subject: r9038: Revert svn rev 414.  Discussed with Jerry and Metze.

We need the option to add an 'a' if we're already in pre or rc state
with the next release.

Bugzilla Bug 2618
(This used to be commit 26bf1d223efd011ca7c4d5c7d5de23d0f9ad0823)
---
 source3/VERSION             | 12 ++++++++++++
 source3/script/mkversion.sh |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'source3')

diff --git a/source3/VERSION b/source3/VERSION
index 303ad3dfcf..1afddaa901 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -21,6 +21,18 @@ SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=0
 SAMBA_VERSION_RELEASE=20
 
+########################################################
+# If a official release has a serious bug              #
+# a security release will have 'a' sufffix             #
+#                                                      #
+# so SAMBA's version will be                           #
+# <MAJOR>.<MINOR>.<RELEASE><REVISION>                  #
+#                                                      #
+# e.g. SAMBA_VERSION_PRE_RELEASE=a                     #
+#  ->  "2.2.8a"                                        #
+########################################################
+SAMBA_VERSION_REVISION=
+
 ########################################################
 # For 'pre' releases the version will be               #
 #                                                      #
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index d9d84a5337..9d919cfe34 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -18,6 +18,8 @@ SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FIL
 SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE`
 SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
 
+SAMBA_VERSION_REVISION=`sed -n 's/^SAMBA_VERSION_REVISION=//p' $SOURCE_DIR$VERSION_FILE`
+
 SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
 
 SAMBA_VERSION_RC_RELEASE=`sed -n 's/^SAMBA_VERSION_RC_RELEASE=//p' $SOURCE_DIR$VERSION_FILE`
@@ -36,7 +38,10 @@ echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE
 SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}"
 
 
-if test -n "${SAMBA_VERSION_PRE_RELEASE}";then
+if test -n "${SAMBA_VERSION_REVISION}";then
+    SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}${SAMBA_VERSION_REVISION}"
+    echo "#define SAMBA_VERSION_REVISION \"${SAMBA_VERSION_REVISION}\"" >> $OUTPUT_FILE
+elif test -n "${SAMBA_VERSION_PRE_RELEASE}";then
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}pre${SAMBA_VERSION_PRE_RELEASE}"
     echo "#define SAMBA_VERSION_PRE_RELEASE ${SAMBA_VERSION_PRE_RELEASE}" >> $OUTPUT_FILE
 elif test -n "${SAMBA_VERSION_RC_RELEASE}";then
-- 
cgit