From f1a21c54149d24f8f8f875c2883af449d921c50b Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 14 Jul 2008 11:20:59 +0200 Subject: [PATCH] Imported Debian patch 1.1.2-6 --- debian/README.source | 29 +++++++++++++++++++ debian/changelog | 15 ++++++++++ debian/control | 2 +- debian/nfs-common.init | 1 + .../04-eacces-is-a-permanent-error.patch | 2 +- debian/rules | 17 +++++++++-- 6 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 debian/README.source diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..66a5588 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,29 @@ +nfs-utils for Debian +==================== + +nfs-utils for Debian is packaged using quilt. To get started: + + sudo aptitude install quilt + export QUILT_PATCHES=debian/patches/ + +To get the complete source as built, use the "patch" target in debian/rules or, +equivalently: + + quilt push -a + +To make a new modification, first apply all patches as described above, and +then + + quilt new 99-my-local-patch.patch + quilt edit foo/bar.c + quilt edit baz/quux.c + quilt refresh + +To get the tree back in pristine form, use the "unpatch" target in debian/rules +or, equivalently: + + quilt pop -a + +Happy hacking! + + -- Steinar H. Gunderson , Mon, 14 Jul 2008 11:20:34 +0200 diff --git a/debian/changelog b/debian/changelog index f2a0c79..1b7ab49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +nfs-utils (1:1.1.2-6) unstable; urgency=high + + * Load nfsd.ko before starting idmapd, to hopefully fix NFSv4 export issues. + (Closes: #490181) + * Bump to Standards-Version 3.8.0.1. + * Added README.source with basic information on use of quilt. + * Added (adapted from the example in Policy) debian/rules code to + parse DEB_BUILD_OPTIONS and support noopt and parallel= targets. + (nostrip is already handled by debhelper.) + * Remove DEB_HOST_ARCH setting from debian/rules, as it was not used + anywhere. + * Refresh 04-eacces-is-a-permanent-error.patch to get rid of the offset. + + -- Steinar H. Gunderson Mon, 14 Jul 2008 11:20:59 +0200 + nfs-utils (1:1.1.2-5) unstable; urgency=high * 05-default-use-old-mount-interface.patch: New patch, disables the diff --git a/debian/control b/debian/control index a8f337d..7062153 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: net Maintainer: Anibal Monsalve Salazar Uploaders: Steinar H. Gunderson , Daniel Baumann 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), libldap2-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.0.1 Homepage: http://nfs.sourceforge.net/ Package: nfs-kernel-server diff --git a/debian/nfs-common.init b/debian/nfs-common.init index 3364207..dc93bea 100644 --- a/debian/nfs-common.init +++ b/debian/nfs-common.init @@ -149,6 +149,7 @@ case "$1" in then do_modprobe sunrpc do_modprobe nfs + do_modprobe nfsd if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT then if [ "$NEED_IDMAPD" = yes ] diff --git a/debian/patches/04-eacces-is-a-permanent-error.patch b/debian/patches/04-eacces-is-a-permanent-error.patch index d3d2406..fe5dae6 100644 --- a/debian/patches/04-eacces-is-a-permanent-error.patch +++ b/debian/patches/04-eacces-is-a-permanent-error.patch @@ -2,7 +2,7 @@ Index: nfs-utils-1.1.2/utils/mount/stropts.c =================================================================== --- nfs-utils-1.1.2.orig/utils/mount/stropts.c +++ nfs-utils-1.1.2/utils/mount/stropts.c -@@ -252,7 +252,6 @@ static int set_mandatory_options(const c +@@ -289,7 +289,6 @@ static int set_mandatory_options(const c static int is_permanent_error(int error) { switch (error) { diff --git a/debian/rules b/debian/rules index 5a65ec5..1386ba1 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,18 @@ include /usr/share/quilt/quilt.make -DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +# Parsing of DEB_BUILD_OPTIONS flags. +# Note that nostrip is handled automatically by debhelper. +CFLAGS := -g -Wall +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif # Temporary root DEBTMP := $(CURDIR)/debian/tmp @@ -10,11 +21,11 @@ DEBTMP := $(CURDIR)/debian/tmp build: patch build-stamp build-stamp: dh_testdir - CFLAGS="-g -O2 -Wall" ./configure \ + CFLAGS="$(CFLAGS)" ./configure \ --mandir='$${prefix}/share/man' \ --enable-secure-statd \ --with-tcp-wrappers - $(MAKE) + $(MAKE) $(MAKEFLAGS) touch build-stamp clean: unpatch -- 2.39.5