diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-04 12:54:44 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-04 12:54:52 +0000 |
| commit | ae49794bd61e8b16bbccd9acc0ae4b73053a3a06 (patch) | |
| tree | 360252413ac73615416898e1c15799c20b417e31 /main/util-linux | |
| parent | 2b0007c0f61b18bf84bf6225629df112ac0239e0 (diff) | |
| download | aports-ae49794bd61e8b16bbccd9acc0ae4b73053a3a06.tar.bz2 aports-ae49794bd61e8b16bbccd9acc0ae4b73053a3a06.tar.xz | |
main/util-linux: upgrade to 2.26.2
Diffstat (limited to 'main/util-linux')
| -rw-r--r-- | main/util-linux/APKBUILD | 12 | ||||
| -rw-r--r-- | main/util-linux/fix-setenv-usage.patch | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD index d7f0f15363..99d2a31613 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.26.1 +pkgver=2.26.2 case $pkgver in *.*.*) _v=${pkgver%.*};; @@ -19,7 +19,6 @@ makedepends="zlib-dev sed ncurses-dev tar autoconf automake libtool python-dev l install= options="suid" source="http://www.kernel.org/pub/linux/utils/util-linux/v${_v}/util-linux-$pkgver.tar.xz - fix-setenv-usage.patch ttydefaults.h " subpackages="$pkgname-doc $pkgname-dev libuuid libblkid libmount sfdisk cfdisk @@ -133,12 +132,9 @@ _py() { mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } -md5sums="2308850946766677f3fabe0685e85de8 util-linux-2.26.1.tar.xz -7033d8ec10f6ff52c8120afbe9522490 fix-setenv-usage.patch +md5sums="9bdf368c395f1b70325d0eb22c7f48fb util-linux-2.26.2.tar.xz 6196f1ce853dfaf717569c1e35555d6d ttydefaults.h" -sha256sums="22dc1c957262e2cbdfb4d524a63d5cd4f219d3ac9b5eab570fc771076799bb6e util-linux-2.26.1.tar.xz -ff1625c8d479511b263c1beb86bf6c30c2e13142183647f4fa8c62ff1bc68910 fix-setenv-usage.patch +sha256sums="0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 util-linux-2.26.2.tar.xz 46faf1198bd884d12c5d45019a5fec8dfdefeae6721d8c9f3da89921acdb2a6d ttydefaults.h" -sha512sums="9321793b3fa219ffc46e10639b9e45094c3cae6c48be4b80e652d9768f40dcedbd49342e17345b61c85f46540a7bd93d118a8e226c315e112bb2e959e2855ad9 util-linux-2.26.1.tar.xz -310acfe2f171010014d25b1788ea64bffc5a315f4fef8d3b8fc9b003bda8810111b12987052eb2d5856500bd6b742792c977608fe9459ce2efe7545ef0054588 fix-setenv-usage.patch +sha512sums="1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b util-linux-2.26.2.tar.xz 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9 ttydefaults.h" diff --git a/main/util-linux/fix-setenv-usage.patch b/main/util-linux/fix-setenv-usage.patch deleted file mode 100644 index 44638d40f5..0000000000 --- a/main/util-linux/fix-setenv-usage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru util-linux-2.23.2.orig/sys-utils/hwclock.c util-linux-2.23.2/sys-utils/hwclock.c ---- util-linux-2.23.2.orig/sys-utils/hwclock.c 2013-06-13 10:46:10.000000000 +0300 -+++ util-linux-2.23.2/sys-utils/hwclock.c 2014-04-10 09:01:47.931470656 +0300 -@@ -390,7 +390,7 @@ - * libc's: - * TZUTC=:/usr/share/zoneinfo/right/UTC - */ -- setenv("TZ", getenv("TZUTC"), TRUE); -+ setenv("TZ", getenv("TZUTC") ?: "", TRUE); - /* - * Note: tzset() gets called implicitly by the time code, - * but only the first time. When changing the environment |