From nobody Mon Mar 20 10:53:10 2023 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 4PgBRC0Gm4z40Yb5; Mon, 20 Mar 2023 10:53:11 +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 4PgBRB6v6tz4PsM; Mon, 20 Mar 2023 10:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679309591; 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=nF2ntklYiHM5ahbZt5Pc9EUeCUngzlkOc3wtr3bF8vI=; b=fsS9OMqCWhyqgiUc079RbqD++V7GHzXegwebMKr1MG1jONHEr+lD1/i31WMpnHT4jJxTz1 tM9OH2EqU6xNC58x6+GgG5r8kQH8BxPdjXdEpGtsNU6ZSPz5l6OhDKjpbw1kdP7q/7GghP ZbOYayR9FR041bJkN71lCte8PN9gsi+p1O++r6UXe5Hmbw8CmNGwXAi/zmEzYObbBKv1TO xn5OOnMYepWybLkHI83CtPuDVoerjfZUOb6jD+6oxSNlXRY/ELRIq/OuePfcSmsFY2vxnE y8AketM09320ZXXeIlfSmk6gWlOS7TpDBG4+m63SNs2KFfDD9r7dZzN/ZXt3eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679309591; 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=nF2ntklYiHM5ahbZt5Pc9EUeCUngzlkOc3wtr3bF8vI=; b=WsWBc75QbaRZM23VCpNcLhcWgq1KVX+Y+S2KfbUizJnYW/j2/DBmnxn5/NhcPa200PFEbE uWm5YikJc5CHQFhnT7MjRVqfFmO3e9XkmUCUDmJasxSYf+XREoW7Rv/Hzm56xwLC2cZ6u0 AkkEKTIp4jUHFbSas4+30q636xcvCu3fMIHU8H/5mznASt2wO5+UrE4ePL+zoHQJtXkIw0 LI5pJA/UuG+KQieNSG2Xexn7el8IIrmwWt/HVW9u7+cOJnuu13ZS0vMVb1d6/wBjt4VbRK 5rI4SC4Q4D4dr1k6fQZiHk4lzY1MY3KyeLR4bE6CgBrdCPgLY6vC9Cm4vLebLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679309591; a=rsa-sha256; cv=none; b=OzDUm6AdSkJq0dVFdL/CYSWuMrWb7u18v3L/DGD/VpLr86363hVmppn8DtzucfGok/mqaR YJ7WO//PQoT2s1w+PWE0sE/0IoVSkSihEv5g+nydGOk5U+sZTySGe8ci5lVuZOPgoPS37d HGCczf/WCuPsSxGRRQi8A+aJCe0vLlas4tFiLfbqE8U4ANTi1iFgeN07cHmOHC/F5nqGxS qGuR1dgMlWSwr1OFlrrPDVEd0bB+aT9hD/MtCbD5bS2rVpPCvClazwaRaIF+fHFrH74SA4 urinN5lgUGeHWzcgRh8+M2pc4Pq3pRxpt2nSMNp+zSAjLFQ+OXmQ0Wc8eoSQAw== 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 4PgBRB5zWSzRsP; Mon, 20 Mar 2023 10:53:10 +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 32KArATl010741; Mon, 20 Mar 2023 10:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KArAvV010739; Mon, 20 Mar 2023 10:53:10 GMT (envelope-from git) Date: Mon, 20 Mar 2023 10:53:10 GMT Message-Id: <202303201053.32KArAvV010739@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: f7d3d88caa1c - main - security/cryptlib: update to 3.4.6 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: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7d3d88caa1cb439dc43ed46b6d780f50fc0e854 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7d3d88caa1cb439dc43ed46b6d780f50fc0e854 commit f7d3d88caa1cb439dc43ed46b6d780f50fc0e854 Author: Alex Dupre AuthorDate: 2023-03-20 10:52:36 +0000 Commit: Alex Dupre CommitDate: 2023-03-20 10:53:05 +0000 security/cryptlib: update to 3.4.6 release. --- security/cryptlib/Makefile | 24 +++++++++++++++--------- security/cryptlib/distinfo | 6 +++--- security/cryptlib/files/patch-crypt_osconfig.h | 13 ------------- security/cryptlib/files/patch-makefile | 14 +++++++------- security/cryptlib/files/patch-misc_os__detect.h | 11 +++++++++++ security/cryptlib/files/patch-misc_os__spec.h | 14 ++++++++++++++ security/cryptlib/files/patch-misc_os_spec.h | 23 ----------------------- security/cryptlib/files/patch-test_certs.c | 11 +++++++++++ security/cryptlib/files/patch-tools_ccopts.sh | 23 ++++++++++++++++------- 9 files changed, 77 insertions(+), 62 deletions(-) diff --git a/security/cryptlib/Makefile b/security/cryptlib/Makefile index 2ac2ba26c675..a306eb97b224 100644 --- a/security/cryptlib/Makefile +++ b/security/cryptlib/Makefile @@ -1,22 +1,28 @@ PORTNAME= cryptlib -PORTVERSION= 3.4.3 +DISTVERSION= 3.4.6 CATEGORIES= security -MASTER_SITES= ftp://ftp.franken.de/pub/crypt/cryptlib/ -DISTNAME= cl${PORTVERSION:S/.//g} +MASTER_SITES= https://cryptlib-release.s3-ap-southeast-1.amazonaws.com/ +DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} MAINTAINER= ale@FreeBSD.org COMMENT= Powerful security programming toolkit -WWW= http://www.cs.auckland.ac.nz/~pgut001/cryptlib/ +WWW= http://www.cs.auckland.ac.nz/~pgut001/cryptlib/ + +LICENSE= SLEEPYCAT +LICENSE_NAME= Sleepycat +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64 powerpc64le +USES= cpe zip:infozip + OPTIONS_DEFINE= DOCS -USES= cpe zip:infozip EXTRACT_BEFORE_ARGS= -aq NO_WRKSUBDIR= yes MAKEFILE= makefile -ALL_TARGET= default FreeBSD shared +ALL_TARGET= default FreeBSD shared testlib USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes CFLAGS+= -DUSE_PKCS11 @@ -27,9 +33,6 @@ PLIST_FILES= include/cryptlib.h \ PORTDOCS= README -post-patch: - @${REINPLACE_CMD} -e 's/%%CFLAGS%%/${CFLAGS}/' ${WRKSRC}/makefile - do-install: ${INSTALL_DATA} ${WRKSRC}/libcl.a ${WRKSRC}/libcl.so.${PORTVERSION} \ ${STAGEDIR}${PREFIX}/lib @@ -41,4 +44,7 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} +do-test: + @cd ${BUILD_WRKSRC} && ./testlib -a + .include diff --git a/security/cryptlib/distinfo b/security/cryptlib/distinfo index 86cae6841b04..4e31fa1950d6 100644 --- a/security/cryptlib/distinfo +++ b/security/cryptlib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484210997 -SHA256 (cl343.zip) = 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad -SIZE (cl343.zip) = 5703258 +TIMESTAMP = 1679305871 +SHA256 (cryptlib346.zip) = c72cfd103eb9fa9f205c14c84ce4fbdf3ead1e2447e830b164dc335141f747bd +SIZE (cryptlib346.zip) = 6826568 diff --git a/security/cryptlib/files/patch-crypt_osconfig.h b/security/cryptlib/files/patch-crypt_osconfig.h deleted file mode 100644 index 3cc1a7d7de9b..000000000000 --- a/security/cryptlib/files/patch-crypt_osconfig.h +++ /dev/null @@ -1,13 +0,0 @@ ---- crypt/osconfig.h.orig 2021-11-26 15:16:58 UTC -+++ crypt/osconfig.h -@@ -147,6 +147,10 @@ - #define L_ENDIAN - #else - #define B_ENDIAN - #endif /* Usually big-endian but may be little-endian */ -+ #ifdef __LP64__ -+ #undef SIXTY_FOUR_BIT -+ #define SIXTY_FOUR_BIT_LONG -+ #endif - #define BN_LLONG - #define DES_RISC1 diff --git a/security/cryptlib/files/patch-makefile b/security/cryptlib/files/patch-makefile index ed4afc3aa397..6f255e18d9d2 100644 --- a/security/cryptlib/files/patch-makefile +++ b/security/cryptlib/files/patch-makefile @@ -1,11 +1,11 @@ ---- makefile.orig 2016-03-25 04:33:28.000000000 +0100 -+++ makefile 2017-01-12 10:10:40.481484000 +0100 -@@ -1626,7 +1626,7 @@ - @make $(DEFINES) CFLAGS="$(CFLAGS) -DUSE_ASM -fomit-frame-pointer -O3" +--- makefile.orig 2021-09-10 22:27:18 UTC ++++ makefile +@@ -1859,7 +1859,7 @@ BSD/OS: + $(MAKE) $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -O3" FreeBSD: -- make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" -+ make $(DEFINES) CFLAGS="$(CFLAGS) %%CFLAGS%%" +- $(MAKE) $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ++ $(MAKE) $(DEFINES) CFLAGS="$(CFLAGS) -O2 -pipe -DUSE_PKCS11 -fstack-protector-strong -fno-strict-aliasing " NetBSD: - make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" + $(MAKE) $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" diff --git a/security/cryptlib/files/patch-misc_os__detect.h b/security/cryptlib/files/patch-misc_os__detect.h new file mode 100644 index 000000000000..835bc7c9a6c9 --- /dev/null +++ b/security/cryptlib/files/patch-misc_os__detect.h @@ -0,0 +1,11 @@ +--- misc/os_detect.h.orig 2023-03-20 10:08:54 UTC ++++ misc/os_detect.h +@@ -629,7 +629,7 @@ + + #if defined( __WINDOWS__ ) || \ + ( defined( __UNIX__ ) && \ +- ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || \ ++ ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || defined( __FreeBSD__ ) || \ + defined( _AIX ) || ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) ) || \ + defined( __ANDROID__ ) + #define DYNAMIC_LOAD diff --git a/security/cryptlib/files/patch-misc_os__spec.h b/security/cryptlib/files/patch-misc_os__spec.h new file mode 100644 index 000000000000..66d060b78bd7 --- /dev/null +++ b/security/cryptlib/files/patch-misc_os__spec.h @@ -0,0 +1,14 @@ +--- misc/os_spec.h.orig 2021-09-11 19:27:14 UTC ++++ misc/os_spec.h +@@ -610,9 +610,8 @@ typedef int BOOLEAN_INT; + variants, this presumably extends to SH5 as well so we treat va_lists on + Super-H as scalars */ + +-#if defined( __GNUC__ ) +- #if( defined( __ARM_EABI__ ) && \ +- ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) || ( __GNUC__ > 4 ) ) ++#if 1 ++ #if defined( __ARM_EABI__ ) + /* In theory we could check __ap but in practice it's too risky to rely + on the type and state of hidden internal fields, and in any case it's + only a sanity check, not a hard requirement, so we just no-op the diff --git a/security/cryptlib/files/patch-misc_os_spec.h b/security/cryptlib/files/patch-misc_os_spec.h deleted file mode 100644 index 8d229ccc8a28..000000000000 --- a/security/cryptlib/files/patch-misc_os_spec.h +++ /dev/null @@ -1,23 +0,0 @@ ---- misc/os_spec.h.orig 2016-03-25 02:49:10.000000000 +0100 -+++ misc/os_spec.h 2017-01-12 10:03:32.170180000 +0100 -@@ -761,9 +761,8 @@ - variants, this presumably extends to SH5 as well so we treat va_lists on - Super-H as scalars */ - --#if defined( __GNUC__ ) -- #if( defined( __ARM_EABI__ ) && \ -- ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) || ( __GNUC__ > 4 ) ) -+#if 1 -+ #if defined( __ARM_EABI__ ) - /* In theory we could check __ap but in practice it's too risky to rely - on the type and state of hidden internal fields, and in any case it's - only a sanity check, not a hard requirement, so we just no-op the -@@ -839,7 +838,7 @@ - - #if defined( __WINDOWS__ ) || \ - ( defined( __UNIX__ ) && \ -- ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || \ -+ ( ( defined( sun ) && OSVERSION > 4 ) || defined( __linux__ ) || defined(__FreeBSD__) || \ - defined( _AIX ) || ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) ) || \ - defined( __ANDROID__ ) - #define DYNAMIC_LOAD diff --git a/security/cryptlib/files/patch-test_certs.c b/security/cryptlib/files/patch-test_certs.c new file mode 100644 index 000000000000..8d9b05f4093c --- /dev/null +++ b/security/cryptlib/files/patch-test_certs.c @@ -0,0 +1,11 @@ +--- test/certs.c.orig 2023-03-20 10:42:36 UTC ++++ test/certs.c +@@ -52,7 +52,7 @@ + #if defined( __MWERKS__ ) || defined( SYMANTEC_C ) || defined( __MRC__ ) + #define CERTTIME_DATETEST ( ( ( 2021 - 1970 ) * ONE_YEAR_TIME ) + 2082844800L ) + #else +- #define CERTTIME_DATETEST ( ( 2021 - 1970 ) * ONE_YEAR_TIME ) ++ #define CERTTIME_DATETEST ( ( 2023 - 1970 ) * ONE_YEAR_TIME ) + #endif /* Macintosh-specific weird epoch */ + #if ( ULONG_MAX > 0xFFFFFFFFUL ) || defined( _M_X64 ) + #define SYSTEM_64BIT diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh index e1b43d127496..f0c1781caf8f 100644 --- a/security/cryptlib/files/patch-tools_ccopts.sh +++ b/security/cryptlib/files/patch-tools_ccopts.sh @@ -1,11 +1,20 @@ ---- tools/ccopts.sh.orig 2010-12-19 00:57:12.000000000 +0100 -+++ tools/ccopts.sh 2011-03-04 15:33:54.000000000 +0100 -@@ -341,22 +341,6 @@ fi - # in situations that also use shared libs, in the case of x86-64 the use - # of PIC should have minimum overhead so it shouldn't be a big deal. +--- tools/ccopts.sh.orig 2021-10-21 02:27:26 UTC ++++ tools/ccopts.sh +@@ -892,31 +892,6 @@ fi + # a big deal. As a convenient side-effect, this also enables the use of + # ASLR where it's supported. --if [ "$ARCH" = "i586" -o "$ARCH" = "i686" -o "$ARCH" = "x86_64" ] ; then -- if [ "$GCC_VER" -ge 30 ] ; then +-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ] || [ "$ARCH" = "x86_64" ] ; then +- if [ "$COMPILER_VER" -ge 45 ] ; then +- if [ $GENERICBUILD -gt 0 ] ; then +- echo " (Enabling lowest-common-denominator build options for cross-platform library)." >&2 ; +- else +- CCARGS="$CCARGS -march=native -mtune=generic" ; +- fi +- if [ "$ARCH" = "x86_64" ] ; then +- CCARGS="$CCARGS -fPIC" ; +- fi ; +- elif [ "$COMPILER_VER" -ge 30 ] ; then - case $ARCH in - 'x86_64') - CCARGS="$CCARGS -march=opteron -fPIC" ;;