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

[chninkel at users.sourceforge.net]

Revision: 15157
          http://gar.svn.sourceforge.net/gar/?rev=15157&view=rev
Author:   chninkel
Date:     2011-07-20 13:56:56 +0000 (Wed, 20 Jul 2011)

Log Message:
-----------
openssl: fixed some compliance errors

Modified Paths:
--------------
    csw/mgar/pkg/openssl/trunk/Makefile
    csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype

Modified: csw/mgar/pkg/openssl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssl/trunk/Makefile	2011-07-20 13:56:36 UTC (rev 15156)
+++ csw/mgar/pkg/openssl/trunk/Makefile	2011-07-20 13:56:56 UTC (rev 15157)
@@ -81,7 +81,7 @@
 CHECKPKG_OVERRIDES_CSWossldevel += discouraged-path-in-pkgmap|/opt/csw/lib/pentium_pro/libssl.a
 endif
 
-# the /usr/local reference in the documents file are relevant
+# the /usr/local references in the documents files are relevant
 CHECKPKG_OVERRIDES_CSWosslutils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/FAQ
 CHECKPKG_OVERRIDES_CSWosslutils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/INSTALL
 CHECKPKG_OVERRIDES_CSWosslutils += file-with-bad-content|/usr/local|root/opt/csw/share/doc/openssl_utils/CHANGES
@@ -101,6 +101,11 @@
 CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libssl.so.0.9.7
 CHECKPKG_OVERRIDES_CSWosslrt += file-with-bad-content|/export/home|root/opt/csw/lib/pentium_pro/libcrypto.so.0.9.7
 
+# We will not fix this today
+CHECKPKG_OVERRIDES_CSWosslutils += catalogname-does-not-match-pkgname|pkgname=CSWosslutils|catalogname=openssl_utils|expected-catalogname=osslutils
+CHECKPKG_OVERRIDES_CSWossldevel += catalogname-does-not-match-pkgname|pkgname=CSWossldevel|catalogname=openssl_devel|expected-catalogname=ossldevel
+CHECKPKG_OVERRIDES_CSWossl += catalogname-does-not-match-pkgname|pkgname=CSWossl|catalogname=openssl|expected-catalogname=ossl
+CHECKPKG_OVERRIDES_CSWosslrt += catalogname-does-not-match-pkgname|pkgname=CSWosslrt|catalogname=openssl_rt|expected-catalogname=osslrt
 
 
 ###### Upstream and opencsw files information #######
@@ -123,6 +128,9 @@
 # solaris-386-cc, solaris-pentium-cc, solaris-pentium_pro-cc, solaris-sparcv9+vis-cc
 PATCHFILES = more_configure_targets.patch
 
+# Update openssl.cnf path in man page to follow opencsw standard
+PATCHFILES += opencsw_paths.patch
+
 LICENSE=LICENSE
 
 ##### Build and installation information #####
@@ -138,10 +146,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
@@ -190,6 +194,8 @@
 endif
 endif 
 
+TEST_SCRIPTS =
+
 include gar/category.mk
 
 

Modified: csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype
===================================================================
--- csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype	2011-07-20 13:56:36 UTC (rev 15156)
+++ csw/mgar/pkg/openssl/trunk/files/CSWosslutils.prototype	2011-07-20 13:56:56 UTC (rev 15157)
@@ -59,9 +59,9 @@
 f none /opt/csw/ssl/misc/c_info 0755 root bin
 f none /opt/csw/ssl/misc/c_issuer 0755 root bin
 f none /opt/csw/ssl/misc/c_name 0755 root bin
-s none /opt/csw/ssl/openssl.cnf=/opt/csw/etc/ssl/openssl.cnf 0644 root bin
+s none /opt/csw/ssl/openssl.cnf=/etc/opt/csw/ssl/openssl.cnf 0644 root bin
 d none /opt/csw/etc/ssl 0755 root bin
-f cswpreserveconf /opt/csw/etc/ssl/openssl.cnf.CSW 0644 root bin
+f cswpreserveconf /etc/opt/csw/ssl/openssl.cnf.CSW 0644 root bin
 f none /opt/csw/share/doc/openssl_utils/changelog.CSW 644 root bin
 f none /opt/csw/share/doc/openssl_utils/license 644 root bin
 f none /opt/csw/share/doc/openssl_utils/CHANGES 644 root bin


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