From 4f9a7acec9fe892f864acd41af8523962ffe68b5 Mon Sep 17 00:00:00 2001
From: Stephan Wiesand <stephan.wiesand@desy.de>
Date: Mon, 13 Jul 2015 12:56:44 +0200
Subject: [PATCH] Make OpenAFS 1.6.13

Update version strings and NEWS for release 1.6.13

Change-Id: I0383e39658420f710e6ab8c20e7ce080f51b1bc0
---
 NEWS                            | 25 +++++++++++++++++++++++++
 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, 31 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index e38c8d00a..029401071 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,30 @@
                        User-Visible OpenAFS Changes
 
+OpenAFS 1.6.13
+
+  All server platforms
+
+    * Fix for CVE-2015-3282: vos leaks stack data onto the wire in the
+      clear when creating vldb entries
+
+    * Workaround for CVE-2015-3283: bos commands can be spoofed, including
+      some which alter server state
+
+    * Disabled searching the VLDB by volume name regular expression to avoid
+      possible buffer overruns in the volume location server
+
+  All client platforms
+
+    * Fix for CVE-2015-3284: pioctls leak kernel memory
+
+    * Fix for CVE-2015-3285: kernel pioctl support for OSD command passing
+      can trigger a panic
+
+  Solaris clients
+
+    * Fix for CVE-2015-3286: Solaris grouplist modifications for PAGs can
+      panic  or overwrite memory
+
 OpenAFS 1.6.12
 
   All server platforms
diff --git a/configure-libafs.ac b/configure-libafs.ac
index bde2e4613..3f8922fcc 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.12
+MACOS_VERSION=1.6.13
 
 AC_SUBST(MACOS_VERSION)
 
diff --git a/configure.ac b/configure.ac
index 93da9ca42..35d3162f2 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.12
-LINUX_PKGVER=1.6.12
+MACOS_VERSION=1.6.13
+LINUX_PKGVER=1.6.13
 
 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 937b88379..6e4587aad 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=1202
+AFSPRODUCT_VER_PATCH=1300
 !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 f33e46ded..fc115d80e 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=1202
+AFSPRODUCT_VER_PATCH=1300
 !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 ba5e7a091..4f2d594d0 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=1202
+AFSPRODUCT_VER_PATCH=1300
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
-- 
2.39.5