From 10be182c8c4196e86eddbf47c2462e915a6207b0 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Fri, 19 Aug 2016 15:00:35 +0000 Subject: [PATCH] gnupg: bump to 1.4.21, add missing aclocal to BUILD_PREREQUIRES. (#772) --- ...nupg-1.4.20.recipe => gnupg-1.4.21.recipe} | 14 ++++++++----- ...-1.4.20.patchset => gnupg-1.4.21.patchset} | 20 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) rename app-crypt/gnupg/{gnupg-1.4.20.recipe => gnupg-1.4.21.recipe} (80%) rename app-crypt/gnupg/patches/{gnupg-1.4.20.patchset => gnupg-1.4.21.patchset} (71%) diff --git a/app-crypt/gnupg/gnupg-1.4.20.recipe b/app-crypt/gnupg/gnupg-1.4.21.recipe similarity index 80% rename from app-crypt/gnupg/gnupg-1.4.20.recipe rename to app-crypt/gnupg/gnupg-1.4.21.recipe index d11f5cfea..18be7ac93 100644 --- a/app-crypt/gnupg/gnupg-1.4.20.recipe +++ b/app-crypt/gnupg/gnupg-1.4.21.recipe @@ -5,12 +5,12 @@ your data and communication, features a versatile key management system as \ well as access modules for all kinds of public key directories. GnuPG, also \ known as GPG, is a command line tool with features for easy integration with \ other applications." -HOMEPAGE="https://www.gnupg.org/" -COPYRIGHT="1998-2015 Free Software Foundation, Inc." +HOMEPAGE="https://gnupg.org/" +COPYRIGHT="1998-2016 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" -SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" -CHECKSUM_SHA256="04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc" +SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" +CHECKSUM_SHA256="6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276" PATCHES="gnupg-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -33,6 +33,7 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku_devel devel:libcurl devel:libiconv devel:libintl @@ -41,7 +42,10 @@ BUILD_REQUIRES=" devel:libz " BUILD_PREREQUIRES=" - haiku_devel + cmd:aclocal + cmd:autoconf + cmd:autoheader + cmd:automake cmd:autoreconf cmd:bison cmd:find diff --git a/app-crypt/gnupg/patches/gnupg-1.4.20.patchset b/app-crypt/gnupg/patches/gnupg-1.4.21.patchset similarity index 71% rename from app-crypt/gnupg/patches/gnupg-1.4.20.patchset rename to app-crypt/gnupg/patches/gnupg-1.4.21.patchset index 6bf900582..88a4c3305 100644 --- a/app-crypt/gnupg/patches/gnupg-1.4.20.patchset +++ b/app-crypt/gnupg/patches/gnupg-1.4.21.patchset @@ -1,11 +1,14 @@ -From: fbrosson +From 3fb03d8c66fe9e28012f87822fd84c89b06df2b4 Mon Sep 17 00:00:00 2001 +From: fbrosson Date: Thu, 18 Feb 2016 22:55:30 +0000 -Subject: [PATCH] Fix detection of libnetwork +Subject: Fix detection of libnetwork -diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac ---- gnupg-1.4.20/configure.ac 2015-12-19 14:08:22.000000000 +0000 -+++ gnupg-1.4.20-haiku/configure.ac -@@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs + +diff --git a/configure.ac b/configure.ac +index 8133537..7c90d45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs are static (or dynamic and without dnl ELF runtime link paths), then link will fail and LDAP support won't dnl be detected. @@ -22,7 +25,7 @@ diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac dnl Now try for the resolver functions so we can use DNS for SRV, PKA, dnl and CERT. -@@ -712,8 +714,8 @@ if test x"$use_dns_srv" = xyes || test x +@@ -712,8 +714,8 @@ if test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then _dns_save_libs=$LIBS LIBS="" # the double underscore thing is a glibc-ism? @@ -33,3 +36,6 @@ diff -urp gnupg-1.4.20/configure.ac gnupg-1.4.20-haiku/configure.ac AC_SEARCH_LIBS(dn_expand,resolv bind socket,, AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no)) AC_SEARCH_LIBS(dn_skipname,resolv bind socket,, +-- +2.9.2 +