aboutsummaryrefslogtreecommitdiffstats
path: root/main/util-linux
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-06-06 08:45:58 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-06-06 08:45:58 +0000
commite27eb1a7332ee2ae8b54dd075d017791d1618bdf (patch)
tree44729eebb7fada12e334ca82b4d15c6a6fad0868 /main/util-linux
parent51630d3c697d7d173f1f5640dfdf2dddd3662474 (diff)
downloadaports-e27eb1a7332ee2ae8b54dd075d017791d1618bdf.tar.bz2
aports-e27eb1a7332ee2ae8b54dd075d017791d1618bdf.tar.xz
main/util-linux: upgrade to 2.21.2
Diffstat (limited to 'main/util-linux')
-rw-r--r--main/util-linux/APKBUILD12
-rw-r--r--main/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch13
2 files changed, 4 insertions, 21 deletions
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index 5e73cc795c..a285feae89 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=util-linux
-pkgver=2.21.1
+pkgver=2.21.2
case $pkgver in
*.*.*) _v=${pkgver%.*};;
@@ -19,7 +19,6 @@ makedepends="zlib-dev sed ncurses-dev tar"
install=
source="http://www.kernel.org/pub/linux/utils/util-linux/v${_v}/util-linux-$pkgver.tar.xz
program-invocation.patch
- fix_NL_TIME_FIRST_WEEKDAY.patch
"
subpackages="$pkgname-doc $pkgname-dev libuuid libblkid sfdisk cfdisk mcookie blkid"
replaces="e2fsprogs util-linux-ng"
@@ -47,10 +46,8 @@ build() {
--disable-nls \
--disable-tls \
--disable-kill \
- --disable-init \
--with-ncurses \
- --without-pam
-
+ || return 1
make || return 1
}
@@ -110,6 +107,5 @@ mcookie() {
mv "$pkgdir"/usr/bin/mcookie "$subpkgdir"/usr/bin/
}
-md5sums="ad602dcd528f340b1329cfa6200d8f80 util-linux-2.21.1.tar.xz
-9682a6ddd5abe65434a145ebe512c123 program-invocation.patch
-8c434a785bfaed23d8f222c14d883a82 fix_NL_TIME_FIRST_WEEKDAY.patch"
+md5sums="54ba880f1d66782c2287ee2c898520e9 util-linux-2.21.2.tar.xz
+9682a6ddd5abe65434a145ebe512c123 program-invocation.patch"
diff --git a/main/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch b/main/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch
deleted file mode 100644
index 9ea76a03b0..0000000000
--- a/main/util-linux/fix_NL_TIME_FIRST_WEEKDAY.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: util-linux-2.21/misc-utils/cal.c
-===================================================================
---- util-linux-2.21.orig/misc-utils/cal.c 2012-02-29 23:41:54.413347665 -0800
-+++ util-linux-2.21/misc-utils/cal.c 2012-02-29 23:42:44.573350057 -0800
-@@ -297,7 +297,7 @@
- * the locale database, which can be overridden with the
- * -s (Sunday) or -m (Monday) options.
- */
--#ifdef HAVE_DECL__NL_TIME_WEEK_1STDAY
-+#if HAVE_DECL__NL_TIME_WEEK_1STDAY
- /*
- * You need to use 2 locale variables to get the first day of the week.
- * This is needed to support first_weekday=2 and first_workday=1 for