[arch-commits] Commit in backuppc/repos (34 files)

Sébastien Luttringer seblu at archlinux.org
Sun Mar 12 14:26:22 UTC 2017


    Date: Sunday, March 12, 2017 @ 14:26:21
  Author: seblu
Revision: 215792

archrelease: copy trunk to community-x86_64, community-i686

Added:
  backuppc/repos/community-i686/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch
    (from rev 215789, backuppc/trunk/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch)
  backuppc/repos/community-i686/PKGBUILD
    (from rev 215790, backuppc/trunk/PKGBUILD)
  backuppc/repos/community-i686/backuppc.httpd
    (from rev 215790, backuppc/trunk/backuppc.httpd)
  backuppc/repos/community-i686/backuppc.install
    (from rev 215790, backuppc/trunk/backuppc.install)
  backuppc/repos/community-i686/backuppc.profile.csh
    (from rev 215790, backuppc/trunk/backuppc.profile.csh)
  backuppc/repos/community-i686/backuppc.profile.sh
    (from rev 215790, backuppc/trunk/backuppc.profile.sh)
  backuppc/repos/community-i686/backuppc.service
    (from rev 215790, backuppc/trunk/backuppc.service)
  backuppc/repos/community-i686/backuppc.sysusers
    (from rev 215790, backuppc/trunk/backuppc.sysusers)
  backuppc/repos/community-i686/backuppc.tmpfiles
    (from rev 215791, backuppc/trunk/backuppc.tmpfiles)
  backuppc/repos/community-x86_64/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch
    (from rev 215789, backuppc/trunk/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch)
  backuppc/repos/community-x86_64/PKGBUILD
    (from rev 215789, backuppc/trunk/PKGBUILD)
  backuppc/repos/community-x86_64/backuppc.httpd
    (from rev 215789, backuppc/trunk/backuppc.httpd)
  backuppc/repos/community-x86_64/backuppc.install
    (from rev 215789, backuppc/trunk/backuppc.install)
  backuppc/repos/community-x86_64/backuppc.profile.csh
    (from rev 215789, backuppc/trunk/backuppc.profile.csh)
  backuppc/repos/community-x86_64/backuppc.profile.sh
    (from rev 215789, backuppc/trunk/backuppc.profile.sh)
  backuppc/repos/community-x86_64/backuppc.service
    (from rev 215789, backuppc/trunk/backuppc.service)
  backuppc/repos/community-x86_64/backuppc.sysusers
    (from rev 215789, backuppc/trunk/backuppc.sysusers)
  backuppc/repos/community-x86_64/backuppc.tmpfiles
    (from rev 215789, backuppc/trunk/backuppc.tmpfiles)
Deleted:
  backuppc/repos/community-i686/PKGBUILD
  backuppc/repos/community-i686/backuppc.httpd
  backuppc/repos/community-i686/backuppc.install
  backuppc/repos/community-i686/backuppc.profile.csh
  backuppc/repos/community-i686/backuppc.profile.sh
  backuppc/repos/community-i686/backuppc.service
  backuppc/repos/community-i686/backuppc.sysusers
  backuppc/repos/community-i686/backuppc.tmpfiles
  backuppc/repos/community-x86_64/PKGBUILD
  backuppc/repos/community-x86_64/backuppc.httpd
  backuppc/repos/community-x86_64/backuppc.install
  backuppc/repos/community-x86_64/backuppc.profile.csh
  backuppc/repos/community-x86_64/backuppc.profile.sh
  backuppc/repos/community-x86_64/backuppc.service
  backuppc/repos/community-x86_64/backuppc.sysusers
  backuppc/repos/community-x86_64/backuppc.tmpfiles

----------------------------------------------------------------------------------+
 /PKGBUILD                                                                        |  262 ++++++++++
 /backuppc.httpd                                                                  |   42 +
 /backuppc.install                                                                |   46 +
 /backuppc.profile.csh                                                            |    2 
 /backuppc.profile.sh                                                             |    6 
 /backuppc.service                                                                |   22 
 /backuppc.sysusers                                                               |    2 
 /backuppc.tmpfiles                                                               |    2 
 community-i686/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch   |   71 ++
 community-i686/PKGBUILD                                                          |  129 ----
 community-i686/backuppc.httpd                                                    |   21 
 community-i686/backuppc.install                                                  |   23 
 community-i686/backuppc.profile.csh                                              |    1 
 community-i686/backuppc.profile.sh                                               |    3 
 community-i686/backuppc.service                                                  |   11 
 community-i686/backuppc.sysusers                                                 |    1 
 community-i686/backuppc.tmpfiles                                                 |    1 
 community-x86_64/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch |   71 ++
 community-x86_64/PKGBUILD                                                        |  129 ----
 community-x86_64/backuppc.httpd                                                  |   21 
 community-x86_64/backuppc.install                                                |   23 
 community-x86_64/backuppc.profile.csh                                            |    1 
 community-x86_64/backuppc.profile.sh                                             |    3 
 community-x86_64/backuppc.service                                                |   11 
 community-x86_64/backuppc.sysusers                                               |    1 
 community-x86_64/backuppc.tmpfiles                                               |    1 
 26 files changed, 526 insertions(+), 380 deletions(-)

Copied: backuppc/repos/community-i686/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch (from rev 215789, backuppc/trunk/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch)
===================================================================
--- community-i686/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch	                        (rev 0)
+++ community-i686/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,71 @@
+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
+

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/PKGBUILD	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,129 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=backuppc
-pkgver=4.0.0
-_xsver=0.52
-_rbpcver=3.0.9.5
-pkgrel=2
-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'
-         '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"
-        "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"
-        "$pkgname.sysusers"
-        "$pkgname.tmpfiles"
-        "$pkgname.profile.sh"
-        "$pkgname.profile.csh"
-        "$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'
-         '9d798d275eb737bcfd035d5277b6b4ce'
-         'd90840387358e5dd230cace0b2d6b53a'
-         'bda3ec3f4c75521c6869279eb16af2f8'
-         '67a939aa63740c52d12bbdca72d37891'
-         'ef09e4dae5b4197998f5c3a74e0ec86d'
-         '99e641c4f3ba4fbcc53e046ce7290ad5')
-
-prepare() {
-  cd BackupPC-$pkgver
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      msg2 "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
-  done
-  :
-}
-
-build() {
-  msg2 'rsync-bpc'
-  cd "$srcdir"/rsync-bpc-$_rbpcver
-  ./configure --prefix=/usr/share/backuppc
-  make
-}
-
-package() {
-  msg2 'rsync-bpc'
-  cd "$srcdir"/rsync-bpc-$_rbpcver
-  make install DESTDIR="$pkgdir"
-
-  msg2 'backuppc-xs'
-  cd "$srcdir"/BackupPC-XS-$_xsver
-  perl Makefile.PL
-  make -j1 # parallel build fail
-  make install DESTDIR="$pkgdir"
-
-  msg2 'backuppc'
-  cd "$srcdir"/BackupPC-$pkgver
-  export PERLLIB="$pkgdir/usr/lib/perl5/site_perl/"
-  perl configure.pl \
-    --batch \
-    --no-set-perms \
-    --uid-ignore \
-    --hostname __HOSTNAME__ \
-    --compress-level 5 \
-    --backuppc-user=backuppc \
-    --dest-dir "$pkgdir" \
-    --fhs \
-    --install-dir /usr/share/$pkgname \
-    --config-dir /etc/$pkgname \
-    --cgi-dir /usr/share/$pkgname/cgi-bin \
-    --html-dir /usr/share/$pkgname/html \
-    --html-dir-url /backuppc \
-    --data-dir /var/lib/$pkgname \
-    --log-dir /var/log/$pkgname \
-    --run-dir /run/$pkgname \
-    --bin-path rsync_bpc=/usr/share/backuppc/bin/rsync_bpc \
-    --bin-path smbclient=/usr/bin/smbclient \
-    --bin-path nmblookup=/usr/bin/nmblookup \
-    --bin-path rsync=/usr/bin/rsync \
-    --bin-path ssh=/usr/bin/ssh \
-    --bin-path sendmail=/usr/bin/sendmail \
-    --bin-path ping=/usr/bin/ping \
-    --bin-path ping6=/usr/bin/ping \
-    --bin-path rrdtool=/usr/bin/rrdtool \
-    --
-  cd "$srcdir"
-  # systemd
-  install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -D -m 644 $pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -D -m 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-  # install shell profiles
-  install -D -m 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
-  install -D -m 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
-  # install apache http
-  install -D -m 644 $pkgname.httpd "$pkgdir/etc/httpd/conf/extra/$pkgname.conf"
-  install -D -m 640 /dev/null "$pkgdir/etc/$pkgname/$pkgname.users"
-  # set correct permissions
-  cd "$pkgdir"
-  chown 126:126 -R etc/$pkgname
-  chown 126:126 -R var/{log,lib}/$pkgname
-  chmod 755 etc
-  chmod 755 -R var usr/share/$pkgname/{cgi-,}bin
-  chmod 750 var/log/$pkgname etc/$pkgname
-  chmod 750 -R var/lib/$pkgname
-  chmod 640 etc/$pkgname/{config.pl,hosts}
-  # no /run
-  rm -r "$pkgdir"/run
-}
-
-# vim:set ts=2 sw=2 et:

Copied: backuppc/repos/community-i686/PKGBUILD (from rev 215790, backuppc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,131 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=backuppc
+pkgver=4.0.0
+_xsver=0.52
+_rbpcver=3.0.9.5
+pkgrel=3
+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'
+         '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"
+        "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"
+        "$pkgname.sysusers"
+        "$pkgname.tmpfiles"
+        "$pkgname.profile.sh"
+        "$pkgname.profile.csh"
+        "$pkgname.httpd"
+        '0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch')
+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'
+         '9d798d275eb737bcfd035d5277b6b4ce'
+         'd90840387358e5dd230cace0b2d6b53a'
+         'bda3ec3f4c75521c6869279eb16af2f8'
+         '67a939aa63740c52d12bbdca72d37891'
+         'ef09e4dae5b4197998f5c3a74e0ec86d'
+         '99e641c4f3ba4fbcc53e046ce7290ad5'
+         '5b7cd4e425b6fb2c9a5b3b56eb313d5b')
+
+prepare() {
+  cd BackupPC-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -i "$srcdir/${filename##*/}"
+    fi
+  done
+  :
+}
+
+build() {
+  msg2 'rsync-bpc'
+  cd "$srcdir"/rsync-bpc-$_rbpcver
+  ./configure --prefix=/usr/share/backuppc
+  make
+}
+
+package() {
+  msg2 'rsync-bpc'
+  cd "$srcdir"/rsync-bpc-$_rbpcver
+  make install DESTDIR="$pkgdir"
+
+  msg2 'backuppc-xs'
+  cd "$srcdir"/BackupPC-XS-$_xsver
+  perl Makefile.PL
+  make -j1 # parallel build fail
+  make install DESTDIR="$pkgdir"
+
+  msg2 'backuppc'
+  cd "$srcdir"/BackupPC-$pkgver
+  export PERLLIB="$pkgdir/usr/lib/perl5/site_perl/"
+  perl configure.pl \
+    --batch \
+    --no-set-perms \
+    --uid-ignore \
+    --hostname __HOSTNAME__ \
+    --compress-level 5 \
+    --backuppc-user=backuppc \
+    --dest-dir "$pkgdir" \
+    --fhs \
+    --install-dir /usr/share/$pkgname \
+    --config-dir /etc/$pkgname \
+    --cgi-dir /usr/share/$pkgname/cgi-bin \
+    --html-dir /usr/share/$pkgname/html \
+    --html-dir-url /backuppc \
+    --data-dir /var/lib/$pkgname \
+    --log-dir /var/log/$pkgname \
+    --run-dir /run/$pkgname \
+    --bin-path rsync_bpc=/usr/share/backuppc/bin/rsync_bpc \
+    --bin-path smbclient=/usr/bin/smbclient \
+    --bin-path nmblookup=/usr/bin/nmblookup \
+    --bin-path rsync=/usr/bin/rsync \
+    --bin-path ssh=/usr/bin/ssh \
+    --bin-path sendmail=/usr/bin/sendmail \
+    --bin-path ping=/usr/bin/ping \
+    --bin-path ping6=/usr/bin/ping \
+    --bin-path rrdtool=/usr/bin/rrdtool \
+    --
+  cd "$srcdir"
+  # systemd
+  install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -D -m 644 $pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -D -m 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  # install shell profiles
+  install -D -m 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
+  install -D -m 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
+  # install apache http
+  install -D -m 644 $pkgname.httpd "$pkgdir/etc/httpd/conf/extra/$pkgname.conf"
+  install -D -m 640 /dev/null "$pkgdir/etc/$pkgname/$pkgname.users"
+  # set correct permissions
+  cd "$pkgdir"
+  chown 126:126 -R etc/$pkgname
+  chown 126:126 -R var/{log,lib}/$pkgname
+  chmod 755 etc
+  chmod 755 -R var usr/share/$pkgname/{cgi-,}bin
+  chmod 750 var/log/$pkgname etc/$pkgname
+  chmod 750 -R var/lib/$pkgname
+  chmod 640 etc/$pkgname/{config.pl,hosts}
+  # no /run
+  rm -r "$pkgdir"/run
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/backuppc.httpd
===================================================================
--- community-i686/backuppc.httpd	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.httpd	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,21 +0,0 @@
-<Directory /usr/share/backuppc/cgi-bin>
-  # This section tells apache which machines can access the interface.
-  # You can change the allow line to allow access from your local
-  # network, or comment out this region to allow access from all
-  # machines.
-  Require ip 127.0.0.1
-
-  # You can change the authorization method to LDAP or another method
-  # besides htaccess here if you are so inclined.
-  AuthType Basic
-  AuthUserFile /etc/backuppc/backuppc.users
-  AuthName "BackupPC Community Edition Administrative Interface"
-  require valid-user
-</Directory>
-
-<Directory /usr/share/backuppc/html>
-  Require ip 127.0.0.1
-</Directory>
-
-Alias           /backuppc         /usr/share/backuppc/html
-ScriptAlias     /BackupPC_Admin         /usr/share/backuppc/cgi-bin/BackupPC_Admin

Copied: backuppc/repos/community-i686/backuppc.httpd (from rev 215790, backuppc/trunk/backuppc.httpd)
===================================================================
--- community-i686/backuppc.httpd	                        (rev 0)
+++ community-i686/backuppc.httpd	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,21 @@
+<Directory /usr/share/backuppc/cgi-bin>
+  # This section tells apache which machines can access the interface.
+  # You can change the allow line to allow access from your local
+  # network, or comment out this region to allow access from all
+  # machines.
+  Require ip 127.0.0.1
+
+  # You can change the authorization method to LDAP or another method
+  # besides htaccess here if you are so inclined.
+  AuthType Basic
+  AuthUserFile /etc/backuppc/backuppc.users
+  AuthName "BackupPC Community Edition Administrative Interface"
+  require valid-user
+</Directory>
+
+<Directory /usr/share/backuppc/html>
+  Require ip 127.0.0.1
+</Directory>
+
+Alias           /backuppc         /usr/share/backuppc/html
+ScriptAlias     /BackupPC_Admin         /usr/share/backuppc/cgi-bin/BackupPC_Admin

Deleted: community-i686/backuppc.install
===================================================================
--- community-i686/backuppc.install	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.install	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,23 +0,0 @@
-#/bin/bash
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  # change uid of old version
-  if (( $(vercmp $2 3.2.1-8) < 0 )); then
-    if pgrep -u backuppc >/dev/null; then
-      echo '==> backuppc user is running.'
-      echo '==> You must manually change uid and gid of backuppc!'
-      echo '==> e.g: usermod -u 126 -g 126 backuppc'
-    else
-      usermod -u 126 -g 126 backuppc
-      echo '==> backuppc uid/gid have changed. Check your filesystem permissions.'
-    fi
-  fi
-  if (( $(vercmp $2 4.0.0-1) <= 0 )); then
-    echo '==> Major update. Remember to merge new variables in config.pl!'
-  fi
-  :
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

Copied: backuppc/repos/community-i686/backuppc.install (from rev 215790, backuppc/trunk/backuppc.install)
===================================================================
--- community-i686/backuppc.install	                        (rev 0)
+++ community-i686/backuppc.install	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,23 @@
+#/bin/bash
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  # change uid of old version
+  if (( $(vercmp $2 3.2.1-8) < 0 )); then
+    if pgrep -u backuppc >/dev/null; then
+      echo '==> backuppc user is running.'
+      echo '==> You must manually change uid and gid of backuppc!'
+      echo '==> e.g: usermod -u 126 -g 126 backuppc'
+    else
+      usermod -u 126 -g 126 backuppc
+      echo '==> backuppc uid/gid have changed. Check your filesystem permissions.'
+    fi
+  fi
+  if (( $(vercmp $2 4.0.0-1) <= 0 )); then
+    echo '==> Major update. Remember to merge new variables in config.pl!'
+  fi
+  :
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: community-i686/backuppc.profile.csh
===================================================================
--- community-i686/backuppc.profile.csh	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.profile.csh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1 +0,0 @@
-[ -d /usr/share/backuppc/bin ] && setenv PATH ${PATH}:/usr/share/backuppc/bin

Copied: backuppc/repos/community-i686/backuppc.profile.csh (from rev 215790, backuppc/trunk/backuppc.profile.csh)
===================================================================
--- community-i686/backuppc.profile.csh	                        (rev 0)
+++ community-i686/backuppc.profile.csh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1 @@
+[ -d /usr/share/backuppc/bin ] && setenv PATH ${PATH}:/usr/share/backuppc/bin

Deleted: community-i686/backuppc.profile.sh
===================================================================
--- community-i686/backuppc.profile.sh	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.profile.sh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,3 +0,0 @@
-[ -d /usr/share/backuppc/bin ] && PATH=$PATH:/usr/share/backuppc/bin
-
-export PATH

Copied: backuppc/repos/community-i686/backuppc.profile.sh (from rev 215790, backuppc/trunk/backuppc.profile.sh)
===================================================================
--- community-i686/backuppc.profile.sh	                        (rev 0)
+++ community-i686/backuppc.profile.sh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,3 @@
+[ -d /usr/share/backuppc/bin ] && PATH=$PATH:/usr/share/backuppc/bin
+
+export PATH

Deleted: community-i686/backuppc.service
===================================================================
--- community-i686/backuppc.service	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.service	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,11 +0,0 @@
-[Unit]
-Description=BackupPC
-
-[Service]
-User=backuppc
-PIDFile=/run/backuppc/BackupPC.pid
-ExecStart=/usr/share/backuppc/bin/BackupPC
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target

Copied: backuppc/repos/community-i686/backuppc.service (from rev 215790, backuppc/trunk/backuppc.service)
===================================================================
--- community-i686/backuppc.service	                        (rev 0)
+++ community-i686/backuppc.service	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,11 @@
+[Unit]
+Description=BackupPC
+
+[Service]
+User=backuppc
+PIDFile=/run/backuppc/BackupPC.pid
+ExecStart=/usr/share/backuppc/bin/BackupPC
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/backuppc.sysusers
===================================================================
--- community-i686/backuppc.sysusers	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.sysusers	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1 +0,0 @@
-u backuppc 126 - /var/lib/backuppc

Copied: backuppc/repos/community-i686/backuppc.sysusers (from rev 215790, backuppc/trunk/backuppc.sysusers)
===================================================================
--- community-i686/backuppc.sysusers	                        (rev 0)
+++ community-i686/backuppc.sysusers	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1 @@
+u backuppc 126 - /var/lib/backuppc

Deleted: community-i686/backuppc.tmpfiles
===================================================================
--- community-i686/backuppc.tmpfiles	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-i686/backuppc.tmpfiles	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1 +0,0 @@
-d /run/backuppc 0750 backuppc backuppc

Copied: backuppc/repos/community-i686/backuppc.tmpfiles (from rev 215791, backuppc/trunk/backuppc.tmpfiles)
===================================================================
--- community-i686/backuppc.tmpfiles	                        (rev 0)
+++ community-i686/backuppc.tmpfiles	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1 @@
+d /run/backuppc 0750 backuppc backuppc

Copied: backuppc/repos/community-x86_64/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch (from rev 215789, backuppc/trunk/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch)
===================================================================
--- community-x86_64/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch	                        (rev 0)
+++ community-x86_64/0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,71 @@
+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
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/PKGBUILD	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,129 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer
-
-pkgname=backuppc
-pkgver=4.0.0
-_xsver=0.52
-_rbpcver=3.0.9.5
-pkgrel=2
-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'
-         '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"
-        "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"
-        "$pkgname.sysusers"
-        "$pkgname.tmpfiles"
-        "$pkgname.profile.sh"
-        "$pkgname.profile.csh"
-        "$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'
-         '9d798d275eb737bcfd035d5277b6b4ce'
-         'd90840387358e5dd230cace0b2d6b53a'
-         'bda3ec3f4c75521c6869279eb16af2f8'
-         '67a939aa63740c52d12bbdca72d37891'
-         'ef09e4dae5b4197998f5c3a74e0ec86d'
-         '99e641c4f3ba4fbcc53e046ce7290ad5')
-
-prepare() {
-  cd BackupPC-$pkgver
-  # apply patch from the source array (should be a pacman feature)
-  local filename
-  for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
-      msg2 "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
-    fi
-  done
-  :
-}
-
-build() {
-  msg2 'rsync-bpc'
-  cd "$srcdir"/rsync-bpc-$_rbpcver
-  ./configure --prefix=/usr/share/backuppc
-  make
-}
-
-package() {
-  msg2 'rsync-bpc'
-  cd "$srcdir"/rsync-bpc-$_rbpcver
-  make install DESTDIR="$pkgdir"
-
-  msg2 'backuppc-xs'
-  cd "$srcdir"/BackupPC-XS-$_xsver
-  perl Makefile.PL
-  make -j1 # parallel build fail
-  make install DESTDIR="$pkgdir"
-
-  msg2 'backuppc'
-  cd "$srcdir"/BackupPC-$pkgver
-  export PERLLIB="$pkgdir/usr/lib/perl5/site_perl/"
-  perl configure.pl \
-    --batch \
-    --no-set-perms \
-    --uid-ignore \
-    --hostname __HOSTNAME__ \
-    --compress-level 5 \
-    --backuppc-user=backuppc \
-    --dest-dir "$pkgdir" \
-    --fhs \
-    --install-dir /usr/share/$pkgname \
-    --config-dir /etc/$pkgname \
-    --cgi-dir /usr/share/$pkgname/cgi-bin \
-    --html-dir /usr/share/$pkgname/html \
-    --html-dir-url /backuppc \
-    --data-dir /var/lib/$pkgname \
-    --log-dir /var/log/$pkgname \
-    --run-dir /run/$pkgname \
-    --bin-path rsync_bpc=/usr/share/backuppc/bin/rsync_bpc \
-    --bin-path smbclient=/usr/bin/smbclient \
-    --bin-path nmblookup=/usr/bin/nmblookup \
-    --bin-path rsync=/usr/bin/rsync \
-    --bin-path ssh=/usr/bin/ssh \
-    --bin-path sendmail=/usr/bin/sendmail \
-    --bin-path ping=/usr/bin/ping \
-    --bin-path ping6=/usr/bin/ping \
-    --bin-path rrdtool=/usr/bin/rrdtool \
-    --
-  cd "$srcdir"
-  # systemd
-  install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  install -D -m 644 $pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
-  install -D -m 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
-  # install shell profiles
-  install -D -m 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
-  install -D -m 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
-  # install apache http
-  install -D -m 644 $pkgname.httpd "$pkgdir/etc/httpd/conf/extra/$pkgname.conf"
-  install -D -m 640 /dev/null "$pkgdir/etc/$pkgname/$pkgname.users"
-  # set correct permissions
-  cd "$pkgdir"
-  chown 126:126 -R etc/$pkgname
-  chown 126:126 -R var/{log,lib}/$pkgname
-  chmod 755 etc
-  chmod 755 -R var usr/share/$pkgname/{cgi-,}bin
-  chmod 750 var/log/$pkgname etc/$pkgname
-  chmod 750 -R var/lib/$pkgname
-  chmod 640 etc/$pkgname/{config.pl,hosts}
-  # no /run
-  rm -r "$pkgdir"/run
-}
-
-# vim:set ts=2 sw=2 et:

Copied: backuppc/repos/community-x86_64/PKGBUILD (from rev 215789, backuppc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,131 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+
+pkgname=backuppc
+pkgver=4.0.0
+_xsver=0.52
+_rbpcver=3.0.9.5
+pkgrel=3
+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'
+         '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"
+        "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"
+        "$pkgname.sysusers"
+        "$pkgname.tmpfiles"
+        "$pkgname.profile.sh"
+        "$pkgname.profile.csh"
+        "$pkgname.httpd"
+        '0001-more-robust-checking-that-IO-Dirent-works.-Matches-s.patch')
+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'
+         '9d798d275eb737bcfd035d5277b6b4ce'
+         'd90840387358e5dd230cace0b2d6b53a'
+         'bda3ec3f4c75521c6869279eb16af2f8'
+         '67a939aa63740c52d12bbdca72d37891'
+         'ef09e4dae5b4197998f5c3a74e0ec86d'
+         '99e641c4f3ba4fbcc53e046ce7290ad5'
+         '5b7cd4e425b6fb2c9a5b3b56eb313d5b')
+
+prepare() {
+  cd BackupPC-$pkgver
+  # apply patch from the source array (should be a pacman feature)
+  local filename
+  for filename in "${source[@]}"; do
+    if [[ "$filename" =~ \.patch$ ]]; then
+      msg2 "Applying patch ${filename##*/}"
+      patch -p1 -N -i "$srcdir/${filename##*/}"
+    fi
+  done
+  :
+}
+
+build() {
+  msg2 'rsync-bpc'
+  cd "$srcdir"/rsync-bpc-$_rbpcver
+  ./configure --prefix=/usr/share/backuppc
+  make
+}
+
+package() {
+  msg2 'rsync-bpc'
+  cd "$srcdir"/rsync-bpc-$_rbpcver
+  make install DESTDIR="$pkgdir"
+
+  msg2 'backuppc-xs'
+  cd "$srcdir"/BackupPC-XS-$_xsver
+  perl Makefile.PL
+  make -j1 # parallel build fail
+  make install DESTDIR="$pkgdir"
+
+  msg2 'backuppc'
+  cd "$srcdir"/BackupPC-$pkgver
+  export PERLLIB="$pkgdir/usr/lib/perl5/site_perl/"
+  perl configure.pl \
+    --batch \
+    --no-set-perms \
+    --uid-ignore \
+    --hostname __HOSTNAME__ \
+    --compress-level 5 \
+    --backuppc-user=backuppc \
+    --dest-dir "$pkgdir" \
+    --fhs \
+    --install-dir /usr/share/$pkgname \
+    --config-dir /etc/$pkgname \
+    --cgi-dir /usr/share/$pkgname/cgi-bin \
+    --html-dir /usr/share/$pkgname/html \
+    --html-dir-url /backuppc \
+    --data-dir /var/lib/$pkgname \
+    --log-dir /var/log/$pkgname \
+    --run-dir /run/$pkgname \
+    --bin-path rsync_bpc=/usr/share/backuppc/bin/rsync_bpc \
+    --bin-path smbclient=/usr/bin/smbclient \
+    --bin-path nmblookup=/usr/bin/nmblookup \
+    --bin-path rsync=/usr/bin/rsync \
+    --bin-path ssh=/usr/bin/ssh \
+    --bin-path sendmail=/usr/bin/sendmail \
+    --bin-path ping=/usr/bin/ping \
+    --bin-path ping6=/usr/bin/ping \
+    --bin-path rrdtool=/usr/bin/rrdtool \
+    --
+  cd "$srcdir"
+  # systemd
+  install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -D -m 644 $pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -D -m 644 $pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+  # install shell profiles
+  install -D -m 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
+  install -D -m 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
+  # install apache http
+  install -D -m 644 $pkgname.httpd "$pkgdir/etc/httpd/conf/extra/$pkgname.conf"
+  install -D -m 640 /dev/null "$pkgdir/etc/$pkgname/$pkgname.users"
+  # set correct permissions
+  cd "$pkgdir"
+  chown 126:126 -R etc/$pkgname
+  chown 126:126 -R var/{log,lib}/$pkgname
+  chmod 755 etc
+  chmod 755 -R var usr/share/$pkgname/{cgi-,}bin
+  chmod 750 var/log/$pkgname etc/$pkgname
+  chmod 750 -R var/lib/$pkgname
+  chmod 640 etc/$pkgname/{config.pl,hosts}
+  # no /run
+  rm -r "$pkgdir"/run
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/backuppc.httpd
===================================================================
--- community-x86_64/backuppc.httpd	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.httpd	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,21 +0,0 @@
-<Directory /usr/share/backuppc/cgi-bin>
-  # This section tells apache which machines can access the interface.
-  # You can change the allow line to allow access from your local
-  # network, or comment out this region to allow access from all
-  # machines.
-  Require ip 127.0.0.1
-
-  # You can change the authorization method to LDAP or another method
-  # besides htaccess here if you are so inclined.
-  AuthType Basic
-  AuthUserFile /etc/backuppc/backuppc.users
-  AuthName "BackupPC Community Edition Administrative Interface"
-  require valid-user
-</Directory>
-
-<Directory /usr/share/backuppc/html>
-  Require ip 127.0.0.1
-</Directory>
-
-Alias           /backuppc         /usr/share/backuppc/html
-ScriptAlias     /BackupPC_Admin         /usr/share/backuppc/cgi-bin/BackupPC_Admin

Copied: backuppc/repos/community-x86_64/backuppc.httpd (from rev 215789, backuppc/trunk/backuppc.httpd)
===================================================================
--- community-x86_64/backuppc.httpd	                        (rev 0)
+++ community-x86_64/backuppc.httpd	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,21 @@
+<Directory /usr/share/backuppc/cgi-bin>
+  # This section tells apache which machines can access the interface.
+  # You can change the allow line to allow access from your local
+  # network, or comment out this region to allow access from all
+  # machines.
+  Require ip 127.0.0.1
+
+  # You can change the authorization method to LDAP or another method
+  # besides htaccess here if you are so inclined.
+  AuthType Basic
+  AuthUserFile /etc/backuppc/backuppc.users
+  AuthName "BackupPC Community Edition Administrative Interface"
+  require valid-user
+</Directory>
+
+<Directory /usr/share/backuppc/html>
+  Require ip 127.0.0.1
+</Directory>
+
+Alias           /backuppc         /usr/share/backuppc/html
+ScriptAlias     /BackupPC_Admin         /usr/share/backuppc/cgi-bin/BackupPC_Admin

Deleted: community-x86_64/backuppc.install
===================================================================
--- community-x86_64/backuppc.install	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.install	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,23 +0,0 @@
-#/bin/bash
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  # change uid of old version
-  if (( $(vercmp $2 3.2.1-8) < 0 )); then
-    if pgrep -u backuppc >/dev/null; then
-      echo '==> backuppc user is running.'
-      echo '==> You must manually change uid and gid of backuppc!'
-      echo '==> e.g: usermod -u 126 -g 126 backuppc'
-    else
-      usermod -u 126 -g 126 backuppc
-      echo '==> backuppc uid/gid have changed. Check your filesystem permissions.'
-    fi
-  fi
-  if (( $(vercmp $2 4.0.0-1) <= 0 )); then
-    echo '==> Major update. Remember to merge new variables in config.pl!'
-  fi
-  :
-}
-
-# vim:set ts=2 sw=2 ft=sh et:

Copied: backuppc/repos/community-x86_64/backuppc.install (from rev 215789, backuppc/trunk/backuppc.install)
===================================================================
--- community-x86_64/backuppc.install	                        (rev 0)
+++ community-x86_64/backuppc.install	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,23 @@
+#/bin/bash
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  # change uid of old version
+  if (( $(vercmp $2 3.2.1-8) < 0 )); then
+    if pgrep -u backuppc >/dev/null; then
+      echo '==> backuppc user is running.'
+      echo '==> You must manually change uid and gid of backuppc!'
+      echo '==> e.g: usermod -u 126 -g 126 backuppc'
+    else
+      usermod -u 126 -g 126 backuppc
+      echo '==> backuppc uid/gid have changed. Check your filesystem permissions.'
+    fi
+  fi
+  if (( $(vercmp $2 4.0.0-1) <= 0 )); then
+    echo '==> Major update. Remember to merge new variables in config.pl!'
+  fi
+  :
+}
+
+# vim:set ts=2 sw=2 ft=sh et:

Deleted: community-x86_64/backuppc.profile.csh
===================================================================
--- community-x86_64/backuppc.profile.csh	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.profile.csh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1 +0,0 @@
-[ -d /usr/share/backuppc/bin ] && setenv PATH ${PATH}:/usr/share/backuppc/bin

Copied: backuppc/repos/community-x86_64/backuppc.profile.csh (from rev 215789, backuppc/trunk/backuppc.profile.csh)
===================================================================
--- community-x86_64/backuppc.profile.csh	                        (rev 0)
+++ community-x86_64/backuppc.profile.csh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1 @@
+[ -d /usr/share/backuppc/bin ] && setenv PATH ${PATH}:/usr/share/backuppc/bin

Deleted: community-x86_64/backuppc.profile.sh
===================================================================
--- community-x86_64/backuppc.profile.sh	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.profile.sh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,3 +0,0 @@
-[ -d /usr/share/backuppc/bin ] && PATH=$PATH:/usr/share/backuppc/bin
-
-export PATH

Copied: backuppc/repos/community-x86_64/backuppc.profile.sh (from rev 215789, backuppc/trunk/backuppc.profile.sh)
===================================================================
--- community-x86_64/backuppc.profile.sh	                        (rev 0)
+++ community-x86_64/backuppc.profile.sh	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,3 @@
+[ -d /usr/share/backuppc/bin ] && PATH=$PATH:/usr/share/backuppc/bin
+
+export PATH

Deleted: community-x86_64/backuppc.service
===================================================================
--- community-x86_64/backuppc.service	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.service	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1,11 +0,0 @@
-[Unit]
-Description=BackupPC
-
-[Service]
-User=backuppc
-PIDFile=/run/backuppc/BackupPC.pid
-ExecStart=/usr/share/backuppc/bin/BackupPC
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target

Copied: backuppc/repos/community-x86_64/backuppc.service (from rev 215789, backuppc/trunk/backuppc.service)
===================================================================
--- community-x86_64/backuppc.service	                        (rev 0)
+++ community-x86_64/backuppc.service	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1,11 @@
+[Unit]
+Description=BackupPC
+
+[Service]
+User=backuppc
+PIDFile=/run/backuppc/BackupPC.pid
+ExecStart=/usr/share/backuppc/bin/BackupPC
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/backuppc.sysusers
===================================================================
--- community-x86_64/backuppc.sysusers	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.sysusers	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1 +0,0 @@
-u backuppc 126 - /var/lib/backuppc

Copied: backuppc/repos/community-x86_64/backuppc.sysusers (from rev 215789, backuppc/trunk/backuppc.sysusers)
===================================================================
--- community-x86_64/backuppc.sysusers	                        (rev 0)
+++ community-x86_64/backuppc.sysusers	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1 @@
+u backuppc 126 - /var/lib/backuppc

Deleted: community-x86_64/backuppc.tmpfiles
===================================================================
--- community-x86_64/backuppc.tmpfiles	2017-03-12 14:26:01 UTC (rev 215791)
+++ community-x86_64/backuppc.tmpfiles	2017-03-12 14:26:21 UTC (rev 215792)
@@ -1 +0,0 @@
-d /run/backuppc 0750 backuppc backuppc

Copied: backuppc/repos/community-x86_64/backuppc.tmpfiles (from rev 215789, backuppc/trunk/backuppc.tmpfiles)
===================================================================
--- community-x86_64/backuppc.tmpfiles	                        (rev 0)
+++ community-x86_64/backuppc.tmpfiles	2017-03-12 14:26:21 UTC (rev 215792)
@@ -0,0 +1 @@
+d /run/backuppc 0750 backuppc backuppc


More information about the arch-commits mailing list