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

Sébastien Luttringer seblu at archlinux.org
Fri Mar 31 23:43:36 UTC 2017


    Date: Friday, March 31, 2017 @ 23:43:35
  Author: seblu
Revision: 220190

upgpkg: backuppc 4.1.1-1

Modified:
  backuppc/trunk/PKGBUILD
Deleted:
  backuppc/trunk/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch

-----------------------------------------------------------------+
 0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch |   71 ----------
 PKGBUILD                                                        |   24 +--
 2 files changed, 11 insertions(+), 84 deletions(-)

Deleted: 0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch
===================================================================
--- 0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch	2017-03-31 23:27:23 UTC (rev 220189)
+++ 0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch	2017-03-31 23:43:35 UTC (rev 220190)
@@ -1,71 +0,0 @@
-From a5bf0f262d5b8854e614de6e2252d5cedbd86d4a Mon Sep 17 00:00:00 2001
-From: Craig Barratt <craigb at gmail.com>
-Date: Fri, 10 Mar 2017 15:18:39 -0800
-Subject: [PATCH] more robust checking that IO::Dirent works.  Matches similar
- changes to 3.x that didn't make it into 4.x.  Fixes issue #56.
-
----
- ChangeLog              | 11 +++++++++++
- lib/BackupPC/DirOps.pm | 31 ++++++++++++++++++++++++-------
- 2 files changed, 35 insertions(+), 7 deletions(-)
-
-diff --git a/lib/BackupPC/DirOps.pm b/lib/BackupPC/DirOps.pm
-index 6d713c1..4e04f87 100644
---- a/lib/BackupPC/DirOps.pm
-+++ b/lib/BackupPC/DirOps.pm
-@@ -67,7 +67,7 @@ require DynaLoader;
- %EXPORT_TAGS = ('BPC_DT_ALL' => [@EXPORT, @EXPORT_OK]);
- 
- BEGIN {
--    eval "use IO::Dirent qw( readdirent DT_DIR );";
-+    eval "use IO::Dirent qw( readdirent );";
-     $IODirentLoaded = 1 if ( !$@ );
- };
- 
-@@ -114,21 +114,38 @@ sub dirRead
-         #
-         # Make sure the IO::Dirent really works - some installs
-         # on certain file systems (eg: XFS) don't return a valid type.
-+        # and some fail to return valid inode numbers.
-         #
-+        # Also create a temporary file to make sure the inode matches.
-+        #
-+        my $tempTestFile = ".TestFileDirent.$$";
-+        my $fullTempTestFile = $bpc->{TopDir} . "/$tempTestFile";
-+        if ( open(my $fh, ">", $fullTempTestFile) ) {
-+            close($fh);
-+        }
-         if ( opendir(my $fh, $bpc->{TopDir}) ) {
--            my $dt_dir = eval("DT_DIR");
-             foreach my $e ( readdirent($fh) ) {
--                if ( $e->{name} eq "." && $e->{type} == $dt_dir ) {
--                    $IODirentOk = 1;
--                    last;
-+                if ( $e->{name} eq "."
-+                        && $e->{type} == BPC_DT_DIR
-+                        && $e->{inode} == (stat($bpc->{TopDir}))[1] ) {
-+                    $IODirentOk |= 0x1;
-+                }
-+                if ( $e->{name} eq $tempTestFile
-+                        && $e->{type} == BPC_DT_REG
-+                        && $e->{inode} == (stat($fullTempTestFile))[1] ) {
-+                    $IODirentOk |= 0x2;
-                 }
-             }
-             closedir($fh);
-         }
-+        unlink($fullTempTestFile) if ( -f $fullTempTestFile );
-         #
-         # if it isn't ok then don't check again.
-         #
--        $IODirentLoaded = 0 if ( !$IODirentOk );
-+        if ( $IODirentOk != 0x3 ) {
-+            $IODirentLoaded = 0;
-+            $IODirentOk     = 0;
-+        }
-     }
-     if ( $IODirentOk ) {
-         @entries = sort({ $a->{inode} <=> $b->{inode} } readdirent($fh));
--- 
-2.12.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-31 23:27:23 UTC (rev 220189)
+++ PKGBUILD	2017-03-31 23:43:35 UTC (rev 220190)
@@ -2,22 +2,22 @@
 # Maintainer: Sébastien Luttringer
 
 pkgname=backuppc
-pkgver=4.0.0
-_xsver=0.52
-_rbpcver=3.0.9.5
-pkgrel=3
+pkgver=4.1.1
+_xsver=0.53
+_rbpcver=3.0.9.6
+pkgrel=1
 pkgdesc='Enterprise-grade system for backing up Linux, Windows and MacOS PCs'
 url='https://github.com/backuppc/backuppc/'
 license=('GPL2')
 arch=('x86_64' 'i686')
 makedepends=('git')
-depends=('glibc' 'popt' 'par2cmdline' 'perl-archive-zip' 'perl-io-dirent'
+depends=('glibc' 'popt' 'perl' 'par2cmdline' 'perl-archive-zip' 'perl-io-dirent'
          'perl-file-listing' 'perl-time-modules' 'perl-cgi' 'perl-xml-rss')
 optdepends=('openssh: ssh transfert support'
             'rsync: rsync transfert support'
             'smbclient: smb/cifs transfert support'
             'rrdtool: graphs of the pool usage ')
-source=("https://github.com/backuppc/backuppc/releases/download/v${pkgver//./_}/BackupPC-$pkgver.tar.gz"
+source=("https://github.com/backuppc/backuppc/releases/download/$pkgver/BackupPC-$pkgver.tar.gz"
         "https://github.com/backuppc/backuppc-xs/releases/download/v${_xsver//./_}/BackupPC-XS-${_xsver}.tar.gz"
         "https://github.com/backuppc/rsync-bpc/releases/download/v${_rbpcver//./_}/rsync-bpc-${_rbpcver}.tar.gz"
         "$pkgname.service"
@@ -25,23 +25,21 @@
         "$pkgname.tmpfiles"
         "$pkgname.profile.sh"
         "$pkgname.profile.csh"
-        "$pkgname.httpd"
-        '0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch')
+        "$pkgname.httpd")
 install=$pkgname.install
 backup=("etc/$pkgname/config.pl"
         "etc/$pkgname/hosts"
         "etc/httpd/conf/extra/$pkgname.conf"
         "etc/$pkgname/$pkgname.users")
-md5sums=('47d3c87239ea24e1a544bd101957aa53'
-         '5787be7fd73f9d89a8d8ea948976d084'
-         'b57dd472402d5df83e1234781983c7cc'
+md5sums=('32b7ecdcfe0a3a7692e4ad86d5225ab8'
+         'a6e58a97994e0128064ab16ee337f2f0'
+         'c3e4b850d5d522bd1df21555c4287448'
          '9d798d275eb737bcfd035d5277b6b4ce'
          'd90840387358e5dd230cace0b2d6b53a'
          'bda3ec3f4c75521c6869279eb16af2f8'
          '67a939aa63740c52d12bbdca72d37891'
          'ef09e4dae5b4197998f5c3a74e0ec86d'
-         '99e641c4f3ba4fbcc53e046ce7290ad5'
-         '5b7cd4e425b6fb2c9a5b3b56eb313d5b')
+         '99e641c4f3ba4fbcc53e046ce7290ad5')
 
 prepare() {
   cd BackupPC-$pkgver


More information about the arch-commits mailing list