components/openssl/common/patches/015-pkcs11_engine-0.9.8a.patch
changeset 4822 1fb8a14c6702
parent 4370 7043c27399f1
--- a/components/openssl/common/patches/015-pkcs11_engine-0.9.8a.patch	Fri Aug 28 07:46:44 2015 -0700
+++ b/components/openssl/common/patches/015-pkcs11_engine-0.9.8a.patch	Fri Aug 28 11:04:52 2015 -0700
@@ -23,7 +23,7 @@
  # --install_prefix  Additional prefix for package builders (empty by
  #               default).  This needn't be set in advance, you can
  #               just as well use "make INSTALL_PREFIX=/whatever install".
-@@ -657,6 +661,9 @@
+@@ -716,6 +719,9 @@
  my $idx_arflags = $idx++;
  my $idx_multilib = $idx++;
  
@@ -33,18 +33,18 @@
  my $prefix="";
  my $libdir="";
  my $openssldir="";
-@@ -882,6 +888,10 @@
-				$_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
-				$flags.=$_." ";
-				}
+@@ -938,6 +944,10 @@
+ 				{
+ 				$prefix=$1;
+ 				}
 +			elsif (/^--pk11-libname=(.*)$/)
 +				{
 +				$pk11_libname=$1;
 +				}
-			elsif (/^--prefix=(.*)$/)
-				{
-				$prefix=$1;
-@@ -1049,6 +1059,13 @@
+ 			elsif (/^--libdir=(.*)$/)
+ 				{
+ 				$libdir=$1;
+@@ -1105,6 +11115,13 @@
  	exit 0;
  }
  
@@ -58,7 +58,7 @@
  if ($target =~ m/^CygWin32(-.*)$/) {
  	$target = "Cygwin".$1;
  }
-@@ -1215,6 +1232,8 @@
+@@ -1279,6 +1296,8 @@
  if ($flags ne "")	{ $cflags="$flags$cflags"; }
  else			{ $no_user_cflags=1;       }
  
@@ -67,7 +67,7 @@
  # Kerberos settings.  The flavor must be provided from outside, either through
  # the script "config" or manually.
  if (!$no_krb5)
-@@ -1604,6 +1623,7 @@
+@@ -1687,6 +1706,7 @@
  	s/^VERSION=.*/VERSION=$version/;
  	s/^MAJOR=.*/MAJOR=$major/;
  	s/^MINOR=.*/MINOR=$minor/;
@@ -191,6 +191,6 @@
  # endif
  void ENGINE_load_cryptodev(void);
 +void ENGINE_load_pk11(void);
- void ENGINE_load_rsax(void);
  void ENGINE_load_rdrand(void);
  void ENGINE_load_builtin_engines(void);
+