add checks for notrust in /etc/ntp.conf #41827

3 files changed, 140 insertions, 1 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 8b7c1c95e5e7..91dda16923c9 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ntp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.43 2004/03/01 16:40:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.44 2004/04/05 23:23:50 vapier Exp $
+
+*ntp-4.2.0-r2 (05 Apr 2004)
+
+  05 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add checking for notrust in /etc/ntp.conf #41827 and
+  tweak the init.d script a bit.
 
 *ntp-4.2.0-r1 (01 Mar 2004)
 
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0-r2 b/net-misc/ntp/files/digest-ntp-4.2.0-r2
new file mode 100644
index 000000000000..a29b978410e4
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.0-r2
@@ -0,0 +1 @@
+MD5 0f8fabe87cf54f409b57c6283f0c0c3d ntp-4.2.0.tar.gz 2514502
diff --git a/net-misc/ntp/ntp-4.2.0-r2.ebuild b/net-misc/ntp/ntp-4.2.0-r2.ebuild
new file mode 100644
index 000000000000..7fb24d0887c7
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.0-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.1 2004/04/05 23:23:50 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz"
+#	mirror://gentoo/${PF}-manpages.tbz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
+IUSE="parse-clocks nodroproot selinux ssl"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	!nodroproot? ( sys-libs/libcap )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.7.7
+	>=sys-apps/sed-4.0.5"
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 /bin/false /dev/null ntp
+}
+
+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}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use alpha && epatch ${FILESDIR}/ntp-4.1.1b-syscall-libc.patch
+
+	epatch ${FILESDIR}/${PV}-ntpdate-quiet.patch
+	epatch ${FILESDIR}/${PV}-linux-config-phone.patch #13001
+	epatch ${FILESDIR}/${PV}-droproot.patch
+	sed -i "s:-Wpointer-arith::" configure.in
+
+	# needed in order to make files with right ver info #30220
+	aclocal -I . || die "aclocal"
+	automake || die "automake"
+	autoconf || die "autoconf"
+
+	sed -i 's:-lelf:-la_doe_a_deer_a_female_deer:g' configure
+}
+
+src_compile() {
+	hax_bitkeeper
+
+	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
+
+	local mysslconf
+	use ssl \
+		&& mysslconf="--with-openssl-libdir=yes" \
+		|| mysslconf="--with-openssl-libdir=no"
+	econf \
+		--build=${CHOST} \
+		`use_enable !nodroproot linuxcaps` \
+		`use_enable parse-clocks` \
+		${mysslconf} \
+		|| die
+
+	has_version "sys-devel/hardened-gcc" && find ${WORKDIR} -name "Makefile" -type f -exec sed -i "s,-yet_exec,," {} \;
+
+	emake || die
+}
+
+src_install() {
+	hax_bitkeeper
+
+	make install DESTDIR=${D} || die
+
+	dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
+#	doman ${WORKDIR}/man/*.1
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins ${FILESDIR}/ntp.conf
+	rm -rf `find scripts/ \
+		-name '*.in' -o \
+		-name 'Makefile*' -o \
+		-name 'rc[12]' -o \
+		-name support`
+	cp -r scripts/* ${D}/usr/share/ntp/
+	chmod -R go-w ${D}/usr/share/ntp
+
+	[ ! -e /etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/ntpd.rc ntpd
+	newexe ${FILESDIR}/ntp-client.rc ntp-client
+	insinto /etc/conf.d
+	newins ${FILESDIR}/ntpd.confd ntpd
+	newins ${FILESDIR}/ntp-client.confd ntp-client
+	use nodroproot && dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+
+	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
+}
+
+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 "$(grep 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
+}