[Pkg-gnupg-commit] r171 - in /gnupg/trunk/debian: ./ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Fri Jan 22 02:19:20 UTC 2010
Author: dleidert-guest
Date: Fri Jan 22 02:19:20 2010
New Revision: 171
URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=171
Log:
* debian/control (Description): Added note about gnupg2 (closes: #566081).
* debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch:
Added.
- g10/sig-check.c (do_check_messages): Evaluate the HAS_EXPIRED flag to
fix missing status line signature verification done with a subkey while
on the main key has expired (closes: #489225).
* debian/patches/551709_fix_info_link_entry.dpatch: Added.
- doc/gnupg1.texi, gnupg1.info: Fix direntry (closes: #551709).
* debian/patches/553175_document_primary_uid_sign.dpatch: Added.
- doc/gpg.texi: Document the primary user id sign in --edit-key mode
(closes: #553175).
* debian/patches/560692_fix_fatal_after_homedir_creation.dpatch: Added.
- g10/tdbio.c (tdbio_set_dbname): Fix a mistaken fatal error after homedir
creation (closes: #560692).
* debian/patches/560995_fix_ftbfs_on_sparc64.dpatch: Added.
- mpi/config.links: Fix FTBFS on sparc64, where it tries to use SPARC32
assembly code (closes: #560995).
* debian/patches/00list: Adjusted.
Added:
gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch (with props)
gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch (with props)
gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch (with props)
gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch (with props)
gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch (with props)
Modified:
gnupg/trunk/debian/changelog
gnupg/trunk/debian/control
gnupg/trunk/debian/patches/00list
Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=171&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Fri Jan 22 02:19:20 2010
@@ -1,6 +1,23 @@
gnupg (1.4.10-3) UNRELEASED; urgency=low
- *
+ * debian/control (Description): Added note about gnupg2 (closes: #566081).
+ * debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch:
+ Added.
+ - g10/sig-check.c (do_check_messages): Evaluate the HAS_EXPIRED flag to
+ fix missing status line signature verification done with a subkey while
+ on the main key has expired (closes: #489225).
+ * debian/patches/551709_fix_info_link_entry.dpatch: Added.
+ - doc/gnupg1.texi, gnupg1.info: Fix direntry (closes: #551709).
+ * debian/patches/553175_document_primary_uid_sign.dpatch: Added.
+ - doc/gpg.texi: Document the primary user id sign in --edit-key mode
+ (closes: #553175).
+ * debian/patches/560692_fix_fatal_after_homedir_creation.dpatch: Added.
+ - g10/tdbio.c (tdbio_set_dbname): Fix a mistaken fatal error after homedir
+ creation (closes: #560692).
+ * debian/patches/560995_fix_ftbfs_on_sparc64.dpatch: Added.
+ - mpi/config.links: Fix FTBFS on sparc64, where it tries to use SPARC32
+ assembly code (closes: #560995).
+ * debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Fri, 22 Jan 2010 02:05:01 +0100
Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=171&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Fri Jan 22 02:19:20 2010
@@ -24,6 +24,11 @@
It can be used to encrypt data and to create digital signatures.
It includes an advanced key management facility and is compliant
with the proposed OpenPGP Internet standard as described in RFC2440.
+ .
+ GnuPG 1.4 is the standalone, non-modularized series. In contrast to
+ the version 2 series, shipped with the gnupg2 package, it comes
+ with no support for S/MIME and some other tools useful for desktop
+ environments, but also with less dependencies.
.
The gnupg package is built without libcurl. So it does not support
HKPS keyservers. Install the gnupg-curl package if you want to use
Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=171&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Fri Jan 22 02:19:20 2010
@@ -1,1 +1,6 @@
# currently empty
+489225_catch_expired_primary_key_with_valid_subkey
+551709_fix_info_link_entry
+553175_document_primary_uid_sign
+560692_fix_fatal_after_homedir_creation
+560995_fix_ftbfs_on_sparc64
Added: gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch?rev=171&op=file
==============================================================================
--- gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch (added)
+++ gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch Fri Jan 22 02:19:20 2010
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 489225_catch_expired_primary_key_with_valid_subkey.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix missing status line signature verification done with a subkey while
+## DP: on the main key has expired.
+## DP:
+## DP: <URL:http://bugs.debian.org/489225>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1059>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2009-December/008699.html>
+
+ at DPATCH@
+diff -urNad trunk~/g10/sig-check.c trunk/g10/sig-check.c
+--- trunk~/g10/sig-check.c 2009-07-30 13:01:05.000000000 +0200
++++ trunk/g10/sig-check.c 2010-01-22 02:33:27.496061461 +0100
+@@ -209,7 +209,11 @@
+ return G10ERR_TIME_CONFLICT;
+ }
+
+- if( pk->expiredate && pk->expiredate < cur_time ) {
++ /* Check whether the key has expired. We check the has_expired
++ flag which is set after a full evaluation of the key (getkey.c)
++ as well as a simple compare to the current time in case the
++ merge has for whatever reasons not been done. */
++ if (pk->has_expired || (pk->expiredate && pk->expiredate < cur_time)) {
+ char buf[11];
+ if (opt.verbose)
+ log_info(_("NOTE: signature key %s expired %s\n"),
Propchange: gnupg/trunk/debian/patches/489225_catch_expired_primary_key_with_valid_subkey.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch?rev=171&op=file
==============================================================================
--- gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch (added)
+++ gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch Fri Jan 22 02:19:20 2010
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 551709_fix_info_link_entry.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix 'gpg' link which should be 'gnupg1'.
+## DP:
+## DP: <URL:http://bugs.debian.org/551709>
+
+ at DPATCH@
+diff -urNad trunk~/doc/gnupg1.info trunk/doc/gnupg1.info
+--- trunk~/doc/gnupg1.info 2009-09-02 15:50:59.000000000 +0200
++++ trunk/doc/gnupg1.info 2010-01-22 02:49:42.916068194 +0100
+@@ -13,7 +13,7 @@
+
+ INFO-DIR-SECTION GNU Utilities
+ START-INFO-DIR-ENTRY
+-* gpg: (gpg). OpenPGP encryption and signing tool (v1).
++* gpg: (gnupg1). OpenPGP encryption and signing tool (v1).
+ END-INFO-DIR-ENTRY
+
+
+diff -urNad trunk~/doc/gnupg1.texi trunk/doc/gnupg1.texi
+--- trunk~/doc/gnupg1.texi 2008-12-11 17:39:51.000000000 +0100
++++ trunk/doc/gnupg1.texi 2010-01-22 02:49:22.005041865 +0100
+@@ -48,7 +48,7 @@
+
+ @dircategory GNU Utilities
+ @direntry
+-* gpg: (gpg). OpenPGP encryption and signing tool (v1).
++* gpg: (gnupg1). OpenPGP encryption and signing tool (v1).
+ @end direntry
+
+
Propchange: gnupg/trunk/debian/patches/551709_fix_info_link_entry.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch?rev=171&op=file
==============================================================================
--- gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch (added)
+++ gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch Fri Jan 22 02:19:20 2010
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 553175_document_primary_uid_sign.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Document the primary user id sign in --edit-key mode.
+## DP:
+## DP: <URL:http://bugs.debian.org/553175>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1172>
+
+ at DPATCH@
+diff -urNad trunk~/doc/gpg.texi trunk/doc/gpg.texi
+--- trunk~/doc/gpg.texi 2009-09-02 14:31:17.000000000 +0200
++++ trunk/doc/gpg.texi 2010-01-22 02:27:18.888061353 +0100
+@@ -845,7 +845,8 @@
+
+ @c man:.RS
+ The listing shows you the key with its secondary keys and all user
+-ids. Selected keys or user ids are indicated by an asterisk. The trust
++ids. The primary user id is indicated by a dot, and selected keys or
++user ids are indicated by an asterisk. The trust
+ value is displayed with the primary key: the first is the assigned owner
+ trust and the second is the calculated trust value. Letters are used for
+ the values:
Propchange: gnupg/trunk/debian/patches/553175_document_primary_uid_sign.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch?rev=171&op=file
==============================================================================
--- gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch (added)
+++ gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch Fri Jan 22 02:19:20 2010
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 560692_fix_fatal_after_homedir_creation.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a mistaken fatal error after creating the home-directory.
+## DP: This can only be seen in a few scenarios.
+## DP:
+## DP: <URL:http://bugs.debian.org/560692>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1169>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2009-December/008688.html>
+
+ at DPATCH@
+diff -urNad trunk~/g10/tdbio.c trunk/g10/tdbio.c
+--- trunk~/g10/tdbio.c 2009-07-23 08:47:35.000000000 +0200
++++ trunk/g10/tdbio.c 2010-01-22 02:21:03.216141400 +0100
+@@ -508,7 +508,8 @@
+ *p = 0;
+ if( access( fname, F_OK ) ) {
+ try_make_homedir( fname );
+- log_fatal( _("%s: directory does not exist!\n"), fname );
++ if (access (fname, F_OK ))
++ log_fatal (_("%s: directory does not exist!\n"), fname);
+ }
+ *p = DIRSEP_C;
+
Propchange: gnupg/trunk/debian/patches/560692_fix_fatal_after_homedir_creation.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch?rev=171&op=file
==============================================================================
--- gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch (added)
+++ gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch Fri Jan 22 02:19:20 2010
@@ -1,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 560995_fix_ftbfs_on_sparc64.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix an FTBFS failure on sparc64, as it tries to use SPARC32 assembly
+## DP: code on SPARC64.
+## DP:
+## DP: <URL:http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560995>
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1171>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2009-December/008669.html>
+
+ at DPATCH@
+diff -urNad trunk~/mpi/config.links trunk/mpi/config.links
+--- trunk~/mpi/config.links 2008-12-11 17:39:43.000000000 +0100
++++ trunk/mpi/config.links 2010-01-22 02:17:22.404037685 +0100
+@@ -124,26 +124,24 @@
+ mpi_extra_modules="udiv-qrnnd"
+ ;;
+ sparc64-*-linux-gnu)
+- # An extra rule because we have an report for this one only.
+- # Should be compared against the next GMP version
+- echo '/* configured for sparc64-*-linux-gnu */' >>./mpi/asm-syntax.h
+- path="sparc32v8 sparc32"
+- mpi_extra_modules="udiv"
+- ;;
++ echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
++ path=""
++ ;;
+ sparc64-sun-solaris2*)
+- # Got a report that udiv is missing, so we try this one
+- echo '/* configured for sparc64-sun-solaris2 */' >>./mpi/asm-syntax.h
+- path="sparc32v8 sparc32"
+- mpi_extra_modules="udiv"
+- ;;
++ echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
++ path=""
++ ;;
+ sparc64-*-netbsd* | sparc64-*-freebsd* | sparc64-*-openbsd*)
+ # There are no sparc64 assembler modules that work on the
+ # *BSDs, so use the generic C functions.
+ echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
+ path=""
+ ;;
++ sparc64*-*-*)
++ echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
++ path=""
++ ;;
+ sparc9*-*-* | \
+- sparc64*-*-* | \
+ ultrasparc*-*-* )
+ echo '/* configured for sparc9 or higher */' >>./mpi/asm-syntax.h
+ path="sparc32v8 sparc32"
Propchange: gnupg/trunk/debian/patches/560995_fix_ftbfs_on_sparc64.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-gnupg-commit
mailing list