Attachment 178769 Details for Bug 215983 – patch

[patch] patch

cryptlib.patch (text/plain), 6.98 KB, created by Yuri Victorovich on 2017-01-12 02:45:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-01-12 02:45:06 UTC

Size: 6.98 KB

patch

obsolete

>Index: security/cryptlib/Makefile
>===================================================================
>--- security/cryptlib/Makefile	(revision 431217)
>+++ security/cryptlib/Makefile	(working copy)
>@@ -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 @@
> 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 \
>Index: security/cryptlib/distinfo
>===================================================================
>--- security/cryptlib/distinfo	(revision 431217)
>+++ security/cryptlib/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (cl341.zip) = d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94
>-SIZE (cl341.zip) = 5704337
>+TIMESTAMP = 1484186560
>+SHA256 (cl343.zip) = 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad
>+SIZE (cl343.zip) = 5703258
>Index: security/cryptlib/files/patch-makefile
>===================================================================
>--- security/cryptlib/files/patch-makefile	(revision 431217)
>+++ security/cryptlib/files/patch-makefile	(working copy)
>@@ -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 11:33:28 UTC
>++++ makefile
>+@@ -1626,7 +1626,7 @@ BSD/OS:
>+ 	@make $(DEFINES) CFLAGS="$(CFLAGS) -DUSE_ASM -fomit-frame-pointer -O3"
>+ 
>+ FreeBSD:
>+-	make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread"
>++	make $(DEFINES) CFLAGS="$(CFLAGS) -O2 -pipe -fno-omit-frame-pointer  -DUSE_PKCS11 -fstack-protector -fno-strict-aliasing"
>+ 
>+ NetBSD:
>+ 	make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" 
>Index: security/cryptlib/files/patch-misc_config.h
>===================================================================
>--- security/cryptlib/files/patch-misc_config.h	(revision 431217)
>+++ security/cryptlib/files/patch-misc_config.h	(nonexistent)
>@@ -1,10 +0,0 @@
>---- misc/config.h.orig	2011-08-14 01:40:52.000000000 +0200
>-+++ misc/config.h	2012-01-10 12:45:17.000000000 +0100
>-@@ -280,6 +280,7 @@
>- 
>- /* General device usage */
>- 
>-+#define USE_PKCS11
>- #if defined( USE_PKCS11 ) || defined( USE_CRYPTOAPI )
>-   #define USE_DEVICES
>- #endif /* Device types */
>
>Property changes on: security/cryptlib/files/patch-misc_config.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/cryptlib/files/patch-misc_os__spec.h
>===================================================================
>--- security/cryptlib/files/patch-misc_os__spec.h	(nonexistent)
>+++ security/cryptlib/files/patch-misc_os__spec.h	(working copy)
>@@ -0,0 +1,23 @@
>+--- misc/os_spec.h.orig	2016-03-25 09:49:10 UTC
>++++ misc/os_spec.h
>+@@ -761,9 +761,8 @@ typedef unsigned char		BYTE;
>+    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 @@ typedef unsigned char		BYTE;
>+ 
>+ #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
>
>Property changes on: security/cryptlib/files/patch-misc_os__spec.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/cryptlib/files/patch-misc_os_spec.h
>===================================================================
>--- security/cryptlib/files/patch-misc_os_spec.h	(revision 431217)
>+++ security/cryptlib/files/patch-misc_os_spec.h	(nonexistent)
>@@ -1,22 +0,0 @@
>---- 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 */
>- 
>--#if defined( __GNUC__ ) && \
>--	( ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) || ( __GNUC__ > 4 ) ) && \
>--	defined( __ARM_EABI__ )
>-+#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 @@
>- 
>- #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__ ) ) ) )
>-   #define DYNAMIC_LOAD
>- 
>
>Property changes on: security/cryptlib/files/patch-misc_os_spec.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: security/cryptlib/files/patch-tools_ccopts.sh
>===================================================================
>--- security/cryptlib/files/patch-tools_ccopts.sh	(revision 431217)
>+++ security/cryptlib/files/patch-tools_ccopts.sh	(working copy)
>@@ -1,6 +1,6 @@
>---- 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
>+--- tools/ccopts.sh.orig	2016-03-05 02:54:34 UTC
>++++ tools/ccopts.sh
>+@@ -448,22 +448,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.
>

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 215983: 178768 | 178769