diff -u gnupg-1.4.6/debian/control gnupg-1.4.6/debian/control --- gnupg-1.4.6/debian/control +++ gnupg-1.4.6/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: James Troup Standards-Version: 3.7.2.1 -Build-Depends: libz-dev, libldap2-dev, libbz2-dev, libcap-dev, libusb-dev, libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12) +Build-Depends: libz-dev, libldap2-dev, libbz2-dev, libcap-dev, libusb-dev, libreadline5-dev, file, gettext, dpatch, dpkg-dev (>= 1.13.12), libcurl4-gnutls-dev Package: gnupg Architecture: any diff -u gnupg-1.4.6/debian/changelog gnupg-1.4.6/debian/changelog --- gnupg-1.4.6/debian/changelog +++ gnupg-1.4.6/debian/changelog @@ -1,3 +1,19 @@ +gnupg (1.4.6-2ubuntu3) gutsy; urgency=low + + [ Scott Kitterman ] + * Add 'debian/patches/60_install_options_skel.dpatch': Patch to + install options file from upstream (LP: #76983) + * Add 'debian/patches/61_use_agent_default.dpatch': Patch to set gpg + (or gpg2) and gpgsm to use a passphrase agent by default (LP: #15485) + * Add 'debian/patches/70_trust_error.dpatch': Patch to disallow illegal + zero response for trust level changes (LP: #39459) + + [ Michael Bienia ] + * Add libcurl4-gnutls-dev to Build-Depends to fix gpg running into a timeout + updating the keyring (LP: #62864) + + -- Michael Bienia Fri, 06 Jul 2007 20:56:05 +0200 + gnupg (1.4.6-2ubuntu2) gutsy; urgency=low * Add 'debian/patches/50_show_primary_only.dpatch': add diff -u gnupg-1.4.6/debian/patches/00list gnupg-1.4.6/debian/patches/00list --- gnupg-1.4.6/debian/patches/00list +++ gnupg-1.4.6/debian/patches/00list @@ -6,0 +7,3 @@ +60_install_options_skel +61_use_agent_default +70_trust_error only in patch2: unchanged: --- gnupg-1.4.6.orig/debian/patches/60_install_options_skel.dpatch +++ gnupg-1.4.6/debian/patches/60_install_options_skel.dpatch @@ -0,0 +1,74 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_install_options_skel.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Actually install the options file (LP: #76983). + +@DPATCH@ +diff -urNad gnupg-1.4.6~/configure gnupg-1.4.6/configure +--- gnupg-1.4.6~/configure 2006-12-06 09:11:02.000000000 +0000 ++++ gnupg-1.4.6/configure 2007-07-06 18:04:03.000000000 +0000 +@@ -28444,7 +25347,6 @@ + #else + #define G10_LOCALEDIR "${datadir}/locale" + #define GNUPG_LIBDIR "${libdir}/gnupg" +-#define GNUPG_DATADIR "${datadir}/gnupg" + #ifdef __VMS + #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" + #else +diff -urNad gnupg-1.4.6~/configure.ac gnupg-1.4.6/configure.ac +--- gnupg-1.4.6~/configure.ac 2006-12-05 12:17:02.000000000 +0000 ++++ gnupg-1.4.6/configure.ac 2007-07-06 18:03:48.000000000 +0000 +@@ -1348,7 +1348,6 @@ + #else + #define G10_LOCALEDIR "${datadir}/locale" + #define GNUPG_LIBDIR "${libdir}/gnupg" +-#define GNUPG_DATADIR "${datadir}/gnupg" + #ifdef __VMS + #define GNUPG_HOMEDIR "/SYS\$LOGIN/gnupg" + #else +diff -urNad gnupg-1.4.6~/g10/Makefile.am gnupg-1.4.6/g10/Makefile.am +--- gnupg-1.4.6~/g10/Makefile.am 2006-07-24 13:46:26.000000000 +0000 ++++ gnupg-1.4.6/g10/Makefile.am 2007-07-06 18:03:48.000000000 +0000 +@@ -27,6 +27,7 @@ + + if ! HAVE_DOSISH_SYSTEM + AM_CPPFLAGS += -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" ++AM_CPPFLAGS += -DGNUPG_DATADIR="\"$(pkgdatadir)\"" + endif + + needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a +diff -urNad gnupg-1.4.6~/g10/Makefile.in gnupg-1.4.6/g10/Makefile.in +--- gnupg-1.4.6~/g10/Makefile.in 2006-12-06 09:15:28.000000000 +0000 ++++ gnupg-1.4.6/g10/Makefile.in 2007-07-06 18:04:01.000000000 +0000 +@@ -57,7 +57,8 @@ + host_triplet = @host@ + # it seems that we can't use this with automake 1.5 + #OMIT_DEPENDENCIES = zlib.h zconf.h +-@HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" ++@HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\"" \ ++@HAVE_DOSISH_SYSTEM_FALSE@ -DGNUPG_DATADIR="\"$(pkgdatadir)\"" + bin_PROGRAMS = gpg$(EXEEXT) gpgv$(EXEEXT) + subdir = g10 + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog +diff -urNad gnupg-1.4.6~/g10/openfile.c gnupg-1.4.6/g10/openfile.c +--- gnupg-1.4.6~/g10/openfile.c 2006-11-27 15:58:41.000000000 +0000 ++++ gnupg-1.4.6/g10/openfile.c 2007-07-06 18:03:48.000000000 +0000 +@@ -345,7 +345,7 @@ + errno = EPERM; + } + if( !src ) { +- log_error(_("can't open `%s': %s\n"), fname, strerror(errno) ); ++ log_info (_("can't open `%s': %s\n"), fname, strerror(errno) ); + xfree(fname); + return; + } +@@ -360,7 +360,7 @@ + dst = fopen( fname, "w" ); + umask(oldmask); + if( !dst ) { +- log_error(_("can't create `%s': %s\n"), fname, strerror(errno) ); ++ log_info (_("can't create `%s': %s\n"), fname, strerror(errno) ); + fclose( src ); + xfree(fname); + return; only in patch2: unchanged: --- gnupg-1.4.6.orig/debian/patches/61_use_agent_default.dpatch +++ gnupg-1.4.6/debian/patches/61_use_agent_default.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 61_use_agent_default.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use agent by default. (LP: #15485) + +@DPATCH@ +diff -urNad gnupg-1.4.6~/g10/options.skel gnupg-1.4.6/g10/options.skel +--- gnupg-1.4.6~/g10/options.skel 2006-04-12 05:23:40.000000000 -0400 ++++ gnupg-1.4.6/g10/options.skel 2007-07-06 10:59:44.000000000 -0400 +@@ -203,8 +203,12 @@ + # at ftp.gnupg.org/gcrypt/alpha/aegypten/). To make use of the agent, + # you have to run an agent as daemon and use the option + # +-# use-agent +-# ++# For Ubuntu we now use-agent by default to support more automatic ++# use of GPG and S/MIME encryption by GUI programs. Depending on the ++# program, users may still have to manually decide to install gnupg-agent. ++ ++use-agent ++ + # which tries to use the agent but will fallback to the regular mode + # if there is a problem connecting to the agent. The normal way to + # locate the agent is by looking at the environment variable only in patch2: unchanged: --- gnupg-1.4.6.orig/debian/patches/70_trust_error.dpatch +++ gnupg-1.4.6/debian/patches/70_trust_error.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_trust_error.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't allow inavlid trust response. (LP: #39459) + +@DPATCH@ +diff -urNad gnupg-1.4.6~/g10/pkclist.c gnupg-1.4.6/g10/pkclist.c +--- gnupg-1.4.6~/g10/pkclist.c 2006-07-26 06:31:15.000000000 -0400 ++++ gnupg-1.4.6/g10/pkclist.c 2007-07-06 11:06:15.000000000 -0400 +@@ -303,7 +303,7 @@ + did_help = 0; + else if( *p && p[1] ) + ; +- else if( !p[1] && ((*p >= '0'+min_num) && *p <= (mode?'5':'4')) ) ++ else if( !p[1] && ((*p > '0'+min_num) && *p <= (mode?'5':'4')) ) + { + unsigned int trust; + switch( *p )