Version bump #384341 by teidakankan.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 137 insertions, 6 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index dc715532a976..db59f5471f71 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.172 2011/07/20 03:52:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.173 2011/09/25 19:13:17 vapier Exp $
+
+*ntp-4.2.6_p4 (25 Sep 2011)
+
+  25 Sep 2011; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.6_p4.ebuild:
+  Version bump #384341 by teidakankan.
 
   20 Jul 2011; Mike Frysinger <vapier@gentoo.org> ntp-4.2.6_p3-r1.ebuild,
   metadata.xml:
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index e5c895e57b46..75b0097f8a4f 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -19,16 +19,19 @@ DIST ntp-4.2.6p2-manpages.tar.bz2 47783 RMD160 f6bbe49014a81abe5a7562d147ec00a71
 DIST ntp-4.2.6p2.tar.gz 4338873 RMD160 805e7845017b97e4d5a8c38ec754c8c7373a3531 SHA1 04b5e3c3755fe9e5bcec5bd5d29255cfef2102c4 SHA256 42898b7903a2da04a242885c92919903d56ee69c0293ec828568cab71dd3e9d8
 DIST ntp-4.2.6p3-manpages.tar.bz2 47797 RMD160 d2f9d88298b2d1966db5c2fab4021457644fb183 SHA1 2fc5d5b748a2ddaad97587bcab40197718fda79d SHA256 9d7780ddeb98b2afbf009af9906908e3aca4524918bcbe70251ccc77feea3ad0
 DIST ntp-4.2.6p3.tar.gz 4270377 RMD160 173c4f9eedb4837e61d7801a6ec7d892549a777c SHA1 1d560cf689054a14e0d7446cb7bab50a92ead647 SHA256 6e84d4ddfa14b911c3ed88463af10867e1fa9b287e7b34d8a02e78be85a7c40e
+DIST ntp-4.2.6p4-manpages.tar.bz2 48229 RMD160 15cc76d1db358ceee75401458989ec826e60d935 SHA1 190e694856289f1b445e4e5c8f822ef5fc33b6b4 SHA256 8be205451ff6b3bba534aa91a14fed2beb5eaff256189bd55e456ca56e16937d
+DIST ntp-4.2.6p4.tar.gz 4194210 RMD160 41e424d8b914801f4407aa9d93306922e0f9b947 SHA1 b53c4565c5d1c37494584d4fb826f82ffea285cf SHA256 dec30ea700d57b2d306ae61a3bcd8bc843443404a819a2f708b23a0ffc8581f3
 EBUILD ntp-4.2.4_p7-r1.ebuild 3929 RMD160 79032df95a530486a6864f8bcaba9dc51419d60a SHA1 b69855a9d306720af9dd5e320cbe237367f3e488 SHA256 38d473e64d492403d01642f246ae8bb5cfa9856d0e3540984c4026548b137eac
 EBUILD ntp-4.2.6_p2-r1.ebuild 3900 RMD160 a4b063ab660e5878d35556bb97bdf7d5c5a02428 SHA1 088fb9490e5b1f27b186d0866908cb144b02c854 SHA256 bbca40b3fdb7dd76d6252535c96d877b984cec71f1203c64ee6c731db9c43bf5
 EBUILD ntp-4.2.6_p3-r1.ebuild 3828 RMD160 7bc722700a341a6533470e27ba1ab3ab6a764071 SHA1 b51b90dd441992aaea34f8a9348d0aaca39a88e0 SHA256 1ec769e7dee6be0796f6143a66b99443b973fa38a6f57a554690f49ad10b8eff
 EBUILD ntp-4.2.6_p3.ebuild 3739 RMD160 1ffea2b1e13744e02538b27ccb88a63248019c51 SHA1 baee094376a980e8d3ec52a147261495c2ce9f1a SHA256 dad25ed57dc050d5d24a5e85838fb9e4237a93f774f0ed283e2f56e13e51c650
-MISC ChangeLog 23584 RMD160 c334d3273c935f88b8b8aca39376766d4eca3330 SHA1 96c3a49207182d277ecad3418a1de037279f8389 SHA256 fcdffd89e490b92cc0bf0d4a847d0eb14ca697241c769cbd8f238accd9dae62e
+EBUILD ntp-4.2.6_p4.ebuild 3825 RMD160 3ed7ca4abf47a4798d8ef775244901eff584d726 SHA1 7fed8c20d900960f60a8db45edd75cb1c967b982 SHA256 6925d769b3f6272b2f1836c2c63b683dd825feb0c488ebd335d7fa5d9c0a74c6
+MISC ChangeLog 23725 RMD160 5326dd8be4ff7063007d99e309af554c0f1fa847 SHA1 e4fb6e77c7d5894031db489a77dfba06ec73107a SHA256 c93c4007163fa74c2f78d361ccf4d87354e6076e8f20f432026fa3e069a52f0d
 MISC metadata.xml 837 RMD160 a03ba53e0adab193b8684f03fc19b7ddfa534c6d SHA1 c83bec5056caaea44392373790480d1bc0f2d483 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4mUQgACgkQaC/OocHi7Jbp2AD/Wujimfi7WjfSZQwZCOFQzgK9
-BzzOqYM+WSTBXIDttVsA/AnfgtQ8av2GzHhPUfP50Hr8BqP+3hAl97RFNX6U0Pza
-=X5jY
+iF4EAREIAAYFAk5/fVMACgkQaC/OocHi7JYRBgD+PZaYqE5EeK7ICWstf5G57VQo
+FlnY/8UcCmzM9r+eVD0A+gJESLNrv6WWrc9RLU49BGaLcS7wZ3F+4L+f1+6omHzN
+=NEqz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.6_p4.ebuild b/net-misc/ntp/ntp-4.2.6_p4.ebuild
new file mode 100644
index 000000000000..7a83bd96ae27
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.6_p4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p4.ebuild,v 1.1 2011/09/25 19:13:17 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )
+	!openntpd? ( !net-misc/openntpd )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )
+	parse-clocks? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
+	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
+	append-cppflags -D_GNU_SOURCE #264109
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(use zeroconf && echo yes || echo no)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	econf \
+		--with-lineeditlibs=readline,edit,editline \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with samba ntp-signd) \
+		$(use_with snmp ntpsnmpd) \
+		$(use_with ssl crypto)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	# 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/*.[58]
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins "${FILESDIR}"/ntp.conf
+	cp -r scripts/* "${D}"/usr/share/ntp/ || die
+	fperms -R go-w /usr/share/ntp
+	find "${D}"/usr/share/ntp \
+		'(' \
+		-name '*.in' -o \
+		-name 'Makefile*' -o \
+		-name support \
+		')' \
+		-exec rm -r {} \;
+
+	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 caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+	dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
+
+	keepdir /var/lib/ntp
+	fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${D}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	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
+	elog "The way ntp sets and maintains your system time has changed."
+	elog "Now you can use /etc/init.d/ntp-client to set your time at"
+	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
+	elog "while your machine runs"
+	if grep -qs '^[^#].*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/41827"
+	fi
+}