Merge lp:~allison/ubuntu/oneiric/backuppc/merge-debian-suidperl into lp:ubuntu/oneiric/backuppc

[Allison Randal]

Merged Debian's implementation of the setuid wrapper replacement for perl-suid.

They chose to install the compiled wrapper in /usr/lib/backuppc/cgi-bin (not worth a distro diff). Also, dropped define check around REAL_PATH in the tiny wrapper (I was being pedantically correct, not worth a distro diff).

Kept the install mode of the install wrapper at 4750 instead of 755.

[Dave Walker (davewalker)]

Looks great! Nice and clean.

Thanks!

builds fine, uploading and merging.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-29 17:49:10 +0000
+++ debian/changelog	2011-06-15 23:51:03 +0000
@@ -1,3 +1,28 @@
+backuppc (3.2.0-4ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - debian/backup.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Debian #488660)
+    - debian/control: Add dependency for libsocket6-perl.
+    - debian/control: Drop build dependency to 'par2', it's in universe.
+    - configure.pl: Do not test for par2 being available at build time
+    - debian/control: depend on default-mta | mail-transport-agent, instead of
+      enumerating a long list of alternative MTAs.
+    - debian/rules: installing setuid wrapper with setuid bit set, and no
+      permissions granted to other (mode 4750)
+
+ -- Allison Randal <[e-mail]>  Wed, 15 Jun 2011 16:28:41 -0700
+
+backuppc (3.2.0-4) unstable; urgency=low
+
+  * debian/setuidwrapper.c: New.
+  * debian/rules: Build setuidwrapper as cgi-bin/index.cgi; install real
+    index.cgi as lib/realindex.cgi.  Closes: #581950.
+  * control: Remove depends on perl-suid.  Change to Architecture any, add
+    ${shlibs:Depends}.
+
+ -- Ludovic Drolez <[e-mail]>  Sat, 07 May 2011 10:11:56 -0500
+
 backuppc (3.2.0-3ubuntu5) oneiric; urgency=low
 
   * Replace dependency on perl-suid with a small setuid wrapper, since the
 
=== modified file 'debian/dirs'
--- debian/dirs	2009-11-06 00:30:12 +0000
+++ debian/dirs	2011-06-15 23:51:03 +0000
@@ -2,3 +2,4 @@
 etc/backuppc
 usr/share/backuppc/image
 usr/share/backuppc/conf
+usr/lib/backuppc/cgi-bin
 
=== modified file 'debian/postinst'
--- debian/postinst	2011-01-14 11:02:06 +0000
+++ debian/postinst	2011-06-15 23:51:03 +0000
@@ -97,10 +97,10 @@
 	chmod 750 /var/lib/backuppc /var/lib/backuppc/* /var/lib/backuppc/pc/*
     fi
 
-    OVERRIDDEN=`dpkg-statoverride --list /usr/share/backuppc/cgi-bin/index.cgi || true`
+    OVERRIDDEN=`dpkg-statoverride --list /usr/lib/backuppc/cgi-bin/index.cgi || true`
     # Force the perms to 4750 if 4755 was found
     echo "$OVERRIDDEN" | grep -q 4755 && OVERRIDDEN=""
-    [ "${OVERRIDDEN}" = "" ] && dpkg-statoverride --force --update --add backuppc www-data 4750 /usr/share/backuppc/cgi-bin/index.cgi
+    [ "${OVERRIDDEN}" = "" ] && dpkg-statoverride --force --update --add backuppc www-data 4750 /usr/lib/backuppc/cgi-bin/index.cgi
 
     if [ ! -f /etc/backuppc/htpasswd ]; then
 	touch /etc/backuppc/htpasswd
 
=== modified file 'debian/postrm'
--- debian/postrm	2009-11-06 00:30:12 +0000
+++ debian/postrm	2011-06-15 23:51:03 +0000
@@ -56,6 +56,7 @@
 
 
 	dpkg-statoverride --remove --force /usr/share/backuppc/cgi-bin/index.cgi
+	dpkg-statoverride --remove --force /usr/lib/backuppc/cgi-bin/index.cgi
 	rm -rf /etc/backuppc
 	if [ -x "/usr/bin/ucf" ]; then
 		ucf --purge /etc/backuppc/config.pl
 
=== modified file 'debian/rules'
--- debian/rules	2011-05-29 17:49:10 +0000
+++ debian/rules	2011-06-15 23:51:03 +0000
@@ -64,13 +64,13 @@
 	    
 	pod2man --section=8 --center="BackupPC manual" doc/BackupPC.pod backuppc.8
 	perl -e "s/.IX Title.*/.SH NAME\nbackuppc \\- BackupPC manual/g" -p -i.tmp backuppc.8
-	mv -f debian/backuppc/usr/share/backuppc/cgi-bin/BackupPC_Admin debian/backuppc/usr/share/backuppc/cgi-bin/BackupPC_Admin.pl
-	install --mode=4750 index.cgi debian/backuppc/usr/share/backuppc/cgi-bin
+	mv -f debian/backuppc/usr/share/backuppc/cgi-bin/* debian/backuppc/usr/share/backuppc/lib/realindex.cgi
+	install --mode=4750 index.cgi debian/backuppc/usr/lib/backuppc/cgi-bin
 	install --mode=644 conf/hosts debian/backuppc/etc/backuppc
 	install --mode=644 debian/localhost.pl debian/backuppc/etc/backuppc
 	install --mode=644 debian/apache.conf debian/backuppc/etc/backuppc
 	-rmdir debian/backuppc/var/lib/backuppc/conf/
-	(cd debian/backuppc/usr/share/backuppc/cgi-bin; ln -s ../image)
+	(cd debian/backuppc/usr/share/backuppc/cgi-bin; ln -s ../image; ln -s /usr/lib/backuppc/cgi-bin/index.cgi )
 	patch --no-backup-if-mismatch -p0 < debian/patches/config.pl.diff
 	install --mode=644 debian/backuppc/etc/backuppc/config.pl debian/backuppc/usr/share/backuppc/conf
 
 
=== modified file 'debian/setuidwrapper.c'
--- debian/setuidwrapper.c	2011-05-29 17:49:10 +0000
+++ debian/setuidwrapper.c	2011-06-15 23:51:03 +0000
@@ -1,8 +1,6 @@
 #include <unistd.h>
 
-#ifndef REAL_PATH
-#define REAL_PATH "/usr/share/backuppc/cgi-bin/BackupPC_Admin.pl"
-#endif
+#define REAL_PATH "/usr/share/backuppc/lib/realindex.cgi"
 
 int main(ac, av)
 char **av;
@@ -10,4 +8,3 @@
     execv(REAL_PATH, av);
     return 0;
 }
-
 
=== added file 'httpd/BackupPC.conf'
--- httpd/BackupPC.conf	1970-01-01 00:00:00 +0000
+++ httpd/BackupPC.conf	2011-06-15 23:51:03 +0000
@@ -0,0 +1,33 @@
+#
+# DESCRIPTION
+#
+#   This file controls access and configuration for the BackupPC CGI
+#   interface.
+#
+# Distributed with BackupPC version 3.1.1, released 22 Dec 2008.
+
+<Directory      /usr/share/backuppc/cgi-bin >
+
+#
+# This section tells apache which machines can access the interface.
+# You can change the allow line to allow access from your local
+# network, or comment out this region to allow access from all
+# machines.
+#
+order deny,allow
+deny from all
+allow from 127.0.0.1
+
+#
+# You can change the authorization method to LDAP or another method
+# besides htaccess here if you are so inclined.
+#
+AuthType Basic
+AuthUserFile /etc/backuppc/BackupPC.users
+AuthName "BackupPC Community Edition Administrative Interface"
+require valid-user
+
+</Directory>
+
+Alias           /backuppc/image         /usr/share/backuppc/image
+ScriptAlias     /BackupPC_Admin         /usr/share/backuppc/cgi-bin/BackupPC_Admin