[Pkg-cups-devel] r73 - cupsys/trunk/debian
Kenshi Muto
kmuto at costa.debian.org
Fri Dec 16 12:22:41 UTC 2005
Author: kmuto
Date: Fri Dec 16 12:22:40 2005
New Revision: 73
Modified:
cupsys/trunk/debian/changelog
cupsys/trunk/debian/cupsys.config
cupsys/trunk/debian/cupsys.postinst
Log:
allow '*' for hostname. use /bin/echo instead of shell built-in.
Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog (original)
+++ cupsys/trunk/debian/changelog Fri Dec 16 12:22:40 2005
@@ -1,4 +1,12 @@
-cupsys (1.1.23-14) UNRELEASED; urgency=high
+cupsys (1.1.23-15) unstable; urgency=high
+
+ [Kenshi Muto]
+ * Allow '*' for hostname in ports.conf. (closes: #340975)
+ * Use /bin/echo instead of shell built-in echo. (closes: #343566)
+
+ -- Kenshi Muto <kmuto at debian.org> Fri, 16 Dec 2005 21:05:47 +0900
+
+cupsys (1.1.23-14) unstable; urgency=high
[Kenshi Muto]
* Downgrade port and browse question to low. (closes: #343341)
Modified: cupsys/trunk/debian/cupsys.config
==============================================================================
--- cupsys/trunk/debian/cupsys.config (original)
+++ cupsys/trunk/debian/cupsys.config Fri Dec 16 12:22:40 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/trunk/debian/cupsys.postinst
==============================================================================
--- cupsys/trunk/debian/cupsys.postinst (original)
+++ cupsys/trunk/debian/cupsys.postinst Fri Dec 16 12:22:40 2005
@@ -182,9 +182,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 = "";
@@ -206,14 +206,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
;;
More information about the Pkg-cups-devel
mailing list