X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id BEFFDDC0099 for ; Mon, 17 Mar 2014 12:37:46 +0000 (UTC) Received: by mail-wg0-f49.google.com with SMTP id a1so4631151wgh.32 for ; Mon, 17 Mar 2014 05:37:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=Kp97XUqrBXEgsGL9b5cmWj8X8+z0iz1xiNXL0QNYVtY=; b=RML6ABrkBB8yXchxPsmPs7RsJsnha2ZlOEQvVIHZ470mwytjq1ib0dbWezgLpG4FV4 7dDJP7vLkVKYig5Ma6LiXfvf7Ar4pHYWFiv7im7vlP75IK+xoPDJhxiFyFAcwxA3wyIK yIMM5H51GcnX3DJEHG/rwkP3pruSHmtkmV0J4MinLl5i8XX474l0h2koY1QtrRv1tx8L qdJJ4rPHEr+i3+GT17XIl41C/4+9ecqTD1LvniQlWjdX3POld+j/b/4gmMt2slYr0seh ZWxLFv6VqX+IAIlzX/BfIN4vI5VSjHmA56+STQ5hMnuljupvw0sqQcFt3oac1Uk/XBPE 0WAw== X-Gm-Message-State: ALoCoQnHUnoIbM+nV8vdiAkC6PX+gWnRcxwWAOMW06ThNhDSUffb2vwfUDnVzARt7SH7AiQtO2eV X-Received: by 10.180.12.115 with SMTP id x19mr9536942wib.19.1395059865583; Mon, 17 Mar 2014 05:37:45 -0700 (PDT) Received: from scandium.members.linode.com (li703-102.members.linode.com. [88.80.191.102]) by mx.google.com with ESMTPSA id t5sm37968525wjw.15.2014.03.17.05.37.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Mar 2014 05:37:44 -0700 (PDT) From: Eivind Uggedal To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] [PATCH] main/openntpd: mv {init.d,conf.d}/ntpd -> openntpd Date: Mon, 17 Mar 2014 12:37:24 +0000 Message-Id: <1395059844-31141-1-git-send-email-eivind@uggedal.com> X-Mailer: git-send-email 1.9.0 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: In preparation for ntpd init and conf script in main/busybox-initscripts. Handles migration of user edited /etc/conf.d/ntpd and runlevel enablement. --- main/openntpd/APKBUILD | 8 ++++---- main/openntpd/openntpd.post-upgrade | 7 +++++++ main/openntpd/openntpd.pre-upgrade | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 main/openntpd/openntpd.post-upgrade create mode 100644 main/openntpd/openntpd.pre-upgrade diff --git a/main/openntpd/APKBUILD b/main/openntpd/APKBUILD index 0b88c5660875..2f1675ba3ebc 100644 --- a/main/openntpd/APKBUILD +++ b/main/openntpd/APKBUILD @@ -2,10 +2,10 @@ pkgname=openntpd pkgver=3.9_p1 _myver=3.9p1 -pkgrel=10 +pkgrel=11 pkgdesc="Lightweight NTP server ported from OpenBSD" url=http://www.openntpd.org/ -install=openntpd.pre-install +install="$pkgname.pre-install $pkgname.pre-upgrade $pkgname.post-upgrade" subpackages="openntpd-doc" depends= @@ -41,8 +41,8 @@ build() { package() { cd "$srcdir/$pkgname-$_myver" make install DESTDIR="$pkgdir" - install -Dm755 ../openntpd.initd "$pkgdir/etc/init.d/ntpd" - install -Dm644 ../openntpd.confd "$pkgdir/etc/conf.d/ntpd" + install -Dm755 ../openntpd.initd "$pkgdir/etc/init.d/$pkgname" + install -Dm644 ../openntpd.confd "$pkgdir/etc/conf.d/$pkgname" } md5sums="afc34175f38d08867c1403d9008600b3 openntpd-3.9p1.tar.gz diff --git a/main/openntpd/openntpd.post-upgrade b/main/openntpd/openntpd.post-upgrade new file mode 100644 index 000000000000..88f0fa97e2f4 --- /dev/null +++ b/main/openntpd/openntpd.post-upgrade @@ -0,0 +1,7 @@ +#!/bin/sh + +for i in /run/openrc/started/ntpd /etc/runlevels/*/ntpd; do + if [ -L "$i" ]; then + mv "$i" "${i%/*}"/openntpd + fi +done diff --git a/main/openntpd/openntpd.pre-upgrade b/main/openntpd/openntpd.pre-upgrade new file mode 100644 index 000000000000..3b052db3fff7 --- /dev/null +++ b/main/openntpd/openntpd.pre-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +if grep -q '^NTPD_HOME=' /etc/conf.d/ntpd 2>/dev/null; then + mv /etc/conf.d/ntpd /etc/conf.d/openntpd +fi -- 1.9.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---