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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Oct 23 14:36:41 CEST 2009


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

Log Message:
-----------
cups-1.4.1: Merging fixes for the cups-polld issue.

Modified Paths:
--------------
    csw/mgar/pkg/cups/branches/cups-1.4/Makefile
    csw/mgar/pkg/cups/branches/cups-1.4/checksums
    csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall
    csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall

Added Paths:
-----------
    csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
    csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch
    csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch

Property Changed:
----------------
    csw/mgar/pkg/cups/branches/cups-1.4/


Property changes on: csw/mgar/pkg/cups/branches/cups-1.4
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-pbuild

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2

Added: svn:mergeinfo
   + /csw/mgar/pkg/cups/branches/cups-1.4.0:6915-6949

Modified: csw/mgar/pkg/cups/branches/cups-1.4/Makefile
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-10-23 12:22:59 UTC (rev 6949)
+++ csw/mgar/pkg/cups/branches/cups-1.4/Makefile	2009-10-23 12:36:40 UTC (rev 6950)
@@ -21,13 +21,13 @@
 # There's a problem with cups-polld going into a busy-wait loop when polling
 # print servers.
 #
-#   http://www.cups.org/str.php?L3257
+#   http://www.cups.org/str.php?L3257 (closed)
+#   http://www.cups.org/str.php?L3381 (filed again)
 #
 # The problem with cups-polld seems to be going away when CUPS is compiled with
 # debugging symbols. The debugging options is turned on for this package, in
 # order to be able to debug the binary if it ever shows the problem.
-#
-# TODO: Check whether the issue is gone or not.
+
 GARFLAVOR = DBG
 
 # These are the source mirrors published on the CUPS home-page.
@@ -52,6 +52,9 @@
 PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
 PATCHFILES += 0003-Reference-counting-for-printers-only.patch
 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/checksums
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/checksums	2009-10-23 12:22:59 UTC (rev 6949)
+++ csw/mgar/pkg/cups/branches/cups-1.4/checksums	2009-10-23 12:36:40 UTC (rev 6950)
@@ -2,7 +2,10 @@
 0da4ea6bf72d61adfc4316a738b90ab5  download/0002-Adding-the-refcount-member-to-mime_type_t.patch
 a80b8543633e2f9b3b1e531ac2289306  download/0003-Reference-counting-for-printers-only.patch
 193912518565c7052724420e7899930b  download/0004-Fix-for-usb-unix.c-from-http-www.cups.org-str.php-L3.patch
-dec0baa8c3ec0e171183496da8f24323  download/CSWcupsclient.preinstall
+bbf0295c76cd06b5311ac3a3467fd431  download/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
+0dd35cc0938696577104852781ec1df6  download/0006-Fail-compilation-if-no-SSL-impl-chosen.patch
+44ff410e237d6f4f9f0fe650ba2c7fa0  download/0007-Solaris-zone-support-in-init-script.patch
+cf6a3fe902545aac1ab2303e41c08a3e  download/CSWcupsclient.preinstall
 ca7718998e56c320c08a77cfefe046f6  download/CSWcupsd.postremove
-dec0baa8c3ec0e171183496da8f24323  download/CSWcupsd.preinstall
+cf6a3fe902545aac1ab2303e41c08a3e  download/CSWcupsd.preinstall
 587a58039c112ecb3c932e048c8a7b01  download/cups-1.4.1-source.tar.bz2

Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch)
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch	2009-10-23 12:36:40 UTC (rev 6950)
@@ -0,0 +1,42 @@
+From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 21 Oct 2009 12:40:39 +0200
+Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno
+
+---
+ cups/http.c |   19 ++++++++++++++++++-
+ 1 files changed, 18 insertions(+), 1 deletions(-)
+
+diff --git a/cups/http.c b/cups/http.c
+index 840e3fc..e255375 100644
+--- a/cups/http.c
++++ b/cups/http.c
+@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http,		/* I - Connection to server */
+   return (SSL_read((SSL *)(http->tls), buf, len));
+ 
+ #  elif defined(HAVE_GNUTLS)
+-  return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
++  int result;
++  result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
++  if (result < 0 && !errno) {
++    switch (result)
++    {
++      case GNUTLS_E_INTERRUPTED :
++        errno = EINTR;
++        break;
++      case GNUTLS_E_AGAIN :
++        errno = EAGAIN;
++        break;
++      default :
++        errno = EPIPE;
++        break;
++    }
++    result = -1;
++  }
++  return result;
+ 
+ #  elif defined(HAVE_CDSASSL)
+   int		result;			/* Return value */
+-- 
+1.6.5
+

Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch (from rev 6949, csw/mgar/pkg/cups/branches/cups-1.4.0/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch)
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/0006-Fail-compilation-if-no-SSL-impl-chosen.patch	2009-10-23 12:36:40 UTC (rev 6950)
@@ -0,0 +1,25 @@
+From 8aaa020d1c297edc2c0b1e2b3426ab6f8b0b7a1d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 20 Oct 2009 13:35:40 +0200
+Subject: [PATCH] Fail compilation if no SSL impl chosen
+
+---
+ cups/http.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/cups/http.c b/cups/http.c
+index 8b767c9..840e3fc 100644
+--- a/cups/http.c
++++ b/cups/http.c
+@@ -2753,6 +2753,8 @@ http_read_ssl(http_t *http,		/* I - Connection to server */
+   }
+ 
+   return (result);
++#  else
++#    error "One of HAVE_LIBSSL, HAVE_GNUTLS or HAVE_CDSASSL must be set."
+ #  endif /* HAVE_LIBSSL */
+ }
+ #endif /* HAVE_SSL */
+-- 
+1.6.5
+

Copied: csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch (from rev 6949, 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/files/0007-Solaris-zone-support-in-init-script.patch	                        (rev 0)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/0007-Solaris-zone-support-in-init-script.patch	2009-10-23 12:36:40 UTC (rev 6950)
@@ -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
+

Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall	2009-10-23 12:22:59 UTC (rev 6949)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsclient.preinstall	2009-10-23 12:36:40 UTC (rev 6950)
@@ -4,6 +4,11 @@
 # $Id$
 #
 
+set -u
+
+PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}"
+readonly PKG_INSTALL_ROOT
+
 obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups"
 
 obsolete_dir_information="
@@ -17,7 +22,7 @@
 for dirpair in ${obsolete_directories}; do
   obsolete_dir=`echo ${dirpair} | cut -d: -f1`
   new_dir=`echo ${dirpair} | cut -d: -f2`
-  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
+  if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then
     echo
     echo "*******************************************************************"
     echo "* The old configuration directory ${obsolete_dir} still exists.    "
@@ -30,7 +35,7 @@
     sleep 10
 
     # Leaving a note for the sysadmin if the they proceed with the installation.
-    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
+    fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}"
     if touch "${fn}" 2>/dev/null; then
       echo "${obsolete_dir_information}" > "${fn}"
     fi

Modified: csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall
===================================================================
--- csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall	2009-10-23 12:22:59 UTC (rev 6949)
+++ csw/mgar/pkg/cups/branches/cups-1.4/files/CSWcupsd.preinstall	2009-10-23 12:36:40 UTC (rev 6950)
@@ -4,6 +4,11 @@
 # $Id$
 #
 
+set -u
+
+PKG_INSTALL_ROOT="${PKG_INSTALL_ROOT:-}"
+readonly PKG_INSTALL_ROOT
+
 obsolete_directories="/opt/csw/etc/cups:/etc/opt/csw/cups"
 
 obsolete_dir_information="
@@ -17,7 +22,7 @@
 for dirpair in ${obsolete_directories}; do
   obsolete_dir=`echo ${dirpair} | cut -d: -f1`
   new_dir=`echo ${dirpair} | cut -d: -f2`
-  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
+  if [ -d "${PKG_INSTALL_ROOT}/${obsolete_dir}" ]; then
     echo
     echo "*******************************************************************"
     echo "* The old configuration directory ${obsolete_dir} still exists.    "
@@ -30,7 +35,7 @@
     sleep 10
 
     # Leaving a note for the sysadmin if the they proceed with the installation.
-    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
+    fn="${PKG_INSTALL_ROOT}/${obsolete_dir}/${obsolete_dir_file_name}"
     if touch "${fn}" 2>/dev/null; then
       echo "${obsolete_dir_information}" > "${fn}"
     fi


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