Re: pkg/32761: update pkgsrc/security/gpgme to 1.1.0

[George Michaelson <ggm%pobox.com@localhost>]

The following reply was made to PR pkg/32761; it has been noted by GNATS.

From: George Michaelson <ggm%pobox.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: gnats-admin%netbsd.org@localhost
Subject: Re: pkg/32761: update pkgsrc/security/gpgme to 1.1.0
Date: Tue, 28 Mar 2006 13:15:43 +1000

 Hmm. I have no idea why my patch I sent before deleted so much stuff.
 
 I have re-done things using cvs diff and its completely different. Can
 you see if this is a more acceptable set of patches to gpgme?
 
 sorry for the confusion.
 
 -George
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/Makefile,v
 retrieving revision 1.40
 diff -u -p -r1.40 Makefile
 --- Makefile   1 Mar 2006 16:22:20 -0000       1.40
 +++ Makefile   28 Mar 2006 03:13:52 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile,v 1.40 2006/03/01 16:22:20 drochner Exp $
  #
  
 -DISTNAME=     gpgme-1.0.3
 +DISTNAME=     gpgme-1.1.0
  PKGREVISION=  3
  CATEGORIES=   security
  MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ \
 @@ -11,7 +11,7 @@ MAINTAINER=  oishi%ims.ac.jp@localhost
  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.22
 diff -u -p -r1.22 distinfo
 --- distinfo   1 Mar 2006 16:22:21 -0000       1.22
 +++ distinfo   28 Mar 2006 03:13:52 -0000
 @@ -1,14 +1,14 @@
  $NetBSD: distinfo,v 1.22 2006/03/01 16:22:21 drochner 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-ac) = e6a4e36558dd3b821591b0b0e1cbca8b383ef8ab
  SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426
  SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a
  SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
  SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e
 -SHA1 (patch-ai) = 5b7958ef6ed51936e948451e03dd835c1b90414c
 -SHA1 (patch-aj) = 372136250ffea3e0db9d86859544b5d22a9782e6
 +SHA1 (patch-ai) = 4ebbcdf975b093d0c8c3387b023b74fd99708524
 +SHA1 (patch-aj) = 14bd2e6edccfc3c5358b3e58d4c811019b992f8c
 Index: patches/patch-ac
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ac,v
 retrieving revision 1.4
 diff -u -p -r1.4 patch-ac
 --- patches/patch-ac   4 Nov 2005 17:16:34 -0000       1.4
 +++ patches/patch-ac   28 Mar 2006 03:13:52 -0000
 @@ -1,9 +1,7 @@
 -$NetBSD: patch-ac,v 1.4 2005/11/04 17:16:34 joerg Exp $
 -
 ---- configure.orig    2004-10-22 12:52:27.000000000 -0600
 -+++ configure
 -@@ -19726,12 +19726,12 @@ _ACEOF
 -        CFLAGS="$CFLAGS $PTH_CFLAGS"
 +--- configure.orig    2005-10-02 07:13:49.000000000 +1000
 ++++ configure 2006-01-31 15:48:37.000000000 +1000
 +@@ -19878,12 +19878,12 @@
 + 
        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 +15,7 @@ $NetBSD: patch-ac,v 1.4
 2005/11/04 17:16 cat >conftest.$ac_ext <<_ACEOF
   /* confdefs.h.  */
   _ACEOF
 -@@ -19839,7 +19839,7 @@ fi
 +@@ -20019,7 +20019,7 @@
   
   # Checks for header files.
   
 @@ -26,7 +24,7 @@ $NetBSD: patch-ac,v 1.4 2005/11/04 17:16
   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 @@
   fi
   GPGSM=$ac_cv_path_GPGSM
   
 Index: patches/patch-ai
 ===================================================================
 RCS file: /cvsroot/pkgsrc/security/gpgme/patches/patch-ai,v
 retrieving revision 1.1
 diff -u -p -r1.1 patch-ai
 --- patches/patch-ai   6 Nov 2004 17:40:15 -0000       1.1
 +++ patches/patch-ai   28 Mar 2006 03:13:52 -0000
 @@ -1,13 +1,11 @@
 -$NetBSD: patch-ai,v 1.1 2004/11/06 17:40:15 jmmv Exp $
 -
 ---- 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 -p -r1.1 patch-aj
 --- patches/patch-aj   4 Nov 2005 17:16:34 -0000       1.1
 +++ patches/patch-aj   28 Mar 2006 03:13:52 -0000
 @@ -1,13 +1,11 @@
 -$NetBSD: patch-aj,v 1.1 2005/11/04 17:16:34 joerg Exp $
 -
 ---- 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@ \