Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openssl/openssl-1.0.1/patches/28-enginesdir.patch
author Ron Jordan <ron.jordan@oracle.com>
Tue, 24 Mar 2015 20:05:38 -0700
branchs11u2-sru
changeset 4016 7f9e1e7611b8
parent 2593 b92e6df5eaf0
permissions -rw-r--r--
20735615 Upgrade OpenSSL version to 1.0.1m 20735495 problem in LIBRARY/OPENSSL 20735520 problem in LIBRARY/OPENSSL 20735531 problem in LIBRARY/OPENSSL 20735537 problem in LIBRARY/OPENSSL 20735541 problem in LIBRARY/OPENSSL 20735555 problem in LIBRARY/OPENSSL 20735563 problem in LIBRARY/OPENSSL 20688058 problem in LIBRARY/OPENSSL
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
     1
 
#
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
     2
 
# This was developed in house to configure the engine dir.
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
     3
 
# Not suitable for upstream.
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
     4
 
#
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     5
 
--- /tmp/18/Configure	Fri Feb 11 15:15:50 2011
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     6
 
+++ openssl-1.0.0d/Configure	Fri Feb 11 15:18:09 2011
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     7
 
@@ -18,6 +18,8 @@
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     8
 
 #               --prefix option is given; /usr/local/ssl otherwise)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     9
 
 # --prefix      prefix for the OpenSSL include, lib and bin directories
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    10
 
 #               (Default: the OPENSSLDIR directory)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    11
 
+# --enginesdir  engines shared library location
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    12
 
+#               (Default: $prefix/lib/engines)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    13
 
 #
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    14
 
 # --pk11-libname  PKCS#11 library name.
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    15
 
 #               (Default: none)
2593
b92e6df5eaf0 PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
    16
 
@@ -679,6 +679,7 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    17
 
 my $prefix="";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    18
 
 my $libdir="";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    19
 
 my $openssldir="";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    20
 
+my $enginesdir="";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    21
 
 my $exe_ext="";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    22
 
 my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    23
 
 my $cross_compile_prefix="";
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
    24
 
@@ -917,6 +920,10 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    25
 
 				{
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    26
 
 				$openssldir=$1;
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    27
 
 				}
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    28
 
+			elsif (/^--enginesdir=(.*)$/)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    29
 
+				{
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    30
 
+				$enginesdir=$1;
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    31
 
+				}
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    32
 
 			elsif (/^--install.prefix=(.*)$/)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    33
 
 				{
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    34
 
 				$install_prefix=$1;
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
    35
 
@@ -1224,6 +1231,10 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    36
 
 # we're ready to tolerate, so don't...
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    37
 
 $multilib="" if !-d "$prefix/lib$multilib";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    38
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    39
 
+if ($enginesdir eq "") {
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    40
 
+	$enginesdir = "$prefix/lib/engines";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    41
 
+}
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    42
 
+
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    43
 
 $libdir="lib$multilib" if $libdir eq "";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    44
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    45
 
 $cflags = "$cflags$exp_cflags";
4016
7f9e1e7611b8 20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents: 2593
diff changeset 
    46
 
@@ -1846,7 +1857,7 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    47
 
 		}
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    48
 
 	elsif	(/^#define\s+ENGINESDIR/)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    49
 
 		{
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    50
 
-		my $foo = "$prefix/$libdir/engines";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    51
 
+		my $foo = "$enginesdir";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    52
 
 		$foo =~ s/\\/\\\\/g;
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    53
 
 		print OUT "#define ENGINESDIR \"$foo\"\n";
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    54
 
 		}
upstream/oracle/userland-gate