[Pkg-cups-devel] r74 - cupsys/branches/cups-1.2/debian

[Kenshi Muto]

Author: kmuto
Date: Fri Dec 16 12:25:14 2005
New Revision: 74

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/cupsys.config
   cupsys/branches/cups-1.2/debian/cupsys.postinst
Log:
allow '*' for hostname. use /bin/echo instead of shell built-in.

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Fri Dec 16 12:25:14 2005
@@ -9,6 +9,8 @@
       CUPS crashes when there is a duplicate definition.
   * Updated Swedish debconf translation.
   * Set seen false flag when ports configuration is failed.
+  * Allow '*' for hostname in ports.conf.
+  * Use /bin/echo instead of shell built-in echo.
 
  -- Kenshi Muto <kmuto at debian.org>  Thu, 15 Dec 2005 07:15:54 +0900
 

Modified: cupsys/branches/cups-1.2/debian/cupsys.config
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.config	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.config	Fri Dec 16 12:25:14 2005
@@ -20,9 +20,9 @@
       } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d:\d+$/) {
         # IP
         $ret .= "Listen $_\\n";
-      } elsif (/^[a-zA-Z0-9-_.]+$/ || /^[a-zA-Z0-9-_.]+:\d+$/) {
+      } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
         my($tmp) = $_;
-        if (/^[a-zA-Z0-9-_.]+:(\d+)$/) {
+        if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
           if ($1 < 0 || $1 > 65535) {
             # ERROR
             $ret = "";

Modified: cupsys/branches/cups-1.2/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2/debian/cupsys.postinst	Fri Dec 16 12:25:14 2005
@@ -156,9 +156,9 @@
 	      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d:\d+$/) {
 	        # IP
 	        $ret .= "Listen $_\\n";
-	      } elsif (/^[a-zA-Z0-9-_.]+$/ || /^[a-zA-Z0-9-_.]+:\d+$/) {
+	      } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {
 	        my($tmp) = $_;
-	        if (/^[a-zA-Z0-9-_.]+:(\d+)$/) {
+	        if (/^[a-zA-Z0-9-_.*]+:(\d+)$/) {
 	          if ($1 < 0 || $1 > 65535) {
 	            # ERROR
 	            $ret = "";
@@ -183,14 +183,14 @@
 	  echo "Error: debconf has an invalid value. Run 'dpkg-reconfigure cupsys' again."
 	  return 1
 	else
-	  echo -e -n "$VAL" > /etc/cups/cups.d/ports.conf
+	  /bin/echo -e -n "$VAL" > /etc/cups/cups.d/ports.conf
 	fi
 
 	db_get cupsys/browse
 	if [ "$RET" = "true" ]; then
-	  echo "Browsing on" > /etc/cups/cups.d/browse.conf
+	  /bin/echo "Browsing on" > /etc/cups/cups.d/browse.conf
 	else
-	  echo "Browsing off" > /etc/cups/cups.d/browse.conf
+	  /bin/echo "Browsing off" > /etc/cups/cups.d/browse.conf
 	fi
     ;;