gnupg, bump version, cleanup (#9269)

app-crypt/gnupg/gnupg-1.4.23.recipe

@@ -1,68 +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="https://gnupg.org/"
-COPYRIGHT="1998-2018 Free Software Foundation, Inc."
-LICENSE="GNU GPL v3"
-REVISION="4"
-SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba"
-PATCHES="gnupg-$portVersion.patchset"
-
-ARCHITECTURES="!x86_gcc2"
-
-PROVIDES="
-	gnupg = $portVersion
-	cmd:gpg = $portVersion
-	cmd:gpg_zip = $portVersion
-	cmd:gpgsplit = $portVersion
-	cmd:gpgv = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libcurl
-	lib:libiconv
-	lib:libintl
-	lib:libreadline
-	lib:libssl
-	lib:libusb_0.1
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libcurl
-	devel:libiconv
-	devel:libintl
-	devel:libreadline
-	devel:libusb_0.1
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:gcc
-	cmd:libtoolize
-	cmd:make
-	"
-
-BUILD()
-{
-	autoreconf -vfi
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make check
-}

app-crypt/gnupg/gnupg-2.4.3.recipe

@@ -31,7 +31,7 @@ LICENSE="CC0 v1.0
 	GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="562a3350dcf66cb67c5825c67ff2c2904db1e30ec8e1d353adc14efba9abf43f"
+CHECKSUM_SHA256="a271ae6d732f6f4d80c258ad9ee88dd9c94c8fdc33c3e45328c4d7c126bd219d"
 PATCHES="gnupg-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -41,6 +41,7 @@ PROVIDES="
 	gnupg$secondaryArchSuffix = $portVersion
 	cmd:addgnupghome$secondaryArchSuffix
 	cmd:applygnupgdefaults$secondaryArchSuffix
+	cmd:gpg_card$secondaryArchSuffix
 	cmd:convert_from_106$secondaryArchSuffix
 	cmd:dirmngr$secondaryArchSuffix
 	cmd:dirmngr_client$secondaryArchSuffix
@@ -48,6 +49,7 @@ PROVIDES="
 	cmd:gpg_agent$secondaryArchSuffix
 	cmd:gpg_check_pattern$secondaryArchSuffix
 	cmd:gpg_connect_agent$secondaryArchSuffix
+	cmd:gpg_wks_client$secondaryArchSuffix
 	cmd:gpg_wks_server$secondaryArchSuffix
 	cmd:gpg_zip$secondaryArchSuffix
 	cmd:gpgconf$secondaryArchSuffix
@@ -112,6 +114,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
+	cmd:makeinfo
 	cmd:perl
 	cmd:pinentry$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
@@ -131,14 +134,16 @@ BUILD()
 		--enable-wks-tools \
 		--with-bzip2
 	make $jobArgs
+	make -C doc html
 }
 
 INSTALL()
 {
 	make install
+	make -C doc install-html
 	# Extra tools, gentoo does the same
-	for f in convert-from-106 gpg-check-pattern gpg-zip lspgpot \
-		mail-signed-keys make-dns-cert; do
+	for f in convert-from-106 gpg-check-pattern lspgpot gpgconf gpgsplit \
+		gpg-check-pattern mail-signed-keys make-dns-cert; do
 		cp -r tools/$f $binDir/
 	done
 }

app-crypt/gnupg/patches/gnupg-1.4.23.patchset

@@ -1,41 +0,0 @@
-From fce1e481c1fcab3066ef605d22d1858553fb80a6 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Thu, 18 Feb 2016 22:55:30 +0000
-Subject: Fix detection of libnetwork
-
-
-diff --git a/configure.ac b/configure.ac
-index b92440c..ca144b0 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.
- 
--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.
-@@ -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?
--  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,,
--- 
-2.15.1
-

app-crypt/gnupg/patches/gnupg-2.4.3.patchset

@@ -1,14 +1,14 @@
-From f76b48249004a87eab81fdbb9a379ba1cf0df2ef Mon Sep 17 00:00:00 2001
+From 959126139d9f92acd0258bb8feaaaad8d02aab13 Mon Sep 17 00:00:00 2001
 From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com>
 Date: Tue, 14 Jul 2020 13:55:34 -0600
 Subject: Fix detection of libnetwork
 
 
 diff --git a/configure.ac b/configure.ac
-index 35822fe..bcc347e 100644
+index e68b779..ec2c9e2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1071,11 +1071,9 @@ AC_MSG_NOTICE([checking for networking options])
+@@ -1083,10 +1083,9 @@ AC_MSG_NOTICE([checking for networking options])
  # ELF runtime link paths), then link will fail and LDAP support won't
  # be detected.
  #
@@ -16,14 +16,13 @@ index 35822fe..bcc347e 100644
 -	[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"
  
+ 
  #
- # Check standard resolver functions.
-@@ -1088,8 +1086,8 @@ if test "$build_dirmngr" = "yes"; then
+@@ -1100,8 +1099,8 @@ if test "$build_dirmngr" = "yes"; then
    # the dirmngr option --standard-resolver.
  
    # the double underscore thing is a glibc-ism?
@@ -35,20 +34,20 @@ index 35822fe..bcc347e 100644
                   AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
  
 -- 
-2.30.2
+2.37.3
 
 
-From 7264cdb62f60ce41c60c54af1f7351f362a114bf Mon Sep 17 00:00:00 2001
+From 43060d62dec015d25d88e67d0dddb34334a3abb7 Mon Sep 17 00:00:00 2001
 From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com>
 Date: Tue, 14 Jul 2020 13:59:24 -0600
 Subject: Add settings path for Haiku
 
 
 diff --git a/configure.ac b/configure.ac
-index bcc347e..b88b0e1 100644
+index ec2c9e2..de0e3ab 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -503,6 +503,8 @@ AH_BOTTOM([
+@@ -517,6 +517,8 @@ AH_BOTTOM([
  # endif
  #elif defined(__VMS)
  #define GNUPG_DEFAULT_HOMEDIR "/SYS$LOGIN/gnupg"
@@ -58,5 +57,5 @@ index bcc347e..b88b0e1 100644
  #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
  #endif
 -- 
-2.30.2
+2.37.3