Attachment #178768 for bug #215983

Lines 2-8 Link Here

(-)security/cryptlib/Makefile (-1 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cryptlib	4	PORTNAME= cryptlib
5	PORTVERSION= 3.4.1	5	PORTVERSION= 3.4.3
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= ftp://ftp.franken.de/pub/crypt/cryptlib/	7	MASTER_SITES= ftp://ftp.franken.de/pub/crypt/cryptlib/
8	DISTNAME= cl${PORTVERSION:S/.//g}	8	DISTNAME= cl${PORTVERSION:S/.//g}
Lines 21-26 Link Here
21	ALL_TARGET= default FreeBSD shared	21	ALL_TARGET= default FreeBSD shared
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	MAKE_JOBS_UNSAFE= yes	23	MAKE_JOBS_UNSAFE= yes
		24	CFLAGS+= -DUSE_PKCS11
24		25
25	PLIST_FILES= include/cryptlib.h \	26	PLIST_FILES= include/cryptlib.h \
26	lib/libcl.a lib/libcl.so \	27	lib/libcl.a lib/libcl.so \

Lines 1-2 Link Here

(-)security/cryptlib/distinfo (-2 / +3 lines)
1	SHA256 (cl341.zip) = d3057acbf4bc7d45694d8ec2621ee4027f9303d36cebdfe2af770567ec912c94	1	TIMESTAMP = 1484186560
2	SIZE (cl341.zip) = 5704337	2	SHA256 (cl343.zip) = 08b104442bb5c7281a3299853d5585cc63bd928454dff3150569c02b957427ad
		3	SIZE (cl343.zip) = 5703258

Lines 1-11 Link Here

(-)security/cryptlib/files/patch-makefile (-11 / +11 lines)
1	--- makefile.orig 2010-11-19 04:08:54.000000000 +0100	1	--- makefile.orig 2016-03-25 11:33:28 UTC
2	+++ makefile 2011-03-04 15:30:09.000000000 +0100	2	+++ makefile
3	@@ -1651,7 +1651,7 @@ FreeBSD:	3	@@ -1626,7 +1626,7 @@ BSD/OS:
4	@if uname -m \| grep "i[3,4,5,6]86" > /dev/null; then \	4	@make $(DEFINES) CFLAGS="$(CFLAGS) -DUSE_ASM -fomit-frame-pointer -O3"
5	./tools/buildasm.sh $(AS) $(OBJPATH) ; \	5
6	make $(DEFINES) EXTRAOBJS="$(ASMOBJS)" CFLAGS="$(CFLAGS) -DUSE_ASM \	6	FreeBSD:
7	- -fomit-frame-pointer -pthread" ; \	7	- make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread"
8	+ %%CFLAGS%%" ; \	8	+ make $(DEFINES) CFLAGS="$(CFLAGS) -O2 -pipe -fno-omit-frame-pointer -DUSE_PKCS11 -fstack-protector -fno-strict-aliasing"
9	else \	9
10	make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread" ; \	10	NetBSD:
11	fi	11	make $(DEFINES) CFLAGS="$(CFLAGS) -fomit-frame-pointer -pthread"

Lines 1-10 Link Here

(-)security/cryptlib/files/patch-misc_config.h (-10 lines)
1	--- misc/config.h.orig 2011-08-14 01:40:52.000000000 +0200
2	+++ misc/config.h 2012-01-10 12:45:17.000000000 +0100
3	@@ -280,6 +280,7 @@
4
5	/* General device usage */
6
7	+#define USE_PKCS11
8	#if defined( USE_PKCS11 ) \|\| defined( USE_CRYPTOAPI )
9	#define USE_DEVICES
10	#endif /* Device types */




--- 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




--- 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
 

Lines 1-6 Link Here

(-)security/cryptlib/files/patch-tools_ccopts.sh (-3 / +3 lines)
1	--- tools/ccopts.sh.orig 2010-12-19 00:57:12.000000000 +0100	1	--- tools/ccopts.sh.orig 2016-03-05 02:54:34 UTC
2	+++ tools/ccopts.sh 2011-03-04 15:33:54.000000000 +0100	2	+++ tools/ccopts.sh
3	@@ -341,22 +341,6 @@ fi	3	@@ -448,22 +448,6 @@ fi
4	# in situations that also use shared libs, in the case of x86-64 the use	4	# in situations that also use shared libs, in the case of x86-64 the use
5	# of PIC should have minimum overhead so it shouldn't be a big deal.	5	# of PIC should have minimum overhead so it shouldn't be a big deal.
6		6

Return to bug 215983

Line 0 Link Here

(-)security/cryptlib/files/patch-misc_os__spec.h (+23 lines)
	1	--- misc/os_spec.h.orig 2016-03-25 09:49:10 UTC
	2	+++ misc/os_spec.h
	3	@@ -761,9 +761,8 @@ typedef unsigned char BYTE;
	4	variants, this presumably extends to SH5 as well so we treat va_lists on
	5	Super-H as scalars */
	6
	7	-#if defined( __GNUC__ )
	8	- #if( defined( __ARM_EABI__ ) && \
	9	- ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) \|\| ( __GNUC__ > 4 ) )
	10	+#if 1
	11	+#if defined( __ARM_EABI__ )
	12	/* In theory we could check __ap but in practice it's too risky to rely
	13	on the type and state of hidden internal fields, and in any case it's
	14	only a sanity check, not a hard requirement, so we just no-op the
	15	@@ -839,7 +838,7 @@ typedef unsigned char BYTE;
	16
	17	#if defined( __WINDOWS__ ) \|\| \
	18	( defined( __UNIX__ ) && \
	19	- ( ( defined( sun ) && OSVERSION > 4 ) \|\| defined( __linux__ ) \|\| \
	20	+ ( ( defined( sun ) && OSVERSION > 4 ) \|\| defined( __linux__ ) \|\| defined(__FreeBSD__) \|\| \
	21	defined( _AIX ) \|\| ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) ) \|\| \
	22	defined( __ANDROID__ )
	23	#define DYNAMIC_LOAD

Lines 1-22 Link Here

(-)security/cryptlib/files/patch-misc_os_spec.h (-22 lines)
1	--- misc/os_spec.h.orig 2011-08-02 23:52:50.000000000 +0000
2	+++ misc/os_spec.h 2015-02-19 11:32:33.126607217 +0000
3	@@ -606,9 +606,7 @@
4	support for the change was added in gcc 4.4, so any newer version with
5	ARM_EABI defined will have a scalar va_list */
6
7	-#if defined( __GNUC__ ) && \
8	- ( ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) \|\| ( __GNUC__ > 4 ) ) && \
9	- defined( __ARM_EABI__ )
10	+#if defined( __ARM_EABI__ )
11	/* In theory we could check __ap but in practice it's too risky to rely
12	on the type and state of hidden internal fields, and in any case it's
13	only a sanity check, not a hard requirement, so we just no-op the
14	@@ -666,7 +664,7 @@
15
16	#if defined( __WINDOWS__ ) \|\| \
17	( defined( __UNIX__ ) && \
18	- ( ( defined( sun ) && OSVERSION > 4 ) \|\| defined( __linux__ ) \|\| \
19	+ ( ( defined( sun ) && OSVERSION > 4 ) \|\| defined( __linux__ ) \|\| defined(__FreeBSD__) \|\| \
20	defined( _AIX ) \|\| ( defined( __APPLE__ ) && !defined( __MAC__ ) ) ) )
21	#define DYNAMIC_LOAD
22