Attachment 199303 Details for Bug 233279 – security/opencryptoki: update to 3.6.2 patch + reorder Makefile entries to make portlint happy

[patch] security/opencryptoki: update to 3.6.2 patch + reorder Makefile entries to make portlint happy

opencryptoki.patch (text/plain), 12.85 KB, created by Oleg Sidorkin on 2018-11-17 23:27:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Sidorkin

Created: 2018-11-17 23:27:03 UTC

Size: 12.85 KB

patch

obsolete

>Index: security/opencryptoki/Makefile
>===================================================================
>--- security/opencryptoki/Makefile	(revision 484819)
>+++ security/opencryptoki/Makefile	(working copy)
>@@ -2,10 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	opencryptoki
>-PORTVERSION=	3.6
>-PORTREVISION=	1
>+PORTVERSION=	3.6.2
>+DISTVERSIONPREFIX=      v
> CATEGORIES=	security
>-MASTER_SITES=	SF
> 
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Open PKCS\#11 implementation library
>@@ -18,8 +17,9 @@
> LIB_DEPENDS=	libtspi.so:security/trousers
> 
> USES=		alias autoreconf gmake libtool ssl tar:tgz
>+USE_GITHUB=	yes
> USE_LDCONFIG=	${PREFIX}/lib/opencryptoki
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>+
> INSTALL_TARGET=	install-strip
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-swtok --enable-tpmtok \
>Index: security/opencryptoki/distinfo
>===================================================================
>--- security/opencryptoki/distinfo	(revision 484819)
>+++ security/opencryptoki/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1478467347
>-SHA256 (opencryptoki-3.6.tgz) = f78a70632e50f6275467e84e95c6fa10dca2078da4e394518280defeb3169d2a
>-SIZE (opencryptoki-3.6.tgz) = 1067759
>+TIMESTAMP = 1542490055
>+SHA256 (opencryptoki-opencryptoki-v3.6.2_GH0.tar.gz) = 290bac872326c0d45e5134f22fb1b8eb8d096e5bd72560fc295d1574b020a95a
>+SIZE (opencryptoki-opencryptoki-v3.6.2_GH0.tar.gz) = 1060521
>Index: security/opencryptoki/files/patch-Makefile.am
>===================================================================
>--- security/opencryptoki/files/patch-Makefile.am	(revision 484819)
>+++ security/opencryptoki/files/patch-Makefile.am	(working copy)
>@@ -1,9 +1,8 @@
>---- Makefile.am.orig	2016-04-29 17:26:45 UTC
>-+++ Makefile.am
>-@@ -8,5 +8,5 @@ if ENABLE_DAEMON
>- MISCDIR = misc
>- endif
>+--- Makefile.am.orig	2017-02-17 15:33:35.000000000 +0300
>++++ Makefile.am	2018-11-18 00:52:35.532957000 +0300
>+@@ -10,4 +10,4 @@
>  
>+ ACLOCAL_AMFLAGS = -I m4
>+ 
> -SUBDIRS = usr man $(MISCDIR) $(TESTDIR)
> +SUBDIRS = usr man $(TESTDIR)
>- 
>Index: security/opencryptoki/files/patch-configure.ac
>===================================================================
>--- security/opencryptoki/files/patch-configure.ac	(revision 484819)
>+++ security/opencryptoki/files/patch-configure.ac	(working copy)
>@@ -1,8 +1,8 @@
>---- configure.in.orig	2016-04-29 17:26:45 UTC
>-+++ configure.in
>-@@ -6,6 +6,9 @@ AC_CANONICAL_SYSTEM
>+--- configure.ac.orig	2017-02-17 15:33:35.000000000 +0300
>++++ configure.ac	2018-11-18 00:35:04.909254000 +0300
>+@@ -6,6 +6,9 @@
>  
>- AM_INIT_AUTOMAKE([foreign 1.6])
>+ AM_INIT_AUTOMAKE([foreign 1.6 subdir-objects])
>  
> +AC_DEFINE(_BSD_SOURCE, 1, BSD functions)
> +AC_DEFINE(__BSD_VISIBLE, 1, BSD extensions)
>@@ -10,7 +10,7 @@
>  dnl Checks for header files.
>  AC_DISABLE_STATIC
>  LT_INIT
>-@@ -25,6 +28,7 @@ AC_FUNC_MEMCMP
>+@@ -25,6 +28,7 @@
>  AC_FUNC_STRFTIME
>  AC_FUNC_VPRINTF
>  AC_CHECK_FUNCS([getcwd])
>@@ -18,7 +18,7 @@
>  
>  dnl Used in various scripts
>  AC_PATH_PROG([ID], [id], [/us/bin/id])
>-@@ -40,10 +44,16 @@ AC_PROG_YACC
>+@@ -40,10 +44,16 @@
>  
>  dnl Define custom variables
>  
>@@ -37,7 +37,7 @@
>  AC_SUBST(logdir)
>  
>  dnl ---
>-@@ -166,6 +176,21 @@ AC_ARG_WITH([systemd],
>+@@ -166,6 +176,21 @@
>  	[],
>  	[with_systemd=no])
>  
>@@ -59,38 +59,37 @@
>  dnl ---
>  dnl ---
>  dnl --- Now that we have all the options, let's check for a valid build
>-@@ -554,13 +579,31 @@ fi
>+@@ -554,12 +579,30 @@
>  
>  AM_CONDITIONAL([ENABLE_PKCSEP11_MIGRATE], [test "x$enable_pkcsep11_migrate" = "xyes"])
>  
> -CFLAGS="$CFLAGS -DPKCS64 -D_XOPEN_SOURCE=600 -Wall -Wno-pointer-sign"
>--
>--CFLAGS+=' -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" -DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\" -DLOCKDIR_PATH=\"$(lockdir)\" -DOCK_CONFDIR=\"$(sysconfdir)/opencryptoki\" -DOCK_LOGDIR=\"$(logdir)\"'
>-+CFLAGS="$CFLAGS \
>-+ -Wall \
>-+ -Wno-pointer-sign \
>++CFLAGS="$CFLAGS \                                                                                                                 
>++ -Wall \                                                                                                                          
>++ -Wno-pointer-sign \                                                                                                              
>++"                                                                                                                                 
>++CPPFX=' \                                                                                                                         
>++ -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" \                                                                            
>++ -DSBIN_PATH=\"$(sbindir)\" \                                                                                                     
>++ -DLIB_PATH=\"$(libdir)\" \                                                                                                       
>++ -DLOCKDIR_PATH=\"$(lockdir)\" \                                                                                                  
>++ -DOCK_CONFDIR=\"$(sysconfdir)/opencryptoki\" \                                                                                   
>++ -DOCK_LOGDIR=\"$(logdir)\" \                                                                                                     
>++'                                                                                                                                 
>++CPPFLAGS="$CPPFLAGS \                                                                                                             
>++ -DPKCS64 \                                                                                                                       
>++ -D_XOPEN_SOURCE=600 \                                                                                                            
>++ $CPPFX \                                                                                                                         
>++ -DPKCS11USER=\\\"${pkcs11_user}\\\" \                                                                                            
>++ -DPKCS11GROUP=\\\"${pkcs11_group}\\\" \                                                                                          
> +"
>-+CPPFX=' \
>-+ -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" \
>-+ -DSBIN_PATH=\"$(sbindir)\" \
>-+ -DLIB_PATH=\"$(libdir)\" \
>-+ -DLOCKDIR_PATH=\"$(lockdir)\" \
>-+ -DOCK_CONFDIR=\"$(sysconfdir)/opencryptoki\" \
>-+ -DOCK_LOGDIR=\"$(logdir)\" \
>-+'
>-+CPPFLAGS="$CPPFLAGS \
>-+ -DPKCS64 \
>-+ -D_XOPEN_SOURCE=600 \
>-+ $CPPFX \
>-+ -DPKCS11USER=\\\"${pkcs11_user}\\\" \
>-+ -DPKCS11GROUP=\\\"${pkcs11_group}\\\" \
>-+"
>  
>+-CFLAGS+=' -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" -DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\" -DLOCKDIR_PATH=\"$(lockdir)\" -DOCK_CONFDIR=\"$(sysconfdir)/opencryptoki\" -DOCK_LOGDIR=\"$(logdir)\"'
>+-
>  # At this point, CFLAGS is set to something sensible
>  AC_PROG_CC
>++
>++AC_SUBST(FPIC, $lt_prog_compiler_pic)                                                                                             
>  
>-+AC_SUBST(FPIC, $lt_prog_compiler_pic)
>-+
>- AC_CONFIG_FILES([Makefile usr/Makefile \
>-           usr/include/Makefile \
>-           usr/include/pkcs11/Makefile \
>+ AC_CONFIG_MACRO_DIRS([m4])
>+ 
>Index: security/opencryptoki/files/patch-configure.in
>===================================================================
>--- security/opencryptoki/files/patch-configure.in	(revision 484819)
>+++ security/opencryptoki/files/patch-configure.in	(nonexistent)
>@@ -1,96 +0,0 @@
>---- configure.in.orig	2016-04-29 17:26:45 UTC
>-+++ configure.in
>-@@ -6,6 +6,9 @@ AC_CANONICAL_SYSTEM
>- 
>- AM_INIT_AUTOMAKE([foreign 1.6])
>- 
>-+AC_DEFINE(_BSD_SOURCE, 1, BSD functions)
>-+AC_DEFINE(__BSD_VISIBLE, 1, BSD extensions)
>-+
>- dnl Checks for header files.
>- AC_DISABLE_STATIC
>- LT_INIT
>-@@ -25,6 +28,7 @@ AC_FUNC_MEMCMP
>- AC_FUNC_STRFTIME
>- AC_FUNC_VPRINTF
>- AC_CHECK_FUNCS([getcwd])
>-+AC_CHECK_FUNCS([asprintf])
>- 
>- dnl Used in various scripts
>- AC_PATH_PROG([ID], [id], [/us/bin/id])
>-@@ -40,10 +44,16 @@ AC_PROG_YACC
>- 
>- dnl Define custom variables
>- 
>--lockdir=$localstatedir/lock/opencryptoki
>-+AC_ARG_WITH([lockdir],
>-+	[AS_HELP_STRING([--with-lockdir],[lock directory])],
>-+        [lockdir=$withval],
>-+        [lockdir=$localstatedir/lock/opencryptoki])
>- AC_SUBST(lockdir)
>- 
>--logdir=$localstatedir/log/opencryptoki
>-+AC_ARG_WITH([logdir],
>-+	[AS_HELP_STRING([--with-logdir],[log directory])],
>-+        [logdir=$withval],
>-+        [logdir=$localstatedir/log/opencryptoki])
>- AC_SUBST(logdir)
>- 
>- dnl ---
>-@@ -166,6 +176,21 @@ AC_ARG_WITH([systemd],
>- 	[],
>- 	[with_systemd=no])
>- 
>-+dnl --- check for pkcs11 user
>-+AC_ARG_WITH([pkcs11user],
>-+	AC_HELP_STRING([--with-pkcs11user[[=USER]]], [set pkcs11 user [[pkcs11]]]),
>-+        [pkcs11_user=$withval],
>-+        [pkcs11_user=pkcs11])
>-+
>-+dnl --- check for pkcs11 group
>-+AC_ARG_WITH(pkcs11group,
>-+	AC_HELP_STRING([--with-pkcs11group[[=GROUP]]], [set pkcs11 group [[pkcs11]]]),
>-+	[pkcs11_group=$withval],
>-+	[pkcs11_group=pkcs11])
>-+
>-+AC_SUBST(PKCS11USER, $pkcs11_user)
>-+AC_SUBST(PKCS11GROUP, $pkcs11_group)
>-+
>- dnl ---
>- dnl ---
>- dnl --- Now that we have all the options, let's check for a valid build
>-@@ -554,13 +579,31 @@ fi
>- 
>- AM_CONDITIONAL([ENABLE_PKCSEP11_MIGRATE], [test "x$enable_pkcsep11_migrate" = "xyes"])
>- 
>--CFLAGS="$CFLAGS -DPKCS64 -D_XOPEN_SOURCE=600 -Wall -Wno-pointer-sign"
>--
>--CFLAGS+=' -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" -DSBIN_PATH=\"$(sbindir)\" -DLIB_PATH=\"$(libdir)\" -DLOCKDIR_PATH=\"$(lockdir)\" -DOCK_CONFDIR=\"$(sysconfdir)/opencryptoki\" -DOCK_LOGDIR=\"$(logdir)\"'
>-+CFLAGS="$CFLAGS \
>-+ -Wall \
>-+ -Wno-pointer-sign \
>-+"
>-+CPPFX=' \
>-+ -DCONFIG_PATH=\"$(localstatedir)/lib/opencryptoki\" \
>-+ -DSBIN_PATH=\"$(sbindir)\" \
>-+ -DLIB_PATH=\"$(libdir)\" \
>-+ -DLOCKDIR_PATH=\"$(lockdir)\" \
>-+ -DOCK_CONFDIR=\"$(sysconfdir)/opencryptoki\" \
>-+ -DOCK_LOGDIR=\"$(logdir)\" \
>-+'
>-+CPPFLAGS="$CPPFLAGS \
>-+ -DPKCS64 \
>-+ -D_XOPEN_SOURCE=600 \
>-+ $CPPFX \
>-+ -DPKCS11USER=\\\"${pkcs11_user}\\\" \
>-+ -DPKCS11GROUP=\\\"${pkcs11_group}\\\" \
>-+"
>- 
>- # At this point, CFLAGS is set to something sensible
>- AC_PROG_CC
>- 
>-+AC_SUBST(FPIC, $lt_prog_compiler_pic)
>-+
>- AC_CONFIG_FILES([Makefile usr/Makefile \
>-           usr/include/Makefile \
>-           usr/include/pkcs11/Makefile \
>
>Property changes on: security/opencryptoki/files/patch-configure.in
>___________________________________________________________________
>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/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c
>===================================================================
>--- security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c	(revision 484819)
>+++ security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c	(nonexistent)
>@@ -1,62 +0,0 @@
>---- usr/lib/pkcs11/common/sw_crypt.c.orig	2016-04-29 17:26:46 UTC
>-+++ usr/lib/pkcs11/common/sw_crypt.c
>-@@ -309,12 +309,12 @@ sw_des3_cbc(CK_BYTE * in_data,
>- 	    CK_BYTE  *key_value,
>- 	    CK_BYTE  encrypt)
>- {
>--	des_key_schedule des_key1;
>--	des_key_schedule des_key2;
>--	des_key_schedule des_key3;
>-+	DES_key_schedule des_key1;
>-+	DES_key_schedule des_key2;
>-+	DES_key_schedule des_key3;
>- 
>--	const_des_cblock key_SSL1, key_SSL2, key_SSL3;
>--	des_cblock ivec;
>-+	const_DES_cblock key_SSL1, key_SSL2, key_SSL3;
>-+	DES_cblock ivec;
>- 
>- 	// the des decrypt will only fail if the data length is not evenly divisible
>- 	// by 8
>-@@ -328,30 +328,30 @@ sw_des3_cbc(CK_BYTE * in_data,
>- 	memcpy(&key_SSL1, key_value, (size_t)8);
>- 	memcpy(&key_SSL2, key_value+8, (size_t)8);
>- 	memcpy(&key_SSL3, key_value+16, (size_t)8);
>--	des_set_key_unchecked(&key_SSL1, des_key1);
>--	des_set_key_unchecked(&key_SSL2, des_key2);
>--	des_set_key_unchecked(&key_SSL3, des_key3);
>-+	DES_set_key_unchecked(&key_SSL1, &des_key1);
>-+	DES_set_key_unchecked(&key_SSL2, &des_key2);
>-+	DES_set_key_unchecked(&key_SSL3, &des_key3);
>- 
>- 	memcpy(ivec, init_v, sizeof(ivec));
>- 
>- 	// Encrypt or decrypt the data
>- 	if (encrypt) {
>--		des_ede3_cbc_encrypt(in_data,
>-+		DES_ede3_cbc_encrypt(in_data,
>- 				out_data,
>- 				in_data_len,
>--				des_key1,
>--				des_key2,
>--				des_key3,
>-+				&des_key1,
>-+				&des_key2,
>-+				&des_key3,
>- 				&ivec,
>- 				DES_ENCRYPT);
>- 		*out_data_len = in_data_len;
>- 	} else {
>--		des_ede3_cbc_encrypt(in_data,
>-+		DES_ede3_cbc_encrypt(in_data,
>- 				out_data,
>- 				in_data_len,
>--				des_key1,
>--				des_key2,
>--				des_key3,
>-+				&des_key1,
>-+				&des_key2,
>-+				&des_key3,
>- 				&ivec,
>- 				DES_DECRYPT);
>- 
>
>Property changes on: security/opencryptoki/files/patch-usr_lib_pkcs11_common_sw__crypt.c
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 233279: 199302 | 199303