Version bump.

Package-Manager: portage-2.1

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index c0e1bfba9d64e5a9760e272b6d95b90e1884ebe5..d4a6f5c0b80ffb820f4629857048c7c64c4ed048 100644 (file)
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.73 2006/05/25 22:33:48 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.74 2006/06/17 07:42:33 vapier Exp $
+
+*ntp-4.2.2 (17 Jun 2006)
+
+  17 Jun 2006; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.2.ebuild:
+  Version bump.
 
   25 May 2006; Emanuele Giaquinta <exg@gentoo.org> ntp-4.2.0-r2.ebuild,
   ntp-4.2.0.20040617-r3.ebuild, ntp-4.2.0.20050303-r1.ebuild,

diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 94218a3586296d885274e8478b4573c434abe119..1de82a33f925e13dc38981f9c823e84510543981 100644 (file)
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -98,12 +98,14 @@ DIST ntp-4.1.2-manpages.tbz2 19961 RMD160 8e71c8bfce4a8d432520f8ca102acf6395e5bd
 DIST ntp-4.1.2.tar.gz 2168384 RMD160 053bc86725a923784da6af37f6a844f6a9819d03 SHA256 9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a
 DIST ntp-4.2.0-r2-manpages.tar.bz2 25355 RMD160 f8aacb8153e55ee5ad99e9e6893fe0e24145fe02 SHA256 c75dde3246c4bf251640d4b503114d2c30cd86b3d1ea6f2791fbc2b372a4efd3
 DIST ntp-4.2.0.tar.gz 2514502 RMD160 73de5671ea583f6699c8052ea9f8270a8455c295 SHA256 da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25
+DIST ntp-4.2.2-manpages.tar.bz2 25213 RMD160 ac90f9b371fe6cd6bfdf931fd53432e054e7ce8a SHA1 0484c00eab29456e148136999bcfc51bd6a17ec3 SHA256 290e5a2ccb61960c7c35b07ac5255c8efa0721858fd85594792b62daa2852bc0
+DIST ntp-4.2.2.tar.gz 2546027 RMD160 2cf9540cf2e6c5fc3e3d8922676ea3b2efb9215e SHA1 a3e9652a1d9e288e2c0d88d1876de67ca4d608fb SHA256 fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc
 DIST ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346 RMD160 2afd3dfc760b995e85cf9676f5b0b262523fd4b6 SHA256 d88055fc4216ee5f34e4cd6a6fc47961904dbc559c0d78c3d814ee64223274bf
 DIST ntp-stable-4.2.0a-20040617.tar.gz 2435648 RMD160 0de9b928c70e22e0a61cab16c749ac73083edd53 SHA256 cb1561b13c95d6598c286bd0f80562e147c30e85104c3aec2a7be6eb5bc34cc3
 DIST ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360 RMD160 7c8b27357b76c8ab75b9f2f148abf214426288c2 SHA256 5702731a6081abbb849ca52f13fa5b5a3570e75c9e96832b3a81d53e70fc214d
 DIST ntp-stable-4.2.0a-20050303.tar.gz 2446073 RMD160 d8c5340c50a6a9c82a82577d4c2804d03f7fe83d SHA256 55001c85e9607ab186ebb297a08369e7567150d5985583255fe560117d14639c
-DIST ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab SHA1 66be0f8d630a83838ee5de700f188d5abb731362 SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b
-DIST ntp-stable-4.2.0a-20060224.tar.gz 2447194 RMD160 36bcce870220fb670d63c4b05a968075f990ca9c SHA1 73139f5aa6af1199ed172196d4cf7d1b35f09592 SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1
+DIST ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060 RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b
+DIST ntp-stable-4.2.0a-20060224.tar.gz 2447194 RMD160 36bcce870220fb670d63c4b05a968075f990ca9c SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1
 EBUILD ntp-4.1.2.ebuild 3162 RMD160 f6b3a6a1fd6ac66b468334c11d2db820a6e3a565 SHA1 52918eb755155cb92a8398756cc7378697cb6ee3 SHA256 5ecd462cd07be1f01087116067196b26ff08a07d89265b5cd980102ec423c89a
 MD5 4874c08acda470ce7373d36b64c39c09 ntp-4.1.2.ebuild 3162
 RMD160 f6b3a6a1fd6ac66b468334c11d2db820a6e3a565 ntp-4.1.2.ebuild 3162
@@ -124,10 +126,14 @@ EBUILD ntp-4.2.0.20060224.ebuild 4247 RMD160 15d445da0a9b705eca73f119d46bbb03da3
 MD5 27fe812cdc2b5d9fae3cdb05b5611776 ntp-4.2.0.20060224.ebuild 4247
 RMD160 15d445da0a9b705eca73f119d46bbb03da3e25c7 ntp-4.2.0.20060224.ebuild 4247
 SHA256 d7196d44a028b56f816f7a6836d9bd63dc8453390da2966b530538f8c9ed2f87 ntp-4.2.0.20060224.ebuild 4247
-MISC ChangeLog 11200 RMD160 bfcda4af7003b03a9dab1f734eccabe7c4474c74 SHA1 d8e3c9ea208f532a78e73977312b1d87a21f856d SHA256 3938e0694dbea1313524fff83fcdd3940d01029fa88f02bc53146fe9ffef4480
-MD5 16302f1e4453df7549a6bdde252a39b1 ChangeLog 11200
-RMD160 bfcda4af7003b03a9dab1f734eccabe7c4474c74 ChangeLog 11200
-SHA256 3938e0694dbea1313524fff83fcdd3940d01029fa88f02bc53146fe9ffef4480 ChangeLog 11200
+EBUILD ntp-4.2.2.ebuild 3861 RMD160 d21ebeeb0d9f1691e49c92739ff5ab768a51a6ee SHA1 afdcc0e4a4d8fb27639b8342481dcca3d0ac9f1d SHA256 cbd3dcf3be18a5c1db493ec3955c33d241af15aa850d9fe73911df4356c5b10c
+MD5 cb235e49c06ff3b3aff0e76d2cf52bc4 ntp-4.2.2.ebuild 3861
+RMD160 d21ebeeb0d9f1691e49c92739ff5ab768a51a6ee ntp-4.2.2.ebuild 3861
+SHA256 cbd3dcf3be18a5c1db493ec3955c33d241af15aa850d9fe73911df4356c5b10c ntp-4.2.2.ebuild 3861
+MISC ChangeLog 11315 RMD160 74fe86841d7cdc59463765c4ef3e57119074235b SHA1 24795c812582727e65a2ed8582671bd517b3a10f SHA256 427e66838d70be64a1471ffba0d43272ce2e245dd86d5f1adf7aa30bfad2e12d
+MD5 2be4b8fb7a220541883134ebaade5a71 ChangeLog 11315
+RMD160 74fe86841d7cdc59463765c4ef3e57119074235b ChangeLog 11315
+SHA256 427e66838d70be64a1471ffba0d43272ce2e245dd86d5f1adf7aa30bfad2e12d ChangeLog 11315
 MISC metadata.xml 636 RMD160 12f6aa70bfc2112d5cc9b6ac955eadc2da4add8c SHA1 f4a032bb0eece99babe176fb858e08fde8604889 SHA256 d3bc84bbb2f194aee41b43fd10cb07c2752073a339e642119d9bf03d31f50494
 MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
 RMD160 12f6aa70bfc2112d5cc9b6ac955eadc2da4add8c metadata.xml 636
@@ -147,3 +153,6 @@ SHA256 9d9a3df7128d19da2c75ddf21a4f3c358f89f6aa05b1c240b71e587b84e522b7 files/di
 MD5 16dafdee10ec932156fab9503b29ea97 files/digest-ntp-4.2.0.20060224 590
 RMD160 3439ae701cf97db73d599b430ff2a2f42feab1ec files/digest-ntp-4.2.0.20060224 590
 SHA256 4932ba26b477696bcd9f8ae11f9055de029b45e522ad685f82abd56ef67b22b7 files/digest-ntp-4.2.0.20060224 590
+MD5 3262184e8d74a645d0a9533c7fff7fa4 files/digest-ntp-4.2.2 488
+RMD160 7626c88be4d9cf362921b01ad3d75da3d21dc845 files/digest-ntp-4.2.2 488
+SHA256 49c96c94188f4ce54072347cd086e2acf60aa39d4ff81fce95c685a726744eca files/digest-ntp-4.2.2 488

diff --git a/net-misc/ntp/files/digest-ntp-4.2.2 b/net-misc/ntp/files/digest-ntp-4.2.2
new file mode 100644 (file)
index 0000000..fa66f4c
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.2
@@ -0,0 +1,6 @@
+MD5 6f51d450cfaef5b898f5ee6fff5499a5 ntp-4.2.2-manpages.tar.bz2 25213
+RMD160 ac90f9b371fe6cd6bfdf931fd53432e054e7ce8a ntp-4.2.2-manpages.tar.bz2 25213
+SHA256 290e5a2ccb61960c7c35b07ac5255c8efa0721858fd85594792b62daa2852bc0 ntp-4.2.2-manpages.tar.bz2 25213
+MD5 111d879acdcc955e60f527575ab0a71a ntp-4.2.2.tar.gz 2546027
+RMD160 2cf9540cf2e6c5fc3e3d8922676ea3b2efb9215e ntp-4.2.2.tar.gz 2546027
+SHA256 fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc ntp-4.2.2.tar.gz 2546027

diff --git a/net-misc/ntp/ntp-4.2.2.ebuild b/net-misc/ntp/ntp-4.2.2.ebuild
new file mode 100644 (file)
index 0000000..ddec5dc
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.2.ebuild,v 1.1 2006/06/17 07:42:34 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+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}/${P}.tar.gz
+       mirror://gentoo/${P}-manpages.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+       >=sys-libs/readline-4.1
+       kernel_linux? ( caps? ( 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 )"
+
+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 -1 /dev/null ntp
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+#      epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
+
+       sed -i \
+               -e 's:md5\.h:touch_not_my_md5:g' \
+               -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 caps linuxcaps) \
+               $(use_enable parse-clocks) \
+               $(use_enable ipv6) \
+               $(use_enable debug debugging) \
+               $(use_with ssl crypto) \
+               || die
+       emake || die
+}
+
+src_install() {
+       hax_bitkeeper
+       make 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/*.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 -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:-Q::" /etc/conf.d/ntp-client # no longer needed
+       dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
+
+       keepdir /var/lib/ntp
+       fowners ntp:ntp /var/lib/ntp
+
+       if use logrotate ; then
+               insinto /etc/logrotate.d
+               newins "${FILESDIR}"/ntp.logrotate ntp
+       fi
+
+       if use openntpd ; then
+               cd "${D}"
+               rm usr/sbin/ntpd
+               rm -r var/lib
+               rm etc/{conf,init}.d/ntpd
+       fi
+}
+
+pkg_preinst() {
+       if [[ -e ${ROOT}/etc/ntp.conf ]] ; then
+               rm -f "${D}"/etc/ntp.conf
+       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 [[ -n $(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/41827"
+       fi
+}