SF.net SVN: gar:[23751] csw/mgar/pkg/cups/trunk

[cgrzemba at users.sourceforge.net]

Revision: 23751
          http://sourceforge.net/p/gar/code/23751
Author:   cgrzemba
Date:     2014-06-02 08:16:01 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
cups/trunk: revive two patches

Modified Paths:
--------------
    csw/mgar/pkg/cups/trunk/Makefile
    csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch
    csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch

Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile	2014-06-01 21:08:13 UTC (rev 23750)
+++ csw/mgar/pkg/cups/trunk/Makefile	2014-06-02 08:16:01 UTC (rev 23751)
@@ -50,12 +50,11 @@
 DISTFILES += CSWcupsclient.README
 
 PATCHFILES += 0001-cswcups-for-the-service-name.patch
-# PATCHFILES += 0002-use-posix-shell-in-install.sh.patch
-# PATCHFILES  = 0001-cswcups-for-service-name.patch
+PATCHFILES += 0002-use-posix-shell-in-install.sh.patch
 # PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
 # PATCHFILES += 0003-Reference-counting-for-printers-only.patch
 # PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
-# PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch
+PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch
 # PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch
 # PATCHFILES += 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch
 # PATCHFILES += 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch

Modified: csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch	2014-06-01 21:08:13 UTC (rev 23750)
+++ csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch	2014-06-02 08:16:01 UTC (rev 23751)
@@ -15,7 +15,7 @@
 -#!/bin/sh
 +#!/usr/xpg4/bin/sh
  #
- # "$Id: install-sh 10317 2012-03-01 00:05:55Z mike $"
+ # "$Id: install-sh 10496 2012-05-22 21:38:54Z mike $"
  #
 -- 
 1.7.10.3

Modified: csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch	2014-06-01 21:08:13 UTC (rev 23750)
+++ csw/mgar/pkg/cups/trunk/files/0007-Solaris-zone-support-in-init-script.patch	2014-06-02 08:16:01 UTC (rev 23751)
@@ -7,10 +7,10 @@
  init/cups.sh.in |   12 +++++++++++-
  1 files changed, 11 insertions(+), 1 deletions(-)
 
-diff --git a/init/cups.sh.in b/init/cups.sh.in
+diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in
 index 2ff418c..d714b19 100755
---- a/init/cups.sh.in
-+++ b/init/cups.sh.in
+--- a/scheduler/cups.sh.in
++++ b/scheduler/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}'`

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