From 3c1b1f253a5a014e77a9cf832a62f1e406565500 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 11 Jun 2014 10:19:54 +0200
Subject: main/alpine-conf: fix setup-timezone to use /etc/localtime as
 upstream musl

---
 ...one-move-etc-zoneinfo-localtime-to-etc-lo.patch | 29 ++++++++++++++++++++++
 main/alpine-conf/APKBUILD                          | 12 ++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 main/alpine-conf/0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch

(limited to 'main/alpine-conf')

diff --git a/main/alpine-conf/0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch b/main/alpine-conf/0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch
new file mode 100644
index 0000000000..09d736cb23
--- /dev/null
+++ b/main/alpine-conf/0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch
@@ -0,0 +1,29 @@
+From 41ae5b85c49d3982261b4aab7bf072093670f874 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 11 Jun 2014 10:17:39 +0200
+Subject: [PATCH] setup-timezone: move /etc/zoneinfo/localtime to
+ /etc/localtime
+
+This is what upstream musl does.
+---
+ setup-timezone.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup-timezone.in b/setup-timezone.in
+index 4192465..6964f69 100644
+--- a/setup-timezone.in
++++ b/setup-timezone.in
+@@ -53,8 +53,8 @@ setup_tz() {
+ 		cp "$zonepath" "${ROOT}"etc/zoneinfo/$zdir/
+ 		zonepath=/etc/zoneinfo/$zone
+ 	fi
+-	rm -f "${ROOT}"etc/zoneinfo/localtime
+-	ln -s "$zonepath" "${ROOT}"etc/zoneinfo/localtime
++	rm -f "${ROOT}"etc/localtime
++	ln -s "$zonepath" "${ROOT}"etc/localtime
+ }
+ 
+ INSTALL_TZDATA=false
+-- 
+2.0.0
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 3ac18c2a87..5e460521a5 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
 pkgver=3.0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="GPL2"
 depends="openrc"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
+	0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -34,6 +35,9 @@ package() {
 	done
 }
 
-md5sums="47d68ae225cd301a4c77230299892c72  alpine-conf-3.0.2.tar.xz"
-sha256sums="2973063ef0bb6da8bab3d6e87d1815ce4844722cc10e98b95367e6f85588d186  alpine-conf-3.0.2.tar.xz"
-sha512sums="08d2d4afe25b27796d08f48a369a245ea695785b5db4eda33a8569b661a16fb1560cbb6e98bebb07bc7afc18f9c0ea648b66ad7596d8636d0ad7d0112a002e22  alpine-conf-3.0.2.tar.xz"
+md5sums="47d68ae225cd301a4c77230299892c72  alpine-conf-3.0.2.tar.xz
+d068ca120f9264c993bd8a62d457959f  0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch"
+sha256sums="2973063ef0bb6da8bab3d6e87d1815ce4844722cc10e98b95367e6f85588d186  alpine-conf-3.0.2.tar.xz
+fd4f7724cbe3e92378b20e10b948b9d8e0b0548dce2b96acad92b8d75bf46640  0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch"
+sha512sums="08d2d4afe25b27796d08f48a369a245ea695785b5db4eda33a8569b661a16fb1560cbb6e98bebb07bc7afc18f9c0ea648b66ad7596d8636d0ad7d0112a002e22  alpine-conf-3.0.2.tar.xz
+fc4b5579194c46e3214fa6108a229cc2213cedd868278a7b010d13ac751908a821dc1c0c7cc96363723733eae105dd20a77e22d9eb84fcf528f4bb9a91ca1bf9  0001-setup-timezone-move-etc-zoneinfo-localtime-to-etc-lo.patch"
-- 
cgit v1.2.3