From nobody Tue Feb 13 15:50:53 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZ5QP4VfJz5968v; Tue, 13 Feb 2024 15:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ5QP43xzz4glR; Tue, 13 Feb 2024 15:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707839453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIJ1785unG+S2R3w6I0OB45l33kacU+ihzooeQdh28A=; b=NgDNAjDNErTa0ClY2/Sna4GV4lgp1T0E+kNF4wWEDyzwL/x9b4xEflxwRnkyH8qjr8WlSx AR5vKY2zFF7aJBzD60Pgkz6rClBDxEEtJajo5WXZPX+2tjDuHDZfzVCVq0oxxlstdroImp ZfnSxhGmsUzJ3x4s/5gX2QAjOvSm3s4wt5mp0xHZcKUX8SQ5RG/GzxqXQ9LNe0ee5CMOu3 IRqtu0wL22iGI8jZSbNltGMRb1xakGJBOfkb90KR7115q1z7uw6jRTmmBrTkCyqYU0vk5J a75clD9OcXkI1U25Tm3DwDaTd+YwVsHMiNbndQDjH79TXcGszkywfdd8SlLAAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707839453; a=rsa-sha256; cv=none; b=BMUQNqPf0W8Gvq6wrk7GvUor8u9Vflf7IaE+6vH02RA1lf+7xSSqaLmYFBjnCjRqGz8yp7 2LkmNtDp+/vdxPzi/sIMy2FDwh0ozMqEjkPEVTmaycL6rXufJRP/1Ln2MxacIYph64Zhpt zf0L5qwCLcCRXzio0VQk/wBfJ0JUg8gdckjepoppKE8KFth8FcVEk/GTt1ZoXdo+GIEsL6 t7+n/9ILMjYjRhsh4Ou2PaNDPG8MYfubeNd1isI2CKFTIqDDIqWbTPsU0TE2A0bke9p9hj vHIEh9LNeWJPoNqFuClV311+GtfBcAU60hZd/cEr6xZWTpa//ODXHDtg8L20tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707839453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mIJ1785unG+S2R3w6I0OB45l33kacU+ihzooeQdh28A=; b=IHEQZspPaRuAj4+Y6Mt64U1vTXapb1gSK12uDAq/EGx9ymY0Suh6fCkhKNWZk0qboDMJy8 SMo+Zy1RKZZZCEpMZiDVD7j6ElJBOPn+9fwOpfw2OOdtm5fEtIJgZR3OLZdThT1N1Inm4V +0NNmj4AJL1ems3yN1k/WjFmSKyoOF/LO1QYPg0UQXQVQoaUGlS1rUPOSENZDe/E+zLEMf ZAmTYxxy3UX79KCjBw8rFFuclk/Yfk3dBKZvGAmYX+ZpO38bkvSRjnbQ+w9kiecRJRngV3 dEBeWoo6bXK9c6UVrYDWqPeTLbJjMMXBq4vzo4v8N/1bNmU4UqCXekho2p0Ehg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ5QP37qTzLT1; Tue, 13 Feb 2024 15:50:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DForse046253; Tue, 13 Feb 2024 15:50:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DForLT046250; Tue, 13 Feb 2024 15:50:53 GMT (envelope-from git) Date: Tue, 13 Feb 2024 15:50:53 GMT Message-Id: <202402131550.41DForLT046250@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 61f0255bbe1b - main - security/xmlsec1: update to 1.3.2 release (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61f0255bbe1b64f3e3d4f95a839d9a1f5c535735 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=61f0255bbe1b64f3e3d4f95a839d9a1f5c535735 commit 61f0255bbe1b64f3e3d4f95a839d9a1f5c535735 Author: Dima Panov AuthorDate: 2024-02-13 15:36:59 +0000 Commit: Dima Panov CommitDate: 2024-02-13 15:36:59 +0000 security/xmlsec1: update to 1.3.2 release (+) It's a minimal requirement for upcoming LibreOffice With hat: office --- security/xmlsec1/Makefile | 4 +--- security/xmlsec1/distinfo | 6 +++--- security/xmlsec1/files/patch-Makefile.in | 4 ++-- security/xmlsec1/files/patch-src-openssl-app.c | 21 ++++++--------------- security/xmlsec1/pkg-plist | 8 ++++---- 5 files changed, 16 insertions(+), 27 deletions(-) diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 0f6dd467bbb4..3db31e03ceca 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,6 +1,5 @@ PORTNAME= xmlsec1 -DISTVERSION= 1.2.38 -PORTREVISION= 1 +DISTVERSION= 1.3.2 CATEGORIES= security MASTER_SITES= https://github.com/lsh123/xmlsec/releases/download/xmlsec_${DISTVERSION:S,.,_,g}/ \ https://www.aleksey.com/xmlsec/download/ @@ -19,7 +18,6 @@ USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share INSTALL_TARGET= install-strip PORTDOCS= * diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo index 31fac1f0c55f..92ea6dd27f1f 100644 --- a/security/xmlsec1/distinfo +++ b/security/xmlsec1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691949373 -SHA256 (xmlsec1-1.2.38.tar.gz) = 9de8cf8d7d2e288a9cef205cc6cb93c926a67dadfaf44aaff76ed63c28ce9902 -SIZE (xmlsec1-1.2.38.tar.gz) = 2036578 +TIMESTAMP = 1702077731 +SHA256 (xmlsec1-1.3.2.tar.gz) = 4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf +SIZE (xmlsec1-1.3.2.tar.gz) = 2437263 diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in index be5659c14e62..7999ab5cc924 100644 --- a/security/xmlsec1/files/patch-Makefile.in +++ b/security/xmlsec1/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2022-12-06 14:04:01 UTC +--- Makefile.in.orig 2023-12-08 23:22:46 UTC +++ Makefile.in -@@ -491,7 +491,7 @@ pkgconfigdir = $(prefix)/libdata/pkgconfig +@@ -504,7 +504,7 @@ pkgconfigdir = $(prefix)/libdata/pkgconfig bin_SCRIPTS = xmlsec1-config pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ pkgconfigdir = $(prefix)/libdata/pkgconfig diff --git a/security/xmlsec1/files/patch-src-openssl-app.c b/security/xmlsec1/files/patch-src-openssl-app.c index bbb25c3f4030..e20b9da3e1ca 100644 --- a/security/xmlsec1/files/patch-src-openssl-app.c +++ b/security/xmlsec1/files/patch-src-openssl-app.c @@ -1,8 +1,8 @@ ---- src/openssl/app.c.orig 2022-11-28 21:40:24 UTC +--- src/openssl/app.c.orig 2023-10-30 22:27:05 UTC +++ src/openssl/app.c -@@ -46,6 +46,29 @@ - +@@ -59,6 +59,29 @@ #include "../cast_helpers.h" + #include "private.h" +#if defined(XMLSEC_OPENSSL_API_110) && defined(LIBRESSL_VERSION_NUMBER) +static UI_METHOD * @@ -30,7 +30,7 @@ static int xmlSecOpenSSLDefaultPasswordCallback (char *buf, int bufsiz, int verify, -@@ -462,6 +485,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, +@@ -490,6 +513,11 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, EVP_PKEY* pKey = NULL; int engineInit = 0; int ret; @@ -42,7 +42,7 @@ xmlSecAssert2(engineName != NULL, NULL); xmlSecAssert2(engineKeyId != NULL, NULL); -@@ -487,7 +515,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, +@@ -538,7 +566,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, } } @@ -51,16 +51,7 @@ xmlSecOpenSSLError("ENGINE_ctrl_cmd_string(SET_USER_INTERFACE)", NULL); goto done; } -@@ -503,7 +531,7 @@ xmlSecOpenSSLAppEngineKeyLoad(const char *engineName, - - /* load private key */ - pKey = ENGINE_load_private_key(engine, engineKeyId, -- (UI_METHOD *)UI_null(), -+ (UI_METHOD *)ui_null, - NULL); - if(pKey == NULL) { - xmlSecOpenSSLError("ENGINE_load_private_key", NULL); -@@ -534,6 +562,7 @@ done: +@@ -601,6 +629,7 @@ done: data = NULL; done: diff --git a/security/xmlsec1/pkg-plist b/security/xmlsec1/pkg-plist index 60e7f180d675..1437ee113a81 100644 --- a/security/xmlsec1/pkg-plist +++ b/security/xmlsec1/pkg-plist @@ -14,6 +14,7 @@ include/xmlsec1/xmlsec/exports.h %%GNUTLS%%include/xmlsec1/xmlsec/gcrypt/symbols.h %%GNUTLS%%include/xmlsec1/xmlsec/gnutls/app.h %%GNUTLS%%include/xmlsec1/xmlsec/gnutls/crypto.h +%%GNUTLS%%include/xmlsec1/xmlsec/gnutls/keysstore.h %%GNUTLS%%include/xmlsec1/xmlsec/gnutls/symbols.h %%GNUTLS%%include/xmlsec1/xmlsec/gnutls/x509.h include/xmlsec1/xmlsec/io.h @@ -25,16 +26,15 @@ include/xmlsec1/xmlsec/list.h include/xmlsec1/xmlsec/membuf.h include/xmlsec1/xmlsec/nodeset.h %%NSS%%include/xmlsec1/xmlsec/nss/app.h -%%NSS%%include/xmlsec1/xmlsec/nss/bignum.h %%NSS%%include/xmlsec1/xmlsec/nss/crypto.h %%NSS%%include/xmlsec1/xmlsec/nss/keysstore.h %%NSS%%include/xmlsec1/xmlsec/nss/pkikeys.h %%NSS%%include/xmlsec1/xmlsec/nss/symbols.h %%NSS%%include/xmlsec1/xmlsec/nss/x509.h %%OPENSSL%%include/xmlsec1/xmlsec/openssl/app.h -%%OPENSSL%%include/xmlsec1/xmlsec/openssl/bn.h %%OPENSSL%%include/xmlsec1/xmlsec/openssl/crypto.h %%OPENSSL%%include/xmlsec1/xmlsec/openssl/evp.h +%%OPENSSL%%include/xmlsec1/xmlsec/openssl/keysstore.h %%OPENSSL%%include/xmlsec1/xmlsec/openssl/symbols.h %%OPENSSL%%include/xmlsec1/xmlsec/openssl/x509.h include/xmlsec1/xmlsec/parser.h @@ -68,6 +68,6 @@ lib/libxmlsec1.so.%%DISTVERSION%% %%NSS%%libdata/pkgconfig/xmlsec1-nss.pc %%OPENSSL%%libdata/pkgconfig/xmlsec1-openssl.pc libdata/pkgconfig/xmlsec1.pc -share/man/man1/xmlsec1-config.1.gz -share/man/man1/xmlsec1.1.gz +man/man1/xmlsec1-config.1.gz +man/man1/xmlsec1.1.gz share/aclocal/xmlsec1.m4