From bsdkaffee@gmail.com  Mon Jun 22 08:03:40 2009
Return-Path: <bsdkaffee@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F849106566C
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Jun 2009 08:03:39 +0000 (UTC)
	(envelope-from bsdkaffee@gmail.com)
Received: by qyk3 with SMTP id 3so3587758qyk.3
        for <FreeBSD-gnats-submit@freebsd.org>; 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 <bsdkaffee@gmail.com>
Reply-To: Jason E. Hale <bsdkaffee@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] security/gpgme: Update to version 1.2.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         135911
>Category:       ports
>Synopsis:       [MAINTAINER] security/gpgme: Update to version 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 22 08:10:02 UTC 2009
>Closed-Date:    Wed Jul 15 16:52:29 UTC 2009
>Last-Modified:  Wed Jul 15 16:52:29 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Mon Jun 22 12:57:27 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135911 

From: "Schweigert, Udo CERT" <Udo.Schweigert@siemens.com>
To: bug-followup@FreeBSD.org, bsdkaffee@gmail.com
Cc:  
Subject: Re: ports/135911: [MAINTAINER] security/gpgme: Update to version
 1.2.0
Date: Thu, 2 Jul 2009 16:59:43 +0200

 The mail/mutt-devel patch is OK and can be committed.
 
 Regards
 
 Udo

From: "Jason E. Hale" <bsdkaffee@gmail.com>
To: bug-followup@freebsd.org,
 bsdkaffee@gmail.com
Cc:  
Subject: Re: ports/135911: [MAINTAINER] security/gpgme: Update to version 1.2.0
Date: Thu, 2 Jul 2009 16:10:20 -0400

 I thought I would post my patches as a follow-up since discussion regarding this
 new version of gpgme is scattered about various lists and in private emails.
 
 Here is the synopsis:  gpgme 1.2.0 requires that gpgme_check_version()  is
 called before using gpgme_new().  Certain ports do not do this namely:
 deskutils/kdepim3
 deskutils/kdepim4
 deskutils/kdepimlibs4
 devel/bazaar
 finance/qhacc
 mail/mutt-devel
 net-im/ayttm
 net-im/centericq
 net-im/centerim
 net-im/centerim-devel
 security/openvas-libnasl
 
 The patches for deskutils/kde* came from upstream (thanks to makc@) that I 
 reworked into our ports framework.  The rest of the patches I made myself.  I
 did run-test deskutils/kdepim4, finance/qhacc, net-im/ayttm, and net-im/centerim
 the best that I could and they seem fine.
 
 These patches only patch the source files and pkg-plists.  Makefiles still need
 to be updated with PORTREVISON bumps and bumping the shlib version of gpgme.
 
 --- deskutils.kdepim3.patch begins here ---
 diff -ruN kdepim3.orig/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp
 --- kdepim3.orig/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp	1969-12-31 19:00:00.000000000 -0500
 +++ kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp	2009-07-01 19:51:10.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- certmanager/lib/backends/qgpgme/qgpgmebackend.cpp.orig	2009-07-01 19:41:54.000000000 -0400
 ++++ certmanager/lib/backends/qgpgme/qgpgmebackend.cpp	2009-07-01 19:42:25.000000000 -0400
 +@@ -54,7 +54,7 @@
 +     mOpenPGPProtocol( 0 ),
 +     mSMIMEProtocol( 0 )
 + {
 +-
 ++  GpgME::initializeLibrary();
 + }
 + 
 + Kleo::QGpgMEBackend::~QGpgMEBackend() {
 diff -ruN kdepim3.orig/files/patch-libkdenetwork-gpgmepp-Makefile.in kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in
 --- kdepim3.orig/files/patch-libkdenetwork-gpgmepp-Makefile.in	1969-12-31 19:00:00.000000000 -0500
 +++ kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in	2009-07-01 19:52:28.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- libkdenetwork/gpgmepp/Makefile.in.orig	2009-07-01 19:33:31.000000000 -0400
 ++++ libkdenetwork/gpgmepp/Makefile.in	2009-07-01 19:39:35.000000000 -0400
 +@@ -434,7 +434,7 @@
 + #   (Interfaces added/removed/changed:  CURRENT++, REVISION=0)
 + #   (Interfaces added:                  AGE++)
 + #   (Interfaces removed/changed:        AGE=0)
 +-libgpgme___la_LDFLAGS = -no-undefined -version-info 3:0:3
 ++libgpgme___la_LDFLAGS = -no-undefined -version-info 4:0:4
 + libgpgme___la_LIBADD = $(GPGME_LIBS)
 + libgpgme___la_DEPENDENCIES = $(GPGME_LIBS_DEP)
 + all: all-recursive
 diff -ruN kdepim3.orig/files/patch-libkdenetwork-gpgmepp-context.cpp kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp
 --- kdepim3.orig/files/patch-libkdenetwork-gpgmepp-context.cpp	1969-12-31 19:00:00.000000000 -0500
 +++ kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp	2009-07-01 19:52:05.000000000 -0400
 @@ -0,0 +1,13 @@
 +--- libkdenetwork/gpgmepp/context.cpp.orig	2009-07-01 19:33:09.000000000 -0400
 ++++ libkdenetwork/gpgmepp/context.cpp	2009-07-01 19:35:46.000000000 -0400
 +@@ -53,6 +53,10 @@
 + 
 + namespace GpgME {
 + 
 ++  void initializeLibrary() {
 ++    gpgme_check_version( 0 );
 ++  }
 ++ 
 +   const char * Error::source() const {
 +     return gpgme_strsource( (gpgme_error_t)mErr );
 +   }
 diff -ruN kdepim3.orig/files/patch-libkdenetwork-gpgmepp-context.h kdepim3/files/patch-libkdenetwork-gpgmepp-context.h
 --- kdepim3.orig/files/patch-libkdenetwork-gpgmepp-context.h	1969-12-31 19:00:00.000000000 -0500
 +++ kdepim3/files/patch-libkdenetwork-gpgmepp-context.h	2009-07-01 19:52:16.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- libkdenetwork/gpgmepp/context.h.orig	2009-07-01 19:33:50.000000000 -0400
 ++++ libkdenetwork/gpgmepp/context.h	2009-07-01 19:36:53.000000000 -0400
 +@@ -287,6 +287,8 @@
 +   //
 +   //
 + 
 ++  KDE_EXPORT void initializeLibrary();
 ++
 +   KDE_EXPORT GpgME::Error setDefaultLocale( int category, const char * value );
 + 
 +   KDE_EXPORT Context * wait( GpgME::Error & e, bool hang=true );
 diff -ruN kdepim3.orig/pkg-plist kdepim3/pkg-plist
 --- kdepim3.orig/pkg-plist	2009-07-01 19:21:06.000000000 -0400
 +++ kdepim3/pkg-plist	2009-07-02 15:24:09.000000000 -0400
 @@ -594,7 +594,7 @@
  lib/libgpgme++.a
  lib/libgpgme++.la
  lib/libgpgme++.so
 -lib/libgpgme++.so.3
 +lib/libgpgme++.so.4
  lib/libgwsoap.a
  lib/libgwsoap.la
  lib/libgwsoap.so
 --- deskutils.kdepim3.patch ends here ---
 
 --- deskutils.kdepim4.patch begins here ---
 diff -ruN kdepim4.orig/files/patch-kleopatra-main.cpp kdepim4/files/patch-kleopatra-main.cpp
 --- kdepim4.orig/files/patch-kleopatra-main.cpp	1969-12-31 19:00:00.000000000 -0500
 +++ kdepim4/files/patch-kleopatra-main.cpp	2009-07-01 18:59:31.000000000 -0400
 @@ -0,0 +1,20 @@
 +--- ../kleopatra/main.cpp.orig	2009-07-01 18:44:25.000000000 -0400
 ++++ ../kleopatra/main.cpp	2009-07-01 18:49:26.000000000 -0400
 +@@ -75,6 +75,8 @@
 + #include <QEventLoop>
 + #include <QThreadPool>
 + 
 ++#include <gpgme++/global.h>
 ++
 + #include <boost/shared_ptr.hpp>
 + 
 + #include <cassert>
 +@@ -153,6 +155,8 @@
 +     QTime timer;
 +     timer.start();
 + 
 ++    GpgME::initializeLibrary();
 ++
 +   {
 +       const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
 +       QThreadPool::globalInstance()->setMaxThreadCount( qMax( 2U, threads ) );
 diff -ruN kdepim4.orig/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp
 --- kdepim4.orig/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp	1969-12-31 19:00:00.000000000 -0500
 +++ kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp	2009-07-01 19:00:16.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- ../libkleo/backends/qgpgme/qgpgmebackend.cpp.orig	2009-07-01 18:51:09.000000000 -0400
 ++++ ../libkleo/backends/qgpgme/qgpgmebackend.cpp	2009-07-01 18:57:10.000000000 -0400
 +@@ -280,7 +280,7 @@
 +     mOpenPGPProtocol( 0 ),
 +     mSMIMEProtocol( 0 )
 + {
 +-
 ++  GpgME::initializeLibrary();
 + }
 + 
 + Kleo::QGpgMEBackend::~QGpgMEBackend() {
 --- deskutils.kdepim4.patch ends here ---
 
 --- deskutils.kdepimlibs4.patch begins here ---
 diff -ruN kdepimlibs4.orig/files/patch-gpgme++-CMakeLists.txt kdepimlibs4/files/patch-gpgme++-CMakeLists.txt
 --- kdepimlibs4.orig/files/patch-gpgme++-CMakeLists.txt	1969-12-31 19:00:00.000000000 -0500
 +++ kdepimlibs4/files/patch-gpgme++-CMakeLists.txt	2009-07-01 18:36:37.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- ../gpgme++/CMakeLists.txt.orig	2009-07-01 18:28:08.000000000 -0400
 ++++ ../gpgme++/CMakeLists.txt	2009-07-01 18:28:36.000000000 -0400
 +@@ -32,7 +32,7 @@
 +         gpgadduserideditinteractor.cpp
 + )
 + 
 +-set( _gpgmepp_version 2.0.2 )
 ++set( _gpgmepp_version 2.0.3 )
 + set( _gpgmepp_soversion 2 )
 + 
 + set( GPGMEPP_INCLUDE ${INCLUDE_INSTALL_DIR} ${GPGME_INCLUDES} ${Boost_INCLUDE_DIR} )
 diff -ruN kdepimlibs4.orig/files/patch-gpgme++-context.cpp kdepimlibs4/files/patch-gpgme++-context.cpp
 --- kdepimlibs4.orig/files/patch-gpgme++-context.cpp	1969-12-31 19:00:00.000000000 -0500
 +++ kdepimlibs4/files/patch-gpgme++-context.cpp	2009-07-01 18:37:44.000000000 -0400
 @@ -0,0 +1,13 @@
 +--- ../gpgme++/context.cpp.orig	2009-07-01 18:28:59.000000000 -0400
 ++++ ../gpgme++/context.cpp	2009-07-01 18:30:51.000000000 -0400
 +@@ -51,6 +51,10 @@
 + #include <cassert>
 + 
 + namespace GpgME {
 ++  void initializeLibrary() {
 ++      gpgme_check_version( 0 );
 ++  }
 ++
 +   static inline gpgme_error_t makeError( gpg_err_code_t code ) {
 +     return gpg_err_make( (gpg_err_source_t)22, code );
 +   }
 diff -ruN kdepimlibs4.orig/files/patch-gpgme++-global.h kdepimlibs4/files/patch-gpgme++-global.h
 --- kdepimlibs4.orig/files/patch-gpgme++-global.h	1969-12-31 19:00:00.000000000 -0500
 +++ kdepimlibs4/files/patch-gpgme++-global.h	2009-07-01 18:38:05.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- ../gpgme++/global.h.orig	2009-07-01 18:26:50.000000000 -0400
 ++++ ../gpgme++/global.h	2009-07-01 18:27:58.000000000 -0400
 +@@ -39,6 +39,8 @@
 + 
 + namespace GpgME {
 + 
 ++    GPGMEPP_EXPORT void initializeLibrary();
 ++
 +     enum Protocol { OpenPGP, CMS, UnknownProtocol };
 + 
 +     enum Engine { GpgEngine, GpgSMEngine, GpgConfEngine, UnknownEngine };
 diff -ruN kdepimlibs4.orig/pkg-plist kdepimlibs4/pkg-plist
 --- kdepimlibs4.orig/pkg-plist	2009-07-01 18:24:24.000000000 -0400
 +++ kdepimlibs4/pkg-plist	2009-07-02 14:13:38.000000000 -0400
 @@ -366,13 +366,13 @@
  lib/libakonadi-kmime.so.5.0.1
  %%WITH_PTH%%lib/libgpgme++-pth.so
  %%WITH_PTH%%lib/libgpgme++-pth.so.2
 -%%WITH_PTH%%lib/libgpgme++-pth.so.2.0.2
 +%%WITH_PTH%%lib/libgpgme++-pth.so.2.0.3
  lib/libgpgme++-pthread.so
  lib/libgpgme++-pthread.so.2
 -lib/libgpgme++-pthread.so.2.0.2
 +lib/libgpgme++-pthread.so.2.0.3
  lib/libgpgme++.so
  lib/libgpgme++.so.2
 -lib/libgpgme++.so.2.0.2
 +lib/libgpgme++.so.2.0.3
  lib/libkabc.so
  lib/libkabc.so.5
  lib/libkabc.so.5.0.1
 --- deskutils.kdepimlibs4.patch ends here ---
 
 --- devel.bazaar.patch begins here ---
 diff -ruN bazaar.orig/files/patch-pfs-signatures.c bazaar/files/patch-pfs-signatures.c
 --- bazaar.orig/files/patch-pfs-signatures.c	2009-07-01 21:01:30.000000000 -0400
 +++ bazaar/files/patch-pfs-signatures.c	2009-07-01 21:10:59.000000000 -0400
 @@ -9,3 +9,11 @@
   #include "libarch/pfs-signatures.h"
   
   
 +@@ -1154,6 +1154,7 @@
 +     gpgme_ctx_t context;
 +     gpgme_data_t signature_data;
 +     gpgme_data_t signed_content;
 ++    gpgme_check_version (NULL);
 +     invariant (GPG_ERR_NO_ERROR == gpgme_new (&context));
 +     invariant (GPG_ERR_NO_ERROR == gpgme_data_new_from_mem (&signature_data, *signed_message, str_length (*signed_message), 0));
 +     invariant (GPG_ERR_NO_ERROR == gpgme_data_new (&signed_content));
 --- devel.bazaar.patch ends here ---
 
 --- finance.qhacc.patch begins here ---
 diff -ruN qhacc.orig/files/patch-plugins::gpg::gpgplugin.cpp qhacc/files/patch-plugins::gpg::gpgplugin.cpp
 --- qhacc.orig/files/patch-plugins::gpg::gpgplugin.cpp	1969-12-31 19:00:00.000000000 -0500
 +++ qhacc/files/patch-plugins::gpg::gpgplugin.cpp	2009-06-30 00:59:43.000000000 -0400
 @@ -0,0 +1,10 @@
 +--- ./plugins/gpg/gpgplugin.cpp.orig	2009-06-30 00:55:33.000000000 -0400
 ++++ ./plugins/gpg/gpgplugin.cpp	2009-06-30 00:59:33.000000000 -0400
 +@@ -56,6 +56,7 @@
 + const PluginInfo& GPGDBPlugin::info() const { return pinfo; }
 + 
 + bool GPGDBPlugin::iconnect( QHacc *, const QString&, QString& error ){
 ++	gpgme_check_version( NULL );
 + 	madectx=( GPG_ERR_NO_ERROR==gpgme_new( &gpgctx ) );
 + 	if( madectx ){
 + 		gpgme_set_passphrase_cb( gpgctx, GPGDBPlugin::passphrase_cb, 
 --- finance.qhacc.patch ends here ---
 
 --- mail.mutt-devel.patch begins here ---
 diff -ruN mutt-devel.orig/files/patch-crypt-gpgme.c mutt-devel/files/patch-crypt-gpgme.c
 --- mutt-devel.orig/files/patch-crypt-gpgme.c	1969-12-31 19:00:00.000000000 -0500
 +++ mutt-devel/files/patch-crypt-gpgme.c	2009-07-01 21:33:06.000000000 -0400
 @@ -0,0 +1,10 @@
 +--- ./crypt-gpgme.c.orig	2009-07-01 21:28:51.000000000 -0400
 ++++ ./crypt-gpgme.c	2009-07-01 21:31:52.000000000 -0400
 +@@ -342,6 +342,7 @@
 +   gpgme_error_t err;
 +   gpgme_ctx_t ctx;
 + 
 ++  gpgme_check_version (NULL);
 +   if (!GpgmeLocaleSet)
 +   {
 +     gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
 --- mail.mutt-devel.patch ends here ---
 
 --- net-im.ayttm.patch begins here ---
 diff -ruN ayttm.orig/files/patch-modules__aycryption__aycryption.c ayttm/files/patch-modules__aycryption__aycryption.c
 --- ayttm.orig/files/patch-modules__aycryption__aycryption.c	1969-12-31 19:00:00.000000000 -0500
 +++ ayttm/files/patch-modules__aycryption__aycryption.c	2009-07-02 05:20:11.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- ./modules/aycryption/aycryption.c.orig	2008-08-11 00:50:44.000000000 -0400
 ++++ ./modules/aycryption/aycryption.c	2009-07-02 04:06:35.000000000 -0400
 +@@ -108,6 +108,8 @@
 + 
 + static int aycryption_init()
 + {
 ++	gpgme_check_version (NULL);
 ++
 + 	input_list *il = g_new0(input_list, 1);
 + 	plugin_info.prefs = il;
 + 
 --- net-im.ayttm.patch ends here ---
 
 --- net-im.centericq.patch begins here ---
 diff -ruN centericq.orig/files/patch-src_impgp.cc centericq/files/patch-src_impgp.cc
 --- centericq.orig/files/patch-src_impgp.cc	1969-12-31 19:00:00.000000000 -0500
 +++ centericq/files/patch-src_impgp.cc	2009-07-01 23:21:51.000000000 -0400
 @@ -0,0 +1,10 @@
 +--- ./src/impgp.cc.orig	2009-07-01 23:19:00.000000000 -0400
 ++++ ./src/impgp.cc	2009-07-01 23:19:29.000000000 -0400
 +@@ -12,6 +12,7 @@
 + string impgp::passphrase[];
 + 
 + impgp::impgp() {
 ++    gpgme_check_version(NULL);
 +     if(gpgme_new(&ctx))
 + 	ctx = 0;
 + }
 --- net-im.centericq.patch ends here ---
 
 --- net-im.centerim-devel.patch begins here ---
 diff -ruN centerim-devel.orig/files/patch-src__impgp.cc centerim-devel/files/patch-src__impgp.cc
 --- centerim-devel.orig/files/patch-src__impgp.cc	1969-12-31 19:00:00.000000000 -0500
 +++ centerim-devel/files/patch-src__impgp.cc	2009-07-01 23:28:12.000000000 -0400
 @@ -0,0 +1,10 @@
 +--- ./src/impgp.cc.orig	2009-07-01 23:27:35.000000000 -0400
 ++++ ./src/impgp.cc	2009-07-01 23:27:55.000000000 -0400
 +@@ -13,6 +13,7 @@
 + string impgp::passphrase[];
 + 
 + impgp::impgp() {
 ++    gpgme_check_version(NULL);
 +     if(gpgme_new(&ctx))
 + 	ctx = 0;
 + }
 --- net-im.centerim-devel.patch ends here ---
 
 --- net-im.centerim.patch begins here ---
 diff -ruN centerim.orig/files/patch-src__impgp.cc centerim/files/patch-src__impgp.cc
 --- centerim.orig/files/patch-src__impgp.cc	1969-12-31 19:00:00.000000000 -0500
 +++ centerim/files/patch-src__impgp.cc	2009-07-01 23:25:47.000000000 -0400
 @@ -0,0 +1,10 @@
 +--- ./src/impgp.cc.orig	2009-07-01 23:25:08.000000000 -0400
 ++++ ./src/impgp.cc	2009-07-01 23:25:37.000000000 -0400
 +@@ -13,6 +13,7 @@
 + string impgp::passphrase[];
 + 
 + impgp::impgp() {
 ++    gpgme_check_version(NULL);
 +     if(gpgme_new(&ctx))
 + 	ctx = 0;
 + }
 --- net-im.centerim.patch ends here ---
 
 --- security.openvas-libnasl.patch begins here ---
 diff -ruN openvas-libnasl.orig/files/patch-nasl__nasl_signature.c openvas-libnasl/files/patch-nasl__nasl_signature.c
 --- openvas-libnasl.orig/files/patch-nasl__nasl_signature.c	1969-12-31 19:00:00.000000000 -0500
 +++ openvas-libnasl/files/patch-nasl__nasl_signature.c	2009-07-01 23:10:14.000000000 -0400
 @@ -0,0 +1,11 @@
 +--- ./nasl/nasl_signature.c.orig	2009-07-01 23:08:30.000000000 -0400
 ++++ ./nasl/nasl_signature.c	2009-07-01 23:09:42.000000000 -0400
 +@@ -131,6 +131,8 @@
 +   gpgme_data_t sig = NULL, text = NULL;
 +   char * gpghome = determine_gpghome();
 + 
 ++  gpgme_check_version (NULL);
 ++
 +   err = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP);
 +   if (err)
 +     {
 --- security.openvas-libnasl.patch ends here ---
 

From: "Carlos A. M. dos Santos" <unixmania@gmail.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135911: [MAINTAINER] security/gpgme: Update to version 
	1.2.0
Date: Fri, 3 Jul 2009 09:49:18 -0300

 --001485f7d7feaa6b2c046dcc95d6
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 [resending to bug-followup]
 
 I confirmed that  the patch provided by Jason works for ayttm. It is
 also necessary to change ayttm/Makefile, because libgpgme has a new
 version number, and set a port revision number. The corresponding
 patch is attached.
 
 --001485f7d7feaa6b2c046dcc95d6
 Content-Type: text/plain; charset=US-ASCII; name="ayttm-0.5.0.82_1.diff.txt"
 Content-Disposition: attachment; filename="ayttm-0.5.0.82_1.diff.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_fwowf97m0
 
 LS0tIGF5dHRtL01ha2VmaWxlLm9yaWcJMjAwOS0wNi0zMCAxMTo1Njo0MC4wMDAwMDAwMDAgLTAz
 MDAKKysrIGF5dHRtL01ha2VmaWxlCTIwMDktMDctMDIgMjE6Mjc6MDEuMDAwMDAwMDAwIC0wMzAw
 CkBAIC03LDYgKzcsNyBAQAogCiBQT1JUTkFNRT0JYXl0dG0KIFBPUlRWRVJTSU9OPQkwLjUuMC44
 MgorUE9SVFJFVklTSU9OPQkxCiBDQVRFR09SSUVTPQluZXQtaW0KIE1BU1RFUl9TSVRFUz0JU0YK
 IERJU1ROQU1FPQkke1BPUlROQU1FfS0ke1BPUlRWRVJTSU9OOlJ9LSR7UE9SVFZFUlNJT046RX0K
 QEAgLTE2LDcgKzE3LDcgQEAKIAogTElCX0RFUEVORFM9CWF1ZGlvZmlsZS4wOiR7UE9SVFNESVJ9
 L2F1ZGlvL2xpYmF1ZGlvZmlsZSBcCiAJCWphc3Blci40OiR7UE9SVFNESVJ9L2dyYXBoaWNzL2ph
 c3BlciBcCi0JCWdwZ21lLjE3OiR7UE9SVFNESVJ9L3NlY3VyaXR5L2dwZ21lIFwKKwkJZ3BnbWUu
 MTg6JHtQT1JUU0RJUn0vc2VjdXJpdHkvZ3BnbWUgXAogCQlwc3BlbGwuMTY6JHtQT1JUU0RJUn0v
 dGV4dHByb2MvYXNwZWxsCiAKIE9QVElPTlM9CUFSVFMJIkVuYWJsZSBhUnRzIHN1cHBvcnQiCQlv
 ZmYgXAo=
 --001485f7d7feaa6b2c046dcc95d6--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135911: commit references a PR
Date: Wed, 15 Jul 2009 16:42:24 +0000 (UTC)

 wxs         2009-07-15 16:42:07 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/gpgme       Makefile distinfo pkg-plist 
     security/gpgme/files patch-src-Makefile.in 
   Log:
   - Update to 1.2.0
   
   PR:             ports/135911
   Submitted by:   Jason E. Hale <bsdkaffee@gmail.com>
   
   Revision  Changes    Path
   1.59      +3 -1      ports/security/gpgme/Makefile
   1.19      +6 -6      ports/security/gpgme/distinfo
   1.2       +57 -39    ports/security/gpgme/files/patch-src-Makefile.in
   1.16      +7 -7      ports/security/gpgme/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135911: commit references a PR
Date: Wed, 15 Jul 2009 16:47:56 +0000 (UTC)

 wxs         2009-07-15 16:47:45 UTC
 
   FreeBSD ports repository
 
   Modified files:
     deskutils/kdepim3    Makefile pkg-plist 
     deskutils/kdepim4    Makefile 
     deskutils/kdepimlibs4 Makefile pkg-plist 
     devel/bazaar         Makefile 
     devel/bazaar/files   patch-pfs-signatures.c 
     finance/qhacc        Makefile 
     mail/mutt-devel      Makefile 
     net-im/ayttm         Makefile 
     net-im/centericq     Makefile 
     net-im/centerim      Makefile 
     net-im/centerim-devel Makefile 
     security/openvas-libnasl Makefile 
     deskutils/basket     Makefile 
     mail/balsa           Makefile 
     mail/claws-mail      Makefile 
     mail/sylpheed        Makefile 
     mail/sylpheed2       Makefile 
     net-im/mcabber       Makefile 
     security/gpa         Makefile 
     security/pecl-gnupg  Makefile 
     security/py-pyme     Makefile 
     security/seahorse    Makefile 
   Added files:
     deskutils/kdepim3/files 
                             patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp 
                             patch-libkdenetwork-gpgmepp-Makefile.in 
                             patch-libkdenetwork-gpgmepp-context.cpp 
                             patch-libkdenetwork-gpgmepp-context.h 
     deskutils/kdepim4/files patch-kleopatra-main.cpp 
                             patch-libkleo-backends-qgpgme-qgpgmebackend.cpp 
     deskutils/kdepimlibs4/files patch-gpgme++-CMakeLists.txt 
                                 patch-gpgme++-context.cpp 
                                 patch-gpgme++-global.h 
     finance/qhacc/files  patch-plugins::gpg::gpgplugin.cpp 
     mail/mutt-devel/files patch-crypt-gpgme.c 
     net-im/ayttm/files   patch-modules__aycryption__aycryption.c 
     net-im/centericq/files patch-src_impgp.cc 
     net-im/centerim/files patch-src__impgp.cc 
     net-im/centerim-devel/files patch-src__impgp.cc 
     security/openvas-libnasl/files patch-nasl__nasl_signature.c 
   Log:
   - Chase security/gpgme update.
   
   Most changes are just PORTREVISION and LIB_DEPENDS fixes. However, the
   following ports require a patch to use the new gpgme correctly:
   deskutils/kdepim3
   deskutils/kdepim3
   deskutils/kdepim3
   deskutils/kdepim3
   deskutils/kdepim4
   deskutils/kdepim4
   deskutils/kdepimlibs4
   deskutils/kdepimlibs4
   deskutils/kdepimlibs4
   finance/qhacc
   mail/mutt-devel
   net-im/ayttm
   net-im/centericq
   net-im/centerim
   net-im/centerim-devel
   security/openvas-libnasl
   
   These patches were submitted by various people and documented in ports/135911.
   
   PR:             ports/135911
   
   Revision  Changes    Path
   1.32      +2 -2      ports/deskutils/basket/Makefile
   1.85      +1 -1      ports/deskutils/kdepim3/Makefile
   1.1       +11 -0     ports/deskutils/kdepim3/files/patch-certmanager-lib-backends-qgpgme-qgpgmebackend.cpp (new)
   1.1       +11 -0     ports/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-Makefile.in (new)
   1.1       +13 -0     ports/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.cpp (new)
   1.1       +11 -0     ports/deskutils/kdepim3/files/patch-libkdenetwork-gpgmepp-context.h (new)
   1.36      +1 -1      ports/deskutils/kdepim3/pkg-plist
   1.94      +1 -0      ports/deskutils/kdepim4/Makefile
   1.1       +20 -0     ports/deskutils/kdepim4/files/patch-kleopatra-main.cpp (new)
   1.1       +11 -0     ports/deskutils/kdepim4/files/patch-libkleo-backends-qgpgme-qgpgmebackend.cpp (new)
   1.13      +1 -0      ports/deskutils/kdepimlibs4/Makefile
   1.1       +11 -0     ports/deskutils/kdepimlibs4/files/patch-gpgme++-CMakeLists.txt (new)
   1.1       +13 -0     ports/deskutils/kdepimlibs4/files/patch-gpgme++-context.cpp (new)
   1.1       +11 -0     ports/deskutils/kdepimlibs4/files/patch-gpgme++-global.h (new)
   1.5       +3 -3      ports/deskutils/kdepimlibs4/pkg-plist
   1.15      +2 -2      ports/devel/bazaar/Makefile
   1.2       +8 -0      ports/devel/bazaar/files/patch-pfs-signatures.c
   1.71      +2 -2      ports/finance/qhacc/Makefile
   1.1       +10 -0     ports/finance/qhacc/files/patch-plugins::gpg::gpgplugin.cpp (new)
   1.139     +2 -1      ports/mail/balsa/Makefile
   1.149     +1 -0      ports/mail/claws-mail/Makefile
   1.304     +1 -1      ports/mail/mutt-devel/Makefile
   1.1       +10 -0     ports/mail/mutt-devel/files/patch-crypt-gpgme.c (new)
   1.117     +2 -2      ports/mail/sylpheed/Makefile
   1.165     +2 -1      ports/mail/sylpheed2/Makefile
   1.57      +2 -1      ports/net-im/ayttm/Makefile
   1.1       +11 -0     ports/net-im/ayttm/files/patch-modules__aycryption__aycryption.c (new)
   1.116     +2 -2      ports/net-im/centericq/Makefile
   1.1       +10 -0     ports/net-im/centericq/files/patch-src_impgp.cc (new)
   1.29      +2 -1      ports/net-im/centerim-devel/Makefile
   1.1       +10 -0     ports/net-im/centerim-devel/files/patch-src__impgp.cc (new)
   1.14      +2 -1      ports/net-im/centerim/Makefile
   1.1       +10 -0     ports/net-im/centerim/files/patch-src__impgp.cc (new)
   1.36      +2 -1      ports/net-im/mcabber/Makefile
   1.33      +1 -1      ports/security/gpa/Makefile
   1.6       +2 -2      ports/security/openvas-libnasl/Makefile
   1.1       +11 -0     ports/security/openvas-libnasl/files/patch-nasl__nasl_signature.c (new)
   1.9       +2 -2      ports/security/pecl-gnupg/Makefile
   1.2       +1 -0      ports/security/py-pyme/Makefile
   1.79      +2 -1      ports/security/seahorse/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Wed Jul 15 16:52:28 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135911 
>Unformatted:
