summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-17 12:57:28 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-17 12:57:44 +0000
commita5bc7dfd01606e1401db86bd769767b1b85db9a0 (patch)
tree2a1a5ff7e3e8f38d5c7698c7defba7720b7f87b4
parent06cf03b8b13a2435ba17d4c47511071f50a07a11 (diff)
downloadaports-a5bc7dfd01606e1401db86bd769767b1b85db9a0.tar.bz2
aports-a5bc7dfd01606e1401db86bd769767b1b85db9a0.tar.xz
main/abuild: upgrade to 2.9.2
-rw-r--r--main/abuild/0001-buildrepo-fix-purging-of-old-packages.patch25
-rw-r--r--main/abuild/0002-buildrepo-fix-previous-commit.patch36
-rw-r--r--main/abuild/APKBUILD10
3 files changed, 3 insertions, 68 deletions
diff --git a/main/abuild/0001-buildrepo-fix-purging-of-old-packages.patch b/main/abuild/0001-buildrepo-fix-purging-of-old-packages.patch
deleted file mode 100644
index 402535c08..000000000
--- a/main/abuild/0001-buildrepo-fix-purging-of-old-packages.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 54ca2cb82aafc43e77dff1bacb80ed25a55f6ae7 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 7 Apr 2011 14:34:51 +0000
-Subject: [PATCH 1/2] buildrepo: fix purging of old packages
-
----
- buildrepo.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/buildrepo.in b/buildrepo.in
-index 5a80b0b..405e500 100755
---- a/buildrepo.in
-+++ b/buildrepo.in
-@@ -81,7 +81,7 @@ build() {
- if [ -n "$dopurge" ]; then
- local tmp=$(mktemp /tmp/$program-XXXXXX)
- local purgefiles
-- cd "$repodir/$1" || return 1
-+ cd "$repodir/$repo/$CARCH" || return 1
- trap 'rm -f "$tmp"; exit 1' INT
- ( listpackages "$1") >$tmp
- purge=$(ls *.apk 2>/dev/null | grep -v -w -f $tmp)
---
-1.7.4.4
-
diff --git a/main/abuild/0002-buildrepo-fix-previous-commit.patch b/main/abuild/0002-buildrepo-fix-previous-commit.patch
deleted file mode 100644
index 522b005ff..000000000
--- a/main/abuild/0002-buildrepo-fix-previous-commit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 18beb69377c4e4809c572cb287e8879d51bebedc Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 11 Apr 2011 11:51:39 +0000
-Subject: [PATCH 2/2] buildrepo: fix previous commit
-
----
- buildrepo.in | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/buildrepo.in b/buildrepo.in
-index 405e500..79954da 100755
---- a/buildrepo.in
-+++ b/buildrepo.in
-@@ -61,8 +61,8 @@ build() {
- pkgs=$(abuild listpkg)
- if all_exist $pkgs; then
- echo ">>> Copying " $pkgs
-- cp -p -l $pkgs "$repodir/$repo/$CARCH"/ 2>/dev/null \
-- || cp -p $pkgs "$repodir/$repo/$CARCH"/ \
-+ cp -p -l $pkgs "$repodir/$repo/$arch"/ 2>/dev/null \
-+ || cp -p $pkgs "$repodir/$repo/$arch"/ \
- || needbuild="$needbuild $i"
- else
- needbuild="$needbuild $i"
-@@ -81,7 +81,7 @@ build() {
- if [ -n "$dopurge" ]; then
- local tmp=$(mktemp /tmp/$program-XXXXXX)
- local purgefiles
-- cd "$repodir/$repo/$CARCH" || return 1
-+ cd "$repodir/$repo/$arch" || return 1
- trap 'rm -f "$tmp"; exit 1' INT
- ( listpackages "$1") >$tmp
- purge=$(ls *.apk 2>/dev/null | grep -v -w -f $tmp)
---
-1.7.4.4
-
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 17b2915b7..af0112548 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,12 +1,10 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgdesc="Script to build Alpine Packages"
pkgname=abuild
-pkgver=2.9.1
-pkgrel=2
+pkgver=2.9.2
+pkgrel=0
url=http://git.alpinelinux.org/cgit/abuild/
source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2
- 0001-buildrepo-fix-purging-of-old-packages.patch
- 0002-buildrepo-fix-previous-commit.patch
"
depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1"
makedepends="openssl-dev pkgconfig"
@@ -39,6 +37,4 @@ package() {
install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles
}
-md5sums="e6c418567cd95eacc1278850dc88ee00 abuild-2.9.1.tar.bz2
-6ad9a80d107beda61e30b33f4fb35a35 0001-buildrepo-fix-purging-of-old-packages.patch
-0da412b51c7f177a140fff08c76a9270 0002-buildrepo-fix-previous-commit.patch"
+md5sums="49817d627e9e93455f74b2fa5bb3d66d abuild-2.9.2.tar.bz2"