From: Jeroen Roovers Date: Tue, 6 Jan 2015 19:43:50 +0000 (+0000) Subject: Fix more format security warnings. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6bd8a3a1b76dc2d9c67781f36c09d9c0861ffcaf;p=gentoo.git Fix more format security warnings. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- diff --git a/net-analyzer/nttcp/ChangeLog b/net-analyzer/nttcp/ChangeLog index b88646b326f0..334357431ea1 100644 --- a/net-analyzer/nttcp/ChangeLog +++ b/net-analyzer/nttcp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/nttcp -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/ChangeLog,v 1.21 2014/07/21 15:26:31 jer Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/ChangeLog,v 1.22 2015/01/06 19:43:48 jer Exp $ + +*nttcp-1.47-r3 (06 Jan 2015) + + 06 Jan 2015; Jeroen Roovers -nttcp-1.47-r2.ebuild, + +nttcp-1.47-r3.ebuild, files/nttcp-1.47-format-security.patch: + Fix more format security warnings. 21 Jul 2014; Jeroen Roovers files/nttcp-1.47-format-security.patch: diff --git a/net-analyzer/nttcp/Manifest b/net-analyzer/nttcp/Manifest index 651a33079095..4498505b9da9 100644 --- a/net-analyzer/nttcp/Manifest +++ b/net-analyzer/nttcp/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX nttcp-1.47-format-security.patch 227 SHA256 417cb83663176893ae226b7e795431fb56ad611d6770423387c7d9da306c5562 SHA512 1958c167761e8cd4dd68abfe4c7f915a56e60ee029be79a894aaa3ddf3121992a319899060b41b938380eec75cd5149c4991664068dc455836d2d086c4aa5d80 WHIRLPOOL 08423f94c4ec9b7c26e74b4d634a803785634f638fae374a7fd41459f6456b06c30cfe932d6ab1c240f9bec6e9af25c4068969307cdeaa208c95ae0306617ade +AUX nttcp-1.47-format-security.patch 3620 SHA256 37e489d2c58f97bcc962d3341e2c8d8469038c387fb7ca36a17b5c7ea2cf257a SHA512 fb77b48b1f785a9658c3ff64a2f252660cf1941f3b782e178dbd80d7680d6aca9618201bbc91749afc7f6120e50ff72a4565caeb63fc5187b10f8c2e74630fbf WHIRLPOOL 836adb7c9dd6493b351ff0f31b260a580f948b733c6d922b8f2d84c629c3de68ebe914cb3cdb8ea1182e030d1af6a91433b4f63ea666e3e1aec8b8fd9b9e975a DIST nttcp-1.47.tar.gz 25693 SHA256 a0e0ac34d250ba874f9ce75da60717cde8da4ebbef56879bbc8b8ed2743b81ae SHA512 eb0a5aa0633555a6e4c3834e99666cd0e00d41da5d82fdfd2644a9f59727236f1b24fbe810272cf9cfb96d76361b028bcf57025008570dbd6b0d761df5cce625 WHIRLPOOL 4565335b23ad89e609d04a8c2c8eef914bbe85da2696da5a1fa352a02feaa13faca71f9058e34ab621fcf3b3653a334cfad67a22b81ca325c0caed789b7931fc EBUILD nttcp-1.47-r1.ebuild 688 SHA256 802f16582fd2af04df088cad10c8cb8103bec3aaea5b72688825b1f2fb224835 SHA512 7d0980ea70c1421e02c3fb9bd7d17552a88240b633a8510905726fad77ad2f2b48846e1cf07cc0b7149620fffc21399ee0d6b4f798a0e174cfd9554ca045ea46 WHIRLPOOL 23e40ee70bc68b29171da58553fba94322ecd1f6087152481453002336848086a744e32a3813ff08ad2e7849ce49b0f2fb226e17c3339b5c2b065122f6bbe9a7 -EBUILD nttcp-1.47-r2.ebuild 690 SHA256 aef373918c12654185cc3b8859d5ac9244884012c296abd3e3c71365432be54a SHA512 7b677ab1514ecd5d26f3bdf7c439c76093a8a68ad470e549443ba2a29ec70fff3ebc8742bc2248a2f0d72e757e51b2bf3d19fc0bb877a3013986db31e4d6d029 WHIRLPOOL 065aab520e8bb196b9985b3c20fdcdadccdd3e7881c599669fff0dbbb63d22700fe6078f92224517c00024e24e01982a7a166439fec1f905f7ec733b1854fb6e -MISC ChangeLog 2359 SHA256 50d0d0dd305c98ac873bda08f15186accfe76841033f0f27aa17866de586da89 SHA512 2058e8f55f671015541ac7ae8ec5ff8b60e55c6a5afcbab21245393b9fee77fc2dd4ca7a103d261db7fb1c198fb49acb874df8111beff7bffb5916a445aaa2c4 WHIRLPOOL 8b09fab154dc9b77c3f3c83b59fee0967ad8c1037401f39dda83f541897e583940e8e2a3ba85347172d0e7605a95b56125bdeefaaaadd198572d34cfa1ca51d7 +EBUILD nttcp-1.47-r3.ebuild 690 SHA256 e5ea8e3b9321fe1b99117555898b36dd930a741ba62f3a8b01de1903eccabc14 SHA512 1a80b835a7801f2672811409f4c127c3d76970b908f9469f6268d0fa94eaabeeed661a37ce454c7b9a4b0e2d3be2a52dca7869e1bf0e955e211477db35e72723 WHIRLPOOL 6f9ace05824357a193a0b7446dad287e43f8b21e228a324b39a917a53737b147912279a1e8f5a7b9b6b728cbadd06d19298e180c21b1b043abfd6c923fb99bf4 +MISC ChangeLog 2562 SHA256 20b2003fad83b3cbc15d48a0b0e782744fdde721c653963a209054a8b57d88ef SHA512 9212f02cf3b693084e5b15d60689728b05422dd515cce7ad9222b801afec1035c471383f0f004618aade7c4b999c1d399f104d2ab8913e632b3809e30ad015ec WHIRLPOOL 7bc96fdec43c31bbd4e66fa9b37db377fbd11dd855526ef1047cdcb09d5078ff6f956d7bb0f0a8bceda13ad604c65eeb607cd48c1a6718c95f6b246ea48ea607 MISC metadata.xml 230 SHA256 52926b3401e96f45c118c1219d5519891848ea9ba10a55487675cbf058a69cb6 SHA512 3c5e7ede097ed1eba78c94572b9ad40915edc79d9d08d56e4c1130dc8ba24b9127d581a4ac6bcdc2d17fcc3a01b9d66c1e73d829be33bcfd69d203b6857f8891 WHIRLPOOL 20b574d10e975b5b2e39efe248fcd3c85ea0e02aae08159ac4b6dd1adef95031a5e37a53712deaadc4842ab46092b2174ee00c2f56c26858e5c1802f438fcc01 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPNMSgACgkQVWmRsqeSphPX2wCfbn0Eaxf5vVuA3mz7sx+SxJRu -K6kAn04Rx8qmiQua4HCw8L5mDkH+do7F -=L1PD +iEYEAREIAAYFAlSsOvYACgkQVWmRsqeSphMROwCfShdq481jjVpiudd1M8pr7AN1 +Cz0An2PJBvseuHa2iMi1cKnEYmh6yRXW +=enoV -----END PGP SIGNATURE----- diff --git a/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch b/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch index c1d5970856e7..336ad237456d 100644 --- a/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch +++ b/net-analyzer/nttcp/files/nttcp-1.47-format-security.patch @@ -9,3 +9,124 @@ fMessage(stderr,s); exit(ret); } +@@ -694,7 +694,7 @@ + register int cnt; + if (opt.udp) { + struct sockaddr_in from; +- int len= sizeof(from); ++ socklen_t len= sizeof(from); + cnt= recvfrom(fd, buf, count, 0, (struct sockaddr *)&from, &len); + SysCalls++; + } +@@ -1150,8 +1150,8 @@ + int main(int argc, char *argv[]) { + + struct sockaddr_in PeerAddr; +- int PeerAddrLeng; +- char *DataPortFormat= "dataport: %d\n"; ++ socklen_t PeerAddrLeng; ++ const char DataPortFormat[]= "dataport: %d\n"; + int DataPort; + struct sockaddr_in sinlh; /* for control socket on local host */ + int fd; /* data socket to transport the data */ +@@ -1184,7 +1184,8 @@ + } + if (opt.inetd) { + /* we simulate inetd behaviour */ +- int nsrv, srv, fromleng; ++ int nsrv, srv; ++ socklen_t fromleng; + struct sockaddr_in sinsrv; + struct sockaddr_in frominet; + if (opt.Verbose) { +@@ -1285,7 +1286,7 @@ + Exit(MsgBuf, 2); + } + if (OptionLine[sizeof(OptionLine)-1] != '\0') { +- sprintf(MsgBuf, "%s: optionline longer than %d\n", ++ sprintf(MsgBuf, "%s: optionline longer than %ld\n", + myname, sizeof(OptionLine)-1); + Exit(MsgBuf, 3); + } +@@ -1308,7 +1309,7 @@ + Peer[PeerCount].fin= stdin; + Peer[PeerCount].fout= stdout; + syslog(LOG_DEBUG, +- "call from %.50 (=%.30s): done remote initial processing\n", ++ "call from %.50s (=%.30s): done remote initial processing\n", + Peer[PeerCount].HostName, Peer[PeerCount].IPName); + PeerCount++; + } +@@ -1617,7 +1618,7 @@ + sinlh.sin_family = AF_INET; + #if defined(MULTICAST) + if (opt.MulticastChannel) { +- int ml, p, join_group; ++ int p, join_group; + struct ip_mreq mreq; + sinlh.sin_port = htons(opt.MulticastPort); + if (bind(fd, (struct sockaddr *)&sinlh, sizeof(sinlh)) < 0) { +@@ -1640,7 +1641,6 @@ + sprintf(MsgBuf, DataPortFormat, DEFAULT_PORT); + + /* tell it our clients */ +- ml= strlen(MsgBuf); + for (p=0; p