[csw-devel] SF.net SVN: gar:[15663] csw/mgar/pkg/squid/branches/squid3

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Mon Sep 19 19:10:57 CEST 2011 

Revision: 15663
          http://gar.svn.sourceforge.net/gar/?rev=15663&view=rev
Author:   wilbury
Date:     2011-09-19 17:10:57 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Added 2 patches.
Modified Makefile:
- Package name changed from squid to squid3
- Directory names changed from .../squid to their respective .../squid3 names

Modified Paths:
--------------
    csw/mgar/pkg/squid/branches/squid3/Makefile

Added Paths:
-----------
    csw/mgar/pkg/squid/branches/squid3/files/0002-Link-against-OpenSSL-from-OpenCSW.patch
    csw/mgar/pkg/squid/branches/squid3/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch

Modified: csw/mgar/pkg/squid/branches/squid3/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile	2011-09-19 14:18:35 UTC (rev 15662)
+++ csw/mgar/pkg/squid/branches/squid3/Makefile	2011-09-19 17:10:57 UTC (rev 15663)
@@ -1,12 +1,12 @@
 # Squid 3
 # $Id$
 #
-NAME = squid
+NAME = squid3
 VERSION = 3.1
 CATEGORIES = server
 RELEASE = 15
 DISTVERSION = $(VERSION).$(RELEASE)
-DISTNAME = $(NAME)-$(DISTVERSION)
+DISTNAME = squid-$(DISTVERSION)
 RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/')
 
 DESCRIPTION = High performance Web proxy cache
@@ -16,9 +16,9 @@
   bandwith usage. Squid runs on all popular Unix and Windows platforms.
 endef
 
-PACKAGES = CSWsquid
-CATALOGNAME_CSWsquid = squid
-RUNTIME_DEP_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl
+PACKAGES = CSW$(NAME)
+CATALOGNAME_CSWsquid = $(NAME)
+RUNTIME_DEP_PKGS_CSW$(NAME) = CSWoldaprt CSWosslrt CSWsasl
 PACKAGING_PLATFORMS =  solaris9-sparc solaris9-i386
 INITSMF = /etc/opt/csw/init.d/csw$(NAME)
 PRESERVECONF = /etc/opt/csw/$(NAME)/cachemgr.conf
@@ -37,6 +37,8 @@
 
 PATCHFILES =  0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
 PATCHFILES += 0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch
+PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch
+PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(NAME)
@@ -63,14 +65,58 @@
 CONFIGURE_ARGS += --with-large-files
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 
-TEST_TARGET = check
-BUILD64=1
+CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/squid_unix_group.8
+CHECKPKG_OVERRIDES_CSW$(NAME) += pkginfo-opencsw-repository-uncommitted
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/lib|opt/csw/bin/squidclient
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib|opt/csw/bin/squidclient
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib/rw7|opt/csw/bin/squidclient
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/lib|opt/csw/libexec/cachemgr.cgi
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib|opt/csw/libexec/cachemgr.cgi
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib/rw7|opt/csw/libexec/cachemgr.cgi
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/lib|opt/csw/libexec/diskd
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib|opt/csw/libexec/diskd
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib/rw7|opt/csw/libexec/diskd
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/lib|opt/csw/libexec/unlinkd
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib|opt/csw/libexec/unlinkd
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib/rw7|opt/csw/libexec/unlinkd
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/lib|opt/csw/sbin/squid
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib|opt/csw/sbin/squid
+CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry|/opt/sunstudio12.1/lib/rw7|opt/csw/sbin/squid
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWcas-initsmf
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWcas-migrateconf
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWcas-preserveconf
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWcommon
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWoldaprt
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWosslrt
+CHECKPKG_OVERRIDES_CSW$(NAME) += unidentified-dependency|CSWsasl
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libsasl2.so.2|is|needed|by|opt/csw/libexec/sasl_auth
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|liblber-2.4.so.2|is|needed|by|opt/csw/libexec/squid_ldap_group
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libcrypto.so.0.9.8|is|needed|by|opt/csw/libexec/ncsa_auth
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libssl.so.0.9.8|is|needed|by|opt/csw/libexec/diskd
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libssl.so.0.9.8|is|needed|by|opt/csw/sbin/squid
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libldap-2.4.so.2|is|needed|by|opt/csw/libexec/squid_ldap_group
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libssl.so.0.9.8|is|needed|by|opt/csw/libexec/unlinkd
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libssl.so.0.9.8|is|needed|by|opt/csw/libexec/ncsa_auth
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libcrypto.so.0.9.8|is|needed|by|opt/csw/libexec/diskd
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libcrypto.so.0.9.8|is|needed|by|opt/csw/libexec/unlinkd
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libltdl.so.7|is|needed|by|opt/csw/sbin/squid
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libldap-2.4.so.2|is|needed|by|opt/csw/libexec/squid_ldap_auth
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|libcrypto.so.0.9.8|is|needed|by|opt/csw/sbin/squid
+CHECKPKG_OVERRIDES_CSW$(NAME) += soname-not-found|liblber-2.4.so.2|is|needed|by|opt/csw/libexec/squid_ldap_auth
+CHECKPKG_OVERRIDES_CSW$(NAME) += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWoldaprt
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWsasl
+CHECKPKG_OVERRIDES_CSW$(NAME) += surplus-dependency|CSWosslrt
 
+EXTRA_LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib
+
+TEST_TARGET = 
+
 PROTOTYPE_MODIFIERS      = varuser
-PROTOTYPE_FILES_varuser  = /var/opt/csw/squid/cache
-PROTOTYPE_FILES_varuser += /var/opt/csw/squid/logs
-PROTOTYPE_USER_varuser   = squid
-PROTOTYPE_GROUP_varuser  = squid
+PROTOTYPE_FILES_varuser  = /var/opt/csw/$(NAME)/cache
+PROTOTYPE_FILES_varuser += /var/opt/csw/$(NAME)/logs
+PROTOTYPE_USER_varuser   = $(NAME)
+PROTOTYPE_GROUP_varuser  = $(NAME)
 
 include gar/category.mk
 
@@ -84,6 +130,6 @@
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/cache
-	ginstall -m 755 $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/cswsquid
+	ginstall -m 755 $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/csw$(NAME)
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/squid/branches/squid3/files/0002-Link-against-OpenSSL-from-OpenCSW.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0002-Link-against-OpenSSL-from-OpenCSW.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0002-Link-against-OpenSSL-from-OpenCSW.patch	2011-09-19 17:10:57 UTC (rev 15663)
@@ -0,0 +1,25 @@
+From bbdd76dd83f1e18436b41127f709aa0958753a7d Mon Sep 17 00:00:00 2001
+From: builder user <builder at opencsw.org>
+Date: Mon, 19 Sep 2011 16:25:15 +0200
+Subject: [PATCH] Link against OpenSSL from OpenCSW.
+
+---
+ src/Makefile.am |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 136a5cd..00ffb43 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -116,6 +116,8 @@ SUBDIRS += ssl
+ SSL_LIBS = \
+ 	ssl/libsslutil.la \
+ 	ssl/libsslsquid.la
++XTRA_LIBS += -lssl -lcrypto
++LDFLAGS += -L/opt/csw/lib -R/opt/csw/lib
+ else
+ SSL_SOURCE = 
+ SSL_LIBS = 
+-- 
+1.7.6
+

Added: csw/mgar/pkg/squid/branches/squid3/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch	2011-09-19 17:10:57 UTC (rev 15663)
@@ -0,0 +1,25 @@
+From c071545192850fba9a024d2ed9e37fe9fad76604 Mon Sep 17 00:00:00 2001
+From: builder user <builder at opencsw.org>
+Date: Mon, 19 Sep 2011 16:56:57 +0200
+Subject: [PATCH] Check for ber_pvt_opt_on instead of main in libber.
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e7df9ed..25b2c17 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2875,7 +2875,7 @@ mingw|mingw32)
+ *)
+        LIB_LDAP="-lldap"
+        dnl LDAP helpers need to know if -llber is needed or not
+-       AC_CHECK_LIB(lber, main, [LIB_LBER="-llber"])
++       AC_CHECK_LIB(lber, ber_pvt_opt_on, [LIB_LBER="-llber"])
+        ;;
+ esac
+ AC_SUBST(LIB_LDAP)
+-- 
+1.7.6
+

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