tags 668755 + patch
tags 668755 + pending
tags 688205 + patch
tags 688205 + pending
tags 688565 + patch
tags 688565 + pending
thanks

Dear maintainer,

I've prepared an NMU for xsp (versioned as 2.10-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Nick Cave & The Bad Seeds: Babe, You Turn Me On
diff -Nru xsp-2.10/debian/changelog xsp-2.10/debian/changelog
--- xsp-2.10/debian/changelog	2012-04-01 15:33:40.000000000 +0200
+++ xsp-2.10/debian/changelog	2012-10-05 15:50:31.000000000 +0200
@@ -1,3 +1,23 @@
+xsp (2.10-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "modifies conffiles (policy 10.7.3): /etc/default/mono-xsp2" and
+    "mono-apache-server2, mono-apache-server4: modifies conffiles (policy
+    10.7.3): /etc/default/mono-apache-server[24]" and another not yet reported
+    case of the same problem in mono-xsp4:
+    for all of mono-xsp[24] and mono-apache-server[24]:
+    - don't ship the .default file
+    - create it in .postinst if necessary
+    - source it in .config to feed existing values into debconf
+    - remove it in .postrm/purge
+    (Closes: #688205, Closes: #688565)
+  * Fix "mono-apache-server{2, 4}: unowned files after purge (policy
+    6.8, 10.8): /etc/mono-server?/mono-server?-hosts.conf":
+    - remove files in .postrm/purge
+    (Closes: #668755)
+
+ -- gregor herrmann <gre...@debian.org>  Fri, 05 Oct 2012 15:50:27 +0200
+
 xsp (2.10-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru xsp-2.10/debian/mono-apache-server2.config xsp-2.10/debian/mono-apache-server2.config
--- xsp-2.10/debian/mono-apache-server2.config	2012-01-19 00:29:24.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server2.config	2012-10-05 15:11:53.000000000 +0200
@@ -30,6 +30,13 @@
 	db_go || true
 fi
 
+# get existing values
+modmono_default="/etc/default/mono-apache-server2"
+if [ -e $modmono_default ]; then
+	. $modmono_default || true
+	db_set monoserver2/monoserver2_restartapache "start_apache"
+fi
+
 STATE=1
 while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
     case "$STATE" in
diff -Nru xsp-2.10/debian/mono-apache-server2.default xsp-2.10/debian/mono-apache-server2.default
--- xsp-2.10/debian/mono-apache-server2.default	2011-03-21 00:37:51.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server2.default	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# Defaults for mono-apache-server2
-
-# Should mono-apache-server2 start apache?
-start_apache=false
diff -Nru xsp-2.10/debian/mono-apache-server2.postinst xsp-2.10/debian/mono-apache-server2.postinst
--- xsp-2.10/debian/mono-apache-server2.postinst	2011-03-21 00:37:51.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server2.postinst	2012-10-05 15:16:32.000000000 +0200
@@ -6,6 +6,16 @@
 
 modmono_default="/etc/default/mono-apache-server2"
 
+# create file if it doesn't exist
+if [ ! -e $modmono_default ]; then
+	cat > $modmono_default <<-END
+	# Defaults for mono-apache-server2
+
+	# Should mono-apache-server2 start apache?
+	start_apache=false
+	END
+fi
+
 restart_apache_on() {
     sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
     cp $tempfile $modmono_default
diff -Nru xsp-2.10/debian/mono-apache-server2.postrm xsp-2.10/debian/mono-apache-server2.postrm
--- xsp-2.10/debian/mono-apache-server2.postrm	1970-01-01 01:00:00.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server2.postrm	2012-10-05 15:28:12.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ]; then
+	rm -f /etc/mono-server2/debian.webapp
+	rm -f /etc/mono-server2/mono-server2-hosts.conf
+	# remove default file created in postinst
+	rm -f /etc/default/mono-apache-server2
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru xsp-2.10/debian/mono-apache-server4.config xsp-2.10/debian/mono-apache-server4.config
--- xsp-2.10/debian/mono-apache-server4.config	2012-01-19 00:29:24.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server4.config	2012-10-05 15:11:54.000000000 +0200
@@ -30,6 +30,13 @@
 	db_go || true
 fi
 
+# get existing values
+modmono_default="/etc/default/mono-apache-server4"
+if [ -e $modmono_default ]; then
+	. $modmono_default || true
+	db_set monoserver4/monoserver4_restartapache "start_apache"
+fi
+
 STATE=1
 while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
     case "$STATE" in
diff -Nru xsp-2.10/debian/mono-apache-server4.default xsp-2.10/debian/mono-apache-server4.default
--- xsp-2.10/debian/mono-apache-server4.default	2012-01-19 00:29:24.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server4.default	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# Defaults for mono-apache-server4
-
-# Should mono-apache-server4 start apache?
-start_apache=false
diff -Nru xsp-2.10/debian/mono-apache-server4.postinst xsp-2.10/debian/mono-apache-server4.postinst
--- xsp-2.10/debian/mono-apache-server4.postinst	2012-01-19 00:29:24.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server4.postinst	2012-10-05 15:15:49.000000000 +0200
@@ -6,6 +6,16 @@
 
 modmono_default="/etc/default/mono-apache-server4"
 
+# create file if it doesn't exist
+if [ ! -e $modmono_default ]; then
+	cat > $modmono_default <<-END
+	# Defaults for mono-apache-server4
+
+	# Should mono-apache-server4 start apache?
+	start_apache=false
+	END
+fi
+
 restart_apache_on() {
     sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
     cp $tempfile $modmono_default
diff -Nru xsp-2.10/debian/mono-apache-server4.postrm xsp-2.10/debian/mono-apache-server4.postrm
--- xsp-2.10/debian/mono-apache-server4.postrm	1970-01-01 01:00:00.000000000 +0100
+++ xsp-2.10/debian/mono-apache-server4.postrm	2012-10-05 15:28:11.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ]; then
+	rm -f /etc/mono-server4/debian.webapp
+	rm -f /etc/mono-server4/mono-server4-hosts.conf
+	# remove default file created in postinst
+	rm -f /etc/default/mono-apache-server4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru xsp-2.10/debian/mono-xsp2.config xsp-2.10/debian/mono-xsp2.config
--- xsp-2.10/debian/mono-xsp2.config	2012-01-19 00:29:24.000000000 +0100
+++ xsp-2.10/debian/mono-xsp2.config	2012-10-05 15:11:55.000000000 +0200
@@ -31,6 +31,15 @@
 	db_go || true
 fi
 
+# get existing values
+xsp2_default="/etc/default/mono-xsp2"
+if [ -e $xsp2_default ]; then
+	. $xsp2_default || true
+	db_set xsp2/xsp2_autostart "$start_boot"
+	db_set xsp2/xsp2_bind      "$address"
+	db_get xsp2/xsp2_port      "$port"
+fi
+
 # Autostart
 STATE=1
 while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
diff -Nru xsp-2.10/debian/mono-xsp2.default xsp-2.10/debian/mono-xsp2.default
--- xsp-2.10/debian/mono-xsp2.default	2011-03-21 00:37:51.000000000 +0100
+++ xsp-2.10/debian/mono-xsp2.default	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-# Defaults for mono-xsp2, official version
-# sourced by /etc/init.d/mono-xsp2
-
-# Should we start it?
-start_boot=true
-
-# User and group by default
-user=www-data
-group=www-data
-
-# Default port
-port=8081
-address=0.0.0.0
-
-# Directory for config files
-config_files=/etc/xsp2
diff -Nru xsp-2.10/debian/mono-xsp2.postinst xsp-2.10/debian/mono-xsp2.postinst
--- xsp-2.10/debian/mono-xsp2.postinst	2012-01-19 00:29:25.000000000 +0100
+++ xsp-2.10/debian/mono-xsp2.postinst	2012-10-05 15:18:38.000000000 +0200
@@ -10,6 +10,28 @@
 CFGDIR=/etc/xsp2
 VIRTUALFILE=$CFGDIR/debian.webapp
 
+# create file if it doesn't exist
+if [ ! -e $xsp2_default ]; then
+	cat > $xsp2_default <<-END
+	# Defaults for mono-xsp2, official version
+	# sourced by /etc/init.d/mono-xsp2
+	
+	# Should we start it?
+	start_boot=true
+	
+	# User and group by default
+	user=www-data
+	group=www-data
+	
+	# Default port
+	port=8081
+	address=0.0.0.0
+	
+	# Directory for config files
+	config_files=/etc/xsp2
+	END
+fi
+
 update_port() {
     db_get xsp2/xsp2_port || true
     R=$RET
diff -Nru xsp-2.10/debian/mono-xsp2.postrm xsp-2.10/debian/mono-xsp2.postrm
--- xsp-2.10/debian/mono-xsp2.postrm	2011-03-21 00:37:51.000000000 +0100
+++ xsp-2.10/debian/mono-xsp2.postrm	2012-10-05 15:13:11.000000000 +0200
@@ -5,6 +5,8 @@
 	rm -f /etc/xsp2/debian.webapp
 	# purge init.d script
 	update-rc.d -f mono-xsp2 remove > /dev/null 2>&1
+	# remove default file created in postinst
+	rm -f /etc/default/mono-xsp2
 fi
 
 #DEBHELPER#
diff -Nru xsp-2.10/debian/mono-xsp4.config xsp-2.10/debian/mono-xsp4.config
--- xsp-2.10/debian/mono-xsp4.config	2012-01-19 00:29:25.000000000 +0100
+++ xsp-2.10/debian/mono-xsp4.config	2012-10-05 15:11:52.000000000 +0200
@@ -31,6 +31,15 @@
 	db_go || true
 fi
 
+# get existing values
+xsp4_default="/etc/default/mono-xsp4"
+if [ -e $xsp4_default ]; then
+	. $xsp4_default || true
+	db_set xsp4/xsp4_autostart "$start_boot"
+	db_set xsp4/xsp4_bind      "$address"
+	db_get xsp4/xsp4_port      "$port"
+fi
+
 # Autostart
 STATE=1
 while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
diff -Nru xsp-2.10/debian/mono-xsp4.default xsp-2.10/debian/mono-xsp4.default
--- xsp-2.10/debian/mono-xsp4.default	2012-01-19 00:29:25.000000000 +0100
+++ xsp-2.10/debian/mono-xsp4.default	1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-# Defaults for mono-xsp4, official version
-# sourced by /etc/init.d/mono-xsp4
-
-# Should we start it?
-start_boot=true
-
-# User and group by default
-user=www-data
-group=www-data
-
-# Default port
-port=8084
-address=0.0.0.0
-
-# Directory for config files
-config_files=/etc/xsp4
diff -Nru xsp-2.10/debian/mono-xsp4.postinst xsp-2.10/debian/mono-xsp4.postinst
--- xsp-2.10/debian/mono-xsp4.postinst	2012-01-19 00:29:25.000000000 +0100
+++ xsp-2.10/debian/mono-xsp4.postinst	2012-10-05 15:18:39.000000000 +0200
@@ -10,6 +10,28 @@
 CFGDIR=/etc/xsp4
 VIRTUALFILE=$CFGDIR/debian.webapp
 
+# create file if it doesn't exist
+if [ ! -e $xsp4_default ]; then
+	cat > $xsp4_default <<-END
+	# Defaults for mono-xsp4, official version
+	# sourced by /etc/init.d/mono-xsp4
+	
+	# Should we start it?
+	start_boot=true
+	
+	# User and group by default
+	user=www-data
+	group=www-data
+	
+	# Default port
+	port=8084
+	address=0.0.0.0
+	
+	# Directory for config files
+	config_files=/etc/xsp4
+	END
+fi
+
 update_port() {
     db_get xsp4/xsp4_port || true
     R=$RET
diff -Nru xsp-2.10/debian/mono-xsp4.postrm xsp-2.10/debian/mono-xsp4.postrm
--- xsp-2.10/debian/mono-xsp4.postrm	2012-01-19 00:29:25.000000000 +0100
+++ xsp-2.10/debian/mono-xsp4.postrm	2012-10-05 15:13:09.000000000 +0200
@@ -5,6 +5,8 @@
 	rm -f /etc/xsp4/debian.webapp
 	# purge init.d script
 	update-rc.d -f mono-xsp4 remove > /dev/null 2>&1
+	# remove default file created in postinst
+	rm -f /etc/default/mono-xsp4
 fi
 
 #DEBHELPER#

Attachment: signature.asc
Description: Digital signature

Reply via email to