[csw-devel] SF.net SVN: gar:[6948] csw/mgar/pkg/cups/branches/cups-1.4.0

[wahwah at users.sourceforge.net]

Revision: 6948
          http://gar.svn.sourceforge.net/gar/?rev=6948&view=rev
Author:   wahwah
Date:     2009-10-23 10:11:21 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
cups-1.4.0: Solaris zone support.

Modified Paths:
--------------
    csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile
    csw/mgar/pkg/cups/branches/cups-1.4.0/checksums

Added Paths:
-----------
    csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch

Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile	2009-10-23 00:44:17 UTC (rev 6947)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/Makefile	2009-10-23 10:11:21 UTC (rev 6948)
@@ -54,6 +54,7 @@
 # PATCHFILES += 0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
 PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
 PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
+PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch
 
 PREREQUISITE_PKGS  = CSWggettext
 PREREQUISITE_PKGS += CSWjpeg

Modified: csw/mgar/pkg/cups/branches/cups-1.4.0/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/checksums	2009-10-23 00:44:17 UTC (rev 6947)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/checksums	2009-10-23 10:11:21 UTC (rev 6948)
@@ -3,6 +3,7 @@
 a80b8543633e2f9b3b1e531ac2289306  0003-Reference-counting-for-printers-only.patch
 bbf0295c76cd06b5311ac3a3467fd431  0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
 0dd35cc0938696577104852781ec1df6  0006-Fail-compilation-if-no-SSL-impl-chosen.patch
+44ff410e237d6f4f9f0fe650ba2c7fa0  0007-Solaris-zone-support-in-init-script.patch
 dec0baa8c3ec0e171183496da8f24323  CSWcupsclient.preinstall
 ca7718998e56c320c08a77cfefe046f6  CSWcupsd.postremove
 dec0baa8c3ec0e171183496da8f24323  CSWcupsd.preinstall

Added: csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4.0/files/0007-Solaris-zone-support-in-init-script.patch	2009-10-23 10:11:21 UTC (rev 6948)
@@ -0,0 +1,42 @@
+From 87110488b3509610756f0c21447a42124d3a092d Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Fri, 23 Oct 2009 11:08:23 +0100
+Subject: [PATCH] Solaris zone support in init script
+
+---
+ init/cups.sh.in |   12 +++++++++++-
+ 1 files changed, 11 insertions(+), 1 deletions(-)
+
+diff --git a/init/cups.sh.in b/init/cups.sh.in
+index 2ff418c..d714b19 100755
+--- a/init/cups.sh.in
++++ b/init/cups.sh.in
+@@ -148,7 +148,7 @@ case "`uname`" in
+ 	HP-UX* | AIX* | SINIX*)
+ 		pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
+ 		;;
+-	IRIX* | SunOS*)
++	IRIX*)
+ 		pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
+ 		;;
+ 	UnixWare*)
+@@ -161,6 +161,16 @@ case "`uname`" in
+ 	Linux* | *BSD* | Darwin*)
+ 		pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
+ 		;;
++	SunOS*)
++		if [ -x /usr/bin/zonename ]; then
++			zonename=`/usr/bin/zonename`
++			zoneopts="-z $zonename"
++		else
++			zoneopts=
++		fi
++		# The backslash before the ^ is important.
++		pid=`/usr/bin/pgrep ${zoneopts} \^cupsd$`
++		;;
+ 	*)
+ 		pid=""
+ 		;;
+-- 
+1.6.3.2
+


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