[arch-commits] Commit in backuppc/trunk (3 files)

[Sébastien Luttringer]

    Date: Sunday, March 12, 2017 @ 14:10:59
  Author: seblu
Revision: 215783

upgpkg: backuppc 4.0.0-2

Modified:
  backuppc/trunk/PKGBUILD
Deleted:
  backuppc/trunk/01-fix-FS#32642.patch
  backuppc/trunk/02-fix-cve-2011-4923.patch

----------------------------+
 01-fix-FS#32642.patch      |   25 -------------------------
 02-fix-cve-2011-4923.patch |   14 --------------
 PKGBUILD                   |   16 ++++++----------
 3 files changed, 6 insertions(+), 49 deletions(-)

Deleted: 01-fix-FS#32642.patch
===================================================================
--- 01-fix-FS#32642.patch	2017-03-12 14:09:51 UTC (rev 215782)
+++ 01-fix-FS#32642.patch	2017-03-12 14:10:59 UTC (rev 215783)
@@ -1,25 +0,0 @@
-From 83d6c1513787c0cd156cb6c2a1c6dd03e8f0b811 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu at seblu.net>
-Date: Mon, 6 Mar 2017 23:11:44 +0100
-Subject: [PATCH] Fix https://bugs.archlinux.org/task/32642
-
----
- lib/BackupPC/DirOps.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/BackupPC/DirOps.pm b/lib/BackupPC/DirOps.pm
-index 6d713c1..a490750 100644
---- a/lib/BackupPC/DirOps.pm
-+++ b/lib/BackupPC/DirOps.pm
-@@ -132,7 +132,7 @@ sub dirRead
-     }
-     if ( $IODirentOk ) {
-         @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh));
--        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);
-     }
--- 
-2.12.0
-

Deleted: 02-fix-cve-2011-4923.patch
===================================================================
--- 02-fix-cve-2011-4923.patch	2017-03-12 14:09:51 UTC (rev 215782)
+++ 02-fix-cve-2011-4923.patch	2017-03-12 14:10:59 UTC (rev 215783)
@@ -1,14 +0,0 @@
-# http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4923
-# http://www.openwall.com/lists/oss-security/2011/10/27/8
-
---- a/lib/BackupPC/CGI/View.pm
-+++ b/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);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-12 14:09:51 UTC (rev 215782)
+++ PKGBUILD	2017-03-12 14:10:59 UTC (rev 215783)
@@ -3,11 +3,11 @@
 
 pkgname=backuppc
 pkgver=4.0.0
-_xsver=0.51
+_xsver=0.52
 _rbpcver=3.0.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Enterprise-grade system for backing up Linux, Windows and MacOS PCs'
-url='https://sourceforge.net/projects/backuppc/'
+url='https://github.com/backuppc/backuppc/'
 license=('GPL2')
 arch=('x86_64' 'i686')
 makedepends=('git')
@@ -25,9 +25,7 @@
         "$pkgname.tmpfiles"
         "$pkgname.profile.sh"
         "$pkgname.profile.csh"
-        "$pkgname.httpd"
-        '01-fix-FS#32642.patch'
-        '02-fix-cve-2011-4923.patch')
+        "$pkgname.httpd")
 install=$pkgname.install
 backup=("etc/$pkgname/config.pl"
         "etc/$pkgname/hosts"
@@ -34,7 +32,7 @@
         "etc/httpd/conf/extra/$pkgname.conf"
         "etc/$pkgname/$pkgname.users")
 md5sums=('47d3c87239ea24e1a544bd101957aa53'
-         'd657d26dece5d9a6e3da7af3b7d96297'
+         '5787be7fd73f9d89a8d8ea948976d084'
          'b57dd472402d5df83e1234781983c7cc'
          '9d798d275eb737bcfd035d5277b6b4ce'
          'd90840387358e5dd230cace0b2d6b53a'
@@ -41,9 +39,7 @@
          'bda3ec3f4c75521c6869279eb16af2f8'
          '67a939aa63740c52d12bbdca72d37891'
          'ef09e4dae5b4197998f5c3a74e0ec86d'
-         '99e641c4f3ba4fbcc53e046ce7290ad5'
-         '05dd3f85ac457fa45c1a1793fc518331'
-         'aca8392c5dea60c3cceeb02ebcc63497')
+         '99e641c4f3ba4fbcc53e046ce7290ad5')
 
 prepare() {
   cd BackupPC-$pkgver