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

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Fri Jul 22 00:40:34 CEST 2011


Revision: 15180
          http://gar.svn.sourceforge.net/gar/?rev=15180&view=rev
Author:   chninkel
Date:     2011-07-21 22:40:34 +0000 (Thu, 21 Jul 2011)

Log Message:
-----------
openssl1: updated to 1.0.0c

Modified Paths:
--------------
    csw/mgar/pkg/openssl1/trunk/Makefile
    csw/mgar/pkg/openssl1/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch
    csw/mgar/pkg/openssl1/trunk/files/opencsw_paths.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2011-07-21 12:07:55 UTC (rev 15179)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2011-07-21 22:40:34 UTC (rev 15180)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 1.0.0b
+VERSION = 1.0.0c
 CATEGORIES = lib
 
 DESCRIPTION = The Open Source toolkit for SSL and TLS
@@ -24,7 +24,7 @@
   as a full-strength general-purpose cryptography library.
 endef
 
-PACKAGES = CSWlibssl1-0-0 CSWlibssl1-0-0-devel CSWossl1utils
+PACKAGES = CSWlibssl1-0-0 CSWlibssl1-0-0-devel CSWopenssl1-utils
 
 CATALOGNAME_CSWlibssl1-0-0 = libssl1_0_0
 RUNTIME_DEP_PKGS_CSWlibssl1-0-0 = CSWcacertificates
@@ -39,20 +39,20 @@
 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 = 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/.* 
-PKGFILES_CSWossl1utils += $(prefix)/ssl/misc/.* 
-PKGFILES_CSWossl1utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.*
-PKGFILES_CSWossl1utils += $(docdir)/openssl1_utils/.*
+CATALOGNAME_CSWopenssl1-utils = openssl1_utils
+RUNTIME_DEP_PKGS_CSWopenssl1-utils = CSWlibssl1-0-0
+SPKG_DESC_CSWopenssl1-utils = Openssl 1.0 binaries and related tools
+SPKG_CLASSES_CSWopenssl1-utils = none cswpreserveconf
+PKGFILES_CSWopenssl1-utils = $(bindir)/[^/]* $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* 
+PKGFILES_CSWopenssl1-utils += $(prefix)/ssl/misc/.* 
+PKGFILES_CSWopenssl1-utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.*
+PKGFILES_CSWopenssl1-utils += $(docdir)/openssl1_utils/.*
 
 
 PRESERVECONF = $(sysconfdir)/ssl/openssl.cnf
 
 # We use SUN perl, not the opencsw one
-CHECKPKG_OVERRIDES_CSWossl1utils += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWopenssl1-utils += missing-dependency|CSWperl
 
 CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += surplus-dependency|CSWcacertificates
 
@@ -70,7 +70,25 @@
 endif
 CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += surplus-dependency|CSWlibssl1-0-0
 
+# We do ship libcrypto in libssl package
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/pentium_pro/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
 
+# References to default path in documentation files, can be safely ignored
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0_devel/INSTALL
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0_devel/CHANGES
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0-devel += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0_devel/FAQ
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0/INSTALL
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0/FAQ
+CHECKPKG_OVERRIDES_CSWlibssl1-0-0 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/libssl1_0_0/CHANGES
+CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/CHANGES
+CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/FAQ
+CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl1_utils/INSTALL
+CHECKPKG_OVERRIDES_CSWopenssl1-utils += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ca.1
+
+
+
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/
@@ -93,8 +111,16 @@
 # patch
 PATCHFILES += dont_use_slash_64_directory.patch
 
-PATCHFILES += fix-test-failure.patch
+#PATCHFILES += fix-test-failure.patch
 
+# We install engines libraries in /opt/csw/lib/engines/1.0.0/
+# instead of /opt/csw/lib/engines to avoid clashes with 0.9.8
+# and futur new release of ssl libraries
+PATCHFILES += 0003-make-engines-directory-soname-dependant.patch
+
+# Update openssl.cnf path in man page to follow opencsw standard
+PATCHFILES += opencsw_paths.patch
+
 LICENSE = LICENSE
 
 ##### Build and installation information #####
@@ -104,10 +130,6 @@
 EXTRA_BUILD_ISAS_i386 = pentium_pro amd64
 EXTRA_BUILD_ISAS_sparc = sparcv8plus+vis sparcv9
 
-# we don't yet use isaexec support so we disable
-# isa relocation for default isa
-NOISAEXEC = 1
-
 # GAR wants and puts sparcv9 in lib/64 but openssl build system
 # isn't the standard autoconf/automake one so we disable this
 # relocation for now
@@ -136,6 +158,9 @@
 # For now we want the sun perl to be used
 CONFIGURE_ENV += PERL="/usr/bin/perl"
 
+# We export the soname to the configure script 
+CONFIGURE_ENV += SONAME=$(shell echo $(VERSION) | )
+
 # Some optimization
 EXT_CFLAGS   += -mt -xstrconst
 EXT_CXXFLAGS += -noex -mt
@@ -144,6 +169,8 @@
 # /opt/csw/ssl/man, but we want them under /opt/csw/share/man
 INSTALL_ARGS += MANDIR=$(mandir)
 
+TEST_SCRIPTS = 
+
 include gar/category.mk
 
 
@@ -174,13 +201,12 @@
 	@$(MAKECOOKIE)
 
 install-certs: 
-	[ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \
+	[ ! -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] || \
 		ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW
 	ginstall -d $(PKGROOT)/etc/$(prefix)/ssl/private
 	rm -rf $(PKGROOT)/$(prefix)/ssl/openssl.cnf && ln -s ../etc/ssl/openssl.cnf $(PKGROOT)/$(prefix)/ssl/openssl.cnf
 	rm -rf $(PKGROOT)/$(prefix)/ssl/certs && ln -s ../etc/ssl/certs $(PKGROOT)/$(prefix)/ssl/certs
 	rm -rf $(PKGROOT)/$(prefix)/ssl/private && ln -s ../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/ssl/private
-	rm -rf $(PKGROOT)/$(prefix)/etc/ssl/private && ln -s ../../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/etc/ssl/private 
 	@$(MAKECOOKIE)
 
 remove-generic-so-files:

Modified: csw/mgar/pkg/openssl1/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl1/trunk/checksums	2011-07-21 12:07:55 UTC (rev 15179)
+++ csw/mgar/pkg/openssl1/trunk/checksums	2011-07-21 22:40:34 UTC (rev 15180)
@@ -1 +1 @@
-104deb3b7e6820cae6de3f49ba0ff2b0  openssl-1.0.0b.tar.gz
+ff8fb85610aef328315a9decbb2712e4  openssl-1.0.0c.tar.gz

Added: csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/0003-make-engines-directory-soname-dependant.patch	2011-07-21 22:40:34 UTC (rev 15180)
@@ -0,0 +1,69 @@
+--- a/Configure
++++ b/Configure
+@@ -1690,7 +1690,7 @@ while (<IN>)
+ 		}
+ 	elsif	(/^#define\s+ENGINESDIR/)
+ 		{
+-		my $foo = "$prefix/$libdir/engines";
++		my $foo = "$prefix/$libdir/engines/$shlib_version_number";
+ 		$foo =~ s/\\/\\\\/g;
+ 		print OUT "#define ENGINESDIR \"$foo\"\n";
+ 		}
+--- a/Makefile
++++ b/Makefile
+@@ -196,6 +196,7 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
+ 		ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)'	\
+ 		EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)'	\
+ 		SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)'	\
++		SHLIB_VERSION_NUMBER='$(SHLIB_VERSION_NUMBER)' \
+ 		PEX_LIBS='$(PEX_LIBS)' EX_LIBS='$(EX_LIBS)'	\
+ 		CPUID_OBJ='$(CPUID_OBJ)'			\
+ 		BN_ASM='$(BN_ASM)' DES_ENC='$(DES_ENC)' 	\
+--- a/engines/Makefile
++++ b/engines/Makefile
+@@ -107,7 +107,7 @@
+ 	@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+ 		set -e; \
+-		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \
++		$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER); \
+ 		for l in $(LIBNAMES); do \
+ 			( echo installing $$l; \
+ 			  pfx=lib; \
+@@ -119,13 +119,13 @@
+ 				*DSO_WIN32*)	sfx="eay32.dll"; pfx=;;	\
+ 				*)		sfx=".bad";;	\
+ 				esac; \
+-				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
++				cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$$pfx$$l$$sfx.new; \
+ 			  else \
+ 				sfx=".so"; \
+ 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+ 			  fi; \
+-			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \
+-			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
++			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$$pfx$$l$$sfx.new; \
++			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$$pfx$$l$$sfx ); \
+ 		done; \
+ 	fi
+ 	@target=install; $(RECURSIVE_MAKE)
+--- a/engines/ccgost/Makefile
++++ b/engines/ccgost/Makefile
+@@ -53,13 +53,13 @@
+ 			*DSO_WIN32*) sfx="eay32.dll"; pfx=;; \
+ 			*) sfx=".bad";; \
+ 			esac; \
+-			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++			cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$${pfx}$(LIBNAME)$$sfx.new; \
+ 		else \
+ 			sfx=".so"; \
+-			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
++			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$${pfx}$(LIBNAME)$$sfx.new; \
+ 		fi; \
+-		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \
+-		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \
++		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$${pfx}$(LIBNAME)$$sfx.new; \
++		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$(SHLIB_VERSION_NUMBER)/$${pfx}$(LIBNAME)$$sfx; \
+ 	fi
+ 
+ links:

Added: csw/mgar/pkg/openssl1/trunk/files/opencsw_paths.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/opencsw_paths.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/opencsw_paths.patch	2011-07-21 22:40:34 UTC (rev 15180)
@@ -0,0 +1,25 @@
+From 0aeef9a058183acd958d397e983be0d7e4d42750 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Wed, 20 Jul 2011 15:04:22 +0200
+Subject: [PATCH] Configuration file path update in man page.
+
+---
+ doc/apps/ca.pod          |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doc/apps/ca.pod b/doc/apps/ca.pod
+index 5618c2d..ddcc446 100644
+--- a/doc/apps/ca.pod
++++ b/doc/apps/ca.pod
+@@ -580,7 +580,7 @@ Note: the location of all files can change either by compile time options,
+ configuration file entries, environment variables or command line options.
+ The values below reflect the default values.
+ 
+- /usr/local/ssl/lib/openssl.cnf - master configuration file
++ /etc/opt/csw/ssl/openssl.cnf   - master configuration file
+  ./demoCA                       - main CA directory
+  ./demoCA/cacert.pem            - CA certificate
+  ./demoCA/private/cakey.pem     - CA private key
+-- 
+1.7.6
+


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