Added patch to compile on Gentoo/FreeBSD. Closes bug #94038.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 67 insertions, 19 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 44eae2f34111..3f2e27ea107b 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ntp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.56 2005/05/08 05:45:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.57 2005/05/26 21:43:45 flameeyes Exp $
+
+  26 May 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/4.2.0.20040617-freebsd.patch, ntp-4.2.0.20040617-r2.ebuild:
+  Added patch to compile on Gentoo/FreeBSD. Closes bug #94038.
 
 *ntp-4.2.0.20040617-r2 (08 May 2005)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 76960973747b..4cc93c603f74 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,30 +1,41 @@
-MD5 03cb65a5d159014d2d77958ef4c7f9be ChangeLog 8472
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fd32a4223042618651f91c741bac221f ChangeLog 8659
 MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
 MD5 5ee4f3f57c18aad3ceece869d567c9c8 ntp-4.1.2.ebuild 3167
 MD5 fd508993ba497efbbe023f0b257528f5 ntp-4.2.0-r2.ebuild 3734
+MD5 22559a01705ffadda302b3510bd9afe7 ntp-4.2.0.20040617-r2.ebuild 4312
 MD5 9ceb922f98c6b88a28c7942e0eacfd75 ntp-4.2.0.20040617.ebuild 3989
-MD5 dbfc76eb3a2153fa2a4baed98aeb2d76 ntp-4.2.0.20040617-r2.ebuild 4251
 MD5 047fe77e01bc9335b07bcc5d963d8683 files/4.1.2-droproot.patch 12672
+MD5 0ac690ae52fe02f336ae73f9857461ec files/4.2.0-droproot.patch 13908
+MD5 24574e6ad1b468152839c10361b51a0f files/4.2.0-linux-config-phone.patch 711
+MD5 d07dbc58315f577cc6d1dd8614f95cb1 files/4.2.0-ntpdate-quiet.patch 1117
+MD5 4404af9ccf7ecc7005c46dc43d9ae80a files/4.2.0.20040617-debug-fix.patch 430
+MD5 abb390de7ada49ef21ae18598b5eddb2 files/4.2.0.20040617-errno-fix.patch 685
+MD5 0c3a6df816f448a870e070797c22f72e files/4.2.0.20040617-hostname.patch 8476
+MD5 c51a9f2f2c85ab3bcdc54a1a9e3bedb6 files/4.2.0.20040617-ipv6-fixes.patch 2541
 MD5 4e13c1a5fa0fa54e3b65ec311dd7270a files/broadcastclient.patch 451
 MD5 af48491e8d6820a3d8eba16a771e5c26 files/digest-ntp-4.1.2 129
+MD5 5fc28af5c2a508eeb67a4d5d0ffab341 files/digest-ntp-4.2.0-r2 135
+MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617 166
+MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617-r2 166
 MD5 dded11ceec4b8f2c1b140341a357f507 files/linux-config-phone.patch 747
 MD5 e327d521e4dfb0c967941eeb84ad9207 files/ntp-4.1.1b-syscall-libc.patch 424
+MD5 20c344cec35350fe17773665094b2e57 files/ntp-4.2.0-gcc4.patch 1607
+MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
 MD5 ab2d8e5ff97df5fdd02bfd1b7e4be633 files/ntp-client.confd 949
 MD5 5eecb47ab966b2003b73b8cbd371de40 files/ntp-client.rc 933
 MD5 5bd3924f5720b97837969ec4ec4d5e09 files/ntp.conf 1451
-MD5 83dde3b948b28c278d496252494c935f files/ntpd.confd 393
-MD5 0ac690ae52fe02f336ae73f9857461ec files/4.2.0-droproot.patch 13908
-MD5 24574e6ad1b468152839c10361b51a0f files/4.2.0-linux-config-phone.patch 711
-MD5 d07dbc58315f577cc6d1dd8614f95cb1 files/4.2.0-ntpdate-quiet.patch 1117
+MD5 8f2b873f4294daf289f6e8787fd30439 files/ntpd-4.1.2.confd 394
 MD5 87951141777f50b2e4a2347a96f987b8 files/ntpd-4.1.2.rc 806
+MD5 83dde3b948b28c278d496252494c935f files/ntpd.confd 393
 MD5 0ce27073d67a016693a77314b6bfd4f5 files/ntpd.rc 741
-MD5 8f2b873f4294daf289f6e8787fd30439 files/ntpd-4.1.2.confd 394
-MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
-MD5 5fc28af5c2a508eeb67a4d5d0ffab341 files/digest-ntp-4.2.0-r2 135
-MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617 166
-MD5 20c344cec35350fe17773665094b2e57 files/ntp-4.2.0-gcc4.patch 1607
-MD5 4404af9ccf7ecc7005c46dc43d9ae80a files/4.2.0.20040617-debug-fix.patch 430
-MD5 abb390de7ada49ef21ae18598b5eddb2 files/4.2.0.20040617-errno-fix.patch 685
-MD5 0c3a6df816f448a870e070797c22f72e files/4.2.0.20040617-hostname.patch 8476
-MD5 c51a9f2f2c85ab3bcdc54a1a9e3bedb6 files/4.2.0.20040617-ipv6-fixes.patch 2541
-MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617-r2 166
+MD5 4cbbcd5bcd303b10c047314fa3d6bba4 files/4.2.0.20040617-freebsd.patch 1207
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFClkIZj5H05b2HAEkRAsllAJ9v6NeFzcpwFBs21IoVKjSz6h2Z6wCggMRM
+OLUFeStr2PiItvlbUvtKGLs=
+=X3ZS
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
new file mode 100644
index 000000000000..881faef63c53
--- /dev/null
+++ b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
@@ -0,0 +1,32 @@
+diff -ur ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c ntp-stable-4.2.0a-20040617-fbsd/ntpdc/ntpdc.c
+--- ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c	2004-05-25 13:02:25.000000000 +0200
++++ ntp-stable-4.2.0a-20040617-fbsd/ntpdc/ntpdc.c	2005-05-26 07:25:33.091870920 +0200
+@@ -449,7 +449,11 @@
+ 	hints.ai_flags = AI_NUMERICHOST;
+ 
+ 	a_info = getaddrinfo(hname, service, &hints, &ai);
+-	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
++	if (a_info == EAI_NONAME 
++#ifdef EAI_NODATA
++		|| a_info == EAI_NODATA
++#endif
++	) {
+ 		hints.ai_flags = AI_CANONNAME;
+ #ifdef AI_ADDRCONFIG
+ 		hints.ai_flags |= AI_ADDRCONFIG;
+diff -ur ntp-stable-4.2.0a-20040617/ntpq/ntpq.c ntp-stable-4.2.0a-20040617-fbsd/ntpq/ntpq.c
+--- ntp-stable-4.2.0a-20040617/ntpq/ntpq.c	2004-05-25 13:02:25.000000000 +0200
++++ ntp-stable-4.2.0a-20040617-fbsd/ntpq/ntpq.c	2005-05-26 07:26:33.276721432 +0200
+@@ -631,7 +631,11 @@
+ 	hints.ai_flags = AI_NUMERICHOST;
+ 
+ 	a_info = getaddrinfo(hname, service, &hints, &ai);
+-	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
++	if (a_info == EAI_NONAME
++#ifdef EAI_NODATA
++		|| a_info == EAI_NODATA
++#endif
++	) {
+ 		hints.ai_flags = AI_CANONNAME;
+ #ifdef AI_ADDRCONFIG
+ 		hints.ai_flags |= AI_ADDRCONFIG;
diff --git a/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild b/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild
index f55ff1c088e2..c0c856f27fdd 100644
--- a/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild,v 1.1 2005/05/08 05:45:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617-r2.ebuild,v 1.2 2005/05/26 21:43:45 flameeyes Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ IUSE="parse-clocks nodroproot selinux ssl ipv6 openntpd debug"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.1
-	!nodroproot? ( sys-libs/libcap )
+	linux_kernel? ( !nodroproot? ( sys-libs/libcap ) )
 	!openntpd? ( !net-misc/openntpd )
 	ssl? ( dev-libs/openssl )
 	selinux? ( sec-policy/selinux-ntp )"
@@ -52,6 +52,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-errno-fix.patch
 	epatch "${FILESDIR}"/${PV}-ipv6-fixes.patch
 	epatch "${FILESDIR}"/${PV}-debug-fix.patch
+	epatch "${FILESDIR}"/${PV}-freebsd.patch
 
 	#GCC 4 compile fixes
 	epatch "${FILESDIR}"/ntp-4.2.0-gcc4.patch