From b1e8c97877c096085d89e57da7859b28bb995022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 11 Jun 2014 14:19:09 +0300
Subject: main/musl: upgrade to snapshot of 2014-06-11

* migrate to /etc/localtime (instead of /etc/zoneinfo/localtime)
  this is the upstream way now

* add replaces to uclibc-utils for smoother upgrades from uclibc
---
 main/musl/APKBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'main/musl/APKBUILD')

diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 80968cabb2..73492167ad 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=musl
 pkgver=1.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="the musl c library (libc) implementation"
 url="http://www.musl-libc.org/"
 arch="all"
@@ -10,12 +10,12 @@ license="MIT"
 depends=""
 depends_dev="!uclibc-dev"
 makedepends="$depends_dev"
-install=""
+install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-dev $pkgname-utils"
 source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
+	0001-v1.1.2-to-66fcde4a.patch
 	1001-add-basic-dns-record-parsing-functions.patch
 	1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
-	2001-default-to-localtime-timezone-if-TZ-is-undefined.patch
 
 	ldconfig
 	getopt_long.c
@@ -101,7 +101,7 @@ package() {
 
 utils() {
 	depends="!uclibc-utils scanelf"
-	replaces="libiconv"
+	replaces="libiconv uclibc-utils"
 	license="MIT BSD GPL2+"
 
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/sbin
@@ -117,9 +117,9 @@ utils() {
 }
 
 md5sums="a81309e54efdf9c68baf679790fc5678  musl-1.1.2.tar.gz
+a6a1f5c4f34f80cb1fd4c6e1b7936013  0001-v1.1.2-to-66fcde4a.patch
 a3810683ef61ac27e2f6ec9801280c81  1001-add-basic-dns-record-parsing-functions.patch
 83c3bd2a50b1de5ef948704d3f4e0583  1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
-e936297ceb484b2160a4cd8a3a4eb291  2001-default-to-localtime-timezone-if-TZ-is-undefined.patch
 013be8897f27c3909ada59c62020502f  ldconfig
 61c6c1e84ed1df82abbe6d75e90cf21c  getopt_long.c
 0df687757221bbb0fc1aa67f1bd646f9  __stack_chk_fail_local.c
@@ -127,9 +127,9 @@ cb82d21fed17a116b44b830adba71c5a  getconf.c
 2b941c4251cac44988a4abfc50e21267  getent.c
 45f92f8d59cf84d765de698a9578dbf4  iconv.c"
 sha256sums="dac94112b9a22d2657cd3f36ca0d62ee1eb10707a22bfc97d5746147ef92852b  musl-1.1.2.tar.gz
+2cd863b8a7d4af3d592607b20479163c1a011cf5a458cf7f0dc2dc9c08f5b57c  0001-v1.1.2-to-66fcde4a.patch
 758390768b1bc4159d56908ca332b9640cd0552ed3b4b2b8d4a6d499c54c11a1  1001-add-basic-dns-record-parsing-functions.patch
 1c25880095e869b827f02997e864fdf4bf157a4e923e52d97dbd05e657aedb70  1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
-60d7aa78040ee664681e507475129f76e445291863137e568c9a3d11ae8436ce  2001-default-to-localtime-timezone-if-TZ-is-undefined.patch
 398dc26ec82cc6af056c738e8ac62da212ba978229d9839eb8b61f7ce536da4a  ldconfig
 d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96  getopt_long.c
 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da  __stack_chk_fail_local.c
@@ -137,9 +137,9 @@ d9b644ec20bc33e81a7c52b9fcf7973d835923a69faf50f03db45534b811bd96  getopt_long.c
 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe  getent.c
 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7  iconv.c"
 sha512sums="54d279efea6e122567c936e47401df5c0f1493c42eb3199b0ba3053b1882a864fc1a71d19ad945bc4f328407231c54a7897413e37f4bc33337a243c044a26b4a  musl-1.1.2.tar.gz
+631b93b875d0b4451e8ab4587d4cd495617fe4b8627387bb7d19af5e9b354ae726e91b24abea87acc63f9b30ea55e1f65d87cf8ecfba2c69e0cdcdab15d84fa9  0001-v1.1.2-to-66fcde4a.patch
 dad965258daf69371b844f76bfe5a914b0eca0ca76f3fc340b8fd7acf598b5f87bbe6d68b1f43ed0293ee0ed3bfd85d5173ccc169aa6265646248d5b8a906708  1001-add-basic-dns-record-parsing-functions.patch
 72cf33738d2cf31f6ec02312bc494d754c17470b519172bb8bd7e2e29ac3b119023088a2b3fbc0dbc2fddd0078ccbae62096106cae361f8c31d6a9950043af25  1002-reimplement-if_nameindex-and-getifaddrs-using-netlin.patch
-8d4cae760895a18e83b5fcbdc925705a6dd98acd2270562ee6c905363096a4111cf3aa324b52a16066e30bddc9ab104883e2b25b5c68396ea27f1c50cb939f0a  2001-default-to-localtime-timezone-if-TZ-is-undefined.patch
 33e13d2242063f3dc9ec199ae9528e469a52ccae4d3726faa3c866e0c7dcf546f69294f9c00307324cee05fd965f84350ae100b8b1138f9d9c8c916de04ab0d1  ldconfig
 140f3f20d30bd95ebce8c41b8cc7f616c6cbedf4ea06c729c21014e74f6043796825cc40ebc5180620ea38173afdba23f09ebf6d8b11fa05440b14d23764fca9  getopt_long.c
 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b  __stack_chk_fail_local.c
-- 
cgit v1.2.3