Date: Sunday, February 12, 2017 @ 16:09:37 Author: seblu Revision: 212050
upgpkg: backuppc 3.3.2-1 Modified: backuppc/trunk/PKGBUILD Deleted: backuppc/trunk/05-fix-edit-menu-ordering.patch backuppc/trunk/06-fix-defined-on-array.patch backuppc/trunk/07-escape-braces-in-perl-regex.patch --------------------------------------+ 05-fix-edit-menu-ordering.patch | 29 ----------------------------- 06-fix-defined-on-array.patch | 28 ---------------------------- 07-escape-braces-in-perl-regex.patch | 23 ----------------------- PKGBUILD | 16 +++++----------- 4 files changed, 5 insertions(+), 91 deletions(-) Deleted: 05-fix-edit-menu-ordering.patch =================================================================== --- 05-fix-edit-menu-ordering.patch 2017-02-12 15:47:01 UTC (rev 212049) +++ 05-fix-edit-menu-ordering.patch 2017-02-12 16:09:37 UTC (rev 212050) @@ -1,29 +0,0 @@ -# Copyright © Sébastien Luttringer - -# This patch is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This patch 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this patch. If not, see <http://www.gnu.org/licenses/>. - -# This patch avoid menu in Host "Edit Config" to swap every load by using -# alphabetic order. - ---- a/lib/BackupPC/CGI/EditConfig.pm 2013-04-14 22:43:32.000000000 +0200 -+++ b/lib/BackupPC/CGI/EditConfig.pm 2013-08-02 03:58:38.796000000 +0200 -@@ -492,7 +492,7 @@ - } - - my $groupText; -- foreach my $m ( keys(%ConfigMenu) ) { -+ foreach my $m ( sort( keys(%ConfigMenu) ) ) { - next if ( $menuDisable{$m}{top} ); - my $text = eval("qq($Lang->{$ConfigMenu{$m}{text}})"); - if ( $m eq $menu ) { Deleted: 06-fix-defined-on-array.patch =================================================================== --- 06-fix-defined-on-array.patch 2017-02-12 15:47:01 UTC (rev 212049) +++ 06-fix-defined-on-array.patch 2017-02-12 16:09:37 UTC (rev 212050) @@ -1,28 +0,0 @@ -# Copyright © Sébastien Luttringer - -# This patch is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This patch 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 Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this patch. If not, see <http://www.gnu.org/licenses/>. - -# perl 5.22 raise errors when defined is used on arrays - ---- a/lib/BackupPC/CGI/Browse.pm 2015-06-01 09:05:54.000000000 +0200 -+++ b/lib/BackupPC/CGI/Browse.pm 2015-07-01 14:34:28.480199121 +0200 -@@ -65,7 +65,7 @@ - # - # default to the newest backup - # -- if ( !defined($In{num}) && defined(@Backups) && @Backups > 0 ) { -+ if ( !defined($In{num}) && @Backups && @Backups > 0 ) { - $i = @Backups - 1; - $num = $Backups[$i]{num}; - } Deleted: 07-escape-braces-in-perl-regex.patch =================================================================== --- 07-escape-braces-in-perl-regex.patch 2017-02-12 15:47:01 UTC (rev 212049) +++ 07-escape-braces-in-perl-regex.patch 2017-02-12 16:09:37 UTC (rev 212050) @@ -1,23 +0,0 @@ -#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 2017-02-12 15:47:01 UTC (rev 212049) +++ PKGBUILD 2017-02-12 16:09:37 UTC (rev 212050) @@ -2,8 +2,8 @@ # Maintainer: Sébastien Luttringer pkgname=backuppc -pkgver=3.3.1 -pkgrel=6 +pkgver=3.3.2 +pkgrel=1 pkgdesc='Enterprise-grade system for backing up Linux, Windows and MacOS PCs' url='https://sourceforge.net/projects/backuppc/' license=('GPL2') @@ -30,16 +30,13 @@ '01-move-socket-into-run.patch' '02-move-socket-into-run.patch' '03-fix-FS#32642.patch' - '04-fix-cve-2011-4923.patch' - '05-fix-edit-menu-ordering.patch' - '06-fix-defined-on-array.patch' - '07-escape-braces-in-perl-regex.patch') + '04-fix-cve-2011-4923.patch') install=$pkgname.install backup=("etc/$pkgname/config.pl" "etc/$pkgname/hosts" "etc/httpd/conf/extra/$pkgname.conf" "etc/$pkgname/$pkgname.users") -md5sums=('5efdcdd48e9e0d4ef7a706902d1f8b3d' +md5sums=('7d57515bf3de8dd2b5de7e7c52afc4bd' 'ffb8827bbefcf5f0cd959d08fdf64fc1' '88344dbc5f8777e04fc8e0d250a2db82' 'd90840387358e5dd230cace0b2d6b53a' @@ -50,10 +47,7 @@ 'ec087e8b899450e9e7ab18bff77cb1f3' 'b468820ed542023e1fec7ce8c88a0c3b' '3917c474a275e262fde246daf59ffe31' - 'aca8392c5dea60c3cceeb02ebcc63497' - '2a568701fd1caf75490987814786fecf' - 'd48f3032e65a8fc4409454fe04faf9e1' - '77bde96156231a3c159cfe1f1fbb1fad') + 'aca8392c5dea60c3cceeb02ebcc63497') prepare() { cd BackupPC-$pkgver
