From 1a38b3452c2c7ef7c623a2c0f5734cb8c1a0fd79 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 31 Dec 2011 07:42:00 +0000 Subject: [PATCH] Version bump #396047 by teidakankan. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- net-misc/ntp/ChangeLog | 8 +- net-misc/ntp/Manifest | 26 +++- net-misc/ntp/files/man-pages/genmans.sh | 7 - net-misc/ntp/files/man-pages/ntpdc.html.patch | 26 ---- net-misc/ntp/ntp-4.2.6_p5.ebuild | 123 ++++++++++++++++++ 5 files changed, 149 insertions(+), 41 deletions(-) delete mode 100644 net-misc/ntp/files/man-pages/ntpdc.html.patch create mode 100644 net-misc/ntp/ntp-4.2.6_p5.ebuild diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index 47ddfe77f72a..ba1a95d8f85b 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,12 @@ # 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.174 2011/10/27 23:36:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.175 2011/12/31 07:42:00 vapier Exp $ + +*ntp-4.2.6_p5 (31 Dec 2011) + + 31 Dec 2011; Mike Frysinger +ntp-4.2.6_p5.ebuild, + -files/man-pages/ntpdc.html.patch, files/man-pages/genmans.sh: + Version bump #396047 by teidakankan. 27 Oct 2011; Mike Frysinger ntp-4.2.6_p3-r1.ebuild, ntp-4.2.6_p4.ebuild: diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 174e6abee699..085c4d361f1c 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -1,10 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 -AUX man-pages/genmans.sh 2023 RMD160 c33ab937243d683a87693946a2eb6e63ff5df4b6 SHA1 c3bec5cf5481e9b816d0dcb7e5300f374c6c54bc SHA256 8f0867cbb66b30787a75ff1464765bb6d6bf541923c23d4aa33791c5b6b150de +AUX man-pages/genmans.sh 1864 RMD160 649444ee7ee7bc02430a2d802384e9e9d2f6ce42 SHA1 5211d95bc661c0d3f58add129fa4ad93d36475ac SHA256 87f46fd035c9432e6dc9f8e4273aae2e5a9616dbaa13d20909a6e01044369c1a AUX man-pages/ntp.conf.5.patch 503 RMD160 f2180ead822ceef3248050e52f8fd4045d88db62 SHA1 8222a771b88002ed119b45f5d19060f9609d4eea SHA256 d26c1006d72d76591588fbd058000596b17b0b9bcbd184d4e6cedbc31c3b1027 AUX man-pages/ntp.xsl 5831 RMD160 3822bda81ff8187ed56e1fdd9725713017e1a375 SHA1 85650d22144dbafa151dd70cb2bd170949075b60 SHA256 8a41227ded8953c90f49022f68bdaba60f9d82fe528d5a93157672c5bf8db03d -AUX man-pages/ntpdc.html.patch 1620 RMD160 0d240cb9b547b7a056b4f08a93385f5c1f4dca6a SHA1 64376272f02c9027d3715b97ab88816b73f0b618 SHA256 3b7295dba123c9922c1e375228f82707582ffa0add0177ad000a123df3852578 AUX ntp-4.2.4_p5-adjtimex.patch 670 RMD160 54cb1f9e8bf872044cc6e9f2a8a469f03d29af00 SHA1 53b437ce6c200cb9a1d4a1f4b0e543ea6e2c268a SHA256 ec465c5d5b3e9d72563ec88dba19ad7a05d9d65d2e72899532730333a8d38b38 AUX ntp-4.2.4_p7-CVE-2009-3563.patch 1752 RMD160 d259ed78523701ce22dd7aaadc945277b0586dd3 SHA1 3696ce854ea1bca9e2a514cdf883772ee38436e4 SHA256 4a6eb328ccfe3be771dc0932d6f6ee8210868f8c3d5ba09dbe6e9707edd4ce60 AUX ntp-4.2.4_p7-nano.patch 393 RMD160 59096f773b7206f6c9a8a94aa4ca6ac9c6b7a2a4 SHA1 4de6cd3fad1946146107f86d1f161eb835fbb2d3 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4 @@ -21,17 +20,30 @@ DIST ntp-4.2.6p3-manpages.tar.bz2 47797 RMD160 d2f9d88298b2d1966db5c2fab40214576 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 +DIST ntp-4.2.6p5-manpages.tar.bz2 47874 RMD160 b0f631d09056a98dc5c442658ea1df753b32fc94 SHA1 ef4fc49b62377b0f9b5833ec59bd9f038803ee16 SHA256 f49203cba2301ce27a53113a6e22d844b258114604f2c9ee1371833babc70f9c +DIST ntp-4.2.6p5.tar.gz 4202539 RMD160 aa1caffe697328b5c3e29dfa50b6074138646d20 SHA1 4a5353a4791b6f4315a66c28d504ec6c7926b192 SHA256 d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c 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 3830 RMD160 0a217f86d3138f69834b96b8f963f9f679a66c02 SHA1 765c8986ce103e0c6e4deb05af7399c530074c76 SHA256 fc6d46ab79ed4d61898856c9adde8679eed6246e89a5424e80d5988aa73f2bde EBUILD ntp-4.2.6_p3.ebuild 3739 RMD160 1ffea2b1e13744e02538b27ccb88a63248019c51 SHA1 baee094376a980e8d3ec52a147261495c2ce9f1a SHA256 dad25ed57dc050d5d24a5e85838fb9e4237a93f774f0ed283e2f56e13e51c650 EBUILD ntp-4.2.6_p4.ebuild 3827 RMD160 cf0649a2809ad24c6e5237d0a36c579d73a5f1ba SHA1 1f84e5b2ed7b858a563f7054247e82c56209330a SHA256 69e8d7eb1b4be9363199985b6d33c39be4417dd6ec1c490374ed21dfc053a309 -MISC ChangeLog 23879 RMD160 b994d275e2c5458f8df3c67db344bacd3fb9186a SHA1 75224ef2f676b3826d6704a6368a6a7805b084bd SHA256 c3a1047e323e199f7225dee44a5d6f32a087affa66250fc76b34e885c6daa103 +EBUILD ntp-4.2.6_p5.ebuild 3805 RMD160 e6d0767ebb2e4706e3d515482bb96d030d6df317 SHA1 444d552c7032add32ea259ea943f896a4cae6b19 SHA256 fb2ab4cdbd1ea99dd66e7be835e435e1c5781a3539df2a47cdc4cace41a77e3e +MISC ChangeLog 24085 RMD160 76a156dc04bf922262a1efd11e31171258a7efd2 SHA1 e615a8c11d00c5da0964f84372c078a4e9e28707 SHA256 525da4ad91c029d826248403ca04d1a2808022d22280d79ba80283a026b358a3 MISC metadata.xml 837 RMD160 a03ba53e0adab193b8684f03fc19b7ddfa534c6d SHA1 c83bec5056caaea44392373790480d1bc0f2d483 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6p6t0ACgkQaC/OocHi7JYnTAD/QNPiEMDipVo2rHRlg93pxtS+ -fjCxp1s8yQgOiZZh4fMBAIjqT/4cT+uprMIOmJOw+BtL5cH5N9cQ6htrX8z4CLqj -=uzAV +iQIcBAEBAgAGBQJO/rzOAAoJELEHsLL7fEFWr04P/1ArEFLkjxKLuaI+rjlNv7Vi +rHp7SGlBY4aD1eO30AWteSdqv00QZ3aipCCN+kDW5eldDTXfXdOVZFpokLiDzG1e +qXW7pX/9hxTQCOcfVf00Ah/fb3Mqif8cCtrKoZzABPwWLULu5fTTq2bDhpVToKVU +yQZMIPP46O3XjqXVqXm9mW9p5tjyGhw+Bg3In/L5F0iw6LRarH4nNJWWLDGQHyFU +Uurs6bjPZVhrObwvds441rscuIHg3DQ9JazzlDVfBzenf2bFHHlf+bDl46E2eX7l +5wJQ1hCGzEE3FFVhdKyktudjvJRSEPgji4pIxta9Cz1cNuXM7WDLy+IYbr+0yOUd +vlq+BPPST1f80gp2UO/YYPf6Exfc18XBhnDZuvTWXByIMtUJeX+vLZejIYGzW8ZH +862Ajm3xk/Mvh95SklW5eKPVJuCyAR8JE+gRzJpSb1vth1ZPZ5TwHmsH4lk2bvg/ +H3+coWQiGqroPt0Zl9ehUW7LaPSZXcMP/Je5OndEvfjoFM/PRs2ohZC9tvBuBVe3 +HkxfRakmwLtwXRA6y+4BXI36P0C9cIv2vuBW/GlLLo7paqBO0Zb+EVF3npiUWPf7 +paaurKhyaZnO/58CR2VBsGzycREie6ar/BoEdhUgIGHFteLPGl32QTdM3jfy+OB9 +Mrz1t3ekILQJvEMmymVX +=3feg -----END PGP SIGNATURE----- diff --git a/net-misc/ntp/files/man-pages/genmans.sh b/net-misc/ntp/files/man-pages/genmans.sh index fb3c2896c109..c0e618289990 100755 --- a/net-misc/ntp/files/man-pages/genmans.sh +++ b/net-misc/ntp/files/man-pages/genmans.sh @@ -50,13 +50,6 @@ echo "MANDIR: $MANDIR" echo "Press enter to continue, or Ctrl-C to cancel." read -# Apply patch if still needed -( -cd $HTMLDIR -patch -F0 -p2 --dry-run < ../../ntpdc.html.patch -sf || exit 0 -patch -F0 -p2 < ../../ntpdc.html.patch -) || exit 1 - # Process HTML files rm -rf ${MANDIR} mkdir ${MANDIR} diff --git a/net-misc/ntp/files/man-pages/ntpdc.html.patch b/net-misc/ntp/files/man-pages/ntpdc.html.patch deleted file mode 100644 index 4e16393bb062..000000000000 --- a/net-misc/ntp/files/man-pages/ntpdc.html.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- ntp/html/ntpdc.html -+++ ntp/html/ntpdc.html -@@ -132,9 +132,9 @@ -

The following commands all make authenticated requests.

-
--
addpeer peer_address [ -+
addpeer peer_address [ - keyid ] [ version ] [ - minpoll# | prefer | iburst | burst | minpoll - N | maxpoll N [...] ] --
addpeer peer_address [ -+
addpeer peer_address [ - prefer | iburst | burst | minpoll - N | maxpoll N | keyid -@@ -165,9 +165,9 @@ - previous setting. The prefer keyword indicates a preferred peer (and thus will be used primarily for clock synchronisation if possible). The preferred peer also determines the validity of the PPS signal - if the preferred peer is suitable for synchronisation so is the PPS signal. - The dynamic keyword allows association configuration even when no suitable network interface is found at configuration time. The dynamic interface update mechanism may complete the configuration when new interfaces appear (e.g. WLAN/PPP interfaces) at a later time and thus render the association operable. --
addserver peer_address [ -+
addserver peer_address [ - keyid ] [ version ] [ - minpoll# | prefer | iburst | burst | minpoll - N | maxpoll N [...] ] --
addserver peer_address [ -+
addserver peer_address [ - prefer | iburst | burst | minpoll - N | maxpoll N | keyid diff --git a/net-misc/ntp/ntp-4.2.6_p5.ebuild b/net-misc/ntp/ntp-4.2.6_p5.ebuild new file mode 100644 index 000000000000..546f4e1edb41 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.6_p5.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_p5.ebuild,v 1.1 2011/12/31 07:42:00 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=$(usex zeroconf) + 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_enable 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 +} -- 2.26.2