[csw-devel] SF.net SVN: gar:[3948] csw/mgar/pkg/openssl/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Wed Mar 25 16:21:12 CET 2009
Revision: 3948
http://gar.svn.sourceforge.net/gar/?rev=3948&view=rev
Author: chninkel
Date: 2009-03-25 15:21:11 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
openssl: updated to 0.9.8j
openssl: first try to add pkcs11 support
Modified Paths:
--------------
csw/mgar/pkg/openssl/trunk/Makefile
csw/mgar/pkg/openssl/trunk/checksums
csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall
csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc
csw/mgar/pkg/openssl/trunk/files/changelog.CSW
Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile 2009-03-25 14:54:06 UTC (rev 3947)
+++ csw/mgar/pkg/openssl/trunk/Makefile 2009-03-25 15:21:11 UTC (rev 3948)
@@ -1,5 +1,5 @@
GARNAME = openssl
-GARVERSION = 0.9.8i
+GARVERSION = 0.9.8j
CATEGORIES = lib
OPENSSL_VERSION := $(shell echo $(GARVERSION) | sed -e 's/[a-z]//g')
@@ -84,6 +84,25 @@
SKIPTEST = 1
+
+# support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
+ifdef PKCS11
+ PATCHFILES += pkcs11_engine-0.9.8h.patch.2008-07-29
+ ifeq ($(GARCH),sparc)
+ ifeq ($(ISA),sparcv9)
+ CONFIGURE_ARGS += --pk11-libname=/usr/lib/sparcv9/libpkcs11.so
+ else
+ CONFIGURE_ARGS += --pk11-libname=/usr/lib/libpkcs11.so
+ endif
+ else
+ ifeq ($(ISA),amd64)
+ CONFIGURE_ARGS += --pk11-libname=/usr/lib/sparcv9/libpkcs11.so
+ else
+ CONFIGURE_ARGS += --pk11-libname=/usr/lib/libpkcs11.so
+ endif
+ endif
+endif
+
include gar/category.mk
# we redefine the timestamp to fulfill opencsw standard
Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums 2009-03-25 14:54:06 UTC (rev 3947)
+++ csw/mgar/pkg/openssl/trunk/checksums 2009-03-25 15:21:11 UTC (rev 3948)
@@ -1,14 +1,14 @@
-561e00f18821c74b2b86c8c7786f9d8b download/openssl-0.9.8i.tar.gz
+a5cb5f6c3d11affb387ecf7a997cac0c download/openssl-0.9.8j.tar.gz
b5ded4412606a0996595015bc2ff6974 download/CSWossl.gspec
05b45e7124833dee48e5f3c45591e95b download/CSWossl.depend
bd9bb4dfb9602fba461b21fa37f97765 download/CSWossl.prototype
83480e01971e71d037bd44fa5ed4e4e5 download/CSWosslrt.gspec
-44afcc5a68551370907b9da130acc62b download/CSWosslrt.checkinstall
+05ace5330714d6cd9c0e076b6ae2518f download/CSWosslrt.checkinstall
c9de908daad1a31fca20329cb043ad3c download/CSWosslrt.preinstall
1c3f600eaf942a18ecab3637e1fc32bd download/CSWosslrt.postinstall
cbf34987267073fb1f60bff86492dd8b download/CSWosslrt.depend
-e4ae37693f304010a024329151d7620e download/CSWosslrt.prototype-i386
-b71924fca6e324743e6977f370cce76b download/CSWosslrt.prototype-sparc
+463d53d6fcab5f33e2e204a831d47ccc download/CSWosslrt.prototype-i386
+ec547e9a56e0933a928fd9d505c19333 download/CSWosslrt.prototype-sparc
2ac43ebf4689d236540e22171541be4e download/CSWossldevel.gspec
37995caa7f4155066b00fb7503e853da download/CSWossldevel.depend
da3116a1d8dfd2bd3e4f2a11f4fb5f8b download/CSWossldevel.prototype-i386
@@ -16,8 +16,9 @@
eec77249fb642c525cad67dcd055fb77 download/CSWosslutils.gspec
37995caa7f4155066b00fb7503e853da download/CSWosslutils.depend
a441995e4e3c95497e77aa613d2c673c download/CSWosslutils.prototype
-1322076d544d1a7d4d494ae65d324d5a download/changelog.CSW
+578763067cc1f5fef2b93f2c70324c50 download/changelog.CSW
b78faa440d6f6a2a07663de331678648 download/README.CSW
7fdc09cd3c11db459c83c8946f7872f6 download/i.conf
a454ac09091085813ec8900f5a0c917c download/r.conf
64f7c3f3a6cae483209b69c31c82557d download/openssl.0.9.8.patch
+8bd218e7c8aef3e2f5b1602a95f714f7 download/pkcs11_engine-0.9.8h.patch.2008-07-29
Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall 2009-03-25 14:54:06 UTC (rev 3947)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.checkinstall 2009-03-25 15:21:11 UTC (rev 3948)
@@ -31,7 +31,7 @@
# and /opt/csw/ssl/certs is now a symbolic links
# we test if certificates were manually installed in this directory
-if [ ! -L "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then
+if [ ! -h "/opt/csw/ssl/certs" ] && [ -d "/opt/csw/ssl/certs" ] && [ -n "`ls -1 /opt/csw/ssl/certs/`" ]; then
echo "Custom certificates have been installed in /opt/csw/ssl/certs/."
echo "They will be moved under /opt/csw/etc/ssl/certs."
Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2009-03-25 14:54:06 UTC (rev 3947)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-i386 2009-03-25 15:21:11 UTC (rev 3948)
@@ -27,6 +27,9 @@
d none /opt/csw/share/doc/openssl_rt 0755 root bin
d none /opt/csw/ssl 0755 root bin
s none /opt/csw/ssl/certs=../etc/ssl/certs
+s none /opt/csw/ssl/private=../../../etc/opt/csw/ssl/private
+d none /etc/opt/csw/ssl/private 0700 root bin
+s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private
f none /opt/csw/share/doc/openssl_rt/changelog.CSW=changelog.CSW 644 root bin
f none /opt/csw/share/doc/openssl_rt/CHANGES=CHANGES 644 root bin
f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay=CHANGES 644 root bin
Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2009-03-25 14:54:06 UTC (rev 3947)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.prototype-sparc 2009-03-25 15:21:11 UTC (rev 3948)
@@ -31,6 +31,9 @@
d none /opt/csw/share/doc/openssl_rt 0755 root bin
d none /opt/csw/ssl 0755 root bin
s none /opt/csw/ssl/certs=../etc/ssl/certs
+s none /opt/csw/ssl/private=../../../etc/opt/csw/ssl/private
+d none /etc/opt/csw/ssl/private 0700 root bin
+s none /opt/csw/etc/ssl/private=../../../../etc/opt/csw/ssl/private
f none /opt/csw/share/doc/openssl_rt/changelog.CSW=changelog.CSW 644 root bin
f none /opt/csw/share/doc/openssl_rt/CHANGES=CHANGES 644 root bin
f none /opt/csw/share/doc/openssl_rt/CHANGES.SSLeay=CHANGES 644 root bin
Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-03-25 14:54:06 UTC (rev 3947)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW 2009-03-25 15:21:11 UTC (rev 3948)
@@ -1,3 +1,18 @@
+openssl (0.9.8,rev=2009.01.28_rev=j) unstable
+
+ * Fixed checkinstall bug, -h should be used instead of -L to
+ test symlink because old sh doesn't know -L.
+
+ -- Yann Rouillard <yann at opencsw.org> Wed, 28 Jan 2009 10:37:43 +0100
+
+openssl (0.9.8,rev=2009.01.07_rev=j) unstable
+
+ * New upstream version.
+ * Made the private directory local by symlinking it to
+ /etc/opt/csw/ssl/private
+
+ -- Yann Rouillard <yann at opencsw.org> Wed, 07 Jan 2009 19:07:01 +0100
+
openssl (0.9.8,rev=2009.01.01_rev=i) unstable
* Removed CA and added dependancy on ca_certificates.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list