[csw-devel] SF.net SVN: gar:[15680] csw/mgar/pkg/gnupg2/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Sep 20 14:37:42 CEST 2011
Revision: 15680
http://gar.svn.sourceforge.net/gar/?rev=15680&view=rev
Author: dmichelsen
Date: 2011-09-20 12:37:42 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
gnupg2: Rework Makefile
Modified Paths:
--------------
csw/mgar/pkg/gnupg2/trunk/Makefile
csw/mgar/pkg/gnupg2/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gnupg2/trunk/files/0001-Fix-mutex-stream-return-args-in-macro.patch
Removed Paths:
-------------
csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch
Modified: csw/mgar/pkg/gnupg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/Makefile 2011-09-20 11:50:32 UTC (rev 15679)
+++ csw/mgar/pkg/gnupg2/trunk/Makefile 2011-09-20 12:37:42 UTC (rev 15680)
@@ -3,99 +3,94 @@
# $Id$
NAME = gnupg
-VERSION = 2.0.15
+VERSION = 2.0.18
CATEGORIES = apps
-DESCRIPTION = GnuPG is a complete and free replacement for PGP.
+DESCRIPTION = GnuPG is a complete and free replacement for PGP
define BLURB
- RFC 2440 compliant tool for secure communication and data storage
+ RFC 2440 compliant tool for secure communication and data storage
endef
-PACKAGES = CSWgnupg2 CSWgnupg-agent
-CATALOGNAME_CSWgnupg2 = gnupg2
-CATALOGNAME_CSWgnupg-agent = gnupg_agent
-SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP.
-SPKG_DESC_CSWgnupg-agent = GNU privacy guard - password agent
+MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/
+DISTFILES = $(DISTNAME).tar.bz2
-SPKG_SOURCEURL = http://www.gnupg.org/
-MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/
-DISTFILES = $(NAME)-$(VERSION).tar.bz2
+PATCHFILES += 0001-Fix-mutex-stream-return-args-in-macro.patch
-# fix some missing libraries for Keyserver tools and gpgsm
-# Bug ID 996 filed up stream along with patch
-# Supposed to be Fixed in the 01/2009 SVN version but has not
-# made it into a release at the time of this packaging
-PATCHFILES = sm-libraries.patch
+VENDOR_URL = http://www.gnupg.org/
-# There's a problem with the testing framework which makes unit tests fail for
-# 2.0.15. Filed upstream as:
-# https://bugs.g10code.com/gnupg/issue1214
-SKIPTEST ?= 1
-# Please remove this upon upgrade to 2.0.16.
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_common)
+BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWgnupg2)
-UFILES_REGEX = (\d+(?:\.\d+)*)
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWlibgpg-error-dev
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+BUILD_DEP_PKGS += CSWlibassuan-dev
+BUILD_DEP_PKGS += CSWlibksba-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
+BUILD_DEP_PKGS += CSWoldapdevel
-NOISALIST = 1
-# There are no 64-bit ldap libraries, disabling the 64-bit build
-# BUILD64 = 1
+PACKAGES += CSWgnupg2
+SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibksba8
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibpth20
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibassuan0
+RUNTIME_DEP_PKGS_CSWgnupg2 += CSWoldaprt
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-libcurl=/opt/csw
-CONFIGURE_ARGS += --with-ldap=/opt/csw
-CONFIGURE_ARGS += --with-zlib=/opt/csw
-CONFIGURE_ARGS += --with-bzip2=/opt/csw
-CONFIGURE_ARGS += --with-readline=/opt/csw
+# Documentation overrides
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/share|root/opt/csw/share/gnupg/help.txt
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpgconf.1
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/share|root/opt/csw/share/info/gnupg.info-1
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnupg.info-1
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnupg.info-2
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/gpgsm.1
+CHECKPKG_OVERRIDES_CSWgnupg2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpgsm.1
-CONFIGURE_ARGS += --with-pinentry-pgm=/opt/csw/bin/pinentry-curses
-
-PROTOTYPE_FILTER = awk '$$$$3 ~/\/gpg2$$$$/ { $$$$4 = 4755 } { print }'
-
-# This is somehow not correctly detected from autoconf
-EXTRA_LINKER_FLAGS = -lgpg-error
-# Needed for nanosleep()
-EXTRA_LINKER_FLAGS += -lrt
-
-PKGFILES_CSWgnupg-agent = .*gpg-agent.*
+PACKAGES += CSWgnupg-agent
+SPKG_DESC_CSWgnupg-agent = GNU privacy guard - password agent
+PKGFILES_CSWgnupg-agent += .*gpg-agent.*
PKGFILES_CSWgnupg-agent += .*gpg-connect-agent.*
PKGFILES_CSWgnupg-agent += .*gpgkey2ssh.*
PKGFILES_CSWgnupg-agent += .*symcryptrun.*
-
-RUNTIME_DEP_PKGS_common = CSWbzip2
-RUNTIME_DEP_PKGS_common += CSWcurlrt
-RUNTIME_DEP_PKGS_common += CSWgcrypt
-RUNTIME_DEP_PKGS_common += CSWggettextrt
-RUNTIME_DEP_PKGS_common += CSWgpgerr
-RUNTIME_DEP_PKGS_common += CSWiconv
-RUNTIME_DEP_PKGS_common += CSWlibksba
-RUNTIME_DEP_PKGS_common += CSWoldaprt
-RUNTIME_DEP_PKGS_common += CSWreadline
-RUNTIME_DEP_PKGS_common += CSWzlib
-
-RUNTIME_DEP_PKGS_common_sparc += CSWpth
-RUNTIME_DEP_PKGS_common += $(RUNTIME_DEP_PKGS_common_$(GARCH))
-
-RUNTIME_DEP_PKGS_CSWgnupg2 += $(RUNTIME_DEP_PKGS_common)
-RUNTIME_DEP_PKGS_CSWgnupg2 += CSWlibassuan
-
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgcrypt11
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibgpg-error0
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibpth20
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibassuan0
# Pinentry is not because of shared libraries.
RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWpinentry
CHECKPKG_OVERRIDES_CSWgnupg-agent += surplus-dependency|CSWpinentry
-RUNTIME_DEP_PKGS_CSWgnupg-agent_sparc += CSWpth
+# Documentation overrides
+CHECKPKG_OVERRIDES_CSWgnupg-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/gpg-agent.1
-RUNTIME_DEP_PKGS_CSWgnupg-agent += $(RUNTIME_DEP_PKGS_CSWgnupg-agent_$(GARCH))
+NOISALIST = 1
-RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgcrypt
-RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWgpgerr
-RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWiconv
-RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWlibassuan
-RUNTIME_DEP_PKGS_CSWgnupg-agent += CSWreadline
+# Unfortunately GNU PTH does not handle 64 bit sanely:
+# "/opt/csw/include/pth.h", line 93: #error: "FD_SETSIZE is larger than what GNU Pth can handle."
+#BUILD64 = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-libcurl=$(prefix)
+CONFIGURE_ARGS += --with-ldap=$(prefix)
+CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-bzip2=$(prefix)
+CONFIGURE_ARGS += --with-readline=$(prefix)
+CONFIGURE_ARGS += --with-pinentry-pgm=$(prefix)/bin/pinentry-curses
+CONFIGURE_ARGS += --with-pth-prefix=$(prefix)
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_common)
-BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWgnupg2)
+PROTOTYPE_MODIFIERS = suid
+PROTOTYPE_FILES_suid = .*/gpg2
+PROTOTYPE_PERMS_suid = 4755
-TEST_TARGET = check
-
include gar/category.mk
Modified: csw/mgar/pkg/gnupg2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/checksums 2011-09-20 11:50:32 UTC (rev 15679)
+++ csw/mgar/pkg/gnupg2/trunk/checksums 2011-09-20 12:37:42 UTC (rev 15680)
@@ -1,2 +1 @@
-c1286e85b66349879dc4b760dd83e2f1 gnupg-2.0.15.tar.bz2
-9ee96ed5623d9ff8f3be8c3d70709509 sm-libraries.patch
+2f37e0722666a0fedbe4d9f9227ac4d7 gnupg-2.0.18.tar.bz2
Added: csw/mgar/pkg/gnupg2/trunk/files/0001-Fix-mutex-stream-return-args-in-macro.patch
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/files/0001-Fix-mutex-stream-return-args-in-macro.patch (rev 0)
+++ csw/mgar/pkg/gnupg2/trunk/files/0001-Fix-mutex-stream-return-args-in-macro.patch 2011-09-20 12:37:42 UTC (rev 15680)
@@ -0,0 +1,36 @@
+From 7615eb0c7ed9aec93e9d10a5d8c530bf23e34005 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 20 Sep 2011 13:58:03 +0200
+Subject: [PATCH] Fix mutex stream return args in macro
+
+---
+ common/estream.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/estream.c b/common/estream.c
+index 2d68415..d350da6 100644
+--- a/common/estream.c
++++ b/common/estream.c
+@@ -175,16 +175,16 @@ static int estream_pth_killed;
+
+ # define ESTREAM_MUTEX_INITIALIZER PTH_MUTEX_INIT
+ # define ESTREAM_MUTEX_LOCK(mutex) \
+- (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \
++ (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \
+ : pth_mutex_acquire (&(mutex), 0, NULL))
+ # define ESTREAM_MUTEX_UNLOCK(mutex) \
+- (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \
++ (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \
+ : pth_mutex_release (&(mutex)))
+ # define ESTREAM_MUTEX_TRYLOCK(mutex) \
+ (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \
+ : ((pth_mutex_acquire (&(mutex), 1, NULL) == TRUE)? 0:-1))
+ # define ESTREAM_MUTEX_INITIALIZE(mutex) \
+- (estream_pth_killed ? dummy_mutex_call_void ((mutex)) \
++ (estream_pth_killed ? dummy_mutex_call_int ((mutex)) \
+ : pth_mutex_init (&(mutex)))
+
+ #else /*!HAVE_PTH*/
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch 2011-09-20 11:50:32 UTC (rev 15679)
+++ csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch 2011-09-20 12:37:42 UTC (rev 15680)
@@ -1,29 +0,0 @@
-Otherwise:
-
- /opt/studio/SOS11/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I.. -I../gl -I../common -I../intl -DLOCALEDIR=\"/opt/csw/share/locale\" -DGNUPG_BINDIR="\"/opt/csw/bin\"" -DGNUPG_LIBEXECDIR="\"/opt/csw/libexec\"" -DGNUPG_LIBDIR="\"/opt/csw/lib/gnupg\"" -DGNUPG_DATADIR="\"/opt/csw/share/gnupg\"" -DGNUPG_SYSCONFDIR="\"/opt/csw/etc/gnupg\"" -DGNUPG_DEFAULT_PINENTRY="\"/opt/csw/bin/pinentry-curses\"" -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -xO3 -xarch=386 -I/opt/csw/include -c qualified.c
-/opt/studio/SOS11/SUNWspro/bin/cc -I/opt/csw/include -I/opt/csw/include -I/opt/csw/include -xO3 -xarch=386 -I/opt/csw/include -xarch=386 -L/opt/csw/lib -lgpg-error -lrt -o gpgsm gpgsm.o misc.o keydb.o server.o call-agent.o call-dirmngr.o fingerprint.o base64.o certlist.o certdump.o certcheck.o certchain.o keylist.o verify.o sign.o encrypt.o decrypt.o import.o export.o delete.o certreqgen.o certreqgen-ui.o qualified.o ../common/libcommon.a ../kbx/libkeybox.a ../jnlib/libjnlib.a ../gl/libgnu.a ../common/libgpgrl.a -L/opt/csw/lib -lgcrypt -lgpg-error -L/opt/csw/lib -lksba -lgpg-error -L/opt/csw/lib -lassuan -L/opt/csw/lib -lgpg-error -lreadline /opt/csw/lib/libintl.so -R/opt/csw/lib -lz -lbz2 /opt/csw/lib/libiconv.so -R/opt/csw/lib
-Undefined first referenced
- symbol in file
-__xnet_connect /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1)
-__xnet_socket /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1)
-__xnet_socketpair /opt/csw/lib/libassuan.a(assuan-pipe-connect.o) (symbol belongs to implicit dependency /lib/libsocket.so.1)
-__xnet_bind /opt/csw/lib/libassuan.a(assuan-socket.o) (symbol belongs to implicit dependency /lib/libsocket.so.1)
-__xnet_recvmsg /opt/csw/lib/libassuan.a(assuan-io.o) (symbol belongs to implicit dependency /lib/libsocket.so.1)
-__xnet_sendmsg /opt/csw/lib/libassuan.a(assuan-io.o) (symbol belongs to implicit dependency /lib/libsocket.so.1)
-ld: fatal: Symbol referencing errors. No output written to gpgsm
-gmake[4]: *** [gpgsm] Error 1
-gmake[4]: Leaving directory `/export/home/blizinski/opencsw/pkg/gnupg2/trunk/work/build-isa-i386/gnupg-2.0.13/sm'
-
-
-diff -Nru gnupg-2.0.10.orig/sm/Makefile.in gnupg-2.0.10/sm/Makefile.in
---- gnupg-2.0.10.orig/sm/Makefile.in 2009-01-12 03:29:44.000000000 -0600
-+++ gnupg-2.0.10/sm/Makefile.in 2009-02-03 21:30:03.836999289 -0600
-@@ -375,7 +375,7 @@
- common_libs = $(libcommon) ../kbx/libkeybox.a ../jnlib/libjnlib.a \
- ../gl/libgnu.a
-
--gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
-+gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a $(NETLIBS) \
- $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
- $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) $(ZLIBS) $(LIBICONV)
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list