From a9c9ec740b900602f8f5885cb1c19ec238ead6b2 Mon Sep 17 00:00:00 2001 From: Leonardo Arena Date: Sat, 21 May 2011 13:41:21 +0000 Subject: [PATCH] main/backuppc: various fixes for #655 --- main/backuppc/APKBUILD | 10 +++++----- main/backuppc/backuppc.post-install | 3 ++- main/backuppc/backuppc.pre-install | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/main/backuppc/APKBUILD b/main/backuppc/APKBUILD index afa6632da22..9568c9372a2 100644 --- a/main/backuppc/APKBUILD +++ b/main/backuppc/APKBUILD @@ -4,18 +4,18 @@ pkgname="backuppc" _realname="BackupPC" pkgver="3.2.0" _realver="3.2.0" -pkgrel=1 +pkgrel=2 pkgdesc="High-performance, enterprise-grade backup system" url="http://backuppc.sourceforge.net/" -arch="all" +arch="noarch" license="GPL" depends="perl busybox rsync perl-archive-zip perl-io-compress -perl-libwww perl-file-rsync" + perl-libwww perl-file-rsync" makedepends="" install="$pkgname.pre-install $pkgname.post-install" subpackages="" source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$_realver/$_realname-$_realver.tar.gz -configure.pl.patch" + configure.pl.patch" _builddir="$srcdir/$_realname-$_realver" @@ -48,7 +48,7 @@ build() { --dest-dir="$pkgdir" \ --config-dir /etc/BackupPC \ --cgi-dir /var/www/cgi-bin \ - --data-dir /var/lib/BackupPC/data/BackupPC \ + --data-dir /var/lib/BackupPC \ --hostname backuppc \ --html-dir /var/www/htdocs/BackupPC \ --html-dir-url /BackupPC \ diff --git a/main/backuppc/backuppc.post-install b/main/backuppc/backuppc.post-install index 0ba76f20f4b..abbfeb40d6e 100644 --- a/main/backuppc/backuppc.post-install +++ b/main/backuppc/backuppc.post-install @@ -1,7 +1,8 @@ #!/bin/sh for dir in /etc /var/log /var/lib do -chown -R backuppc.backuppc ${dir}/BackupPC &>/dev/null + chown -R backuppc.backuppc ${dir}/BackupPC &>/dev/null done chmod 774 /usr/lib/BackupPC/bin/* &>/dev/null +ln -s /var/www/htdocs/BackupPC/index.cgi /var/www/cgi-bin/BackupPC_Admin &>/dev/null diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install index 415971d749b..04a7ce19199 100644 --- a/main/backuppc/backuppc.pre-install +++ b/main/backuppc/backuppc.pre-install @@ -1,4 +1,4 @@ #!/bin/sh addgroup -S backuppc &>/dev/null -adduser -h /var/lib/backuppc -s /bin/sh -S -D -H -G backuppc -g "BackuPC user" backuppc &>/dev/null +adduser -h /var/lib/BackupPC -s /bin/sh -S -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null exit 0