gcc4 compilation fixes from Fedora

Package-Manager: portage-2.0.51.19

4 files changed, 75 insertions, 13 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index d47c71ae2d5b..9ee970379fe8 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/ntp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.53 2004/12/29 19:59:28 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.54 2005/04/15 22:22:19 halcy0n Exp $
+
+  15 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/ntp-4.2.0-gcc4.patch,
+  ntp-4.2.0.20040617.ebuild:
+  Patch for GCC4 compilation issues from Fedora
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 2f210f3fdf6d..eefe37a4e93a 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,23 +1,34 @@
-MD5 f5aa586f3e30787daae3f591bf93a08e ChangeLog 7504
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 883ab49ef0c22b0c2898f3c623ccc408 ChangeLog 7659
 MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
 MD5 5ee4f3f57c18aad3ceece869d567c9c8 ntp-4.1.2.ebuild 3167
 MD5 fd508993ba497efbbe023f0b257528f5 ntp-4.2.0-r2.ebuild 3734
-MD5 07dee771783fde4012966cecede0ba2e ntp-4.2.0.20040617.ebuild 3922
+MD5 9ceb922f98c6b88a28c7942e0eacfd75 ntp-4.2.0.20040617.ebuild 3989
 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 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 dded11ceec4b8f2c1b140341a357f507 files/linux-config-phone.patch 747
 MD5 e327d521e4dfb0c967941eeb84ad9207 files/ntp-4.1.1b-syscall-libc.patch 424
+MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
 MD5 ab2d8e5ff97df5fdd02bfd1b7e4be633 files/ntp-client.confd 949
 MD5 2965cff99d89c28ae19c1a967f697777 files/ntp-client.rc 925
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCYD6lCRZPokWLroQRAmcKAJ0Yz6uUvUfq/umc38JufJsJMsvBiQCgvh/c
+lO81GfRMYHDP12K0hJ0Nh8g=
+=hOtW
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/ntp-4.2.0-gcc4.patch b/net-misc/ntp/files/ntp-4.2.0-gcc4.patch
new file mode 100644
index 000000000000..114672d7f49c
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.0-gcc4.patch
@@ -0,0 +1,44 @@
+--- ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h.gcc4	2005-03-08 14:29:42.940559784 +0100
++++ ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h	2005-03-08 14:29:43.015548384 +0100
+@@ -133,10 +133,6 @@
+ extern u_char *	cache_key;		/* key pointer */
+ extern u_int	cache_keylen;		/* key length */
+ 
+-/* clocktypes.c */
+-struct clktype;
+-extern struct clktype clktypes[];
+-
+ /* getopt.c */
+ extern char *	ntp_optarg;		/* global argument pointer */
+ extern int	ntp_optind;		/* global argv index */
+--- ntp-stable-4.2.0a-20040617/include/ntp_refclock.h.gcc4	2004-02-25 06:57:56.000000000 +0100
++++ ntp-stable-4.2.0a-20040617/include/ntp_refclock.h	2005-03-08 14:29:43.015548384 +0100
+@@ -65,6 +65,7 @@
+ 	const char *clocktype;	/* long description */
+ 	const char *abbrev;	/* short description */
+ };
++extern struct clktype clktypes[];
+ 
+ /*
+  * Configuration flag values
+--- ntp-stable-4.2.0a-20040617/include/ntpd.h.gcc4	2004-05-25 13:02:24.000000000 +0200
++++ ntp-stable-4.2.0a-20040617/include/ntpd.h	2005-03-08 14:29:43.016548232 +0100
+@@ -225,8 +225,6 @@
+ #endif
+ 
+ /* ntp_control.c */
+-struct ctl_trap;
+-extern struct ctl_trap ctl_trap[];
+ extern int	num_ctl_traps;
+ extern keyid_t	ctl_auth_keyid;		/* keyid used for authenticating write requests */
+ 
+--- ntp-stable-4.2.0a-20040617/include/ntp_control.h.gcc4	2004-05-25 13:02:23.000000000 +0200
++++ ntp-stable-4.2.0a-20040617/include/ntp_control.h	2005-03-08 14:29:43.016548232 +0100
+@@ -268,6 +268,7 @@
+ 	u_char tr_flags;		/* trap flags */
+ 	u_char tr_version;		/* version number of trapper */
+ };
++extern struct ctl_trap ctl_trap[];
+ 
+ /*
+  * Flag bits
diff --git a/net-misc/ntp/ntp-4.2.0.20040617.ebuild b/net-misc/ntp/ntp-4.2.0.20040617.ebuild
index a94eda2d4cd6..33c6768e32e3 100644
--- a/net-misc/ntp/ntp-4.2.0.20040617.ebuild
+++ b/net-misc/ntp/ntp-4.2.0.20040617.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.ebuild,v 1.4 2005/03/31 00:11:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20040617.ebuild,v 1.5 2005/04/15 22:22:19 halcy0n Exp $
 
 inherit eutils
 
@@ -49,6 +49,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/ntp-4.1.1b-syscall-libc.patch
 	epatch "${FILESDIR}"/4.2.0-linux-config-phone.patch #13001
 
+	#GCC 4 compile fixes
+	epatch "${FILESDIR}"/ntp-4.2.0-gcc4.patch
+
 	sed -i \
 		-e 's:md5\.h:touch_not_my_md5:g' \
 		-e 's:-Wpointer-arith::' \