Merge lp:~allison/ubuntu/oneiric/backuppc/bug-852484 into lp:ubuntu/oneiric/backuppc

[Dave Walker]

[James Page (james-page)]

LGTM

[James Page (james-page)]

However I can't upload - but still LGTM!

review: Approve

[Dave Walker (davewalker)]

Uploading thanks to ~james-page's review.

=== modified file 'ChangeLog'
--- ChangeLog	2010-11-21 14:59:53 +0000
+++ ChangeLog	2011-09-19 08:47:26 +0000
@@ -11,13 +11,36 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
 #========================================================================
 
 #------------------------------------------------------------------------
+# Version 3.2.1, 24 Apr 2011
+#------------------------------------------------------------------------
+
+* Ensure $num is numeric in lib/BackupPC/CGI/Browse.pm to avoid XSS
+  attack.  Report and patch by Adam E.
+
+* Fixed application of "*" in $Conf{BackupFilesOnly} and
+  $Conf{BackupFilesExclud} for 2nd and later shares.  Reported
+  by Alessandro and Alexander Maringer.
+
+* Fixed email status check in lib/BackupPC/CGI/HostInfo.pl so that
+  empty email info doesn't appear; reported by Wayne Trevena,
+  and based on patch from Tyler Wagner.
+
+* Several fixes to FTP xfer mode related to file excludes, from
+  Dave Pearce.
+
+* Wrapped eval() around unpack() in lib/BackupPC/Attrib.pm to avoid
+  failures on corrupted attrib files; patch from Tim Connors.
+
+* Applied documention patch from Alexander Moisseev.
+
+#------------------------------------------------------------------------
 # Version 3.2.0, 31 Jul 2010
 #------------------------------------------------------------------------
 

=== modified file 'README'
--- README	2010-11-21 14:59:53 +0000
+++ README	2011-09-19 08:47:26 +0000
@@ -1,11 +1,11 @@
 
                               BackupPC
 
-                            Version 3.2.0
-
-                            31 Jul 2010
-
-         Copyright (C) 2001-2009 Craig Barratt.  All rights reserved.
+                            Version 3.2.1
+
+                            24 Apr 2011
+
+         Copyright (C) 2001-2010 Craig Barratt.  All rights reserved.
 
       This program is free software; you can redistribute it and/or
       modify it under the terms of the GNU General Public License.
@@ -28,8 +28,8 @@
 
 To install BackupPC run these commands as root:
 
-    tar zxf BackupPC-3.2.0.tar.gz
-    cd BackupPC-3.2.0
+    tar zxf BackupPC-3.2.1.tar.gz
+    cd BackupPC-3.2.1
     perl configure.pl
 
 This will automatically determine some system information and prompt you

=== modified file 'bin/BackupPC'
--- bin/BackupPC	2010-11-21 14:59:53 +0000
+++ bin/BackupPC	2011-09-19 08:47:26 +0000
@@ -47,7 +47,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_archive'
--- bin/BackupPC_archive	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_archive	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_archiveHost'
--- bin/BackupPC_archiveHost	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_archiveHost	2011-09-19 08:47:26 +0000
@@ -38,7 +38,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_archiveStart'
--- bin/BackupPC_archiveStart	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_archiveStart	2011-09-19 08:47:26 +0000
@@ -35,7 +35,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_attribPrint'
--- bin/BackupPC_attribPrint	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_attribPrint	2011-09-19 08:47:26 +0000
@@ -31,7 +31,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_dump'
--- bin/BackupPC_dump	2011-03-07 11:35:50 +0000
+++ bin/BackupPC_dump	2011-09-19 08:47:26 +0000
@@ -77,7 +77,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_fixupBackupSummary'
--- bin/BackupPC_fixupBackupSummary	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_fixupBackupSummary	2011-09-19 08:47:26 +0000
@@ -30,7 +30,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_link'
--- bin/BackupPC_link	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_link	2011-09-19 08:47:26 +0000
@@ -39,7 +39,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_nightly'
--- bin/BackupPC_nightly	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_nightly	2011-09-19 08:47:26 +0000
@@ -55,7 +55,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_restore'
--- bin/BackupPC_restore	2011-03-07 11:35:50 +0000
+++ bin/BackupPC_restore	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_sendEmail'
--- bin/BackupPC_sendEmail	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_sendEmail	2011-09-19 08:47:26 +0000
@@ -31,7 +31,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_serverMesg'
--- bin/BackupPC_serverMesg	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_serverMesg	2011-09-19 08:47:26 +0000
@@ -43,7 +43,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_tarCreate'
--- bin/BackupPC_tarCreate	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_tarCreate	2011-09-19 08:47:26 +0000
@@ -55,7 +55,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_tarExtract'
--- bin/BackupPC_tarExtract	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_tarExtract	2011-09-19 08:47:26 +0000
@@ -27,7 +27,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_tarPCCopy'
--- bin/BackupPC_tarPCCopy	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_tarPCCopy	2011-09-19 08:47:26 +0000
@@ -38,7 +38,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_trashClean'
--- bin/BackupPC_trashClean	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_trashClean	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_zcat'
--- bin/BackupPC_zcat	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_zcat	2011-09-19 08:47:26 +0000
@@ -32,7 +32,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'bin/BackupPC_zipCreate'
--- bin/BackupPC_zipCreate	2010-11-21 14:59:53 +0000
+++ bin/BackupPC_zipCreate	2011-09-19 08:47:26 +0000
@@ -51,7 +51,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'cgi-bin/BackupPC_Admin'
--- cgi-bin/BackupPC_Admin	2010-11-21 14:59:53 +0000
+++ cgi-bin/BackupPC_Admin	2011-09-19 08:47:26 +0000
@@ -39,7 +39,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'conf/BackupPC_stnd.css'
--- conf/BackupPC_stnd.css	2010-11-21 14:59:53 +0000
+++ conf/BackupPC_stnd.css	2011-09-19 08:47:26 +0000
@@ -1,7 +1,7 @@
 /*
  * BackupPC standard CSS definitions
  *
- * Version 3.2.0, released 31 Jul 2010.
+ * Version 3.2.1, released 24 Apr 2011.
  *
  * See http://backuppc.sourceforge.net.
  *

=== modified file 'conf/BackupPC_stnd_orig.css'
--- conf/BackupPC_stnd_orig.css	2010-11-21 14:59:53 +0000
+++ conf/BackupPC_stnd_orig.css	2011-09-19 08:47:26 +0000
@@ -1,7 +1,7 @@
 /*
  * BackupPC standard CSS definitions
  *
- * Version 3.2.0, released 31 Jul 2010.
+ * Version 3.2.1, released 24 Apr 2011.
  *
  * See http://backuppc.sourceforge.net.
  *

=== modified file 'configure.pl'
--- configure.pl	2011-03-07 11:35:50 +0000
+++ configure.pl	2011-09-19 08:47:26 +0000
@@ -19,7 +19,7 @@
 #   Craig Barratt <[e-mail]>
 #
 # COPYRIGHT
-#   Copyright (C) 2001-2009  Craig Barratt
+#   Copyright (C) 2001-2010  Craig Barratt
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -72,7 +72,7 @@
 BackupPC distribution.  This probably means you did not cd to the
 unpacked BackupPC distribution before running configure.pl, eg:
 
-    cd BackupPC-3.2.0
+    cd BackupPC-3.2.1
     ./configure.pl
 
 Please try again.
@@ -673,7 +673,7 @@
     #
     # Install new CSS file, making a backup copy if necessary
     #
-    my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.2.0";
+    my $cssBackup = "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css.pre-3.2.1";
     if ( -f "$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css" && !-f $cssBackup ) {
 	rename("$DestDir$Conf{CgiImageDir}/BackupPC_stnd.css", $cssBackup);
     }
@@ -893,7 +893,7 @@
 #
 # Now backup and write the config file
 #
-my $confCopy = "$dest.pre-3.2.0";
+my $confCopy = "$dest.pre-3.2.1";
 if ( -f $dest && !-f $confCopy ) {
     #
     # Make copy of config file, preserving ownership and modes
@@ -1386,7 +1386,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001-2009  Craig Barratt.
+Copyright (C) 2001-2010  Craig Barratt.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-15 16:28:41 +0000
+++ debian/changelog	2011-09-19 08:47:26 +0000
@@ -1,3 +1,32 @@
+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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 28 Jun 2011 22:31:10 +0200
+
 backuppc (3.2.0-4ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable. Remaining changes:

=== modified file 'debian/control'
--- debian/control	2011-06-15 16:28:41 +0000
+++ debian/control	2011-09-19 08:47:26 +0000
@@ -8,7 +8,7 @@
 
 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, ucf, libtime-modules-perl, libwww-perl, libsocket6-perl
+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)

=== modified file 'doc/BackupPC.html'
--- doc/BackupPC.html	2010-11-21 14:59:53 +0000
+++ doc/BackupPC.html	2011-09-19 08:47:26 +0000
@@ -124,8 +124,8 @@
 <p>
 </p>
 <h1><a name="backuppc_introduction">BackupPC Introduction</a></h1>
-<p>This documentation describes BackupPC version 3.2.0,
-released on 31 Jul 2010.</p>
+<p>This documentation describes BackupPC version 3.2.1,
+released on 24 Apr 2011.</p>
 <p>
 </p>
 <h2><a name="overview">Overview</a></h2>
@@ -591,7 +591,7 @@
 and install BackupPC yourself.  If you use a package provided by a
 distribution, the package management system should take of installing
 any needed dependencies.</p>
-<p>First off, there are three perl modules you should install.
+<p>First off, there are five perl modules you should install.
 These are all optional, but highly recommended:</p>
 <dl>
 <dt><strong><a name="compress_zlib" class="item">Compress::Zlib</a></strong></dt>
@@ -624,12 +624,14 @@
 File::RsyncP is available from <a href="http://perlrsync.sourceforge.net">http://perlrsync.sourceforge.net</a>.
 Version 0.68 or later is required.</p>
 </dd>
-<dt><strong><a name="file_rsyncp2" class="item">File::RsyncP</a></strong></dt>
+<dt><strong><a name="file_listing_net_ftp_net_ftp_retrhandle_net_ftp_autoreconnect" class="item">File::Listing, Net::FTP, Net::FTP::RetrHandle, Net::FTP::AutoReconnect</a></strong></dt>
 
 <dd>
-<p>To use ftp with BackupPC you will need to install three libraries:
-Net::FTP, Net::FTP::RetrHandle and Net::FTP::AutoReconnect. You can
-run &quot;perldoc Net::FTP&quot; to see if a particular module is installed.</p>
+<p>To use ftp with BackupPC you will need four libraries, but actually
+need to install only File::Listing from <a href="http://www.cpan.org">http://www.cpan.org</a>.
+You can run &quot;perldoc File::Listing&quot; to see if this module is installed.
+Net::FTP is a standard module. Net::FTP::RetrHandle and
+Net::FTP::AutoReconnect included in BackupPC distribution.</p>
 </dd>
 </dl>
 <p>To build and install these packages you should use the cpan program.
@@ -644,27 +646,27 @@
     make install</pre>
 <p>The same sequence of commands can be used for each module.</p>
 <p>Now let's move onto BackupPC itself.  After fetching
-BackupPC-3.2.0.tar.gz, run these commands as root:</p>
+BackupPC-3.2.1.tar.gz, run these commands as root:</p>
 <pre>
-    tar zxf BackupPC-3.2.0.tar.gz
-    cd BackupPC-3.2.0
+    tar zxf BackupPC-3.2.1.tar.gz
+    cd BackupPC-3.2.1
     perl configure.pl</pre>
 <p>In the future this release might also have patches available on the
 SourceForge site.  These patch files are text files, with a name of
 the form</p>
 <pre>
-    BackupPC-3.2.0plN.diff</pre>
+    BackupPC-3.2.1plN.diff</pre>
 <p>where N is the patch level, eg: pl2 is patch-level 2.  These
 patch files are cumulative: you only need apply the last patch
 file, not all the earlier patch files.  If a patch file is
-available, eg: BackupPC-3.2.0pl2.diff, you should apply
+available, eg: BackupPC-3.2.1pl2.diff, you should apply
 the patch after extracting the tar file:</p>
 <pre>
-     # fetch BackupPC-3.2.0.tar.gz
-     # fetch BackupPC-3.2.0pl2.diff
-     tar zxf BackupPC-3.2.0.tar.gz
-     cd BackupPC-3.2.0
-     patch -p0 &lt; ../BackupPC-3.2.0pl2.diff
+     # fetch BackupPC-3.2.1.tar.gz
+     # fetch BackupPC-3.2.1pl2.diff
+     tar zxf BackupPC-3.2.1.tar.gz
+     cd BackupPC-3.2.1
+     patch -p0 &lt; ../BackupPC-3.2.1pl2.diff
      perl configure.pl</pre>
 <p>A patch file includes comments that describe that bug fixes
 and changes.  Feel free to review it before you apply the patch.</p>

=== modified file 'doc/BackupPC.pod'
--- doc/BackupPC.pod	2010-11-21 14:59:53 +0000
+++ doc/BackupPC.pod	2011-09-19 08:47:26 +0000
@@ -1,7 +1,7 @@
 =head1 BackupPC Introduction
 
-This documentation describes BackupPC version 3.2.0,
-released on 31 Jul 2010.
+This documentation describes BackupPC version 3.2.1,
+released on 24 Apr 2011.
 
 =head2 Overview
 
@@ -522,7 +522,7 @@
 distribution, the package management system should take of installing
 any needed dependencies.
 
-First off, there are three perl modules you should install.
+First off, there are five perl modules you should install.
 These are all optional, but highly recommended:
 
 =over 4
@@ -553,11 +553,13 @@
 File::RsyncP is available from L<http://perlrsync.sourceforge.net>.
 Version 0.68 or later is required.
 
-=item File::RsyncP
+=item File::Listing, Net::FTP, Net::FTP::RetrHandle, Net::FTP::AutoReconnect
 
-To use ftp with BackupPC you will need to install three libraries:
-Net::FTP, Net::FTP::RetrHandle and Net::FTP::AutoReconnect. You can
-run "perldoc Net::FTP" to see if a particular module is installed.
+To use ftp with BackupPC you will need four libraries, but actually
+need to install only File::Listing from L<http://www.cpan.org>.
+You can run "perldoc File::Listing" to see if this module is installed.
+Net::FTP is a standard module. Net::FTP::RetrHandle and
+Net::FTP::AutoReconnect included in BackupPC distribution.
 
 =back
 
@@ -575,29 +577,29 @@
 The same sequence of commands can be used for each module.
 
 Now let's move onto BackupPC itself.  After fetching
-BackupPC-3.2.0.tar.gz, run these commands as root:
+BackupPC-3.2.1.tar.gz, run these commands as root:
 
-    tar zxf BackupPC-3.2.0.tar.gz
-    cd BackupPC-3.2.0
+    tar zxf BackupPC-3.2.1.tar.gz
+    cd BackupPC-3.2.1
     perl configure.pl
 
 In the future this release might also have patches available on the
 SourceForge site.  These patch files are text files, with a name of
 the form
 
-    BackupPC-3.2.0plN.diff
+    BackupPC-3.2.1plN.diff
 
 where N is the patch level, eg: pl2 is patch-level 2.  These
 patch files are cumulative: you only need apply the last patch
 file, not all the earlier patch files.  If a patch file is
-available, eg: BackupPC-3.2.0pl2.diff, you should apply
+available, eg: BackupPC-3.2.1pl2.diff, you should apply
 the patch after extracting the tar file:
 
-     # fetch BackupPC-3.2.0.tar.gz
-     # fetch BackupPC-3.2.0pl2.diff
-     tar zxf BackupPC-3.2.0.tar.gz
-     cd BackupPC-3.2.0
-     patch -p0 < ../BackupPC-3.2.0pl2.diff
+     # fetch BackupPC-3.2.1.tar.gz
+     # fetch BackupPC-3.2.1pl2.diff
+     tar zxf BackupPC-3.2.1.tar.gz
+     cd BackupPC-3.2.1
+     patch -p0 < ../BackupPC-3.2.1pl2.diff
      perl configure.pl
 
 A patch file includes comments that describe that bug fixes

=== modified file 'init.d/src/debian-backuppc'
--- init.d/src/debian-backuppc	2010-11-21 14:59:53 +0000
+++ init.d/src/debian-backuppc	2011-09-19 08:47:26 +0000
@@ -4,7 +4,7 @@
 #
 #   Startup init script for BackupPC on Debian.
 #
-# Distributed with BackupPC version 3.2.0, released 31 Jul 2010.
+# Distributed with BackupPC version 3.2.1, released 24 Apr 2011.
 #
 
 set -e

=== modified file 'init.d/src/gentoo-backuppc'
--- init.d/src/gentoo-backuppc	2010-11-21 14:59:53 +0000
+++ init.d/src/gentoo-backuppc	2011-09-19 08:47:26 +0000
@@ -4,7 +4,7 @@
 #
 #   Startup init script for BackupPC on Gentoo` linux.
 #
-# Distributed with BackupPC version 3.2.0, released 31 Jul 2010.
+# Distributed with BackupPC version 3.2.1, released 24 Apr 2011.
 #
 # description: Starts and stops the BackupPC server
 # Copy to /etc/init.d and run 'rc-update add backuppc default'

=== modified file 'init.d/src/linux-backuppc'
--- init.d/src/linux-backuppc	2010-11-21 14:59:53 +0000
+++ init.d/src/linux-backuppc	2011-09-19 08:47:26 +0000
@@ -4,7 +4,7 @@
 #
 #   Startup init script for BackupPC on Redhat linux.
 #
-# Distributed with BackupPC version 3.2.0, released 31 Jul 2010.
+# Distributed with BackupPC version 3.2.1, released 24 Apr 2011.
 #
 # chkconfig: - 91 35
 # description: Starts and stops the BackupPC server

=== modified file 'init.d/src/slackware-backuppc'
--- init.d/src/slackware-backuppc	2010-11-21 14:59:53 +0000
+++ init.d/src/slackware-backuppc	2011-09-19 08:47:26 +0000
@@ -4,7 +4,7 @@
 #
 # Startup init script for BackupPC for Slackware.
 #
-# Distributed with BackupPC version 3.2.0, released 31 Jul 2010.
+# Distributed with BackupPC version 3.2.1, released 24 Apr 2011.
 #
 # Provided by Tony Nelson.
 #

=== modified file 'init.d/src/solaris-backuppc'
--- init.d/src/solaris-backuppc	2010-11-21 14:59:53 +0000
+++ init.d/src/solaris-backuppc	2011-09-19 08:47:26 +0000
@@ -4,7 +4,7 @@
 #
 #   Startup init script for BackupPC for solaris.
 #
-# Distributed with BackupPC version 3.2.0, released 31 Jul 2010.
+# Distributed with BackupPC version 3.2.1, released 24 Apr 2011.
 #
 # Not tested...
 # 

=== modified file 'init.d/src/suse-backuppc'
--- init.d/src/suse-backuppc	2010-11-21 14:59:53 +0000
+++ init.d/src/suse-backuppc	2011-09-19 08:47:26 +0000
@@ -4,7 +4,7 @@
 #
 # Startup init script for BackupPC on suse linux.
 #
-# Distributed with BackupPC version 3.2.0, released 31 Jul 2010.
+# Distributed with BackupPC version 3.2.1, released 24 Apr 2011.
 #
 
 set -e

=== modified file 'lib/BackupPC/Attrib.pm' (properties changed: +x to -x)
--- lib/BackupPC/Attrib.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Attrib.pm	2011-09-19 08:47:26 +0000
@@ -30,7 +30,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -297,10 +297,15 @@
                     = $a->{files}{$file}{size} % (4096 * 1024 * 1024);
         $a->{files}{$file}{sizeDiv4GB}
                     = int($a->{files}{$file}{size} / (4096 * 1024 * 1024));
-	$data .= pack("w a* w$nFldsW N$nFldsN", length($file), $file,
-			       @{$a->{files}{$file}}{@FldsUnixW},
-			       @{$a->{files}{$file}}{@FldsUnixN},
-                    );
+        eval {
+            $data .= pack("w a* w$nFldsW N$nFldsN", length($file), $file,
+                                   @{$a->{files}{$file}}{@FldsUnixW},
+                                   @{$a->{files}{$file}}{@FldsUnixN},
+                        );
+        };
+        if ( $@ ) {
+            $a->{_errStr} = "Can't pack attr for $file: " . Dumper($a->{files}{$file});
+        }
     }
     return $data;
 }

=== modified file 'lib/BackupPC/CGI/AdminOptions.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/AdminOptions.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/AdminOptions.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/Archive.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/Archive.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/Archive.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/ArchiveInfo.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/ArchiveInfo.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/ArchiveInfo.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/Browse.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/Browse.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/Browse.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -73,8 +73,8 @@
     for ( $i = 0 ; $i < @Backups ; $i++ ) {
         last if ( $Backups[$i]{num} == $num );
     }
-    if ( $i >= @Backups ) {
-        ErrorExit("Backup number $num for host ${EscHTML($host)} does"
+    if ( $i >= @Backups || $num !~ /^\d+$/ ) {
+        ErrorExit("Backup number ${EscHTML($num)} for host ${EscHTML($host)} does"
 	        . " not exist.");
     }
     my $backupTime = timeStamp2($Backups[$i]{startTime});

=== modified file 'lib/BackupPC/CGI/DirHistory.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/DirHistory.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/DirHistory.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/EditConfig.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/EditConfig.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/EditConfig.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/EmailSummary.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/EmailSummary.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/EmailSummary.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/GeneralInfo.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/GeneralInfo.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/GeneralInfo.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/HostInfo.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/HostInfo.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/HostInfo.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/LOGlist.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/LOGlist.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/LOGlist.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/Lib.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/Lib.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/Lib.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/Queue.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/Queue.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/Queue.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/RSS.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/RSS.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/RSS.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/ReloadServer.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/ReloadServer.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/ReloadServer.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/Restore.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/Restore.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/Restore.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/RestoreFile.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/RestoreFile.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/RestoreFile.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/RestoreInfo.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/RestoreInfo.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/RestoreInfo.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/StartServer.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/StartServer.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/StartServer.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/StartStopBackup.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/StartStopBackup.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/StartStopBackup.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/StopServer.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/StopServer.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/StopServer.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/Summary.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/Summary.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/Summary.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/CGI/View.pm' (properties changed: +x to -x)
--- lib/BackupPC/CGI/View.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/CGI/View.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Config.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Config/Meta.pm' (properties changed: +x to -x)
--- lib/BackupPC/Config/Meta.pm	2011-03-07 11:35:50 +0000
+++ lib/BackupPC/Config/Meta.pm	2011-09-19 08:47:26 +0000
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/FileZIO.pm' (properties changed: +x to -x)
--- lib/BackupPC/FileZIO.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/FileZIO.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Lang/de.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/en.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/es.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/fr.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/it.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/nl.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/pl.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/pt_br.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lang/zh_CN.pm' (properties changed: +x to -x)
=== modified file 'lib/BackupPC/Lib.pm' (properties changed: +x to -x)
--- lib/BackupPC/Lib.pm	2011-03-07 11:35:50 +0000
+++ lib/BackupPC/Lib.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -131,7 +131,7 @@
 
     my $bpc = bless {
 	%$paths,
-        Version => '3.2.0',
+        Version => '3.2.1',
     }, $class;
 
     $bpc->{storage} = BackupPC::Storage->new($paths);

=== modified file 'lib/BackupPC/PoolWrite.pm' (properties changed: +x to -x)
--- lib/BackupPC/PoolWrite.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/PoolWrite.pm	2011-09-19 08:47:26 +0000
@@ -56,7 +56,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Storage.pm' (properties changed: +x to -x)
--- lib/BackupPC/Storage.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Storage.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Storage/Text.pm' (properties changed: +x to -x)
--- lib/BackupPC/Storage/Text.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Storage/Text.pm	2011-09-19 08:47:26 +0000
@@ -30,7 +30,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/View.pm' (properties changed: +x to -x)
--- lib/BackupPC/View.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/View.pm	2011-09-19 08:47:26 +0000
@@ -31,7 +31,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer.pm	2010-10-06 20:57:45 +0000
+++ lib/BackupPC/Xfer.pm	2011-09-19 08:47:26 +0000
@@ -30,7 +30,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer/Archive.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/Archive.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Xfer/Archive.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer/Ftp.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/Ftp.pm	2010-10-06 20:57:45 +0000
+++ lib/BackupPC/Xfer/Ftp.pm	2011-09-19 08:47:26 +0000
@@ -31,7 +31,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer/Protocol.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/Protocol.pm	2010-10-06 20:57:45 +0000
+++ lib/BackupPC/Xfer/Protocol.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -288,12 +288,9 @@
     my @BackupFilesExclude = ();
     my ($shareName, $shareNameRE);
     
-    #
-    # $conf->{$shareType} shold be a reference to an array with one
-    # element, thanks to BackupFileConfFix().
-    #
-    $shareName = @{ $conf->{$shareType} }[0];
+    $shareName = $t->{shareName};
     $shareName =~ s/\/*$//;    # remove trailing slashes
+    $shareName = "/" if ( $shareName eq "" );
 
     $t->{shareName}   = $shareName;
     $t->{shareNameRE} = $bpc->glob2re($shareName);
@@ -422,18 +419,18 @@
     my ($t, $file) = @_;
 
     my $shareName = $t->{shareName};
-    my $includes  = $t->{BackupFilesOnly} || return 0;
+    my $excludes  = $t->{BackupFilesExclude} || return 0;
     my $match = "";
 
-    foreach my $include ( @{$includes} ) {
+    foreach my $exclude ( @{$excludes} ) {
 
         #
         # construct regexp elsewhere to avoid syntactical evil
         #
-        $match = '^' . quotemeta( $shareName . $include ) . '(?=\/.*)?';
+        $match = '^' . quotemeta( $shareName . $exclude ) . '(?=\/.*)?';
 
 	#
-        # return true if the include folder is a parent of the file,
+        # return true if the exclude folder is a parent of the file,
         # or the folder itself.
 	#
         return 1 if ( $file =~ /$match/ );
@@ -441,10 +438,10 @@
         $match = '^' . quotemeta($file) . '(?=\/.*)?';
                 
 	#
-        # return true if the file is a parent of the include folder,
+        # return true if the file is a parent of the exclude folder,
         # or the folder itself.
 	#
-        return 1 if ( "$shareName$include" =~ /$match/ );
+        return 1 if ( "$shareName$exclude" =~ /$match/ );
     }
     return 0;
 }

=== modified file 'lib/BackupPC/Xfer/Rsync.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/Rsync.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Xfer/Rsync.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -126,7 +126,7 @@
 
         if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) {
             my(@inc, @exc, %incDone, %excDone);
-            foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {
+            foreach my $file2 ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {
                 #
                 # If the user wants to just include /home/craig, then
                 # we need to do create include/exclude pairs at
@@ -144,6 +144,7 @@
                 # To make this easier we do all the includes first and all
                 # of the excludes at the end (hopefully they commute).
                 #
+                my $file = $file2;
                 $file =~ s{/$}{};
                 $file = "/$file";
                 $file =~ s{//+}{/}g;
@@ -185,11 +186,11 @@
             }
         }
         if ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) {
-            foreach my $file ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} )
-            {
+            foreach my $file2 ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} ) {
                 #
                 # just append additional exclude lists onto the end
                 #
+                my $file = $file2;
                 $file = encode($conf->{ClientCharset}, $file)
                             if ( $conf->{ClientCharset} ne "" );
                 push(@fileList, "--exclude=$file");

=== modified file 'lib/BackupPC/Xfer/RsyncDigest.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/RsyncDigest.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Xfer/RsyncDigest.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer/RsyncFileIO.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/RsyncFileIO.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Xfer/RsyncFileIO.pm	2011-09-19 08:47:26 +0000
@@ -26,7 +26,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer/Smb.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/Smb.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Xfer/Smb.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #

=== modified file 'lib/BackupPC/Xfer/Tar.pm' (properties changed: +x to -x)
--- lib/BackupPC/Xfer/Tar.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Xfer/Tar.pm	2011-09-19 08:47:26 +0000
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -71,8 +71,8 @@
 	$bpc->backupFileConfFix($conf, "TarShareName");
 
         if ( defined($conf->{BackupFilesExclude}{$t->{shareName}}) ) {
-            foreach my $file ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} )
-            {
+            foreach my $file2 ( @{$conf->{BackupFilesExclude}{$t->{shareName}}} ) {
+                my $file = $file2;
                 $file = "./$2" if ( $file =~ m{^(\./+|/+)(.*)}s );
                 $file = encode($conf->{ClientCharset}, $file)
                             if ( $conf->{ClientCharset} ne "" );
@@ -80,7 +80,8 @@
             }
         }
         if ( defined($conf->{BackupFilesOnly}{$t->{shareName}}) ) {
-            foreach my $file ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {
+            foreach my $file2 ( @{$conf->{BackupFilesOnly}{$t->{shareName}}} ) {
+                my $file = $file2;
                 $file = $2 if ( $file =~ m{^(\./+|/+)(.*)}s );
 		$file = "./$file";
                 $file = encode($conf->{ClientCharset}, $file)

=== modified file 'lib/BackupPC/Zip/FileMember.pm' (properties changed: +x to -x)
--- lib/BackupPC/Zip/FileMember.pm	2010-11-21 14:59:53 +0000
+++ lib/BackupPC/Zip/FileMember.pm	2011-09-19 08:47:26 +0000
@@ -33,7 +33,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Jul 2010.
+# Version 3.2.1, released 24 Apr 2011.
 #
 # See http://backuppc.sourceforge.net.
 #