From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2009 23:09:19 +0100 Subject: fix make allmodconfig update several packages, remove snort-wireless. --- package/nfs-utils/Config.in.kerberos | 31 ----- package/nfs-utils/Makefile | 43 +++---- .../nfs-utils/patches/patch-aclocal_kerberos5_m4 | 138 --------------------- .../patches/patch-support_nfs_nfs_mntent_c | 5 +- package/nfs-utils/patches/patch-tools_Makefile_am | 11 -- package/nfs-utils/patches/patch-tools_Makefile_in | 15 ++- .../nfs-utils/patches/patch-utils_mount_error_c | 5 +- .../nfs-utils/patches/patch-utils_mountd_cache_c | 75 ----------- .../nfs-utils/patches/patch-utils_mountd_fsloc_c | 5 +- 9 files changed, 28 insertions(+), 300 deletions(-) delete mode 100644 package/nfs-utils/Config.in.kerberos delete mode 100644 package/nfs-utils/patches/patch-aclocal_kerberos5_m4 delete mode 100644 package/nfs-utils/patches/patch-tools_Makefile_am delete mode 100644 package/nfs-utils/patches/patch-utils_mountd_cache_c (limited to 'package/nfs-utils') diff --git a/package/nfs-utils/Config.in.kerberos b/package/nfs-utils/Config.in.kerberos deleted file mode 100644 index 7c82d55ca..000000000 --- a/package/nfs-utils/Config.in.kerberos +++ /dev/null @@ -1,31 +0,0 @@ -config ADK_COMPILE_NFS_UTILS_WITH_KERBEROS - prompt "Enable Kerberos and NFSv4" - bool - select ADK_PACKAGE_LIBEVENT - select ADK_PACKAGE_LIBNFSIDMAP - select ADK_PACKAGE_LIBRPCSECGSS - select ADK_PACKAGE_LIBCOM_ERR - select ADK_KERNEL_NFSD_V4 - default n - depends on ADK_PACKAGE_NFS_UTILS - -choice -prompt "Kerberos implementation" -depends on ADK_COMPILE_NFS_UTILS_WITH_KERBEROS -config ADK_COMPILE_NFS_UTILS_WITH_KRB5 - prompt "MIT" - bool - select ADK_COMPILE_KRB5 - select ADK_PACKAGE_KRB5_LIBS - select ADK_PACKAGE_LIBGSSGLUE - help - use MIT kerberos libraries - -config ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL - prompt "Heimdal" - bool - select ADK_PACKAGE_HEIMDAL_LIBS - help - Use heimdal kerberos libraries (experimental) - -endchoice diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index c2cb0d806..b2c2c216f 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,53 +4,40 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 1.2.0 +PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 -PKG_BUILDDEP+= libtirpc -ifeq (${ADK_COMPILE_NFS_UTILS_WITH_KRB5},y) -PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss -endif -ifeq (${ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL},y) -PKG_BUILDDEP+= libnfsidmap heimdal libevent librpcsecgss -endif -PKG_MD5SUM:= 779cf81044e92cb51ad590960e7b3671 +PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net PKG_DEPENDS:= portmap libtirpc +PKG_BUILDDEP+= libtirpc +ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y) +PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss +endif PKG_URL:= http://sourceforge.net/projects/nfs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -include ${TOPDIR}/mk/package.mk +PKG_FLAVOURS:= WITH_KERBEROS +PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT) -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y) -PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue -endif +include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y) -PKG_DEPENDS+= heimdal-libs libevent libnfsidmap librpcsecgss libcom_err +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) +PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue endif $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) TCPPFLAGS+= -I${LINUX_DIR}/include -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y) +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) CONFIGURE_ARGS+= --enable-nfsv4 \ --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \ --enable-gss CONFIGURE_ENV+= LIBS="-lrpcsecgss" -endif - -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y) -CONFIGURE_ARGS+= --enable-nfsv4 \ - --with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \ - --enable-gss -CONFIGURE_ENV+= LIBS="-lrpcsecgss" -endif - -ifneq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y) +else CONFIGURE_ARGS+= --disable-nfsv4 \ --disable-gss endif @@ -62,7 +49,7 @@ CONFIGURE_ARGS+= --without-tcp-wrappers \ --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \ --disable-uuid -CONFIGURE_STYLE:= autotool gnu +CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto @@ -76,7 +63,7 @@ post-install: ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/ -ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y) +ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y) ${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/ ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/ diff --git a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 b/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 deleted file mode 100644 index 1a5ca00ba..000000000 --- a/package/nfs-utils/patches/patch-aclocal_kerberos5_m4 +++ /dev/null @@ -1,138 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.4.orig/aclocal/kerberos5.m4 2008-10-17 16:20:09.000000000 +0200 -+++ nfs-utils-1.1.4/aclocal/kerberos5.m4 2009-01-30 16:24:45.000000000 +0100 -@@ -1,112 +1,48 @@ --dnl Checks for Kerberos --dnl NOTE: while we intend to do generic gss-api, currently we --dnl have a requirement to get an initial Kerberos machine --dnl credential. Thus, the requirement for Kerberos. --dnl The Kerberos gssapi library will be dynamically loaded? - AC_DEFUN([AC_KERBEROS_V5],[ -+ K5CONFIG="krb5-config" - AC_MSG_CHECKING(for Kerberos v5) -- AC_ARG_WITH(krb5, -- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], -+ AC_ARG_WITH(krb5-config, -+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], - [ case "$withval" in - yes|no) -- krb5_with="" -+ K5CONFIG="krb5-config" - ;; - *) -- krb5_with="$withval" -+ K5CONFIG="$withval" - ;; - esac ] - ) - -- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ -- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do -- dnl This ugly hack brought on by the split installation of -- dnl MIT Kerberos on Fedora Core 1 -- K5CONFIG="" -- if test -f $dir/bin/krb5-config; then -- K5CONFIG=$dir/bin/krb5-config -- elif test -f "/usr/kerberos/bin/krb5-config"; then -- K5CONFIG="/usr/kerberos/bin/krb5-config" -- elif test -f "/usr/lib/mit/bin/krb5-config"; then -- K5CONFIG="/usr/lib/mit/bin/krb5-config" -- fi - if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs gssapi` -- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` -- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) -- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ -- \( -f $dir/lib/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.so -o \ -- -f $dir/lib/libgssapi_krb5.so \) ; then -+ if $K5CONFIG --version | grep -q -e heimdal; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` -+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -+ gssapi_lib=gssapi -+ KRBIMPL="heimdal" -+ elif $K5CONFIG --version | grep -q -e Kerberos; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` - AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) -- KRBDIR="$dir" -- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the -- dnl private function (gss_krb5_ccache_name) to get correct -- dnl behavior of changing the ccache used by gssapi. -- dnl Starting in 1.3.2, we *DO NOT* want to use -- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME -- dnl to get gssapi to use a different ccache - if test $K5VERS -le 131; then - AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) - fi - gssapi_lib=gssapi_krb5 -- break -- dnl The following ugly hack brought on by the split installation -- dnl of Heimdal Kerberos on SuSe -- elif test \( -f $dir/include/heim_err.h -o\ -- -f $dir/include/heimdal/heim_err.h \) -a \ -- -f $dir/lib/libroken.a; then -- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -- KRBDIR="$dir" -- gssapi_lib=gssapi -- break -- fi -- fi -- done -- dnl We didn't find a usable Kerberos environment -- if test "x$KRBDIR" = "x"; then -- if test "x$krb5_with" = "x"; then -- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) -+ KRBIMPL="mit-krb5" - else -- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) -- fi -+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) -+ KRBIMPL="unknown" - fi -- AC_MSG_RESULT($KRBDIR) -- -- dnl Check if -rpath=$(KRBDIR)/lib is needed -- echo "The current KRBDIR is $KRBDIR" -- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ -- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then -- KRBLDFLAGS=""; -- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then -- KRBLDFLAGS=""; -- else -- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" -+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) - fi -+ AC_MSG_RESULT($KRBIMPL) - -- dnl Now check for functions within gssapi library -- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, -- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, -- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, -- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -- -- dnl Check for newer error message facility -- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, -- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -- -- dnl Check for function to specify addressless tickets -- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, -- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) -- -- dnl If they specified a directory and it didn't work, give them a warning -- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then -- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) -- fi -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) - -- AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIBS]) - AC_SUBST([KRBCFLAGS]) - AC_SUBST([KRBLDFLAGS]) diff --git a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c index 5097e0cf0..65c51fcc9 100644 --- a/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c +++ b/package/nfs-utils/patches/patch-support_nfs_nfs_mntent_c @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.3.orig/support/nfs/nfs_mntent.c 2008-07-27 23:01:45.000000000 +0200 -+++ nfs-utils-1.1.3/support/nfs/nfs_mntent.c 2008-10-06 16:53:17.000000000 +0200 +--- nfs-utils-1.2.1.orig/support/nfs/nfs_mntent.c 2009-11-04 12:13:56.000000000 +0100 ++++ nfs-utils-1.2.1/support/nfs/nfs_mntent.c 2009-12-25 19:33:24.000000000 +0100 @@ -9,7 +9,7 @@ */ diff --git a/package/nfs-utils/patches/patch-tools_Makefile_am b/package/nfs-utils/patches/patch-tools_Makefile_am deleted file mode 100644 index 073486f8d..000000000 --- a/package/nfs-utils/patches/patch-tools_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.4.orig/tools/Makefile.am 2008-10-17 16:20:09.000000000 +0200 -+++ nfs-utils-1.1.4/tools/Makefile.am 2009-01-03 14:12:09.000000000 +0100 -@@ -6,6 +6,6 @@ if CONFIG_RPCGEN - OPTDIRS += rpcgen - endif - --SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS) -+SUBDIRS = $(OPTDIRS) - - MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in index ef12d1e52..a97226111 100644 --- a/package/nfs-utils/patches/patch-tools_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_Makefile_in @@ -1,16 +1,15 @@ -$Id$ ---- nfs-utils-1.1.4.orig/tools/Makefile.in 2008-10-17 16:23:52.000000000 +0200 -+++ nfs-utils-1.1.4/tools/Makefile.in 2009-01-03 13:46:50.000000000 +0100 -@@ -59,7 +59,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re - distclean-recursive maintainer-clean-recursive +--- nfs-utils-1.2.1.orig/tools/Makefile.in 2009-11-04 12:15:52.000000000 +0100 ++++ nfs-utils-1.2.1/tools/Makefile.in 2009-12-25 19:25:33.000000000 +0100 +@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE + distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen +DIST_SUBDIRS = rpcgen DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ - ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -@@ -210,7 +210,7 @@ target_alias = @target_alias@ + am__relativize = \ + dir0=`pwd`; \ +@@ -257,7 +257,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OPTDIRS = $(am__append_1) diff --git a/package/nfs-utils/patches/patch-utils_mount_error_c b/package/nfs-utils/patches/patch-utils_mount_error_c index ab4590270..641a482f2 100644 --- a/package/nfs-utils/patches/patch-utils_mount_error_c +++ b/package/nfs-utils/patches/patch-utils_mount_error_c @@ -1,6 +1,5 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.3.orig/utils/mount/error.c 2008-07-27 23:01:45.000000000 +0200 -+++ nfs-utils-1.1.3/utils/mount/error.c 2008-10-06 16:58:40.000000000 +0200 +--- nfs-utils-1.2.1.orig/utils/mount/error.c 2009-11-04 12:13:56.000000000 +0100 ++++ nfs-utils-1.2.1/utils/mount/error.c 2009-12-25 19:32:49.000000000 +0100 @@ -62,7 +62,7 @@ static int rpc_strerror(int spos) char *tmp; diff --git a/package/nfs-utils/patches/patch-utils_mountd_cache_c b/package/nfs-utils/patches/patch-utils_mountd_cache_c deleted file mode 100644 index 5f46d3116..000000000 --- a/package/nfs-utils/patches/patch-utils_mountd_cache_c +++ /dev/null @@ -1,75 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- nfs-utils-1.1.4.orig/utils/mountd/cache.c 2008-10-17 16:20:09.000000000 +0200 -+++ nfs-utils-1.1.4/utils/mountd/cache.c 2009-01-03 13:48:33.000000000 +0100 -@@ -118,54 +118,6 @@ void auth_unix_ip(FILE *f) - free(he); - } - --void auth_unix_gid(FILE *f) --{ -- /* Request are -- * uid -- * reply is -- * uid expiry count list of group ids -- */ -- int uid; -- struct passwd *pw; -- gid_t glist[100], *groups = glist; -- int ngroups = 100; -- int rv, i; -- char *cp; -- -- if (readline(fileno(f), &lbuf, &lbuflen) != 1) -- return; -- -- cp = lbuf; -- if (qword_get_int(&cp, &uid) != 0) -- return; -- -- pw = getpwuid(uid); -- if (!pw) -- rv = -1; -- else { -- rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); -- if (rv == -1 && ngroups >= 100) { -- groups = malloc(sizeof(gid_t)*ngroups); -- if (!groups) -- rv = -1; -- else -- rv = getgrouplist(pw->pw_name, pw->pw_gid, -- groups, &ngroups); -- } -- } -- qword_printint(f, uid); -- qword_printint(f, time(0)+30*60); -- if (rv >= 0) { -- qword_printint(f, ngroups); -- for (i=0; i