SF.net SVN: gar:[26168] csw/mgar/pkg/openssl/trunk

rmottola at users.sourceforge.net rmottola at users.sourceforge.net
Fri Apr 28 10:26:08 CEST 2017 

Revision: 26168
          http://sourceforge.net/p/gar/code/26168
Author:   rmottola
Date:     2017-04-28 08:26:07 +0000 (Fri, 28 Apr 2017)
Log Message:
-----------
openssl/trunk: first work towards LTS 1.0.2, disable all patches for now, regenerated target patch

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

Added Paths:
-----------
    csw/mgar/pkg/openssl/trunk/files/0001-more-configure-targets-1_0_2.patch

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2017-04-27 17:04:16 UTC (rev 26167)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2017-04-28 08:26:07 UTC (rev 26168)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 NAME = openssl
-VERSION = 0.9.8zf
+VERSION = 1.0.2f
 GARTYPE = v2
 
 DESCRIPTION = The Open Source toolkit for SSL and TLS
@@ -24,11 +24,11 @@
   as a full-strength general-purpose cryptography library.
 endef
 
-PACKAGES = CSWlibssl0-9-8
+PACKAGES = CSWlibssl1-0-2
 
-SPKG_DESC_CSWlibssl0-9-8 = Openssl runtime libraries
-CATALOGNAME_CSWlibssl0-9-8 = libssl0_9_8
-RUNTIME_DEP_PKGS_CSWlibssl0-9-8 = CSWcacertificates
+SPKG_DESC_CSWlibssl1-0-2 = Openssl runtime libraries
+CATALOGNAME_CSWlibssl1-0-2 = libssl1_0_2
+RUNTIME_DEP_PKGS_CSWlibssl1-0-2 = CSWcacertificates
 
 #CHECKPKG_OVERRIDES_CSWlibssl0-9-8 += surplus-dependency|CSWcacertificates
 
@@ -72,27 +72,28 @@
 ###### Upstream and opencsw files information #######
 
 MASTER_SITES = http://www.openssl.org/source/ http://openssl.org/news/
-UPSTREAM_MASTER_SITES = http://www.openssl.org/source/ 
+UPSTREAM_MASTER_SITES = https://www.openssl.org/source/old/1.0.2/
 
 # We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(0.9.8[a-z][a-z]).tar.gz
+UFILES_REGEX = $(NAME)-(1.0.2[a-z][a-z]).tar.gz
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz 
-DISTFILES += CSWlibssl0-9-8.prototype-i386 CSWlibssl0-9-8.prototype-sparc
-DISTFILES += changelog.CSW README.CSW
+#DISTFILES += CSWlibssl1-0-2.prototype-i386 CSWlibssl1-0-2.prototype-sparc
+#DISTFILES += changelog.CSW README.CSW
 
 DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS README.ENGINE
 
 # This patch add optimised build targets for some solaris isa, ie:
 # solaris-386-cc, solaris-pentium-cc, solaris-pentium_pro-cc, solaris-sparcv9+vis-cc
-PATCHFILES = more_configure_targets.patch
+#PATCHFILES = more_configure_targets.patch
+PATCHFILES = 0001-more-configure-targets-1_0_2.patch
 
 # Update openssl.cnf path in man page to follow opencsw standard
-PATCHFILES += opencsw_paths.patch
+#PATCHFILES += opencsw_paths.patch
 
 # Let's always block some compromised CA, whatever the CA configured
 # (patchs taken from Debian Package)
-PATCHFILES += block_bad_certificates.patch
+#PATCHFILES += block_bad_certificates.patch
 
 LICENSE=LICENSE
 
@@ -153,13 +154,13 @@
 INSTALL_ARGS += MANDIR=$(mandir)
 
 # we include previous release of libraries file for comptability purpose
-OLDLIBS                 = 0.9.7m
+#OLDLIBS                 = 0.9.7m
 
 # support for pkcs11 engine http://blogs.sun.com/chichang1/entry/how_to_integrate_pkcs11_engine
 ifdef PKCS11
 	PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386
 ifneq ($(shell /usr/bin/uname -r),5.9) 
-	PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03
+	#PATCHFILES += pkcs11_engine-0.9.8o.patch.2010-09-03
 	CONFIGURE_ARGS += --pk11-libname=$(abspath /usr/lib/$(MM_LIBDIR)/libpkcs11.so) 
 endif
 endif 

Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums	2017-04-27 17:04:16 UTC (rev 26167)
+++ csw/mgar/pkg/openssl/trunk/checksums	2017-04-28 08:26:07 UTC (rev 26168)
@@ -1 +1 @@
-c69a4a679233f7df189e1ad6659511ec  openssl-0.9.8zf.tar.gz
+b3bf73f507172be9292ea2a8c28b659d  openssl-1.0.2f.tar.gz

Added: csw/mgar/pkg/openssl/trunk/files/0001-more-configure-targets-1_0_2.patch
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/0001-more-configure-targets-1_0_2.patch	                        (rev 0)
+++ csw/mgar/pkg/openssl/trunk/files/0001-more-configure-targets-1_0_2.patch	2017-04-28 08:26:07 UTC (rev 26168)
@@ -0,0 +1,32 @@
+From 17f42c88f0c1f345e7f110d32448aa0157339b51 Mon Sep 17 00:00:00 2001
+From: Riccardo Mottola <rmottola at opencsw.org>
+Date: Fri, 28 Apr 2017 10:04:19 +0200
+Subject: [PATCH] more configure targets 1_0_2
+
+---
+ Configure | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Configure b/Configure
+index 4a715dc..856aea0 100755
+--- a/Configure
++++ b/Configure
+@@ -249,11 +249,15 @@ my %table=(
+  
+ #### Solaris x86 with Sun C setups
+ "solaris-x86-cc","cc:-fast -xarch=generic -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-386-cc","cc:-fast -xarch=386 -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-cc","cc:-fast -xpentium -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNRO LL 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",
+ 
+ #### 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)",
+ "solaris-sparcv8-gcc","gcc:-mcpu=v8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"solaris-sparcv9+vis-cc","cc:-xtarget=ultra -xarch=v8plusa -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
+ "solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+-- 
+2.4.0
+

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