From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 22 08:10:02 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFEE710656D5 for ; Mon, 22 Jun 2009 08:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A61668FC32 for ; Mon, 22 Jun 2009 08:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5M8A2up077252 for ; Mon, 22 Jun 2009 08:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5M8A2HR077251; Mon, 22 Jun 2009 08:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 22 Jun 2009 08:10:02 GMT Resent-Message-Id: <200906220810.n5M8A2HR077251@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F849106566C for ; Mon, 22 Jun 2009 08:03:40 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.221.173]) by mx1.freebsd.org (Postfix) with ESMTP id 0C3AF8FC14 for ; Mon, 22 Jun 2009 08:03:39 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: by qyk3 with SMTP id 3so3587758qyk.3 for ; Mon, 22 Jun 2009 01:03:38 -0700 (PDT) Received: by 10.224.54.129 with SMTP id q1mr4637887qag.218.1245657818587; Mon, 22 Jun 2009 01:03:38 -0700 (PDT) Received: from mocha.verizon.net (c-24-3-41-151.hsd1.oh.comcast.net [24.3.41.151]) by mx.google.com with ESMTPS id 2sm1278178qwi.3.2009.06.22.01.03.37 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 22 Jun 2009 01:03:37 -0700 (PDT) Message-Id: <4a3f3ad9.02c3f10a.71bc.012a@mx.google.com> Date: Mon, 22 Jun 2009 01:03:37 -0700 (PDT) From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/135911: [MAINTAINER] security/gpgme: Update to version 1.2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2009 08:10:03 -0000 >Number: 135911 >Category: ports >Synopsis: [MAINTAINER] security/gpgme: Update to version 1.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jun 22 08:10:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 7.2-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Mon May 4 04:03:46 EDT 2009 root@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA7 i386 KDE 4.2.4 >Description: - Update security/gpgme to version 1.2.0. - Shared library version bump from libgpgme*.so.17 -> libgpgme*.so.18. - Use smaller bz2 distfiles instead - Mark MAKE_JOBS_SAFE Note: Changes to library were mostly additional functions, so there shouldn't be any compatibility troubles. I build-tested all ports that require gpgme by default with no issues. I also run-tested the library with kdepimlibs-4.2.4 and kdepim-4.2.4 with success. >How-To-Repeat: Use attached diff to update the security/gpgme port. The following ports depend on security/gpgme and need a PORTREVISION bump: deskutils/basket deskutils/kdepim3 deskutils/kdepim4 deskutils/kdepimlibs4 devel/bazaar finance/qhacc mail/balsa mail/claws-mail mail/mutt-devel mail/sylpheed mail/sylpheed2 net-im/ayttm net-im/centericq net-im/centerim net-im/centerim-devel net-im/mcabber security/gpa security/openvas-libnasl security/pecl-gnupg security/py-pyme security/seahorse Some of the above ports specifically reference gpgme.17 and need to be updated to gpgme.18; they are: deskutils/basket devel/bazaar finance/qhacc mail/balsa mail/sylpheed mail/sylpheed2 net-im/ayttm net-im/centericq net-im/centerim net-im/centerim-devel net-im/mcabber security/openvas-libnasl security/pecl-gnupg security/seahorse >Fix: --- 2009-06-22-gpgme.diff begins here --- diff -ruN gpgme.orig/Makefile gpgme/Makefile --- gpgme.orig/Makefile 2009-06-20 02:32:16.000000000 -0400 +++ gpgme/Makefile 2009-06-22 02:54:23.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= gpgme -PORTVERSION= 1.1.8 +PORTVERSION= 1.2.0 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gpgme @@ -18,9 +18,11 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error +USE_BZIP2= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/gpgme diff -ruN gpgme.orig/distinfo gpgme/distinfo --- gpgme.orig/distinfo 2009-06-20 02:32:16.000000000 -0400 +++ gpgme/distinfo 2009-06-22 02:35:58.000000000 -0400 @@ -1,6 +1,6 @@ -MD5 (gpgme-1.1.8.tar.gz) = 1f500e7b4e81fcc76b901f1249ec09fc -SHA256 (gpgme-1.1.8.tar.gz) = a7f276a6d21b9fef471a3c734d8be5a04ba8364a4d239e437aa137ce18b0afd8 -SIZE (gpgme-1.1.8.tar.gz) = 1085576 -MD5 (gpgme-1.1.8.tar.gz.sig) = c13869d91ba266fd06f4d6be9ed1d7ee -SHA256 (gpgme-1.1.8.tar.gz.sig) = 7c8a3e1f36e82f78881ef6fee32b682cf608a67ae32de632aac722680fe47f4e -SIZE (gpgme-1.1.8.tar.gz.sig) = 315 +MD5 (gpgme-1.2.0.tar.bz2) = 508ee686bd275d908d1dc1938810e045 +SHA256 (gpgme-1.2.0.tar.bz2) = c4ba555ea795a42061f0b03fffe22b3f1cb22fcdbcc0bbbeb0419e59b04ef801 +SIZE (gpgme-1.2.0.tar.bz2) = 845063 +MD5 (gpgme-1.2.0.tar.bz2.sig) = ead07c74f6b82fe77ca632c69897c562 +SHA256 (gpgme-1.2.0.tar.bz2.sig) = 267d6f05d81da2f86c3b34d193cd86ea8ffcdf9b560cc09f6cfec680cd1fac92 +SIZE (gpgme-1.2.0.tar.bz2.sig) = 315 diff -ruN gpgme.orig/files/patch-src-Makefile.in gpgme/files/patch-src-Makefile.in --- gpgme.orig/files/patch-src-Makefile.in 2009-06-20 02:32:16.000000000 -0400 +++ gpgme/files/patch-src-Makefile.in 2009-06-20 03:12:56.000000000 -0400 @@ -1,13 +1,14 @@ ---- ./src/Makefile.in.orig 2009-01-22 19:07:22.000000000 -0500 -+++ ./src/Makefile.in 2009-01-22 19:07:35.000000000 -0500 -@@ -130,13 +130,43 @@ - engine-gpgconf.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \ - posix-sema.c posix-io.c w32-util.c w32-sema.c debug.c debug.h \ - gpgme.c version.c error.c ath-pth.c w32-io.c +--- ./src/Makefile.in.orig 2009-06-20 02:58:28.000000000 -0400 ++++ ./src/Makefile.in 2009-06-20 02:58:43.000000000 -0400 +@@ -131,13 +129,45 @@ + sema.h priv-io.h ath.h posix-util.c posix-sema.c posix-io.c \ + w32-util.c w32-sema.c dirinfo.c debug.c debug.h gpgme.c \ + version.c error.c ath-pth.c w32-io.c -@HAVE_DOSISH_SYSTEM_TRUE@am__objects_5 = w32-io.lo -am_libgpgme_pth_la_OBJECTS = $(am__objects_4) ath-pth.lo \ - $(am__objects_5) -+@HAVE_GPGSM_TRUE@am__objects_5 = libgpgme_pth_la-engine-gpgsm.lo ++@HAVE_GPGSM_TRUE@am__objects_5 = libgpgme_pth_la-engine-gpgsm.lo \ ++@HAVE_GPGSM_TRUE@ libgpgme_pth_la-engine-assuan.lo +@HAVE_GPGCONF_TRUE@am__objects_6 = libgpgme_pth_la-engine-gpgconf.lo +@HAVE_DOSISH_SYSTEM_FALSE@am__objects_7 = \ +@HAVE_DOSISH_SYSTEM_FALSE@ libgpgme_pth_la-posix-util.lo \ @@ -32,9 +33,10 @@ + libgpgme_pth_la-import.lo libgpgme_pth_la-export.lo \ + libgpgme_pth_la-genkey.lo libgpgme_pth_la-delete.lo \ + libgpgme_pth_la-edit.lo libgpgme_pth_la-getauditlog.lo \ -+ libgpgme_pth_la-engine.lo libgpgme_pth_la-rungpg.lo \ -+ $(am__objects_5) $(am__objects_6) libgpgme_pth_la-gpgconf.lo \ -+ $(am__objects_7) libgpgme_pth_la-debug.lo \ ++ libgpgme_pth_la-opassuan.lo libgpgme_pth_la-engine.lo \ ++ libgpgme_pth_la-engine-gpg.lo $(am__objects_5) \ ++ $(am__objects_6) libgpgme_pth_la-gpgconf.lo $(am__objects_7) \ ++ libgpgme_pth_la-dirinfo.lo libgpgme_pth_la-debug.lo \ + libgpgme_pth_la-gpgme.lo libgpgme_pth_la-version.lo \ + libgpgme_pth_la-error.lo +@HAVE_DOSISH_SYSTEM_TRUE@am__objects_9 = libgpgme_pth_la-w32-io.lo @@ -47,12 +49,12 @@ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgpgme_pth_la_CFLAGS) \ + $(CFLAGS) $(libgpgme_pth_la_LDFLAGS) $(LDFLAGS) -o $@ @HAVE_PTH_TRUE@am_libgpgme_pth_la_rpath = -rpath $(libdir) - am__libgpgme_pthread_la_SOURCES_DIST = gpgme.h util.h conversion.c \ - get-env.c context.h ops.h data.h data.c data-fd.c \ -@@ -150,8 +180,9 @@ - engine-gpgconf.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \ - posix-sema.c posix-io.c w32-util.c w32-sema.c debug.c debug.h \ - gpgme.c version.c error.c ath-pthread.c w32-io.c + am__libgpgme_pthread_la_SOURCES_DIST = util.h conversion.c get-env.c \ + context.h ops.h data.h data.c data-fd.c data-stream.c \ +@@ -152,8 +182,9 @@ + sema.h priv-io.h ath.h posix-util.c posix-sema.c posix-io.c \ + w32-util.c w32-sema.c dirinfo.c debug.c debug.h gpgme.c \ + version.c error.c ath-pthread.c w32-io.c +@HAVE_DOSISH_SYSTEM_TRUE@am__objects_10 = w32-io.lo am_libgpgme_pthread_la_OBJECTS = $(am__objects_4) ath-pthread.lo \ - $(am__objects_5) @@ -60,24 +62,16 @@ libgpgme_pthread_la_OBJECTS = $(am_libgpgme_pthread_la_OBJECTS) libgpgme_pthread_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -189,7 +220,7 @@ +@@ -192,7 +223,7 @@ engine-gpgconf.c gpgconf.c sema.h priv-io.h ath.h posix-util.c \ - posix-sema.c posix-io.c w32-util.c w32-sema.c debug.c debug.h \ - gpgme.c version.c error.c ath.c w32-io.c + posix-sema.c posix-io.c w32-util.c w32-sema.c dirinfo.c \ + debug.c debug.h gpgme.c version.c error.c ath.c w32-io.c -am_libgpgme_la_OBJECTS = $(am__objects_4) ath.lo $(am__objects_5) +am_libgpgme_la_OBJECTS = $(am__objects_4) ath.lo $(am__objects_10) libgpgme_la_OBJECTS = $(am_libgpgme_la_OBJECTS) libgpgme_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -375,6 +406,7 @@ - srcdir = @srcdir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - -@@ -459,10 +491,10 @@ +@@ -465,10 +498,10 @@ # We use a global CFLAGS and CPPFLAGS setting for all library # versions, because then every object file is only compiled once. @@ -90,7 +84,7 @@ @HAVE_W32_SYSTEM_TRUE@LTRCCOMPILE = $(LIBTOOL) --mode=compile $(RC) \ @HAVE_W32_SYSTEM_TRUE@ `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \ @HAVE_W32_SYSTEM_TRUE@ sed -e 's/-I/--include-dir /g;s/-D/--define /g'` -@@ -496,6 +528,7 @@ +@@ -502,6 +535,7 @@ libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \ -lpthread @GPG_ERROR_LIBS@ @NETLIBS@ @@ -98,7 +92,7 @@ libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \ $(libgpgme_version_script_cmd) -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ -@@ -668,7 +701,6 @@ +@@ -674,7 +708,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ttyname_r.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Plo@am__quote@ @@ -106,7 +100,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath-pthread.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ath.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conversion.Plo@am__quote@ -@@ -700,6 +732,55 @@ +@@ -709,6 +742,58 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdpipeiodevice.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keylist.Plo@am__quote@ @@ -122,9 +116,12 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-decrypt-verify.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-decrypt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-delete.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-dirinfo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-edit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-encrypt-sign.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-encrypt.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-assuan.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine-gpgsm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-engine.Plo@am__quote@ @@ -139,12 +136,12 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-key.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-keylist.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-op-support.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-opassuan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-passphrase.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-sema.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-posix-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-progress.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-rungpg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-sig-notation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-sign.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-signers.Plo@am__quote@ @@ -160,9 +157,9 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-wait-user.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpgme_pth_la-wait.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/op-support.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opassuan.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/passphrase.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix-io.Plo@am__quote@ -@@ -745,6 +826,349 @@ +@@ -754,6 +839,370 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -397,6 +394,13 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-getauditlog.lo `test -f 'getauditlog.c' || echo '$(srcdir)/'`getauditlog.c + ++libgpgme_pth_la-opassuan.lo: opassuan.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-opassuan.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-opassuan.Tpo -c -o libgpgme_pth_la-opassuan.lo `test -f 'opassuan.c' || echo '$(srcdir)/'`opassuan.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-opassuan.Tpo $(DEPDIR)/libgpgme_pth_la-opassuan.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='opassuan.c' object='libgpgme_pth_la-opassuan.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-opassuan.lo `test -f 'opassuan.c' || echo '$(srcdir)/'`opassuan.c ++ +libgpgme_pth_la-engine.lo: engine.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine.Tpo -c -o libgpgme_pth_la-engine.lo `test -f 'engine.c' || echo '$(srcdir)/'`engine.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine.Tpo $(DEPDIR)/libgpgme_pth_la-engine.Plo @@ -404,12 +408,12 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine.lo `test -f 'engine.c' || echo '$(srcdir)/'`engine.c + -+libgpgme_pth_la-rungpg.lo: rungpg.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-rungpg.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-rungpg.Tpo -c -o libgpgme_pth_la-rungpg.lo `test -f 'rungpg.c' || echo '$(srcdir)/'`rungpg.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-rungpg.Tpo $(DEPDIR)/libgpgme_pth_la-rungpg.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rungpg.c' object='libgpgme_pth_la-rungpg.lo' libtool=yes @AMDEPBACKSLASH@ ++libgpgme_pth_la-engine-gpg.lo: engine-gpg.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-gpg.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-gpg.Tpo -c -o libgpgme_pth_la-engine-gpg.lo `test -f 'engine-gpg.c' || echo '$(srcdir)/'`engine-gpg.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine-gpg.Tpo $(DEPDIR)/libgpgme_pth_la-engine-gpg.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='engine-gpg.c' object='libgpgme_pth_la-engine-gpg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-rungpg.lo `test -f 'rungpg.c' || echo '$(srcdir)/'`rungpg.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-gpg.lo `test -f 'engine-gpg.c' || echo '$(srcdir)/'`engine-gpg.c + +libgpgme_pth_la-engine-gpgsm.lo: engine-gpgsm.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-gpgsm.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-gpgsm.Tpo -c -o libgpgme_pth_la-engine-gpgsm.lo `test -f 'engine-gpgsm.c' || echo '$(srcdir)/'`engine-gpgsm.c @@ -418,6 +422,13 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-gpgsm.lo `test -f 'engine-gpgsm.c' || echo '$(srcdir)/'`engine-gpgsm.c + ++libgpgme_pth_la-engine-assuan.lo: engine-assuan.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-assuan.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-assuan.Tpo -c -o libgpgme_pth_la-engine-assuan.lo `test -f 'engine-assuan.c' || echo '$(srcdir)/'`engine-assuan.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine-assuan.Tpo $(DEPDIR)/libgpgme_pth_la-engine-assuan.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='engine-assuan.c' object='libgpgme_pth_la-engine-assuan.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-engine-assuan.lo `test -f 'engine-assuan.c' || echo '$(srcdir)/'`engine-assuan.c ++ +libgpgme_pth_la-engine-gpgconf.lo: engine-gpgconf.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-engine-gpgconf.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Tpo -c -o libgpgme_pth_la-engine-gpgconf.lo `test -f 'engine-gpgconf.c' || echo '$(srcdir)/'`engine-gpgconf.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Tpo $(DEPDIR)/libgpgme_pth_la-engine-gpgconf.Plo @@ -467,6 +478,13 @@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-w32-sema.lo `test -f 'w32-sema.c' || echo '$(srcdir)/'`w32-sema.c + ++libgpgme_pth_la-dirinfo.lo: dirinfo.c ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-dirinfo.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-dirinfo.Tpo -c -o libgpgme_pth_la-dirinfo.lo `test -f 'dirinfo.c' || echo '$(srcdir)/'`dirinfo.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-dirinfo.Tpo $(DEPDIR)/libgpgme_pth_la-dirinfo.Plo ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dirinfo.c' object='libgpgme_pth_la-dirinfo.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -c -o libgpgme_pth_la-dirinfo.lo `test -f 'dirinfo.c' || echo '$(srcdir)/'`dirinfo.c ++ +libgpgme_pth_la-debug.lo: debug.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpgme_pth_la_CFLAGS) $(CFLAGS) -MT libgpgme_pth_la-debug.lo -MD -MP -MF $(DEPDIR)/libgpgme_pth_la-debug.Tpo -c -o libgpgme_pth_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libgpgme_pth_la-debug.Tpo $(DEPDIR)/libgpgme_pth_la-debug.Plo diff -ruN gpgme.orig/pkg-plist gpgme/pkg-plist --- gpgme.orig/pkg-plist 2009-06-20 02:32:16.000000000 -0400 +++ gpgme/pkg-plist 2009-06-21 00:28:13.000000000 -0400 @@ -1,21 +1,21 @@ bin/gpgme-config include/gpgme/gpgme.h -%%WITH_PTH%%lib/libgpgme-pth.a -%%WITH_PTH%%lib/libgpgme-pth.la -%%WITH_PTH%%lib/libgpgme-pth.so -%%WITH_PTH%%lib/libgpgme-pth.so.17 lib/common-lisp/gpgme/gpgme-package.lisp lib/common-lisp/gpgme/gpgme.asd lib/common-lisp/gpgme/gpgme.lisp +%%WITH_PTH%%lib/libgpgme-pth.a +%%WITH_PTH%%lib/libgpgme-pth.la +%%WITH_PTH%%lib/libgpgme-pth.so +%%WITH_PTH%%lib/libgpgme-pth.so.18 lib/libgpgme-pthread.a lib/libgpgme-pthread.la lib/libgpgme-pthread.so -lib/libgpgme-pthread.so.17 +lib/libgpgme-pthread.so.18 lib/libgpgme.a lib/libgpgme.la lib/libgpgme.so -lib/libgpgme.so.17 +lib/libgpgme.so.18 share/aclocal/gpgme.m4 -@dirrm include/gpgme @dirrm lib/common-lisp/gpgme @dirrmtry lib/common-lisp +@dirrm include/gpgme --- 2009-06-22-gpgme.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: