From 82faf28585181edbad005c789e57d6232d855388 Mon Sep 17 00:00:00 2001
From: Bertrand Marc <beberking@gmail.com>
Date: Sat, 7 Jul 2012 16:25:24 +0200
Subject: Use chmod and chown instead of dpkg-statoverride to set special
 permissions and upgrade properly depending on the previous version (Closes:
 #673301).

---
 debian/gnunet-server.postinst | 31 ++++++++++++++++++++++++++-----
 debian/gnunet-server.postrm   | 15 ---------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/debian/gnunet-server.postinst b/debian/gnunet-server.postinst
index 439b3db..76fb9a8 100644
--- a/debian/gnunet-server.postinst
+++ b/debian/gnunet-server.postinst
@@ -52,6 +52,24 @@ case "${1}" in
 			echo " done."
 		fi
 
+		# this can go away after wheezy
+		if dpkg --compare-versions "$2" le "0.9.3-2" && dpkg --compare-versions "$2" ge "0.9.2-1"; then
+			for file in /usr/bin/gnunet-helper-exit \
+				/usr/bin/gnunet-helper-fs-publish \
+				/usr/bin/gnunet-helper-nat-client \
+				/usr/bin/gnunet-helper-nat-server \
+				/usr/bin/gnunet-helper-transport-wlan \
+				/usr/bin/gnunet-helper-vpn \
+				/usr/bin/gnunet-helper-dns \
+				/usr/bin/gnunet-service-dns
+			do
+				if dpkg-statoverride --list $file >/dev/null 2>&1
+				then
+					dpkg-statoverride --remove $file
+				fi
+			done
+		fi
+		
 		# Update files and directories permissions.
 		# Assuming default values, this *should* not be changed.
 		echo -n "Updating files and directories permissions:"
@@ -60,7 +78,7 @@ case "${1}" in
 		# Secure access to the data directory
 		chmod 0700 "${SERVICEHOME}" || true
 		# Restrict access on setuid binaries
-		for i in /usr/bin/gnunet-helper-exit \
+		for file in /usr/bin/gnunet-helper-exit \
 			/usr/bin/gnunet-helper-fs-publish \
 			/usr/bin/gnunet-helper-nat-client \
 			/usr/bin/gnunet-helper-nat-server \
@@ -68,18 +86,21 @@ case "${1}" in
 			/usr/bin/gnunet-helper-vpn
 		do
 			# only do something when no setting exists
-			if ! dpkg-statoverride --list $i >/dev/null 2>&1
+			if ! dpkg-statoverride --list $file >/dev/null 2>&1
 			then
-				dpkg-statoverride --update --add root ${_GROUPNAME} 4754 $i
+				chown root:${_GROUPNAME} $file
+				chmod 4754 $file
 			fi
 		done
 		if ! dpkg-statoverride --list /usr/bin/gnunet-helper-dns >/dev/null 2>&1
 		then
-			dpkg-statoverride --update --add root ${GNUNETDNS_GROUP} 4754 /usr/bin/gnunet-helper-dns
+			chown root:${GNUNETDNS_GROUP} /usr/bin/gnunet-helper-dns
+			chmod 4754 /usr/bin/gnunet-helper-dns
 		fi
 		if ! dpkg-statoverride --list /usr/bin/gnunet-service-dns >/dev/null 2>&1
 		then
-			dpkg-statoverride --update --add ${_USERNAME} ${GNUNETDNS_GROUP} 2754 /usr/bin/gnunet-service-dns
+			chown ${_USERNAME}:${GNUNETDNS_GROUP} /usr/bin/gnunet-service-dns
+			chmod 2754 /usr/bin/gnunet-service-dns
 		fi
 		echo  " done."
 
diff --git a/debian/gnunet-server.postrm b/debian/gnunet-server.postrm
index ffc3a48..d665975 100644
--- a/debian/gnunet-server.postrm
+++ b/debian/gnunet-server.postrm
@@ -21,21 +21,6 @@ case "${1}" in
 
 		GNUNETDNS_GROUP="gnunetdns"
 
-		for i in /usr/bin/gnunet-helper-exit \
-			/usr/bin/gnunet-helper-fs-publish \
-			/usr/bin/gnunet-helper-nat-client \
-			/usr/bin/gnunet-helper-nat-server \
-			/usr/bin/gnunet-helper-transport-wlan \
-			/usr/bin/gnunet-helper-vpn \
-			/usr/bin/gnunet-helper-dns \
-			/usr/bin/gnunet-service-dns
-		do
-			if dpkg-statoverride --list $i >/dev/null 2>&1
-			then
-				dpkg-statoverride --remove $i
-			fi
-		done
-
 		if [ -x /usr/sbin/deluser ]
 		then
 			deluser --quiet --system ${_USERNAME}
-- 
cgit v1.2.3-18-g5258