diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2011-05-11 13:19:32 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2011-05-11 13:20:11 -0500 |
| commit | 53340444c95fa741e40cc22fc114d4f4de142282 (patch) | |
| tree | c45d0a9e551116afacbe8e64dc51b2ac9cea691c | |
| parent | 2d682f0f163150865f6723e85095ef83d0497066 (diff) | |
| download | aports-53340444c95fa741e40cc22fc114d4f4de142282.tar.bz2 aports-53340444c95fa741e40cc22fc114d4f4de142282.tar.xz | |
main/util-linux-ng: upgrade to 2.19.1
| -rw-r--r-- | main/util-linux-ng/APKBUILD | 27 | ||||
| -rw-r--r-- | main/util-linux-ng/program-invocation.patch | 11 |
2 files changed, 31 insertions, 7 deletions
diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD index 5f06840bb6..98b38fc7db 100644 --- a/main/util-linux-ng/APKBUILD +++ b/main/util-linux-ng/APKBUILD @@ -1,22 +1,34 @@ # Contributor: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-linux-ng -pkgver=2.18 -pkgrel=2 +pkgver=2.19.1 +pkgrel=0 pkgdesc="Random collection of Linux utilities" -url="http://kernel.org/~kzak/util-linux-ng/" +url="http://kernel.org/~kzak/util-linux/" arch="all" license="GPL-2 GPL Public Domain" depends= # use GNU sed til bb sed is fixed makedepends="zlib-dev sed ncurses-dev" install= -source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v$pkgver/$pkgname-$pkgver.tar.gz" +source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v${pkgver%.*}/util-linux-$pkgver.tar.gz + program-invocation.patch" subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk" replaces="e2fsprogs" +_builddir="$srcdir/util-linux-$pkgver" +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" sed -e 's/versionsort/alphasort/g'\ -e 's/strverscmp.h/dirent.h/g' \ -i mount/lomount.c @@ -34,7 +46,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$_builddir" make -j1 install DESTDIR="$pkgdir" # use pkg-config rm -f "$pkgdir"/usr/lib/*.la @@ -74,4 +86,5 @@ cfdisk() { mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ } -md5sums="aff22adfff1bf39cd3f13371b95a3d3a util-linux-ng-2.18.tar.gz" +md5sums="dd242eeb2ba76e4e55bf2237a50dd2b7 util-linux-2.19.1.tar.gz +079dc713684e01ad48c7e0bb877dc51a program-invocation.patch" diff --git a/main/util-linux-ng/program-invocation.patch b/main/util-linux-ng/program-invocation.patch new file mode 100644 index 0000000000..c81f97e36a --- /dev/null +++ b/main/util-linux-ng/program-invocation.patch @@ -0,0 +1,11 @@ +--- util-linux-2.19.1.orig/include/c.h ++++ util-linux-2.19.1/include/c.h +@@ -115,7 +115,7 @@ + + #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME + # ifdef HAVE___PROGNAME +-extern char *__progname; ++extern const char *__progname; + # define program_invocation_short_name __progname + # else + # include <string.h> |