Revision: 22882
http://sourceforge.net/p/gar/code/22882
Author: chninkel
Date: 2014-01-25 11:03:10 +0000 (Sat, 25 Jan 2014)
Log Message:
-----------
openssl1/trunk: really fix the pkcs11 engine location
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
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 10:38:40 UTC (rev 22881)
+++ csw/mgar/pkg/openssl1/trunk/files/openssl-1.0.1f-pkcs11-engine.patch
2014-01-25 11:03:10 UTC (rev 22882)
@@ -166,9 +166,9 @@
+ if (strcmp(filename, "pkcs11") == 0)
+ {
+#ifdef _LP64
-+ char *fullpath = "/opt/csw/lib/openssl/engines/64/libpk11.so";
++ char *fullpath =
"/opt/csw/lib/openssl-1.0.0/engines/64/libpk11.so";
+#else
-+ char *fullpath = "/opt/csw/lib/openssl/engines/libpk11.so";
++ char *fullpath =
"/opt/csw/lib/openssl-1.0.0/engines/libpk11.so";
+#endif
+ result = OPENSSL_malloc(strlen(fullpath) + 1);
+ if(result == NULL)
@@ -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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11.c 2014-01-25 13:02:14.090671745 +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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11.h 2014-01-25 13:02:14.090671745 +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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.c 2014-01-25 13:02:14.090671745 +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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_err.h 2014-01-25 13:02:14.090671745 +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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_pub.c 2014-01-25 13:02:14.090671745 +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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.c 2014-01-25 13:02:14.090671745 +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 00:09:21.952650657 +0100
++++ openssl-1.0.1f/engines/e_pk11_uri.h 2014-01-25 13:02:14.090671745 +0100
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights
reserved.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
