From owner-svn-ports-all@freebsd.org Thu Jan 12 09:16:12 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E171CAC763; Thu, 12 Jan 2017 09:16:12 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EDC012FB; Thu, 12 Jan 2017 09:16:12 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0C9GBcP070141; Thu, 12 Jan 2017 09:16:11 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0C9GB09070137; Thu, 12 Jan 2017 09:16:11 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201701120916.v0C9GB09070137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Thu, 12 Jan 2017 09:16:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431239 - in head/security/cryptlib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jan 2017 09:16:12 -0000 Author: ale Date: Thu Jan 12 09:16:11 2017 New Revision: 431239 URL: https://svnweb.freebsd.org/changeset/ports/431239 Log: Update to 3.4.3 release. PR: 215983 Submitted by: Yuri Victorovich Deleted: head/security/cryptlib/files/patch-misc_config.h Modified: head/security/cryptlib/Makefile head/security/cryptlib/distinfo head/security/cryptlib/files/patch-makefile head/security/cryptlib/files/patch-misc_os_spec.h Modified: head/security/cryptlib/Makefile ============================================================================== --- head/security/cryptlib/Makefile Thu Jan 12 09:01:09 2017 (r431238) +++ head/security/cryptlib/Makefile Thu Jan 12 09:16:11 2017 (r431239) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cryptlib -PORTVERSION= 3.4.1 +PORTVERSION= 3.4.3 CATEGORIES= security MASTER_SITES= ftp://ftp.franken.de/pub/crypt/cryptlib/ DISTNAME= cl${PORTVERSION:S/.//g} @@ -21,6 +21,7 @@ MAKEFILE= makefile ALL_TARGET= default FreeBSD shared USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes +CFLAGS+= -DUSE_PKCS11 PLIST_FILES= include/cryptlib.h \ lib/libcl.a lib/libcl.so \ Modified: head/security/cryptlib/distinfo ============================================================================== --- head/security/cryptlib/distinfo Thu Jan 12 09:01:09 2017 (r431238) +++ head/security/cryptlib/distinfo Thu Jan 12 09:16:11 2017 (r431239) @@ -1,2 +1,3 @@ -SHA256 (cl341.zip) = d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94 -SIZE (cl341.zip) = 5704337 +TIMESTAMP = 1484210997 +SHA256 (cl343.zip) = 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad +SIZE (cl343.zip) = 5703258 Modified: head/security/cryptlib/files/patch-makefile ============================================================================== --- head/security/cryptlib/files/patch-makefile Thu Jan 12 09:01:09 2017 (r431238) +++ head/security/cryptlib/files/patch-makefile Thu Jan 12 09:16:11 2017 (r431239) @@ -1,11 +1,11 @@ ---- makefile.orig 2010-11-19 04:08:54.000000000 +0100 -+++ makefile 2011-03-04 15:30:09.000000000 +0100 -@@ -1651,7 +1651,7 @@ FreeBSD: - @if uname -m | grep "i[3,4,5,6]86" > /dev/null; then \ - ./tools/buildasm.sh $(AS) $(OBJPATH) ; \ - make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \ -- -fomit-frame-pointer -pthread" ; \ -+ %%CFLAGS%%" ; \ - else \ - make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \ - fi +--- 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" + + FreeBSD: +- make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ++ make $(DEFINES) CFLAGS="$(CFLAGS) %%CFLAGS%%" + + NetBSD: + make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" Modified: head/security/cryptlib/files/patch-misc_os_spec.h ============================================================================== --- head/security/cryptlib/files/patch-misc_os_spec.h Thu Jan 12 09:01:09 2017 (r431238) +++ head/security/cryptlib/files/patch-misc_os_spec.h Thu Jan 12 09:16:11 2017 (r431239) @@ -1,22 +1,23 @@ ---- misc/os_spec.h.orig 2011-08-02 23:52:50.000000000 +0000 -+++ misc/os_spec.h 2015-02-19 11:32:33.126607217 +0000 -@@ -606,9 +606,7 @@ - support for the change was added in gcc 4.4, so any newer version with - ARM_EABI defined will have a scalar va_list */ +--- 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__ ) && \ -- ( ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) || ( __GNUC__ > 4 ) ) && \ -- defined( __ARM_EABI__ ) -+#if defined( __ARM_EABI__ ) +-#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 -@@ -666,7 +664,7 @@ +@@ -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( _AIX ) || ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) ) || \ + defined( __ANDROID__ ) #define DYNAMIC_LOAD -