diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-25 15:16:29 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-01-25 15:17:52 +0000 |
| commit | 6f613e0f07777ae01350635aef26816bbcde424b (patch) | |
| tree | 28d1f7d1d4d837805ce441cf55674b34f0ff3968 /main/alpine-conf | |
| parent | 92b0caf829b64934a11d713708953e37a28316a2 (diff) | |
| download | aports-6f613e0f07777ae01350635aef26816bbcde424b.tar.bz2 aports-6f613e0f07777ae01350635aef26816bbcde424b.tar.xz | |
main/alpine-conf: set up ntp before repos in setup-alpine
we need time to be correct for https certificate validation.
fixes #9911
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-alpine-setup-ntp-before-repos.patch | 42 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 9 |
2 files changed, 48 insertions, 3 deletions
diff --git a/main/alpine-conf/0001-setup-alpine-setup-ntp-before-repos.patch b/main/alpine-conf/0001-setup-alpine-setup-ntp-before-repos.patch new file mode 100644 index 0000000000..38ca133649 --- /dev/null +++ b/main/alpine-conf/0001-setup-alpine-setup-ntp-before-repos.patch @@ -0,0 +1,42 @@ +From 8a3bfebfbcb7c1dab3bec763f07c731372c17ce4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 25 Jan 2019 15:11:50 +0000 +Subject: [PATCH] setup-alpine: setup ntp before repos + +we need time to be correct for https certificates when setting up +apkrepos, so we call setup-ntp before setup-apkrepos. + +ref #9911 +--- + setup-alpine.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/setup-alpine.in b/setup-alpine.in +index 9bae702..80e10ff 100644 +--- a/setup-alpine.in ++++ b/setup-alpine.in +@@ -186,6 +186,10 @@ if [ -r "$ROOT/etc/profile" ]; then + . "$ROOT/etc/profile" + fi + ++if ! is_qemu && [ "$rc_sys" != "LXC" ] && [ "$quick" != 1 ]; then ++ $PREFIX/sbin/setup-ntp ${NTPOPTS} ++fi ++ + $PREFIX/sbin/setup-apkrepos ${APKREPOSOPTS} + + # lets stop here if in "quick mode" +@@ -195,10 +199,6 @@ fi + + $PREFIX/sbin/setup-sshd ${SSHDOPTS} + +-if ! is_qemu && [ "$rc_sys" != "LXC" ]; then +- $PREFIX/sbin/setup-ntp ${NTPOPTS} +-fi +- + if is_xen_dom0; then + setup-xen-dom0 + fi +-- +2.20.1 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index f79d343913..7413366230 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,13 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.8.1 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" -source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz" +source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz + 0001-setup-alpine-setup-ntp-before-repos.patch + " builddir="$srcdir"/$pkgname-$pkgver build() { @@ -23,4 +25,5 @@ package() { done } -sha512sums="6aa0f0eaab6ee1ff8f9259d5c4e4634bf6d736a2cb52efb3cbabfdfcdd5dcd81b9fe05073ac16f964e7b74b5006b5f4219b33ab4ff5f984273b3bb48982afd6a alpine-conf-3.8.1.tar.xz" +sha512sums="6aa0f0eaab6ee1ff8f9259d5c4e4634bf6d736a2cb52efb3cbabfdfcdd5dcd81b9fe05073ac16f964e7b74b5006b5f4219b33ab4ff5f984273b3bb48982afd6a alpine-conf-3.8.1.tar.xz +4b1b88b66a0771720e1991534c0d55b17293d0d9c3e4064d4210c2edd2fcbe8f6691bf5336b5492312df6160aad8f17b4bb4f9174efd4bad342472b3ad2a16bc 0001-setup-alpine-setup-ntp-before-repos.patch" |