From 3381492d26c2c3677b5f6065e1022c9cfe225c79 Mon Sep 17 00:00:00 2001
From: Stephan Wiesand <stephan.wiesand@desy.de>
Date: Thu, 12 Jun 2014 10:30:48 +0200
Subject: [PATCH] Make OpenAFS 1.6.9

Update version strings and NEWS for 1.6.9

Change-Id: I80fe292dd091a26cbec5d5b4a2fab51e4cf4dee6
---
 NEWS                            | 6 ++++++
 configure-libafs.ac             | 2 +-
 configure.ac                    | 4 ++--
 src/config/NTMakefile.amd64_w2k | 2 +-
 src/config/NTMakefile.i386_nt40 | 2 +-
 src/config/NTMakefile.i386_w2k  | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 0bd5e2cbf7..3c6ec2f70c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
                        User-Visible OpenAFS Changes
 
+OpenAFS 1.6.9
+
+  All server platforms
+
+    * Fix for OPENAFS-SA-2014-002
+
 OpenAFS 1.6.8
 
   All platforms
diff --git a/configure-libafs.ac b/configure-libafs.ac
index 162dbbdf7c..5b91de1c2d 100644
--- 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.8
+MACOS_VERSION=1.6.9
 
 AC_SUBST(MACOS_VERSION)
 
diff --git a/configure.ac b/configure.ac
index dd16efd061..6a32534135 100644
--- 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.8
-LINUX_PKGVER=1.6.8
+MACOS_VERSION=1.6.9
+LINUX_PKGVER=1.6.9
 
 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 447b7c0ae5..90202dbbc4 100644
--- 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=0802
+AFSPRODUCT_VER_PATCH=0900
 !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 7831ad1b9e..56425cd0a0 100644
--- 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=0802
+AFSPRODUCT_VER_PATCH=0900
 !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 4d7a6bb957..5b7d9d62e2 100644
--- 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=0802
+AFSPRODUCT_VER_PATCH=0900
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0