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

wilbury at users.sourceforge.net wilbury at users.sourceforge.net
Wed Sep 21 21:01:37 CEST 2011


Revision: 15705
          http://gar.svn.sourceforge.net/gar/?rev=15705&view=rev
Author:   wilbury
Date:     2011-09-21 19:01:36 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
squid/branches/squid3: Fix build, name package as CSWsquid

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

Added Paths:
-----------
    csw/mgar/pkg/squid/branches/squid3/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch
    csw/mgar/pkg/squid/branches/squid3/files/0006-Use-default-cache_dir.patch
    csw/mgar/pkg/squid/branches/squid3/files/CSWsquid3.cswusergroup
    csw/mgar/pkg/squid/branches/squid3/files/cswsquid3

Removed Paths:
-------------
    csw/mgar/pkg/squid/branches/squid3/files/CSWsquid.cswusergroup
    csw/mgar/pkg/squid/branches/squid3/files/cswsquid

Modified: csw/mgar/pkg/squid/branches/squid3/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile	2011-09-21 12:33:05 UTC (rev 15704)
+++ csw/mgar/pkg/squid/branches/squid3/Makefile	2011-09-21 19:01:36 UTC (rev 15705)
@@ -17,9 +17,11 @@
   bandwith usage. Squid runs on all popular Unix and Windows platforms.
 endef
 
-PACKAGES = CSW$(NAME)
-CATALOGNAME_CSW$(NAME) = $(NAME)
-RUNTIME_DEP_PKGS_CSW$(NAME) = CSWoldaprt CSWosslrt CSWsasl
+PACKAGES = CSWsquid
+RUNTIME_DEP_PKGS = CSWoldaprt CSWosslrt CSWsasl
+RUNTIME_DEP_PKGS += CSWperl
+RUNTIME_DEP_PKGS += CSWlibltdl7
+
 PACKAGING_PLATFORMS =  solaris9-sparc solaris9-i386
 INITSMF = /etc/opt/csw/init.d/csw$(NAME)
 PRESERVECONF = /etc/opt/csw/$(NAME)/cachemgr.conf
@@ -33,17 +35,19 @@
 MIGRATE_FILES += squid.conf
 
 MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/
-DISTFILES = $(DISTNAME).tar.bz2
-#DISTFILES += cswsquid
-#DISTFILES += CSWsquid.cswusergroup
+DISTFILES = squid-$(DISTVERSION).tar.bz2
 
 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
+PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch
+PATCHFILES += 0006-Use-default-cache_dir.patch
 
+sysconfdir = /etc/opt/csw/$(NAME)
+
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(NAME)
+CONFIGURE_ARGS += --sysconfdir=${sysconfdir}
 CONFIGURE_ARGS += --datadir=$(datadir)/$(NAME)
 CONFIGURE_ARGS += --docdir=$(datadir)/$(NAME)
 CONFIGURE_ARGS += --localstatedir=/var/opt/csw/$(NAME)
@@ -69,15 +73,17 @@
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-default-user=$(NAME)
 
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWperl
-RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibltdl7
+# CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/squid_unix_group.8
 
-CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/squid_unix_group.8
-
 TEST_TARGET = 
 
 EXTRA_LINKER_FLAGS += -norunpath
 
+SAMPLECONF = squid.conf
+SAMPLECONF += cachemgr.conf
+SAMPLECONF += mime.conf
+USERGROUP = /etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
+
 PROTOTYPE_MODIFIERS      = varuser
 PROTOTYPE_FILES_varuser  = \/var\/opt\/csw\/$(NAME)\/cache
 PROTOTYPE_FILES_varuser += \/var\/opt\/csw\/$(NAME)\/logs
@@ -85,12 +91,14 @@
 PROTOTYPE_USER_varuser   = $(NAME)
 PROTOTYPE_GROUP_varuser  = $(NAME)
 
-USERGROUP = /etc/opt/csw/pkg/$(NAME)/cswusergroup
 
 include gar/category.mk
 
 SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE)
 
+#post-extract-modulated:
+#	@-[ ! -d ${WORKDIR}/${DISTNAME} ] && mv ${WORKDIR}/squid-$(DISTVERSION) ${WORKDIR}/${DISTNAME}
+
 pre-configure-modulated:
 	cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh
 	@$(MAKECOOKIE)
@@ -99,8 +107,8 @@
 	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 -d $(DESTDIR)/etc/opt/csw/pkg/$(NAME)
-	ginstall -m 755 $(DOWNLOADDIR)/cswsquid $(DESTDIR)/etc/opt/csw/init.d/csw$(NAME)
-	ginstall -m 644 $(DOWNLOADDIR)/CSWsquid.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/$(NAME)/cswusergroup
+	ginstall -d $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)
+	ginstall -m 755 $(FILEDIR)/cswsquid3 $(DESTDIR)/etc/opt/csw/init.d/csw$(NAME)
+	ginstall -m 644 $(FILEDIR)/CSWsquid3.cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSW$(NAME)/cswusergroup
 	@$(MAKECOOKIE)
 

Added: csw/mgar/pkg/squid/branches/squid3/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch	2011-09-21 19:01:36 UTC (rev 15705)
@@ -0,0 +1,26 @@
+From 6f0024035fe0aa19409203614e724b5a386849b7 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Wed, 21 Sep 2011 14:59:31 +0200
+Subject: [PATCH 6/7] Replace /usr/local/squid/libexec with
+ /opt/csw/libexec/squid3.
+
+---
+ helpers/external_acl/unix_group/squid_unix_group.8 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/helpers/external_acl/unix_group/squid_unix_group.8 b/helpers/external_acl/unix_group/squid_unix_group.8
+index 72aa1a3..66c2d52 100644
+--- a/helpers/external_acl/unix_group/squid_unix_group.8
++++ b/helpers/external_acl/unix_group/squid_unix_group.8
+@@ -27,7 +27,7 @@ Strip NT domain name component from user names (/ or \\ separated)
+ This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2
+ matches users in group2 or group3
+ .IP
+-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p
++external_acl_type unix_group %LOGIN /opt/csw/libexec/squid3/squid_unix_group -p
+ .IP
+ acl usergroup1 external unix_group group1
+ .IP
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/squid/branches/squid3/files/0006-Use-default-cache_dir.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0006-Use-default-cache_dir.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0006-Use-default-cache_dir.patch	2011-09-21 19:01:36 UTC (rev 15705)
@@ -0,0 +1,25 @@
+From 7b2c6d4e46b124924a82474d21ab51db5de64830 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Wed, 21 Sep 2011 16:06:58 +0200
+Subject: [PATCH] Use default cache_dir.
+
+---
+ src/cf.data.pre |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/cf.data.pre b/src/cf.data.pre
+index a5aaefc..8301b58 100644
+--- a/src/cf.data.pre
++++ b/src/cf.data.pre
+@@ -2412,7 +2412,7 @@ DOC_START
+ NOCOMMENT_START
+ 
+ # Uncomment and adjust the following to add a disk cache directory.
+-#cache_dir ufs @DEFAULT_SWAP_DIR@ 100 16 256
++cache_dir ufs @DEFAULT_SWAP_DIR@ 100 16 256
+ NOCOMMENT_END
+ DOC_END
+ 
+-- 
+1.7.6.1
+

Deleted: csw/mgar/pkg/squid/branches/squid3/files/CSWsquid.cswusergroup
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/CSWsquid.cswusergroup	2011-09-21 12:33:05 UTC (rev 15704)
+++ csw/mgar/pkg/squid/branches/squid3/files/CSWsquid.cswusergroup	2011-09-21 19:01:36 UTC (rev 15705)
@@ -1 +0,0 @@
-squid:squid:::::

Copied: csw/mgar/pkg/squid/branches/squid3/files/CSWsquid3.cswusergroup (from rev 15702, csw/mgar/pkg/squid/branches/squid3/files/CSWsquid.cswusergroup)
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/CSWsquid3.cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/CSWsquid3.cswusergroup	2011-09-21 19:01:36 UTC (rev 15705)
@@ -0,0 +1 @@
+squid:squid:::::

Deleted: csw/mgar/pkg/squid/branches/squid3/files/cswsquid
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/cswsquid	2011-09-21 12:33:05 UTC (rev 15704)
+++ csw/mgar/pkg/squid/branches/squid3/files/cswsquid	2011-09-21 19:01:36 UTC (rev 15705)
@@ -1,66 +0,0 @@
-#!/sbin/sh
-# $Id#
-
-PATH=/usr/bin
-CSWPREFIX=/opt/csw
-CSWETC=/etc${PREFIX}
-CSWSBIN=${CSWPREFIX}/sbin
-SQUID_DAEMON=${CSWSBIN}/squid
-SQUID_CONF=${CSWETC}/squid/squid.conf
-SQUID_PIDFILE=/var${CSWPREFIX}/squid/logs/squid.pid
-
-if [ -f /lib/svc/share/smf_include.sh ]; then
-    . /lib/svc/share/smf_include.sh
-fi
-
-case "$1" in
-    'start')
-        if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
-            if [ -f ${SQUID_PIDFILE} ]; then
-                echo 'squid server is already running'
-                    exit 0
-            else
-                echo 'starting squid server.'
-                ${SQUID_DAEMON} -D &
-                    exit 0
-            fi
-        else
-            echo '****  NOTICE  ****'
-            echo 'Problem starting squid server,'
-            echo 'Please make sure it is properly installed'
-            echo 'and properly configured.'
-            exit 1
-        fi
-        ;;
-    'stop')
-        if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
-            if [ -f ${SQUID_PIDFILE} ]; then
-                ## stop gracefully
-                    echo 'stopping squid server... please wait for cleanup...'
-                ${SQUID_DAEMON} -k shutdown
-                rm -f /var/opt/csw/squid/logs/squid.pid
-                exit 0
-            else
-                ## Not running
-                echo 'squid server is already down'
-                rm -f /var/opt/csw/squid/logs/squid.pid
-                exit 0
-            fi
-        else
-            echo '****  NOTICE  ****'
-            echo 'Squid server not properly installed'
-            echo 'Forcing Down!'
-            pkill -9 squid
-            rm -f /var/opt/csw/squid/logs/squid.pid
-            exit 1
-            fi
-        ;;
-
-    *)
-        echo "Usage: $0 { start | stop }"
-        exit 1
-        ;;
-esac
-
-exit 0
-

Added: csw/mgar/pkg/squid/branches/squid3/files/cswsquid3
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/cswsquid3	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/cswsquid3	2011-09-21 19:01:36 UTC (rev 15705)
@@ -0,0 +1,66 @@
+#!/sbin/sh
+# $Id#
+
+PATH=/usr/bin
+CSWPREFIX=/opt/csw
+CSWETC=/etc${PREFIX}
+CSWSBIN=${CSWPREFIX}/sbin
+SQUID_DAEMON=${CSWSBIN}/squid
+SQUID_CONF=${CSWETC}/squid/squid.conf
+SQUID_PIDFILE=/var${CSWPREFIX}/squid/logs/squid.pid
+
+if [ -f /lib/svc/share/smf_include.sh ]; then
+    . /lib/svc/share/smf_include.sh
+fi
+
+case "$1" in
+    'start')
+        if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
+            if [ -f ${SQUID_PIDFILE} ]; then
+                echo 'squid server is already running'
+                    exit 0
+            else
+                echo 'starting squid server.'
+                ${SQUID_DAEMON} -D &
+                    exit 0
+            fi
+        else
+            echo '****  NOTICE  ****'
+            echo 'Problem starting squid server,'
+            echo 'Please make sure it is properly installed'
+            echo 'and properly configured.'
+            exit 1
+        fi
+        ;;
+    'stop')
+        if [ -x ${SQUID_DAEMON} -a -f ${SQUID_CONF} ]; then
+            if [ -f ${SQUID_PIDFILE} ]; then
+                ## stop gracefully
+                    echo 'stopping squid server... please wait for cleanup...'
+                ${SQUID_DAEMON} -k shutdown
+                rm -f /var/opt/csw/squid/logs/squid.pid
+                exit 0
+            else
+                ## Not running
+                echo 'squid server is already down'
+                rm -f /var/opt/csw/squid/logs/squid.pid
+                exit 0
+            fi
+        else
+            echo '****  NOTICE  ****'
+            echo 'Squid server not properly installed'
+            echo 'Forcing Down!'
+            pkill -9 squid
+            rm -f /var/opt/csw/squid/logs/squid.pid
+            exit 1
+            fi
+        ;;
+
+    *)
+        echo "Usage: $0 { start | stop }"
+        exit 1
+        ;;
+esac
+
+exit 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