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

[chninkel at users.sourceforge.net]

Revision: 10881
          http://gar.svn.sourceforge.net/gar/?rev=10881&view=rev
Author:   chninkel
Date:     2010-09-01 14:08:40 +0000 (Wed, 01 Sep 2010)

Log Message:
-----------
openssl: some checkpkg override + changelog update

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/checksums
    csw/mgar/pkg/openssl/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2010-09-01 13:23:50 UTC (rev 10880)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2010-09-01 14:08:40 UTC (rev 10881)
@@ -54,16 +54,30 @@
 
 CHECKPKG_OVERRIDES_CSWosslrt += surplus-dependency|CSWcacertificates
 # we will not recompile old 0.9.7 version for now
+ifeq ($(GARCH),sparc) 
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libcrypto.so.0.9.7
 CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/sparcv8plus+vis/libssl.so.0.9.7
+else
+CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/amd64/libcrypto.so.0.9.7
+CHECKPKG_OVERRIDES_CSWosslrt += bad-rpath-entry|/opt/csw/lib/sparcv8plus+vis|opt/csw/lib/pentium_pro/libssl.so.0.9.7
+endif
 
 # we do ship .a files in the devel package
+ifeq ($(GARCH),sparc) 
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv8plus+vis/libssl.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/libcrypto.a
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/sparcv9/libssl.a
+else
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/amd64/libssl.a
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libcrypto.a
+CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a
+endif
+
+
 CHECKPKG_OVERRIDES_CSWossldevel += surplus-dependency|CSWosslrt
 
 

Modified: csw/mgar/pkg/openssl/trunk/checksums
===================================================================
--- csw/mgar/pkg/openssl/trunk/checksums	2010-09-01 13:23:50 UTC (rev 10880)
+++ csw/mgar/pkg/openssl/trunk/checksums	2010-09-01 14:08:40 UTC (rev 10881)
@@ -1,13 +1 @@
-88d71b493eb56f5a1ebf67cf33c70b9a  CSWossl.prototype
-f293ba8ca08b0a5fd391dcf3c7b29539  CSWossldevel.prototype-i386
-1f491e2f0c0f26fdc0b93fcebfc77613  CSWossldevel.prototype-sparc
-05ace5330714d6cd9c0e076b6ae2518f  CSWosslrt.checkinstall
-1c3f600eaf942a18ecab3637e1fc32bd  CSWosslrt.postinstall
-c9de908daad1a31fca20329cb043ad3c  CSWosslrt.preinstall
-7535e5b5b281adb5c13bf9ad878b5cf1  CSWosslrt.prototype-i386
-0fcaed441f7527bdeda410a70bb60f6f  CSWosslrt.prototype-sparc
-07b1ad34d1f742052460e4655eccb41f  CSWosslutils.prototype
-b78faa440d6f6a2a07663de331678648  README.CSW
-f0d5119652618d956eb24490b7577eb9  changelog.CSW
-84830e15846f1b20d8371c1fa375a0b1  more_configure_targets.patch
 63ddc5116488985e820075e65fbe6aa4  openssl-0.9.8o.tar.gz

Modified: csw/mgar/pkg/openssl/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2010-09-01 13:23:50 UTC (rev 10880)
+++ csw/mgar/pkg/openssl/trunk/files/changelog.CSW	2010-09-01 14:08:40 UTC (rev 10881)
@@ -1,3 +1,9 @@
+openssl (0.9.8o,REV=2010.09.01) unstable
+
+  * New upstream version.
+
+   -- Yann Rouillard <yann at opencsw.org>  Wed, 01 Sep 2010 16:07:54 +0200
+
 openssl (0.9.8n,REV=2010.03.24) unstable
 
   * New upstream version.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.