[csw-devel] SF.net SVN: gar:[2570] csw/mgar/pkg/openssl/trunk

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Sat Dec 13 14:30:45 CET 2008


Revision: 2570
          http://gar.svn.sourceforge.net/gar/?rev=2570&view=rev
Author:   chninkel
Date:     2008-12-13 13:30:44 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
openssl: last fixes to be able to build with gar v2

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/checksums
    csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec
    csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec
    csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec
    csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec
    csw/mgar/pkg/openssl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2008-12-13 13:30:44 UTC (rev 2570)
@@ -41,8 +41,9 @@
 # we don't yet use isaexec support so we disable
 # isa relocation for default isa
 NO_ISAEXEC = 1
-#ISA_RELOCATE_DIRS_i386 = 
-#ISA_RELOCATE_DIRS_sparcv8 = 
+# 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
 ISALIBDIR_sparcv9 = .
 libdir = /opt/csw/lib
 
@@ -91,7 +92,7 @@
 pre-configure-modulated: 
 	echo " ==> Creating configure script"
 	cd $(WORKSRC) && ln -nf Configure configure
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 # we remove every debug information except symbol table
 # (should rather be done in the gar scripts)
@@ -99,18 +100,22 @@
 	chmod -R u+w $(PKGROOT)$(libdir)
 	find $(PKGROOT)$(libdir) -name "*.so*" -exec strip -x '{}' ';'
 
+install-changelog:
+	ginstall -D $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/changelog.CSW $(SPKG_PKGBASE)/changelog.CSW
+	@$(MAKECOOKIE)
+
 install-certs: 
 	[ -f $(PKGROOT)$(prefix)/ssl/openssl.cnf ] && \
 		ginstall -D $(PKGROOT)$(prefix)/ssl/openssl.cnf $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf
 	gunzip --stdout $(CURDIR)/$(FILEDIR)/certs.tar.gz | (cd $(PKGROOT)$(prefix)/ssl/certs && tar xf -)
-	cp -r $(WORKSRC)/certs/* $(PKGROOT)$(prefix)/ssl/certs
+	cp -r $(WORKSRC_FIRSTMOD)/certs/* $(PKGROOT)$(prefix)/ssl/certs
 	OPENSSL=$(PKGROOT)/$(bindir)/openssl $(PKGROOT)/$(bindir)/c_rehash $(PKGROOT)/$(prefix)/ssl/certs/
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
 install-oldlibs: $(addprefix install-oldlibs-,$(OLDLIBS))
 install-oldlibs-%:
 	echo " ==> Installing old libraries $* from archive oldlibs.$*-$(GARCH).tar.gz"; \
 	cd $(PKGROOT) && gunzip -c $(CURDIR)/$(FILEDIR)/oldlibs.$*-$(GARCH).tar.gz | tar xvf - && \
-	$(MAKECOOKIE)
+	@$(MAKECOOKIE)
 
-pre-package: striplib install-certs install-oldlibs
+post-merge: striplib install-certs install-oldlibs install-changelog

Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/checksums	2008-12-13 13:30:44 UTC (rev 2570)
@@ -1,20 +1,20 @@
 561e00f18821c74b2b86c8c7786f9d8b  download/openssl-0.9.8i.tar.gz
-bc7aa9d2ea44e9ac28b11db12402024e  download/CSWossl.gspec
+b5ded4412606a0996595015bc2ff6974  download/CSWossl.gspec
 05b45e7124833dee48e5f3c45591e95b  download/CSWossl.depend
 7fe01ca4ef9d0e971d57b00f4d0b168b  download/CSWossl.prototype
-cf0fa997cc719009991e67b4264caeed  download/CSWosslrt.gspec
+83480e01971e71d037bd44fa5ed4e4e5  download/CSWosslrt.gspec
 78c26f65b14f3ebf4a29069a3f675285  download/CSWosslrt.checkinstall
 d41d8cd98f00b204e9800998ecf8427e  download/CSWosslrt.depend
 cba143e52cb08dd3ee39f275aefa075d  download/CSWosslrt.prototype-i386
 ceeb4a59f1c31ae4deac9f2b61dadca2  download/CSWosslrt.prototype-sparc
-1791edde7bf1bce62ac799852459dc47  download/CSWossldevel.gspec
+2ac43ebf4689d236540e22171541be4e  download/CSWossldevel.gspec
 37995caa7f4155066b00fb7503e853da  download/CSWossldevel.depend
 45161ff3a5b00fd6942f63b77c0b0ed1  download/CSWossldevel.prototype-i386
 7b1dd2e8c78b033ca2a8be4de097b147  download/CSWossldevel.prototype-sparc
-0d55e4c93c94a1a72fb295d0ee6225d4  download/CSWosslutils.gspec
+eec77249fb642c525cad67dcd055fb77  download/CSWosslutils.gspec
 37995caa7f4155066b00fb7503e853da  download/CSWosslutils.depend
 6e0c86ddc23d044757810cca6f31f017  download/CSWosslutils.prototype
-e3f149dea30df046b9042a69639bcf3b  download/changelog.CSW
+1bd6e7ee77845fc4de843d7479a4bdb9  download/changelog.CSW
 7fdc09cd3c11db459c83c8946f7872f6  download/i.conf
 a454ac09091085813ec8900f5a0c917c  download/r.conf
 64f7c3f3a6cae483209b69c31c82557d  download/openssl.0.9.8.patch

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossl.gspec	2008-12-13 13:30:44 UTC (rev 2570)
@@ -4,4 +4,4 @@
 %var            desc Openssl meta package
 %var 		pkgfile %{bitname}-%{SPKG_VERSION}%{SPKG_REVSTAMP}-%{SPKG_OSNAME}-all-CSW.pkg
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE

Modified: csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/files/CSWossldevel.gspec	2008-12-13 13:30:44 UTC (rev 2570)
@@ -2,4 +2,4 @@
 %var            pkgname CSWossldevel
 %var            desc Openssl development support
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslrt.gspec	2008-12-13 13:30:44 UTC (rev 2570)
@@ -2,4 +2,4 @@
 %var            pkgname CSWosslrt
 %var            desc Openssl runtime libraries
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.gspec	2008-12-13 13:30:44 UTC (rev 2570)
@@ -2,4 +2,4 @@
 %var            pkgname CSWosslutils
 %var            desc Openssl binaries and related tools 
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/LICENSE
+%copyright      url file://%{WORKSRC_FIRSTMOD}/LICENSE

Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2008-12-13 11:33:23 UTC (rev 2569)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2008-12-13 13:30:44 UTC (rev 2570)
@@ -1,10 +1,17 @@
-openssl (0.9.8,REV=2008.10.05_rev=i) unstable
+openssl (0.9.8,rev=2008.10.05_rev=i) unstable
 
+  * checkinstall script now accepts that /dev/random and 
+  /dev/random are pipes (Closes: #2687)
+
+ -- Yann Rouillard <yann at opencsw.org>  Sat, 13 Dec 2008 14:28:14 +0100
+
+openssl (0.9.8,rev=2008.10.05_rev=i) unstable
+
  * New upstream version.
- * Added CA certs that were removed in 0.9.8h.
- * Fixed ARCH in openssl meta-package.
+ * Added ca certs that were removed in 0.9.8h.
+ * Fixed arch in openssl meta-package.
 
- -- Yann Rouillard  <yann at opencsw.org>  Fri, 05 Oct 2008 21:25:09 +0200
+ -- Yann Rouillard <yann at opencsw.org>  Fri, 05 oct 2008 21:25:09 +0200
 
 openssl (0.9.8,REV=2007.12.26_rev=g) unstable
 


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