diff --git a/dev-libs/libassuan/libassuan-2.5.1.recipe b/dev-libs/libassuan/libassuan-2.5.3.recipe similarity index 95% rename from dev-libs/libassuan/libassuan-2.5.1.recipe rename to dev-libs/libassuan/libassuan-2.5.3.recipe index bde70a53e..016c54ce2 100644 --- a/dev-libs/libassuan/libassuan-2.5.1.recipe +++ b/dev-libs/libassuan/libassuan-2.5.3.recipe @@ -9,15 +9,15 @@ LICENSE=" GNU GPL v3 GNU LGPL v2.1 " -REVISION="2" +REVISION="1" SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-$portVersion.tar.bz2" -CHECKSUM_SHA256="47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449" +CHECKSUM_SHA256="91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702" PATCHES="libassuan-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="0.8.1" +libVersion="0.8.3" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -70,6 +70,7 @@ INSTALL() rm $libDir/*.la prepareInstalledDevelLibs libassuan + fixPkgconfig # The config file reference other libraries using the wrong paths, which # creates a lot of confusion. Fix them so correct paths are used. diff --git a/dev-libs/libassuan/patches/libassuan-2.5.1.patchset b/dev-libs/libassuan/patches/libassuan-2.5.3.patchset similarity index 62% rename from dev-libs/libassuan/patches/libassuan-2.5.1.patchset rename to dev-libs/libassuan/patches/libassuan-2.5.3.patchset index 27e98def2..16cda041f 100644 --- a/dev-libs/libassuan/patches/libassuan-2.5.1.patchset +++ b/dev-libs/libassuan/patches/libassuan-2.5.3.patchset @@ -1,18 +1,15 @@ -From c8ac5a2281347d8df7a423885f68ed8039f26b93 Mon Sep 17 00:00:00 2001 +From a1c75ccbd1eabfa5c09b2e6afd6280ca71140547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 16 Nov 2014 15:43:14 +0100 -Subject: [PATCH] Fix setsockopt test to search for libnetwork as well +Subject: Fix setsockopt test to search for libnetwork as well Rewrite to use AC_SEARCH_LIBS. ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 9b97ad4..5d00d35 100644 +index f369e6b..f48f333 100644 --- a/configure.ac +++ b/configure.ac -@@ -284,9 +284,11 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP", +@@ -309,9 +309,11 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP", # # Check for network libraries. They are needed for tests. # @@ -27,17 +24,17 @@ index 9b97ad4..5d00d35 100644 if test "$have_w32_system" = yes; then if test "$have_w32ce_system" = yes; then -- -1.8.3.4 +2.21.0 -From 5bab7edd125430bc91abe4e0570a9ed3e05b6314 Mon Sep 17 00:00:00 2001 +From 2f8a61037fc794af3f1ebc7d4b3fd0546b29e000 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 17 Jan 2018 22:03:45 +0000 Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined. diff --git a/src/assuan.h.in b/src/assuan.h.in -index f9899d8..7136aac 100644 +index 65d3b48..f0aa22e 100644 --- a/src/assuan.h.in +++ b/src/assuan.h.in @@ -64,9 +64,14 @@ extern "C" @@ -56,5 +53,27 @@ index f9899d8..7136aac 100644 #if _ASSUAN_GCC_VERSION > 30100 #define _ASSUAN_DEPRECATED __attribute__ ((__deprecated__)) -- -2.15.1 +2.21.0 + + +From a2d818e5b6e7d16b875ab53d22b4581677678cf6 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 27 Sep 2019 20:41:20 +0200 +Subject: fd_set needs sys/select.h + + +diff --git a/src/assuan-socket.c b/src/assuan-socket.c +index bffe480..84ba050 100644 +--- a/src/assuan-socket.c ++++ b/src/assuan-socket.c +@@ -34,6 +34,7 @@ + #endif + #else + # include ++# include + # include + # include + # include +-- +2.21.0