diff options
Diffstat (limited to 'net-analyzer')
20 files changed, 333 insertions, 162 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex c9bf9b6bcd42..47237a418853 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index d6fa1dd697d1..57031c4aeee1 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,5 +1,9 @@ +AUX sarg-2.3.10-bool.patch 228 BLAKE2B 38c1ca6c03c316afab832c2680afc433d499a9f0218c004996b4f74ef24395c57bd3e2355d1af0244b31d1a50f017faf96ca8e75e142884a3b2ab5ac66bbb7e6 SHA512 f5f5aa42a16e01fe84c4f62715215ed960323b1c2525281c1433e20bde08c1ed4c0a460b635905d2fd7a0269cff232446b557c30dc49b4652988f660b832f618 +AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda +AUX sarg-2.3.10-format.patch 1541 BLAKE2B cfa03a3dad67f3ca8ec3b47db8755f5760b3780bedcb29549e04cecc955212003930e2a467749e964ab8073a404d55359826132e43ff6d1a01228a1a6fe79229 SHA512 d3c25d94da93dd1308b9c035fff3ddf6a241327596c182d85d79f183b659fa20ea8e806e5b1e3e8675dae843744b7329d03e572260c6932466694103180c8bd6 AUX sarg-2.3.9-configure-bash.patch 4033 BLAKE2B 7f98a2fda63c4abe93ec80f5a068bdd99a647f811cb95c05f0a716167ca73b6ae4476b344cfe7f1d7d7b5e43e491790cbc8cb8aefc36bb0e0696cadb69a65350 SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68 AUX sarg-2.3.9-configure.patch 641 BLAKE2B dc4162b7180bc40692e779ddf1d1a1b48442e9814c4d043593f695062f132041102ec70807aad07119b9415a9e04776d5728cd2e73a646e4c2dcb4351d4bf9a5 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d +EBUILD sarg-2.3.10-r1.ebuild 936 BLAKE2B f5e330e0c9b7e0a906c04c69e00676bce19a84d021186f3e99208a4bd2fd67895bc837191d0f774fd9488d547813b43e07a0ca8ff72eaadd46284e88bd92082f SHA512 c989ef3e90ae8d1e8852e50d08825efa7596e8c688332e38f648b716bda4cce1d6b35cf1cd249a84c0565284c0aafd9e57d1bfc7d4272219e33dea1156bb16a2 EBUILD sarg-2.3.10.ebuild 1757 BLAKE2B 1e5d9122b9f9dc647971485eafc762155ed7cda0bcd24739a9b1d780d1c9e7f0880136e9ba0b88dc6e628dd2e2341414fa61f08aa92266b73530c5a3e40c391d SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182 MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a diff --git a/net-analyzer/sarg/files/sarg-2.3.10-bool.patch b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch new file mode 100644 index 000000000000..188b6dd3732b --- /dev/null +++ b/net-analyzer/sarg/files/sarg-2.3.10-bool.patch @@ -0,0 +1,11 @@ +--- a/util.c ++++ b/util.c +@@ -2088,7 +2088,7 @@ + int pad_len; + bool bracket=false; + bool port=false; +- bool port_num=0; ++ int port_num=0; + + // skip leading spaces and tabs + while (*buf && (*buf==' ' || *buf=='\t')) buf++; diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch new file mode 100644 index 000000000000..cfbf103d5b2a --- /dev/null +++ b/net-analyzer/sarg/files/sarg-2.3.10-config.patch @@ -0,0 +1,94 @@ +--- a/log.c ++++ b/log.c +@@ -241,7 +241,7 @@ + strcpy(LogoTextColor,"#006699"); + strcpy(FontSize,"9px"); + strcpy(TempDir,"/tmp"); +- strcpy(OutputDir,"/var/www/html/squid-reports"); ++ strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports"); + AnonymousOutputFiles=false; + Ip2Name=false; + strcpy(DateFormat,"u"); +--- a/sarg-php/sarg-squidguard-block.php ++++ b/sarg-php/sarg-squidguard-block.php +@@ -26,8 +26,8 @@ + */ + + // Change to squidGuard and sarg config file paths +-$SargConf = "/usr/local/sarg/sarg.conf"; +-$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf"; ++$SargConf = "/etc/sarg/sarg.conf"; ++$squidGuardConf = "/etc/squidGuard/squidGuard.conf"; + + global $SargConf; + global $dbhome; +@@ -37,7 +37,7 @@ + include_once("style.php"); + + $url = $_GET['url']; +-$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf'; ++$squidGuard_conf = '/etc/squidGuard/squidGuard.conf'; + + function parse_config($line,$clave) { + if (preg_match("/dbhome/i", $line)) { +--- a/sarg-php/sarg-block-it.php ++++ b/sarg-php/sarg-block-it.php +@@ -25,7 +25,7 @@ + * + */ + +-$filename = "/usr/local/squid/etc/block.txt"; ++$filename = "/etc/squid/etc/block.txt"; + + $url = $_GET['url']; + $url = $url."\n"; +--- a/htaccess ++++ b/htaccess +@@ -1,4 +1,4 @@ +-AuthUserFile /usr/local/sarg/passwd ++AuthUserFile /etc/sarg/passwd + AuthName "SARG, Squid Analysis Report Generator" + AuthType Basic + <Limit GET POST> +--- a/sarg.conf ++++ b/sarg.conf +@@ -4,7 +4,7 @@ + # Where is the access.log file + # sarg -l file + # +-#access_log /usr/local/squid/var/logs/access.log ++#access_log /var/log/squid/access.log + + # TAG: graphs yes|no + # Use graphics where is possible. +@@ -117,7 +117,7 @@ + # The reports will be saved in that directory + # sarg -o dir + # +-#output_dir /var/www/html/squid-reports ++#output_dir /var/www/localhost/htdocs/squid-reports + + # TAG: anonymous_output_files yes/no + # Use anonymous file and directory names in the report. If it is set to +@@ -545,7 +545,7 @@ + # Generate reports from SquidGuard logs. + # Use 'none' to disable. + # You can use sarg -L filename to use an alternate squidGuard log. +-# squidguard_conf /usr/local/squidGuard/squidGuard.conf ++# squidguard_conf /etc/squidGuard/squidGuard.conf + # + #squidguard_conf none + +--- a/user_limit_block ++++ b/user_limit_block +@@ -24,8 +24,8 @@ + # + # + +-conf="/usr/local/sarg/sarg.conf" +-squid_password_file="/usr/local/squid/etc/passwd" ++conf="/etc/sarg/sarg.conf" ++squid_password_file="/etc/squid/passwd" + tmp="/tmp/sarg_limit.$$" + + limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'` diff --git a/net-analyzer/sarg/files/sarg-2.3.10-format.patch b/net-analyzer/sarg/files/sarg-2.3.10-format.patch new file mode 100644 index 000000000000..926fdc8c6725 --- /dev/null +++ b/net-analyzer/sarg/files/sarg-2.3.10-format.patch @@ -0,0 +1,77 @@ +--- a/report.c ++++ b/report.c +@@ -54,7 +54,7 @@ + char accsmart[MAXLEN]; + char crc2[MAXLEN/2 -1]; + char siteind[MAX_TRUNCATED_URL]; +- char arqtt[256]; ++ char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10]; + char *oldurltt=NULL; + char oldaccdiatt[11],oldacchoratt[9]; + char tmp3[MAXLEN]; +--- a/util.c ++++ b/util.c +@@ -671,10 +671,10 @@ + char *buildtime(long long int elap) + { + int num = elap / 1000; +- int hor = 0; +- int min = 0; +- int sec = 0; +- static char buf[12]; ++ short int hor = 0; ++ short int min = 0; ++ short int sec = 0; ++ static char buf[15]; + + buf[0]='\0'; + +@@ -1236,10 +1236,10 @@ + char *fixtime(long long int elap) + { + int num = elap / 1000; +- int hor = 0; +- int min = 0; +- int sec = 0; +- static char buf[12]; ++ short int hor = 0; ++ short int min = 0; ++ short int sec = 0; ++ static char buf[15]; + + hor=num / 3600; + min=(num % 3600) / 60; +@@ -1248,7 +1248,7 @@ + if(hor==0 && min==0 && sec==0) + strcpy(buf,"0"); + else +- sprintf(buf,"%d:%02d:%02d",hor,min,sec); ++ sprintf(buf,"%02d:%02d:%02d",hor,min,sec); + + return buf; + } +--- a/index.c ++++ b/index.c +@@ -89,9 +89,9 @@ + char monthdir[MAXLEN]; + char monthname1[9], monthname2[9]; + char nmonth[30]; +- char monthnum[10]; ++ char monthnum[15]; + char dayindex[MAXLEN]; +- char daynum[10]; ++ char daynum[15]; + char title[80]; + int yearsort[150]; + int nyears; +--- a/userinfo.c ++++ b/userinfo.c +@@ -67,7 +67,7 @@ + int skip; + int flen; + int count, clen; +- char cstr[9]; ++ char cstr[10]; + + last=NULL; + for (group=first_user_group ; group ; group=group->next) { diff --git a/net-analyzer/sarg/sarg-2.3.10-r1.ebuild b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild new file mode 100644 index 000000000000..72e6e4dbb97f --- /dev/null +++ b/net-analyzer/sarg/sarg-2.3.10-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="Squid Analysis Report Generator" +HOMEPAGE="http://sarg.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" +IUSE="+gd ldap pcre" + +DEPEND=" + gd? ( media-libs/gd[png,truetype] ) + ldap? ( net-nds/openldap ) + pcre? ( dev-libs/libpcre ) +" +RDEPEND="${DEPEND}" + +DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.9-configure.patch + "${FILESDIR}"/${PN}-2.3.9-configure-bash.patch + "${FILESDIR}"/${PN}-2.3.10-format.patch + "${FILESDIR}"/${PN}-2.3.10-bool.patch + "${FILESDIR}"/${PN}-2.3.10-config.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_with gd) \ + $(use_with ldap) \ + $(use_with pcre) \ + --sysconfdir="${EPREFIX}/etc/sarg/" +} diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest index a22fc7343293..266bcc8cda60 100644 --- a/net-analyzer/thc-ipv6/Manifest +++ b/net-analyzer/thc-ipv6/Manifest @@ -1,12 +1,8 @@ -AUX thc-ipv6-2.1-Makefile.patch 1233 BLAKE2B b9b9b19476e030b0ad87ca6a85715e7cf64fb67203aa3f67f7d354728c875b2c43890be877fb424a0b4507dd458106a4bfb72053d9aceabbd94534a6adb76a95 SHA512 14880d1982e935eba874c87fb7bab7859246d4ba1539e3cbfc06fe5850c3076f99d4bdd59cd968e7d5c1386062c4a081f3a0a11d61e9f66ea90177e78c22e307 AUX thc-ipv6-3.0-Makefile.patch 465 BLAKE2B 42194c35ace6760ed17c454bbf4ae01a70618297efed865d93ec645514ef34734668fde6df1139727ca317769bc2e221af88b8084811529c3372aab6db908c0b SHA512 2a0a0d21ad3147a772df5a52ea425edbf2681256240e3570976268b5d9cf19f315a014b304932161219813c65dff95a2644070383121595ec3f2adabbb116093 -DIST thc-ipv6-2.3.tar.gz 176918 BLAKE2B fc3c06324b25b8b2ff70a569955d584e0a4c2691b92b21691a2c9098e5c1bf2e3354c101fe48b2174fd803e3f051af32b5c3293745cbe2ee83f23a84c5379c19 SHA512 d4eff19a0a87ca828d7cf06e9ef9c1e542c0a527949681d08730445e40e90608aaebf778b8ab1cd8d3adeb44fb8cac79607e27704baddf703355a0058ebce4a8 -DIST thc-ipv6-2.5.tar.gz 262015 BLAKE2B 91dac7cfa86c3afb59fc34c2fad648a1ef2402b0fdb1cf80aa94bfc6affd90533c7d96b72e0c9f7551f125b0f8cdeda87232fbc3fa408346c64f099ca31adea1 SHA512 7fc2dda9d83d25c61b3dc8576679e06866fd1144ca39d5e0b43bbd3c4da2583ec37ca901a43a817bdeec19226d3e252624d684f31bc7e94e08bdd811d5fb5466 -DIST thc-ipv6-2.7.tar.gz 661592 BLAKE2B 64b5b8779f25c111bb132e30242da8563dde687f4a88f902d8d72239efc5982613a148a38bfb3adc1a770bdbac20554832c5c3b95a57e5a9512629a225a97257 SHA512 0863ff36109e048a45ec220b98f0e2cf62b7214edcab4afa27a89fc5c0e41469f7e5733efeb56ed0d00cffcf57ceed3d7d32d813e8081d39f1a21e2646e0a0f3 +AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e DIST thc-ipv6-3.0.tar.gz 667859 BLAKE2B 6fa4f697bf316c3b9730b58e35c3d8ac6910c0e063751037a0900aa459c128c5de9a07e4912025dd6eebb92061a7cc48a6e2e2a0b5d7d53b339e4d5416e4fdf7 SHA512 969ebbf4da4514cb83e3abcff637f7ba301c4f072f1f983b3cd3cfd3b0643b55af6eacca3c76e39e11ea9ef6e465be03dfa7ce1d6c988cabbd42cdd95d1e2552 -EBUILD thc-ipv6-2.3.ebuild 776 BLAKE2B 3a418e01562d970b7bf7326230fa7662867c02d04d9ad8190540732f7da762497c11c7915ab8dab7522d40b71ce9beacc62f665c01ff226cd2cb0657836b0349 SHA512 9f5c13cc7553c95652e6171ea32924a073af5949a616179c1571e35d9f6224728ab39df431a8ea7e9140babcfc94cc00a4025109debc501897cb03d5e47d3911 -EBUILD thc-ipv6-2.5.ebuild 777 BLAKE2B a620af86d8e84e37afac0ece467a2c60afdeb1d054a699ab9e92b33197eb1843ae95a63a0a3a53163f55c12b01df096cd1bb720ecfeb0f9428d7d2c4333708bb SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5 -EBUILD thc-ipv6-2.7.ebuild 777 BLAKE2B a620af86d8e84e37afac0ece467a2c60afdeb1d054a699ab9e92b33197eb1843ae95a63a0a3a53163f55c12b01df096cd1bb720ecfeb0f9428d7d2c4333708bb SHA512 67af189268fe5e6fbb99cd6dc31d54706890ecba5ee8ba33dd5010a1fe7fd152c7fd9315725b2f0ac713ad683bac846cfb36f46ed98331b4f5e40156928cc3f5 -EBUILD thc-ipv6-3.0.ebuild 1130 BLAKE2B 3f8d3b7abb54405d3b9755c300d27f1ad098109bf264d1480fbeb2b6188b88179dda12cbfb9e44e361a3acc4347765a5abec8c925b85d44c04d41850952039d2 SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a -EBUILD thc-ipv6-9999.ebuild 1130 BLAKE2B 3f8d3b7abb54405d3b9755c300d27f1ad098109bf264d1480fbeb2b6188b88179dda12cbfb9e44e361a3acc4347765a5abec8c925b85d44c04d41850952039d2 SHA512 ef2f809e3348f222fe2f01d81202f26a4d119209256ab6d27148c98f04bd896740b54397ff64d60b4af7eee36d20a906ceef831d14a0d567e951cf9f2e78fe1a +DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441 +EBUILD thc-ipv6-3.0.ebuild 1172 BLAKE2B 24e8c7bc51f3abefdd752003f9bc32da61a83e2af7863afd2ee711a4a52ead7f27ecdf7855ccfa5d9803b763bd233d54bc2f5786f75cfd0ba2dfbd5b88c4f648 SHA512 f8d0288bbfc765ff2f838bb7a402e4c7d15384bc23b34d4a43bb20071b6e2f6f8410e8803d3006ae978235002ee536c6e1551e808d9e31cbce94c85e8970c616 +EBUILD thc-ipv6-3.2.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0 +EBUILD thc-ipv6-9999.ebuild 1167 BLAKE2B ccc13cadfe360838172cb55255226715c2b8698822e1db045ce32dc001e610224a8a7516d17ad3e562586c3d71dbbcd66acf842b8ee5c181c9d8d86bc0fccace SHA512 01c36f2a68a61c1172e2d346a0f684bec784dc6dd580e4d6fcbbb584819ba073e03d92a472b3fde9fee30498dbf552e002295680c01c92cf2070a19b174f9ce0 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch deleted file mode 100644 index d7b42147ae1e..000000000000 --- a/net-analyzer/thc-ipv6/files/thc-ipv6-2.1-Makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- thc-ipv6-2.1/Makefile -+++ thc-ipv6-2.1/Makefile -@@ -4,7 +4,7 @@ - - CC=gcc - #CFLAGS=-g --CFLAGS=-O2 -+CFLAGS?=-O2 - CFLAGS+=$(if $(HAVE_SSL),-D_HAVE_SSL,) - LDFLAGS+=-lpcap $(if $(HAVE_SSL),-lssl -lcrypto,) - PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_router26 flood_router26 passive_discovery6 dnsrevenum6 inverse_lookup6 node_query6 address6 covert_send6 covert_send6d inject_alive6 firewall6 ndpexhaust26 fake_pim6 -@@ -17,10 +17,10 @@ - all: $(LIBS) $(PROGRAMS) dnssecwalk dnsdict6 thcping6 - - dnssecwalk: dnssecwalk.c -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - - dnsdict6: dnsdict6.c -- $(CC) $(CFLAGS) -o $@ $^ -lpthread -lresolv -+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lpthread -lresolv - - thcping6: thcping6.c $(LIBS) - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) -lrt diff --git a/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch b/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch new file mode 100644 index 000000000000..7873563b2377 --- /dev/null +++ b/net-analyzer/thc-ipv6/files/thc-ipv6-3.2-stdint.patch @@ -0,0 +1,10 @@ +--- thc-ipv6-3.2/dnsrevenum6.c ++++ thc-ipv6-3.2/dnsrevenum6.c +@@ -17,6 +17,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + #include <string.h> + #include <strings.h> + #include <string.h> diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild deleted file mode 100644 index 0cf3cf3241d1..000000000000 --- a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" -HOMEPAGE="http://freeworld.thc.org/thc-ipv6/" -SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-3 openssl" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND="net-libs/libpcap - ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch - if ! use ssl ; then - sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile - fi -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install - dodoc CHANGES HOWTO-INJECT README -} diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild deleted file mode 100644 index 4b3cd8777b52..000000000000 --- a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" -HOMEPAGE="http://freeworld.thc.org/thc-ipv6/" -SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz" - -LICENSE="AGPL-3 openssl" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND="net-libs/libpcap - ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch - if ! use ssl ; then - sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile - fi -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install - dodoc CHANGES HOWTO-INJECT README -} diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild deleted file mode 100644 index 4b3cd8777b52..000000000000 --- a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" -HOMEPAGE="http://freeworld.thc.org/thc-ipv6/" -SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz" - -LICENSE="AGPL-3 openssl" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND="net-libs/libpcap - ssl? ( dev-libs/openssl )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1-Makefile.patch - if ! use ssl ; then - sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile - fi -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install - dodoc CHANGES HOWTO-INJECT README -} diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild index 5151e3d3ceca..d4aee56ff488 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,6 +24,9 @@ DEPEND="net-libs/libpcap ssl? ( dev-libs/openssl:* )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" + "${FILESDIR}"/${PN}-3.0-Makefile.patch ) + src_unpack() { if [[ ${PV} != *9999 ]]; then default_src_unpack @@ -33,15 +36,13 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch - sed -i \ - -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ - Makefile + sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ + -i Makefile || die if ! use ssl ; then sed -e '/^HAVE_SSL/s:^:#:' \ -i Makefile fi - eapply_user + default } src_compile() { diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild new file mode 100644 index 000000000000..a0934cf80b9a --- /dev/null +++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +[[ ${PV} == *9999 ]] && SCM="git-r3" +EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" +EGIT_BRANCH=master + +inherit eutils toolchain-funcs ${SCM} + +DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +HOMEPAGE="https://www.thc.org/thc-ipv6/" +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +if [[ ${PV} != *9999 ]]; then + SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DEPEND="net-libs/libpcap + net-libs/libnetfilter_queue + ssl? ( dev-libs/openssl:* )" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) + +src_unpack() { + if [[ ${PV} != *9999 ]]; then + default_src_unpack + else + git-r3_src_unpack + fi +} + +src_prepare() { + sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ + -i Makefile || die + if ! use ssl ; then + sed -e '/^HAVE_SSL/s:^:#:' \ + -i Makefile + fi + default +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="/usr" STRIP="true" install + dodoc CHANGES HOWTO-INJECT README +} diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild index 5151e3d3ceca..a0934cf80b9a 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ SLOT="0" IUSE="ssl" if [[ ${PV} != *9999 ]]; then - SRC_URI="http://www.thc.org/releases/${P}.tar.gz" + SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -24,6 +24,8 @@ DEPEND="net-libs/libpcap ssl? ( dev-libs/openssl:* )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) + src_unpack() { if [[ ${PV} != *9999 ]]; then default_src_unpack @@ -33,15 +35,13 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-3.0-Makefile.patch - sed -i \ - -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ - Makefile + sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ + -i Makefile || die if ! use ssl ; then sed -e '/^HAVE_SSL/s:^:#:' \ -i Makefile fi - eapply_user + default } src_compile() { diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 1607bef35e89..8fe15369ca0b 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -5,8 +5,8 @@ AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f92022 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716 DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433 -EBUILD wireshark-2.2.7.ebuild 6439 BLAKE2B 86d89c85ae317328c1ab3fdead659c4a70ee10ca1ddef1d821752ba0a89c3d8cfcea65ceff744e3deb32dcd9b2a6126992bb0664cd6e56a969baa42e37cdae9a SHA512 19547b52dd4f3571a17c954e2d3158511e0abde89632b4b370b2d5ced306b42bf08d9eeae8747651738bc2ebe38f81c0c7193e7992a8660ac61b0c7e205c830a -EBUILD wireshark-2.4.2.ebuild 7337 BLAKE2B 64d920110b5c8b15591d3b13f49b9580f737fec9d3e6debd40635b1fe318719a2a26f34f4a52537f12d4e3cf78126909187e66e263364410c84af74f3809037f SHA512 8e77633581947acc961ff073d9f117326497ff6cab113a26fccd3d8931b231ddcd62b6b8a704e175d2546b6af15d0fa831407c99fdf17d96de24afc470c35439 -EBUILD wireshark-2.4.3.ebuild 7302 BLAKE2B a5d5c0260b17d1a443980170a095c989a583dd37a89cae29184823acee3c8588486245a0d6c364452a99f32437d18d739377d0c13a0a5cf109af70f42498e042 SHA512 c59b60ad2c4b7d1a3978d9117cd82203ee5e81638a1d2bfbfa2e97661958926dacb3b9234fbc6dfbb2c062116e31ef1dd08409270dd035fa1900b0b39fc46156 -EBUILD wireshark-99999999.ebuild 7217 BLAKE2B ad176fcc18764982eacd5442529f646522c94321d3d5940de551dc20ef324f0714028839aa5cff633572bfdc526bbe6f61605e1930266c2c47eb52729e900b42 SHA512 6ce954d8e03a0a76a17bf9560477126d5b61f5eef49c078a3383ff6ab7da375e0e1770ac440458c4a8b6e28fc325ee9d3ab21894ba31cf8b02bdd5a2e22c5396 +EBUILD wireshark-2.2.7.ebuild 6481 BLAKE2B 167c80ea9d3f41234ec9324d37ed3886776fac88863fd47e264eebc35014cc1c8da5c191da741d2fa2d8d7239eb8de649819c544deed346102627bc723e5ae29 SHA512 f7c45d28f9b5dd2a10b1575e4f9d071e435dcd34d6b7638ea2d8fc0ec3ca7c8ac4e8d73d23b2bc093c623b87e32b25ac36d80ca0d309daa32a18ebe5813529bb +EBUILD wireshark-2.4.2.ebuild 7379 BLAKE2B 6b2e91ce48323c78b8182774e87140e8f1b6db3187074d11d671ee3597aae4e6ba1a487458e144ece58a69bb89e2d254a73f4809714c0b5038bd488ca0a982f1 SHA512 219ada160e01d499ff48ec40e161a64ffc0e709169fafccf41d6b428ee10eb00e34c0d2db8198f151c893a425c9781583eb56f6216f3162c2e87dec63d0d8fcb +EBUILD wireshark-2.4.3.ebuild 7344 BLAKE2B 640d8fdc278d1a7a0b8012872c8ffa92089074a2dd78908c51eae118d012a537567d0d2b0f66f392e29f89947ee01960819b0472694820ef06a0d569ea32ecc2 SHA512 7ca6ff0d6dcc439894d004e99a4c8975e9b36cd0fda5e8af17b45ec5cc5f1721ddae52bea9953335d02875cb6c7f6532acff78edfa13134d871f930a915cdfe2 +EBUILD wireshark-99999999.ebuild 7259 BLAKE2B e6cd9d0222161c4280dbd722bf159e91b4659ab52eb9b3e0c549715734a1dcc610cebe9e22c4e5a3bd170457655160c88d5dcf4f8aac67a076d1c6b9f17f3a21 SHA512 edbf3a090c9af2531e9f0a4735ed38ed8e56b5fa2eb727a4866cfe3b6573846c24fa2ef8c67c087d4a768d3d38b8085f80d35c0981b75e9cb363ca1ca37bb718 MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5 diff --git a/net-analyzer/wireshark/wireshark-2.2.7.ebuild b/net-analyzer/wireshark/wireshark-2.2.7.ebuild index e28e46471220..dcdf77d1de68 100644 --- a/net-analyzer/wireshark/wireshark-2.2.7.ebuild +++ b/net-analyzer/wireshark/wireshark-2.2.7.ebuild @@ -48,7 +48,10 @@ CDEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 - media-libs/speex + || ( + media-libs/speexdsp + <media-libs/speex-1.2.0 + ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) diff --git a/net-analyzer/wireshark/wireshark-2.4.2.ebuild b/net-analyzer/wireshark/wireshark-2.4.2.ebuild index 77aa34a9b99e..e886059b19aa 100644 --- a/net-analyzer/wireshark/wireshark-2.4.2.ebuild +++ b/net-analyzer/wireshark/wireshark-2.4.2.ebuild @@ -51,7 +51,10 @@ CDEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 - media-libs/speex + || ( + media-libs/speexdsp + <media-libs/speex-1.2.0 + ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild index 5fbf5cfe70b6..f006ba339014 100644 --- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild +++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild @@ -52,7 +52,10 @@ CDEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 - media-libs/speex + || ( + media-libs/speexdsp + <media-libs/speex-1.2.0 + ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 32ecbd608dd8..9d9fca8d8a03 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -52,7 +52,10 @@ CDEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 - media-libs/speex + || ( + media-libs/speexdsp + <media-libs/speex-1.2.0 + ) x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) |