--- backuppc-3.2.1.orig/configure.pl +++ backuppc-3.2.1/configure.pl @@ -242,6 +242,8 @@ $Conf{LogDir} ||= $opts{"log-dir"} || "$Conf{TopDir}/log"; } +$Conf{ConfDir} = "/etc/backuppc"; + # # These are the programs whose paths we need to find # @@ -252,6 +254,7 @@ nmblookup => "NmbLookupPath", rsync => "RsyncClientPath", ping => "PingPath", + ping6 => "Ping6Path", df => "DfPath", 'ssh/ssh2' => "SshPath", sendmail => "SendmailPath", @@ -332,7 +335,10 @@ $Conf{BackupPCUser} || "backuppc", "backuppc-user"); if ( $opts{"set-perms"} ) { - ($name, $passwd, $Uid, $Gid) = getpwnam($Conf{BackupPCUser}); + #($name, $passwd, $Uid, $Gid) = getpwnam($Conf{BackupPCUser}); + $name = "backuppc"; + $Uid = 0; + $Gid = 0; last if ( $name ne "" ); print < `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +. /usr/share/debconf/confmodule +db_version 2.0 + +case "$1" in + configure) + + # TODO: I should detect if par2, bzip2 ... are really installed + # and modify config.pl accordingly. + + db_get backuppc/reconfigure-webserver + webservers="$RET" + db_get backuppc/restart-webserver + webservers_rst="$RET" + inc="/etc/backuppc/apache.conf" + + for webserver in $webservers ; do + webserver=${webserver%,} + test -x /usr/sbin/$webserver || continue + + case "$webserver" in + apache|apache-perl|apache-ssl|apache2) + # remove wwwconfig-common stuff + if grep -qs "^Include $inc" /etc/$webserver/httpd.conf; then + mv -f /etc/$webserver/httpd.conf /etc/$webserver/httpd.conf.old.backuppc + grep -v "^Include $inc" /etc/$webserver/httpd.conf.old.backuppc \ + > /etc/$webserver/httpd.conf + fi + # add new links + newfile=false + if [ -d /etc/$webserver/conf.d -a ! -f /etc/$webserver/conf.d/backuppc.conf -a ! -h /etc/$webserver/conf.d/backuppc.conf ]; then + ln -s /etc/backuppc/apache.conf /etc/$webserver/conf.d/backuppc.conf + [ -f /etc/$webserver/conf.d/backuppc ] && rm /etc/$webserver/conf.d/backuppc + if [ "$webservers_rst" = "true" ]; then + # restart + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver restart + else + /etc/init.d/$webserver restart + fi + fi + fi + ;; + esac + done + + # creating backuppc group if he isn't already there + if ! getent group backuppc >/dev/null; then + addgroup --system backuppc >/dev/null + fi + + # creating backuppc user if he isn't already there + if ! getent passwd backuppc >/dev/null; then + adduser --system --gecos "BackupPC" --ingroup backuppc \ + --shell /bin/sh --home /var/lib/backuppc backuppc >/dev/null + + # add backuppc to /etc/aliases + if [ -f /etc/aliases ] || [ -L /etc/aliases ]; then + if ! grep -qi "^backuppc[[:space:]]*:" /etc/aliases; then + echo "backuppc: root" >> /etc/aliases + test -x "$(command -v newaliases)" && newaliases || : + fi + fi + fi + + #usermod -c "BackupPC Daemon" backuppc + + # chown some files only on the 1st install + if [ -z "$2" ]; then + mkdir /var/lib/backuppc/pc/localhost/ + chown backuppc:backuppc /var/lib/backuppc /var/lib/backuppc/* /var/lib/backuppc/pc/* /var/lib/backuppc/log/* + chmod 750 /var/lib/backuppc /var/lib/backuppc/* /var/lib/backuppc/pc/* + fi + + 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/lib/backuppc/cgi-bin/index.cgi + + if [ ! -f /etc/backuppc/htpasswd ]; then + touch /etc/backuppc/htpasswd + db_get backuppc/tmppass + if [ -f /usr/bin/htpasswd ]; then + htpasswd -bm /etc/backuppc/htpasswd backuppc $RET + else + htpasswd2 -bm /etc/backuppc/htpasswd backuppc $RET + fi + fi + db_reset backuppc/tmppass + db_subst "backuppc/configuration-note" "pass" "" + + if [ -x /usr/sbin/a2enmod ]; then + a2enmod auth_basic + a2enmod authz_groupfile + a2enmod authn_file + a2enmod authz_user + a2enmod cgi + fi + + # create a symlink to have the same directories as in the doc + cd /etc/backuppc + [ ! -e pc ] && ln -s /etc/backuppc pc + + # ucf stuff + ucf --debconf-ok --three-way /usr/share/backuppc/conf/config.pl /etc/backuppc/config.pl + + # change the rights of /etc/backuppc so that the CGI can modify the conf. + chown -R backuppc:www-data /etc/backuppc + + # fix the perms of the backuppc password files + chmod 640 /etc/backuppc/htpasswd + + ;; + + 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 + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +db_stop + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- backuppc-3.2.1.orig/debian/postrm +++ backuppc-3.2.1/debian/postrm @@ -0,0 +1,85 @@ +#!/bin/sh +# postrm script for backuppc +# +# see: dh_installdeb(1) + +#set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + purge) + + if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_version 2.0 + + db_get backuppc/reconfigure-webserver + webservers="$RET" + db_get backuppc/restart-webserver + webservers_rst="$RET" + restart="" + inc="/etc/backuppc/apache.conf" + + for webserver in $webservers ; do + webserver=${webserver%,} + test -x /usr/sbin/$webserver || continue + + case "$webserver" in + apache|apache-perl|apache-ssl|apache2) + # remove links + if [ -h /etc/$webserver/conf.d/backuppc.conf ]; then + rm -f /etc/$webserver/conf.d/backuppc.conf + if [ "$webservers_rst" = "true" ]; then + # restart + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver restart + else + /etc/init.d/$webserver restart + fi + fi + fi + ;; + esac + done + fi + + + 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 + fi + + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_version 2.0 + db_stop +fi + +exit 0 --- backuppc-3.2.1.orig/debian/docs +++ backuppc-3.2.1/debian/docs @@ -0,0 +1 @@ +README --- backuppc-3.2.1.orig/debian/menu +++ backuppc-3.2.1/debian/menu @@ -0,0 +1,4 @@ +?package(backuppc):needs="X11" section="Applications/File Management"\ + title="View backuppc status" \ + command="www-browser http://localhost/backuppc/" + --- backuppc-3.2.1.orig/debian/backuppc.config +++ backuppc-3.2.1/debian/backuppc.config @@ -0,0 +1,28 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule + +db_version 2.0 + +db_input high backuppc/reconfigure-webserver || true +db_input low backuppc/restart-webserver || true +db_go + +if [ ! -f /etc/backuppc/htpasswd ]; then + db_get "backuppc/tmppass" + PASS=$RET + if [ "$PASS" != "" ]; then + # already set... do nothing + echo + else + PASS=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..8)'` + db_set "backuppc/tmppass" "$PASS" + fi + db_subst "backuppc/configuration-note" "site" `hostname -f` + db_subst "backuppc/configuration-note" "pass" "$PASS" + db_input high "backuppc/configuration-note" || true + db_go +fi + +db_stop +exit 0 --- backuppc-3.2.1.orig/debian/setuidwrapper.c +++ backuppc-3.2.1/debian/setuidwrapper.c @@ -0,0 +1,10 @@ +#include + +#define REAL_PATH "/usr/share/backuppc/lib/realindex.cgi" + +int main(ac, av) +char **av; +{ + execv(REAL_PATH, av); + return 0; +} --- backuppc-3.2.1.orig/debian/watch +++ backuppc-3.2.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://sf.net/backuppc/BackupPC-(.*).tar.gz debian uupdate --- backuppc-3.2.1.orig/debian/dirs +++ backuppc-3.2.1/debian/dirs @@ -0,0 +1,5 @@ +etc/init.d +etc/backuppc +usr/share/backuppc/image +usr/share/backuppc/conf +usr/lib/backuppc/cgi-bin --- backuppc-3.2.1.orig/debian/backuppc.doc-base +++ backuppc-3.2.1/debian/backuppc.doc-base @@ -0,0 +1,9 @@ +Document: backuppc +Title: BackupPC Manual +Author: Craig Baratt +Abstract: BackupPC user and administrator's manual +Section: File Management + +Format: HTML +Index: /usr/share/doc/backuppc/BackupPC.html +Files: /usr/share/doc/backuppc/*.html --- backuppc-3.2.1.orig/debian/control +++ backuppc-3.2.1/debian/control @@ -0,0 +1,37 @@ +Source: backuppc +Section: utils +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ludovic Drolez +Build-Depends: debhelper (>= 5), perl (>= 5.6.0), patch, libsocket6-perl +Standards-Version: 3.9.2 + +Package: backuppc +Architecture: any +Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-modules-perl, libwww-perl, 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) +Description: high-performance, enterprise-grade system for backing up PCs + BackupPC is disk based and not tape based. This particularity allows + features not found in any other backup solution: + * Clever pooling scheme minimizes disk storage and disk I/O. + Identical files across multiple backups of the same or different PC are + stored only once resulting in substantial savings in disk storage and disk + writes. Also known as "data deduplication". + * Optional compression provides additional reductions in storage. + CPU impact of compression is low since only new files (those not already + in the pool) need to be compressed. + * A powerful http/cgi user interface allows administrators to view log files, + configuration, current status and allows users to initiate and cancel + backups and browse and restore files from backups very quickly. + * No client-side software is needed. On WinXX the smb protocol is used. + On Linux or Unix clients, rsync or tar (over ssh/rsh/nfs) can be used + * Flexible restore options. Single files can be downloaded from any backup + directly from the CGI interface. Zip or Tar archives for selected files + or directories can also be downloaded from the CGI interface. + * BackupPC supports mobile environments where laptops are only intermittently + connected to the network and have dynamic IP addresses (DHCP). + * Flexible configuration parameters allow multiple backups to be performed + in parallel. + * and more to discover in the manual... --- backuppc-3.2.1.orig/debian/backuppc.templates +++ backuppc-3.2.1/debian/backuppc.templates @@ -0,0 +1,30 @@ +Template: backuppc/configuration-note +Type: note +_Description: Web administration default user created + BackupPC can be managed through its web interface: + http://${site}/backuppc/ + . + For that purpose, a web user named 'backuppc' with '${pass}' as password + has been created. You can change this password by + running 'htpasswd /etc/backuppc/htpasswd backuppc'. + +Template: backuppc/reconfigure-webserver +Type: multiselect +Choices: apache2 +Default: +_Description: Which web server would you like to reconfigure automatically: + BackupPC supports any web server with CGI enabled, but this automatic + configuration process only supports Apache. + +Template: backuppc/restart-webserver +Type: boolean +Default: true +_Description: Do you want to restart the webservers now if needed? + Remember that in order to activate the new configuration + the webservers have to be restarted. + +Template: backuppc/tmppass +Type: password +Description: Temporary password for internal use + Temporary password. Should not be translated. + --- backuppc-3.2.1.orig/debian/changelog +++ backuppc-3.2.1/debian/changelog @@ -0,0 +1,630 @@ +backuppc (3.2.1-1ubuntu1.1) oneiric-security; 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:46:52 -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 + * urgency set to high because of a security fix + + -- Ludovic Drolez Tue, 13 Sep 2011 20:38:00 +0200 + +backuppc (3.2.0-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Use inetutils-ping as an alternative to iputils-ping. Closes: #630777 + + -- 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. + * 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 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 + * Added in README.Debian instructions for IPv6 hosts. Closes: #594091 + * Removed /etc/backuppc/htgroup. Closes: #594692 + + -- 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 + * updated the pt_BR debconf translation. Closes: #607405 + + -- 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. + * Add depends on libwww-perl (Closes: #602787) + + -- 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 + + -- Ludovic Drolez Wed, 06 Oct 2010 20:57:45 +0200 + +backuppc (3.1.0-10) unstable; urgency=low + + * Dependenct added: libtime-modules-perl. Closes: #570843 + * Removed useless logging. Closes: #558431 + + -- 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 + * added 'Allow from all' in apache conf. Closes: #538976 + * depends on samba-common-bin. Closes: #546660 + * depends on default-mta. Closes: #539796 + * added the xfs/rfs pool size patch. Closes: #556729 #544852 + * specified a font name for graphs. Closes: #544853 + * updated debconf translations. Closes: #526699 + * added a nice value in the init. Closes: #438614 + * only keep apache2 auto-config. Closes: #528965 + + -- 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 + * Small init.d file fix + + -- Ludovic Drolez Fri, 09 Oct 2009 20:58:32 +0200 + +backuppc (3.1.0-7) unstable; urgency=high + + * Disable the modification of the alias for normal users. Closes: #542218 + * Recommends: libio-dirent-perl. Closes: #518554 + * manage config.pl with ucf. Closes: #483573 + + -- 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 + * Fix the permissions of htpasswd/htgroup files + * Enabled MD5 hash for htpasswd by default + + -- Ludovic Drolez Tue, 31 Mar 2009 11:30:48 +0200 + +backuppc (3.1.0-5) unstable; urgency=low + + * MTA dependency added. Closes: #458961 + * iputils-ping dependency added. Closes: #516147 + * remove the /etc/$webserver/conf.d/backuppc link if present. Closes: #516159 + * Small debian/rules fix. Closes: #488659 + * Apache1 dep removed. Closes: #488656 + * /etc/backuppc/localconfig.pl can be used for customizations to config.pl. + Closes: #375998 + * Updated debconf translations. Closes: #513665, #503741 + * Enable basic auth apache2 modules + + -- Ludovic Drolez Tue, 03 Mar 2009 21:29:55 +0100 + +backuppc (3.1.0-4) unstable; urgency=medium + + * Failing SMB backups: removed the '-N' option for smbclient because + of an undocumented change in samba. See bug #501057 + * Updated Sweedish debconf file. Closes: #491937 + * Added Russian debconf file. Closes: #501756 + * Added Finnish debconf file. Closes: #501934 + * Added Ukrainian debconf file. Closes: #501977 + * Added Basque debconf file. Closes: #502076 + * Added Italian debconf file. Closes: #502463 + * Changed the doc-base section to `File Management' + * Documented some known bugs with WAs. + + -- Ludovic Drolez Tue, 07 Oct 2008 20:10:20 +0200 + +backuppc (3.1.0-3) unstable; urgency=low + + * Added backuppc to /etc/aliases. Closes: #438331 + * Moved the pool size graphs to the bottom. Closes: #476659 + * Watch file fixed + + -- Ludovic Drolez Tue, 8 Apr 2008 12:26:57 +0200 + +backuppc (3.1.0-2) unstable; urgency=low + + * patched backuppc to show a nice rrdtool graph of the pool size. + * added a conflicts: libfile-rsyncp-perl (< 0.68). Closes: #431979 + * removed the forgotten wwwconfig-common from dependencies + * Japanese debconf template updated. Closes: #463646 + * Added the SSL option in apache.conf. Closes: #437685 + + -- Ludovic Drolez Thu, 21 Feb 2008 20:49:07 +0100 + +backuppc (3.1.0-1) unstable; urgency=low + + * New upstream release. Closes: #437451 + * Moved MTAs, rsync and openssh to the recommends line. Smbclient is still needed. + Closes: #454795, #441337 + * symlink /etc/backuppc/pc to /etc/backuppc to follow the doc. Closes: #436793 + * moved the creation of /var/lib/backuppc/pc/localhost to the postinst. Closes: #451922 + * Added the PT debconf translation. Closes: #434291 + * Unfuzzy config.pl.diff. Closes: #452673 + * Support /var/run on tmpfs and use LSB logging. Closes: #452672 + * Properly remove /etc/apache*/conf.d/backuppc.conf. Closes: #452677 + + -- Ludovic Drolez Fri, 7 Dec 2007 10:54:44 +0100 + +backuppc (3.0.0-4) unstable; urgency=high + + * Clear the remaining password in config.dat. Closes: #436681 + + -- Ludovic Drolez Mon, 27 Aug 2007 18:28:25 +0200 + +backuppc (3.0.0-3) unstable; urgency=medium + + * Added bzip2 in the dependencies. Closes: #420030 + * Added a LSB section in the init script. + + -- Ludovic Drolez Sun, 20 May 2007 16:38:13 +0200 + +backuppc (3.0.0-2.1) unstable; urgency=high + + * Non-maintainer upload during BSP. + * Fix non-conditional use of debconf during purge (Closes: #416650). + * Updated German translation, thanks Erik Schanze (Closes: #412020). + * Updated Czech translation, thanks Martin Sin (Closes: #412729). + + -- Luk Claes Thu, 17 May 2007 00:37:56 +0200 + +backuppc (3.0.0-2) unstable; urgency=low + + * Bzip2 path changed. Closes: #410858 + * Refuse to run the daemon if an old config.pl file is detected. + + -- Ludovic Drolez Wed, 14 Feb 2007 8:27:12 +0100 + +backuppc (3.0.0-1) unstable; urgency=low + + * New upstream release. Closes: #369684, #377084, #406681, #405822, #408916 + * /etc/backuppc is now owned by user backuppc, so that the CGI can modify the + configuration. + * README.Debian updated. Closes: #407467 + * Updated README.Debian with information about the backuppc account, and + about installation with Apache 2.2.x. Closes: #390798 + * Do not use wwwconfig-common anymore. Closes: #304901, #249010 + + -- Ludovic Drolez Mon, 5 Feb 2007 10:12:51 +0100 + +backuppc (2.1.2-5) unstable; urgency=medium + + * upstream patch 2.1.2pl1 applied. Closes: #369425, #355112 + * added -D to rsync flags. Closes: #365437, #358319 + * localhost incremental backups fixed. Closes: #369465 + * suggests openssh-client or ssh-client. Closes: #369464 + * paths in the documentation fixed. Closes: #369428 + + -- Ludovic Drolez Wed, 7 Jun 2006 10:00:31 +0200 + +backuppc (2.1.2-4) unstable; urgency=low + + * Added BackupPC-2.1.2pl0.diff. Closes: #347930 + + -- Ludovic Drolez Mon, 23 Jan 2006 21:43:30 +0100 + +backuppc (2.1.2-3) unstable; urgency=low + + * Added Spanish and Swedish debconf translations. Closes: #333877, #330940 + * Avoid the creation of etc/config.pl.orig + * DH_COMPAT=4 + + -- Ludovic Drolez Sun, 8 Jan 2006 23:52:56 +0100 + +backuppc (2.1.2-2) unstable; urgency=low + + * Added misc:Depends in control file. Closes: #331756. + + -- Ludovic Drolez Sun, 13 Nov 2005 13:40:15 +0100 + +backuppc (2.1.2-1) unstable; urgency=low + + * New upstream release. Closes: #327125, #317714. + + -- Ludovic Drolez Thu, 8 Sep 2005 18:25:22 +0200 + +backuppc (2.1.1-4) unstable; urgency=medium + + * Fixed an important bug in BackupPC_tarCreate which can cause archives to + be corrupted. + * Put pid file in /var/run/backuppc/BackupPC.pid, Closes: #317748 + * Check if ssh and par2 exists. Closes: #319246 + * Now depends on a MTA. + + -- Ludovic Drolez Mon, 22 Aug 2005 18:55:15 +0200 + +backuppc (2.1.1-3) unstable; urgency=low + + * Typo in french translation removed. Closes: #305475 + * Added Vietnamese debconf translation. Closes: #309327 + * Added Czech debconf translation. Closes: #304877 + * Added instructions in README.Debian on installing the CGI under + suexec+apache2 (contributed by William McKee). Closes: #309700 + + -- Ludovic Drolez Tue, 28 Jun 2005 13:02:06 +0200 + +backuppc (2.1.1-2) unstable; urgency=low + + * Added a patch to have backuppc detach correclty. Closes: #301057 + * Hostname fix. Closes: #301360 + * Small CGI fix: the host config file link was not present. + + -- Ludovic Drolez Fri, 1 Apr 2005 22:07:03 +0200 + +backuppc (2.1.1-1) unstable; urgency=low + + * New upstream release + * Do not modify config.pl in the postinst. + Thanks to Peter Palfrader for the patch. Closes: #301076. + * Moved the 'rm -rf /etc/backuppc'. Closes: #301084. + * Check that backuppc.config is not run 2 times before generating + a random password. Closes: #301087. + * Added /bin/sh as shell for the backuppc user. Closes: #299852. + + -- Ludovic Drolez Fri, 18 Mar 2005 20:25:47 +0100 + +backuppc (2.1.0-10) unstable; urgency=medium + + * Explicitly run /usr/bin/env : do not rely on the PATH. + Closes: #297879. + Priority set to medium since it could break existing setups. + * Removed the debconf templates which should not be translated. + * Added pt_BR debconf translation. Closes: #297052 + + -- Ludovic Drolez Mon, 28 Feb 2005 18:56:02 +0100 + +backuppc (2.1.0-9) unstable; urgency=low + + * A random password is generated for backuppc http user. Closes: #293848 + * $Conf{CgiURL} corrected in configure.pl. Closes: #287281 + * Added 'env LC_ALL=C' before tar in config.pl to prevent locale problems + * added the tarssh-sudo.pl example configuration file. + * postrm script fixed. Closes: #293847 + * config comment fixed. Closes: #279041 + + -- Ludovic Drolez Tue, 28 Dec 2004 15:38:06 +0100 + +backuppc (2.1.0-8) unstable; urgency=low + + * Postinst script fixed. Closes: Bug#283755 + + -- Ludovic Drolez Sat, 4 Dec 2004 01:54:02 +0100 + +backuppc (2.1.0-7) unstable; urgency=low + + * Depends on libfile-rsyncp-perl >= 0.50. Closes: #279649 + + -- Ludovic Drolez Fri, 5 Nov 2004 14:03:38 +0100 + +backuppc (2.1.0-6) unstable; urgency=medium + + * Moved 'db_stop' after 'db_purge'. Closes: #276306 + * Urgency=medium because this important bug was fixed. + * Po-debconf translations updated. Closes: #270786, #271100, #274656 + + -- Ludovic Drolez Thu, 21 Oct 2004 23:43:18 +0200 + +backuppc (2.1.0-5) unstable; urgency=low + + * Added the pl1 patch. Closes: #270230 + * Postint modified to use a2enmod. Closes: #269434 + + -- Ludovic Drolez Thu, 9 Sep 2004 08:56:10 +0200 + +backuppc (2.1.0-4) unstable; urgency=medium + + * Backuppc now asks if it can modify the apache config. Closes: #268068 + * Urgency=medium because an RC bug has been fixed. + * fr.po updated. + + -- Ludovic Drolez Tue, 31 Aug 2004 20:19:55 +0200 + +backuppc (2.1.0-3) unstable; urgency=medium + + * Added a patch to make the archive feature working. Closes: Bug#263409 + * Urgency=medium because this upload fixes a new feature of backuppc 2.1 + * User backuppc now created as a system user since it's mainly used + to run the daemon. Closes: Bug#255498 + + -- Ludovic Drolez Thu, 5 Aug 2004 20:53:37 +0200 + +backuppc (2.1.0-2) unstable; urgency=low + + * Removed a slash in the apache alias. Closes: Bug#261108 + * Removed a few checks in the configure script. Closes: Bug#261041 + * added a 'dpkg-statoverride --remove' in the postrm script + + -- Ludovic Drolez Fri, 23 Jul 2004 22:49:11 +0200 + +backuppc (2.1.0-1) unstable; urgency=low + + * New upstream release. Closes: #255482 + * Added in README.Debian what additional packages you need for + rsync based backups. Closes: #257518 + * suggests exim4. Closes: #255338 + + -- Ludovic Drolez Thu, 15 Jul 2004 09:30:12 +0200 + +backuppc (2.0.2-6) unstable; urgency=low + + * German debconf translation added. Closes: Bug#250573 + * Dependencies: added apache-ssl | apache-perl + + -- Ludovic Drolez Thu, 3 Jun 2004 09:36:22 +0200 + +backuppc (2.0.2-5) unstable; urgency=low + + * XFerLog filter patch applied. Closes: Bug#248604 + + -- Ludovic Drolez Wed, 12 May 2004 20:05:55 +0200 + +backuppc (2.0.2-4) unstable; urgency=low + + * solved the doc substitution problem. Closes: Bug#237322 + * nl.po debconf translation added. Closes: Bug#241308 + * quiet ssh flag added in $Conf{RsyncClientCmd}. Closes: Bug#242621 + + -- Ludovic Drolez Sat, 10 Apr 2004 00:08:24 +0200 + +backuppc (2.0.2-3) unstable; urgency=low + + * apache2 support. Closes: Bug#214548. + * Japanese po-debconf template translation added. Closes: Bug#227229 + + -- Ludovic Drolez Mon, 15 Mar 2004 23:11:45 +0100 + +backuppc (2.0.2-2) unstable; urgency=low + + * Docbase path fixed. Closes: Bug#224250 + * More copyright info + * Added a mysql backup file example. + + -- Ludovic Drolez Wed, 17 Dec 2003 20:02:35 +0100 + +backuppc (2.0.2-1) unstable; urgency=low + + * New upstream release + * debian/watch added + * chown syntax fixed. Closes: #211987 + * chown/chmod called only on the 1st install. Closes: #214526 + + -- Ludovic Drolez Thu, 16 Oct 2003 21:56:25 +0200 + +backuppc (2.0.0-5) unstable; urgency=low + + * Added gettext based debconf templates. Closes: Bug#205787 + * Added fr.po debconf file. Closes: Bug#206592 + * Added some basic examples + * Fixed the default 'hosts' file: 'localhost' is now owned by 'backuppc' + * Fixed BackupPC_Admin to be able to display config files in /etc/backuppc + * Updated README.debian file. Closes: #203234, #203272 + + -- Ludovic Drolez Mon, 23 Aug 2003 21:34:44 +0200 + +backuppc (2.0.0-4) unstable; urgency=low + + * set Architecture to all + * depends: samba-tng-common or samba-common + * Menu file added. Closes: #201148 + * improved description. Closes: #199170 + + -- Ludovic Drolez Thu, 26 Jun 2003 21:21:21 +0200 + +backuppc (2.0.0-3) unstable; urgency=low + + * added --gecos "" to the adduser line on the postinst. Closes: #198814 + * init script small fix + + -- Ludovic Drolez Thu, 26 Jun 2003 20:57:53 +0200 + +backuppc (2.0.0-2) unstable; urgency=low + + * added dependencies: libdigest-md5-perl + * packaged libfile-rsyncp-perl: you can now use rsync for backups + * images path fixed + * documentation path fixed in cgi script + + -- Ludovic Drolez Wed, 18 Jun 2003 22:08:19 +0200 + +backuppc (2.0.0-1) unstable; urgency=low + + * Initial Release. Closes: Bug#158874. + * modified configure.pl for non-interactive install + * modified perl scripts for having main config files in /etc/backuppc + + -- Ludovic Drolez Mon, 16 Jun 2003 10:43:48 +0200 + --- backuppc-3.2.1.orig/debian/rules +++ backuppc-3.2.1/debian/rules @@ -0,0 +1,110 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + #$(MAKE) + #/usr/bin/docbook-to-man debian/backuppc.sgml > backuppc.1 + cc debian/setuidwrapper.c -o index.cgi + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp index.cgi + + # Add here commands to clean up after the build process. + rm -f init.d/*-backuppc* + rm -f backuppc.8* + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/backuppc. + ./configure.pl --batch --no-fhs --hostname XXXXXX --uid-ignore \ + --install-dir /usr/share/backuppc --dest-dir $(CURDIR)/debian/backuppc/ \ + --data-dir /var/lib/backuppc --cgi-dir /usr/share/backuppc/cgi-bin \ + --html-dir /usr/share/backuppc/image --html-dir-url /backuppc/image \ + --bin-path perl=/usr/bin/perl --bin-path tar=/bin/tar \ + --bin-path smbclient=/usr/bin/smbclient --bin-path nmblookup=/usr/bin/nmblookup \ + --bin-path rsync=/usr/bin/rsync --bin-path ping=/bin/ping \ + --bin-path df=/bin/df --bin-path ssh=/usr/bin/ssh \ + --bin-path sendmail=/usr/sbin/sendmail --bin-path hostname=/bin/hostname \ + --bin-path par2=/usr/bin/par2 --bin-path gzip=/bin/gzip --bin-path bzip2=/bin/bzip2 + + 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=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/patches/config.pl.diff + install --mode=644 debian/backuppc/etc/backuppc/config.pl debian/backuppc/usr/share/backuppc/conf + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples debian/examples/* + mv -f debian/backuppc/usr/share/backuppc/doc/* debian/backuppc/usr/share/doc/backuppc/ + dh_installmenu + dh_installinit -- start 20 2 3 4 5 . stop 20 1 . + dh_installcron + dh_installman backuppc.8 + dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdebconf +# dh_makeshlibs + dh_installdeb + dh_perl $(CURDIR)/debian/backuppc/usr/share/backuppc/lib/ + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- backuppc-3.2.1.orig/debian/backuppc.init +++ backuppc-3.2.1/debian/backuppc.init @@ -0,0 +1,90 @@ +#! /bin/sh +# /etc/init.d/backuppc +# +# BackupPC Debian init script +# +### BEGIN INIT INFO +# Provides: backuppc +# Required-Start: $syslog $network $remote_fs +# Required-Stop: $syslog $network $remote_fs +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: Launch backuppc server +# Description: Launch backuppc server, a high-performance, +# enterprise-grade system for backing up PCs. +### END INIT INFO + +set -e + +# Do not change the values below ! Read /usr/share/doc/backuppc/README.Debian ! +BINDIR=/usr/share/backuppc/bin +DATADIR=/var/lib/backuppc +USER=backuppc +NICE=0 +# +NAME=backuppc +DAEMON=BackupPC + +test -x $BINDIR/$DAEMON || exit 0 +. /lib/lsb/init-functions +[ -r /etc/default/rcS ] && . /etc/default/rcS + +if [ ! -d /var/run/backuppc ]; then + mkdir /var/run/backuppc + chown backuppc:backuppc /var/run/backuppc +fi + +# Check for incompatible old config files +check_old_config() +{ + BAD=0 + CONF=/etc/backuppc/config.pl + + grep -q IncrLevel $CONF || BAD=1 + + if [ "$BAD" = "1" ]; then + echo "BackupPC cannot be started because important parameters are missing from config.pl." + echo "If you just upgraded BackupPC, please update /etc/backuppc/config.pl." + exit 1 + fi +} + + +case "$1" in + start) + log_begin_msg "Starting $NAME..." + check_old_config + start-stop-daemon --start --pidfile /var/run/backuppc/BackupPC.pid \ + --nicelevel $NICE -c $USER --exec $BINDIR/$DAEMON -- -d + log_end_msg $? + ;; + stop) + log_begin_msg "Stopping $NAME..." + start-stop-daemon --stop --pidfile /var/run/backuppc/BackupPC.pid -u $USER \ + --oknodo --retry 30 + log_end_msg $? + ;; + restart) + log_begin_msg "Restarting $NAME..." + start-stop-daemon --stop --pidfile /var/run/backuppc/BackupPC.pid -u $USER \ + --oknodo --retry 30 + check_old_config + start-stop-daemon --start --pidfile /var/run/backuppc/BackupPC.pid \ + --nicelevel $NICE -c $USER --exec $BINDIR/$DAEMON -- -d + log_end_msg $? + ;; + reload|force-reload) + log_begin_msg "Reloading $NAME configuration files..." + start-stop-daemon --stop --pidfile /var/run/backuppc/BackupPC.pid \ + --signal 1 + log_end_msg $? + ;; + *) + log_success_msg "Usage: /etc/init.d/$NAME {start|stop|restart|reload}" + exit 1 + ;; +esac + +exit 0 --- backuppc-3.2.1.orig/debian/copyright +++ backuppc-3.2.1/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Ludovic Drolez on +Mon, 16 Jun 2003 10:43:48 +0200. + +It was downloaded from http://sourceforge.net/projects/backuppc/ + +Upstream Author: Craig Barratt + +Copyright: + + Copyright (C) 2001-2003 Craig Barratt + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + --- backuppc-3.2.1.orig/debian/README.Debian +++ backuppc-3.2.1/debian/README.Debian @@ -0,0 +1,109 @@ +BackupPC for Debian +------------------- + +The Web interface is available at http://myserver/backuppc/. Log in a user +backuppc with the random password given during installation. +You can change the password by running "htpasswd for /etc/backuppc/htpasswd". + +The default install will backup the local /etc directory using the 'backuppc' +user, so it will not backup root only files like /etc/shadow. If you want +to do a local backup as root, you need to use ssh and ssh authentication keys, +as explained in the manual. The examples/ directory contains some basic host +configuration files. + +If you do not like the default data directory (/var/lib/backuppc/), you +should move this directory where you want and make a symbolic link from +the new directory to the default one (all paths are hardcoded so it's the +easiest way to change the data directory). + +About Xfer methods +------------------ + +The default install of backuppc is only useful for backuping PCs via SMB. +For other backup methods you'll probably have to install more packages: +- for rsync: rsync, libfile-rsyncp-perl +- for tar/ssh: ssh + +Known bugs with workarounds +--------------------------- + +- If SMB backups no longer work after an upgrade to lenny, please remove + the '-N' smbclient options from /etc/backuppc/config.pl + +- Do no use the '--exclude' option for rsync backups but only the + $Conf{BackupFilesExclude} backuppc parameter. + +- For IPv6 only hosts, add the following lines to the host configuration file: + + $Conf{NmbLookupCmd} = ''; + $Conf{NmbLookupFindHostCmd} = ''; + $Conf{PingCmd} = '/bin/ping6'; + +Installing BackupPC with Apache 2.2.x +------------------------------------- + +The following lines should be added to your Apache configuration or to the top +of /etc/backuppc/apache.conf, to make the authentication work. + +LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so +LoadModule authz_groupfile_module /usr/lib/apache2/modules/mod_authz_groupfile.so +LoadModule authn_file_module /usr/lib/apache2/modules/mod_authn_file.so +LoadModule authz_user_module /usr/lib/apache2/modules/mod_authz_user.so +LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so + +Installing the CGI under suexec+apache2 (contributed by William McKee) +---------------------------------------------------------------------- + +To enable suexec, you'll probably need to recompile Apache2: + + apt-get source apache2 + apt-get build-dep apache2 + cd apache2_2.0.54 + edit debian/rules and change the --suexec-docroot to / + dpkg-buildpackage -rfakeroot -b + dpkg -i ../apache2_2.0.54-4_i386.deb + dpkg -i ../apache2-common_2.0.54-4_i386.deb + dpkg -i ../apache2-utils_2.0.54-4_i386.deb + dpkg -i ../apache2-mpm-prefork_2.0.54-4_i386.deb + +Disable sgid on index.cgi: + + chmod u-s /usr/share/backuppc/cgi-bin/index.cgi + +Fix permissions on cgi-bin: + + chown backuppc:backuppc /usr/share/backuppc/cgi-bin + +Modify /etc/backuppc/apache.conf: + + + ServerName backuppc + SuexecUserGroup backuppc backuppc + DocumentRoot /usr/share/backuppc/cgi-bin + + Alias /backuppc /usr/share/backuppc/cgi-bin + + AllowOverride None + Options ExecCGI MultiViews Indexes + SymLinksIfOwnerMatch IncludesNoExec + DirectoryIndex index.cgi + AddHandler cgi-script .cgi + + AuthType Basic + AuthUserFile /etc/backuppc/htpasswd + AuthName "BackupPC admin" + require valid-user + + + + +Debian Modifications +-------------------- + +- Modified Perl scripts for having main config files (hosts and config.pl) +in /etc/backuppc. +- Data directory is /var/lib/backuppc/ + + + + -- Ludovic Drolez , Mon, 16 Jun 2004 10:43:48 +0200 --- backuppc-3.2.1.orig/debian/apache.conf +++ backuppc-3.2.1/debian/apache.conf @@ -0,0 +1,22 @@ +Alias /backuppc /usr/share/backuppc/cgi-bin/ + + + AllowOverride None + Allow from all + + # Uncomment the line below to ensure that nobody can sniff importanti + # info from network traffic during editing of the BackupPC config or + # when browsing/restoring backups. + # Requires that you have your webserver set up for SSL (https) access. + #SSLRequireSSL + + Options ExecCGI FollowSymlinks + AddHandler cgi-script .cgi + DirectoryIndex index.cgi + + AuthUserFile /etc/backuppc/htpasswd + AuthType basic + AuthName "BackupPC admin" + require valid-user + + --- backuppc-3.2.1.orig/debian/examples/localhost.pl +++ backuppc-3.2.1/debian/examples/localhost.pl @@ -0,0 +1,14 @@ +# +# Local server backup of /etc as user backuppc +# +$Conf{XferMethod} = 'tar'; + +$Conf{TarShareName} = ['/etc']; + +$Conf{TarClientCmd} = '/usr/bin/env LC_ALL=C $tarPath -c -v -f - -C $shareName' + . ' --totals'; + +# remove extra shell escapes ($fileList+ etc.) that are +# needed for remote backups but may break local ones +$Conf{TarFullArgs} = '$fileList'; +$Conf{TarIncrArgs} = '--newer=$incrDate $fileList'; --- backuppc-3.2.1.orig/debian/examples/smb.pl +++ backuppc-3.2.1/debian/examples/smb.pl @@ -0,0 +1,13 @@ +# +# SMB Backup (for Windows clients) +# + +$Conf{XferMethod} = 'smb'; + +$Conf{SmbShareName} = ['C$', 'MyShare']; + +# if needed set a user name and password to access the remote shares +#$Conf{SmbShareUserName} = ''; +#$Conf{SmbSharePasswd} = ''; +# if you want anonymous login under XP, you should set $Conf{SmbShareUserName} +# to something (like 'guest'). --- backuppc-3.2.1.orig/debian/examples/tarssh.pl +++ backuppc-3.2.1/debian/examples/tarssh.pl @@ -0,0 +1,11 @@ +# +# Tar backup over ssh +# +# You should generate an SSH key pair to allow the local backuppc user +# to connect as root on the target host. +# Please refer to the BackupPC's manual for details +# + +$Conf{XferMethod} = 'tar'; + +$Conf{BackupFilesOnly} = [ '/onedir', '/anotherdir' ]; --- backuppc-3.2.1.orig/debian/examples/mysql.pl +++ backuppc-3.2.1/debian/examples/mysql.pl @@ -0,0 +1,17 @@ +# +# Mysql backup over ssh +# +# You should generate an SSH key pair to allow the local backuppc user +# to connect as root on the target host. +# Please refer to the BackupPC's manual for details +# +# Replace $dbuser and $dbpasswd with appropriate values to dump your database +# You should also create the /var/backup-mysql/ directory. +# + +$Conf{XferMethod} = 'tar'; + +$Conf{BackupFilesOnly} = [ '/var/backup-mysql/' ]; + +$Conf{DumpPreUserCmd} = '$sshPath -l root $host mysqldump \ +-u $dbuser -p$dbpasswd --all-databases --add-locks > /var/backup-mysql/backup-all-databases.sql' --- backuppc-3.2.1.orig/debian/examples/rsyncssh.pl +++ backuppc-3.2.1/debian/examples/rsyncssh.pl @@ -0,0 +1,11 @@ +# +# Rsync backup over ssh +# +# You should generate an SSH key pair to allow the local backuppc user +# to connect as root on the target host. +# Please refer to the BackupPC's manual for details +# + +$Conf{XferMethod} = 'rsync'; + +$Conf{RsyncShareName} = [ '/onedir', '/anotherdir' ]; --- backuppc-3.2.1.orig/debian/examples/rsyncd.pl +++ backuppc-3.2.1/debian/examples/rsyncd.pl @@ -0,0 +1,11 @@ +# +# Rsync Backup (with rsync daemon on the client) +# + +$Conf{XferMethod} = 'rsyncd'; + +$Conf{RsyncShareName} = ['MyShare']; + +# if needed set a user name and password to access the remote shares +#$Conf{RsyncdUserName} = ''; +#$Conf{RsyncdPasswd} = ''; --- backuppc-3.2.1.orig/debian/examples/tarssh-sudo.pl +++ backuppc-3.2.1/debian/examples/tarssh-sudo.pl @@ -0,0 +1,22 @@ +# +# Tar backup over ssh using SUDO with user 'backuppc' +# +# You should generate an SSH key pair to allow the local 'backuppc' user +# to connect as 'backuppc' on the target host. +# Please refer to the BackupPC's manual for key generation details. +# +# Then on the client host added the following line to 'sudoers' with 'visudo': +# backuppc ALL=NOPASSWD: /bin/tar +# + +$Conf{XferMethod} = 'tar'; + +$Conf{TarClientCmd} = '$sshPath -q -x -n -l backuppc $host' + . ' /usr/bin/env LC_ALL=C sudo $tarPath -c -v -f - -C $shareName+' + . ' --totals'; + +$Conf{TarClientRestoreCmd} = '$sshPath -q -x -l backuppc $host' + . ' /usr/bin/env LC_ALL=C sudo $tarPath -x -p --numeric-owner --same-owner' + . ' -v -f - -C $shareName+'; + +$Conf{BackupFilesOnly} = [ '/onedir', '/anotherdir' ]; --- backuppc-3.2.1.orig/debian/po/uk.po +++ backuppc-3.2.1/debian/po/uk.po @@ -0,0 +1,67 @@ +# Olexandr Kravchuk +# +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: backuppc@packages.debian.org\n" +"POT-Creation-Date: 2008-10-12 12:34+0200\n" +"PO-Revision-Date: 2008-10-12 14:41+0300\n" +"Last-Translator: Olexandr Kravchuk \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Типового користувача для веб-адміністрування створено" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC може керуватись через веб-інтерфейс:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "Було створено віртуальний хост 'backuppc' з паролем '${pass}' . Ви можете змінити цей пароль запустивши команду 'htpasswd /etc/backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Який веб-сервер ви бажаєте автоматично переналаштувати:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "BackupPC підтримує будь який веб-сервер з увімкненим CGI, однак, автоматично може бути налаштований лише Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Чи бажаєте перезапустити веб-сервер?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "Майте на увазі, що для активації змін, веб-сервер необхідно перезавантажити." --- backuppc-3.2.1.orig/debian/po/es.po +++ backuppc-3.2.1/debian/po/es.po @@ -0,0 +1,106 @@ +# backuppc po-debconf translation to Spanish +# Copyright (C) 2005, 2009 Software in the Public Interest +# This file is distributed under the same license as the backuppc package. +# +# Changes: +# - Initial translation +# César Gómez Martín , 2005 +# +# - Updates +# Francisco Javier Cuadrado , 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor, lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc 3.1.0-6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-04-02 10:27+0200\n" +"PO-Revision-Date: 2009-04-27 08:33+0100\n" +"Last-Translator: Francisco Javier Cuadrado \n" +"Language-Team: Debian l10n Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Se ha creado el usuario predeterminado para la administración web." + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"Puede gestionar BackupPC a través de su interfaz web:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "For that purpose, a web user named 'backuppc' with '${pass}' as password has been created. You can change this password by running 'htpasswd /etc/backuppc/htpasswd backuppc'." +msgstr "Para ello se ha creado un usuario web llamado «backuppc» con la contraseña «${pass}». Puede cambiar esta contraseña ejecutando «htpasswd /etc/backuppc/htpasswd backuppc»." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Qué servidor web desea reconfigurar automáticamente:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "BackupPC supports any web server with CGI enabled, but this automatic configuration process only supports Apache." +msgstr "BackupPC permite utilizar cualquier servidor web con CGI activado, pero el proceso de configuración automática sólo se puede realizar sobre Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "¿Desea reiniciar los servidores web ahora si fuera necesario?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Remember that in order to activate the new configuration the webservers have to be restarted." +msgstr "Recuerde que para poder activar la configuración nueva los servidores web se deben reiniciar." + +#~ msgid "Add aliases for /backuppc/ to your apache config files ?" +#~ msgstr "" +#~ "¿Desea añadir alias para /backuppc/ en su fichero de configuración de " +#~ "apache?" +#~ msgid "" +#~ "In order to have the Backuppc web administration interface working, I " +#~ "need to add an include line in your apache configuration, which will set-" +#~ "up a few aliases." +#~ msgstr "" +#~ "Para que la interfaz de administración web de Backuppc funcione se " +#~ "necesita añadir una línea «include», que establecerá algunos alias en la " +#~ "configuración de apache." +#~ msgid "" +#~ "If you do not trust automatically modified configurations, you can add " +#~ "the /etc/backuppc/apache.conf include file later yourself." +#~ msgstr "" +#~ "Posteriormente puede añadir el fichero /etc/backup/apache.conf si no se " +#~ "fía de las configuraciones que se han modificado de forma automática." + --- backuppc-3.2.1.orig/debian/po/pt.po +++ backuppc-3.2.1/debian/po/pt.po @@ -0,0 +1,78 @@ +# translation of backuppc debconf to Portuguese +# Copyright (C) 2007 Américo Monteiro +# This file is distributed under the same license as the backuppc package. +# +# Américo Monteiro , 2007. +msgid "" +msgstr "" +"Project-Id-Version: backuppc 3.0.0-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-05-25 04:30+0200\n" +"PO-Revision-Date: 2007-07-22 17:22+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Criado utilizador por omissão para administração Web." + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC pode ser gerido através da sua interface Web:\n " +"http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"Para esse propósito, foi criado um servidor Web chamado 'backuppc' usando " +"'${pass}' como password. Você pode mudar esta password com o comando " +"'htpasswd /etc/backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Qual o servidor Web que deseja reconfigurar automaticamente?" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC suporta qualquer servidor Web com CGI activo, mas este processo " +"de configuração automático apenas suporta Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Você quer reiniciar agora os servidores Web caso seja necessário?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Lembre-se que para activar a nova configuração, os servidores Web precisam " +"ser reiniciados." + --- backuppc-3.2.1.orig/debian/po/templates.pot +++ backuppc-3.2.1/debian/po/templates.pot @@ -0,0 +1,76 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-02-13 10:56+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../backuppc.templates:3 +msgid "Web administration default user created" +msgstr "" + +#. Type: note +#. Description +#: ../backuppc.templates:3 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" + +#. Type: note +#. Description +#: ../backuppc.templates:3 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:15 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:15 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" + +#. Type: boolean +#. Description +#: ../backuppc.templates:22 +msgid "Do you want to restart the webservers now if needed?" +msgstr "" + +#. Type: boolean +#. Description +#: ../backuppc.templates:22 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" --- backuppc-3.2.1.orig/debian/po/ja.po +++ backuppc-3.2.1/debian/po/ja.po @@ -0,0 +1,85 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc 3.1.0-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-12-19 04:31+0100\n" +"PO-Revision-Date: 2008-01-31 07:26+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "web 管理用の標準ユーザが作成されます" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC は web インターフェイスから操作できます: \n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"このため、web ユーザ 'backuppc' がパスワード '${pass}' で作成されます。すぐ" +"に 'htpasswd /etc/backuppc/htpasswd backuppc' としてこのパスワードを変更して" +"ください。" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "どの web サーバを自動的に再構成するか:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC は CGI が動く web サーバであれば動作しますが、この自動構成では Apache " +"のみをサポートしています。" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "必要であれば今、web サーバを再起動しますか?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"新しい設定を有効にするには web サーバを再起動する必要があります。" + --- backuppc-3.2.1.orig/debian/po/eu.po +++ backuppc-3.2.1/debian/po/eu.po @@ -0,0 +1,78 @@ +# translation of backuppc-eu.po to Euskara +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Piarres Beobide , 2008. +msgid "" +msgstr "" +"Project-Id-Version: backuppc-eu\n" +"Report-Msgid-Bugs-To: backuppc@packages.debian.org\n" +"POT-Creation-Date: 2008-10-12 12:34+0200\n" +"PO-Revision-Date: 2008-10-13 13:55+0200\n" +"Last-Translator: Piarres Beobide \n" +"Language-Team: Euskara \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Web kudeaketa lehenetsiko erabiltzailea sortua" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC bere web interfazearen bidez kudeatu daiteke:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"Honetarako 'backuppc' izeneko erabiltzaile bat eta horrentzat '${pass}' pasahitza " +"sortu dira. Pasahitz hau aldatzeko aukera duzu 'htpasswd /etc/backuppc/htpasswd " +"backuppc' abiaraziaz." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Zein web zerbitzari nahi duzu automatikoki konfiguratzea:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC-ek CGI gaiturik duen edozein web zerbitzari onartzen du, baina " +"konfigurazio automatiko honek apache bakarrik konfiguratzeko gai da." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Nahi al duzu web zerbitzaria orain berrabiaraztea?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Kontutan izan konfigurazio berria martxan ipintzeko web-zerbitzaria berrabiarazi " +"egin behar dela." + --- backuppc-3.2.1.orig/debian/po/cs.po +++ backuppc-3.2.1/debian/po/cs.po @@ -0,0 +1,92 @@ +# Czech translation of backuppc templates +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc 2.1.1-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-02-16 04:30+0100\n" +"PO-Revision-Date: 2007-02-27 10:55+0100\n" +"Last-Translator: Martin Sin \n" +"Language-Team: Czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Bylo vytvořeno webové rozhraní s výchozím uživatelem" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC můžete ovládat přes jeho webové rozhraní:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"K tomuto účelu byl vytvořen uživatel se jménem 'backuppc' a heslem " +"'${pass}'. Toto heslo můžete změnit spuštěním příkazu 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Který webserver si přejete nastavit automaticky:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC podporuje libovolný webserver s povoleným CGI. Tento automatický " +"konfigurační proces však podporuje pouze Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Přejete si restartovat webové servery podle potřeby?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Pamatujte, že je nutné pro načtení nové konfigurace restartovat také " +"webový server." + +#~ msgid "Add aliases for /backuppc/ to your apache config files ?" +#~ msgstr "" +#~ "Přidat aliasy pro /backuppc/ do vašeho konfiguračního souboru apache?" + +#~ msgid "" +#~ "In order to have the Backuppc web administration interface working, I " +#~ "need to add an include line in your apache configuration, which will set-" +#~ "up a few aliases." +#~ msgstr "" +#~ "Pro zprovoznění administrátorského webového rozhranní Backuppc je potřeba " +#~ "přidat řádek do konfigurace apache, který nastaví několik aliasů." + +#~ msgid "" +#~ "If you do not trust automatically modified configurations, you can add " +#~ "the /etc/backuppc/apache.conf include file later yourself." +#~ msgstr "" +#~ "Jestliže nedůvěřujete automaticky vytvořeným konfiguracím, můžete přidat /" +#~ "etc/backuppc/apache.conf samostatně později." --- backuppc-3.2.1.orig/debian/po/vi.po +++ backuppc-3.2.1/debian/po/vi.po @@ -0,0 +1,71 @@ +# Vietnamese Translation for Backuppc. +# Copyright © 2009 Free Software Foundation, Inc. +# Clytie Siddall , 2005-2009. +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc 3.1.0-3.1\n" +"Report-Msgid-Bugs-To: backuppc@packages.debian.org\n" +"POT-Creation-Date: 2008-10-12 12:34+0200\n" +"PO-Revision-Date: 2009-01-31 16:55+1030\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.8\n" + +#: ../backuppc.templates:1001 +#. Type: note +#. Description +msgid "Web administration default user created" +msgstr "Người dùng mặc định để quản trị Web đã được tạo" + +#: ../backuppc.templates:1001 +#. Type: note +#. Description +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC có thể được quản lý thông qua giao diện Web:\n" +" http://${site}/backuppc/" + +#: ../backuppc.templates:1001 +#. Type: note +#. Description +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"Cho mục đích đó, một tên người dùng Web tên « backuppc » với mật khẩu « ${pass} » đã được tạo. Bạn cũng có khả năng thay đổi mật khẩu này bằng cách chạy câu lệnh « htpasswd /etc/backuppc/htpasswd backuppc »." + +#: ../backuppc.templates:2001 +#. Type: multiselect +#. Description +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Bạn có muốn tự động cấu hình trình phục vụ Web nào :" + +#: ../backuppc.templates:2001 +#. Type: multiselect +#. Description +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "Phần mềm BackupPC hỗ trợ bất cứ trình phục vụ Web nào cũng hiệu lực CGI, nhưng mà tiến trình tự động cấu hình chỉ hỗ trợ Apache." + +#: ../backuppc.templates:3001 +#. Type: boolean +#. Description +msgid "Do you want to restart the webservers now if needed?" +msgstr "Bạn có muốn khởi chạy lại các trình phục vụ Web (nếu yêu cầu) không?" + +#: ../backuppc.templates:3001 +#. Type: boolean +#. Description +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "Ghi nhớ rằng để kích hoạt cấu hình mới, các trình phục vụ Web cần phải được khởi chạy lại." --- backuppc-3.2.1.orig/debian/po/ru.po +++ backuppc-3.2.1/debian/po/ru.po @@ -0,0 +1,79 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2008. +msgid "" +msgstr "" +"Project-Id-Version: backuppc 3.1.0-3\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-05-23 04:30+0200\n" +"PO-Revision-Date: 2008-10-10 08:13+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Создана учётная запись по умолчанию для управления через веб" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC можно управлять через веб-интерфейс:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"Для этой цели создана учётная запись 'backuppc' с паролем '${pass}'. " +"Чтобы изменить пароль, запустите команду " +"'htpasswd /etc/backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Выберите веб-сервер для автоматической настройки:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC работает с любым веб-сервером с включённым CGI, но автоматическая " +"настройка доступна только для Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Перезапустить веб-сервер сейчас, если потребуется?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Чтобы новые настройки начали действовать, веб-сервер должен быть " +"перезапущен." + --- backuppc-3.2.1.orig/debian/po/POTFILES.in +++ backuppc-3.2.1/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] backuppc.templates --- backuppc-3.2.1.orig/debian/po/nl.po +++ backuppc-3.2.1/debian/po/nl.po @@ -0,0 +1,94 @@ +# translation of backuppc_3.1.0-3.1.po to Dutch +# This file is distributed under the same license as the backuppc package. +# Please see debian/copyright. +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Luk Claes , 2004. +# Paul Gevers , 2008. +msgid "" +msgstr "" +"Project-Id-Version: backuppc 2.0.2-2\n" +"Report-Msgid-Bugs-To: backuppc@packages.debian.org\n" +"POT-Creation-Date: 2008-10-12 12:34+0200\n" +"PO-Revision-Date: 2008-10-16 20:59-0600\n" +"Last-Translator: Paul Gevers \n" +"Language-Team: Debian l10n Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Standaard gebruiker voor webbeheer gecreerd" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC kan worden beheerd via de webinterface:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "For that purpose, a web user named 'backuppc' with '${pass}' as password has been created. You can change this password by running 'htpasswd /etc/backuppc/htpasswd backuppc'." +msgstr "Voor dit doel is er een webgebruiker 'backuppc' gecreerd met '${pass}' als wachtwoord. U kunt dit wachtwoord wijzigen met het commando 'htpasswd /etc/backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Welke webserver wilt u automatisch herconfigureren?" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "BackupPC supports any web server with CGI enabled, but this automatic configuration process only supports Apache." +msgstr "BackupPC ondersteunt iedere webserver die CGI aan heeft staan. Echter, alleen Apache wordt ondersteund door dit automatische configuratieproces." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Wilt u dat de webservers nu worden herstart, als dat nodig is?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Remember that in order to activate the new configuration the webservers have to be restarted." +msgstr "Om de nieuwe configuratie te activeren is het nodig dat de webservers herstart worden." + +#~ msgid "Add aliases for /backuppc/ to your apache config files ?" +#~ msgstr "" +#~ "Aliases voor /backuppc/ toevoegen aan uw apache-configuratiebestanden?" +#~ msgid "" +#~ "In order to have the Backuppc web administration interface working, I " +#~ "need to add an include line in your apache configuration, which will set-" +#~ "up a few aliases." +#~ msgstr "" +#~ "Om de Backuppc-webbeheer-interface te laten werken, moet er een include-" +#~ "regel worden toegevoegd in uw apache-configuratie die enkele aliases zal " +#~ "opzetten." +#~ msgid "" +#~ "If you do not trust automatically modified configurations, you can add " +#~ "the /etc/backuppc/apache.conf include file later yourself." +#~ msgstr "" +#~ "Als u dit niet vertrouwt, kunt u het /etc/backuppc/apache.conf-include-" +#~ "bestand later zelf toevoegen." + --- backuppc-3.2.1.orig/debian/po/it.po +++ backuppc-3.2.1/debian/po/it.po @@ -0,0 +1,78 @@ +# ITALIAN TRANSLATION OF BACKUPPC'S.PO-DEBCONF FILE +# Copyright (C) 2008 THE BACKUPPS'S COPYRIGHT HOLDER +# This file is distributed under the same license as the backuppc package. +# +# Vincenzo Campanella , 2008. +msgid "" +msgstr "" +"Project-Id-Version: it\n" +"Report-Msgid-Bugs-To: backuppc@packages.debian.org\n" +"POT-Creation-Date: 2008-10-12 12:34+0200\n" +"PO-Revision-Date: 2008-10-12 13:10+0200\n" +"Last-Translator: Vincenzo Campanella \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Creato utente predefinito per l'amministrazione web" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC può essere gestito attraverso la sua interfaccia web:\n " +"http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"A tale scopo è stato creato un utente web, \"backuppc\", con \"${pass}\" come " +"password. È possibile modificare questa password eseguendo " +"\"htpasswd /etc/backuppc/htpasswd backuppc\"." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Quale server web riconfigurare automaticamente:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC supporta qualsiasi server web con CGI abilitata, ma questo processo " +"di configurazione automatica supporta solo Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Riavviare i server web ora se necessario?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Ricordare che, per attivare la nuova configurazione, i server web devono " +"essere riavviati." + --- backuppc-3.2.1.orig/debian/po/de.po +++ backuppc-3.2.1/debian/po/de.po @@ -0,0 +1,87 @@ +# translation of backuppc_3.0.0-2_de.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Erik Schanze , 2004-2007. +msgid "" +msgstr "" +"Project-Id-Version: backuppc_3.0.0-2_de\n" +"Report-Msgid-Bugs-To: backuppc@packages,debian.org\n" +"POT-Creation-Date: 2007-02-16 04:30+0100\n" +"PO-Revision-Date: 2007-02-22 22:18+0100\n" +"Last-Translator: Erik Schanze \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Standard-Benutzer für die Web-Administration erstellt" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC kann mit seiner Web-Oberfläche verwaltet werden:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"Dafür wurde ein Benutzer namens »backuppc« mit »${pass}« als Passwort " +"eingerichtet. Sie können dieses Passwort durch das " +"Kommando 'htpasswd /etc/backuppc/htpasswd backuppc' ändern." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Welche Webserver wollen Sie automatisch neu einrichten:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC unterstützt jeden Webserver der CGI bietet, aber dieser " +"automatische Einrichtungsvorgang unterstützt nur Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Wollen Sie die Webserver wenn nötig jetzt neu starten?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Denken Sie daran, dass die Webserver neu gestartet werden müssen, " +"damit die neuen Einstellungen wirksam werden." + --- backuppc-3.2.1.orig/debian/po/fi.po +++ backuppc-3.2.1/debian/po/fi.po @@ -0,0 +1,60 @@ +msgid "" +msgstr "" +"Project-Id-Version: backuppc\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-05-23 04:30+0200\n" +"PO-Revision-Date: \n" +"Last-Translator: Esko Arajärvi \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Verkkohallinnan oletuskäyttäjätunnus luotu" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"Ohjelmaa BackupPC voidaan hallita sen verkkokäyttöliittymän kautta:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "For that purpose, a web user named 'backuppc' with '${pass}' as password has been created. You can change this password by running 'htpasswd /etc/backuppc/htpasswd backuppc'." +msgstr "Tätä varten on luotu verkkokäyttäjätunnus ”backuppc”, jonka salasana on ”${pass}”. Salasana voidaan vaihtaa ajamalla komento ”htpasswd /etc/backuppc/htpasswd backuppc”." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Verkkopalvelimet, joiden asetuksia muokataan automaattisesti:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "BackupPC supports any web server with CGI enabled, but this automatic configuration process only supports Apache." +msgstr "BackupPC tukee kaikkia verkkopalvelimia, joissa on CGI käytössä, mutta vain Apachen asetuksia voidaan muokata automaattisesti." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Tulisiko verkkopalvelimet tarvittaessa käynnistää uudelleen nyt?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Remember that in order to activate the new configuration the webservers have to be restarted." +msgstr "Verkkopalvelimet täytyy käynnistää uudelleen uusien asetusten ottamiseksi käyttöön." + --- backuppc-3.2.1.orig/debian/po/sv.po +++ backuppc-3.2.1/debian/po/sv.po @@ -0,0 +1,71 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc 2.1.2-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-05-23 04:30+0200\n" +"PO-Revision-Date: 2008-07-22 20:10+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Webadministrationens standardanvändare skapad" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC kan hanteras via sitt webbinterface:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "For that purpose, a web user named 'backuppc' with '${pass}' as password has been created. You can change this password by running 'htpasswd /etc/backuppc/htpasswd backuppc'." +msgstr "Av denna anledning har en webanvändare kallad 'backuppc' med '${pass}' som lösenord skapats. Du kan ändra lösenordet genom att köra 'htpasswd /etc/backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Vilken webbserver vill du ställa in automatiskt:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "BackupPC supports any web server with CGI enabled, but this automatic configuration process only supports Apache." +msgstr "BackupPC har stöd för alla CGI-kapabla webbservrar men den automatiska inställningen kan bara göras på Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Vill du starta om webbservern nu om det behövs?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Remember that in order to activate the new configuration the webservers have to be restarted." +msgstr "Kom ihïåg att webbservern måste startas om för att de nya inställningarna ska träda i kraft." + --- backuppc-3.2.1.orig/debian/po/fr.po +++ backuppc-3.2.1/debian/po/fr.po @@ -0,0 +1,84 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-02-13 10:56+0100\n" +"PO-Revision-Date: 2005-02-28 21:21+0200\n" +"Last-Translator: Ludovic Drolez \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../backuppc.templates:3 +msgid "Web administration default user created" +msgstr "Cration de l'utilisateur par dfaut pour l'administration Web" + +#. Type: note +#. Description +#: ../backuppc.templates:3 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"BackupPC peut tre gr avec une interface Web:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:3 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +" cet effet, un utilisateur web nomm backuppc a t cr. Son mot de " +"passe est actuellement ${pass}. Vous pouvez changer ce mot de passe avec " +"la commande htpasswd /etc/backuppc/htpasswd backuppc." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:15 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Quel serveur WEB voulez-vous configurer automatiquement :" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:15 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"BackupPC fonctionne sur tout serveur Web supportant les CGI, mais la " +"configuration automatique ne supporte qu'Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:22 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Voulez-vous relancer les serveurs Web si ncessaire ?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:22 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Veuillez noter que, pour mettre en service la nouvelle configuration, votre " +"serveur Web doit tre redmarr." --- backuppc-3.2.1.orig/debian/po/pt_BR.po +++ backuppc-3.2.1/debian/po/pt_BR.po @@ -0,0 +1,102 @@ +# backuppc Brazilian Portuguese translation +# Copyright (C) 2008 THE backuppc'S COPYRIGHT HOLDER +# This file is distributed under the same license as the backuppc package. +# André Luís Lopes , 2008. +# Adriano Rafael Gomes , 2008-2010. +# +msgid "" +msgstr "" +"Project-Id-Version: backuppc\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-10-09 10:27+0200\n" +"PO-Revision-Date: 2010-11-13 22:48-0200\n" +"Last-Translator: Adriano Rafael Gomes \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR utf-8\n" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "Web administration default user created" +msgstr "Criado usuário padrão para administração web" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"BackupPC can be managed through its web interface:\n" +" http://${site}/backuppc/" +msgstr "" +"O BackupPC pode ser gerenciado através de sua interface web:\n" +" http://${site}/backuppc/" + +#. Type: note +#. Description +#: ../backuppc.templates:1001 +msgid "" +"For that purpose, a web user named 'backuppc' with '${pass}' as password has " +"been created. You can change this password by running 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." +msgstr "" +"Para esse propósito foi criado um usuário web chamado 'backuppc' com a senha " +"'${pass}'. Você pode mudar essa senha executando o comando 'htpasswd /etc/" +"backuppc/htpasswd backuppc'." + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "Which web server would you like to reconfigure automatically:" +msgstr "Qual servidor web você gostaria de reconfigurar automaticamente:" + +#. Type: multiselect +#. Description +#: ../backuppc.templates:2001 +msgid "" +"BackupPC supports any web server with CGI enabled, but this automatic " +"configuration process only supports Apache." +msgstr "" +"O BackupPC suporta qualquer servidor web com CGI habilitado, mas este " +"processo de configuração automática suporta somente o Apache." + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "Do you want to restart the webservers now if needed?" +msgstr "Você quer reiniciar os servidores web agora se necessário?" + +#. Type: boolean +#. Description +#: ../backuppc.templates:3001 +msgid "" +"Remember that in order to activate the new configuration the webservers have " +"to be restarted." +msgstr "" +"Lembre-se que para ativar a nova configuração os servidores web devem ser " +"reiniciados." + +#~ msgid "Add aliases for /backuppc/ to your apache config files ?" +#~ msgstr "" +#~ "Adicionar aliases para /backppc/ em seus arquivos de configuração do " +#~ "Apache ?" + +#~ msgid "" +#~ "In order to have the Backuppc web administration interface working, I " +#~ "need to add an include line in your apache configuration, which will set-" +#~ "up a few aliases." +#~ msgstr "" +#~ "Para que a interface de administração Web do BackupPc funcione, é " +#~ "necessário adicionar uma linha 'Include' em seu arquivo de configuração " +#~ "do Apache, a qual irá configurar alguns aliases." + +#~ msgid "" +#~ "If you do not trust automatically modified configurations, you can add " +#~ "the /etc/backuppc/apache.conf include file later yourself." +#~ msgstr "" +#~ "Caso você não confie no procedimento automático, você pode adicionar o " +#~ "'Include /etc/backuppc/apache.conf' em seu arquivo de configuração do " +#~ "Apache manualmente posteriormente." --- backuppc-3.2.1.orig/debian/patches/config.pl.diff +++ backuppc-3.2.1/debian/patches/config.pl.diff @@ -0,0 +1,79 @@ +--- 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'; +@@ -952,7 +952,7 @@ + # redirection and pipes; put that in a script if you need it. + # + $Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName' +- . ' $I_option -U $userName -E -N -d 1' ++ . ' $I_option -U $userName -E -d 1' + . ' -c tarmode\\ full -Tc$X_option - $fileList'; + + # +@@ -966,7 +966,7 @@ + # redirection and pipes; put that in a script if you need it. + # + $Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName' +- . ' $I_option -U $userName -E -N -d 1' ++ . ' $I_option -U $userName -E -d 1' + . ' -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList'; + + # +@@ -984,7 +984,7 @@ + # redirection and pipes; put that in a script if you need it. + # + $Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName' +- . ' $I_option -U $userName -E -N -d 1' ++ . ' $I_option -U $userName -E -d 1' + . ' -c tarmode\\ full -Tx -'; + + # +@@ -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 --- backuppc-3.2.1.orig/conf/hosts +++ backuppc-3.2.1/conf/hosts @@ -54,3 +54,4 @@ host dhcp user moreUsers # <--- do not edit this line #farside 0 craig jill,jeff # <--- example static IP host entry #larson 1 bill # <--- example DHCP host entry +localhost 0 backuppc --- backuppc-3.2.1.orig/conf/config.pl +++ backuppc-3.2.1/conf/config.pl @@ -1637,6 +1637,7 @@ # $Conf{PingPath} = '/bin/echo'; # $Conf{PingPath} = ''; +$Conf{Ping6Path} = ''; # # Ping command. The following variables are substituted at run-time: --- backuppc-3.2.1.orig/httpd/BackupPC.conf +++ backuppc-3.2.1/httpd/BackupPC.conf @@ -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. + + + +# +# 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 + + + +Alias /backuppc/image /usr/share/backuppc/image +ScriptAlias /BackupPC_Admin /usr/share/backuppc/cgi-bin/BackupPC_Admin --- backuppc-3.2.1.orig/doc/BackupPC.pod +++ backuppc-3.2.1/doc/BackupPC.pod @@ -1758,7 +1758,7 @@ files (eg: 650MB). The archive for each host is done by default using -__INSTALLDIR__/BackupPC_archiveHost. This script can be copied +__INSTALLDIR__/bin/BackupPC_archiveHost. This script can be copied and customized as needed. =head2 Configuring an Archive Host @@ -1779,7 +1779,7 @@ The per-host archive command is $Conf{ArchiveClientCmd}. By default this invokes - __INSTALLDIR__/BackupPC_archiveHost + __INSTALLDIR__/bin/BackupPC_archiveHost which you can copy and customize as necessary. --- backuppc-3.2.1.orig/doc/BackupPC.html +++ backuppc-3.2.1/doc/BackupPC.html @@ -1690,7 +1690,7 @@ and the output is optionally compressed and split into fixed-sized files (eg: 650MB).

The archive for each host is done by default using -__INSTALLDIR__/BackupPC_archiveHost. This script can be copied +__INSTALLDIR__/bin/BackupPC_archiveHost. This script can be copied and customized as needed.

@@ -1707,7 +1707,7 @@

The per-host archive command is $Conf{ArchiveClientCmd}. By default this invokes

-     __INSTALLDIR__/BackupPC_archiveHost
+ __INSTALLDIR__/bin/BackupPC_archiveHost

which you can copy and customize as necessary.

--- backuppc-3.2.1.orig/lib/BackupPC/Lib.pm +++ backuppc-3.2.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; @@ -123,7 +124,7 @@ useFHS => $useFHS, TopDir => $topDir, InstallDir => $installDir, - ConfDir => $confDir eq "" ? "$topDir/conf" : $confDir, + ConfDir => "/etc/backuppc", LogDir => "$topDir/log", }; } @@ -495,7 +496,8 @@ } if ( $IODirentOk ) { @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh)); - map { $_->{type} = 0 + $_->{type} } @entries; # make type numeric + #map { $_->{type} = 0 + $_->{type} } @entries; # make type numeric + map { $_->{type} = 0 + $_->{type}; $_->{type} = undef if ($_->{type} eq BPC_DT_UNKNOWN); } @entries; # make type numeric, unset unknown types } else { @entries = map { { name => $_} } readdir($fh); } @@ -954,6 +956,7 @@ { my($bpc, $host) = @_; my($s, $pingCmd, $ret); + my($family, @res, $args); # # Return success if the ping cmd is undefined or empty. @@ -964,10 +967,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); # --- backuppc-3.2.1.orig/lib/BackupPC/CGI/View.pm +++ backuppc-3.2.1/lib/BackupPC/CGI/View.pm @@ -46,7 +46,7 @@ my $compress = 0; my $fh; my $host = $In{host}; - my $num = $In{num}; + my $num = ${EscHTML($In{num})}; my $type = $In{type}; my $linkHosts = 0; my($file, $comment); @@ -86,7 +86,7 @@ $file = $bpc->ConfDir() . "/hosts"; $linkHosts = 1; } elsif ( $type eq "docs" ) { - $file = $bpc->InstallDir() . "/doc/BackupPC.html"; + $file = "/usr/share/doc/backuppc/BackupPC.html"; } elsif ( $host ne "" ) { if ( !defined($In{num}) ) { # get the latest LOG file --- backuppc-3.2.1.orig/lib/BackupPC/CGI/GeneralInfo.pm +++ backuppc-3.2.1/lib/BackupPC/CGI/GeneralInfo.pm @@ -44,6 +44,14 @@ GetStatusInfo("info jobs hosts queueLen"); my $Privileged = CheckPermission(); + if ($In{image} ne "") { + $In{image} =~ /([0-9]+)/; + my $weeks = $1; + print "Content-type: image/png\n\n"; + print `/usr/bin/rrdtool graph - --imgformat=PNG --start=end-${weeks}w --end=-300 --title="BackupPC Pool Size (${weeks} weeks)" --base=1000 --height=100 --width=600 --alt-autoscale-max --lower-limit=0 --vertical-label="" --slope-mode --font TITLE:10:Times --font AXIS:8:Times --font LEGEND:8:Times --font UNIT:8:Times -c BACK#FFFFFF DEF:ao="$LogDir/pool.rrd":ckb:AVERAGE CDEF:a=ao,1024,* AREA:a#95B8DB:"CPool in bytes" GPRINT:a:LAST:"Current\\:%8.2lf %s" GPRINT:a:AVERAGE:"Average\\:%8.2lf %s" GPRINT:a:MAX:"Maximum\\:%8.2lf %s\\n"`; + return; + } + my($jobStr, $statusStr); foreach my $host ( sort(keys(%Jobs)) ) { my $startTime = timeStamp2($Jobs{$host}{startTime}); @@ -129,6 +137,11 @@ my $generalInfo = eval("qq{$Lang->{BackupPC_Server_Status_General_Info}}") if ( $Privileged ); my $content = eval("qq{$Lang->{BackupPC_Server_Status}}"); + + if (-r "$LogDir/pool.rrd" && $Privileged) { + $content .= '

'; + } + Header($Lang->{H_BackupPC_Server_Status}, $content); Trailer(); } --- backuppc-3.2.1.orig/lib/BackupPC/CGI/Lib.pm +++ backuppc-3.2.1/lib/BackupPC/CGI/Lib.pm @@ -484,7 +484,7 @@ NavLink("?action=editConfig&host=${EscURI($host)}", $Lang->{CfgEdit_Edit_Config}, " class=\"navbar\""); } elsif ( -f "$TopDir/pc/$host/config.pl" - || ($host ne "config" && -f "$TopDir/conf/$host.pl") ) { + || ($host ne "config" && -f "/etc/backuppc/$host.pl") ) { NavLink("?action=view&type=config&host=${EscURI($host)}", $Lang->{Config_file}, " class=\"navbar\""); } --- backuppc-3.2.1.orig/lib/BackupPC/CGI/EditConfig.pm +++ backuppc-3.2.1/lib/BackupPC/CGI/EditConfig.pm @@ -378,8 +378,8 @@ my $host = $In{host}; my $menu = $In{menu} || "server"; my $hosts_path = $Hosts; - my $config_path = $host eq "" ? "$TopDir/conf/config.pl" - : "$TopDir/pc/$host/config.pl"; + my $config_path = $host eq "" ? "/etc/backuppc/config.pl" + : "/etc/backuppc/$host.pl"; my $Privileged = CheckPermission($host) && ($PrivAdmin || $Conf{CgiUserConfigEditEnable}); @@ -390,6 +390,9 @@ ErrorExit(eval("qq{$Lang->{Only_privileged_users_can_edit_config_files}}")); } + # Debian: ClientNameAlias is too dangerous, disable it + $bpc->{Conf}{CgiUserConfigEdit}{ClientNameAlias} = 0; + if ( defined($In{menu}) || $In{saveAction} eq "Save" ) { $errors = errorCheck(); if ( %$errors ) { @@ -451,6 +454,7 @@ # based on what is enabled. Admin users can edit all the # available per-host settings. # + foreach my $m ( keys(%ConfigMenu) ) { my $enabled = 0; my $text = -1; --- backuppc-3.2.1.orig/lib/BackupPC/Storage/Text.pm +++ backuppc-3.2.1/lib/BackupPC/Storage/Text.pm @@ -268,7 +268,7 @@ if ( -f "$s->{TopDir}/pc/$host/config.pl" ); return "$s->{ConfDir}/$host.pl" if ( $host ne "config" && -f "$s->{ConfDir}/$host.pl" ); - return "$s->{ConfDir}/pc/$host.pl"; + return "$s->{ConfDir}/$host.pl"; } } @@ -283,6 +283,7 @@ my $conf = $prevConfig || {}; my $configPath = $s->ConfigPath($host); + push(@configs, "/etc/backuppc/localconfig.pl") if ( -f "/etc/backuppc/localconfig.pl" ); push(@configs, $configPath) if ( -f $configPath ); foreach $config ( @configs ) { %Conf = %$conf; --- backuppc-3.2.1.orig/lib/BackupPC/Config/Meta.pm +++ backuppc-3.2.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}, --- backuppc-3.2.1.orig/bin/BackupPC_restore +++ backuppc-3.2.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. --- backuppc-3.2.1.orig/bin/BackupPC +++ backuppc-3.2.1/bin/BackupPC @@ -363,11 +363,11 @@ # Write out our initial status and save our PID # StatusWrite(); - unlink("$LogDir/BackupPC.pid"); - if ( open(PID, ">", "$LogDir/BackupPC.pid") ) { + unlink("/var/run/backuppc/BackupPC.pid"); + if ( open(PID, ">", "/var/run/backuppc/BackupPC.pid") ) { print(PID $$); close(PID); - chmod(0444, "$LogDir/BackupPC.pid"); + chmod(0444, "/var/run/backuppc/BackupPC.pid"); } # @@ -1198,6 +1198,15 @@ $Info{"${p}FileRepMax"}, $Info{"${p}FileLinkMax"}, $Info{"${p}DirCnt"}); } + if (-x "/usr/bin/rrdtool") { + my $date = time() + (24*3600); + if (! -f "$LogDir/pool.rrd") { + system("/usr/bin/rrdtool create $LogDir/pool.rrd --step 86400 DS:ckb:GAUGE:172800:0:U RRA:AVERAGE:0.5:1:1400"); + } + system("/usr/bin/rrdtool update $LogDir/pool.rrd --template ckb $date:".($Info{"cpoolKb"}+$Info{"poolKb"})); + #print(LOG $bpc->timeStamp, "RRD data\n"); + #print(LOG $bpc->timeStamp, "RRD data: ".($Info{"cpoolKb"}+$Info{"poolKb"})."\n"); + } } } else { $CmdJob = ""; @@ -1846,7 +1855,7 @@ close(LOG); LogFileOpen(); print(LOG "Fatal error: unhandled signal $SigName\n"); - unlink("$LogDir/BackupPC.pid"); + unlink("/var/run/backuppc/BackupPC.pid"); confess("Got new signal $SigName... quitting\n"); } else { $SigName = shift; @@ -1968,7 +1977,7 @@ } delete($Info{pid}); StatusWrite(); - unlink("$LogDir/BackupPC.pid"); + unlink("/var/run/backuppc/BackupPC.pid"); exit(1); } --- backuppc-3.2.1.orig/bin/BackupPC_dump +++ backuppc-3.2.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.