[Pkg-gnupg-commit] r41 - in /gnupg/trunk/debian: changelog patches/15_free_caps.dpatch patches/16_min_privileges.dpatch patches/24_gpgv_manpage_cleanup.dpatch

Tue Jun 3 22:20:34 UTC 2008

Author: pusling-guest
Date: Tue Jun  3 22:20:34 2008
New Revision: 41

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=41
Log:
Redo patches with dpatch-run instead of big patch blurb in the patches.

Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/patches/15_free_caps.dpatch
    gnupg/trunk/debian/patches/16_min_privileges.dpatch
    gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=41&op=diff
==============================================================================

--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Tue Jun  3 22:20:34 2008
@@ -16,6 +16,7 @@
     - doc/yat2m.c: Backport two fixes from the upstream SVN regarding the
       correct handling of backslahes and fixing the samples output format
       avoiding man-db warnings.
+  * Redo patches with dpatch-run instead of big patch blurb in the patches.
   * Updated and added some tranlations (patch 25*)
     (French: Closes: #394037) (Italian: Closes: #298699)
   * Have gpg suggest libpcsclite1 (Closes: #297253) and a couple of image

Modified: gnupg/trunk/debian/patches/15_free_caps.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/15_free_caps.dpatch?rev=41&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/15_free_caps.dpatch (original)
+++ gnupg/trunk/debian/patches/15_free_caps.dpatch Tue Jun  3 22:20:34 2008
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 15_free_caps.dpatch by  <mpitt at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
@@ -7,24 +7,6 @@
 ## DP: Please note that this approach alone is not safe: when using
 ## DP: USE_CAPABILITIES the root user is not setuid() back any more to a normal
 ## DP: user.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
 
 @DPATCH@
 diff -urNad /home/weasel/tmp/debian-gpg/gnupg-1.2.5/g10/status.c gnupg-1.2.5/g10/status.c

Modified: gnupg/trunk/debian/patches/16_min_privileges.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/16_min_privileges.dpatch?rev=41&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/16_min_privileges.dpatch (original)
+++ gnupg/trunk/debian/patches/16_min_privileges.dpatch Tue Jun  3 22:20:34 2008
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 16_min_privileges.dpatch by  <mpitt at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
@@ -7,24 +7,6 @@
 ## DP: exec(). This patch ensures minimal privileges by immediately revoking
 ## DP: root user and all capabilities except CAP_IPC_LOCK. After the shared
 ## DP: memory is set up, this last capability is dropped as well.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
 
 @DPATCH@
 diff -urNad gnupg-1.4.0/g10/gpg.c /tmp/dpep.O5S02c/gnupg-1.4.0/g10/gpg.c

Modified: gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch?rev=41&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch (original)
+++ gnupg/trunk/debian/patches/24_gpgv_manpage_cleanup.dpatch Tue Jun  3 22:20:34 2008
@@ -1,28 +1,10 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
 ## 24_gpgv_manpage_cleanup.dpatch
 ##
 ## DP: Description: Small fixes for gpgv manpage (#177951)
 ## DP: Author: "Jim W. Jaszewski" <grok at sprint.ca>
 ## DP: Upstream status: Not yet submitted
 ## DP: Date: 2003-01-22
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
 
 @DPATCH@
 diff -urNad gnupg-1.4.6~/doc/gpgv.texi gnupg-1.4.6/doc/gpgv.texi


