From: Schantl Stefan <Stevee@ipfire.org>
Date: Fri, 27 Aug 2010 09:02:19 +0000 (+0200)
Subject: libassuan: Update to 2.0.1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c790c2393c4b8f3f6029fde19806e4d7429efe2e;p=ipfire-3.x.git

libassuan: Update to 2.0.1.

Now it provides its own shared library, so we don't need the patch for it anymore.
---

diff --git a/pkgs/core/libassuan/libassuan.nm b/pkgs/core/libassuan/libassuan.nm
index ec9082425..a8e5bb6c8 100644
--- a/pkgs/core/libassuan/libassuan.nm
+++ b/pkgs/core/libassuan/libassuan.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = libassuan
-PKG_VER        = 1.0.5
+PKG_VER        = 2.0.1
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -34,8 +34,7 @@ PKG_URL        = http://www.gnupg.org/
 PKG_LICENSE    = LGPLv2+
 PKG_SUMMARY    = GnuPG IPC library.
 
-PKG_BUILD_DEPS+= autoconf automake libtool
-PKG_DEPS      += pth
+PKG_DEPS      += libgpg-error pth
 
 define PKG_DESCRIPTION
 	The Libassuan package contains an IPC library used by some of the other \
@@ -47,7 +46,3 @@ define PKG_DESCRIPTION
 endef
 
 PKG_TARBALL    = $(THISAPP).tar.bz2
-
-define STAGE_PREPARE_CMDS
-	cd $(DIR_APP) && autoreconf --install
-endef
diff --git a/pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch b/pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch
deleted file mode 100644
index 43857130c..000000000
--- a/pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libassuan-1.0.5/configure.ac.orig	2008-05-27 08:25:59.235870000 +0200
-+++ libassuan-1.0.5/configure.ac	2008-05-27 08:36:37.868258393 +0200
-@@ -44,7 +44,10 @@
- AB_INIT
- 
- AC_GNU_SOURCE
--
-+AH_TEMPLATE([_ALL_SOURCE], [All extensions])
-+AH_TEMPLATE([_GNU_SOURCE], [GNU extensions])
-+AH_TEMPLATE([_POSIX_PTHREAD_SEMANTICS], [POSIX pthread semantics])
-+AH_TEMPLATE([_TANDEM_SOURCE], [Tandem extensions])
- 
- AC_SUBST(PACKAGE)
- AC_SUBST(VERSION)
-@@ -106,11 +109,6 @@
- have_dosish_system=no
- have_w32_system=no
- case "${host}" in
--    *-linux*)
--        if test "$GCC" = yes; then
--          CFLAGS="$CFLAGS -fPIC -DPIC"
--        fi
--        ;;
-     *-mingw32*)
-         have_dosish_system=yes
-         have_w32_system=yes
diff --git a/pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch b/pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch
deleted file mode 100644
index 5491c4e33..000000000
--- a/pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- libassuan-1.0.1/src/Makefile.am.orig	2006-11-21 19:17:18.000000000 +0100
-+++ libassuan-1.0.1/src/Makefile.am	2006-11-23 19:30:28.776620250 +0100
-@@ -25,7 +25,7 @@
- MOSTLYCLEANFILES = assuan-errors.c
- 
- if HAVE_PTH
--libassuan_pth = libassuan-pth.a
-+libassuan_pth = libassuan-pth.la
- else
- libassuan_pth = 
- endif
-@@ -33,7 +33,7 @@
- bin_SCRIPTS = libassuan-config
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libassuan.m4
--lib_LIBRARIES = libassuan.a $(libassuan_pth)
-+lib_LTLIBRARIES = libassuan.la $(libassuan_pth)
- include_HEADERS = assuan.h
- 
- 
-@@ -55,13 +55,13 @@
- 	assuan-logging.c \
- 	assuan-socket.c
- 
--libassuan_a_SOURCES = $(common_sources) assuan-io.c
--libassuan_a_LIBADD = @LIBOBJS@
-+libassuan_la_SOURCES = $(common_sources) assuan-io.c
-+libassuan_la_LIBADD = @LTLIBOBJS@
- 
- if HAVE_PTH
--libassuan_pth_a_SOURCES = $(common_sources) assuan-io-pth.c
--libassuan_pth_a_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS)
--libassuan_pth_a_LIBADD = @LIBOBJS@
-+libassuan_pth_la_SOURCES = $(common_sources) assuan-io-pth.c
-+libassuan_pth_la_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS)
-+libassuan_pth_la_LIBADD = @LTLIBOBJS@ $(PTH_LIBS)
- endif
- 
- assuan-errors.c : assuan.h mkerrors
---- libassuan-0.6.0/configure.ac.orig	2003-08-06 10:34:42.000000000 +0200
-+++ libassuan-0.6.0/configure.ac	2003-08-10 11:56:23.735375928 +0200
-@@ -57,7 +57,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- #AC_ARG_PROGRAM
- 
- if test "$GCC" = yes; then
---- libassuan-0.9.3/tests/Makefile.am.orig	2006-10-10 12:05:25.000000000 +0200
-+++ libassuan-0.9.3/tests/Makefile.am	2006-10-11 12:02:10.555971000 +0200
-@@ -37,5 +37,5 @@
- 
- noinst_HEADERS = common.h
- noinst_PROGRAMS = $(TESTS)
--LDADD =  ../src/libassuan.a  $(NETLIBS) # $(GPG_ERROR_LIBS)
-+LDADD =  ../src/libassuan.la  $(NETLIBS) # $(GPG_ERROR_LIBS)
-