[Pkg-silc-commits] r158 - in /silc-server/trunk/debian: config control postinst

[lunar at users.alioth.debian.org]

Author: lunar
Date: Tue Sep  4 10:12:25 2007
New Revision: 158

URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=158
Log:
Take care of quote escaping in configuration strings.

Quotes can be escaped (using the standard backslash) in configuration strings
since libsilc-1.1-2 (>= 1.1.2-3).  config and postinst scripts have been
modified accordingly.

Modified:
    silc-server/trunk/debian/config
    silc-server/trunk/debian/control
    silc-server/trunk/debian/postinst

Modified: silc-server/trunk/debian/config
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/config?rev=158&op=diff
==============================================================================
--- silc-server/trunk/debian/config (original)
+++ silc-server/trunk/debian/config Tue Sep  4 10:12:25 2007
@@ -10,7 +10,8 @@
 read_config() {
     FILE="$1"
     PARAMETER="$2"
-    sed -n -e "s/^[^#]*$PARAMETER  *=  *\"\([^\"]*\)\".*$/\1/p" "$CONFIGFILE"
+    sed -n -e "s/^[^#]*$PARAMETER  *=  *\"\(\(\\\.\|[^\"]\)*\)\".*$/\1/p" \
+    	"$CONFIGFILE" | sed -e 's/\\//g'
 }
 
 if [ -e "$CONFIGFILE" ]; then

Modified: silc-server/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/control?rev=158&op=diff
==============================================================================
--- silc-server/trunk/debian/control (original)
+++ silc-server/trunk/debian/control Tue Sep  4 10:12:25 2007
@@ -10,7 +10,7 @@
 
 Package: silcd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ucf
+Depends: libsilc-1.1-2 (>= 1.1.2-3), ${shlibs:Depends}, ${misc:Depends}, ucf
 Provides: silc-server
 Description: server for the Secure Live Internet Conferencing (SILC) protocol
  silc-server is a server for the SILC protocol.

Modified: silc-server/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-silc/silc-server/trunk/debian/postinst?rev=158&op=diff
==============================================================================
--- silc-server/trunk/debian/postinst (original)
+++ silc-server/trunk/debian/postinst Tue Sep  4 10:12:25 2007
@@ -15,7 +15,8 @@
 
 read_config() {
     PARAMETER="$1"
-    sed -n -e "s/^[^#]*$PARAMETER  *=  *\"\([^\"]*\)\".*$/\1/p" "$CONFIGFILE"
+    sed -n -e "s/^[^#]*$PARAMETER  *=  *\"\(\(\\\.\|[^\"]\)*\)\".*$/\1/p" \
+    	"$CONFIGFILE" | sed -e 's/\\//g'
 }
 
 if [ -e "$CONFIGFILE" ]; then
@@ -86,7 +87,7 @@
     shift
     VALUE="$*"
  
-    VALUE="$(echo "$VALUE" | sed 's,/,\\/,g')"
+    VALUE="$(echo "$VALUE" | sed -e 's,/,\\/,g;s,",\\\\",g')"
     sed -i -e "s/\([^#]*$KEY  *=  *\"\)[^\"]*\(\"\)/\1$VALUE\2/" "$FILE"
 }