diff options
Diffstat (limited to 'filesystems')
-rw-r--r-- | filesystems/openafs/Makefile | 6 | ||||
-rw-r--r-- | filesystems/openafs/PLIST | 3 | ||||
-rw-r--r-- | filesystems/openafs/distinfo | 12 | ||||
-rw-r--r-- | filesystems/openafs/options.mk | 17 | ||||
-rw-r--r-- | filesystems/openafs/patches/patch-Makefile.in | 13 | ||||
-rw-r--r-- | filesystems/openafs/patches/patch-src_aklog_aklog.c | 26 | ||||
-rw-r--r-- | filesystems/openafs/patches/patch-src_config_param.nbsd60.h | 12 | ||||
-rw-r--r-- | filesystems/openafs/patches/patch-src_util_softsig.c | 14 |
8 files changed, 12 insertions, 91 deletions
diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile index e70bd39fb93..7f12d1658a9 100644 --- a/filesystems/openafs/Makefile +++ b/filesystems/openafs/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2013/09/17 01:04:12 jakllsch Exp $ +# $NetBSD: Makefile,v 1.6 2014/02/21 21:33:51 gendalia Exp $ -DISTNAME= openafs-1.6.5-src +DISTNAME= openafs-1.6.6-src PKGNAME= ${DISTNAME:C/-src//} CATEGORIES= filesystems net sysutils -MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.5/ +MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.6/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= gendalia@NetBSD.org diff --git a/filesystems/openafs/PLIST b/filesystems/openafs/PLIST index 0b28db1de08..de7f1052152 100644 --- a/filesystems/openafs/PLIST +++ b/filesystems/openafs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2012/12/01 15:22:32 jakllsch Exp $ +@comment $NetBSD: PLIST,v 1.3 2014/02/21 21:33:51 gendalia Exp $ bin/afs_compile_et bin/afsio bin/afsmonitor @@ -224,6 +224,7 @@ lib/libubik.a libexec/openafs/buserver libexec/openafs/dafileserver libexec/openafs/dasalvager +libexec/openafs/davolserver libexec/openafs/fileserver libexec/openafs/kaserver libexec/openafs/ptserver diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo index 12f7862805b..9462d90d910 100644 --- a/filesystems/openafs/distinfo +++ b/filesystems/openafs/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.5 2013/09/17 01:04:12 jakllsch Exp $ +$NetBSD: distinfo,v 1.6 2014/02/21 21:33:51 gendalia Exp $ -SHA1 (openafs-1.6.5-src.tar.bz2) = f0261d7fcd05610d2bb7dcf43c6bb21115476472 -RMD160 (openafs-1.6.5-src.tar.bz2) = 4f0eac7661c311e08b85f4195c712ee592a9b52c -Size (openafs-1.6.5-src.tar.bz2) = 14400420 bytes -SHA1 (patch-Makefile.in) = 159d314975188f768e0046bf153711d1b5c6b89c -SHA1 (patch-src_aklog_aklog.c) = 7a21b2bd338a3a1d00dc0cb99f1af206ab0c607c +SHA1 (openafs-1.6.6-src.tar.bz2) = 819abbb4d639f8f671837e258314710b548bf21d +RMD160 (openafs-1.6.6-src.tar.bz2) = ee51e249021acf9d19ca0053ff9d7f83019862cb +Size (openafs-1.6.6-src.tar.bz2) = 14582006 bytes SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717 -SHA1 (patch-src_config_param.nbsd60.h) = bb2288fd155f20df64fe2e8bc91f0fcf215d6c46 -SHA1 (patch-src_util_softsig.c) = 3f1b27b2ce0d72de6239ebefc199eba831c1acf0 diff --git a/filesystems/openafs/options.mk b/filesystems/openafs/options.mk index fc57c357665..79fe81cece0 100644 --- a/filesystems/openafs/options.mk +++ b/filesystems/openafs/options.mk @@ -1,15 +1,13 @@ -# $NetBSD: options.mk,v 1.2 2013/04/08 11:17:13 rodent Exp $ +# $NetBSD: options.mk,v 1.3 2014/02/21 21:33:51 gendalia Exp $ .include "../../mk/bsd.prefs.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.openafs -PKG_SUPPORTED_OPTIONS+= server bitmap-later bos-new-config fast-restart -PKG_SUPPORTED_OPTIONS+= largefile kernel-module supergroups namei +PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei .if ${MACHINE_ARCH} != "x86_64" PKG_SUPPORTED_OPTIONS+= pam .endif -PKG_SUGGESTED_OPTIONS= server bitmap-later bos-new-config fast-restart -PKG_SUGGESTED_OPTIONS+= namei largefile -kernel-module supergroups +PKG_SUGGESTED_OPTIONS= server -bitmap-later namei -kernel-module supergroups .include "../../mk/bsd.options.mk" @@ -19,15 +17,6 @@ CONFIGURE_ARGS+= --enable-supergroups .if !empty(PKG_OPTIONS:Mbitmap-later) CONFIGURE_ARGS+= --enable-bitmap-later .endif -.if !empty(PKG_OPTIONS:Mbos-new-config) -CONFIGURE_ARGS+= --enable-bos-new-config -.endif -.if !empty(PKG_OPTIONS:Mfast-restart) -CONFIGURE_ARGS+= --enable-fast-restart -.endif -.if !empty(PKG_OPTIONS:Mlargefile) -CONFIGURE_ARGS+= --enable-largefile-fileserver -.endif .if !empty(PKG_OPTIONS:Mkernel-module) CONFIGURE_ARGS+= --enable-kernel-module .else diff --git a/filesystems/openafs/patches/patch-Makefile.in b/filesystems/openafs/patches/patch-Makefile.in deleted file mode 100644 index ccc89b0f034..00000000000 --- a/filesystems/openafs/patches/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ - ---- Makefile.in.orig 2012-03-26 23:03:34.000000000 +0000 -+++ Makefile.in -@@ -270,7 +270,7 @@ vol: cmd comerr dir afs sgiefs - - tsalvaged: vol libafsrpc libafsauthent cmd util - +case ${SYS_NAME} in \ -- alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*|*_darwin_*) \ -+ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd*|*_darwin_*) \ - ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \ - *_darwin_*) \ - ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \ diff --git a/filesystems/openafs/patches/patch-src_aklog_aklog.c b/filesystems/openafs/patches/patch-src_aklog_aklog.c deleted file mode 100644 index 0d0dbad35a1..00000000000 --- a/filesystems/openafs/patches/patch-src_aklog_aklog.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_aklog_aklog.c,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ - ---- src/aklog/aklog.c.orig 2012-03-26 23:03:34.000000000 +0000 -+++ src/aklog/aklog.c -@@ -67,9 +67,11 @@ - #if defined(HAVE_ET_COM_ERR_H) - #include <et/com_err.h> - #else --#include <com_err.h> -+//#include <com_err.h> -+#include <krb5/com_err.h> - #endif - -+ - #ifndef HAVE_KERBEROSV_HEIM_ERR_H - #include <afs/com_err.h> - #endif -@@ -95,6 +97,8 @@ - #include "aklog.h" - #include "linked_list.h" - -+#define HAVE_NO_KRB5_524 -+ - #ifdef HAVE_KRB5_CREDS_KEYBLOCK - #define USING_MIT 1 - #endif diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd60.h b/filesystems/openafs/patches/patch-src_config_param.nbsd60.h deleted file mode 100644 index df70a23e23b..00000000000 --- a/filesystems/openafs/patches/patch-src_config_param.nbsd60.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_config_param.nbsd60.h,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ - ---- src/config/param.nbsd60.h.orig 2012-03-26 23:03:34.000000000 +0000 -+++ src/config/param.nbsd60.h -@@ -3,6 +3,7 @@ - #ifndef AFS_PARAM_COMMON_H - #define AFS_PARAM_COMMON_H 1 - -+#define AFS_64BIT_ENV 1 - #define AFS_NAMEI_ENV 1 /* User space interface to file system */ - #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ - #define AFS_64BIT_CLIENT 1 diff --git a/filesystems/openafs/patches/patch-src_util_softsig.c b/filesystems/openafs/patches/patch-src_util_softsig.c deleted file mode 100644 index 113fc27bd0e..00000000000 --- a/filesystems/openafs/patches/patch-src_util_softsig.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_util_softsig.c,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ - ---- src/util/softsig.c.orig 2012-03-26 23:03:34.000000000 +0000 -+++ src/util/softsig.c -@@ -72,7 +72,8 @@ softsig_thread(void *arg) - - while (1) { - void (*h) (int); --#if !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV) -+#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) -+#else - int sigw; - #endif - |