From: Anibal Monsalve Salazar Date: Tue, 11 Sep 2007 10:12:50 +0000 (+1000) Subject: Imported Debian patch 1.1.1~git-20070709-4 X-Git-Tag: debian/1%1.1.1_git-20070709-4^0 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=10ad9faf6dff18ea3e4711fd416738173b4f8806;p=nfs-utils.git Imported Debian patch 1.1.1~git-20070709-4 --- diff --git a/debian/changelog b/debian/changelog index bc9fb81..55c5c1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nfs-utils (1:1.1.1~git-20070709-4) unstable; urgency=low + + * Replaced libgssapi-dev as build-dependency by libgssglue-dev. + - Added 08-libgssglue-changes.patch. + * Defined major and minor macros. Closes: #442122. + - Added 09-define-major-minor.patch. + + -- Anibal Monsalve Salazar Tue, 11 Sep 2007 20:12:50 +1000 + nfs-utils (1:1.1.1~git-20070709-3) unstable; urgency=low * If there is no override present when running the post-removal script, do diff --git a/debian/control b/debian/control index 6191419..995347a 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Priority: standard Section: net Maintainer: Anibal Monsalve Salazar Uploaders: Steinar H. Gunderson , Daniel Baumann -Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssapi-dev (>= 0.11), librpcsecgss-dev, libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40) -Build-Conflicts: librpcsecgss-dev (= 0.14-1) +Build-Depends: debhelper (>= 5), libwrap0-dev, libevent-dev, libnfsidmap-dev, libkrb5-dev, libgssglue-dev (>= 0.1-1), librpcsecgss-dev (>= 0.16-1), libblkid-dev, libkeyutils-dev, pkg-config, quilt (>= 0.40) Standards-Version: 3.7.2 Package: nfs-kernel-server diff --git a/debian/patches/08-libgssglue-changes.patch b/debian/patches/08-libgssglue-changes.patch new file mode 100644 index 0000000..59e1c46 --- /dev/null +++ b/debian/patches/08-libgssglue-changes.patch @@ -0,0 +1,134 @@ +--- a/utils/gssd/gssd.c ++++ b/utils/gssd/gssd.c +@@ -81,7 +81,7 @@ sig_hup(int signal) + static void + usage(char *progname) + { +- fprintf(stderr, "usage: %s [-f] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir]\n", ++ fprintf(stderr, "usage: %s [-f] [-M] [-n] [-v] [-r] [-p pipefsdir] [-k keytab] [-d ccachedir]\n", + progname); + exit(1); + } +--- a/configure 2007-08-10 01:29:12.000000000 +1000 ++++ b/configure 2007-09-12 23:00:15.000000000 +1000 +@@ -22631,12 +22631,12 @@ + pkg_cv_RPCSECGSS_CFLAGS="$RPCSECGSS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.10\"") >&5 +- ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.10") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.16\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.16") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_RPCSECGSS_CFLAGS=`$PKG_CONFIG --cflags "librpcsecgss >= 0.10" 2>/dev/null` ++ pkg_cv_RPCSECGSS_CFLAGS=`$PKG_CONFIG --cflags "librpcsecgss >= 0.16" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22649,12 +22649,12 @@ + pkg_cv_RPCSECGSS_LIBS="$RPCSECGSS_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.10\"") >&5 +- ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.10") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librpcsecgss >= 0.16\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "librpcsecgss >= 0.16") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_RPCSECGSS_LIBS=`$PKG_CONFIG --libs "librpcsecgss >= 0.10" 2>/dev/null` ++ pkg_cv_RPCSECGSS_LIBS=`$PKG_CONFIG --libs "librpcsecgss >= 0.16" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22673,9 +22673,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librpcsecgss >= 0.10"` ++ RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librpcsecgss >= 0.16"` + else +- RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librpcsecgss >= 0.10"` ++ RPCSECGSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librpcsecgss >= 0.16"` + fi + # Put the nasty error message in config.log where it belongs + echo "$RPCSECGSS_PKG_ERRORS" >&5 +@@ -22710,12 +22710,12 @@ + pkg_cv_GSSAPI_CFLAGS="$GSSAPI_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.11\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.11") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GSSAPI_CFLAGS=`$PKG_CONFIG --cflags "libgssapi >= 0.11" 2>/dev/null` ++ pkg_cv_GSSAPI_CFLAGS=`$PKG_CONFIG --cflags "libgssglue >= 0.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22728,12 +22728,12 @@ + pkg_cv_GSSAPI_LIBS="$GSSAPI_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssapi >= 0.11\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libgssapi >= 0.11") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GSSAPI_LIBS=`$PKG_CONFIG --libs "libgssapi >= 0.11" 2>/dev/null` ++ pkg_cv_GSSAPI_LIBS=`$PKG_CONFIG --libs "libgssglue >= 0.1" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22752,14 +22752,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GSSAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgssapi >= 0.11"` ++ GSSAPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgssglue >= 0.1"` + else +- GSSAPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgssapi >= 0.11"` ++ GSSAPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgssglue >= 0.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GSSAPI_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (libgssapi >= 0.11) were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (libgssglue >= 0.1) were not met: + + $GSSAPI_PKG_ERRORS + +@@ -22770,7 +22770,7 @@ + and GSSAPI_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (libgssapi >= 0.11) were not met: ++echo "$as_me: error: Package requirements (libgssglue >= 0.1) were not met: + + $GSSAPI_PKG_ERRORS + +@@ -24020,7 +24020,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lrpcsecgss -lgssapi -ldl $LIBS" ++LIBS="-lrpcsecgss -lgssglue -ldl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -24089,7 +24089,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lrpcsecgss -lgssapi -ldl $LIBS" ++LIBS="-lrpcsecgss -lgssglue -ldl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF diff --git a/debian/patches/09-define-major-minor.patch b/debian/patches/09-define-major-minor.patch new file mode 100644 index 0000000..6a96940 --- /dev/null +++ b/debian/patches/09-define-major-minor.patch @@ -0,0 +1,18 @@ +--- a/utils/mountd/cache.c 2007-08-10 01:28:21.000000000 +1000 ++++ b/utils/mountd/cache.c 2007-08-10 01:28:21.000000000 +1000 +@@ -36,6 +36,15 @@ + #include "blkid/blkid.h" + #endif + ++#ifndef major ++# define major(dev) gnu_dev_major (dev) ++#endif ++#ifndef minor ++# define minor(dev) gnu_dev_minor (dev) ++#endif ++#ifndef makedev ++# define makedev(maj, min) gnu_dev_makedev (maj, min) ++#endif + + enum nfsd_fsid { + FSID_DEV = 0, diff --git a/debian/patches/series b/debian/patches/series index ec410b4..5c4660d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,5 @@ 05-ignore-quota-option.patch 06-gssd-manpage-typo.patch 07-daemonize-instead-of-fork.patch +08-libgssglue-changes.patch +09-define-major-minor.patch