diffstat of debian/ for nfs-utils_1.1.1~git-20070709-3 nfs-utils_1.1.1~git-20070709-3.0maemo3 changelog | 22 ++++++++++++++++++++++ control | 28 ++-------------------------- nfs-common.install | 14 ++++---------- nfs-common.links | 2 -- nfs-common.manpages | 8 ++------ nfs-common.postinst | 21 ++++++++++++++++----- nfs-common.postrm | 2 +- nfs-kernel-server.install | 1 - nfs-kernel-server.manpages | 1 - rules | 10 +++++++--- 10 files changed, 54 insertions(+), 55 deletions(-) diff -u nfs-utils-1.1.1~git-20070709/debian/rules nfs-utils-1.1.1~git-20070709/debian/rules --- nfs-utils-1.1.1~git-20070709/debian/rules +++ nfs-utils-1.1.1~git-20070709/debian/rules @@ -10,8 +10,12 @@ dh_testdir CFLAGS="-g -O2 -Wall" ./configure \ --mandir='$${prefix}/share/man' \ - --enable-secure-statd \ - --with-tcp-wrappers + --disable-secure-statd \ + --without-tcp-wrappers \ + --disable-nfsv4 \ + --disable-uuid \ + --disable-gss + $(MAKE) touch build-stamp @@ -35,7 +39,7 @@ dh_installdocs -A dh_installdocs -pnfs-common debian/README.Debian.nfsv4 install -m 0755 debian/nfs-common.init debian/nfs-common/etc/init.d/nfs-common - install -m 0755 debian/nfs-kernel-server.init debian/nfs-kernel-server/etc/init.d/nfs-kernel-server +# install -m 0755 debian/nfs-kernel-server.init debian/nfs-kernel-server/etc/init.d/nfs-kernel-server dh_installman dh_link dh_installchangelogs ChangeLog diff -u nfs-utils-1.1.1~git-20070709/debian/changelog nfs-utils-1.1.1~git-20070709/debian/changelog --- nfs-utils-1.1.1~git-20070709/debian/changelog +++ nfs-utils-1.1.1~git-20070709/debian/changelog @@ -1,3 +1,25 @@ +nfs-utils (1:1.1.1~git-20070709-3.0maemo3) unstable; urgency=low + + * does not produce nfs-kernel-server package + * does not include mount.nfs and umount.nfs in nfs-common + * Fixes: NB#73590 + + -- Juha Kallioinen Fri, 02 Nov 2007 16:12:31 +0200 + +nfs-utils (1:1.1.1~git-20070709-3.0maemo2) unstable; urgency=low + + * No longer depends on adduser, initscripts and ucf. + * Fixes: NB#73590 + + -- Maemo Integration Fri, 12 Oct 2007 17:41:31 +0300 + +nfs-utils (1:1.1.1~git-20070709-3.0maemo1) unstable; urgency=low + + * No longer use libwrap, nfsv4, secure-statd, kerberos, idmapd, gss, + blkid. + + -- Maemo Integration Thu, 11 Oct 2007 15:25:31 +0300 + 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 -u nfs-utils-1.1.1~git-20070709/debian/nfs-common.postrm nfs-utils-1.1.1~git-20070709/debian/nfs-common.postrm --- nfs-utils-1.1.1~git-20070709/debian/nfs-common.postrm +++ nfs-utils-1.1.1~git-20070709/debian/nfs-common.postrm @@ -22,5 +22,5 @@ /var/lib/nfs/sm.bak/* - dpkg-statoverride --remove /sbin/mount.nfs || true +# dpkg-statoverride --remove /sbin/mount.nfs || true ;; esac diff -u nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.manpages nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.manpages --- nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.manpages +++ nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.manpages @@ -6 +5,0 @@ -debian/tmp/usr/share/man/man8/svcgssd.8 diff -u nfs-utils-1.1.1~git-20070709/debian/nfs-common.install nfs-utils-1.1.1~git-20070709/debian/nfs-common.install --- nfs-utils-1.1.1~git-20070709/debian/nfs-common.install +++ nfs-utils-1.1.1~git-20070709/debian/nfs-common.install @@ -1,17 +1,11 @@ -debian/tmp/sbin/mount.nfs -debian/tmp/sbin/mount.nfs4 -debian/tmp/sbin/umount.nfs -debian/tmp/sbin/umount.nfs4 +# debian/tmp/sbin/mount.nfs +# debian/tmp/sbin/mount.nfs4 +# debian/tmp/sbin/umount.nfs +# debian/tmp/sbin/umount.nfs4 debian/tmp/usr/sbin/rpc.statd sbin/ debian/tmp/usr/sbin/sm-notify sbin/ debian/tmp/usr/sbin/showmount sbin/ debian/tmp/usr/sbin/nfsstat -debian/tmp/usr/sbin/rpc.gssd -debian/tmp/usr/sbin/rpc.idmapd -debian/tmp/usr/sbin/gss_clnt_send_err -debian/tmp/usr/sbin/gss_destroy_creds debian/tmp/usr/sbin/rpcdebug -debian/idmapd.conf usr/share/nfs-common/conffiles/ -debian/idmapd.conf.md5sum usr/share/nfs-common/conffiles/ debian/nfs-common.default usr/share/nfs-common/conffiles/ debian/nfs-common.default.md5sum usr/share/nfs-common/conffiles/ diff -u nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.install nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.install --- nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.install +++ nfs-utils-1.1.1~git-20070709/debian/nfs-kernel-server.install @@ -1,7 +1,6 @@ debian/tmp/usr/sbin/exportfs debian/tmp/usr/sbin/rpc.mountd debian/tmp/usr/sbin/rpc.nfsd -debian/tmp/usr/sbin/rpc.svcgssd debian/nfs-kernel-server.default /usr/share/nfs-kernel-server/conffiles/ debian/etc.exports /usr/share/nfs-kernel-server/conffiles/ debian/nfs-kernel-server.default.md5sum /usr/share/nfs-kernel-server/conffiles/ diff -u nfs-utils-1.1.1~git-20070709/debian/nfs-common.postinst nfs-utils-1.1.1~git-20070709/debian/nfs-common.postinst --- nfs-utils-1.1.1~git-20070709/debian/nfs-common.postinst +++ nfs-utils-1.1.1~git-20070709/debian/nfs-common.postinst @@ -4,8 +4,8 @@ case "$1" in configure) - ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf - ucf --three-way /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common +# ucf --three-way /usr/share/nfs-common/conffiles/idmapd.conf /etc/idmapd.conf + cp /usr/share/nfs-common/conffiles/nfs-common.default /etc/default/nfs-common if [ "$2" != "" ] && dpkg --compare-versions "$2" lt 1:1.1.0-10; then update-rc.d -f nfs-common remove >/dev/null @@ -13,12 +13,23 @@ update-rc.d nfs-common start 20 2 3 4 5 . stop 20 0 1 6 . start 44 S . >/dev/null if ! getent passwd statd >/dev/null; then - adduser --system --home /var/lib/nfs --no-create-home statd +# adduser --system --home /var/lib/nfs --no-create-home statd + + # here we get the first available system user id for statd + # in Debian the default system user id range is 100 - 999 + sysuid=100 + + while ! useradd -u $sysuid -g nogroup -s /bin/false -d /var/lib/nfs statd; + do + sysuid=$(($sysuid + 1)) + done + fi + if dpkg --compare-versions "$2" ge 1:1.0.7-10 && dpkg --compare-versions "$2" lt 1:1.0.7-13; then - usermod --home /var/lib/nfs statd || true + usermod -d /var/lib/nfs statd || true if [ -d /home/statd ]; then - rmdir --ignore-fail-on-non-empty /home/statd + rm -rf /home/statd fi fi if [ "$2" = "" ] || dpkg --compare-versions "$2" lt 1:1.0.7-16; then diff -u nfs-utils-1.1.1~git-20070709/debian/nfs-common.links nfs-utils-1.1.1~git-20070709/debian/nfs-common.links --- nfs-utils-1.1.1~git-20070709/debian/nfs-common.links +++ nfs-utils-1.1.1~git-20070709/debian/nfs-common.links @@ -1,3 +1 @@ -/usr/share/man/man8/gssd.8 /usr/share/man/man8/rpc.gssd.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 diff -u nfs-utils-1.1.1~git-20070709/debian/nfs-common.manpages nfs-utils-1.1.1~git-20070709/debian/nfs-common.manpages --- nfs-utils-1.1.1~git-20070709/debian/nfs-common.manpages +++ nfs-utils-1.1.1~git-20070709/debian/nfs-common.manpages @@ -1,11 +1,7 @@ -debian/tmp/usr/share/man/man5/idmapd.conf* debian/tmp/usr/share/man/man5/nfs.5 -debian/tmp/usr/share/man/man8/gssd.8 -debian/tmp/usr/share/man/man8/idmapd.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* debian/tmp/usr/share/man/man8/rpcdebug.8 -debian/tmp/usr/share/man/man8/mount.nfs.8 -debian/tmp/usr/share/man/man8/umount.nfs.8 +# debian/tmp/usr/share/man/man8/mount.nfs.8 +# debian/tmp/usr/share/man/man8/umount.nfs.8 diff -u nfs-utils-1.1.1~git-20070709/debian/control nfs-utils-1.1.1~git-20070709/debian/control --- nfs-utils-1.1.1~git-20070709/debian/control +++ nfs-utils-1.1.1~git-20070709/debian/control @@ -3,37 +3,13 @@ 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-Depends: debhelper (>= 5), pkg-config, quilt (>= 0.40) Build-Conflicts: librpcsecgss-dev (= 0.14-1) Standards-Version: 3.7.2 -Package: nfs-kernel-server -Priority: optional -Architecture: any -Depends: nfs-common (>= 1:1.0.8-1), ucf, lsb-base (>= 1.3-9ubuntu3), ${shlibs:Depends}, libblkid1 (>= 1.39+1.40-WIP-2006.11.14+dfsg-2) -Provides: knfs, nfs-server -Conflicts: knfs, nfs-server -Replaces: knfs, nfs-server -Description: support for NFS kernel server - The NFS kernel server is currently the recommended NFS server for use - with Linux, featuring features such as NFSv3 and NFSv4, Kerberos - support via GSS, and much more. It is also significantly faster and - usually more reliable than the user-space NFS servers (from the - unfs3 and nfs-user-server packages). However, it is more difficult to - debug than the user-space servers, and has a slightly different - feature set. - . - This package contains the user-space support needed to use the - NFS kernel server. Most administrators wishing to set up an NFS server - would want to install this package. - . - Upstream: SourceForge project "nfs", CVS module nfs-utils. - . - Homepage: http://nfs.sourceforge.net/ - Package: nfs-common Architecture: any -Depends: portmap | rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), initscripts (>= 2.86.ds1-38.1), ${shlibs:Depends} +Depends: portmap | rpcbind, lsb-base (>= 1.3-9ubuntu3), netbase (>= 4.24), ${shlibs:Depends} Provides: nfs-client Conflicts: nfs-client Replaces: nfs-client, nfs-kernel-server (<< 1:1.0.7-5), mount (<< 2.13~)