Bug#773174: unblock: debdelta/0.55 , or discuss on the matter
Dear Jonathan Wiltshire,
I attach the debdiff (both for changes and for dsc)
thanks a lot
a.
File lists identical (after any substitutions)
Control files of package debdelta: lines which differ (wdiff format)
Installed-Size: [-408-] {+410+}
Version: [-0.50+2-] {+0.50+3+}
Control files of package debdelta-doc: lines which differ (wdiff format)
Version: [-0.50+2-] {+0.50+3+}
diff -Nru debdelta-0.50+2/debian/changelog debdelta-0.50+3/debian/changelog
--- debdelta-0.50+2/debian/changelog 2012-11-07 13:33:08.0 +0100
+++ debdelta-0.50+3/debian/changelog 2014-12-19 14:42:36.0 +0100
@@ -1,3 +1,14 @@
+debdelta (0.50+3) testing-proposed-updates; urgency=medium
+
+ * Ship new GPG key
+ * Bug fix: owned and unowned files after purge (policy 6.8 + 10.7.3),
+ (Closes: #617481).
+ * Portuguese translation, thanks to Américo Monteiro (Closes: #760731).
+ * Add a stanza in etc/sources.conf to find deltas for backports
+ * Thanks to Jonathan Wiltshire for T-P-U assistance
+
+ -- A Mennucc1 mennu...@debian.org Fri, 19 Dec 2014 14:42:17 +0100
+
debdelta (0.50+2) unstable; urgency=high
* debdelta-upgrade: uses incorrect URL when requesting
diff -Nru debdelta-0.50+2/debian/postinst debdelta-0.50+3/debian/postinst
--- debdelta-0.50+2/debian/postinst 2011-03-31 11:32:26.0 +0200
+++ debdelta-0.50+3/debian/postinst 2014-12-19 14:10:08.0 +0100
@@ -1,19 +1,47 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
+
+umask 0077
GPG_MASTER_PUB_KEYRING=/usr/share/keyrings/debian-debdelta-archive-keyring.gpg
GPG_HOME=/etc/debdelta/gnupg
+sha1it () {
+ (
+cd ${GPG_HOME}
+echo '#if this file is deleted or it does not match, then ' sha1_hashes.txt
+echo '# these files will not be removed when purging debdelta ' sha1_hashes.txt
+sha1sum pubring.gpg secring.gpg sha1_hashes.txt
+if test -f trustdb.gpg ; then sha1sum trustdb.gpg sha1_hashes.txt ; fi
+ )
+}
+
+check1it () {
+ (
+ cd ${GPG_HOME}
+ test -f sha1_hashes.txt sha1sum -c --quiet sha1_hashes.txt
+ )
+}
+
case $1 in
configure|reconfigure)
if test ! -r ${GPG_HOME} ; then
+ echo Debdelta: creating ${GPG_HOME}
+ mkdir ${GPG_HOME}
+fi
+if test ! -r ${GPG_HOME}/pubring.gpg -a \
+! -r ${GPG_HOME}/secring.gpg ; then
echo Debdelta: creating keyrings in ${GPG_HOME}
- mkdir ${GPG_HOME}
- chmod 0700 ${GPG_HOME}
- touch ${GPG_HOME}/secring.gpg ${GPG_HOME}/pubring.gpg
- chmod 0600 ${GPG_HOME}/secring.gpg ${GPG_HOME}/pubring.gpg
+ touch ${GPG_HOME}/secring.gpg ${GPG_HOME}/pubring.gpg
+ sha1it
else
echo Debdelta: updating public keyring in ${GPG_HOME}
fi
-gpg --no-tty --batch --no-options --no-auto-check-trustdb --homedir ${GPG_HOME} --import ${GPG_MASTER_PUB_KEYRING} || true
+
+c=0 ; if check1it ; then c=1 ; fi
+gpg --no-tty --batch --no-options --no-auto-check-trustdb --homedir ${GPG_HOME} --import ${GPG_MASTER_PUB_KEYRING} || true
+if test $c = 1 ; then sha1it ; fi
+
;;
esac
diff -Nru debdelta-0.50+2/debian/postrm debdelta-0.50+3/debian/postrm
--- debdelta-0.50+2/debian/postrm 2011-03-31 11:32:26.0 +0200
+++ debdelta-0.50+3/debian/postrm 2014-12-19 14:10:08.0 +0100
@@ -3,32 +3,28 @@
GPG_HOME=/etc/debdelta/gnupg
+check1it () {
+ (
+ cd ${GPG_HOME}
+ test -f sha1_hashes.txt sha1sum -c --quiet sha1_hashes.txt
+ )
+}
+
if [ $1 = purge ] ; then
if [ -r /var/lib/debdelta ] ; then
rm -r /var/lib/debdelta
fi
- if test -f ${GPG_HOME}/secring.gpg ; then
-if test -s ${GPG_HOME}/secring.gpg ; then
- echo debdelta: does not delete nonempty ${GPG_HOME}/secring.gpg
-else
- rm ${GPG_HOME}/secring.gpg
-fi
- fi
-
- if test -f ${GPG_HOME}/pubring.gpg ; then
- if echo 4509b7260dc7aee6ec8dac68263bc662 ${GPG_HOME}/pubring.gpg | md5sum -c --quiet ; then
- rm ${GPG_HOME}/pubring.gpg
-else
- echo debdelta: does not delete modified ${GPG_HOME}/pubring.gpg
-fi
+ if check1it ; then
+(
+ cd ${GPG_HOME}
+ rm -f pubring.gpg secring.gpg trustdb.gpg
+ if test -f pubring.gpg~ ; then
+ rm -f pubring.gpg~
+ fi
+ rm -f sha1_hashes.txt
+)
+rmdir ${GPG_HOME} || true
fi
- if test -f ${GPG_HOME}/pubring.gpg~ ; then
-rm ${GPG_HOME}/pubring.gpg~
- fi
-
- #unfortunately I could not spot a good way to detect if the
- # trustdb does contain useful info
-
fi
diff -Nru debdelta-0.50+2/etc/sources.conf debdelta-0.50+3/etc/sources.conf
--- debdelta-0.50+2/etc/sources.conf 2011-03-31 11:32:26.0 +0200
+++ debdelta-0.50+3/etc/sources.conf 2014-12-19 14:11:11.0 +0100
@@ -23,6 +23,11 @@
Label=Debian
delta_uri=http://debdeltas.debian.net/debian-deltas
+[backports debian archive]
+Origin=Debian Backports
+Label=Debian Backports
Bug#773174: unblock: debdelta/0.55 , or discuss on the matter
Control: tag -1 confirmed moreinfo On Fri, Dec 19, 2014 at 03:14:29PM +0100, A Mennucc1 wrote: Dear Jonathan Wiltshire, I attach the debdiff (both for changes and for dsc) Looks good, apart from the last line of the changelog. Please remove that and go ahead, and remove the moreinfo tag. Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51 signature.asc Description: Digital signature
Bug#773174: unblock: debdelta/0.55 , or discuss on the matter
Control: tag -1 moreinfo On Mon, Dec 15, 2014 at 11:16:58AM +0100, A Mennucc wrote: Please unblock package debdelta, or let us discuss if there is some set of changes that you are willing to let into Jessie. [...] 1C) ship new GPG key; the key currently available in the clients in wheezy and in testing will expire 2015-08-24 so it will need to be updated during the lifetime of Jessie. 2P) Bug fix: owned and unowned files after purge (policy 6.8 + 10.7.3), (Closes: #617481). These are all the changes in debian/postrm and debian/postinst that you see in the debdiff 3C) Portuguese translation (Closes: #760731). 4C) add a stanza in etc/sources.conf to tell the client where to find deltas for backports These four. The first is RC; the others may as well be fixed along with it. I'll accept them through testing-proposed-updates in this case. Please prepare a suitable package and send a debdiff for approval before uploading. Remove the moreinfo tag when you are ready. Thanks, -- Jonathan Wiltshire j...@debian.org Debian Developer http://people.debian.org/~jmw 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51 signature.asc Description: Digital signature
Bug#773174: unblock: debdelta/0.55 , or discuss on the matter
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock Dear Release team, I uploaded a new version of debdelta ; unfortunately (my fault) I did not realize that this time the freeze policy is so tight. Please unblock package debdelta, or let us discuss if there is some set of changes that you are willing to let into Jessie. Note that the package 'debdelta' contains both the server code and the client code . The server code is quite old, but this is not a problem, since few people (if any) need to use the server code. (The up-to-date server code is in GIT, and is in use in the server that generates deltas for 'debdelta-upgrade' , that is the client tool). The client code is agnostic, it can apply deltas generated by server code that is much more advanced than what is shipped in the package (as long as the GPG key matches!) Let me highlight all the changes between the version 0.50+2 in stable, and 0.55 in unstable; I will list them in decreasing order of importance. 'S' means : affects server code 'C' means : affects client code 'P' means : affects packaging 1C) ship new GPG key; the key currently available in the clients in wheezy and in testing will expire 2015-08-24 so it will need to be updated during the lifetime of Jessie. 2P) Bug fix: owned and unowned files after purge (policy 6.8 + 10.7.3), (Closes: #617481). These are all the changes in debian/postrm and debian/postinst that you see in the debdiff 3C) Portuguese translation (Closes: #760731). 4C) add a stanza in etc/sources.conf to tell the client where to find deltas for backports 5P) ship in .dsc , and then build, only what is committed in git archive; so the following files are not shipped any more debdelta-0.55/contrib/debmirror-delta-security.ubuntu debdelta-0.55/old/README debdelta-0.55/old/README.upgrade debdelta-0.55/po/pt.po debdelta-0.55/preunpacking/tarpu.py 6CS) close unneeded file descriptor when invoking subprocesses 7P) bump Standards Version (no change) 8C) do not get confused by broken symlinks 9P) debian/rules : add build-arch, build-indep 10S) support data.tar.xz, with XZ parameter autodetection 11P) update location of GIT repository in debian/control 12S) add ability to cache intermediate data 13C) wait for subprocesses to avoid zombies 15CS) change code to be more ready for a future switch to Python 3 , and some other minor code improvements If you think that there are too many changes, but some of the above changes may enter into testing (and then in Jessie) please tell me which one, and I will upload a new version. All server-code related changes may be omitted w/o affecting the client. I attach the 'cleaned up' debdiff. In this debdiff I deleted all references to the files listed in (5P) that simply disappeared from the package, and the portuguese translation. I also deleted duplicates (since my package uses symlinks, each change is reported 5 times by debdiff). If you wish, unblock debdelta/0.55 otherwise please tell me which changes may be accepted. I personally would love to see changes 1 to 4 included; these do not really affect the code, but have large positive impact. Thanks and sorry for the mess. a. signature.asc Description: Digital signature
