diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-09 03:36:00 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-09 03:36:00 +0000 |
| commit | 66018e3cb2f893ec3add478fcd86ed3334e46fa9 (patch) | |
| tree | 3336c03eb23042b17727e6ab856ce359443b2d48 /extra/ntp | |
| parent | 740a52614d0b18baf8d2177a89036a29c8cd3bd8 (diff) | |
Fri May 9 03:32:12 UTC 2014
Diffstat (limited to 'extra/ntp')
| -rw-r--r-- | extra/ntp/PKGBUILD | 34 | ||||
| -rw-r--r-- | extra/ntp/install | 26 |
2 files changed, 15 insertions, 45 deletions
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index a599fb9c8..0d2396f64 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 207491 2014-03-11 04:40:40Z bisson $ +# $Id: PKGBUILD 212134 2014-05-08 17:10:10Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp -pkgver=4.2.6.p5 -_realver=4.2.6p5 -pkgrel=19 +_pkgname=ntp-dev +_pkgver=4.2.7p441 +pkgver=${_pkgver/p/.p} +pkgrel=1 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -13,24 +14,24 @@ arch=('i686' 'x86_64') makedepends=('perl-html-parser') depends=('openssl' 'libcap' 'libedit') backup=('etc/ntp.conf') -source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${_pkgname}/${_pkgname}-${_pkgver}.tar.gz" 'ntp.conf' 'ntpd.service' 'ntpdate.service') -sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' +sha1sums=('81444413350982f92f99885f201b50df24a14201' 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' 'dd24216e8333e12d5080965696602591c72537b1' - '059b382d1af0c55202e2d17f2ae065a2cbfec9ee' -) + '059b382d1af0c55202e2d17f2ae065a2cbfec9ee') +options=('!emptydirs') install=install build() { - cd "${srcdir}/${pkgname}-${_realver}" + cd "${srcdir}/${_pkgname}-${_pkgver}" ./configure \ --prefix=/usr \ - --mandir=/usr/share/man \ + --libexecdir=/usr/lib \ --enable-linuxcaps \ --enable-ntp-signd \ @@ -38,22 +39,17 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${_realver}" + cd "${srcdir}/${_pkgname}-${_pkgver}" make DESTDIR="${pkgdir}" install - rmdir "${pkgdir}"/usr/{lib,sbin} - install -d -o 87 "${pkgdir}"/var/lib/ntp install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service install -Dm644 ../ntpdate.service "${pkgdir}"/usr/lib/systemd/system/ntpdate.service install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd html - ../scripts/html2man - install -d "${pkgdir}"/usr/share/man - mv man/man* "${pkgdir}"/usr/share/man - mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + + install -d -o 87 "${pkgdir}"/var/lib/ntp + echo > "${pkgdir}/var/lib/ntp/.placeholder" install -dm755 "${pkgdir}/usr/lib/systemd/ntp-units.d" echo 'ntpd.service' > "${pkgdir}/usr/lib/systemd/ntp-units.d/${pkgname}.list" diff --git a/extra/ntp/install b/extra/ntp/install index e6eddf8a4..1c4c4ee95 100644 --- a/extra/ntp/install +++ b/extra/ntp/install @@ -4,32 +4,6 @@ post_install() { true } -post_upgrade() { - if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then - cat <<EOF - -==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf -==> If you made changes to the former, please update the latter. - -EOF - fi - if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then - cat <<EOF - -==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid -==> and the new rc.d script only takes the latter into account. -==> To stop your old ntpd process, please kill it manually. - -EOF - fi - if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then - post_install - fi - if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then - chown -R ntp /var/lib/ntp - fi -} - post_remove() { getent passwd ntp &>/dev/null && userdel ntp >/dev/null getent group ntp &>/dev/null && groupdel ntp >/dev/null |