[Pkg-cups-devel] r97 - cupsys/trunk/debian

[Kenshi Muto]

Author: kmuto
Date: Fri Dec 23 05:12:56 2005
New Revision: 97

Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/cupsys.config
   cupsys/trunk/debian/cupsys.postinst
Log:
fix IPv4 validation.

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Fri Dec 23 05:12:56 2005
@@ -2,6 +2,7 @@
 
   [Kenshi Muto]
   * Allow '*' for hostname in ports.conf. (closes: #340975)
+  * Fix IPv4 address validation.
   * Use /bin/echo instead of shell built-in echo. (closes: #343566)
   * Improve cupsys.templates. (closes: #343498)
   * Updated Swedish debconf translation.

Modified: cupsys/trunk/debian/cupsys.config
==============================================================================
--- cupsys/trunk/debian/cupsys.config	(original)
+++ cupsys/trunk/debian/cupsys.config	Fri Dec 23 05:12:56 2005
@@ -17,7 +17,7 @@
       if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
         # PORT
         $ret .= "Port $_\\n";
-      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d:\d+$/) {
+      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
         # IP
         $ret .= "Listen $_\\n";
       } elsif (/^[a-zA-Z0-9-_.]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {

Modified: cupsys/trunk/debian/cupsys.postinst
==============================================================================
--- cupsys/trunk/debian/cupsys.postinst	(original)
+++ cupsys/trunk/debian/cupsys.postinst	Fri Dec 23 05:12:56 2005
@@ -179,7 +179,7 @@
 	      if (/^\d+$/ && $_ >= 0 && $_ < 65536) {
 	        # PORT
 	        $ret .= "Port $_\\n";
-	      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d:\d+$/) {
+	      } elsif (/^\d+\.\d+\.\d+\.\d+$/ || /^\d+\.\d+\.\d+\.\d+:\d+$/) {
 	        # IP
 	        $ret .= "Listen $_\\n";
 	      } elsif (/^[a-zA-Z0-9-_.*]+$/ || /^[a-zA-Z0-9-_.*]+:\d+$/) {