+++ /dev/null
-
-#define NFS3_SUPPORTED 1
-#define NFS4_SUPPORTED 1
-#define GSS_SUPPORTED 1
+nfs-utils (1:1.0.7-5) unstable; urgency=low
+
+ * Non-non-maintainer-upload this time, it seems. :-)
+ * Don't let the init script fail if there wasn't any lockd threads to kill;
+ this could cause the package to fail configuration.
+ * Move to debhelper compatibility level 5.
+ * Use dh_install instead of dh_movefiles (actually a combination was used
+ earlier). Move stuff from *.files accordingly into *.install.
+ * mkdir debian/tmp manually before doing make install, and remove it
+ in the clean target.
+ * Use straight cp -a instead of dh_install for the files that _don't_
+ come from debian/tmp/ (the two /etc files).
+ * Fix the "fixups" part in debian/rules to reflect the behaviour of
+ dh_install compared to dh_movefiles (ie. don't rm lots of stuff in
+ debian/tmp, etc.).
+ * Make a debian/nfs-kernel-server.install listing explicitly the files
+ we want in that package; with dh_movefiles everything from make install
+ was implicitly put there. This has the side effect that the man pages
+ for rpc.gssd and idmap.conf are no longer put in nfs-kernel-server, but
+ in nfs-common, where they should be.
+ * Use dh_installman to install the manpages, to make sure they're in the
+ right place (and move the manpage lists from *.files to *.manpages
+ accordingly). List the rpc.* variants of the manpages in *.links,
+ instead of assuming dh_compress (!) will make them for us. Bonus points
+ for then not including the nonsensical rpc.* variants, such as
+ rpc.idmapd.conf(5).
+ * Don't mv lockd, statd and showmount manually from /usr/sbin to /sbin;
+ let the .install file do it for us.
+ * Remove *.conffiles; debhelper now sets everything in /etc as conffiles
+ automatically.
+ * Extend the debian/rules rm hack to the files we removed in this version
+ (ick).
+ * In debian/control, make nfs-common replace nfs-kernel-server
+ (<< 1:1.0.7-5), since the idmapd manpage switched packages.
+ * Remove old cruft in debian/rules file:
+ * Remove non-used dh_* programs.
+ * Remove obsolete source and diff targets.
+ * Remove SETGCC hack.
+ * Don't set rpath for rpc.gssd and rpc.svcgssd (fixes lintian warnings).
+
+ -- Steinar H. Gunderson <sesse@debian.org> Tue, 28 Mar 2006 02:57:23 +0200
+
nfs-utils (1:1.0.7-4) unstable; urgency=low
* Ack NMU. Thanks Steinar H. Gunderson.
Depends: portmap, sysvinit (>= 2.80-1), ${shlibs:Depends}
Provides: nfs-client
Conflicts: nfs-client
-Replaces: nfs-client
+Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5)
Description: NFS support files common to client and server
Use this package on any machine that does NFS either as client or
server. Programs included: lockd, statd, showmount, and nfsstat.
start-stop-daemon --stop --oknodo --quiet \
--name rpc.lockd || true
else
- pkill -KILL -u root -x lockd
+ pkill -KILL -u root -x lockd || true
fi
printf " statd"
start-stop-daemon --stop --oknodo --quiet \
-debian/idmapd.conf etc
-debian/gssapi_mech.conf etc
+usr/sbin/rpc.lockd sbin/
+usr/sbin/rpc.statd sbin/
+usr/sbin/showmount sbin/
+usr/sbin/nfsstat
+usr/sbin/rpc.gssd
+usr/sbin/rpc.idmapd
--- /dev/null
+/usr/share/man/man8/gssd.8 /usr/share/man/man8/rpc.gssd.8
+/usr/share/man/man8/lockd.8 /usr/share/man/man8/rpc.lockd.8
+/usr/share/man/man8/statd.8 /usr/share/man/man8/rpc.statd.8
+/usr/share/man/man8/idmapd.8 /usr/share/man/man8/rpc.idmapd.8
--- /dev/null
+debian/tmp/usr/share/man/man5/idmapd.conf*
+debian/tmp/usr/share/man/man8/gssd.8
+debian/tmp/usr/share/man/man8/idmapd.8
+debian/tmp/usr/share/man/man8/lockd.8
+debian/tmp/usr/share/man/man8/statd.8
+debian/tmp/usr/share/man/man8/nfsstat*
+debian/tmp/usr/share/man/man8/showmount*
+debian/tmp/usr/share/man/man8/idmapd*
--- /dev/null
+usr/sbin/exportfs
+usr/sbin/rpc.mountd
+usr/sbin/rpc.nfsd
+usr/sbin/rpc.svcgssd
--- /dev/null
+/usr/share/man/man8/mountd.8 /usr/share/man/man8/rpc.mountd.8
+/usr/share/man/man8/nfsd.8 /usr/share/man/man8/rpc.nfsd.8
+/usr/share/man/man8/svcgssd.8 /usr/share/man/man8/rpc.svcgssd.8
+
--- /dev/null
+debian/tmp/usr/share/man/man5/exports.5
+debian/tmp/usr/share/man/man7/nfsd.7
+debian/tmp/usr/share/man/man8/mountd.8
+debian/tmp/usr/share/man/man8/exportfs.8
+debian/tmp/usr/share/man/man8/nfsd.8
+debian/tmp/usr/share/man/man8/svcgssd.8
--- /dev/null
+usr/sbin/nhfs*
+usr/share/man/man8/nhfs*
#!/usr/bin/make -f
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-#export DH_COMPAT=5
export DH_VERBOSE=1
-# You can use gcc 2.7.2 if it's installed,
-# but I don't think that's necessary any more.
-#SETGCC := CC=$(notdir $(shell which gcc272 gcc 2>/dev/null | sed '1q'))
-
# Temporary root
DEBTMP := $(shell pwd)/debian/tmp
build-stamp:
# Debian source diffs don't reflect removals.
# This kludge will suffice until the next upstream version. *sigh*
- rm -f debian/nfs-common.config \
+ rm -f debian/nfs-common.conffiles \
+ debian/nfs-common.config \
+ debian/nfs-common.files \
debian/nfs-common.templates \
+ debian/nfs-kernel-server.conffiles\
debian/nfs-kernel-server.config \
- debian/nfs-kernel-server.templates
+ debian/nfs-kernel-server.templates\
+ debian/nhfsstone.files
dh_testdir
- # Add here commands to compile the package.
-test -r /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub config.sub
-test -r /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess config.guess
autoconf
- $(SETGCC) ./configure \
+ ./configure \
--mandir='$${prefix}/share/man' \
--enable-secure-statd
$(MAKE)
dh_testdir
dh_testroot
rm -f build-stamp
+ rm -rf $(DEBTMP)
# Add here commands to clean up after the build process.
-test -r /usr/share/misc/config.sub && rm -f config.sub
-test -r /usr/share/misc/config.guess && rm -f config.guess
rm -f config.log configure
dh_clean
-# Build architecture-independent files here.
binary-indep: build
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
binary-arch: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- dh_install
+ mkdir $(DEBTMP)
# Add here commands to install the files into debian/tmp
$(MAKE) install_prefix='$(DEBTMP)' install
- dh_movefiles
+ dh_install --sourcedir=debian/tmp/
# Fixups Start Here #
cd debian && \
for f in lockd statd showmount; do \
- mv tmp/usr/sbin/*$$f nfs-common/sbin; \
perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
nfs-common/usr/share/man/man8/$$f.8; \
done; \
- rm -f tmp/usr/sbin/*quota*; \
- rm -f tmp/usr/share/man/man8/*quota*; \
- rm -rf tmp/var/lib/nfs/*; \
- cp --preserve=timestamps etc.exports tmp/etc/exports
+ cp --preserve=timestamps etc.exports nfs-kernel-server/etc/exports; \
+ cp --preserve=timestamps idmapd.conf nfs-common/etc/; \
+ cp --preserve=timestamps gssapi_mech.conf nfs-common/etc/; \
# Fixups End Here #
dh_installdocs -A
dh_installexamples
-# dh_installmenu
dh_installinit -n
-# dh_installcron
-# dh_installmanpages
-# dh_undocumented
+ dh_installman
+ dh_link
dh_installchangelogs ChangeLog
dh_strip
dh_compress
dh_fixperms
dh_installdeb
-# dh_makeshlibs
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
OBJS = gssd.o gssd_main_loop.o gssd_proc.o err_util.o gss_util.o \
gss_oids.o context.o context_heimdal.o krb5_util.o
LIBDEPS = $(TOP)support/lib/librpc.a $(TOP)support/lib/libgssapi.a
-LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpc -lgssapi -ldl $(KRBLIB)
+LIBS = -lrpc -lgssapi -ldl $(KRBLIB)
MAN8 = gssd
include $(TOP)rules.mk
OBJS = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \
gss_oids.o context.o context_heimdal.o cacheio.o svcgssd_mech2file.o
LIBDEPS = $(TOP)support/lib/librpc.a $(TOP)support/lib/libgssapi.a
-LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpc -lgssapi -ldl $(KRBLIB) -lnfsidmap
+LIBS = -lrpc -lgssapi -ldl $(KRBLIB) -lnfsidmap
MAN8 = svcgssd
LINKED = err_util.c gss_util.c gss_oids.c context.c context_heimdal.c
projects / nfs-utils.git / commitdiff