From 822a5ad68500f05a014ba4838c04ecba468a3fcd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 8 Jun 2006 10:57:02 +0000 Subject: [PATCH] Fixup a lot of incorrect type use. Package-Manager: portage-2.1_rc4-r3 --- net-misc/iputils/ChangeLog | 6 +- net-misc/iputils/Manifest | 44 +++-- .../iputils/files/iputils-021109-gcc4.patch | 177 ++++++++++++++++++ net-misc/iputils/iputils-021109-r3.ebuild | 3 +- 4 files changed, 208 insertions(+), 22 deletions(-) create mode 100644 net-misc/iputils/files/iputils-021109-gcc4.patch diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog index 928b037c34b6..e350b6f24880 100644 --- a/net-misc/iputils/ChangeLog +++ b/net-misc/iputils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/iputils # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.40 2006/05/06 07:24:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.41 2006/06/08 10:57:02 vapier Exp $ + + 08 Jun 2006; Mike Frysinger + +files/iputils-021109-gcc4.patch, iputils-021109-r3.ebuild: + Fixup a lot of incorrect type use. 06 May 2006; Mike Frysinger iputils-021109-r3.ebuild: Generate a ping6.8 symlink to ping.8 as pointed out by Matej Stepanek #132010. diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest index 959380fcc76d..6a73ad39397f 100644 --- a/net-misc/iputils/Manifest +++ b/net-misc/iputils/Manifest @@ -1,44 +1,48 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 021109-ipg-linux-2.6.patch 981 RMD160 a89a5b0365dbc21abaa7dded4597158f34a06e4c SHA1 3840d311e39c8d901fc9796db52f2e8d1a11c0d7 SHA256 8794d4046aa73b7bbc5083d8d3204cce0d0ee32b00647e758427d6ba0e9628ab size 981 +AUX 021109-ipg-linux-2.6.patch 981 RMD160 a89a5b0365dbc21abaa7dded4597158f34a06e4c SHA1 3840d311e39c8d901fc9796db52f2e8d1a11c0d7 SHA256 8794d4046aa73b7bbc5083d8d3204cce0d0ee32b00647e758427d6ba0e9628ab MD5 c9986b4299c200260da8f025c5e4b0ea files/021109-ipg-linux-2.6.patch 981 RMD160 a89a5b0365dbc21abaa7dded4597158f34a06e4c files/021109-ipg-linux-2.6.patch 981 SHA256 8794d4046aa73b7bbc5083d8d3204cce0d0ee32b00647e758427d6ba0e9628ab files/021109-ipg-linux-2.6.patch 981 -AUX 021109-no-pfkey-search.patch 307 RMD160 acb6af71e67f874ceb5278006e24d45ef2a55a03 SHA1 ab2943f56cfd7db78b0988b6667112e8a8540869 SHA256 ce4f073534b5091ab928698257bdf8dbaaaa53b9b6aa40bd1c77eff3cfd980f2 size 307 +AUX 021109-no-pfkey-search.patch 307 RMD160 acb6af71e67f874ceb5278006e24d45ef2a55a03 SHA1 ab2943f56cfd7db78b0988b6667112e8a8540869 SHA256 ce4f073534b5091ab928698257bdf8dbaaaa53b9b6aa40bd1c77eff3cfd980f2 MD5 c11c8762616b29e6d556a147aaa9374a files/021109-no-pfkey-search.patch 307 RMD160 acb6af71e67f874ceb5278006e24d45ef2a55a03 files/021109-no-pfkey-search.patch 307 SHA256 ce4f073534b5091ab928698257bdf8dbaaaa53b9b6aa40bd1c77eff3cfd980f2 files/021109-no-pfkey-search.patch 307 -AUX 021109-syserror.patch 324 RMD160 461a890ce1bcdae2725c56b1a34b98efc8b79d37 SHA1 81d3626212f87cbb108759b406f2c1d522a23d90 SHA256 b630f3a62e0577acd43dc7aae48a839198e7838918d1e4e71ff9c36fd206e592 size 324 +AUX 021109-syserror.patch 324 RMD160 461a890ce1bcdae2725c56b1a34b98efc8b79d37 SHA1 81d3626212f87cbb108759b406f2c1d522a23d90 SHA256 b630f3a62e0577acd43dc7aae48a839198e7838918d1e4e71ff9c36fd206e592 MD5 d85216426f34d4e768ab8f9f48c66e4f files/021109-syserror.patch 324 RMD160 461a890ce1bcdae2725c56b1a34b98efc8b79d37 files/021109-syserror.patch 324 SHA256 b630f3a62e0577acd43dc7aae48a839198e7838918d1e4e71ff9c36fd206e592 files/021109-syserror.patch 324 -AUX 021109-uclibc-no-ether_ntohost.patch 635 RMD160 234010cd5aadc5086beb638c19514659974939f8 SHA1 8e7fda98a1cc1fae5b8f75f9aec200fcb3afee49 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b size 635 +AUX 021109-uclibc-no-ether_ntohost.patch 635 RMD160 234010cd5aadc5086beb638c19514659974939f8 SHA1 8e7fda98a1cc1fae5b8f75f9aec200fcb3afee49 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b MD5 b4615612d4514f12b35fbaf27d3e04fe files/021109-uclibc-no-ether_ntohost.patch 635 RMD160 234010cd5aadc5086beb638c19514659974939f8 files/021109-uclibc-no-ether_ntohost.patch 635 SHA256 cf8135fd380918890a1da8de438d5283111f1e9ea0754b4f5c78bb703fcf617b files/021109-uclibc-no-ether_ntohost.patch 635 -AUX iputils-021109-bindnow.patch 511 RMD160 aefefcdde73444cec6ab51fdbb36886600368b8b SHA1 e9970fd8b930b719e4219e1fe73f6b27fcfb9ea6 SHA256 16c744ad23c16b90746eee08f36579ff0db996adcc01c908d2386381c564570d size 511 +AUX iputils-021109-bindnow.patch 511 RMD160 aefefcdde73444cec6ab51fdbb36886600368b8b SHA1 e9970fd8b930b719e4219e1fe73f6b27fcfb9ea6 SHA256 16c744ad23c16b90746eee08f36579ff0db996adcc01c908d2386381c564570d MD5 e5bfab718c4dbfe351c8220e20b6052d files/iputils-021109-bindnow.patch 511 RMD160 aefefcdde73444cec6ab51fdbb36886600368b8b files/iputils-021109-bindnow.patch 511 SHA256 16c744ad23c16b90746eee08f36579ff0db996adcc01c908d2386381c564570d files/iputils-021109-bindnow.patch 511 -AUX iputils-021109-gcc34.patch 2313 RMD160 354dcdc651bcfb88bd96d9008367854e91a5f7f7 SHA1 97baa39948144d83f0d484d2c5df0c8efc924590 SHA256 f015536e6b043aacdc7e55afd2394ecdea4d1aeeb33780e3857374788321bf9e size 2313 +AUX iputils-021109-gcc34.patch 2313 RMD160 354dcdc651bcfb88bd96d9008367854e91a5f7f7 SHA1 97baa39948144d83f0d484d2c5df0c8efc924590 SHA256 f015536e6b043aacdc7e55afd2394ecdea4d1aeeb33780e3857374788321bf9e MD5 744f2999dcf0fc5fd25ffcfeedd574d9 files/iputils-021109-gcc34.patch 2313 RMD160 354dcdc651bcfb88bd96d9008367854e91a5f7f7 files/iputils-021109-gcc34.patch 2313 SHA256 f015536e6b043aacdc7e55afd2394ecdea4d1aeeb33780e3857374788321bf9e files/iputils-021109-gcc34.patch 2313 -AUX iputils-021109-linux-udp-header.patch 418 RMD160 fc11364990492f813061116252bdab361e43092e SHA1 85ec6af23a1dfacf773772a4645c341ab7fe5b64 SHA256 0a206f5b0848b73609ff8be30411510431a6b8ec91a6fbed4e7c84788a2584f9 size 418 +AUX iputils-021109-gcc4.patch 4071 RMD160 c433ebf099e09320a60b7d1aeb7eb4127ce9697f SHA1 8654e31146cbd688d20e6795b44280f36baf6cb3 SHA256 f6d270b69a41b296d92b9c191a03f46379dc75270e92cb392b6f67ecfaf8069f +MD5 02ad61a6cb57f69f04b50434a49b3017 files/iputils-021109-gcc4.patch 4071 +RMD160 c433ebf099e09320a60b7d1aeb7eb4127ce9697f files/iputils-021109-gcc4.patch 4071 +SHA256 f6d270b69a41b296d92b9c191a03f46379dc75270e92cb392b6f67ecfaf8069f files/iputils-021109-gcc4.patch 4071 +AUX iputils-021109-linux-udp-header.patch 418 RMD160 fc11364990492f813061116252bdab361e43092e SHA1 85ec6af23a1dfacf773772a4645c341ab7fe5b64 SHA256 0a206f5b0848b73609ff8be30411510431a6b8ec91a6fbed4e7c84788a2584f9 MD5 79de65b9da536090d0560ba51520fd9d files/iputils-021109-linux-udp-header.patch 418 RMD160 fc11364990492f813061116252bdab361e43092e files/iputils-021109-linux-udp-header.patch 418 SHA256 0a206f5b0848b73609ff8be30411510431a6b8ec91a6fbed4e7c84788a2584f9 files/iputils-021109-linux-udp-header.patch 418 -DIST iputils-ss021109-try.tar.bz2 428335 size 428335 -EBUILD iputils-021109-r3.ebuild 2386 RMD160 438fd4ee36f5c6a2cd9077533e5104dc4158ab77 SHA1 f61348014f3c8086fc37ee0607a0b7cc7d78db0f SHA256 ab535228a0019becf44b5f8117251b4b1d4dde02b08a5def5b104815e101519f size 2386 -MD5 146a09425b0f129d2f2f0b809fd56462 iputils-021109-r3.ebuild 2386 -RMD160 438fd4ee36f5c6a2cd9077533e5104dc4158ab77 iputils-021109-r3.ebuild 2386 -SHA256 ab535228a0019becf44b5f8117251b4b1d4dde02b08a5def5b104815e101519f iputils-021109-r3.ebuild 2386 -MISC ChangeLog 6157 RMD160 edcd40153dc1301bd7cdc890027a17dbd8c5bd09 SHA1 5d8a2a42e840b5d7d5bf02514fd787312b6c233f SHA256 3a9d237faf1f8e3da5f553bd2706f8e6e20c874d9a26e2d761de1bf42c4b10b0 size 6157 -MD5 9e5fd5cadd091782e43fe4cb4e3a7912 ChangeLog 6157 -RMD160 edcd40153dc1301bd7cdc890027a17dbd8c5bd09 ChangeLog 6157 -SHA256 3a9d237faf1f8e3da5f553bd2706f8e6e20c874d9a26e2d761de1bf42c4b10b0 ChangeLog 6157 -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164 +DIST iputils-ss021109-try.tar.bz2 428335 +EBUILD iputils-021109-r3.ebuild 2424 RMD160 3ff7dea11b2785fbf3cf1525afd1ae43f4c98785 SHA1 51ac8c32f3cd2b47aa48203c8e9ff35e70e16e59 SHA256 709a81dcd7568eaae18e08d1c9d538e39fdf0fc874a185c681a7541b799ac286 +MD5 14593d47e174f7adf9ed1bc1786e920f iputils-021109-r3.ebuild 2424 +RMD160 3ff7dea11b2785fbf3cf1525afd1ae43f4c98785 iputils-021109-r3.ebuild 2424 +SHA256 709a81dcd7568eaae18e08d1c9d538e39fdf0fc874a185c681a7541b799ac286 iputils-021109-r3.ebuild 2424 +MISC ChangeLog 6307 RMD160 fc9b02a22923da3bc59b86c614f8033372826aba SHA1 bf1d226df41a27968954d6cb8785b6e6ba545cb3 SHA256 e5683763e970f69c4a08e1bbbf96c56fc9eefeb872920484089da78f72b9ac33 +MD5 8a96a81041503c309221f38c3d42add1 ChangeLog 6307 +RMD160 fc9b02a22923da3bc59b86c614f8033372826aba ChangeLog 6307 +SHA256 e5683763e970f69c4a08e1bbbf96c56fc9eefeb872920484089da78f72b9ac33 ChangeLog 6307 +MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 @@ -48,7 +52,7 @@ SHA256 5118692d8b1f6a1331d66d10cde790bb62239e1509c8dd758bed3f1e5fe4ca83 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEXE962+ySkm8kpY0RAiUgAJ9fGxYoFwW188IUbCBuVzsZiMMr8ACgqpYE -o2pNsbHidzCq7gjKYX9gC+c= -=XFxE +iD8DBQFEiANy2+ySkm8kpY0RArv5AJ9MGpHwahWZTh1QjUv2T7m572T9VQCgviRJ +hC05ARvsNutVsbo4rYSCPu4= +=Nc3H -----END PGP SIGNATURE----- diff --git a/net-misc/iputils/files/iputils-021109-gcc4.patch b/net-misc/iputils/files/iputils-021109-gcc4.patch new file mode 100644 index 000000000000..2ed079e06d77 --- /dev/null +++ b/net-misc/iputils/files/iputils-021109-gcc4.patch @@ -0,0 +1,177 @@ +fix a lot of incorrect types + +--- iputils/arping.c ++++ iputils/arping.c +@@ -434,7 +434,7 @@ main(int argc, char **argv) + } + } else if (!dad) { + int on = 1; +- int alen = sizeof(saddr); ++ socklen_t alen = sizeof(saddr); + + saddr.sin_port = htons(1025); + saddr.sin_addr = dst; +@@ -463,7 +463,7 @@ main(int argc, char **argv) + } + + if (1) { +- int alen = sizeof(me); ++ socklen_t alen = sizeof(me); + if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) { + perror("getsockname"); + exit(2); +@@ -495,9 +495,9 @@ main(int argc, char **argv) + + while(1) { + sigset_t sset, osset; +- char packet[4096]; ++ unsigned char packet[4096]; + struct sockaddr_ll from; +- int alen = sizeof(from); ++ socklen_t alen = sizeof(from); + int cc; + + if ((cc = recvfrom(s, packet, sizeof(packet), 0, +--- iputils/clockdiff.c ++++ iputils/clockdiff.c +@@ -120,7 +120,7 @@ long rtt_sigma = 0; + int + measure(struct sockaddr_in * addr) + { +- int length; ++ socklen_t length; + int msgcount; + int cc, count; + fd_set ready; +@@ -299,7 +299,7 @@ char *myname, *hisname; + int + measure_opt(struct sockaddr_in * addr) + { +- int length; ++ socklen_t length; + int msgcount; + int cc, count; + fd_set ready; +@@ -597,7 +597,7 @@ main(int argc, char *argv[]) + } + if (ip_opt_len) { + struct sockaddr_in myaddr; +- int addrlen = sizeof(myaddr); ++ socklen_t addrlen = sizeof(myaddr); + unsigned char rspace[ip_opt_len]; + + bzero(rspace, sizeof(rspace)); +--- iputils/ping6.c ++++ iputils/ping6.c +@@ -313,7 +313,7 @@ int main(int argc, char *argv[]) + hostname = target; + + if (ipv6_addr_any(&source.sin6_addr)) { +- int alen; ++ socklen_t alen; + int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0); + + if (probe_fd < 0) { +--- iputils/ping.c ++++ iputils/ping.c +@@ -260,7 +260,7 @@ main(int argc, char **argv) + } + + if (source.sin_addr.s_addr == 0) { +- int alen; ++ socklen_t alen; + struct sockaddr_in dst = whereto; + int probe_fd = socket(AF_INET, SOCK_DGRAM, 0); + +--- iputils/ping_common.c ++++ iputils/ping_common.c +@@ -67,7 +67,7 @@ static void fill(char *patp) + int ii, jj, kk; + int pat[16]; + char *cp; +- char *bp = outpack+8; ++ u_char *bp = outpack+8; + + for (cp = patp; *cp; cp++) { + if (!isxdigit(*cp)) { +@@ -393,7 +393,7 @@ resend: + void sock_setbufs(int icmp_sock, int alloc) + { + int rcvbuf, hold; +- int tmplen = sizeof(hold); ++ socklen_t tmplen = sizeof(hold); + + if (!sndbuf) + sndbuf = alloc; +@@ -464,7 +464,7 @@ void setup(int icmp_sock) + + if (!(options & F_PINGFILLED)) { + int i; +- char *p = outpack+8; ++ u_char *p = outpack+8; + + /* Do not forget about case of small datalen, + * fill timestamp area too! +--- iputils/rarpd.c ++++ iputils/rarpd.c +@@ -423,7 +423,7 @@ void serve_it(int fd) + { + unsigned char buf[1024]; + struct sockaddr_ll sll; +- int sll_len = sizeof(sll); ++ socklen_t sll_len = sizeof(sll); + struct arphdr *a = (struct arphdr*)buf; + struct rarp_map *rmap; + unsigned char *ptr; +--- iputils/rdisc.c ++++ iputils/rdisc.c +@@ -451,7 +451,7 @@ next: + for (;;) { + u_char packet[MAXPACKET]; + int len = sizeof (packet); +- int fromlen = sizeof (from); ++ socklen_t fromlen = sizeof (from); + int cc; + + cc=recvfrom(s, (char *)packet, len, 0, +--- iputils/tftpd.c ++++ iputils/tftpd.c +@@ -89,7 +89,7 @@ union { + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + } from; +-int fromlen; ++socklen_t fromlen; + + #define MAXARG 1 + char *dirs[MAXARG+1]; +@@ -149,7 +149,8 @@ int main(int ac, char **av) + */ + { + int pid; +- int i, j; ++ int i; ++ socklen_t j; + + for (i = 1; i < 20; i++) { + pid = fork(); +--- iputils/traceroute6.c ++++ iputils/traceroute6.c +@@ -501,7 +501,7 @@ int main(int argc, char *argv[]) + (char *)&on, sizeof(on)); + + if (source == NULL) { +- int alen; ++ socklen_t alen; + int probe_fd = socket(AF_INET6, SOCK_DGRAM, 0); + + if (probe_fd < 0) { +@@ -622,7 +622,7 @@ wait_for_reply(sock, from, reset_timer) + fd_set fds; + static struct timeval wait; + int cc = 0; +- int fromlen = sizeof (*from); ++ socklen_t fromlen = sizeof (*from); + + FD_ZERO(&fds); + FD_SET(sock, &fds); diff --git a/net-misc/iputils/iputils-021109-r3.ebuild b/net-misc/iputils/iputils-021109-r3.ebuild index 20dca60b767a..b71b6fdbc29c 100644 --- a/net-misc/iputils/iputils-021109-r3.ebuild +++ b/net-misc/iputils/iputils-021109-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.24 2006/05/06 07:24:49 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r3.ebuild,v 1.25 2006/06/08 10:57:02 vapier Exp $ inherit flag-o-matic eutils toolchain-funcs @@ -29,6 +29,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-gcc34.patch + epatch "${FILESDIR}"/${P}-gcc4.patch epatch "${FILESDIR}"/${PV}-no-pfkey-search.patch epatch "${FILESDIR}"/${PV}-ipg-linux-2.6.patch #71756 epatch "${FILESDIR}"/${PV}-syserror.patch -- 2.26.2