[arch-commits] Commit in ntp/repos (3 files)

Tobias Powalowski tpowa at archlinux.org
Thu Jun 4 11:23:13 EDT 2009


    Date: Thursday, June 4, 2009 @ 11:23:13
  Author: tpowa
Revision: 41488

Merged revisions 41487 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ntp/trunk

........
  r41487 | tpowa | 2009-06-04 15:22:27 +0000 (Do, 04 Jun 2009) | 1 line
  
  upgpkg: ntp 4.2.4p7-1
........

Added:
  ntp/repos/extra-x86_64/ntp-4.2.4_p7-nano.patch
    (from rev 41487, ntp/trunk/ntp-4.2.4_p7-nano.patch)
Modified:
  ntp/repos/extra-x86_64/	(properties)
  ntp/repos/extra-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |   64 ++++++++++++++++++++++++++--------------------
 ntp-4.2.4_p7-nano.patch |   20 ++++++++++++++
 2 files changed, 57 insertions(+), 27 deletions(-)


Property changes on: ntp/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ntp/trunk:1-31034
   + /ntp/trunk:1-41487

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-04 15:22:27 UTC (rev 41487)
+++ extra-x86_64/PKGBUILD	2009-06-04 15:23:13 UTC (rev 41488)
@@ -1,56 +1,66 @@
 # $Id$
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=ntp
-pkgver=4.2.4p6
-pkgrel=3
+pkgver=4.2.4p7
+pkgrel=1
 pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.ntp.org/"
-depends=('openssl>=0.9.8h' 'readline')
+depends=('openssl>=0.9.8h' 'readline' 'libcap')
 backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf')
 options=('!emptydirs')
-source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz \
-        ftp://ftp.archlinux.org/other/ntp/ntp-${pkgver}-manpages.tar.bz2 ntp.conf ntp-client.conf ntpd ntpdate)
-md5sums=('1961c2c12b66b9046d5df37d0a41b181' '3396ea6276147617e5cf79cefffee018'\
-         '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'\
-         '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
+source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${pkgver}.tar.gz
+        ftp://ftp.archlinux.org/other/ntp/ntp-4.2.4p6-manpages.tar.bz2
+        ntp-4.2.4_p7-nano.patch
+        ntp.conf
+        ntp-client.conf
+        ntpd
+        ntpdate)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver || return 1
-
+  cd $srcdir/$pkgname-$pkgver || return 1
+  # fix glibc build issue
+  patch -Np1 -i ../ntp-4.2.4_p7-nano.patch || return 1
   # configure
   ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man --enable-linux-caps || return 1
 
   # build and install
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR=$pkgdir install || return 1
 
   # install conf files
-  mkdir -p $startdir/pkg/usr/share/ntp || return 1
-  install -D -m644 conf/* $startdir/pkg/usr/share/ntp/ || return 1
+  mkdir -p $pkgdir/usr/share/ntp || return 1
+  install -D -m644 conf/* $pkgdir/usr/share/ntp/ || return 1
 
   # install launch scripts 
-  mkdir -p $startdir/pkg/etc/rc.d || return 1
-  install -D -m755 $startdir/src/{ntpd,ntpdate} $startdir/pkg/etc/rc.d/ || return 1
+  mkdir -p $pkgdir/etc/rc.d || return 1
+  install -D -m755 $srcdir/{ntpd,ntpdate} $pkgdir/etc/rc.d/ || return 1
 
   # install man pages
-  install -d $startdir/pkg/usr/share/man/man{1,5}
-  install -m644 $startdir/src/man/*.5 \
-  	$startdir/pkg/usr/share/man/man5/ || return 1
-  for i in $startdir/src/man/*.8 ; do
-    install -m644 $i $startdir/pkg/usr/share/man/man1/$(basename $i .8).1 || return 1
+  install -d $pkgdir/usr/share/man/man{1,5}
+  install -m644 $srcdir/man/*.5 \
+  	$pkgdir/usr/share/man/man5/ || return 1
+  for i in $srcdir/man/*.8 ; do
+    install -m644 $i $pkgdir/usr/share/man/man1/$(basename $i .8).1 || return 1
   done
-  mv $startdir/pkg/usr/share/man/man1/keygen.1 $startdir/pkg/usr/share/man/man1/ntp-keygen.1 || return 1
+  mv $pkgdir/usr/share/man/man1/keygen.1 $pkgdir/usr/share/man/man1/ntp-keygen.1 || return 1
 
   # install sample configs
-  install -D -m644 $startdir/src/ntp.conf $startdir/pkg/etc/ntp.conf || return 1
-  install -D -m644 $startdir/src/ntp-client.conf \
-  	$startdir/pkg/etc/conf.d/ntp-client.conf || return 1
+  install -D -m644 $srcdir/ntp.conf $pkgdir/etc/ntp.conf || return 1
+  install -D -m644 $srcdir/ntp-client.conf \
+  	$pkgdir/etc/conf.d/ntp-client.conf || return 1
 
   # create /var/lib/ntp
-  mkdir -p $startdir/pkg/var/lib/ntp || return 1
-  touch $startdir/pkg/var/lib/ntp/.placeholder || return 1
+  mkdir -p $pkgdir/var/lib/ntp || return 1
+  touch $pkgdir/var/lib/ntp/.placeholder || return 1
 
-  install -Dm644 $startdir/src/$pkgname-$pkgver/COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT
+  install -Dm644 $srcdir/$pkgname-$pkgver/COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
 }
+md5sums=('8c19ff62ed4f7d64f8e2aa59cb11f364'
+         '3396ea6276147617e5cf79cefffee018'
+         '36c5711228cb0cf48966daa993e06f55'
+         '5bd3924f5720b97837969ec4ec4d5e09'
+         'c7f50632b69bd4f32cf052d0b1848463'
+         '46118a8ec2c4f5bbfafd730af21b7c03'
+         '140855352baeb89da0c6c1c475c18b57')

Copied: ntp/repos/extra-x86_64/ntp-4.2.4_p7-nano.patch (from rev 41487, ntp/trunk/ntp-4.2.4_p7-nano.patch)
===================================================================
--- extra-x86_64/ntp-4.2.4_p7-nano.patch	                        (rev 0)
+++ extra-x86_64/ntp-4.2.4_p7-nano.patch	2009-06-04 15:23:13 UTC (rev 41488)
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/270483
+
+ripped from fedora
+
+--- ntp-4.2.4p7/include/ntp_syscall.h
++++ ntp-4.2.4p7/include/ntp_syscall.h
+@@ -14,5 +14,13 @@
+ # include <sys/timex.h>
+ #endif
+ 
++#if defined(ADJ_NANO) && !defined(MOD_NANO)
++#define MOD_NANO ADJ_NANO
++#endif
++
++#if defined(ADJ_TAI) && !defined(MOD_TAI)
++#define MOD_TAI ADJ_TAI
++#endif
++
+ #ifndef NTP_SYSCALLS_LIBC
+ #ifdef NTP_SYSCALLS_STD



More information about the arch-commits mailing list