From f019743418ec7b42ec41add73c5d259bb766c714 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 22 Mar 2017 10:37:07 +0000 Subject: [PATCH] gnupg: add recipe for version 2.1.19 (#1237) --- app-crypt/gnupg/gnupg-2.1.19.recipe | 94 +++++++++++++++++++ app-crypt/gnupg/patches/gnupg-2.1.19.patchset | 61 ++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 app-crypt/gnupg/gnupg-2.1.19.recipe create mode 100644 app-crypt/gnupg/patches/gnupg-2.1.19.patchset diff --git a/app-crypt/gnupg/gnupg-2.1.19.recipe b/app-crypt/gnupg/gnupg-2.1.19.recipe new file mode 100644 index 000000000..3f4659636 --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.1.19.recipe @@ -0,0 +1,94 @@ +SUMMARY="The GNU project's free implementation of the OpenPGP standard" +DESCRIPTION="GnuPG is the GNU project's complete and free implementation of \ +the OpenPGP standard as defined by RFC4880 . GnuPG allows to encrypt and sign \ +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://gnupg.org/" +COPYRIGHT="1998-2016 Free Software Foundation, Inc." +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" +CHECKSUM_SHA256="46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0" +PATCHES="gnupg-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + gnupg$secondaryArchSuffix = $portVersion + cmd:addgnupghome$secondaryArchSuffix + cmd:applygnupgdefaults$secondaryArchSuffix + cmd:dirmngr_client$secondaryArchSuffix + cmd:dirmngr$secondaryArchSuffix + cmd:gpg$secondaryArchSuffix + cmd:gpg_zip$secondaryArchSuffix + cmd:gpgsplit$secondaryArchSuffix + cmd:gpg_agent$secondaryArchSuffix + cmd:gpg_connect_agent$secondaryArchSuffix + cmd:gpg2$secondaryArchSuffix + cmd:gpgconf$secondaryArchSuffix + cmd:gpgparsemail$secondaryArchSuffix + cmd:gpgscm$secondaryArchSuffix + cmd:gpgsm$secondaryArchSuffix + cmd:gpgtar$secondaryArchSuffix + cmd:gpgv2$secondaryArchSuffix + cmd:gpgv$secondaryArchSuffix + cmd:kbxutil$secondaryArchSuffix + cmd:watchgnupg$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libgpg_error$secondaryArchSuffix + lib:libgcrypt$secondaryArchSuffix + lib:libassuan$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libksba$secondaryArchSuffix + lib:libnpth$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix + lib:libusb_1.0$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libgpg_error$secondaryArchSuffix + devel:libgcrypt$secondaryArchSuffix + devel:libassuan$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libksba$secondaryArchSuffix + devel:libnpth$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libusb_1.0$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + autogen.sh + runConfigure ./configure \ + --libexecdir=$libDir/gnupg + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} diff --git a/app-crypt/gnupg/patches/gnupg-2.1.19.patchset b/app-crypt/gnupg/patches/gnupg-2.1.19.patchset new file mode 100644 index 000000000..4f97a5481 --- /dev/null +++ b/app-crypt/gnupg/patches/gnupg-2.1.19.patchset @@ -0,0 +1,61 @@ +From 971db23d4c872cdd4daee96f3ea55eb1b5879c0e Mon Sep 17 00:00:00 2001 +From: begasus +Date: Tue, 21 Mar 2017 11:13:43 +0000 +Subject: patch source file to use "extern char" instead of "static const char" + + +diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c +index b2ff721..e89ce32 100644 +--- a/tests/gpgscm/scheme.c ++++ b/tests/gpgscm/scheme.c +@@ -89,7 +89,7 @@ static int stricmp(const char *s1, const char *s2) + #endif /* __APPLE__ */ + + #if USE_STRLWR +-static const char *strlwr(char *s) { ++extern char *strlwr(char *s) { + const char *p=s; + while(*s) { + *s=tolower(*s); +-- +2.7.0 + + +From e6d7b1f0ea81cee4f8da51853a019177515929af Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Thu, 18 Feb 2016 22:55:30 +0000 +Subject: Fix detection of libnetwork + + +diff --git a/configure.ac b/configure.ac +index 4b9ceca..c5fecc8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1015,10 +1015,9 @@ AC_MSG_NOTICE([checking for networking options]) + # ELF runtime link paths), then link will fail and LDAP support won't + # be detected. + # +-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, +- [NETLIBS="-lnsl $NETLIBS"])) +-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, +- [NETLIBS="-lsocket $NETLIBS"])) ++AC_SEARCH_LIBS(gethostbyname, nsl network) ++AC_SEARCH_LIBS(setsockopt, network socket) ++NETLIBS="$LIBS" + + + # +@@ -1032,8 +1031,8 @@ if test "$build_dirmngr" = "yes"; then + # the dirmngr option --standard-resolver. + + # the double underscore thing is a glibc-ism? +- AC_SEARCH_LIBS(res_query,resolv bind,, +- AC_SEARCH_LIBS(__res_query,resolv bind,,have_resolver=no)) ++ AC_SEARCH_LIBS(res_query,resolv network bind socket,, ++ AC_SEARCH_LIBS(__res_query,resolv network bind socket,,have_resolver=no)) + AC_SEARCH_LIBS(dn_expand,resolv bind,, + AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no)) + +-- +2.7.0 +