[csw-devel] SF.net SVN: gar:[21669] csw/mgar/pkg/openssl1/trunk

[chninkel at users.sourceforge.net]

Revision: 21669
          http://gar.svn.sourceforge.net/gar/?rev=21669&view=rev
Author:   chninkel
Date:     2013-08-07 18:53:09 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
openssl1/trunk: disabled pkcs11 engine patch under sparc for now as it creates some problem with the tls protocol

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2013-08-07 15:23:18 UTC (rev 21668)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2013-08-07 18:53:09 UTC (rev 21669)
@@ -125,8 +125,12 @@
 
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
 ifneq ($(shell /usr/bin/uname -r),5.9)
+# There is a problem with this patch under sparc when using tls protocol
+# See https://www.opencsw.org/mantis/view.php?id=5098
+ifneq ($(shell /usr/bin/uname -p),sparc)
        PATCHFILES += pkcs11_engine-1.0.1b.patch.2012-04-30
 endif
+endif
 
 # support for sparc t4 crypto engine 
 # see http://bubbva.blogspot.fr/2011/11/exciting-crypto-advances-with-t4.html
@@ -187,7 +191,11 @@
 
 # PKCS11 is only for Solaris 10 so we must create solaris 10 specific packages
 ifneq ($(shell /usr/bin/uname -r),5.9)
+# There is a problem with this patch under sparc when using tls protocol
+# See https://www.opencsw.org/mantis/view.php?id=5098
+ifneq ($(shell /usr/bin/uname -p),sparc)
         CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
+endif
 endif 
 
 # For now we want the sun perl to be used

Modified: csw/mgar/pkg/openssl1/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2013-08-07 15:23:18 UTC (rev 21668)
+++ csw/mgar/pkg/openssl1/trunk/files/changelog.CSW	2013-08-07 18:53:09 UTC (rev 21669)
@@ -1,10 +1,17 @@
+openssl (1.0.1e,rev=2013.08.07) unstable
+
+  * Disabled pkcs11 engine patch under sparc for now as it 
+  creates some problem with the tls protocol (see bug #5098).
+
+   -- yann rouillard <yann at opencsw.org>  Wed, 07 Aug 2013 20:51:08 +0200
+
 openssl (1.0.1e,rev=2013.07.09) unstable
 
-  * Removed checkinstall, preinstall and postinstall scripts
-    that are not necessary anymore (Solaris 8 support and 
+  * removed checkinstall, preinstall and postinstall scripts
+    that are not necessary anymore (solaris 8 support and 
     old modification of certificates location).
 
-   -- Yann Rouillard <yann at opencsw.org>  Tue, 09 Jul 2013 16:14:39 +0200
+   -- yann rouillard <yann at opencsw.org>  Tue, 09 jul 2013 16:14:39 +0200
 
 openssl (1.0.1e,rev=2013.03.22) unstable
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.