MFH: r393218

Update to upstream openafs security release 1.6.13

OPENAFS-SA-2015-001 - vos leaks stack data onto the wire in the clear
when creating vldb entries

OPENAFS-SA-2015-002 - bos commands can be spoofed, including some
which alter server state

OPENAFS-SA-2015-003 - pioctls leak kernel memory contents

OPENAFS-SA-2015-004 - kernel pioctl support for OSD command passing can
trigger a panic

OPENAFS-SA-2015-006 - Buffer overflow in OpenAFS vlserver

Approved by:	ports-secteam (delphij)
Security:	CVE-2015-3282, CVE-2015-3283, CVE-2015-3284, CVE-2015-3285

6 files changed, 5 insertions, 65 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 2b74d17ed598..512155d2a30b 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	openafs
-PORTREVISION=	1
 DISTVERSION=	${AFS_DISTVERSION}.${DBVERSION:S/-//g}
 CATEGORIES=	net
 MASTER_SITES=	http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
@@ -22,7 +21,7 @@ LICENSE_NAME=	IBM Public License Version 1.0
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-AFS_DISTVERSION=	1.6.10
+AFS_DISTVERSION=	1.6.13
 DBVERSION=	2013-01-28
 
 USES=		cpe kmod tar:bzip2
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index 2d837d843f7b..6cb0b4c368f0 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,6 +1,6 @@
-SHA256 (openafs-1.6.10-src.tar.bz2) = 09b3c4f9500107c6e1cb737a5642e50f338d6acb0579e5e03c772cba1c6f1276
-SIZE (openafs-1.6.10-src.tar.bz2) = 14592958
-SHA256 (openafs-1.6.10-doc.tar.bz2) = 7cc67eaa3feb7bc4fafc2339284ca46e160bc8dff4acdbd502cfa6e4f41a8ea4
-SIZE (openafs-1.6.10-doc.tar.bz2) = 3531577
+SHA256 (openafs-1.6.13-src.tar.bz2) = 6139370633b48f0149d4dacdd01af7ee29b800b0866c2d18a679c1669e317b26
+SIZE (openafs-1.6.13-src.tar.bz2) = 14373447
+SHA256 (openafs-1.6.13-doc.tar.bz2) = a0517efcb665efc70ac0813256730443be68fb8635da2f90e221bb2c6cc23736
+SIZE (openafs-1.6.13-doc.tar.bz2) = 3501580
 SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17
 SIZE (CellServDB.2013-01-28) = 36787
diff --git a/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c b/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c
deleted file mode 100644
index a20d69429418..000000000000
--- a/net/openafs/files/patch-src-afs-FBSD-osi_vfsops.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/afs/FBSD/osi_vfsops.c.orig	2014-11-08 11:45:02.000000000 +0900
-+++ src/afs/FBSD/osi_vfsops.c	2014-11-08 12:01:34.000000000 +0900
-@@ -49,7 +49,11 @@
-     int code;
-     int offset = AFS_SYSCALL;
- #if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
-+# if defined(FBSD_SYSCALL_REGISTER_FOUR_ARGS)
-+    code = syscall_register(&offset, &afs_sysent, &old_sysent, 0);
-+# else
-     code = syscall_register(&offset, &afs_sysent, &old_sysent);
-+# endif
-     if (code) {
- 	printf("AFS_SYSCALL in use, error %i. aborting\n", code);
- 	return code;
diff --git a/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h b/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h
deleted file mode 100644
index 45a25aa060d1..000000000000
--- a/net/openafs/files/patch-src-config-param.amd64_fbsd_110.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/config/param.amd64_fbsd_110.h.orig	2014-10-09 18:21:13.000000000 +0900
-+++ src/config/param.amd64_fbsd_110.h	2014-11-08 12:19:21.000000000 +0900
-@@ -144,6 +144,11 @@
- #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
- #endif /* _KERNEL */
- 
-+/* r273707 added a flags argument to syscall_register() */
-+#if __FreeBSD_version >= 1100041
-+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS
-+#endif
-+
- #else /* !defined(UKERNEL) */
- 
- /* This section for user space compiles only */
diff --git a/net/openafs/files/patch-src-config-param.i386_fbsd_110.h b/net/openafs/files/patch-src-config-param.i386_fbsd_110.h
deleted file mode 100644
index cf042afed677..000000000000
--- a/net/openafs/files/patch-src-config-param.i386_fbsd_110.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/config/param.i386_fbsd_110.h.orig	2014-10-09 18:21:13.000000000 +0900
-+++ src/config/param.i386_fbsd_110.h	2014-11-08 12:19:35.000000000 +0900
-@@ -143,6 +143,11 @@
- #endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ */
- #endif /* _KERNEL */
- 
-+/* r273707 added a flags argument to syscall_register() */
-+#if __FreeBSD_version >= 1100041
-+#define FBSD_SYSCALL_REGISTER_FOUR_ARGS
-+#endif
-+
- #else /* !defined(UKERNEL) */
- 
- /* This section for user space compiles only */
diff --git a/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in b/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in
deleted file mode 100644
index 62722865ebbb..000000000000
--- a/net/openafs/files/patch-src-libafs-MakefileProto.FBSD.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/libafs/MakefileProto.FBSD.in.orig	2014-05-14 23:09:14.000000000 +0900
-+++ src/libafs/MakefileProto.FBSD.in	2014-05-22 08:00:36.000000000 +0900
-@@ -41,10 +41,12 @@
- <all>
- 
- KDEFS=-Wall -nostdinc -I/usr/include -D_KERNEL -DKLD_MODULE \
--	-elf \
- 	-mno-mmx -mno-3dnow -mno-sse -mno-sse2 \
--	-mno-align-long-strings -fno-common -ffreestanding \
-+	-fno-common -ffreestanding \
- 	-I${KBLD} -include opt_global.h -fno-strict-aliasing
-+.if ${COMPILER_TYPE} != clang
-+KDEFS+=	-elf -mno-align-long-strings
-+.endif
- 
- DBUG = -O2
- #DBUG = -O -g