From b937ff72af13f96f448b70bba3308caa100198e1 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 30 Aug 2017 09:38:45 +0300 Subject: [PATCH] gnupg: bump version --- app-crypt/gnupg/gnupg-1.4.11.recipe | 57 --------------- app-crypt/gnupg/gnupg-1.4.16.recipe | 72 ------------------- ...gnupg-2.1.23.recipe => gnupg-2.2.0.recipe} | 2 +- app-crypt/gnupg/patches/gnupg-1.4.11.patch | 27 ------- app-crypt/gnupg/patches/gnupg-1.4.16.patchset | 44 ------------ ...g-2.1.23.patchset => gnupg-2.2.0.patchset} | 0 6 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 app-crypt/gnupg/gnupg-1.4.11.recipe delete mode 100644 app-crypt/gnupg/gnupg-1.4.16.recipe rename app-crypt/gnupg/{gnupg-2.1.23.recipe => gnupg-2.2.0.recipe} (97%) delete mode 100644 app-crypt/gnupg/patches/gnupg-1.4.11.patch delete mode 100644 app-crypt/gnupg/patches/gnupg-1.4.16.patchset rename app-crypt/gnupg/patches/{gnupg-2.1.23.patchset => gnupg-2.2.0.patchset} (100%) diff --git a/app-crypt/gnupg/gnupg-1.4.11.recipe b/app-crypt/gnupg/gnupg-1.4.11.recipe deleted file mode 100644 index ca2e164d5..000000000 --- a/app-crypt/gnupg/gnupg-1.4.11.recipe +++ /dev/null @@ -1,57 +0,0 @@ -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="http://www.gnupg.org/" -COPYRIGHT="1998-2010 Free Software Foundation, Inc." -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.11.tar.bz2" -CHECKSUM_SHA256="d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6" -PATCHES="gnupg-1.4.11.patch" - -ARCHITECTURES="x86 x86_gcc2" - -PROVIDES=" - gnupg = $portVersion - cmd:gpg = $portVersion compat >= 1.4 - cmd:gpg_zip = $portVersion compat >= 1.4 - cmd:gpgsplit = $portVersion compat >= 1.4 - cmd:gpgv = $portVersion compat >= 1.4 - " -REQUIRES=" - haiku - lib:libz - " - -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - " - -BUILD() -{ - libtoolize --force --copy --install - autoconf - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install -} - -TEST() -{ - make check -} diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe deleted file mode 100644 index 5ec0b216e..000000000 --- a/app-crypt/gnupg/gnupg-1.4.16.recipe +++ /dev/null @@ -1,72 +0,0 @@ -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="http://www.gnupg.org/" -COPYRIGHT="1998-2010 Free Software Foundation, Inc." -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" -CHECKSUM_SHA256="7b3b748e6aaa338092a0b26b1730cd9355765b55e3684f58dd70f9a1b00f4a2f" -PATCHES="gnupg-1.4.16.patchset" - -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PROVIDES=" - gnupg = $portVersion - cmd:gpg = $portVersion compat >= 1.4 - cmd:gpg_zip = $portVersion compat >= 1.4 - cmd:gpgsplit = $portVersion compat >= 1.4 - cmd:gpgv = $portVersion compat >= 1.4 - " -REQUIRES=" - haiku - lib:libcurl - lib:libiconv - lib:libintl - lib:libreadline - lib:libusb_0.1 - lib:libz - " - -BUILD_REQUIRES=" - devel:libcurl - devel:libiconv - devel:libintl - devel:libreadline - devel:libusb_0.1 - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:autoconf - cmd:bison - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - cmd:msgfmt - cmd:perl - cmd:tar - " - -BUILD() -{ - #libtoolize --force --copy --install - autoconf - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install -} - -TEST() -{ - make check -} diff --git a/app-crypt/gnupg/gnupg-2.1.23.recipe b/app-crypt/gnupg/gnupg-2.2.0.recipe similarity index 97% rename from app-crypt/gnupg/gnupg-2.1.23.recipe rename to app-crypt/gnupg/gnupg-2.2.0.recipe index dfa665b7f..fdee1bfff 100644 --- a/app-crypt/gnupg/gnupg-2.1.23.recipe +++ b/app-crypt/gnupg/gnupg-2.2.0.recipe @@ -10,7 +10,7 @@ COPYRIGHT="1998-2017 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2" -CHECKSUM_SHA256="a94476391595e9351f219188767a9d6ea128e83be5ed3226a7890f49aa2d0d77" +CHECKSUM_SHA256="d4514a0be0f7a1ff263193330019eb4b53c82f0f5e230af3c14df371271a45e6" PATCHES="gnupg-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" diff --git a/app-crypt/gnupg/patches/gnupg-1.4.11.patch b/app-crypt/gnupg/patches/gnupg-1.4.11.patch deleted file mode 100644 index d3ac815ef..000000000 --- a/app-crypt/gnupg/patches/gnupg-1.4.11.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up gnupg-1.4.11/configure.ac.orig gnupg-1.4.11/configure.ac ---- gnupg-1.4.11/configure.ac.orig 2010-02-17 15:06:58.390594560 -0700 -+++ gnupg-1.4.11/configure.ac 2010-02-17 15:07:20.451936256 -0700 -@@ -657,6 +657,8 @@ dnl be detected. - - AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, - [NETLIBS="-lnsl $NETLIBS"])) -+AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(network, gethostbyname, -+ [NETLIBS="-lnetwork $NETLIBS"])) - AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, - [NETLIBS="-lsocket $NETLIBS"])) - -diff -up gnupg-1.4.11/util/dotlock.c.orig gnupg-1.4.11/util/dotlock.c ---- gnupg-1.4.11/util/dotlock.c.orig 2010-02-17 15:07:04.697040896 -0700 -+++ gnupg-1.4.11/util/dotlock.c 2010-02-17 15:07:12.601620480 -0700 -@@ -432,7 +432,11 @@ make_dotlock( DOTLOCK h, long timeout ) - { - #ifndef HAVE_DOSISH_SYSTEM - # ifndef __riscos__ -+# ifdef __HAIKU__ -+ if( !symlink(h->tname, h->lockname) ) -+# else - if( !link(h->tname, h->lockname) ) -+# endif - { - /* fixme: better use stat to check the link count */ - h->locked = 1; diff --git a/app-crypt/gnupg/patches/gnupg-1.4.16.patchset b/app-crypt/gnupg/patches/gnupg-1.4.16.patchset deleted file mode 100644 index ed33eabb2..000000000 --- a/app-crypt/gnupg/patches/gnupg-1.4.16.patchset +++ /dev/null @@ -1,44 +0,0 @@ -From b6a2edd27beef20ef6fc938ea930397e5d7bd484 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Sat, 8 Nov 2014 02:08:06 +0100 -Subject: [PATCH] Fix detection of libnetwork - ---- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index af78185..7649857 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -673,10 +673,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. - --AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, -- [NETLIBS="-lnsl $NETLIBS"])) --AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, -- [NETLIBS="-lsocket $NETLIBS"])) -+_net_save_libs=$LIBS -+LIBS="" -+AC_SEARCH_LIBS(gethostbyname, nsl network) -+AC_SEARCH_LIBS(setsockopt, network socket) -+NETLIBS="$LIBS" -+LIBS="$_net_save_libs" - - dnl Now try for the resolver functions so we can use DNS for SRV, PKA, - dnl and CERT. -@@ -704,8 +706,8 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns - _dns_save_libs=$LIBS - LIBS="" - # the double underscore thing is a glibc-ism? -- AC_SEARCH_LIBS(res_query,resolv bind socket,, -- AC_SEARCH_LIBS(__res_query,resolv bind socket,,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 socket,, - AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no)) - AC_SEARCH_LIBS(dn_skipname,resolv bind socket,, --- -1.8.3.4 - diff --git a/app-crypt/gnupg/patches/gnupg-2.1.23.patchset b/app-crypt/gnupg/patches/gnupg-2.2.0.patchset similarity index 100% rename from app-crypt/gnupg/patches/gnupg-2.1.23.patchset rename to app-crypt/gnupg/patches/gnupg-2.2.0.patchset