Date: Thursday, May 23, 2013 @ 01:28:21 Author: seblu Revision: 91454
upgpkg: openntpd 3.9p1-22 - drop rc - move to /usr/bin Modified: openntpd/trunk/PKGBUILD openntpd/trunk/openntpd.service Deleted: openntpd/trunk/openntpd openntpd/trunk/openntpd.conf ------------------+ PKGBUILD | 29 +++++++++++++++-------------- openntpd | 38 -------------------------------------- openntpd.conf | 4 ---- openntpd.service | 2 +- 4 files changed, 16 insertions(+), 57 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-22 23:26:10 UTC (rev 91453) +++ PKGBUILD 2013-05-22 23:28:21 UTC (rev 91454) @@ -6,32 +6,35 @@ pkgname=openntpd pkgver=3.9p1 -pkgrel=21 -pkgdesc="Free, easy to use implementation of the Network Time Protocol." -url="http://www.openntpd.org/" +pkgrel=22 +pkgdesc='Free, easy to use implementation of the Network Time Protocol.' +url='http://www.openntpd.org/' arch=('x86_64' 'i686') license=('BSD') depends=('openssl') conflicts=('ntp') -backup=('etc/ntpd.conf' 'etc/conf.d/openntpd') +backup=('etc/ntpd.conf') install=$pkgname.install -source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz - 'openntpd' 'openntpd.conf' 'linux-adjtimex.patch' 'openntpd.tmpfiles' 'openntpd.service') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz" + 'linux-adjtimex.patch' + 'openntpd.tmpfiles' + 'openntpd.service') sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49' - 'b486b7034b8d3d790b6bc1793dd8a44c68b82c8dc833b617c60674b0a7c9d98f' - '77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96' '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2' 'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5' - '7ad4d3ce4af3a6ff47ba2e5428092139666ad821101dafe1599b209d53f6943f') + '3239fc6f69d661cd9233233da9e68bebdf7b12888febbc2f2d794742db2d8ed1') +prepare() { + patch -Np1 -d $pkgname-$pkgver < linux-adjtimex.patch +} + build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i ../linux-adjtimex.patch + cd $pkgname-$pkgver autoreconf -fi ./configure \ --prefix=/usr \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-privsep-user=ntp \ --with-privsep-path=/run/openntpd/ \ --with-adjtimex @@ -42,8 +45,6 @@ cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -Dm644 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname" install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \ "$pkgdir/usr/share/licenses/$pkgname/LICENCE" sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf Deleted: openntpd =================================================================== --- openntpd 2013-05-22 23:26:10 UTC (rev 91453) +++ openntpd 2013-05-22 23:28:21 UTC (rev 91454) @@ -1,38 +0,0 @@ -#!/bin/bash - -CONF=/etc/conf.d/openntpd - -. /etc/rc.conf -. /etc/rc.d/functions -[[ -f $CONF ]] && . "$CONF" - -PID=$(pidof -o %PPID /usr/sbin/ntpd) -case $1 in - start) - stat_busy "Starting OpenNTPD" - [[ -d /run/openntpd ]] || mkdir /run/openntpd - if [[ $PID ]] || ! /usr/sbin/ntpd $PARAMS; then - stat_fail - else - pidof -o %PPID /usr/sbin/ntpd >/run/openntpd.pid - add_daemon openntpd - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenNTPD" - if [[ -z $PID ]] || ! kill $PID &>/dev/null; then - stat_fail - else - rm_daemon openntpd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 Deleted: openntpd.conf =================================================================== --- openntpd.conf 2013-05-22 23:26:10 UTC (rev 91453) +++ openntpd.conf 2013-05-22 23:28:21 UTC (rev 91454) @@ -1,4 +0,0 @@ -# -s Set the time immediately at startup if the local clock is off by more than# 180 seconds. -PARAMS="-s" - - Modified: openntpd.service =================================================================== --- openntpd.service 2013-05-22 23:26:10 UTC (rev 91453) +++ openntpd.service 2013-05-22 23:28:21 UTC (rev 91454) @@ -4,7 +4,7 @@ [Service] Type=forking -ExecStart=/usr/sbin/ntpd -s +ExecStart=/usr/bin/ntpd -s [Install] WantedBy=multi-user.target