From: Thilo Bangert Date: Mon, 19 Feb 2007 21:56:08 +0000 (+0000) Subject: add patch to fix bug #122912 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19d76692d64177b85c274151ef656574538a8d36;p=gentoo.git add patch to fix bug #122912 Package-Manager: portage-2.1.1-r2 --- diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog index 1c538699d3d5..7c5c3b802c2e 100644 --- a/net-misc/openntpd/ChangeLog +++ b/net-misc/openntpd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/openntpd -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.27 2006/08/11 17:40:27 bangert Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.28 2007/02/19 21:56:08 bangert Exp $ + +*openntpd-3.9_p1-r1 (19 Feb 2007) + + 19 Feb 2007; Thilo Bangert + +files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff, + +openntpd-3.9_p1-r1.ebuild: + add patch to fix bug #122912 11 Aug 2006; Thilo Bangert openntpd-3.7_p1.ebuild, openntpd-3.9_p1.ebuild: diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest index 15005da97744..a2d7c8f36845 100644 --- a/net-misc/openntpd/Manifest +++ b/net-misc/openntpd/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 3.6.1_p1-ntpd.8.patch 664 RMD160 98de0f67ddbbee68b73326c5abc81f18588652b9 SHA1 e22bbf43812760e4ba1fb5c044f1a390148826ce SHA256 8fdfc228c1d3955cbb7451ac3edb7978eafb7f08a6dcc1fd6887d25c69c0c3ee MD5 71e8d0be6ce1e3324576b9ddce02c74e files/3.6.1_p1-ntpd.8.patch 664 RMD160 98de0f67ddbbee68b73326c5abc81f18588652b9 files/3.6.1_p1-ntpd.8.patch 664 @@ -9,6 +6,10 @@ AUX 3.6.1_p1-pollerr.patch 1218 RMD160 08ac74e0b22ae1174fdd8030c52c9ec20bf4b23c MD5 8ff46ca71725c4c9ccbdaed5ecbd8ea3 files/3.6.1_p1-pollerr.patch 1218 RMD160 08ac74e0b22ae1174fdd8030c52c9ec20bf4b23c files/3.6.1_p1-pollerr.patch 1218 SHA256 0c4daaeb700665a8ee7479145e5812ac4d0c7dd440a7a7c493d5473d1f9ae191 files/3.6.1_p1-pollerr.patch 1218 +AUX openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff 1279 RMD160 b5009b37267b053841b0d46a07ae2af994cd24ea SHA1 4fee3243fbb5abdaaf29c2359c1287882f7b49cb SHA256 97043f4a19468bc275326e6cd1b8aee8dfe6123746a8e857a5b1fa63f7f9a044 +MD5 ae2f708b860975b64126bb316aeb6641 files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff 1279 +RMD160 b5009b37267b053841b0d46a07ae2af994cd24ea files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff 1279 +SHA256 97043f4a19468bc275326e6cd1b8aee8dfe6123746a8e857a5b1fa63f7f9a044 files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff 1279 AUX openntpd.conf.d 181 RMD160 0cacb7e31ec0c04c99e9ba01dd82d0ec26b56b8f SHA1 dbf1ed92e8606bd95e579f77235f4d8b249a7081 SHA256 a1cb9dc8fbbaf6f439d6547bce9d59e86e7e13855b037d33bad1f789fb7050f3 MD5 e3eee9eb2ea092dfdf9d887cd6df5795 files/openntpd.conf.d 181 RMD160 0cacb7e31ec0c04c99e9ba01dd82d0ec26b56b8f files/openntpd.conf.d 181 @@ -28,14 +29,18 @@ EBUILD openntpd-3.7_p1.ebuild 1278 RMD160 f236b3218882609dc761068f1b61d262361481 MD5 16648dae31d6e924198c9ce2c244f82b openntpd-3.7_p1.ebuild 1278 RMD160 f236b3218882609dc761068f1b61d26236148190 openntpd-3.7_p1.ebuild 1278 SHA256 9381a109496c2e8f792ef07719af768e0ba11ec15655c091334e82e5097d1158 openntpd-3.7_p1.ebuild 1278 +EBUILD openntpd-3.9_p1-r1.ebuild 1360 RMD160 dc07da705c21f11581b1ab162a89743af1c4c01e SHA1 4820a6993b353011aa6f5e4129a359af0de1ba3a SHA256 261fdc5ce936a79458d0f385a6975da815b59d8e4bd9fa92d14d17fb7feb67e7 +MD5 5a126eae76e8f061fd02ca10649b354e openntpd-3.9_p1-r1.ebuild 1360 +RMD160 dc07da705c21f11581b1ab162a89743af1c4c01e openntpd-3.9_p1-r1.ebuild 1360 +SHA256 261fdc5ce936a79458d0f385a6975da815b59d8e4bd9fa92d14d17fb7feb67e7 openntpd-3.9_p1-r1.ebuild 1360 EBUILD openntpd-3.9_p1.ebuild 1289 RMD160 68f1fbc5edbda24a137b251aba2e9ac4d6b6cd95 SHA1 300760d955a6a966284565746ba59e0e962ca111 SHA256 d50b6738b259f3827665ce141932243036142a5173fef9a014c252f5fc77d881 MD5 bb2ec6462b32aeac3ed97f7403d4ce2d openntpd-3.9_p1.ebuild 1289 RMD160 68f1fbc5edbda24a137b251aba2e9ac4d6b6cd95 openntpd-3.9_p1.ebuild 1289 SHA256 d50b6738b259f3827665ce141932243036142a5173fef9a014c252f5fc77d881 openntpd-3.9_p1.ebuild 1289 -MISC ChangeLog 3695 RMD160 43cac34108df5c88fc64267caefcc3d7c9250e51 SHA1 4cc8be987f338b452a759d8636b7942b4a9f5a6e SHA256 6bf78eb06bc73fae4e9a431ec4dcde29b8772f34346bf9abc2e2d637253a15fd -MD5 65fbc2cf00f6021efd0eb12854a066e3 ChangeLog 3695 -RMD160 43cac34108df5c88fc64267caefcc3d7c9250e51 ChangeLog 3695 -SHA256 6bf78eb06bc73fae4e9a431ec4dcde29b8772f34346bf9abc2e2d637253a15fd ChangeLog 3695 +MISC ChangeLog 3899 RMD160 84a49c37bfb04e7f39d2647eca82beba199f8190 SHA1 54a0f229212772257053639de9826712cf899f41 SHA256 eeaa4e0d699818af51315a4f88a2b5efe417fb8ac5dc99d47a60a6d239950bb9 +MD5 89b733bafe6b162184ee5443a8eb2a1e ChangeLog 3899 +RMD160 84a49c37bfb04e7f39d2647eca82beba199f8190 ChangeLog 3899 +SHA256 eeaa4e0d699818af51315a4f88a2b5efe417fb8ac5dc99d47a60a6d239950bb9 ChangeLog 3899 MISC metadata.xml 507 RMD160 31dde8e6744b8a825bd8a763c149663785e7a267 SHA1 9aa7883d59456d95af5032a6b85547b65b74a439 SHA256 b4a289de60d0e1cdf33f8cd2ea669a6b8f1668ed0bb3adbbb79f155bd88a0e5d MD5 4d2bf1a30a1c5819189a29be006b2073 metadata.xml 507 RMD160 31dde8e6744b8a825bd8a763c149663785e7a267 metadata.xml 507 @@ -49,10 +54,6 @@ SHA256 581f4588e719f1cac98f775bc39b9d88d3cceab2548a412d65321a9055a49f8c files/di MD5 dd4ff15ab44746657cf96ce93731444a files/digest-openntpd-3.9_p1 244 RMD160 5e1b202b3dd29bf7b4bbbd1360ef53d8e708447d files/digest-openntpd-3.9_p1 244 SHA256 526cc23ea22b696d49f30d7381c12c5c635d1b5646c80237a81cccae72d59a1e files/digest-openntpd-3.9_p1 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFl8sg8bi6rjpTunYRAhKuAJ9DvQm2XeZG6sYJvXcMbHmddoK+SACfeWpg -wo29DmtCjuERq2PHZRJhY3c= -=Uir6 ------END PGP SIGNATURE----- +MD5 dd4ff15ab44746657cf96ce93731444a files/digest-openntpd-3.9_p1-r1 244 +RMD160 5e1b202b3dd29bf7b4bbbd1360ef53d8e708447d files/digest-openntpd-3.9_p1-r1 244 +SHA256 526cc23ea22b696d49f30d7381c12c5c635d1b5646c80237a81cccae72d59a1e files/digest-openntpd-3.9_p1-r1 244 diff --git a/net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 b/net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 new file mode 100644 index 000000000000..0fd0491f53c8 --- /dev/null +++ b/net-misc/openntpd/files/digest-openntpd-3.9_p1-r1 @@ -0,0 +1,3 @@ +MD5 afc34175f38d08867c1403d9008600b3 openntpd-3.9p1.tar.gz 152700 +RMD160 c348004116c78810daa9451f15abcc26788949a8 openntpd-3.9p1.tar.gz 152700 +SHA256 83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49 openntpd-3.9p1.tar.gz 152700 diff --git a/net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff b/net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff new file mode 100644 index 000000000000..adca55614a49 --- /dev/null +++ b/net-misc/openntpd/files/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff @@ -0,0 +1,43 @@ +diff -Naur openntpd-3.9p1/client.c openntpd-3.9p1-fixed/client.c +--- openntpd-3.9p1/client.c 2006-05-14 07:29:21.000000000 +0200 ++++ openntpd-3.9p1-fixed/client.c 2006-10-11 02:41:44.000000000 +0200 +@@ -116,6 +116,7 @@ + client_query(struct ntp_peer *p) + { + int tos = IPTOS_LOWDELAY; ++ int result; + + if (p->addr == NULL && client_nextaddr(p) == -1) { + set_next(p, error_interval()); +@@ -163,9 +164,17 @@ + p->query->msg.xmttime.fractionl = arc4random(); + p->query->xmttime = gettime(); + +- if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg, +- NTP_MSGSIZE_NOAUTH, 0) == -1) { ++ if ((result = ntp_sendmsg(p->query->fd, NULL, &p->query->msg, ++ NTP_MSGSIZE_NOAUTH, 0)) < 0) { + set_next(p, INTERVAL_QUERY_PATHETIC); ++ if (result == -2) { ++ /* ++ * got EINVAL in sendto(), probably the local socket ++ * address got invalidated -> force re-connect() ++ */ ++ close(p->query->fd); ++ p->query->fd = -1; ++ } + return (-1); + } + +diff -Naur openntpd-3.9p1/ntp_msg.c openntpd-3.9p1-fixed/ntp_msg.c +--- openntpd-3.9p1/ntp_msg.c 2006-05-14 07:29:21.000000000 +0200 ++++ openntpd-3.9p1-fixed/ntp_msg.c 2006-10-11 02:41:49.000000000 +0200 +@@ -98,6 +98,8 @@ + return (-1); + } + log_warn("sendto"); ++ if (errno == EINVAL) ++ return (-2); + return (-1); + } + diff --git a/net-misc/openntpd/openntpd-3.9_p1-r1.ebuild b/net-misc/openntpd/openntpd-3.9_p1-r1.ebuild new file mode 100644 index 000000000000..3270bbab5690 --- /dev/null +++ b/net-misc/openntpd/openntpd-3.9_p1-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-3.9_p1-r1.ebuild,v 1.1 2007/02/19 21:56:08 bangert Exp $ + +inherit eutils + +MY_P=${P/_/} +DESCRIPTION="Lightweight NTP server ported from OpenBSD" +HOMEPAGE="http://www.openntpd.org/" +SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="ssl selinux" + +RDEPEND="ssl? ( dev-libs/openssl ) + selinux? ( sec-policy/selinux-ntp ) + !<=net-misc/ntp-4.2.0-r2" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.51" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + enewgroup ntp 123 + enewuser ntp 123 -1 /var/empty ntp + + if has_version net-misc/ntp && ! built_with_use net-misc/ntp openntpd ; then + die "you need to emerge ntp with USE=openntpd" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die + epatch ${FILESDIR}/openntpd-3.9p1_reconnect_on_sendto_EINVAL.diff +} + +src_compile() { + econf \ + --disable-strip \ + $(use_with !ssl builtin-arc4random) || die + emake || die "emake failed" +} + +src_install() { + make install DESTDIR="${D}" || die + dodoc ChangeLog CREDITS README + + newinitd "${FILESDIR}"/openntpd.rc ntpd + newconfd "${FILESDIR}"/openntpd.conf.d ntpd +}