From nobody Fri May 06 17:36:50 2022 X-Original-To: dev-commits-ports-main@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 E11CE1AB3D2B; Fri, 6 May 2022 17:36:50 +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 4KvyRk5z10z4bhf; Fri, 6 May 2022 17:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651858610; 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=AtpXr7aS5Ohd1X73FB6WQjtOwZlzOmZ35bT5GN1MSHQ=; b=ZEwgPsJN45mDrSdIVtYIiN1XS55TmSt3YpWrlJEaNzf7ogjurJox58iv0kuKfNYTI/IYWg 6h9JO163lIpbqxVYcGpRvbirWEi1PDDGgoGMa0IwtGYFsGtW7Wne3wnodM3PFcHUSxLPXh Up+djL0xulycLPVjo/StMcHLohkZC1v3jjXn1W7nzHSKu3PTaBJPt5T3MMwSnUO6Uxf6UN Z+QqOznSy0xcSwdsD2yW1UsDHM6kmhHjFVvk//BPUXCUCXA1d6qlOroYcxnJ2GTvNeXET5 VjxMIFPa43dvh9Pb7eLXebiAY5eSOXOF/rWun7TL8O3qb8bONHDgIXL82Cfb9A== 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 AD109202AE; Fri, 6 May 2022 17:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 246HaoSs000397; Fri, 6 May 2022 17:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246Haoqo000396; Fri, 6 May 2022 17:36:50 GMT (envelope-from git) Date: Fri, 6 May 2022 17:36:50 GMT Message-Id: <202205061736.246Haoqo000396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: 097c9235d921 - main - security/xmlsec1: update to 1.2.34 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 097c9235d921c27255e836c98874e3df62376711 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651858610; 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=AtpXr7aS5Ohd1X73FB6WQjtOwZlzOmZ35bT5GN1MSHQ=; b=vdQCmtS1RAsozVa7Dwa41JBr1AeJWFYJSZqX+GWT7Mm8o6AhyB59A5f5QLToY3bS8n6KZR fFmNHCCkvzqxMPzovoOqdoMztqow+sihtinFkruEZmsAdkmPFW4F575+TPgYtMgsGVLfgZ 6bb5HPJN/pS6+fBxOPUMXja6WTQwaUKgr+czRKY2oGVc6ntXvWIOiosZKimwf9Q5FJsr89 x9JngRPnFTXiXk+BFF1qh6nImESiHw7hNFPDgt/D+4++qacfZ/wVinjT5WynE4uDstWue8 TlEMOg3vaXVHaVA9Zmewcykq5sd9fO/5lhhMP/fTXdg6IhUz9kJSQOcj8x7kzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651858610; a=rsa-sha256; cv=none; b=xNFButpoR41jiQGeEUrhyCgi6Aesdgrix56VdjHulE+gGDvcEbJxISMZ568w3R9lcPisXX oHWSQjJnRszTiPUF6GKK37QwHE5ww4sJ+tiaRD1jVl9oi8t1MPrNz//R7ZGJiuuSyM0jDI NpAgP57lObshiwzWEg60ZVVFfYB7AKThO2Ffj4OigYs2yeBQPJGcafJEitwobid2Y0ecnM t3AnLAQ6wVNtplXZzuRNJDBLRF/H8ZFCjAtOz4qn8TfZ3Iy3Y6XmpB3Z7Bk57P4b20BAEu oM7r5v8FYjpzhqVDI1fBsT97a1Lwg6G4FEnz+lE50ss20DvSwAVxBV5b/Q5Beg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=097c9235d921c27255e836c98874e3df62376711 commit 097c9235d921c27255e836c98874e3df62376711 Author: Hiroki Sato AuthorDate: 2022-05-06 17:35:52 +0000 Commit: Hiroki Sato CommitDate: 2022-05-06 17:36:27 +0000 security/xmlsec1: update to 1.2.34 --- security/xmlsec1/Makefile | 4 ++-- security/xmlsec1/distinfo | 6 +++--- security/xmlsec1/files/patch-Makefile.in | 6 +++--- security/xmlsec1/files/patch-apps-xmlsec.c | 11 +++++++++++ .../xmlsec1/files/patch-src_openssl_openssl__compat.h | 16 +++++++++------- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile index 6a1359ffb91e..6d6ccfa6822c 100644 --- a/security/xmlsec1/Makefile +++ b/security/xmlsec1/Makefile @@ -1,8 +1,7 @@ # Created by: Jim Geovedi PORTNAME= xmlsec1 -PORTVERSION= 1.2.29 -PORTREVISION= 2 +PORTVERSION= 1.2.34 CATEGORIES= security MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ ftp://ftp.aleksey.com/pub/xmlsec/releases/ \ @@ -25,6 +24,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl="${OPENSSLBASE}" \ --with-gcrypt="${LOCALBASE}" \ + --enable-werror \ --enable-soap \ --disable-docs-build MAKE_ENV= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC} diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo index 3a9d3c2debff..baa844e7f7ee 100644 --- a/security/xmlsec1/distinfo +++ b/security/xmlsec1/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581996323 -SHA256 (xmlsec1-1.2.29.tar.gz) = b1d1deba966019930f608d1f2b95c40ca3450f1393bcd3a3c001a8ba1d2839ab -SIZE (xmlsec1-1.2.29.tar.gz) = 1989360 +TIMESTAMP = 1651858077 +SHA256 (xmlsec1-1.2.34.tar.gz) = 52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262 +SIZE (xmlsec1-1.2.34.tar.gz) = 1991505 diff --git a/security/xmlsec1/files/patch-Makefile.in b/security/xmlsec1/files/patch-Makefile.in index 40393dc3aeb4..250d09d1d46d 100644 --- a/security/xmlsec1/files/patch-Makefile.in +++ b/security/xmlsec1/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2017-12-12 16:05:23.187628000 +0300 -+++ Makefile.in 2017-12-12 16:07:19.241092000 +0300 -@@ -480,7 +480,7 @@ +--- Makefile.in.orig 2022-05-06 17:33:38 UTC ++++ Makefile.in +@@ -490,7 +490,7 @@ DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ bin_SCRIPTS = xmlsec1-config pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ pkgconfigdir = $(prefix)/libdata/pkgconfig diff --git a/security/xmlsec1/files/patch-apps-xmlsec.c b/security/xmlsec1/files/patch-apps-xmlsec.c new file mode 100644 index 000000000000..ce1c62f81e60 --- /dev/null +++ b/security/xmlsec1/files/patch-apps-xmlsec.c @@ -0,0 +1,11 @@ +--- apps/xmlsec.c.orig 2022-05-03 14:36:17 UTC ++++ apps/xmlsec.c +@@ -1210,7 +1210,7 @@ int main(int argc, const char **argv) { + (xmlSecAppCmdLineParamGetInt(&repeatParam, 1) > 0)) { + + repeats = xmlSecAppCmdLineParamGetInt(&repeatParam, 1); +- fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (1000 * total_time) / CLOCKS_PER_SEC); ++ fprintf(stderr, "Executed %d tests in %ld msec\n", repeats, (long)(1000 * total_time) / CLOCKS_PER_SEC); + } + + goto success; diff --git a/security/xmlsec1/files/patch-src_openssl_openssl__compat.h b/security/xmlsec1/files/patch-src_openssl_openssl__compat.h index ab20e6310f2d..21eed249a79a 100644 --- a/security/xmlsec1/files/patch-src_openssl_openssl__compat.h +++ b/security/xmlsec1/files/patch-src_openssl_openssl__compat.h @@ -1,11 +1,9 @@ ---- src/openssl/openssl_compat.h.orig 2017-09-12 13:21:09 UTC +--- src/openssl/openssl_compat.h.orig 2022-05-03 14:36:17 UTC +++ src/openssl/openssl_compat.h -@@ -49,4 +49,19 @@ +@@ -51,6 +51,21 @@ - #endif /* !defined(XMLSEC_OPENSSL_API_110) */ - -+/****************************************************************************** -+ * + /****************************************************************************** + * + * LibreSSL 2.7+ compatibility (implements most of OpenSSL 1.1 API) + * + *****************************************************************************/ @@ -19,4 +17,8 @@ +#define X509_OBJECT_free(x) { X509_OBJECT_free_contents(x); free(x); } +#endif + - #endif /* __XMLSEC_OPENSSL_OPENSSL_COMPAT_H__ */ ++/****************************************************************************** ++ * + * boringssl compatibility + * + *****************************************************************************/