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-fips-140/patches/27-6978791.patch
author Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
Fri, 13 Dec 2013 07:45:20 -0800
changeset 1596 59869c4257d0
parent 1586 components/openssl/openssl-0.9.8-fips-140/patches/27-6978791.patch@2d3ec080d6a3
permissions -rw-r--r--
PSARC/2013/383 OpenSSL FIPS 140-2 version update 15801760 SUNBT7181479 FIPS-capable version of OpenSSL using OpenSSL FIPS Object Module v2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1586
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     1
 
--- /tmp/Makefile.shared	Mon Feb 14 14:39:29 2011
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     2
 
+++ openssl-1.0.0d/Makefile.shared	Mon Feb 14 14:50:52 2011
2d3ec080d6a3 PSARC/2013/383 OpenSSL FIPS 140-2 version update
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents: 363
diff changeset 
     3
 
@@ -387,6 +387,9 @@
363
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     4
 
 		ALLSYMSFLAGS="$${MINUSZ}allextract"; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     5
 
 		NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     6
 
 		SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     7
 
+		if [ $(LIBNAME) = "ssl" ]; then \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     8
 
+			SHAREDFLAGS="$$SHAREDFLAGS $${MINUSZ}nodelete"; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
     9
 
+		fi; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    10
 
 	fi; \
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    11
 
 	$(LINK_SO_A)
9c0cad004039 7039910 move OpenSSL from SFW to Userland gate
Jan Pechanec <Jan.Pechanec@Oracle.COM>
parents:
diff changeset 
    12
 
 # Make sure the apps have non-executable stacks and data (x86/x64 only).
upstream/oracle/userland-gate