diff -u backuppc-3.2.0/configure.pl backuppc-3.2.0/configure.pl --- backuppc-3.2.0/configure.pl +++ backuppc-3.2.0/configure.pl @@ -796,7 +796,7 @@ # (pre-3.0.0 configure.pl incorrectly set it to a # hardcoded value). # -$Conf{ParPath} = '' if ( $Conf{ParPath} ne '' && !-x $Conf{ParPath} ); +#$Conf{ParPath} = '' if ( $Conf{ParPath} ne '' && !-x $Conf{ParPath} ); # # Figure out sensible arguments for the ping command diff -u backuppc-3.2.0/debian/control backuppc-3.2.0/debian/control --- backuppc-3.2.0/debian/control +++ backuppc-3.2.0/debian/control @@ -1,14 +1,15 @@ Source: backuppc Section: utils Priority: optional -Maintainer: Ludovic Drolez +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ludovic Drolez Build-Depends-Indep: perl (>= 5.6.0), patch -Build-Depends: debhelper (>= 5), par2 +Build-Depends: debhelper (>= 5) Standards-Version: 3.9.1 Package: backuppc Architecture: all -Depends: ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, perl-suid, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | exim4 | mail-transport-agent, iputils-ping, ucf, libtime-modules-perl, libwww-perl +Depends: ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, perl-suid, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping, ucf, libtime-modules-perl, libwww-perl Recommends: rsync, libfile-rsyncp-perl (>= 0.68), openssh-client | ssh-client, rrdtool, libio-dirent-perl Suggests: w3m | www-browser, par2 Conflicts: libfile-rsyncp-perl (<< 0.68) diff -u backuppc-3.2.0/debian/rules backuppc-3.2.0/debian/rules --- backuppc-3.2.0/debian/rules +++ backuppc-3.2.0/debian/rules @@ -85,7 +85,7 @@ dh_installexamples debian/examples/* mv -f debian/backuppc/usr/share/backuppc/doc/* debian/backuppc/usr/share/doc/backuppc/ dh_installmenu - dh_installinit + dh_installinit -- start 20 2 3 4 5 . stop 20 1 . dh_installcron dh_installman backuppc.8 dh_installinfo diff -u backuppc-3.2.0/debian/backuppc.init backuppc-3.2.0/debian/backuppc.init --- backuppc-3.2.0/debian/backuppc.init +++ backuppc-3.2.0/debian/backuppc.init @@ -10,7 +10,7 @@ # Should-Start: $local_fs # Should-Stop: $local_fs # Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Stop: 1 # Short-Description: Launch backuppc server # Description: Launch backuppc server, a high-performance, # enterprise-grade system for backing up PCs. diff -u backuppc-3.2.0/debian/changelog backuppc-3.2.0/debian/changelog --- backuppc-3.2.0/debian/changelog +++ backuppc-3.2.0/debian/changelog @@ -1,3 +1,15 @@ +backuppc (3.2.0-3ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #702812) Remaining changes: + - debian/backup.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - 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. + + -- Angel Abad Fri, 14 Jan 2011 11:02:06 +0100 + backuppc (3.2.0-3) unstable; urgency=low * Shell characters are now properly escaped. Closes: #516626 @@ -6,6 +18,18 @@ -- Ludovic Drolez Mon, 10 Jan 2011 12:29:07 +0100 +backuppc (3.2.0-2ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #698028) Remaining changes: + - debian/backup.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - 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. + + -- Angel Abad Thu, 06 Jan 2011 10:34:00 +0100 + backuppc (3.2.0-2) unstable; urgency=low * re-added the xfs/rfs pool size patch. Closes: #600654 @@ -13,6 +37,18 @@ -- Ludovic Drolez Sun, 02 Jan 2011 19:33:07 +0100 +backuppc (3.2.0-1.1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #690073). Remaining changes: + - debian/backup.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - 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. + + -- Angel Abad Tue, 14 Dec 2010 08:54:57 +0100 + backuppc (3.2.0-1.1) unstable; urgency=low * Non-maintainer upload. @@ -20,6 +56,21 @@ -- Patrick Winnertz Fri, 26 Nov 2010 14:37:21 +0100 +backuppc (3.2.0-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #677799) Remaining changes: + - debian/backup.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - 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. + * Dropped changes: + - Suggest libio-dirent-perl, its in universe (now in main) + - debian/control: Add libtime-modules-perl to Depends (applied in Debian) + + -- Angel Abad Sun, 21 Nov 2010 14:59:53 +0100 + backuppc (3.2.0-1) unstable; urgency=low * New upstream release @@ -33,6 +84,26 @@ -- Ludovic Drolez Mon, 12 Apr 2010 20:30:28 +0200 +backuppc (3.1.0-9ubuntu2) maverick; urgency=low + + * debian/control: Add libtime-modules-perl to Depends (LP: #525395) + Forwarded to Debian as b.d.o/570843 + + -- Angel Abad Sun, 21 Feb 2010 20:56:57 +0100 + +backuppc (3.1.0-9ubuntu1) lucid; urgency=low + + * Resynchronize with debian, remaining changes: + - debian/backup.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - 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. + - Suggest libio-dirent-perl, its in universe. + + -- Chuck Short Fri, 18 Dec 2009 10:44:41 -0500 + backuppc (3.1.0-9) unstable; urgency=low * chown/chmod only the needed dirs. Closes: #531948 @@ -47,6 +118,19 @@ -- Ludovic Drolez Tue, 24 Nov 2009 10:34:10 +0100 +backuppc (3.1.0-8ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - debian/backup.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - 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. + - Suggest libio-dirent-perl, its in universe. + + -- Chuck Short Fri, 06 Nov 2009 00:30:12 +0000 + backuppc (3.1.0-8) unstable; urgency=high * Really fix the alias bug. Closes: #542218 @@ -62,6 +146,42 @@ -- Ludovic Drolez Tue, 01 Sep 2009 14:43:36 +0200 +backuppc (3.1.0-6ubuntu4) karmic; urgency=low + + * SECURITY UPDATE: authorization bypass via ClientNameAlias function + - debian/patches/security-CVE-2009-3369.dpatch: disable ClientNameAlias + usage by normal users in lib/BackupPC/CGI/EditConfig.pm. + - CVE-2009-3369 + + -- Marc Deslauriers Mon, 05 Oct 2009 11:40:41 -0400 + +backuppc (3.1.0-6ubuntu3) karmic; urgency=low + + * Add dpatch system to package. + - debian/control: Add build dependency on dpatch. + - debian/rules: Add dpatch targets. + * Add missing "use Encode" in sendEmail. (LP: #430879) + * Fix encoding of special characters in french translation. (LP: #373327) + + -- Michael Jeanson Wed, 16 Sep 2009 18:04:03 -0400 + +backuppc (3.1.0-6ubuntu2) karmic; urgency=low + + * debian/control: depend on default-mta | mail-transport-agent, instead of + enumerating a long list of alternative MTAs. + + -- Steve Langasek Mon, 03 Aug 2009 17:28:07 +0000 + +backuppc (3.1.0-6ubuntu1) karmic; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - debian/backuppc.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660) + - debian/control: Drop build dependency to 'par2', it's in universe. + - configure.pl: Do not test for par2 being available at build time. + + -- Martin Pitt Tue, 28 Apr 2009 13:26:14 +0200 + backuppc (3.1.0-6) unstable; urgency=high * Fix the permissions of the CGI script. Closes: #518518 diff -u backuppc-3.2.0/debian/postinst backuppc-3.2.0/debian/postinst --- backuppc-3.2.0/debian/postinst +++ backuppc-3.2.0/debian/postinst @@ -139,6 +139,11 @@ abort-upgrade|abort-remove|abort-deconfigure) + # Remove shutdown and reboot links; this init script does not need them. + if dpkg --compare-versions "$2" lt "2.1.2-5ubuntu3"; then + rm -f /etc/rc0.d/K20backuppc /etc/rc6.d/K20backuppc + fi + ;; *)