aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-09-04 08:43:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-09-04 08:43:12 +0000
commit281764e0600cf3dbf10987373c357957d8ac1f16 (patch)
tree4ddcb17e7f7e2eef9fa987d8600e44ffc3aca869
parent601b6ee7d8634c02249dbe0b9222998ca275a0d4 (diff)
downloadaports-281764e0600cf3dbf10987373c357957d8ac1f16.tar.bz2
aports-281764e0600cf3dbf10987373c357957d8ac1f16.tar.xz
main/apk-tools: 0001-version-index-output-to-stdout-instead-of-stderr.patch
-rw-r--r--main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch31
-rw-r--r--main/apk-tools/APKBUILD7
2 files changed, 36 insertions, 2 deletions
diff --git a/main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch b/main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch
new file mode 100644
index 0000000000..31bfc9a368
--- /dev/null
+++ b/main/apk-tools/0001-version-index-output-to-stdout-instead-of-stderr.patch
@@ -0,0 +1,31 @@
+From d3861d70a88c6d2d3583fb90946aedb48a8d3e46 Mon Sep 17 00:00:00 2001
+From: Timo Teras <timo.teras@iki.fi>
+Date: Fri, 4 Sep 2009 11:38:19 +0300
+Subject: [PATCH] version: --index output to stdout instead of stderr
+
+---
+ src/ver.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/ver.c b/src/ver.c
+index 3f85afc..a617bdb 100644
+--- a/src/ver.c
++++ b/src/ver.c
+@@ -31,10 +31,10 @@ static int ver_indexes(struct apk_database *db, int argc, char **argv)
+ if (APK_BLOB_IS_NULL(repo->description))
+ continue;
+
+- apk_message("%.*s [%s]",
+- repo->description.len,
+- repo->description.ptr,
+- db->repos[i].url);
++ printf("%.*s [%s]\n",
++ repo->description.len,
++ repo->description.ptr,
++ db->repos[i].url);
+ }
+
+ return 0;
+--
+1.6.4.2
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index a29393b1eb..7729b17163 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,12 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.0_rc5
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-version-index-output-to-stdout-instead-of-stderr.patch
"
@@ -16,6 +17,7 @@ license=GPL-2
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i -e 's:-Werror::' Make.rules
+ patch -p1 -i ../0001-version-index-output-to-stdout-instead-of-stderr.patch || return 1
make || return 1
make static || return 1
@@ -36,4 +38,5 @@ static() {
"$subpkgdir"/sbin/apk.static
}
-md5sums="0d7507305586e2f4bcc4884cf6684977 apk-tools-2.0_rc5.tar.bz2"
+md5sums="0d7507305586e2f4bcc4884cf6684977 apk-tools-2.0_rc5.tar.bz2
+5fafd1581c7d2bce26fc9531f4a128e7 0001-version-index-output-to-stdout-instead-of-stderr.patch"