From 84381d73914e05032f66e3f3adcb1abebe106030 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 30 Aug 2011 08:07:06 +0000 Subject: main/util-linux: renamed from util-linux-ng and upgrade to 2.20 --- main/util-linux-ng/APKBUILD | 105 -------------------- main/util-linux-ng/program-invocation.patch | 11 --- ...0001-script-fix-building-with-disable-nls.patch | 31 ++++++ main/util-linux/APKBUILD | 109 +++++++++++++++++++++ main/util-linux/program-invocation.patch | 11 +++ 5 files changed, 151 insertions(+), 116 deletions(-) delete mode 100644 main/util-linux-ng/APKBUILD delete mode 100644 main/util-linux-ng/program-invocation.patch create mode 100644 main/util-linux/0001-script-fix-building-with-disable-nls.patch create mode 100644 main/util-linux/APKBUILD create mode 100644 main/util-linux/program-invocation.patch diff --git a/main/util-linux-ng/APKBUILD b/main/util-linux-ng/APKBUILD deleted file mode 100644 index 7dcbc606c4..0000000000 --- a/main/util-linux-ng/APKBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# Contributor: Leonardo Arena -# Maintainer: Natanael Copa -pkgname=util-linux-ng -pkgver=2.19.1 -pkgrel=2 -pkgdesc="Random collection of Linux utilities" -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%.*}/util-linux-$pkgver.tar.gz - program-invocation.patch" -subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid" -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 "$_builddir" - sed -e 's/versionsort/alphasort/g'\ - -e 's/strverscmp.h/dirent.h/g' \ - -i mount/lomount.c - - ./configure --prefix=/usr \ - --disable-uuidd \ - --disable-nls \ - --disable-tls \ - --disable-kill \ - --disable-init \ - --with-ncurses \ - --without-pam - - make || return 1 -} - -package() { - cd "$_builddir" - make -j1 install DESTDIR="$pkgdir" - # use pkg-config - rm -f "$pkgdir"/usr/lib/*.la -} - -dev() { - default_dev - replaces="e2fsprogs-dev" -} - -blkid() { - pkgdesc="block device identificatio tool" - replaces="util-linux-ng" - depends= - mkdir -p "$subpkgdir"/sbin - mv "$pkgdir"/sbin/blkid "$subpkgdir"/sbin/ -} - -libuuid() { - pkgdesc="DCE compatible Universally Unique Identifier library" - depends= - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/ -} - -libblkid() { - pkgdesc="Block device identification library from util-linux-ng" - depends= - mkdir -p "$subpkgdir"/lib - mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/ -} - -sfdisk() { - pkgdesc="Partition table manipulator from util-linux-ng" - depends= - mkdir -p "$subpkgdir"/sbin - mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/ -} - - -cfdisk() { - pkgdesc="Curses based partition table manipulator from util-linux-ng" - depends= - mkdir -p "$subpkgdir"/sbin - mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ -} - -mcookie() { - pkgdesc="mcookie from util-linux-ng" - replaces="util-linux-ng" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/ -} - -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 deleted file mode 100644 index c81f97e36a..0000000000 --- a/main/util-linux-ng/program-invocation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/main/util-linux/0001-script-fix-building-with-disable-nls.patch b/main/util-linux/0001-script-fix-building-with-disable-nls.patch new file mode 100644 index 0000000000..d81efd3308 --- /dev/null +++ b/main/util-linux/0001-script-fix-building-with-disable-nls.patch @@ -0,0 +1,31 @@ +From c22a5aaf45d21487641080d185e175d7d78d65d1 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Tue, 30 Aug 2011 07:55:17 +0000 +Subject: [PATCH] script: fix building with --disable-nls + +We should only include the libintl.h when NLS is requested. + +This fixes issue when building util-linux with uClibc. + +Signed-off-by: Natanael Copa +--- + term-utils/script.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/term-utils/script.c b/term-utils/script.c +index d96ca2f..99748a1 100644 +--- a/term-utils/script.c ++++ b/term-utils/script.c +@@ -55,7 +55,9 @@ + #include + #include + #include ++#ifdef ENABLE_NLS + #include ++#endif + #include + #include + #include +-- +1.7.6.1 + diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD new file mode 100644 index 0000000000..d4e0a8bde4 --- /dev/null +++ b/main/util-linux/APKBUILD @@ -0,0 +1,109 @@ +# Contributor: Leonardo Arena +# Maintainer: Natanael Copa +pkgname=util-linux +pkgver=2.20 +pkgrel=0 +pkgdesc="Random collection of Linux utilities" +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/v${pkgver}/util-linux-$pkgver.tar.gz + program-invocation.patch + 0001-script-fix-building-with-disable-nls.patch + " + +subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid" +replaces="e2fsprogs util-linux-ng" + +_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 "$_builddir" + sed -e 's/versionsort/alphasort/g'\ + -e 's/strverscmp.h/dirent.h/g' \ + -i mount/lomount.c + + ./configure --prefix=/usr \ + --disable-uuidd \ + --disable-nls \ + --disable-tls \ + --disable-kill \ + --disable-init \ + --with-ncurses \ + --without-pam + + make || return 1 +} + +package() { + cd "$_builddir" + make -j1 install DESTDIR="$pkgdir" + # use pkg-config + rm -f "$pkgdir"/usr/lib/*.la +} + +dev() { + default_dev + replaces="e2fsprogs-dev util-linux-ng-dev" +} + +blkid() { + pkgdesc="block device identificatio tool" + replaces="util-linux-ng" + depends= + mkdir -p "$subpkgdir"/sbin + mv "$pkgdir"/sbin/blkid "$subpkgdir"/sbin/ +} + +libuuid() { + pkgdesc="DCE compatible Universally Unique Identifier library" + depends= + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/ +} + +libblkid() { + pkgdesc="Block device identification library from util-linux" + depends= + mkdir -p "$subpkgdir"/lib + mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/ +} + +sfdisk() { + pkgdesc="Partition table manipulator from util-linux" + depends= + mkdir -p "$subpkgdir"/sbin + mv "$pkgdir"/sbin/sfdisk "$subpkgdir"/sbin/ +} + + +cfdisk() { + pkgdesc="Curses based partition table manipulator from util-linux" + depends= + mkdir -p "$subpkgdir"/sbin + mv "$pkgdir"/sbin/cfdisk "$subpkgdir"/sbin/ +} + +mcookie() { + pkgdesc="mcookie from util-linux" + replaces="util-linux-ng" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/ +} + +md5sums="fbcd168147c87550804744b70c2feac5 util-linux-2.20.tar.gz +079dc713684e01ad48c7e0bb877dc51a program-invocation.patch +b0b5ef3a9f785a5431675da696b60262 0001-script-fix-building-with-disable-nls.patch" diff --git a/main/util-linux/program-invocation.patch b/main/util-linux/program-invocation.patch new file mode 100644 index 0000000000..c81f97e36a --- /dev/null +++ b/main/util-linux/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 -- cgit v1.2.3