[csw-devel] SF.net SVN: gar:[7552] csw/mgar/pkg/gnupg2/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Dec 4 17:57:30 CET 2009 

Revision: 7552
          http://gar.svn.sourceforge.net/gar/?rev=7552&view=rev
Author:   wahwah
Date:     2009-12-04 16:57:30 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
gnupg2: Making incompatible with gnupg 1.x, adding a symlink from gpg to gpg2, version bump to 2.0.13

Modified Paths:
--------------
    csw/mgar/pkg/gnupg2/trunk/Makefile
    csw/mgar/pkg/gnupg2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch

Removed Paths:
-------------
    csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff

Property Changed:
----------------
    csw/mgar/pkg/gnupg2/trunk/Makefile

Modified: csw/mgar/pkg/gnupg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/Makefile	2009-12-04 16:02:42 UTC (rev 7551)
+++ csw/mgar/pkg/gnupg2/trunk/Makefile	2009-12-04 16:57:30 UTC (rev 7552)
@@ -1,5 +1,9 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
 GARNAME    = gnupg
-GARVERSION = 2.0.10
+GARVERSION = 2.0.13
 CATEGORIES = apps
 
 DESCRIPTION = GnuPG is a complete and free replacement for PGP.
@@ -19,10 +23,8 @@
 # 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 = patch-keyserver_and_sm.diff
+PATCHFILES = sm-libraries.patch
 
-# We define upstream file regex so we can be notifed of 
-# new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 NOISALIST  = 1
@@ -35,16 +37,27 @@
 CONFIGURE_ARGS += --with-bzip2
 CONFIGURE_ARGS += --with-readline
 CONFIGURE_ARGS += --enable-threads=solaris
+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
 
-REQUIRED_PKGS  = CSWlibksba CSWgpgerr CSWgcrypt 
-REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn 
+REQUIRED_PKGS  = CSWlibksba CSWgpgerr CSWgcrypt
+REQUIRED_PKGS += CSWcurlrt CSWoldaprt CSWzlib CSWpth CSWlibidn
 REQUIRED_PKGS += CSWbzip2 CSWreadline CSWggettextrt CSWiconv CSWosslrt
+REQUIRED_PKGS += CSWpinentry CSWlibassuan
+PREREQUISITE_PKGS  = $(REQUIRED_PKGS)
 
+INCOMPATIBLE_PKGS = CSWgnupg
+
 TEST_TARGET = check
 
 include gar/category.mk
+
+post-merge:
+	ln -s gnupg2 $(DESTDIR)$(bindir)/gnupg
+	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/gnupg2/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/gnupg2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/checksums	2009-12-04 16:02:42 UTC (rev 7551)
+++ csw/mgar/pkg/gnupg2/trunk/checksums	2009-12-04 16:57:30 UTC (rev 7552)
@@ -1,2 +1,2 @@
-1cb778dd555f87685a8fde2f7113725e  download/gnupg-2.0.10.tar.bz2
-37677df3905ce0e4b23a2fb3cc4d7207  download/patch-keyserver_and_sm.diff
+41bd7629d815b90c15b37bb31c2f07c0  download/gnupg-2.0.13.tar.bz2
+9ee96ed5623d9ff8f3be8c3d70709509  download/sm-libraries.patch

Deleted: csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff	2009-12-04 16:02:42 UTC (rev 7551)
+++ csw/mgar/pkg/gnupg2/trunk/files/patch-keyserver_and_sm.diff	2009-12-04 16:57:30 UTC (rev 7552)
@@ -1,40 +0,0 @@
-diff -Nru gnupg-2.0.10.orig/keyserver/Makefile.in gnupg-2.0.10/keyserver/Makefile.in
---- gnupg-2.0.10.orig/keyserver/Makefile.in	2009-01-12 03:29:44.000000000 -0600
-+++ gnupg-2.0.10/keyserver/Makefile.in	2009-02-03 21:29:41.031225041 -0600
-@@ -395,7 +395,7 @@
- libexec_SCRIPTS = $(GPGKEYS_MAILTO)
- noinst_SCRIPTS = gpg2keys_test
- common_libs = ../gl/libgnu.a  ../common/libcommon.a ../jnlib/libjnlib.a
--other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
-+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS) ../jnlib/libjnlib.a
- gpg2keys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h no-libgcrypt.c
- gpg2keys_ldap_CPPFLAGS = $(LDAP_CPPFLAGS) $(AM_CPPFLAGS)
- gpg2keys_ldap_LDADD = ../jnlib/libjnlib.a $(LDAPLIBS) $(GPG_ERROR_LIBS) \
-@@ -417,13 +417,13 @@
- 	$(am__append_8)
- @FAKE_CURL_FALSE at gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
- @FAKE_CURL_TRUE at gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
-- at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT)
-+ at FAKE_CURL_FALSE@gpg2keys_curl_LDADD = $(LIBCURL) $(GETOPT) $(other_libs)
- @FAKE_CURL_TRUE at gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- @FAKE_CURL_TRUE@	              $(other_libs) 
- 
- @FAKE_CURL_FALSE at gpg2keys_hkp_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
- @FAKE_CURL_TRUE at gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
-- at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT)
-+ at FAKE_CURL_FALSE@gpg2keys_hkp_LDADD = $(LIBCURL) $(GETOPT) $(other_libs)
- @FAKE_CURL_TRUE at gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
- @FAKE_CURL_TRUE@	             $(other_libs) 
- 
-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)
- 

Added: csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch	                        (rev 0)
+++ csw/mgar/pkg/gnupg2/trunk/files/sm-libraries.patch	2009-12-04 16:57:30 UTC (rev 7552)
@@ -0,0 +1,29 @@
+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