diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-18 17:12:10 +0100 |
| commit | fb5b6b28f363547abcbfa026fcae050236861425 (patch) | |
| tree | 850e29f1f9f42ada20e1c6818316988505970dae /community/openntpd | |
| parent | 67eabbfbd9364ee57f122c9ec9a03dd61bba850b (diff) | |
| parent | ab63d8d49f68847a68c2ba0014bf0d3338cb3df6 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ettercap/PKGBUILD
community/mplayer2/PKGBUILD
community/nginx/PKGBUILD
community/pidgin-libnotify/PKGBUILD
core/util-linux/PKGBUILD
extra/aspell-pt/PKGBUILD
extra/glpk/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/llvm/PKGBUILD
extra/mesa/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/texmacs/PKGBUILD
Diffstat (limited to 'community/openntpd')
| -rw-r--r-- | community/openntpd/PKGBUILD | 5 | ||||
| -rw-r--r-- | community/openntpd/openntpd.install | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD index 8411524c9..b3ba9f225 100644 --- a/community/openntpd/PKGBUILD +++ b/community/openntpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75378 2012-08-21 16:04:24Z dreisner $ +# $Id: PKGBUILD 80216 2012-11-17 19:40:50Z jelle $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch) @@ -6,12 +6,13 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=19 +pkgrel=20 pkgdesc="Free, easy to use implementation of the Network Time Protocol." url="http://www.openntpd.org/" arch=('x86_64' 'i686' 'mips64el') license=('BSD') depends=('openssl') +conflicts=('ntp') backup=('etc/ntpd.conf' 'etc/conf.d/openntpd') install=$pkgname.install source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install index 4f42aeb1f..5b440ee2f 100644 --- a/community/openntpd/openntpd.install +++ b/community/openntpd/openntpd.install @@ -1,24 +1,18 @@ -createuser() { - if ! getent group ntp >/dev/null; then - groupadd -g 87 ntp - fi - - if ! getent passwd ntp >/dev/null; then - useradd -g ntp -u 87 -d /var/empty -s /bin/false -c 'Network Time Protocol' ntp - fi -} - post_install() { - createuser + getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null + getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null + systemd-tmpfiles --create openntpd.conf + true } post_upgrade() { - createuser } post_remove() { - userdel ntp >/dev/null + getent passwd ntp &>/dev/null && userdel ntp >/dev/null + getent group ntp &>/dev/null && groupdel ntp >/dev/null + true } # vim: ts=2 sw=2 et ft=sh |