[csw-devel] SF.net SVN: gar:[12050] csw/mgar/pkg/openssl1/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Mon Dec 20 20:38:43 CET 2010
Revision: 12050
http://gar.svn.sourceforge.net/gar/?rev=12050&view=rev
Author: chninkel
Date: 2010-12-20 19:38:42 +0000 (Mon, 20 Dec 2010)
Log Message:
-----------
openssl1: renamed package to follow opencsw standard
Modified Paths:
--------------
csw/mgar/pkg/openssl1/trunk/Makefile
csw/mgar/pkg/openssl1/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall
csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.postinstall
csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.preinstall
csw/mgar/pkg/openssl1/trunk/files/fix-test-failure.patch
Removed Paths:
-------------
csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall
csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.postinstall
csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.preinstall
Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile 2010-12-20 19:38:07 UTC (rev 12049)
+++ csw/mgar/pkg/openssl1/trunk/Makefile 2010-12-20 19:38:42 UTC (rev 12050)
@@ -13,7 +13,7 @@
###### Package information #######
NAME = openssl
-VERSION = 1.0.0a
+VERSION = 1.0.0b
CATEGORIES = lib
DESCRIPTION = The Open Source toolkit for SSL and TLS
@@ -24,23 +24,23 @@
as a full-strength general-purpose cryptography library.
endef
-PACKAGES = CSWossl1rt CSWossl1devel CSWossl1utils
+PACKAGES = CSWlibssl1-0-0 CSWlibssl1-0-0-devel CSWossl1utils
-CATALOGNAME_CSWossl1rt = openssl1_rt
-RUNTIME_DEP_PKGS_CSWossl1rt = CSWcacertificates
-SPKG_DESC_CSWossl1rt = Openssl 1.0 runtime libraries
-PKGFILES_CSWossl1rt = $(libdir).*\.so(\.\d+)*
-PKGFILES_CSWossl1rt += $(sysconfdir)/etc/ssl/private $(prefix)/ssl/private $(prefix)/ssl/certs /etc/$(prefix)/ssl/private
-PKGFILES_CSWossl1rt += $(docdir)/openssl1_rt/.*
+CATALOGNAME_CSWlibssl1-0-0 = libssl1_0_0
+RUNTIME_DEP_PKGS_CSWlibssl1-0-0 = CSWcacertificates
+SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
+PKGFILES_CSWlibssl1-0-0 = $(libdir).*\.so(\.\d+)*
+PKGFILES_CSWlibssl1-0-0 += $(sysconfdir)/etc/ssl/private $(prefix)/ssl/private $(prefix)/ssl/certs /etc/$(prefix)/ssl/private
+PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.*
-CATALOGNAME_CSWossl1devel = openssl1_devel
-RUNTIME_DEP_PKGS_CSWossl1devel = CSWossl1rt
-SPKG_DESC_CSWossl1devel = Openssl 1.0 development support files
-PKGFILES_CSWossl1devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWossl1devel += $(docdir)/openssl1_devel/.*
+CATALOGNAME_CSWlibssl1-0-0-devel = libssl1_0_0_devel
+RUNTIME_DEP_PKGS_CSWlibssl1-0-0-devel = CSWlibssl1-0-0
+SPKG_DESC_CSWlibssl1-0-0-devel = Openssl 1.0 development support files
+PKGFILES_CSWlibssl1-0-0-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibssl1-0-0-devel += $(docdir)/libssl1_0_0_devel/.*
CATALOGNAME_CSWossl1utils = openssl1_utils
-RUNTIME_DEP_PKGS_CSWossl1utils = CSWossl1rt
+RUNTIME_DEP_PKGS_CSWossl1utils = CSWlibssl1-0-0
SPKG_DESC_CSWossl1utils = Openssl 1.0 binaries and related tools
SPKG_CLASSES_CSWossl1utils = none cswpreserveconf
PKGFILES_CSWossl1utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.*
@@ -54,21 +54,21 @@
# We use SUN perl, not the opencsw one
CHECKPKG_OVERRIDES_CSWossl1utils += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWossl1rt += surplus-dependency|CSWcacertificates
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += surplus-dependency|CSWcacertificates
# We ship the .a files in the devel package
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
ifeq ($(GARCH),sparc)
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a
else
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a
-CHECKPKG_OVERRIDES_CSWossl1devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a
endif
-CHECKPKG_OVERRIDES_CSWossl1devel += surplus-dependency|CSWossl1rt
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += surplus-dependency|CSWlibssl1-0-0
###### Upstream and opencsw files information #######
@@ -79,7 +79,7 @@
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*[a-z]?).tar.gz
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += CSWossl1rt.checkinstall CSWossl1rt.preinstall CSWossl1rt.postinstall
+DISTFILES += CSWlibssl1-0-0.checkinstall CSWlibssl1-0-0.preinstall CSWlibssl1-0-0.postinstall
DISTFILES += changelog.CSW README.CSW
DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE
@@ -93,6 +93,8 @@
# patch
PATCHFILES += dont_use_slash_64_directory.patch
+PATCHFILES += fix-test-failure.patch
+
LICENSE = LICENSE
##### Build and installation information #####
Modified: csw/mgar/pkg/openssl1/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl1/trunk/checksums 2010-12-20 19:38:07 UTC (rev 12049)
+++ csw/mgar/pkg/openssl1/trunk/checksums 2010-12-20 19:38:42 UTC (rev 12050)
@@ -1 +1 @@
-e3873edfffc783624cfbdb65e2249cbd openssl-1.0.0a.tar.gz
+104deb3b7e6820cae6de3f49ba0ff2b0 openssl-1.0.0b.tar.gz
Added: csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.checkinstall 2010-12-20 19:38:42 UTC (rev 12050)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+PLATFORM=`/usr/bin/uname -p`
+VERSION=`/usr/bin/uname -r`
+
+# Solaris 8 requires patches to have /dev/random and /dev/urandom.
+if [ $VERSION -eq "5.8" ]; then
+
+ if [ ! -c $PKG_ROOT_DIR/dev/random ] && [ ! -p $PKG_ROOT_DIR/dev/random ]; then
+ echo "ERROR: /dev/random must exist."
+ err=1
+ fi
+
+ if [ ! -c $PKG_ROOT_DIR/dev/urandom ] && [ ! -p $PKG_ROOT_DIR/dev/urandom ]; then
+ echo "ERROR: /dev/urandom must exist."
+ err=1
+ fi
+
+ if [ "$err" = "1" ]; then
+ if [ $PLATFORM -eq "sparc" ]; then
+ echo "Please install patch 112438."
+ elif [ $PLATFORM -eq "i386" ]; then
+ echo "Please install patch 112439."
+ fi
+ exit 1
+ fi
+fi
+
+# Certification Authority have been moved under /opt/csw/etc/ssl/certs
+# under the ca_certificates package control
+# and /opt/csw/ssl/certs is now a symbolic links
+
+# we test if certificates were manually installed in this directory
+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."
+ echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information"
+ echo "about CA."
+
+ # we define the MOVE_CERTS variable so preinstall and postinstall scripts
+ # will now they have to do something about theses certificates
+ cat >>$1 <<!
+MOVE_CERTS=Yes
+!
+fi
+
+exit 0
Added: csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.postinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.postinstall (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.postinstall 2010-12-20 19:38:42 UTC (rev 12050)
@@ -0,0 +1,9 @@
+
+
+# we regenerate the certificate hash if we moved certificates from the old /opt/csw/ssl/certs
+# directory to /opt/csw/etc/ssl/certs
+if [ "$MOVE_CERTS" = "Yes" ]; then
+ [ ! -x "/opt/csw/sbin/update-ca-certificates" ] || /opt/csw/sbin/update-ca-certificates
+fi
+
+true
Added: csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.preinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.preinstall (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWlibssl1-0-0.preinstall 2010-12-20 19:38:42 UTC (rev 12050)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Certification Authority have been moved under /opt/csw/etc/ssl/certs
+# under the ca_certificates package control
+# /opt/csw/ssl/certs should now be a symbolic links
+if [ "$MOVE_CERTS" = "Yes" ]; then
+ mv -f /opt/csw/ssl/certs/* /opt/csw/etc/ssl/certs
+ rmdir "/opt/csw/ssl/certs"
+fi
+
+true
Deleted: csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall 2010-12-20 19:38:07 UTC (rev 12049)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.checkinstall 2010-12-20 19:38:42 UTC (rev 12050)
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-PLATFORM=`/usr/bin/uname -p`
-VERSION=`/usr/bin/uname -r`
-
-# Solaris 8 requires patches to have /dev/random and /dev/urandom.
-if [ $VERSION -eq "5.8" ]; then
-
- if [ ! -c $PKG_ROOT_DIR/dev/random ] && [ ! -p $PKG_ROOT_DIR/dev/random ]; then
- echo "ERROR: /dev/random must exist."
- err=1
- fi
-
- if [ ! -c $PKG_ROOT_DIR/dev/urandom ] && [ ! -p $PKG_ROOT_DIR/dev/urandom ]; then
- echo "ERROR: /dev/urandom must exist."
- err=1
- fi
-
- if [ "$err" = "1" ]; then
- if [ $PLATFORM -eq "sparc" ]; then
- echo "Please install patch 112438."
- elif [ $PLATFORM -eq "i386" ]; then
- echo "Please install patch 112439."
- fi
- exit 1
- fi
-fi
-
-# Certification Authority have been moved under /opt/csw/etc/ssl/certs
-# under the ca_certificates package control
-# and /opt/csw/ssl/certs is now a symbolic links
-
-# we test if certificates were manually installed in this directory
-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."
- echo "see /opt/csw/share/doc/openssl_rt/README.CSW for more information"
- echo "about CA."
-
- # we define the MOVE_CERTS variable so preinstall and postinstall scripts
- # will now they have to do something about theses certificates
- cat >>$1 <<!
-MOVE_CERTS=Yes
-!
-fi
-
-exit 0
Deleted: csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.postinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.postinstall 2010-12-20 19:38:07 UTC (rev 12049)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.postinstall 2010-12-20 19:38:42 UTC (rev 12050)
@@ -1,9 +0,0 @@
-
-
-# we regenerate the certificate hash if we moved certificates from the old /opt/csw/ssl/certs
-# directory to /opt/csw/etc/ssl/certs
-if [ "$MOVE_CERTS" = "Yes" ]; then
- [ ! -x "/opt/csw/sbin/update-ca-certificates" ] || /opt/csw/sbin/update-ca-certificates
-fi
-
-true
Deleted: csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.preinstall
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.preinstall 2010-12-20 19:38:07 UTC (rev 12049)
+++ csw/mgar/pkg/openssl1/trunk/files/CSWossl1rt.preinstall 2010-12-20 19:38:42 UTC (rev 12050)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Certification Authority have been moved under /opt/csw/etc/ssl/certs
-# under the ca_certificates package control
-# /opt/csw/ssl/certs should now be a symbolic links
-if [ "$MOVE_CERTS" = "Yes" ]; then
- mv -f /opt/csw/ssl/certs/* /opt/csw/etc/ssl/certs
- rmdir "/opt/csw/ssl/certs"
-fi
-
-true
Added: csw/mgar/pkg/openssl1/trunk/files/fix-test-failure.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/fix-test-failure.patch (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/fix-test-failure.patch 2010-12-20 19:38:42 UTC (rev 12050)
@@ -0,0 +1,14 @@
+--- ./ssl/t1_lib.c 2010/11/16 13:26:24 1.64.2.15
++++ ./ssl/t1_lib.c 2010/11/16 22:41:07 1.64.2.16
+@@ -779,8 +779,8 @@
+ {
+ if(s->session->tlsext_ecpointformatlist)
+ {
+- *al = TLS1_AD_DECODE_ERROR;
+- return 0;
++ OPENSSL_free(s->session->tlsext_ecpointformatlist);
++ s->session->tlsext_ecpointformatlist = NULL;
+ }
+ s->session->tlsext_ecpointformatlist_length = 0;
+ if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+
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