From ec94a0e78fbc63d4f3a20f7c568b7835521ca36c Mon Sep 17 00:00:00 2001 From: Oleg Borodin Date: Fri, 5 May 2023 13:33:17 +0200 Subject: [PATCH] gpg2 updated --- crypto/gnupg2/Makefile | 7 +- crypto/gnupg2/distinfo | 9 +- crypto/gnupg2/files/patch-dirmngr_server.c | 13 +++ crypto/gnupg2/files/patch-x-Makefile.in | 11 --- crypto/gnupg2/files/patch-x-doc-Makefile.in | 23 ----- crypto/gnupg2/pkg-plist | 98 ++++++++++++++----- crypto/gpgme/Makefile | 2 +- crypto/gpgme/distinfo | 5 +- crypto/gpgme/files/patch-configure | 19 ++++ .../gpgme/files/patch-lang_python_Makefile.in | 29 ++++++ crypto/gpgme/files/patch-x-configure | 13 +++ crypto/gpgme/pkg-plist | 8 +- crypto/libassuan/Makefile | 2 +- crypto/libassuan/distinfo | 5 +- crypto/libassuan/files/patch-x-configure | 15 +++ crypto/libassuan/pkg-plist | 2 + crypto/libgcrypt/Makefile | 2 +- crypto/libgcrypt/distinfo | 5 +- crypto/libgcrypt/files/extra-patch-no-info | 20 ++++ crypto/libgcrypt/files/patch-gcrypt.h.in | 20 ---- crypto/libgcrypt/files/patch-mpi_config.links | 13 +++ .../files/patch-random_jitterentropy-base.c | 10 ++ crypto/libgcrypt/files/patch-tests_basic.c | 29 ++++++ crypto/libgcrypt/files/patch-x-configure | 15 +++ crypto/libgcrypt/pkg-plist | 6 +- crypto/libgpg-error/Makefile | 4 +- crypto/libgpg-error/distinfo | 5 +- crypto/libgpg-error/files/patch-x-configure | 13 +++ crypto/libgpg-error/pkg-plist | 64 +++++++++++- crypto/libksba/Makefile | 2 +- crypto/libksba/distinfo | 5 +- crypto/libksba/files/patch-x-configure | 15 +++ crypto/libksba/pkg-plist | 2 + crypto/libnpth/Makefile | 2 +- crypto/libnpth/distinfo | 5 +- crypto/libnpth/files/patch-x-configure | 15 +++ 36 files changed, 400 insertions(+), 113 deletions(-) create mode 100644 crypto/gnupg2/files/patch-dirmngr_server.c delete mode 100644 crypto/gnupg2/files/patch-x-Makefile.in delete mode 100644 crypto/gnupg2/files/patch-x-doc-Makefile.in create mode 100644 crypto/gpgme/files/patch-configure create mode 100644 crypto/gpgme/files/patch-lang_python_Makefile.in create mode 100644 crypto/gpgme/files/patch-x-configure create mode 100644 crypto/libassuan/files/patch-x-configure create mode 100644 crypto/libgcrypt/files/extra-patch-no-info delete mode 100644 crypto/libgcrypt/files/patch-gcrypt.h.in create mode 100644 crypto/libgcrypt/files/patch-mpi_config.links create mode 100644 crypto/libgcrypt/files/patch-random_jitterentropy-base.c create mode 100644 crypto/libgcrypt/files/patch-tests_basic.c create mode 100644 crypto/libgcrypt/files/patch-x-configure create mode 100644 crypto/libgpg-error/files/patch-x-configure create mode 100644 crypto/libksba/files/patch-x-configure create mode 100644 crypto/libnpth/files/patch-x-configure diff --git a/crypto/gnupg2/Makefile b/crypto/gnupg2/Makefile index dc0db947..3bb9a478 100644 --- a/crypto/gnupg2/Makefile +++ b/crypto/gnupg2/Makefile @@ -2,7 +2,7 @@ # $Id$ # PORTNAME= gnupg -PORTVERSION= 2.1.1 +PORTVERSION= 2.3.8 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -49,10 +49,5 @@ INFO= gnupg verify: checksum gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig -post-patch: -# ${REINPLACE_CMD} -e "s@-lpthread@${PTHREAD_LIBS}@g" ${CONFIGURE_SUB} \ -# ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${WRKSRC}/configure - ${REINPLACE_CMD} -e "/#include /d" ${WRKSRC}/tools/symcryptrun.c - .include #EOF diff --git a/crypto/gnupg2/distinfo b/crypto/gnupg2/distinfo index 6e7b465a..775bd964 100644 --- a/crypto/gnupg2/distinfo +++ b/crypto/gnupg2/distinfo @@ -1,4 +1,5 @@ -SHA256 (gnupg-2.1.1.tar.bz2) = 70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49 -SIZE (gnupg-2.1.1.tar.bz2) = 4801472 -SHA256 (gnupg-2.1.1.tar.bz2.sig) = b7442981adee5eee70b89556b6e0926b57f886188cbd419060aaaf822ba380da -SIZE (gnupg-2.1.1.tar.bz2.sig) = 574 +TIMESTAMP = 1683284130 +SHA256 (gnupg-2.3.8.tar.bz2) = 540b7a40e57da261fb10ef521a282e0021532a80fd023e75fb71757e8a4969ed +SIZE (gnupg-2.3.8.tar.bz2) = 7644926 +SHA256 (gnupg-2.3.8.tar.bz2.sig) = e324dc29d7a45eed4916521577c85572bf4a62b51a76f5d4d05b30fb7fa5dc67 +SIZE (gnupg-2.3.8.tar.bz2.sig) = 238 diff --git a/crypto/gnupg2/files/patch-dirmngr_server.c b/crypto/gnupg2/files/patch-dirmngr_server.c new file mode 100644 index 00000000..3a20a369 --- /dev/null +++ b/crypto/gnupg2/files/patch-dirmngr_server.c @@ -0,0 +1,13 @@ +--- dirmngr/server.c.orig 2022-10-07 13:23:50 UTC ++++ dirmngr/server.c +@@ -3137,8 +3137,10 @@ start_command_handler (assuan_fd_t fd, unsigned int se + ctrl->refcount); + else + { ++#if USE_LDAP + ks_ldap_free_state (ctrl->ks_get_state); + ctrl->ks_get_state = NULL; ++#endif /*USE_LDAP*/ + release_ctrl_ocsp_certs (ctrl); + xfree (ctrl->server_local); + dirmngr_deinit_default_ctrl (ctrl); diff --git a/crypto/gnupg2/files/patch-x-Makefile.in b/crypto/gnupg2/files/patch-x-Makefile.in deleted file mode 100644 index 8cc58b21..00000000 --- a/crypto/gnupg2/files/patch-x-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2014-12-16 16:55:34.000000000 +0200 -+++ ./Makefile.in 2014-12-31 00:15:30.000000000 +0200 -@@ -885,7 +885,7 @@ - - info-am: - --install-data-am: install-dist_docDATA -+install-data-am: - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-recursive diff --git a/crypto/gnupg2/files/patch-x-doc-Makefile.in b/crypto/gnupg2/files/patch-x-doc-Makefile.in deleted file mode 100644 index f94daa1f..00000000 --- a/crypto/gnupg2/files/patch-x-doc-Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ ---- ./doc/Makefile.in.orig 2014-12-16 16:55:33.000000000 +0200 -+++ ./doc/Makefile.in 2014-12-31 00:15:30.000000000 +0200 -@@ -377,10 +377,10 @@ - myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \ - watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ - gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \ -- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \ -+ gpgsm-gencert.sh.1 applygnupgdefaults.8 \ - dirmngr-client.1 - --man_MANS = $(myman_pages) gnupg.7 -+man_MANS = $(myman_pages) - watchgnupg_SOURCE = gnupg.texi - CLEANFILES = yat2m faq.txt faq.html - DISTCLEANFILES = gnupg.tmp gnupg.ops yat2m-stamp.tmp yat2m-stamp \ -@@ -874,7 +874,6 @@ - info-am: $(INFO_DEPS) - - install-data-am: install-dist_pkgdataDATA install-info-am install-man \ -- install-nobase_dist_docDATA - - install-dvi: install-dvi-am - diff --git a/crypto/gnupg2/pkg-plist b/crypto/gnupg2/pkg-plist index 79cc86ba..378181c5 100644 --- a/crypto/gnupg2/pkg-plist +++ b/crypto/gnupg2/pkg-plist @@ -1,27 +1,78 @@ bin/dirmngr bin/dirmngr-client -bin/g13 +bin/gpg bin/gpg-agent +bin/gpg-card bin/gpg-connect-agent -bin/gpg2 +bin/gpg-wks-client +bin/gpg-wks-server bin/gpgconf -bin/gpgkey2 bin/gpgparsemail +bin/gpgscm bin/gpgsm -bin/gpgsm-gencert +bin/gpgsplit bin/gpgtar -bin/gpgv2 +bin/gpgv bin/kbxutil bin/watchgnupg -sbin/addgnupghome -sbin/applygnupgdefaults +libexec/gpg-auth libexec/gpg-check-pattern +libexec/gpg-pair-tool libexec/gpg-preset-passphrase libexec/gpg-protect-tool +libexec/gpg-wks-client +libexec/keyboxd libexec/scdaemon -share/gnupg/com-certs.pem +man/man1/dirmngr-client.1.gz +man/man1/gpg-agent.1.gz +man/man1/gpg-card.1.gz +man/man1/gpg-check-pattern.1.gz +man/man1/gpg-connect-agent.1.gz +man/man1/gpg-preset-passphrase.1.gz +man/man1/gpg-wks-client.1.gz +man/man1/gpg-wks-server.1.gz +man/man1/gpg.1.gz +man/man1/gpgconf.1.gz +man/man1/gpgparsemail.1.gz +man/man1/gpgsm.1.gz +man/man1/gpgtar.1.gz +man/man1/gpgv.1.gz +man/man1/scdaemon.1.gz +man/man1/watchgnupg.1.gz +man/man7/gnupg.7.gz +man/man8/addgnupghome.8.gz +man/man8/applygnupgdefaults.8.gz +man/man8/dirmngr.8.gz +sbin/addgnupghome +sbin/applygnupgdefaults +share/doc/gnupg/DCO +share/doc/gnupg/DETAILS +share/doc/gnupg/examples/Automatic.prf +share/doc/gnupg/examples/common.conf +share/doc/gnupg/examples/debug.prf +share/doc/gnupg/examples/gpgconf.conf +share/doc/gnupg/examples/gpgconf.rnames +share/doc/gnupg/examples/pwpattern.list +share/doc/gnupg/examples/qualified.txt +share/doc/gnupg/examples/README +share/doc/gnupg/examples/scd-event +share/doc/gnupg/examples/systemd-user/dirmngr.service +share/doc/gnupg/examples/systemd-user/dirmngr.socket +share/doc/gnupg/examples/systemd-user/gpg-agent-browser.socket +share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket +share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket +share/doc/gnupg/examples/systemd-user/gpg-agent.service +share/doc/gnupg/examples/systemd-user/gpg-agent.socket +share/doc/gnupg/examples/systemd-user/README +share/doc/gnupg/examples/trustlist.txt +share/doc/gnupg/examples/VS-NfD.prf +share/doc/gnupg/FAQ +share/doc/gnupg/HACKING +share/doc/gnupg/KEYSERVER +share/doc/gnupg/OpenPGP +share/doc/gnupg/README +share/doc/gnupg/TRANSLATE share/gnupg/distsigkey.gpg -share/gnupg/gpg-conf.skel share/gnupg/help.be.txt share/gnupg/help.ca.txt share/gnupg/help.cs.txt @@ -40,8 +91,8 @@ share/gnupg/help.it.txt share/gnupg/help.ja.txt share/gnupg/help.nb.txt share/gnupg/help.pl.txt -share/gnupg/help.pt.txt share/gnupg/help.pt_BR.txt +share/gnupg/help.pt.txt share/gnupg/help.ro.txt share/gnupg/help.ru.txt share/gnupg/help.sk.txt @@ -50,7 +101,11 @@ share/gnupg/help.tr.txt share/gnupg/help.txt share/gnupg/help.zh_CN.txt share/gnupg/help.zh_TW.txt -share/gnupg/qualified.txt +share/gnupg/sks-keyservers.netCA.pem +share/info/gnupg.info +share/info/gnupg.info-1 +share/info/gnupg.info-2 +share/info/gnupg.info-3 share/locale/ca/LC_MESSAGES/gnupg2.mo share/locale/cs/LC_MESSAGES/gnupg2.mo share/locale/da/LC_MESSAGES/gnupg2.mo @@ -79,23 +134,12 @@ share/locale/tr/LC_MESSAGES/gnupg2.mo share/locale/uk/LC_MESSAGES/gnupg2.mo share/locale/zh_CN/LC_MESSAGES/gnupg2.mo share/locale/zh_TW/LC_MESSAGES/gnupg2.mo -man/man1/dirmngr-client.1.gz -man/man1/gpg-agent.1.gz -man/man1/gpg-connect-agent.1.gz -man/man1/gpg-preset-passphrase.1.gz -man/man1/gpg2.1.gz -man/man1/gpgconf.1.gz -man/man1/gpgparsemail.1.gz -man/man1/gpgsm-gencert.1.gz -man/man1/gpgsm.1.gz -man/man1/gpgv2.1.gz -man/man1/scdaemon.1.gz -man/man1/symcryptrun.1.gz -man/man1/watchgnupg.1.gz -man/man8/addgnupghome.8.gz -man/man8/applygnupgdefaults.8.gz -man/man8/dirmngr.8.gz +@dir share/doc/gnupg/examples/systemd-user +@dir share/doc/gnupg/examples +@dir share/doc/gnupg +@dir share/doc @dir share/gnupg +@dir share/info @dir share/locale/ca/LC_MESSAGES @dir share/locale/ca @dir share/locale/cs/LC_MESSAGES diff --git a/crypto/gpgme/Makefile b/crypto/gpgme/Makefile index eb35acfd..bd87123d 100644 --- a/crypto/gpgme/Makefile +++ b/crypto/gpgme/Makefile @@ -2,7 +2,7 @@ # $Id$ # PORTNAME= gpgme -PORTVERSION= 1.5.1 +PORTVERSION= 1.20.0 CATEGORIES= security MASTER_SITES= GNUPG/gpgme diff --git a/crypto/gpgme/distinfo b/crypto/gpgme/distinfo index 52cc9afb..4f0b15d8 100644 --- a/crypto/gpgme/distinfo +++ b/crypto/gpgme/distinfo @@ -1,2 +1,3 @@ -SHA256 (gpgme-1.5.1.tar.bz2) = 6c2f3af8ceeb303277d44ec0216d9a1271701f65b91d5942264cf7cefb4a11e3 -SIZE (gpgme-1.5.1.tar.bz2) = 964623 +TIMESTAMP = 1683283290 +SHA256 (gpgme-1.20.0.tar.bz2) = 25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 +SIZE (gpgme-1.20.0.tar.bz2) = 1817377 diff --git a/crypto/gpgme/files/patch-configure b/crypto/gpgme/files/patch-configure new file mode 100644 index 00000000..d54dc986 --- /dev/null +++ b/crypto/gpgme/files/patch-configure @@ -0,0 +1,19 @@ +The configure script automatically detects all versions of Python and builds +the bindings for each found version. This is a problem when building outside +of a clean environment since the ports system can only build a package for one +Python flavor at a time. The found versions of Python are overridden by +environment variables set in the port Makefile. + +--- configure.orig 2019-03-26 17:29:46 UTC ++++ configure +@@ -23851,6 +23851,10 @@ $as_echo "$as_me: WARNING: + + fi + ++ # Override the automatically found Pythons with the selected version from ports. ++ PYTHONS=$BSD_PYTHON ++ PYTHON_VERSIONS=$BSD_PYTHON_VERSION ++ + # Recover some values lost in the second attempt to find Python. + PYTHON="$(echo $PYTHONS | cut -d ' ' -f 1)" + PYTHON_VERSION="$(echo $PYTHON_VERSIONS | cut -d ' ' -f 1)" diff --git a/crypto/gpgme/files/patch-lang_python_Makefile.in b/crypto/gpgme/files/patch-lang_python_Makefile.in new file mode 100644 index 00000000..227ab2c5 --- /dev/null +++ b/crypto/gpgme/files/patch-lang_python_Makefile.in @@ -0,0 +1,29 @@ +First hunk: +The swig executable from devel/swig30 is named 'swig3.0' and the build system +only looks for an executable named 'swig': +unable to execute 'swig': No such file or directory + +Second hunk: +Fix staging and build the *.pyc and *.pyo files + +--- lang/python/Makefile.in.orig 2017-12-12 11:56:08 UTC ++++ lang/python/Makefile.in +@@ -740,7 +740,7 @@ all-local: copystamp + CFLAGS="$(CFLAGS)" \ + srcdir="$(srcdir)" \ + top_builddir="$(top_builddir)" \ +- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \ ++ $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" build_ext --swig=$(SWIG) ; \ + done + + python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp +@@ -782,7 +782,8 @@ install-exec-local: + build \ + --build-base="$$(basename "$${PYTHON}")-gpg" \ + install \ +- --prefix "$(DESTDIR)$(prefix)" \ ++ -c -O1 --prefix=$(prefix) \ ++ --root=$(DESTDIR) \ + --verbose ; \ + done + diff --git a/crypto/gpgme/files/patch-x-configure b/crypto/gpgme/files/patch-x-configure new file mode 100644 index 00000000..43359d03 --- /dev/null +++ b/crypto/gpgme/files/patch-x-configure @@ -0,0 +1,13 @@ +--- ./configure~ 2023-05-05 12:41:51.278992000 +0200 ++++ ./configure 2023-05-05 12:51:45.672880000 +0200 +@@ -2919,8 +2919,8 @@ + # (Interfaces added: AGE++) + # (Interfaces removed: AGE=0) + # +-LIBGPGME_LT_CURRENT=40 +-LIBGPGME_LT_AGE=29 ++LIBGPGME_LT_CURRENT=24 ++LIBGPGME_LT_AGE=24 + LIBGPGME_LT_REVISION=0 + + # If there is an ABI break in gpgmepp or qgpgme also bump the diff --git a/crypto/gpgme/pkg-plist b/crypto/gpgme/pkg-plist index b8dd1eb7..6d19dab6 100644 --- a/crypto/gpgme/pkg-plist +++ b/crypto/gpgme/pkg-plist @@ -1,7 +1,13 @@ -bin/gpgme-config +bin/gpgme-json +bin/gpgme-tool include/gpgme/gpgme.h lib/libgpgme.la lib/libgpgme.so lib/libgpgme.so.24 +lib/pkgconfig/gpgme-glib.pc +lib/pkgconfig/gpgme.pc share/aclocal/gpgme.m4 +share/info/gpgme.info +share/info/gpgme.info-1 +share/info/gpgme.info-2 @dir include/gpgme diff --git a/crypto/libassuan/Makefile b/crypto/libassuan/Makefile index 816ec833..382849e5 100644 --- a/crypto/libassuan/Makefile +++ b/crypto/libassuan/Makefile @@ -2,7 +2,7 @@ # $Id$ # PORTNAME= libassuan -PORTVERSION= 2.1.3 +PORTVERSION= 2.5.5 CATEGORIES= security devel MASTER_SITES= GNUPG/${PORTNAME} diff --git a/crypto/libassuan/distinfo b/crypto/libassuan/distinfo index 6e16486d..881df53f 100644 --- a/crypto/libassuan/distinfo +++ b/crypto/libassuan/distinfo @@ -1,2 +1,3 @@ -SHA256 (libassuan-2.1.3.tar.bz2) = fa2170b353c928eb59610e0700c34947f1890634ddf7bcf2366c9c88b4f51d1a -SIZE (libassuan-2.1.3.tar.bz2) = 516087 +TIMESTAMP = 1683283601 +SHA256 (libassuan-2.5.5.tar.bz2) = 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 +SIZE (libassuan-2.5.5.tar.bz2) = 572263 diff --git a/crypto/libassuan/files/patch-x-configure b/crypto/libassuan/files/patch-x-configure new file mode 100644 index 00000000..e1de7a00 --- /dev/null +++ b/crypto/libassuan/files/patch-x-configure @@ -0,0 +1,15 @@ +--- ./configure~ 2021-03-22 14:11:16.000000000 +0200 ++++ ./configure 2023-05-05 12:47:28.224684000 +0200 +@@ -2444,9 +2444,9 @@ + # (Interfaces added: AGE++) + # (Interfaces removed/changed: AGE=0) + # +-LIBASSUAN_LT_CURRENT=8 +-LIBASSUAN_LT_AGE=8 +-LIBASSUAN_LT_REVISION=5 ++LIBASSUAN_LT_CURRENT=4 ++LIBASSUAN_LT_AGE=4 ++LIBASSUAN_LT_REVISION=0 + + # If the API is changed in an incompatible way: increment the next counter. + LIBASSUAN_CONFIG_API_VERSION=2 diff --git a/crypto/libassuan/pkg-plist b/crypto/libassuan/pkg-plist index 743c70c0..c23a4109 100644 --- a/crypto/libassuan/pkg-plist +++ b/crypto/libassuan/pkg-plist @@ -3,4 +3,6 @@ include/assuan.h lib/libassuan.la lib/libassuan.so lib/libassuan.so.4 +lib/pkgconfig/libassuan.pc share/aclocal/libassuan.m4 +share/info/assuan.info diff --git a/crypto/libgcrypt/Makefile b/crypto/libgcrypt/Makefile index 2ca43ba4..c05511e3 100644 --- a/crypto/libgcrypt/Makefile +++ b/crypto/libgcrypt/Makefile @@ -3,7 +3,7 @@ # $URL: file:///usr2/svn/ports5/crypto/libgcrypt/Makefile $ # PORTNAME= libgcrypt -PORTVERSION= 1.6.1 +PORTVERSION= 1.9.4 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= libgcrypt diff --git a/crypto/libgcrypt/distinfo b/crypto/libgcrypt/distinfo index 44bc5d8f..03a2b63d 100644 --- a/crypto/libgcrypt/distinfo +++ b/crypto/libgcrypt/distinfo @@ -1,2 +1,3 @@ -SHA256 (libgcrypt-1.6.1.tar.bz2) = a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070 -SIZE (libgcrypt-1.6.1.tar.bz2) = 2470885 +TIMESTAMP = 1683284364 +SHA256 (libgcrypt-1.9.4.tar.bz2) = ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 +SIZE (libgcrypt-1.9.4.tar.bz2) = 3239704 diff --git a/crypto/libgcrypt/files/extra-patch-no-info b/crypto/libgcrypt/files/extra-patch-no-info new file mode 100644 index 00000000..85d58af1 --- /dev/null +++ b/crypto/libgcrypt/files/extra-patch-no-info @@ -0,0 +1,20 @@ +--- doc/Makefile.in.orig 2021-08-22 16:00:24 UTC ++++ doc/Makefile.in +@@ -690,7 +690,7 @@ distdir-am: $(DISTFILES) + check-am: all-am + check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +-all-am: Makefile $(INFO_DEPS) $(MANS) ++all-am: Makefile $(MANS) + installdirs: + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +@@ -750,7 +750,7 @@ info: info-am + + info-am: $(INFO_DEPS) + +-install-data-am: install-info-am install-man ++install-data-am: install-man + + install-dvi: install-dvi-am + diff --git a/crypto/libgcrypt/files/patch-gcrypt.h.in b/crypto/libgcrypt/files/patch-gcrypt.h.in deleted file mode 100644 index ed18bf91..00000000 --- a/crypto/libgcrypt/files/patch-gcrypt.h.in +++ /dev/null @@ -1,20 +0,0 @@ ---- src/gcrypt.h.in-orig 2014-07-28 03:54:16.000000000 +0200 -+++ src/gcrypt.h.in 2014-07-28 03:54:32.000000000 +0200 -@@ -508,7 +508,7 @@ - GCRYMPI_FLAG_USER1 = 0x0100,/* User flag 1. */ - GCRYMPI_FLAG_USER2 = 0x0200,/* User flag 2. */ - GCRYMPI_FLAG_USER3 = 0x0400,/* User flag 3. */ -- GCRYMPI_FLAG_USER4 = 0x0800,/* User flag 4. */ -+ GCRYMPI_FLAG_USER4 = 0x0800 /* User flag 4. */ - }; - - -@@ -1345,7 +1345,7 @@ - /* Flags used with the open function. */ - enum gcry_mac_flags - { -- GCRY_MAC_FLAG_SECURE = 1, /* Allocate all buffers in "secure" memory. */ -+ GCRY_MAC_FLAG_SECURE = 1 /* Allocate all buffers in "secure" memory. */ - }; - - /* Create a MAC handle for algorithm ALGO. FLAGS may be given as an bitwise OR diff --git a/crypto/libgcrypt/files/patch-mpi_config.links b/crypto/libgcrypt/files/patch-mpi_config.links new file mode 100644 index 00000000..9407e6f9 --- /dev/null +++ b/crypto/libgcrypt/files/patch-mpi_config.links @@ -0,0 +1,13 @@ +--- mpi/config.links.orig 2018-01-22 12:14:47 UTC ++++ mpi/config.links +@@ -301,8 +301,8 @@ case "${host}" in + mpi_cpu_arch="ppc" + ;; + +- powerpc*-*-netbsd* | powerpc*-*-openbsd*) +- echo '/* configured {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h ++ powerpc*-*-netbsd* | powerpc*-*-openbsd* | powerpc-*-freebsd* | powerpcspe-*-freebsd*) ++ echo '/* configured {Open,Net,Free}BSD on powerpc */' >>./mpi/asm-syntax.h + echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h + cat $srcdir/mpi/powerpc32/syntax.h >>./mpi/asm-syntax.h + mpi_sflags="-Wa,-mppc" diff --git a/crypto/libgcrypt/files/patch-random_jitterentropy-base.c b/crypto/libgcrypt/files/patch-random_jitterentropy-base.c new file mode 100644 index 00000000..e1a9c81f --- /dev/null +++ b/crypto/libgcrypt/files/patch-random_jitterentropy-base.c @@ -0,0 +1,10 @@ +--- random/jitterentropy-base.c.orig 2021-08-22 05:57:34.000000000 -0700 ++++ random/jitterentropy-base.c 2021-08-23 14:05:29.630091000 -0700 +@@ -52,6 +52,7 @@ + #undef _FORTIFY_SOURCE + #ifdef __OPTIMIZE__ + #pragma GCC optimize ("O0") ++#pragma clang optimize off + #endif + + #include "jitterentropy.h" diff --git a/crypto/libgcrypt/files/patch-tests_basic.c b/crypto/libgcrypt/files/patch-tests_basic.c new file mode 100644 index 00000000..4735524f --- /dev/null +++ b/crypto/libgcrypt/files/patch-tests_basic.c @@ -0,0 +1,29 @@ +--- tests/basic.c.orig 2021-08-22 04:56:06.000000000 -0700 ++++ tests/basic.c 2022-12-05 07:46:59.768944000 -0800 +@@ -38,6 +38,10 @@ + #else + # define ALWAYS_INLINE + #endif ++#ifdef WITH_DEBUG ++# undef ALWAYS_INLINE ++# define ALWAYS_INLINE ++#endif + + typedef struct test_spec_pubkey_key + { +@@ -214,6 +218,7 @@ + } + + ++#ifndef WITH_DEBUG + #if defined(__x86_64__) && defined(HAVE_GCC_INLINE_ASM_SSSE3) && \ + (defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) || \ + defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS)) +@@ -233,6 +238,7 @@ + defined(__ARM_NEON) + # define CLUTTER_VECTOR_REGISTER_NEON 1 + # define CLUTTER_VECTOR_REGISTER_COUNT 16 ++#endif + #endif + + diff --git a/crypto/libgcrypt/files/patch-x-configure b/crypto/libgcrypt/files/patch-x-configure new file mode 100644 index 00000000..9916814c --- /dev/null +++ b/crypto/libgcrypt/files/patch-x-configure @@ -0,0 +1,15 @@ +--- ./configure~ 2021-08-22 18:00:26.000000000 +0200 ++++ ./configure 2023-05-05 13:11:00.660667000 +0200 +@@ -2688,9 +2688,9 @@ + # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) + # (Interfaces added: CURRENT++, AGE++, REVISION=0) + # (No interfaces changed: REVISION++) +-LIBGCRYPT_LT_CURRENT=23 +-LIBGCRYPT_LT_AGE=3 +-LIBGCRYPT_LT_REVISION=4 ++LIBGCRYPT_LT_CURRENT=20 ++LIBGCRYPT_LT_AGE=20 ++LIBGCRYPT_LT_REVISION=0 + ################################################ + + diff --git a/crypto/libgcrypt/pkg-plist b/crypto/libgcrypt/pkg-plist index 3fb4047e..9adc98f8 100644 --- a/crypto/libgcrypt/pkg-plist +++ b/crypto/libgcrypt/pkg-plist @@ -7,5 +7,9 @@ lib/libgcrypt.a lib/libgcrypt.la lib/libgcrypt.so lib/libgcrypt.so.20 -share/aclocal/libgcrypt.m4 +lib/pkgconfig/libgcrypt.pc man/man1/hmac256.1.gz +share/aclocal/libgcrypt.m4 +share/info/gcrypt.info +share/info/gcrypt.info-1 +share/info/gcrypt.info-2 diff --git a/crypto/libgpg-error/Makefile b/crypto/libgpg-error/Makefile index c5052f41..4216fcc5 100644 --- a/crypto/libgpg-error/Makefile +++ b/crypto/libgpg-error/Makefile @@ -3,7 +3,7 @@ # $URL: file:///usr2/svn/ports5/crypto/libgpg-error/Makefile $ # PORTNAME= libgpg-error -PORTVERSION= 1.17 +PORTVERSION= 1.47 CATEGORIES= security devel MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -25,6 +25,8 @@ CONFIGURE_ARGS+= --disable-languages INSTALLS_SHLIB= yes CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --mandir=${PREFIX}/man +CONFIGURE_ARGS+= --enable-static=yes \ + --enable-install-gpg-error-config .include #EOF diff --git a/crypto/libgpg-error/distinfo b/crypto/libgpg-error/distinfo index c8168b59..bd55c2f9 100644 --- a/crypto/libgpg-error/distinfo +++ b/crypto/libgpg-error/distinfo @@ -1,2 +1,3 @@ -SHA256 (libgpg-error-1.17.tar.bz2) = 3ff4e5a71116eb862cd14185fcd282850927b8608e3b4186834fd940fbef57b5 -SIZE (libgpg-error-1.17.tar.bz2) = 669914 +TIMESTAMP = 1683283376 +SHA256 (libgpg-error-1.47.tar.bz2) = 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb +SIZE (libgpg-error-1.47.tar.bz2) = 1020862 diff --git a/crypto/libgpg-error/files/patch-x-configure b/crypto/libgpg-error/files/patch-x-configure new file mode 100644 index 00000000..d9d5fc8c --- /dev/null +++ b/crypto/libgpg-error/files/patch-x-configure @@ -0,0 +1,13 @@ +--- ./configure~ 2023-04-06 10:30:14.000000000 +0200 ++++ ./configure 2023-05-05 12:43:46.913029000 +0200 +@@ -2627,8 +2627,8 @@ + # (Interfaces added: AGE++) + # (Interfaces removed: AGE=0) + # Note that added error codes don't constitute an interface change. +-LIBGPG_ERROR_LT_CURRENT=34 +-LIBGPG_ERROR_LT_AGE=34 ++LIBGPG_ERROR_LT_CURRENT=11 ++LIBGPG_ERROR_LT_AGE=11 + LIBGPG_ERROR_LT_REVISION=0 + ################################################ + diff --git a/crypto/libgpg-error/pkg-plist b/crypto/libgpg-error/pkg-plist index 691594ed..5ac34dd5 100644 --- a/crypto/libgpg-error/pkg-plist +++ b/crypto/libgpg-error/pkg-plist @@ -1,22 +1,82 @@ bin/gpg-error bin/gpg-error-config +bin/gpgrt-config +bin/yat2m include/gpg-error.h +include/gpgrt.h +lib/libgpg-error.a lib/libgpg-error.la lib/libgpg-error.so -lib/libgpg-error.so.13 +lib/libgpg-error.so.11 +lib/pkgconfig/gpg-error.pc +man/man1/gpg-error-config.1.gz +man/man1/gpgrt-config.1.gz share/aclocal/gpg-error.m4 +share/aclocal/gpgrt.m4 +share/info/gpgrt.info +share/libgpg-error/errorref.txt share/locale/cs/LC_MESSAGES/libgpg-error.mo share/locale/da/LC_MESSAGES/libgpg-error.mo share/locale/de/LC_MESSAGES/libgpg-error.mo share/locale/eo/LC_MESSAGES/libgpg-error.mo +share/locale/es/LC_MESSAGES/libgpg-error.mo share/locale/fr/LC_MESSAGES/libgpg-error.mo +share/locale/hu/LC_MESSAGES/libgpg-error.mo share/locale/it/LC_MESSAGES/libgpg-error.mo share/locale/ja/LC_MESSAGES/libgpg-error.mo share/locale/nl/LC_MESSAGES/libgpg-error.mo share/locale/pl/LC_MESSAGES/libgpg-error.mo +share/locale/pt/LC_MESSAGES/libgpg-error.mo share/locale/ro/LC_MESSAGES/libgpg-error.mo +share/locale/ru/LC_MESSAGES/libgpg-error.mo +share/locale/sr/LC_MESSAGES/libgpg-error.mo share/locale/sv/LC_MESSAGES/libgpg-error.mo +share/locale/tr/LC_MESSAGES/libgpg-error.mo share/locale/uk/LC_MESSAGES/libgpg-error.mo share/locale/vi/LC_MESSAGES/libgpg-error.mo share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo -man/man1/gpg-error-config.1.gz +share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo +@dir share/libgpg-error +@dir share/locale/cs/LC_MESSAGES +@dir share/locale/cs +@dir share/locale/da/LC_MESSAGES +@dir share/locale/da +@dir share/locale/de/LC_MESSAGES +@dir share/locale/de +@dir share/locale/eo/LC_MESSAGES +@dir share/locale/eo +@dir share/locale/es/LC_MESSAGES +@dir share/locale/es +@dir share/locale/fr/LC_MESSAGES +@dir share/locale/fr +@dir share/locale/hu/LC_MESSAGES +@dir share/locale/hu +@dir share/locale/it/LC_MESSAGES +@dir share/locale/it +@dir share/locale/ja/LC_MESSAGES +@dir share/locale/ja +@dir share/locale/nl/LC_MESSAGES +@dir share/locale/nl +@dir share/locale/pl/LC_MESSAGES +@dir share/locale/pl +@dir share/locale/pt/LC_MESSAGES +@dir share/locale/pt +@dir share/locale/ro/LC_MESSAGES +@dir share/locale/ro +@dir share/locale/ru/LC_MESSAGES +@dir share/locale/ru +@dir share/locale/sr/LC_MESSAGES +@dir share/locale/sr +@dir share/locale/sv/LC_MESSAGES +@dir share/locale/sv +@dir share/locale/tr/LC_MESSAGES +@dir share/locale/tr +@dir share/locale/uk/LC_MESSAGES +@dir share/locale/uk +@dir share/locale/vi/LC_MESSAGES +@dir share/locale/vi +@dir share/locale/zh_CN/LC_MESSAGES +@dir share/locale/zh_CN +@dir share/locale/zh_TW/LC_MESSAGES +@dir share/locale/zh_TW +@dir share/locale diff --git a/crypto/libksba/Makefile b/crypto/libksba/Makefile index 0095a105..a7ae5422 100644 --- a/crypto/libksba/Makefile +++ b/crypto/libksba/Makefile @@ -2,7 +2,7 @@ # $Id$ # PORTNAME= libksba -PORTVERSION= 1.3.3 +PORTVERSION= 1.6.3 CATEGORIES= security MASTER_SITES= GNUPG/${PORTNAME} diff --git a/crypto/libksba/distinfo b/crypto/libksba/distinfo index 62fb6490..dec83770 100644 --- a/crypto/libksba/distinfo +++ b/crypto/libksba/distinfo @@ -1,2 +1,3 @@ -SHA256 (libksba-1.3.3.tar.bz2) = 0c7f5ffe34d0414f6951d9880a46fcc2985c487f7c36369b9f11ad41131c7786 -SIZE (libksba-1.3.3.tar.bz2) = 618698 +TIMESTAMP = 1683285405 +SHA256 (libksba-1.6.3.tar.bz2) = 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c +SIZE (libksba-1.6.3.tar.bz2) = 668287 diff --git a/crypto/libksba/files/patch-x-configure b/crypto/libksba/files/patch-x-configure new file mode 100644 index 00000000..afd8b889 --- /dev/null +++ b/crypto/libksba/files/patch-x-configure @@ -0,0 +1,15 @@ +--- ./configure~ 2022-12-06 15:33:27.000000000 +0200 ++++ ./configure 2023-05-05 13:18:09.693115000 +0200 +@@ -2544,9 +2544,9 @@ + # (Interfaces added: CURRENT++, AGE++, REVISION=0) + # (No interfaces changed: REVISION++) + # Please remember to document interface changes in the NEWS file. +-LIBKSBA_LT_CURRENT=22 +-LIBKSBA_LT_AGE=14 +-LIBKSBA_LT_REVISION=3 ++LIBKSBA_LT_CURRENT=19 ++LIBKSBA_LT_AGE=19 ++LIBKSBA_LT_REVISION=0 + #------------------- + # If the API is changed in an incompatible way: increment the next counter. + KSBA_CONFIG_API_VERSION=1 diff --git a/crypto/libksba/pkg-plist b/crypto/libksba/pkg-plist index 37887431..d517c3d5 100644 --- a/crypto/libksba/pkg-plist +++ b/crypto/libksba/pkg-plist @@ -4,4 +4,6 @@ lib/libksba.a lib/libksba.la lib/libksba.so lib/libksba.so.19 +lib/pkgconfig/ksba.pc share/aclocal/ksba.m4 +share/info/ksba.info diff --git a/crypto/libnpth/Makefile b/crypto/libnpth/Makefile index 8169e8dc..556c338d 100644 --- a/crypto/libnpth/Makefile +++ b/crypto/libnpth/Makefile @@ -2,7 +2,7 @@ # $Id$ # PORTNAME= npth -PORTVERSION= 1.1 +PORTVERSION= 1.6 CATEGORIES= devel MASTER_SITES= GNUPG/${PORTNAME} PKGNAMEPREFIX= lib diff --git a/crypto/libnpth/distinfo b/crypto/libnpth/distinfo index d2c8105d..55b5ebfb 100644 --- a/crypto/libnpth/distinfo +++ b/crypto/libnpth/distinfo @@ -1,2 +1,3 @@ -SHA256 (npth-1.1.tar.bz2) = 896c561eb2ec8da35f11828fb04a3fbff12d41ff657c799056d7dc4a66e5df7f -SIZE (npth-1.1.tar.bz2) = 293362 +TIMESTAMP = 1683285777 +SHA256 (npth-1.6.tar.bz2) = 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1 +SIZE (npth-1.6.tar.bz2) = 300486 diff --git a/crypto/libnpth/files/patch-x-configure b/crypto/libnpth/files/patch-x-configure new file mode 100644 index 00000000..ce4f5ce3 --- /dev/null +++ b/crypto/libnpth/files/patch-x-configure @@ -0,0 +1,15 @@ +--- ./configure~ 2018-07-16 09:33:37.000000000 +0200 ++++ ./configure 2023-05-05 13:23:47.954412000 +0200 +@@ -2310,9 +2310,9 @@ + # (Interfaces added: AGE++) + # (Interfaces removed: AGE=0) + # +-LIBNPTH_LT_CURRENT=1 +-LIBNPTH_LT_AGE=1 +-LIBNPTH_LT_REVISION=2 ++LIBNPTH_LT_CURRENT=0 ++LIBNPTH_LT_AGE=0 ++LIBNPTH_LT_REVISION=0 + ################################################ + +