Control: tags 670437 + pending Control: tags 771501 + pending Dear maintainer,
Cameron Norman has prepared an NMU for pygopherd (versioned as 2.0.18.3+nmu4) and I've uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Davy Graham: Tristano
diff -Nru pygopherd-2.0.18.3+nmu3/debian/changelog pygopherd-2.0.18.3+nmu4/debian/changelog
--- pygopherd-2.0.18.3+nmu3/debian/changelog 2013-06-30 14:30:23.000000000 +0200
+++ pygopherd-2.0.18.3+nmu4/debian/changelog 2014-12-07 15:35:37.000000000 +0100
@@ -1,3 +1,11 @@
+pygopherd (2.0.18.3+nmu4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Install gophermap in rules from upstream source, not from
+ /usr/share/doc in postinst (Closes: #771501, #670437)
+
+ -- Cameron Norman <camerontnor...@gmail.com> Fri, 05 Dec 2014 20:51:00 -0800
+
pygopherd (2.0.18.3+nmu3) unstable; urgency=low
* Non-maintainer upload.
diff -Nru pygopherd-2.0.18.3+nmu3/debian/postinst pygopherd-2.0.18.3+nmu4/debian/postinst
--- pygopherd-2.0.18.3+nmu3/debian/postinst 2008-04-10 15:56:55.000000000 +0200
+++ pygopherd-2.0.18.3+nmu4/debian/postinst 2014-12-07 15:35:37.000000000 +0100
@@ -31,13 +31,10 @@
set +e
UNAME=gopher
-HOMEDIR=/var/gopher
-if test -d $HOMEDIR; then HOMEDIREXISTS=yes; else HOMEDIREXISTS=no; fi
-
-if ! grep -q "^${UNAME}:.*${HOMEDIR}" /etc/passwd
+if ! grep -q "^${UNAME}:" /etc/passwd
then
- adduser --system --home $HOMEDIR --group $UNAME
+ adduser --system --home /nonexistent --no-create-home --group $UNAME
else
echo "Gopher account already in place; not modifying."
fi
@@ -62,14 +59,8 @@
chsh -s /bin/sh gopher
fi
-
-if [ "$HOMEDIREXISTS" = "no" ]; then
- if ! test -d $HOMEDIR; then
- mkdir $HOMEDIR
- fi
- cp /usr/share/doc/pygopherd/examples/gophermap $HOMEDIR/gophermap
- chown -R gopher.gopher $HOMEDIR
-fi
+# fix permissions on /var/gopher, since the gopher u/gid is now present
+chown -R gopher.gopher /var/gopher
;;
diff -Nru pygopherd-2.0.18.3+nmu3/debian/rules pygopherd-2.0.18.3+nmu4/debian/rules
--- pygopherd-2.0.18.3+nmu3/debian/rules 2013-06-30 14:30:23.000000000 +0200
+++ pygopherd-2.0.18.3+nmu4/debian/rules 2014-12-07 15:35:37.000000000 +0100
@@ -75,6 +75,7 @@
mv debian/pygopherd/usr/bin/pygopherd \
debian/pygopherd/usr/sbin/pygopherd
rm debian/pygopherd/etc/pygopherd/mime.types
+ install -D examples/gophermap debian/pygopherd/var/gopher/gophermap
cp pygfarm/*.pyg debian/pygfarm/usr/share/pygfarm
chown root.root debian/pygfarm/usr/share/pygfarm/*
chmod 0755 debian/pygfarm/usr/share/pygfarm/*
signature.asc
Description: Digital Signature
