From 4c1086821aea4b77518ade3718a073421bbbd291 Mon Sep 17 00:00:00 2001 From: Cecil Date: Fri, 4 Feb 2011 20:44:26 -0800 Subject: abs:bumped to latest --- abs/extra/abs/ChangeLog | 41 ----------------------------------------- abs/extra/abs/PKGBUILD | 12 +++++------- abs/extra/abs/abs.install | 23 ++++++++++------------- 3 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 abs/extra/abs/ChangeLog diff --git a/abs/extra/abs/ChangeLog b/abs/extra/abs/ChangeLog deleted file mode 100644 index 03d6d88..0000000 --- a/abs/extra/abs/ChangeLog +++ /dev/null @@ -1,41 +0,0 @@ -2008-10-28 Allan McRae - - * 2.3-1 - Upstream update - - add ability to download files using tarballs on pacman mirror - -2008-08-10 Allan McRae - - * 2.2-1 - Upstream update - - adds ability to select which repos/packages - sync on commandline - - additional PKGBUILD and install script prototypes - -2008-04-19 Travis Willard - - * 2.1-1 - Upstream update - re-adds support for community - -2008-04-19 Travis Willard - - * 2.0-4 - Added install warning about /var/abs - -2008-04-15 Travis Willard - - * 2.0-3 - Added install message - Moved abs.conf to /etc instead of /etc/abs - -2008-04-13 Travis Willard - - * 2.0-2 - Moved rsyncd.conf.abs to /usr/share/abs - Made rsync server configurable - -2008-04-10 Travis Willard - - * 2.0-1 - Added ChangeLog - New rsync-based release diff --git a/abs/extra/abs/PKGBUILD b/abs/extra/abs/PKGBUILD index 872fc59..4273e8a 100644 --- a/abs/extra/abs/PKGBUILD +++ b/abs/extra/abs/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 17300 2008-10-28 04:37:22Z allan $ +# $Id: PKGBUILD 65230 2010-01-25 13:11:11Z allan $ # Maintainer: Allan McRae pkgname=abs -pkgver=2.3 +pkgver=2.3.4.1 pkgrel=1 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64') -url="http://projects.archlinux.org/git/?p=abs.git" +url="http://projects.archlinux.org/abs.git/" license=('GPL') depends=('bash' 'rsync') backup=(etc/abs.conf) install=abs.install source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz) -md5sums=('d6fd791aa487ba8bb5ff48c3ace20592') +md5sums=('286825d64f19f801d510ff1f7cc05ea6') build() { cd ${srcdir}/${pkgname} @@ -26,8 +26,6 @@ build() { # change ABS tags for x86_64 to correct values if [ "$CARCH" = "x86_64" ]; then - sed -i "s|i686|x86_64|g" ${pkgdir}/etc/abs.conf + sed -i 's|"i686"|"x86_64"|g' ${pkgdir}/etc/abs.conf fi } - -# vim: set ts=2 sw=2 noet: diff --git a/abs/extra/abs/abs.install b/abs/extra/abs/abs.install index 1b19b4a..c16a8d7 100644 --- a/abs/extra/abs/abs.install +++ b/abs/extra/abs/abs.install @@ -1,15 +1,12 @@ -## arg 1: the new package version -## arg 2: the old package version pre_upgrade() { - if [ "$(vercmp $2 2.0-1)" -lt 0 ]; then - echo "==> ABS now uses rsync, instead of cvsup, to synchronize your tree." - echo "==> Please note the new configuration in /etc/abs.conf" - fi - - if [ "$(vercmp $2 2.0-4)" -lt 0 ]; then - echo "==> Warning: abs clears out the contents of /var/abs when syncing." - echo "==> Keep all local PKGBUILDs in /var/abs/local, or they will disappear" - fi + if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then + echo "==> Fixing potential ABS tree permission issues (this may take a while...)" + + for dir in core extra community testing; do + if [ -d /var/abs/$dir ]; then + find /var/abs/$dir -type d -exec chown root:root {} \; + find /var/abs/$dir -type d -exec chmod 755 {} \; + fi + done + fi } - -# vim:set ts=2 sw=2 et: -- cgit v0.12