Revision: 22883
http://sourceforge.net/p/gar/code/22883
Author: chninkel
Date: 2014-01-25 12:10:29 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
openssl1/trunk: really fix the pkcs11 engine location
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/Makefile
csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh
Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile 2014-01-25 11:03:10 UTC (rev
22882)
+++ csw/mgar/pkg/openssl1/trunk/Makefile 2014-01-25 12:10:29 UTC (rev
22883)
@@ -31,7 +31,7 @@
SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT)
-PKGFILES_CSWlibssl1-0-0 += $(libdir)(/amd64)?/openssl-1.0.0/engines/.*
+PKGFILES_CSWlibssl1-0-0 += $(libdir)(/[^/]*)?/openssl-1.0.0/engines/.*
PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs
PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.*
Modified: csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
2014-01-25 11:03:10 UTC (rev 22882)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
2014-01-25 12:10:29 UTC (rev 22883)
@@ -166,7 +166,7 @@
+ if (strcmp(filename, "pkcs11") == 0)
+ {
+#ifdef _LP64
-+ char *fullpath =
"/opt/csw/lib/openssl-1.0.0/engines/64/libpk11.so";
++ char *fullpath =
"/opt/csw/lib/64/openssl-1.0.0/engines/libpk11.so";
+#else
+ char *fullpath =
"/opt/csw/lib/openssl-1.0.0/engines/libpk11.so";
+#endif
@@ -196,7 +196,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11.c openssl-1.0.1f/engines/e_pk11.c
--- openssl-1.0.1f/engines/e_pk11.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,3710 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -3912,7 +3912,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11.h openssl-1.0.1f/engines/e_pk11.h
--- openssl-1.0.1f/engines/e_pk11.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -4175,7 +4175,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_err.c
openssl-1.0.1f/engines/e_pk11_err.c
--- openssl-1.0.1f/engines/e_pk11_err.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -4487,7 +4487,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_err.h
openssl-1.0.1f/engines/e_pk11_err.h
--- openssl-1.0.1f/engines/e_pk11_err.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,242 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -4735,7 +4735,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_pub.c
openssl-1.0.1f/engines/e_pk11_pub.c
--- openssl-1.0.1f/engines/e_pk11_pub.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,3273 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -8014,7 +8014,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_uri.c
openssl-1.0.1f/engines/e_pk11_uri.c
--- openssl-1.0.1f/engines/e_pk11_uri.c 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,869 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights
reserved.
@@ -8889,7 +8889,7 @@
===================================================================
diff -uNr openssl-1.0.1f/engines/e_pk11_uri.h
openssl-1.0.1f/engines/e_pk11_uri.h
--- openssl-1.0.1f/engines/e_pk11_uri.h 1970-01-01 01:00:00.000000000 +0100
-+++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:02:14.090671745 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:25:24.018899108 +0100
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
Modified: csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh 2014-01-25
11:03:10 UTC (rev 22882)
+++ csw/mgar/pkg/openssl1/trunk/files/update-pkcs11-patch.sh 2014-01-25
12:10:29 UTC (rev 22883)
@@ -24,7 +24,7 @@
wget $WGET_OPTIONS --output-document=-
${SOURCE_URL}/patches/15-pkcs11_engine-0.9.8a.patch | \
gsed -e 's/\/usr\/bin\/ar/\/usr\/ccs\/bin\/ar/g' | \
- gsed -e
's,"/lib/openssl/engines\(/64\)*/libpk11.so","/opt/csw/lib/openssl-1.0.0/engines\1/libpk11.so",'
+ gsed -e
's,"/lib/openssl/engines\(/64\)*/libpk11.so","/opt/csw/lib\1/openssl-1.0.0/engines/libpk11.so",'
# in the repository, the new files are not part of the patch, but we
merge them
# in a single patch
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
