Bug#670437: pygopherd: diff for NMU version 2.0.18.3+nmu4
On Tue, 09 Dec 2014 00:06:42 -0800, Cameron Norman wrote: > >> I have supplied a more minimal NMU to fix #771501 that does not mess with > >> the gophermap file other than installing it if it was not there before. > > Where is this new patch? It seems that I don't see it right now :) > Doh! Attached now :) Thanks! First NMU cancelled, new one re-uploaded to DELAYED/5 again. Cheers, gregor -- .''`. 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: Ben Weaver: Like A Wound signature.asc Description: Digital Signature
Bug#670437: pygopherd: diff for NMU version 2.0.18.3+nmu4
On Mon, Dec 8, 2014 at 11:55 PM, gregor herrmann wrote: > On Mon, 08 Dec 2014 17:49:27 -0800, Cameron Norman wrote: > >> I have supplied a more minimal NMU to fix #771501 that does not mess with >> the gophermap file other than installing it if it was not there before. > > Where is this new patch? It seems that I don't see it right now :) Doh! Attached now :) Cheers, -- Cameron pygopherd-nodocusage.2.debdiff Description: Binary data
Bug#670437: pygopherd: diff for NMU version 2.0.18.3+nmu4
On Mon, 08 Dec 2014 17:49:27 -0800, Cameron Norman wrote: > Unfortunately I have discovered there is an issue in this set of changes. > The gophermap file is modified by the admin in basically all cases of > pygopherd being actually used to serve a gopher site. Overwriting it (on > installation/upgrade) or deleting it (on removal/purge), which this NMU > does, is deleting the data of the site. Oh, good catch; sorry for missing this aspect. I'll cancel the NMU later today. > I have supplied a more minimal NMU to fix #771501 that does not mess with > the gophermap file other than installing it if it was not there before. Where is this new patch? It seems that I don't see it right now :) > I will hopefully address the unowned file issue (#670437) in a later set of > changes. Ack. > Thanks for sponsoring the first upload, Gregor. Thanks for providing the patch(es) in the first place! Cheers, gregor -- .''`. 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 `- BOFH excuse #191: Just type 'mv * /dev/null'. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#670437: pygopherd: diff for NMU version 2.0.18.3+nmu4
On Sun, 7 Dec 2014 15:48:28 +0100 gregor herrmann wrote: > 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. Unfortunately I have discovered there is an issue in this set of changes. The gophermap file is modified by the admin in basically all cases of pygopherd being actually used to serve a gopher site. Overwriting it (on installation/upgrade) or deleting it (on removal/purge), which this NMU does, is deleting the data of the site. I have supplied a more minimal NMU to fix #771501 that does not mess with the gophermap file other than installing it if it was not there before. I will hopefully address the unowned file issue (#670437) in a later set of changes. Thanks for sponsoring the first upload, Gregor. Best regards, -- Cameron Norman
Bug#670437: pygopherd: diff for NMU version 2.0.18.3+nmu4
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.0 +0200
+++ pygopherd-2.0.18.3+nmu4/debian/changelog 2014-12-07 15:35:37.0 +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 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.0 +0200
+++ pygopherd-2.0.18.3+nmu4/debian/postinst 2014-12-07 15:35:37.0 +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.0 +0200
+++ pygopherd-2.0.18.3+nmu4/debian/rules 2014-12-07 15:35:37.0 +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
