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

[lblume at users.sourceforge.net]

Revision: 21863
          http://gar.svn.sourceforge.net/gar/?rev=21863&view=rev
Author:   lblume
Date:     2013-08-28 19:46:21 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
gnupg2/trunk: Bump to 2.0.21; add 64bit binary

Modified Paths:
--------------
    csw/mgar/pkg/gnupg2/trunk/Makefile
    csw/mgar/pkg/gnupg2/trunk/checksums
    csw/mgar/pkg/gnupg2/trunk/files/0001-Fix-mutex-stream-return-args-in-macro.patch

Modified: csw/mgar/pkg/gnupg2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/Makefile	2013-08-28 14:50:13 UTC (rev 21862)
+++ csw/mgar/pkg/gnupg2/trunk/Makefile	2013-08-28 19:46:21 UTC (rev 21863)
@@ -3,7 +3,7 @@
 # $Id$
 
 NAME    = gnupg
-VERSION = 2.0.18
+VERSION = 2.0.21
 GARTYPE = v2
 
 DESCRIPTION = GnuPG is a complete and free replacement for PGP
@@ -28,7 +28,8 @@
 BUILD_DEP_PKGS += CSWlibassuan-dev
 BUILD_DEP_PKGS += CSWlibksba-dev
 BUILD_DEP_PKGS += CSWlibreadline-dev
-BUILD_DEP_PKGS += CSWoldapdevel
+BUILD_DEP_PKGS += CSWopenldap-dev
+BUILD_DEP_PKGS += CSWlibpth-dev
 
 PACKAGES += CSWgnupg2
 SPKG_DESC_CSWgnupg2 = GnuPG is a complete and free replacement for PGP
@@ -76,9 +77,8 @@
 
 NOISALIST = 1
 
-# 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_LIBS_ONLY = 1
+BUILD64 = 1
+ISAEXEC = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --with-libcurl=$(prefix)

Modified: csw/mgar/pkg/gnupg2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnupg2/trunk/checksums	2013-08-28 14:50:13 UTC (rev 21862)
+++ csw/mgar/pkg/gnupg2/trunk/checksums	2013-08-28 19:46:21 UTC (rev 21863)
@@ -1 +1 @@
-2f37e0722666a0fedbe4d9f9227ac4d7  gnupg-2.0.18.tar.bz2
+48c05f5dfe97cf21ae0ced811aaad750  gnupg-2.0.21.tar.bz2

Modified: 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	2013-08-28 14:50:13 UTC (rev 21862)
+++ csw/mgar/pkg/gnupg2/trunk/files/0001-Fix-mutex-stream-return-args-in-macro.patch	2013-08-28 19:46:21 UTC (rev 21863)
@@ -1,23 +1,8 @@
-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))
+@@ -181,13 +181,13 @@ static int estream_pth_killed;
+   (estream_pth_killed ? dummy_mutex_call_void ((mutex))         \
+    : (void)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))         \
@@ -31,6 +16,3 @@
     : pth_mutex_init (&(mutex)))
  
  #else /*!HAVE_PTH*/
--- 
-1.7.6.1
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.