Date: Monday, November 21, 2016 @ 01:17:01 Author: seblu Revision: 196395
upgpkg: backuppc 3.3.1-4 - fix braces issues Added: backuppc/trunk/07-escape-braces-in-perl-regex.patch Modified: backuppc/trunk/PKGBUILD --------------------------------------+ 07-escape-braces-in-perl-regex.patch | 23 +++++++++++++++++++++++ PKGBUILD | 16 +++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) Added: 07-escape-braces-in-perl-regex.patch =================================================================== --- 07-escape-braces-in-perl-regex.patch (rev 0) +++ 07-escape-braces-in-perl-regex.patch 2016-11-21 01:17:01 UTC (rev 196395) @@ -0,0 +1,23 @@ +#Description: Escape braces in Perl regex +#Author: Marcel Meckel <[email protected]> +#Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820110 +--- a/lib/BackupPC/Lib.pm 2016-01-06 12:44:15.000000000 +0100 ++++ b/lib/BackupPC/Lib.pm 2016-04-05 16:23:35.706625290 +0200 +@@ -1262,7 +1262,7 @@ + # + # Replace scalar variables first + # +- $arg =~ s[\${(\w+)}(\+?)]{ ++ $arg =~ s[\$\{(\w+)}(\+?)]{ + exists($vars->{$1}) && ref($vars->{$1}) ne "ARRAY" + ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1}) + : "\${$1}$2" +@@ -1271,7 +1271,7 @@ + # Now replicate any array arguments; this just works for just one + # array var in each argument. + # +- if ( $arg =~ m[(.*)\${(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { ++ if ( $arg =~ m[(.*)\$\{(\w+)}(\+?)(.*)] && ref($vars->{$2}) eq "ARRAY" ) { + my $pre = $1; + my $var = $2; + my $esc = $3; Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-11-20 20:03:57 UTC (rev 196394) +++ PKGBUILD 2016-11-21 01:17:01 UTC (rev 196395) @@ -3,9 +3,9 @@ pkgname=backuppc pkgver=3.3.1 -pkgrel=3 +pkgrel=4 pkgdesc='Enterprise-grade system for backing up Linux, Windows and MacOS PCs' -url='http://backuppc.sourceforge.net/' +url='https://sourceforge.net/projects/backuppc/' license=('GPL2') arch=('any') depends=('openssh' @@ -19,7 +19,7 @@ optdepends=('rsync: used by rsync transfert method' 'perl-file-rsyncp: used by rsync transfert method' 'perl-io-dirent') -source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/BackupPC-$pkgver.tar.gz"; +source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/BackupPC-$pkgver.tar.gz"; "$pkgname.service" "$pkgname.socket" "$pkgname.sysusers" @@ -32,7 +32,8 @@ '03-fix-FS#32642.patch' '04-fix-cve-2011-4923.patch' '05-fix-edit-menu-ordering.patch' - '06-fix-defined-on-array.patch') + '06-fix-defined-on-array.patch' + '07-escape-braces-in-perl-regex.patch') install=$pkgname.install backup=("etc/$pkgname/config.pl" "etc/$pkgname/hosts" @@ -51,7 +52,8 @@ '3917c474a275e262fde246daf59ffe31' 'aca8392c5dea60c3cceeb02ebcc63497' '2a568701fd1caf75490987814786fecf' - 'd48f3032e65a8fc4409454fe04faf9e1') + 'd48f3032e65a8fc4409454fe04faf9e1' + '77bde96156231a3c159cfe1f1fbb1fad') prepare() { cd BackupPC-$pkgver @@ -59,8 +61,8 @@ local filename for filename in "${source[@]}"; do if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch $filename" - patch -p1 -N -i "$srcdir/$filename" + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" fi done :
