diff -u backuppc-3.3.1/bin/BackupPC_dump backuppc-3.3.1/bin/BackupPC_dump --- backuppc-3.3.1/bin/BackupPC_dump +++ backuppc-3.3.1/bin/BackupPC_dump @@ -92,6 +92,7 @@ use BackupPC::Xfer; use Encode; use Socket; +use Socket6; use File::Path; use File::Find; use Getopt::Std; @@ -493,7 +494,7 @@ } else { $host = $client; } - if ( !defined(gethostbyname($host)) ) { + if ( defined(getaddrinfo($host, "22")) ) { # # Ok, NS doesn't know about it. Maybe it is a NetBios name # instead. diff -u backuppc-3.3.1/configure.pl backuppc-3.3.1/configure.pl --- backuppc-3.3.1/configure.pl +++ backuppc-3.3.1/configure.pl @@ -255,6 +255,7 @@ nmblookup => "NmbLookupPath", rsync => "RsyncClientPath", ping => "PingPath", + ping6 => "Ping6Path", df => "DfPath", 'ssh/ssh2' => "SshPath", sendmail => "SendmailPath", @@ -800,7 +801,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.3.1/debian/backuppc.init backuppc-3.3.1/debian/backuppc.init --- backuppc-3.3.1/debian/backuppc.init +++ backuppc-3.3.1/debian/backuppc.init @@ -10,7 +10,7 @@ # Should-Start: $local_fs autofs # Should-Stop: $local_fs autofs # 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.3.1/debian/changelog backuppc-3.3.1/debian/changelog --- backuppc-3.3.1/debian/changelog +++ backuppc-3.3.1/debian/changelog @@ -1,3 +1,18 @@ +backuppc (3.3.1-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/backuppc.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Closes: #488660). + - debian/control: + + Depend on default-mta | mail-transport-agent, instead of enumerating a + long list of alternative MTAs. + + Drop build dependency to 'par2', it's in universe. + + Add build dependency on libsocket6-perl. + - configure.pl: Do not test for par2 being available at build time. + * Depend on libsocket6-perl as well as build-depend. LP: #1515986 + + -- Jackson Doak Sat, 14 Nov 2015 09:38:40 +1100 + backuppc (3.3.1-1) unstable; urgency=low * New upstream release @@ -6,6 +21,20 @@ -- Ludovic Drolez Mon, 10 Aug 2015 18:10:59 +0200 +backuppc (3.3.0-2ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/backuppc.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Closes: #488660). + - debian/control: + + Depend on default-mta | mail-transport-agent, instead of enumerating a + long list of alternative MTAs. + + Drop build dependency to 'par2', it's in universe. + + Add build dependency on libsocket6-perl + - configure.pl: Do not test for par2 being available at build time. + + -- Jackson Doak Fri, 22 Aug 2014 06:59:23 +1000 + backuppc (3.3.0-2) unstable; urgency=low * Depends on apache2-utils @@ -15,6 +44,18 @@ -- Ludovic Drolez Thu, 06 Feb 2014 12:41:22 +0100 +backuppc (3.3.0-1ubuntu1) trusty-proposed; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1201029) + - debian/backuppc.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Closes: #488660). + - debian/control: + + Remove estraneous libtime-modules-perl (Closes: #734356). + + Depend on default-mta | mail-transport-agent, instead of enumerating a + long list of alternative MTAs. + + -- Louis Bouchard Wed, 15 Jan 2014 09:33:13 -0600 + backuppc (3.3.0-1) unstable; urgency=low * New upstream release. Closes: #716824 @@ -53,6 +94,30 @@ -- Ludovic Drolez Thu, 03 Jan 2013 17:27:35 +0100 +backuppc (3.2.1-4ubuntu2) trusty; urgency=medium + + * Specify pod2man encoding. + + -- Dimitri John Ledkov Fri, 20 Dec 2013 02:17:32 +0000 + +backuppc (3.2.1-4ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/backuppc.init, debian/rules, debian/postinst: Do not call init + script on shutdown and reboot (TearDown) (Debian #488660). + - debian/control: + + Add dependency for libsocket6-perl. + + Drop build dependency to 'par2', it's in universe. + + Depend on default-mta | mail-transport-agent, instead of enumerating a + long list of alternative MTAs. + - 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). + + -- Logan Rosen Sun, 06 Jan 2013 03:04:32 -0500 + backuppc (3.2.1-4) unstable; urgency=low * init.d status support. Closes: #651539 @@ -60,6 +125,21 @@ -- Ludovic Drolez Thu, 20 Dec 2012 17:59:28 +0100 +backuppc (3.2.1-3ubuntu1) raring; 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) + + -- Logan Rosen Wed, 14 Nov 2012 13:30:30 -0500 + backuppc (3.2.1-3) unstable; urgency=high * urgency set to high because of a security fix @@ -70,12 +150,59 @@ -- Ludovic Drolez Thu, 31 May 2012 11:51:16 +0200 +backuppc (3.2.1-2ubuntu2) quantal; urgency=low + + * SECURITY UPDATE: XSS in CGI/RestoreFile.pm + - lib/BackupPC/CGI/RestoreFile.pm: update to escape share and backup + number + - CVE-2011-5081 + + -- Jamie Strandboge Thu, 17 May 2012 15:46:43 -0500 + +backuppc (3.2.1-2ubuntu1) precise; 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: 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) + + -- Chuck Short Sun, 06 Nov 2011 05:47:04 +0000 + backuppc (3.2.1-2) unstable; urgency=high * Really fix CVE-2011-3361. Closes: #646865 -- Ludovic Drolez Thu, 02 Nov 2011 11:03:38 +0100 +backuppc (3.2.1-1ubuntu2) precise; urgency=low + + * SECURITY UPDATE: XSS in CGI/View.pm + - lib/BackupPC/CGI/View.pm: update to verify backup number is numeric + - CVE-2011-XXXX + + -- Jamie Strandboge Thu, 27 Oct 2011 14:47:58 -0500 + +backuppc (3.2.1-1ubuntu1) oneiric; urgency=high + + * Merge from debian unstable. (LP: #852484) 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 Sun, 18 Sep 2011 17:37:55 -0700 + backuppc (3.2.1-1) unstable; urgency=high * New upstream release. Closes: #641450 @@ -90,6 +217,21 @@ -- Bernd Zeimetz Tue, 28 Jun 2011 22:31:10 +0200 +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 Wed, 15 Jun 2011 16:28:41 -0700 + backuppc (3.2.0-4) unstable; urgency=low * debian/setuidwrapper.c: New. @@ -100,6 +242,45 @@ -- Ludovic Drolez 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 + perl-suid package been removed in Perl 5.12. (LP: #786250) + + -- Allison Randal Sun, 29 May 2011 17:49:10 -0700 + +backuppc (3.2.0-3ubuntu4) natty; urgency=low + + * debian/control: Add dependency for libsocket6-perl. + (LP: #742748) + + -- Chuck Short Mon, 04 Apr 2011 07:32:43 -0400 + +backuppc (3.2.0-3ubuntu3) natty; urgency=low + + * Fix FTBFS. + + -- Chuck Short Mon, 07 Mar 2011 12:31:14 -0500 + +backuppc (3.2.0-3ubuntu2) natty; urgency=low + + * Applied ipv6-support.dpatch, debian/control: + Add support for ipv6. (LP: #54918) + + -- Chuck Short Mon, 07 Mar 2011 11:35:50 -0500 + +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 @@ -108,6 +289,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 @@ -115,6 +308,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. @@ -122,6 +327,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 @@ -135,6 +355,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 @@ -149,6 +389,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 @@ -164,6 +417,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 reverted: --- backuppc-3.3.1/debian/config.pl.diff +++ backuppc-3.3.1.orig/debian/config.pl.diff @@ -1,61 +0,0 @@ ---- config.pl 2005-03-03 23:39:20.000000000 +0100 -+++ debian/backuppc/etc/backuppc/config.pl 2005-03-03 18:55:02.000000000 +0100 -@@ -41,7 +41,10 @@ - # - # Host name on which the BackupPC server is running. - # --$Conf{ServerHost} = 'XXXXXX'; -+$ENV{'PATH'} = '/bin:/usr/bin'; -+delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; -+$Conf{ServerHost} = `hostname`; -+chomp($Conf{ServerHost}); - - # - # TCP port number on which the BackupPC server listens for and accepts -@@ -218,7 +218,7 @@ - # Full path to various commands for archiving - # - $Conf{SplitPath} = '/usr/bin/split'; --$Conf{ParPath} = '/usr/bin/par2'; -+$Conf{ParPath} = '/usr/bin/par2' if -x '/usr/bin/par2'; - $Conf{CatPath} = '/bin/cat'; - $Conf{GzipPath} = '/bin/gzip'; - $Conf{Bzip2Path} = '/bin/bzip2'; -@@ -1462,7 +1462,7 @@ - # Full path for ssh. Security caution: normal users should not - # allowed to write to this file or directory. - # --$Conf{SshPath} = '/usr/bin/ssh'; -+$Conf{SshPath} = '/usr/bin/ssh' if -x '/usr/bin/ssh'; - - # - # Full path for nmblookup. Security caution: normal users should not -@@ -1919,8 +1919,8 @@ - # $Conf{CgiAdminUsers} = 'craig celia'; - # --> administrative users are only craig and celia'. - # --$Conf{CgiAdminUserGroup} = ''; --$Conf{CgiAdminUsers} = ''; -+$Conf{CgiAdminUserGroup} = 'backuppc'; -+$Conf{CgiAdminUsers} = 'backuppc'; - - # - # URL of the BackupPC_Admin CGI script. Used for email messages. -@@ -1925,7 +1925,7 @@ - # - # URL of the BackupPC_Admin CGI script. Used for email messages. - # --$Conf{CgiURL} = 'http://XXXXXX/backuppc/index.cgi'; -+$Conf{CgiURL} = 'http://'.$Conf{ServerHost}.'/backuppc/index.cgi'; - - # - # Language to use. See lib/BackupPC/Lang for the list of supported -@@ -2063,7 +2066,7 @@ - # dates (MM/DD), a value of 2 uses full YYYY-MM-DD format, and zero - # for international dates (DD/MM). - # --$Conf{CgiDateFormatMMDD} = 1; -+$Conf{CgiDateFormatMMDD} = 2; - - # - # If set, the complete list of hosts appears in the left navigation diff -u backuppc-3.3.1/debian/control backuppc-3.3.1/debian/control --- backuppc-3.3.1/debian/control +++ backuppc-3.3.1/debian/control @@ -1,13 +1,14 @@ Source: backuppc Section: utils Priority: optional -Maintainer: Ludovic Drolez -Build-Depends: debhelper (>= 5), par2, perl (>= 5.6.0), patch +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ludovic Drolez +Build-Depends: debhelper (>= 5), par2, perl (>= 5.6.0), patch, libsocket6-perl Standards-Version: 3.9.6 Package: backuppc Architecture: any -Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libio-compress-perl | libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>= 1.15.7.2), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | exim4 | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-parsedate-perl, libwww-perl, apache2-utils +Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>= 1.15.7.2), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-parsedate-perl, libwww-perl, apache2-utils, libsocket6-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.3.1/debian/postinst backuppc-3.3.1/debian/postinst --- backuppc-3.3.1/debian/postinst +++ backuppc-3.3.1/debian/postinst @@ -156,6 +156,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 + ;; *) diff -u backuppc-3.3.1/debian/rules backuppc-3.3.1/debian/rules --- backuppc-3.3.1/debian/rules +++ backuppc-3.3.1/debian/rules @@ -69,13 +69,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/* debian/backuppc/usr/share/backuppc/lib/realindex.cgi - install --mode=755 index.cgi debian/backuppc/usr/lib/backuppc/cgi-bin + 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; ln -s /usr/lib/backuppc/cgi-bin/index.cgi ) - patch --no-backup-if-mismatch -p0 < debian/config.pl.diff + 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 rm -rf debian/backuppc/etc/backuppc/config.pl @@ -92,7 +92,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.3.1/debian/setuidwrapper.c backuppc-3.3.1/debian/setuidwrapper.c --- backuppc-3.3.1/debian/setuidwrapper.c +++ backuppc-3.3.1/debian/setuidwrapper.c @@ -11 +10,0 @@ - diff -u backuppc-3.3.1/doc/BackupPC.pod backuppc-3.3.1/doc/BackupPC.pod --- backuppc-3.3.1/doc/BackupPC.pod +++ backuppc-3.3.1/doc/BackupPC.pod @@ -1,5 +1,4 @@ -=encoding UTF-8 - +=encoding utf8 =head1 BackupPC Introduction This documentation describes BackupPC version 3.3.1, diff -u backuppc-3.3.1/lib/BackupPC/Lib.pm backuppc-3.3.1/lib/BackupPC/Lib.pm --- backuppc-3.3.1/lib/BackupPC/Lib.pm +++ backuppc-3.3.1/lib/BackupPC/Lib.pm @@ -46,6 +46,7 @@ use File::Path; use File::Compare; use Socket; +use Socket6; use Cwd; use Digest::MD5; use Config; @@ -972,6 +973,7 @@ { my($bpc, $host) = @_; my($s, $pingCmd, $ret); + my($family, @res, $args); # # Return success if the ping cmd is undefined or empty. @@ -982,10 +984,20 @@ return 0; } - my $args = { - pingPath => $bpc->{Conf}{PingPath}, - host => $host, - }; + ($family, @res) = getaddrinfo($host, "22"); + if ( $family eq AF_INET ) { + $args = { + pingPath => $bpc->{Conf}{PingPath}, + host => $host, + }; + } + if ( $family eq AF_INET6 ) { + $args = { + pingPath => $bpc->{Conf}{Ping6Path}, + host => $host, + }; + } + $pingCmd = $bpc->cmdVarSubstitute($bpc->{Conf}{PingCmd}, $args); # only in patch2: unchanged: --- backuppc-3.3.1.orig/bin/BackupPC_restore +++ backuppc-3.3.1/bin/BackupPC_restore @@ -42,6 +42,7 @@ use BackupPC::FileZIO; use BackupPC::Xfer; use Socket; +use Socket6; use File::Path; use Getopt::Std; @@ -167,7 +168,7 @@ # Find its IP address # if ( $hostIP !~ /\d+\.\d+\.\d+\.\d+/ ) { - if ( !defined(gethostbyname($host)) ) { + if ( defined(getaddrinfo($host, "22")) ) { # # Ok, NS doesn't know about it. Maybe it is a NetBios name # instead. only in patch2: unchanged: --- backuppc-3.3.1.orig/conf/config.pl +++ backuppc-3.3.1/conf/config.pl @@ -1650,6 +1650,7 @@ # $Conf{PingPath} = '/bin/echo'; # $Conf{PingPath} = ''; +$Conf{Ping6Path} = ''; # # Ping command. The following variables are substituted at run-time: only in patch2: unchanged: --- backuppc-3.3.1.orig/debian/patches/config.pl.diff +++ backuppc-3.3.1/debian/patches/config.pl.diff @@ -0,0 +1,52 @@ +--- config.pl 2005-03-03 23:39:20.000000000 +0100 ++++ debian/backuppc/etc/backuppc/config.pl 2005-03-03 18:55:02.000000000 +0100 +@@ -41,7 +41,10 @@ + # + # Host name on which the BackupPC server is running. + # +-$Conf{ServerHost} = 'XXXXXX'; ++$ENV{'PATH'} = '/bin:/usr/bin'; ++delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; ++$Conf{ServerHost} = `hostname`; ++chomp($Conf{ServerHost}); + + # + # TCP port number on which the BackupPC server listens for and accepts +@@ -218,7 +218,7 @@ + # Full path to various commands for archiving + # + $Conf{SplitPath} = '/usr/bin/split'; +-$Conf{ParPath} = '/usr/bin/par2'; ++$Conf{ParPath} = '/usr/bin/par2' if -x '/usr/bin/par2'; + $Conf{CatPath} = '/bin/cat'; + $Conf{GzipPath} = '/bin/gzip'; + $Conf{Bzip2Path} = '/bin/bzip2'; +@@ -1462,7 +1462,7 @@ + # Full path for ssh. Security caution: normal users should not + # allowed to write to this file or directory. + # +-$Conf{SshPath} = '/usr/bin/ssh'; ++$Conf{SshPath} = '/usr/bin/ssh' if -x '/usr/bin/ssh'; + + # + # Full path for nmblookup. Security caution: normal users should not +@@ -1919,8 +1919,8 @@ + # $Conf{CgiAdminUsers} = 'craig celia'; + # --> administrative users are only craig and celia'. + # +-$Conf{CgiAdminUserGroup} = ''; +-$Conf{CgiAdminUsers} = ''; ++$Conf{CgiAdminUserGroup} = 'backuppc'; ++$Conf{CgiAdminUsers} = 'backuppc'; + + # + # URL of the BackupPC_Admin CGI script. Used for email messages. +@@ -1925,7 +1925,7 @@ + # + # URL of the BackupPC_Admin CGI script. Used for email messages. + # +-$Conf{CgiURL} = 'http://XXXXXX/backuppc/index.cgi'; ++$Conf{CgiURL} = 'http://'.$Conf{ServerHost}.'/backuppc/index.cgi'; + + # + # Language to use. See lib/BackupPC/Lang for the list of supported only in patch2: unchanged: --- backuppc-3.3.1.orig/lib/BackupPC/Config/Meta.pm +++ backuppc-3.3.1/lib/BackupPC/Config/Meta.pm @@ -85,6 +85,7 @@ SshPath => {type => "execPath", undefIfEmpty => 1}, NmbLookupPath => {type => "execPath", undefIfEmpty => 1}, PingPath => {type => "execPath", undefIfEmpty => 1}, + Ping6Path => {type => "execPath", undefIfEmpty => 1}, DfPath => {type => "execPath", undefIfEmpty => 1}, DfCmd => "string", SplitPath => {type => "execPath", undefIfEmpty => 1},