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

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Wed Sep 1 23:02:03 CEST 2010 

Revision: 10883
          http://gar.svn.sourceforge.net/gar/?rev=10883&view=rev
Author:   chninkel
Date:     2010-09-01 21:02:03 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssl1: updated to 1.0.0a + several GAR fix

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

Added Paths:
-----------
    csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch

Modified: csw/mgar/pkg/openssl1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/trunk/Makefile	2010-09-01 14:23:33 UTC (rev 10882)
+++ csw/mgar/pkg/openssl1/trunk/Makefile	2010-09-01 21:02:03 UTC (rev 10883)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 GARNAME = openssl
-GARVERSION = 1.0.0
+GARVERSION = 1.0.0a
 CATEGORIES = lib
 
 DESCRIPTION = The Open Source toolkit for SSL and TLS
@@ -48,12 +48,29 @@
 PKGFILES_CSWossl1utils += $(prefix)/ssl/openssl\.cnf $(sysconfdir)/ssl/openssl\.cnf.*
 PKGFILES_CSWossl1utils += $(docdir)/openssl1_utils/.*
 
-PROTOTYPE_MODIFIERS = conf
-PROTOTYPE_FILES_conf = $(sysconfdir)/ssl/openssl.cnf.CSW
-PROTOTYPE_CLASS_conf = cswpreserveconf
-PROTOTYPE_PERMS_conf = 0644
 
+PRESERVECONF = $(sysconfdir)/ssl/openssl.cnf
 
+# We use SUN perl, not the opencsw one
+CHECKPKG_OVERRIDES_CSWossl1utils += missing-dependency|CSWperl
+
+CHECKPKG_OVERRIDES_CSWossl1rt += 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
+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
+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
+endif
+CHECKPKG_OVERRIDES_CSWossl1devel += surplus-dependency|CSWossl1rt
+
+
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/
@@ -71,7 +88,13 @@
 # solaris-pentium_pro-cc and solaris-sparcv9+vis-cc
 PATCHFILES = more_configure_targets.patch
 
+# Since 1.0.0, openssl tries to install x64 libraries in $(prefix)/64 directory
+# we prefer to rely on gar system to take of this so we remove this using this
+# patch
+PATCHFILES += dont_use_slash_64_directory.patch
 
+LICENSE = LICENSE
+
 ##### Build and installation information #####
 
 # The list of instructions set for which we will 
@@ -122,7 +145,7 @@
 include gar/category.mk
 
 
-pre-configure-modulated: 
+pre-configure-modulated:
 	echo " ==> Creating configure script"
 	cd $(WORKSRC) && ln -nf Configure configure
 	@$(MAKECOOKIE)
@@ -158,4 +181,4 @@
 	rm -rf $(PKGROOT)/$(prefix)/etc/ssl/private && ln -s ../../../../etc/opt/csw/ssl/private $(PKGROOT)/$(prefix)/etc/ssl/private 
 	@$(MAKECOOKIE)
 
-post-merge: install-certs install-changelog install-doc
+pre-package: install-certs install-changelog install-doc

Modified: csw/mgar/pkg/openssl1/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl1/trunk/checksums	2010-09-01 14:23:33 UTC (rev 10882)
+++ csw/mgar/pkg/openssl1/trunk/checksums	2010-09-01 21:02:03 UTC (rev 10883)
@@ -1,7 +1 @@
-05ace5330714d6cd9c0e076b6ae2518f  CSWossl1rt.checkinstall
-1c3f600eaf942a18ecab3637e1fc32bd  CSWossl1rt.postinstall
-c9de908daad1a31fca20329cb043ad3c  CSWossl1rt.preinstall
-b78faa440d6f6a2a07663de331678648  README.CSW
-904ceefa66b6b7b7e93ae0e9bc58bac8  changelog.CSW
-a8f10e3b109567d6caedf5113411ff4b  more_configure_targets.patch
-89eaa86e25b2845f920ec00ae4c864ed  openssl-1.0.0.tar.gz
+e3873edfffc783624cfbdb65e2249cbd  openssl-1.0.0a.tar.gz

Added: csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch
===================================================================
--- csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl1/trunk/files/dont_use_slash_64_directory.patch	2010-09-01 21:02:03 UTC (rev 10883)
@@ -0,0 +1,25 @@
+From edf25f4c871ccd0951105e6d575b9d845915d22f Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Wed, 1 Sep 2010 15:40:32 +0200
+Subject: [PATCH] Don't use /64 directory when installing libraries
+
+---
+ Configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Configure b/Configure
+index d59f117..7f38214 100755
+--- a/Configure
++++ b/Configure
+@@ -219,7 +219,7 @@ my %table=(
+ #### Solaris x86 with Sun C setups
+ "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris-pentium_pro-cc","cc:-fast -xarch=pentium_pro -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
++"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #### SPARC Solaris with GNU C setups
+ "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-- 
+1.7.1
+


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