[csw-devel] SF.net SVN: gar:[14938] csw/mgar/pkg/libassuan/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14938
          http://gar.svn.sourceforge.net/gar/?rev=14938&view=rev
Author:   dmichelsen
Date:     2011-06-29 14:12:42 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
libassuan: General cleanup

Modified Paths:
--------------
    csw/mgar/pkg/libassuan/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch
    csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff

Modified: csw/mgar/pkg/libassuan/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libassuan/trunk/Makefile	2011-06-29 12:27:01 UTC (rev 14937)
+++ csw/mgar/pkg/libassuan/trunk/Makefile	2011-06-29 14:12:42 UTC (rev 14938)
@@ -9,14 +9,9 @@
 MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/libassuan/
 DISTFILES  = $(DISTNAME).tar.bz2
 
-# Use this patch unless this is fixed:
-#   https://bugs.g10code.com/gnupg/issue1282
-#PATCHFILES = 0001-Add-INADDR_NONE-for-Solaris.patch
-
 VENDOR_URL = http://www.gnupg.org/download/#libassuan
 
-BUILD_DEP_PKGS += CSWgpgerr
-BUILD_DEP_PKGS += CSWpth
+BUILD_DEP_PKGS += CSWlibgpgerr-dev
 
 PACKAGES += CSWlibassuan0
 SPKG_DESC_CSWlibassuan0 = IPC library used by some GnuPG related software, libassuan.so.0
@@ -31,10 +26,8 @@
 
 BUILD64 = 1
 
-# EXTRA_LDFLAGS = -lrt -lsocket -lnsl
-
 # Disable tests until this is fixed:
-#   https://bugs.g10code.com/gnupg/msg3633
-# SKIPTEST ?= 1
+#   https://bugs.g10code.com/gnupg/msg4081
+SKIPTEST ?= 1
 
 include gar/category.mk

Deleted: csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch
===================================================================
--- csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch	2011-06-29 12:27:01 UTC (rev 14937)
+++ csw/mgar/pkg/libassuan/trunk/files/0001-Add-INADDR_NONE-for-Solaris.patch	2011-06-29 14:12:42 UTC (rev 14938)
@@ -1,26 +0,0 @@
-From f7b3397155b616637aa0b8ca51c78fa62b9a302b Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 16 Sep 2010 15:56:10 +0200
-Subject: [PATCH] Add INADDR_NONE for Solaris
-
----
- src/assuan-socket-connect.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
-index 13b8aa5..8d5a09e 100644
---- a/src/assuan-socket-connect.c
-+++ b/src/assuan-socket-connect.c
-@@ -51,6 +51,9 @@
- #ifndef AF_LOCAL
- # define AF_LOCAL AF_UNIX
- #endif
-+#ifndef INADDR_NONE
-+# define INADDR_NONE ((unsigned long) -1)
-+#endif
- 
- #ifndef SUN_LEN
- # define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
--- 
-1.7.1
-

Deleted: csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff
===================================================================
--- csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff	2011-06-29 12:27:01 UTC (rev 14937)
+++ csw/mgar/pkg/libassuan/trunk/files/patch-pth_config_dir.diff	2011-06-29 14:12:42 UTC (rev 14938)
@@ -1,30 +0,0 @@
-diff -Nru libassuan-1.0.5.orig/configure libassuan-1.0.5/configure
---- libassuan-1.0.5.orig/configure	2008-05-25 03:00:36.000000000 -0500
-+++ libassuan-1.0.5/configure	2009-02-04 13:25:18.940318965 -0600
-@@ -1320,6 +1320,7 @@
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-   --with-pth-prefix=PFX   prefix where GNU Pth is installed (optional)
-+  --with-pth-config-dir=DIR  Directory containing pth-config (optionl)
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -4264,6 +4265,18 @@
-   if test x$pth_config_prefix != x ; then
-      PTH_CONFIG="$pth_config_prefix/bin/pth-config"
-   fi
-+
-+  ## Check for --with-pth-prefix and override
-+  ## --with-pth-prefix PTH_CONFIG to
-+  ## --with-pth-config-dir PTH_CONFIG
-+  if test "${with_pth_config_dir+set}" = set; then
-+      withval=$with_pth_config_dir
-+      PTH_CONFIG="${withval}/pth-config"
-+    if test ! -x ${PTH_CONFIG}; then
-+        PTH_CONFIG=""
-+    fi
-+  fi
-+
-   # Extract the first word of "pth-config", so it can be a program name with args.
- set dummy pth-config; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5


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