Version bump to resolve ipv6 problems (#51721 #57355 #67654), segfaults (#48128 ...
authorMike Frysinger <vapier@gentoo.org>
Tue, 9 Nov 2004 15:46:44 +0000 (15:46 +0000)
committerMike Frysinger <vapier@gentoo.org>
Tue, 9 Nov 2004 15:46:44 +0000 (15:46 +0000)
net-misc/ntp/ChangeLog
net-misc/ntp/files/digest-ntp-4.2.0.20040617 [new file with mode: 0644]
net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
net-misc/ntp/files/ntp.conf
net-misc/ntp/ntp-4.2.0.20040617.ebuild [new file with mode: 0644]

index 4b81c681ed3025f6b4b0a3b1c7e927c0d9fb50d7..61cac035f8123da317f08db0c6fdddf4982fa0f3 100644 (file)
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/ntp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.50 2004/08/07 10:38:30 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.51 2004/11/09 15:46:44 vapier Exp $
+
+*ntp-4.2.0.20040617 (09 Nov 2004)
+
+  09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
+  files/ntp-4.1.1b-syscall-libc.patch, files/ntp.conf,
+  +ntp-4.2.0.20040617.ebuild:
+  Version bump to resolve ipv6 problems (#51721 #57355 #67654), segfaults
+  (#48128 #58684), be more friendly with openntpd (#70142), clean up the
+  config files (#64171 #65502), some md5 key troubles (#65099 #67408), and
+  change the default install path (#66671).
 
   07 Aug 2004; Tom Martin <slarti@gentoo.org> ntp-4.2.0-r2.ebuild:
   Stable on amd64.
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20040617 b/net-misc/ntp/files/digest-ntp-4.2.0.20040617
new file mode 100644 (file)
index 0000000..1fec310
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 d0554ae42164bcda990e6318648a7c58 ntp-stable-4.2.0a-20040617.tar.gz 2435648
+MD5 0f2d809eb4a360dd4479b00cfd95bc4e ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346
index 48815334315b0d950facfcf04a3fe2539b52776f..02a7375f0e4a5475aae37c57424c91bf6833d720 100644 (file)
@@ -1,17 +1,11 @@
 --- ntp-4.1.1b/include/ntp_syscall.h   2003-01-06 18:51:39.000000000 +0100
 +++ ntp-4.1.1b-alpha/include/ntp_syscall.h     2003-01-06 18:54:57.000000000 +0100
-@@ -14,7 +14,6 @@
+@@ -14,7 +14,7 @@
  # include <sys/timex.h>
  #endif
  
 -#ifndef NTP_SYSCALLS_LIBC
++#if !defined(NTP_SYSCALLS_LIBC) || defined(__alpha__)
  #ifdef NTP_SYSCALLS_STD
  # define ntp_adjtime(t)               syscall(SYS_ntp_adjtime, (t))
  # define ntp_gettime(t)               syscall(SYS_ntp_gettime, (t))
-@@ -50,6 +49,5 @@
- #  endif
- # endif /* !HAVE_ADJTIMEX */
- #endif /* !NTP_SYSCALLS_STD */
--#endif /* !NTP_SYSCALLS_LIBC */
- 
- #endif /* NTP_SYSCALL_H */
index ca3806b324caa7a00d372406c8c74d7962683a87..a56945aa45f0f11514ce5185e0cf186c0840e2fc 100644 (file)
@@ -34,7 +34,7 @@ driftfile     /var/lib/ntp/ntp.drift
 
 # To deny other machines from changing the
 # configuration but allow localhost:
-restrict default notrust nomodify
+restrict default nomodify nopeer
 restrict 127.0.0.1
 
 
@@ -43,4 +43,4 @@ restrict 127.0.0.1
 # not allowed to configure the server or used as peers
 # to synchronize against, uncomment this line.
 #
-#restrict 192.168.0.0 mask 255.255.255.0 notrust nomodify notrap
+#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap
diff --git a/net-misc/ntp/ntp-4.2.0.20040617.ebuild b/net-misc/ntp/ntp-4.2.0.20040617.ebuild
new file mode 100644 (file)
index 0000000..e271c03
--- /dev/null
@@ -0,0 +1,132 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617.ebuild,v 1.1 2004/11/09 15:46:44 vapier Exp $
+
+inherit eutils
+
+MY_P="${PN}-stable-${PV:0:5}a-${PV:6}"
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${MY_P}.tar.gz
+       mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="parse-clocks nodroproot selinux ssl ipv6 openntpd"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+       >=sys-libs/readline-4.1
+       !nodroproot? ( sys-libs/libcap )
+       !openntpd? ( !net-misc/openntpd )
+       ssl? ( dev-libs/openssl )
+       selinux? ( sec-policy/selinux-ntp )"
+DEPEND="${RDEPEND}
+       >=sys-apps/portage-2.0.51"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+hax_bitkeeper() {
+       # the makefiles have support for bk ...
+       # basically we have to do this or bk will try to write
+       # to files in /opt/bitkeeper causing sandbox violations ;(
+       mkdir ${T}/fakebin
+       echo "#!/bin/sh"$'\n'"exit 1" > ${T}/fakebin/bk
+       chmod a+x ${T}/fakebin/bk
+       export PATH="${T}/fakebin:${PATH}"
+}
+
+pkg_setup() {
+       enewgroup ntp 123
+       enewuser ntp 123 /bin/false /dev/null ntp
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/ntp-4.1.1b-syscall-libc.patch
+       epatch ${FILESDIR}/4.2.0-linux-config-phone.patch #13001
+
+       sed -i \
+               -e 's:md5\.h:touch_not_my_md5:g' \
+               -e 's:-Wpointer-arith::' \
+               -e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \
+               -e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \
+               configure || die "sed failed"
+}
+
+src_compile() {
+       hax_bitkeeper
+       econf \
+               $(use_enable !nodroproot linuxcaps) \
+               $(use_enable parse-clocks) \
+               $(use_enable ipv6) \
+               $(use_with ssl crypto) \
+               || die
+       emake || die
+}
+
+src_install() {
+       hax_bitkeeper
+       make install DESTDIR="${D}" || die
+       # move ntpd/ntpdate to sbin #66671
+       dodir /usr/sbin
+       mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin"
+
+       dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
+       doman ${WORKDIR}/man/*.1
+       dohtml -r html/*
+
+       insinto /usr/share/ntp
+       doins ${FILESDIR}/ntp.conf
+       cp -r scripts/* ${D}/usr/share/ntp/
+       chmod -R go-w ${D}/usr/share/ntp
+       find ${D}/usr/share/ntp \
+               '(' \
+               -name '*.in' -o \
+               -name 'Makefile*' -o \
+               -name 'rc[12]' -o \
+               -name support \
+               ')' \
+               -exec rm -rf {} \;
+
+       [ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
+       newinitd ${FILESDIR}/ntpd.rc ntpd
+       newconfd ${FILESDIR}/ntpd.confd ntpd
+       newinitd ${FILESDIR}/ntp-client.rc ntp-client
+       newconfd ${FILESDIR}/ntp-client.confd ntp-client
+       use nodroproot && dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+       dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed
+
+       dodir /var/lib/ntp
+       fowners ntp:ntp /var/lib/ntp
+       touch ${D}/var/lib/ntp/ntp.drift
+       fowners ntp:ntp /var/lib/ntp/ntp.drift
+
+       if use openntpd ; then
+               cd ${D}
+               rm usr/sbin/ntpd
+               rm -r var/lib
+               rm etc/{conf,init}.d/ntpd
+       fi
+}
+
+pkg_postinst() {
+       ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/"
+       ewarn "Review /etc/ntp.conf to setup server info."
+       ewarn "Review /etc/conf.d/ntpd to setup init.d info."
+       echo
+       einfo "The way ntp sets and maintains your system time has changed."
+       einfo "Now you can use /etc/init.d/ntp-client to set your time at"
+       einfo "boot while you can use /etc/init.d/ntpd to maintain your time"
+       einfo "while your machine runs"
+       if [ ! -z "$(egrep '^[^#].*notrust' ${ROOT}/etc/ntp.conf)" ] ; then
+               echo
+               eerror "The notrust option was found in your /etc/ntp.conf!"
+               ewarn "If your ntpd starts sending out weird responses,"
+               ewarn "then make sure you have keys properly setup and see"
+               ewarn "http://bugs.gentoo.org/show_bug.cgi?id=41827"
+       fi
+}