2014-12-20 10:30 GMT+01:00 Bálint Réczey <bal...@balintreczey.hu>: > Hi, > > 2014-12-19 22:51 GMT+01:00 Holger Levsen <hol...@layer-acht.org>: >> On Freitag, 19. Dezember 2014, Balint Reczey wrote: >>> If you don't have time I would happily prepare an NMU with the fix. >> >> Please go ahead. Thanks! > I just performed the NMU to DELAYED/2 with the attached patch. I made a typo in the bug number, please see the fixed patch attached. I also reuploaded the package to DELAYED/2.
Cheers, Balint
diff -Nru gnunet-0.10.1/debian/changelog gnunet-0.10.1/debian/changelog --- gnunet-0.10.1/debian/changelog 2014-10-15 21:44:30.000000000 +0200 +++ gnunet-0.10.1/debian/changelog 2014-12-20 10:00:17.000000000 +0100 @@ -1,3 +1,12 @@ +gnunet (0.10.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + + [Raphael Geissert] + * Fix bashisms (Closes: #772233) + + -- Balint Reczey <bal...@balintreczey.hu> Sat, 20 Dec 2014 09:59:13 +0100 + gnunet (0.10.1-2) unstable; urgency=medium * Put the upstream signing key in debian/upstream/signing-key.asc and remove diff -Nru gnunet-0.10.1/debian/patches/fix-bashism.patch gnunet-0.10.1/debian/patches/fix-bashism.patch --- gnunet-0.10.1/debian/patches/fix-bashism.patch 1970-01-01 01:00:00.000000000 +0100 +++ gnunet-0.10.1/debian/patches/fix-bashism.patch 2014-12-20 10:34:36.000000000 +0100 @@ -0,0 +1,54 @@ +Description: fix bashisms +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772233 +Author: Raphael Geissert <geiss...@debian.org> +Forwarded: https://gnunet.org/bugs/view.php?id=3588 + +Index: gnunet-0.10.1-2/src/gns/gnunet-gns-proxy-setup-ca +=================================================================== +--- gnunet-0.10.1-2/src/gns/gnunet-gns-proxy-setup-ca ++++ gnunet-0.10.1-2/src/gns/gnunet-gns-proxy-setup-ca +@@ -7,9 +7,9 @@ + options='' + while getopts "c:" opt; do + case $opt in + c) ++ options="$options -c $OPTARG" +- options+="-c $OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 1 +@@ -38,16 +38,16 @@ + for f in ~/.mozilla/firefox/*.default + do + if [ -d $f ]; then + echo "Importing CA info Firefox $f" ++ certutil -D -n "GNS Proxy CA" -d ~/.mozilla/firefox/*.default >/dev/null 2>&1 +- certutil -D -n "GNS Proxy CA" -d ~/.mozilla/firefox/*.default >/dev/null 2&>1 + certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.mozilla/firefox/*.default < $GNSCERT + fi + done + + if [ -d ~/.pki/nssdb ]; then + echo "Importing CA into Chrome" ++ certutil -D -n "GNS Proxy CA" -d ~/.pki/nssdb >/dev/null 2>&1 +- certutil -D -n "GNS Proxy CA" -d ~/.pki/nssdb >/dev/null 2&>1 + certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.pki/nssdb < $GNSCERT + fi + + +Index: gnunet-0.10.1-2/contrib/gnunet-gns-import.sh +=================================================================== +--- gnunet-0.10.1-2/contrib/gnunet-gns-import.sh ++++ gnunet-0.10.1-2/contrib/gnunet-gns-import.sh +@@ -25,9 +25,9 @@ + + while getopts "c:" opt; do + case $opt in + c) ++ options="$options -c $OPTARG" +- options+="-c $OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 1 diff -Nru gnunet-0.10.1/debian/patches/series gnunet-0.10.1/debian/patches/series --- gnunet-0.10.1/debian/patches/series 2014-10-15 21:41:21.000000000 +0200 +++ gnunet-0.10.1/debian/patches/series 2014-12-20 09:44:17.000000000 +0100 @@ -3,3 +3,4 @@ typos.diff noinst_set.diff kfreebsd_malloc_np.patch +fix-bashism.patch
