Subject: Re: pkg/32761: update pkgsrc/security/gpgme to 1.1.0
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Thomas Klausner <wiz@NetBSD.org>
List: pkgsrc-bugs
Date: 02/25/2006 12:55:02
The following reply was made to PR pkg/32761; it has been noted by GNATS.

From: Thomas Klausner <wiz@NetBSD.org>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: pkg/32761: update pkgsrc/security/gpgme to 1.1.0
Date: Sat, 25 Feb 2006 13:50:01 +0100

 --lildS9pRFgpM/xzO
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Tue, Feb 07, 2006 at 12:20:00AM +0000, ggm@pobox.com wrote:
 > >Number:         32761
 > >Category:       pkg
 > >Synopsis:       update to security/gpgme to 1.1.0
 
 You removed quite a number of patches without commenting on it.
 Attached is a diff including all current pkgsrc patches.
 
 Could you please comment on why you would remove the patches?
 
 Thanks,
  Thomas
 
 --lildS9pRFgpM/xzO
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="gpgme.diff"
 
 ? log
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/Makefile,v
 retrieving revision 1.39
 diff -u -r1.39 Makefile
 --- Makefile	11 Feb 2006 14:11:07 -0000	1.39
 +++ Makefile	25 Feb 2006 12:48:31 -0000
 @@ -1,8 +1,7 @@
  # $NetBSD: Makefile,v 1.39 2006/02/11 14:11:07 joerg Exp $
  #
  
 -DISTNAME=	gpgme-1.0.3
 -PKGREVISION=	2
 +DISTNAME=	gpgme-1.1.0
  CATEGORIES=	security
  MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/ \
  		ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
 @@ -11,7 +10,7 @@
  HOMEPAGE=	http://www.gnupg.org/gpgme.html
  COMMENT=	GnuPG Made Easy
  
 -DEPENDS+=		gnupg>=1.2.2:../../security/gnupg
 +DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
  
  USE_LIBTOOL=		YES
  GNU_CONFIGURE=		YES
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/distinfo,v
 retrieving revision 1.21
 diff -u -r1.21 distinfo
 --- distinfo	11 Feb 2006 14:11:07 -0000	1.21
 +++ distinfo	25 Feb 2006 12:48:31 -0000
 @@ -1,14 +1,14 @@
 -$NetBSD: distinfo,v 1.21 2006/02/11 14:11:07 joerg Exp $
 +$NetBSD: distinfo,v 1.20 2005/11/04 17:16:34 joerg Exp $
  
 -SHA1 (gpgme-1.0.3.tar.gz) = 632436ff5c66405d9704983411aa031f29006dce
 -RMD160 (gpgme-1.0.3.tar.gz) = cc8dc465c733eea8d7f0297127f9f97dd0876a53
 -Size (gpgme-1.0.3.tar.gz) = 837866 bytes
 +SHA1 (gpgme-1.1.0.tar.gz) = 2b4f6a8eb4bbc3bc8ad049840c8cbe695ad379f9
 +RMD160 (gpgme-1.1.0.tar.gz) = f29903597e74ae637001a73ba9ae4cfd20802bf2
 +Size (gpgme-1.1.0.tar.gz) = 862122 bytes
  SHA1 (patch-aa) = 3a9d2d9de847b2c763ab23d0af32064dee9d20c5
 -SHA1 (patch-ab) = c47b732622deaa2eb3269d7ae753ab553c4fa54e
 -SHA1 (patch-ac) = 1f27efa0a5c109c7a8b4f4e346487a5d2f8b26f2
 -SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426
 -SHA1 (patch-af) = 9945bd0ed5f999509b8a8684233286b2183009e8
 +SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
 +SHA1 (patch-ac) = ad952491ace59bcdd522de489200cad33dddfe42
 +SHA1 (patch-ae) = f2b77e5f72ecae72f869afe968f77fb0f0d84c3f
 +SHA1 (patch-af) = 09887ffbdfd66a54c04e6e1983c1a9232f575df1
  SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
 -SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e
 -SHA1 (patch-ai) = 5b7958ef6ed51936e948451e03dd835c1b90414c
 -SHA1 (patch-aj) = 372136250ffea3e0db9d86859544b5d22a9782e6
 +SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3
 +SHA1 (patch-ai) = 95d0b8d0ade54722fff4bcd25bba1370fc80eea4
 +SHA1 (patch-aj) = 65ee755510efa9ddd52a8b28f474db7197fbba53
 Index: patches/patch-ab
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ab,v
 retrieving revision 1.3
 diff -u -r1.3 patch-ab
 --- patches/patch-ab	6 Nov 2004 17:40:15 -0000	1.3
 +++ patches/patch-ab	25 Feb 2006 12:48:31 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ab,v 1.3 2004/11/06 17:40:15 jmmv Exp $
  
 ---- tests/gpg/mkdemodirs.orig	2001-11-22 04:01:26.000000000 +0100
 +--- tests/gpg/mkdemodirs.orig	2005-09-08 14:42:32.000000000 +0000
  +++ tests/gpg/mkdemodirs
 -@@ -2,7 +2,7 @@
 +@@ -19,7 +19,7 @@
   
   set -e
   
 @@ -11,7 +11,7 @@
   NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
          Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
          Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'
 -@@ -25,7 +25,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name
 +@@ -42,7 +42,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name
   echo -n "Creating:"
   for name in $NAMES; do
       echo -n " $name"
 Index: patches/patch-ac
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ac,v
 retrieving revision 1.4
 diff -u -r1.4 patch-ac
 --- patches/patch-ac	4 Nov 2005 17:16:34 -0000	1.4
 +++ patches/patch-ac	25 Feb 2006 12:48:31 -0000
 @@ -1,9 +1,9 @@
 -$NetBSD: patch-ac,v 1.4 2005/11/04 17:16:34 joerg Exp $
 +$NetBSD$
  
 ---- configure.orig	2004-10-22 12:52:27.000000000 -0600
 +--- configure.orig	2005-10-01 21:13:49.000000000 +0000
  +++ configure
 -@@ -19726,12 +19726,12 @@ _ACEOF
 - 	  CFLAGS="$CFLAGS $PTH_CFLAGS"
 +@@ -19878,12 +19878,12 @@ _ACEOF
 + 
   	fi
   	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
  -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
 @@ -17,7 +17,7 @@
   cat >conftest.$ac_ext <<_ACEOF
   /* confdefs.h.  */
   _ACEOF
 -@@ -19839,7 +19839,7 @@ fi
 +@@ -20019,7 +20019,7 @@ fi
   
   # Checks for header files.
   
 @@ -26,7 +26,7 @@
   do
   as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
   if eval "test \"\${$as_ac_Header+set}\" = set"; then
 -@@ -22011,7 +22011,7 @@ esac
 +@@ -22190,7 +22190,7 @@ esac
   fi
   GPGSM=$ac_cv_path_GPGSM
   
 Index: patches/patch-ae
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ae,v
 retrieving revision 1.2
 diff -u -r1.2 patch-ae
 --- patches/patch-ae	4 Nov 2004 20:41:21 -0000	1.2
 +++ patches/patch-ae	25 Feb 2006 12:48:31 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ae,v 1.2 2004/11/04 20:41:21 shannonjr Exp $
  
 ---- gpgme/engine-gpgsm.c.orig	2004-10-22 12:29:21.000000000 -0600
 +--- gpgme/engine-gpgsm.c.orig	2005-10-01 20:14:48.000000000 +0000
  +++ gpgme/engine-gpgsm.c
 -@@ -27,6 +27,9 @@
 +@@ -30,6 +30,9 @@
   #include <sys/types.h>
   #include <assert.h>
   #include <unistd.h>
 @@ -12,7 +12,7 @@
   #include <locale.h>
   #include <fcntl.h> /* FIXME */
   #include <errno.h>
 -@@ -452,7 +455,8 @@ gpgsm_new (void **engine, const char *lc
 +@@ -457,7 +460,8 @@ gpgsm_new (void **engine, const char *fi
   
     if (isatty (1))
       {
 Index: patches/patch-af
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-af,v
 retrieving revision 1.4
 diff -u -r1.4 patch-af
 --- patches/patch-af	7 Nov 2004 13:18:16 -0000	1.4
 +++ patches/patch-af	25 Feb 2006 12:48:31 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-af,v 1.4 2004/11/07 13:18:16 jmmv Exp $
  
 ---- gpgme/get-env.c.orig	2003-09-13 19:45:04.000000000 +0200
 +--- gpgme/get-env.c.orig	2005-09-08 14:42:31.000000000 +0000
  +++ gpgme/get-env.c
 -@@ -21,6 +21,9 @@
 +@@ -22,6 +22,9 @@
   #include <config.h>
   #endif
   #include <stdlib.h>
 @@ -12,7 +12,7 @@
   #include <errno.h>
   #include <string.h>
   
 -@@ -52,7 +55,26 @@ _gpgme_getenv (const char *name, char **
 +@@ -53,7 +56,26 @@ _gpgme_getenv (const char *name, char **
   
   #else
   
 Index: patches/patch-ah
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ah,v
 retrieving revision 1.1
 diff -u -r1.1 patch-ah
 --- patches/patch-ah	4 Nov 2004 20:41:21 -0000	1.1
 +++ patches/patch-ah	25 Feb 2006 12:48:31 -0000
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ah,v 1.1 2004/11/04 20:41:21 shannonjr Exp $
  
 ---- gpgme/error.c.orig	2003-09-30 13:36:20.000000000 -0600
 +--- gpgme/error.c.orig	2005-09-08 14:42:31.000000000 +0000
  +++ gpgme/error.c
 -@@ -21,6 +21,10 @@
 +@@ -22,6 +22,10 @@
   #include <config.h>
   #endif
   
 @@ -13,7 +13,7 @@
   #include <gpgme.h>
   
   /* Return a pointer to a string containing a description of the error
 -@@ -42,7 +46,7 @@ gpgme_strerror (gpgme_error_t err)
 +@@ -43,7 +47,7 @@ gpgme_strerror (gpgme_error_t err)
   int
   gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen)
   {
 Index: patches/patch-ai
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ai,v
 retrieving revision 1.1
 diff -u -r1.1 patch-ai
 --- patches/patch-ai	6 Nov 2004 17:40:15 -0000	1.1
 +++ patches/patch-ai	25 Feb 2006 12:48:31 -0000
 @@ -1,13 +1,13 @@
 -$NetBSD: patch-ai,v 1.1 2004/11/06 17:40:15 jmmv Exp $
 +$NetBSD$
  
 ---- tests/gpg/Makefile.in.orig	2004-10-22 20:52:26.000000000 +0200
 -+++ tests/gpg/Makefile.in
 -@@ -732,7 +732,7 @@ all-local: ./pubring.gpg
 - 	$(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg
 +--- tests/gpg/Makefile.in.orig	2005-10-02 07:13:46.000000000 +1000
 ++++ tests/gpg/Makefile.in	2006-01-31 15:50:43.000000000 +1000
 +@@ -764,7 +764,7 @@
 + 		--import Alpha/Secret.gpg Zulu/Secret.gpg
   
   ./Alpha/Secret.gpg: secdemo.asc 
  -	srcdir=$(srcdir) $(srcdir)/mkdemodirs 
  +	srcdir=$(srcdir) GPG=$(GPG) $(srcdir)/mkdemodirs 
 - # Tell versions [3.59,3.63) of GNU make to not export all variables.
 - # Otherwise a system limit (for SysV at least) may be exceeded.
 - .NOEXPORT:
 + 
 + ./gpg.conf:
 + # This is required for t-sig-notations.
 Index: patches/patch-aj
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-aj,v
 retrieving revision 1.1
 diff -u -r1.1 patch-aj
 --- patches/patch-aj	4 Nov 2005 17:16:34 -0000	1.1
 +++ patches/patch-aj	25 Feb 2006 12:48:31 -0000
 @@ -1,13 +1,13 @@
 -$NetBSD: patch-aj,v 1.1 2005/11/04 17:16:34 joerg Exp $
 +$NetBSD$
  
 ---- gpgme/Makefile.in.orig	2005-11-02 14:59:53.000000000 +0000
 -+++ gpgme/Makefile.in
 -@@ -350,7 +350,7 @@ libgpgme_pthread_la_DEPENDENCIES = libgp
 +--- gpgme/Makefile.in.orig	2005-10-02 07:13:45.000000000 +1000
 ++++ gpgme/Makefile.in	2006-01-31 15:52:16.000000000 +1000
 +@@ -346,7 +346,7 @@
   	@LTLIBOBJS@ $(srcdir)/libgpgme.vers
   
   libgpgme_pthread_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \
  -	-lpthread @GPG_ERROR_LIBS@
  +	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@
   
 + libgpgme_pth_la_CFLAGS = $(AM_CFLAGS) @PTH_CFLAGS@
   libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@
 - libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
 
 --lildS9pRFgpM/xzO--