diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
| commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
| tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /net-analyzer | |
| parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) | |
gentoo resync : 05.02.2020
Diffstat (limited to 'net-analyzer')
188 files changed, 3220 insertions, 1147 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz Binary files differindex 9deb27822add..b2c39895e38e 100644 --- a/net-analyzer/Manifest.gz +++ b/net-analyzer/Manifest.gz diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest index a1e4a6763a55..06a0f67b17fa 100644 --- a/net-analyzer/angst/Manifest +++ b/net-analyzer/angst/Manifest @@ -1,4 +1,6 @@ -AUX 0.4b-libnet-1.0.patch 518 BLAKE2B ec4062d1d1ac2227203e5ed0cd9b673fd879691b4522c12960e92a8f4c26ef41552b9adefb7b84b202efa3119e30f5ccb85681f0e108cabd390ad589a3ba71ea SHA512 59164bff22aa252b414820fd47fa06059be5ab2587236c378a08ab7e576bd41947d66ea872e673707586893ae61117aa4320baf583d2a30f603b53a497b49032 +AUX 0.4b-flags.patch 551 BLAKE2B f8abf1a56addf80157155dfdf1cad5f2fc49d9b554c1e65baf69a64ef90c5337522635878704fe867f51e9dcca4b46b45a9e2a6a16c36a6bf92709d32c4f3494 SHA512 4552e16344bfa8fab9952c55891ea1ecbaaeec38df4fa459959f7db54b7197282b8d6436f250002c05db5abcc75c640f87bdff66261812afa82ef8f2b6e96965 +AUX 0.4b-libnet-1.0.patch 372 BLAKE2B 56df2ea477503005c28c32bf852675fe428beb07334bce78d467fbe3977c1aec82fee34935157160fbb9563fb2a1b385e93b28e76a030496e07c86b052ef4d81 SHA512 aa135c5e1e0daf54a2ff72eff465f0f3f26e06bf7da76fca48ffb145ebfc10e09d29fa45ae0c84009ee2535a06d093e0fc0936993ab9034025e1c68136168b25 DIST angst-0.4b.tar.gz 13909 BLAKE2B f08b9e489eaec5e2006ad8d84dc7586c6fb57c3d8585fb5cd769591ed56f4e5a4c2e0bdaf0ba02b40370ea99146ebfa02611d64b043949b27f6dfcbbdd2b16e5 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449 EBUILD angst-0.4b-r2.ebuild 848 BLAKE2B bb06b8af7b4b33859d2d55012cce753da80bf776329e8b875ed30cdd878c19c4be78fdcad8f008d09ed405a360fe726bc2ea0553218e6ff99e8f0d7cefbf80a8 SHA512 7ddd27ba2be944a552127e8fb7f03a7e35a5a2e919d0b4c582eae4360fa9dfca3e2a8e8f65daa3bac5afc72a074e9fedca0ba39774a9f0c836a9ea0001fb4a3b +EBUILD angst-0.4b-r3.ebuild 836 BLAKE2B 65636b593221b7d9e05b9842538b89122bf13ac87d0293bed20d3500b7db6cb48c19cf7b619ee325e7ff0467fe7929a6a98bc475183114c8e1d8841adf43b440 SHA512 40d259f2606c32d205c130c85df499ca36281c63684ef3d394d40fe7f19f7423f4922e2c2ffe99a93dc21e753f1367b217b0ce3f04134cc54eac96926664111b MISC metadata.xml 471 BLAKE2B 3d6f52d876f3d620414906524cc0f84a46b33ef28add51fdf4a45dbdba740862f175d742f8b6c8cf9daa1657c33c3a3d38aeb4c9586c5a2b0e52fd509e75ec08 SHA512 0632876623160e4192bdf280011de0006adec537ad7065da350fde0a0b338b264f60cd6acdaeb439316d28ac84bfe100527b532c20a65606d1bb91ba415a82b4 diff --git a/net-analyzer/angst/angst-0.4b-r3.ebuild b/net-analyzer/angst/angst-0.4b-r3.ebuild new file mode 100644 index 000000000000..8054d460f586 --- /dev/null +++ b/net-analyzer/angst/angst-0.4b-r3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="an active sniffer that provides methods for aggressive sniffing on switched LANs" +HOMEPAGE="http://angst.sourceforge.net/" +SRC_URI="http://angst.sourceforge.net/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug" + +DEPEND=" + net-libs/libpcap + net-libs/libnet:1.0 +" +RDEPEND=" + ${DEPEND} +" +PATCHES=( + "${FILESDIR}"/${PV}-flags.patch + "${FILESDIR}"/${PV}-libnet-1.0.patch +) + +src_configure() { + append-cflags -fcommon + use debug && append-cppflags -DDEBUG +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" \ + -f Makefile.linux +} + +src_install() { + dosbin angst + doman angst.8 + dodoc README TODO ChangeLog +} diff --git a/net-analyzer/angst/files/0.4b-flags.patch b/net-analyzer/angst/files/0.4b-flags.patch new file mode 100644 index 000000000000..1021faa5b539 --- /dev/null +++ b/net-analyzer/angst/files/0.4b-flags.patch @@ -0,0 +1,20 @@ +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -5,7 +5,7 @@ + # + # $Id: Makefile.linux,v 1.6 2001/02/08 13:44:12 argp Exp $ + +-CC = gcc ++CC ?= gcc + INSTALL_DIR = /usr/bin/install -c -o root -g bin + INSTALL_SBIN = /usr/bin/install -c -s -o root -g bin -m 555 + INSTALL_MAN = /usr/bin/install -c -o root -g bin -m 444 +@@ -21,7 +21,7 @@ + all: angst + + angst: $(OBJS) +- $(CC) $(CFLAGS) -o angst $(DEFINE) $(OBJS) $(INCLUDE) $(LIBS) ++ $(CC) $(CFLAGS) -o angst $(DEFINE) $(LDFLAGS) $(OBJS) $(INCLUDE) $(LIBS) + + clean: + rm -f angst *.o missing/*.o *.core core diff --git a/net-analyzer/angst/files/0.4b-libnet-1.0.patch b/net-analyzer/angst/files/0.4b-libnet-1.0.patch index b78243a1a187..a2bcf1a18696 100644 --- a/net-analyzer/angst/files/0.4b-libnet-1.0.patch +++ b/net-analyzer/angst/files/0.4b-libnet-1.0.patch @@ -1,12 +1,12 @@ ---- Makefile.linux.orig 2003-08-19 01:22:26.737300264 -0400 -+++ Makefile.linux 2003-08-19 01:22:26.745299048 -0400 +--- a/Makefile.linux ++++ b/Makefile.linux @@ -14,2 +14,2 @@ -LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap -DEFINE = `libnet-config --defines` -DLINUX #-DDEBUG +LIBS = -L/usr/local/lib `libnet-1.0-config --libs` -lpcap +DEFINE = `libnet-1.0-config --defines` -DLINUX #-DDEBUG ---- angst.h.orig 2003-08-19 01:22:26.741299656 -0400 -+++ angst.h 2003-08-19 01:22:26.751298136 -0400 +--- a/angst.h ++++ b/angst.h @@ -12 +12 @@ -#include <libnet.h> +#include <libnet-1.0.h> diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest index 8f768aa4a0a2..0acbb52b9dd5 100644 --- a/net-analyzer/apinger/Manifest +++ b/net-analyzer/apinger/Manifest @@ -1,3 +1,6 @@ +AUX apinger-0.4.1-fno-common.patch 193 BLAKE2B c13aa8e654dc58b9802a4b2b56b2bb4f9004a5556c46997dcee1e028b67d226057d9e09e779f91d08629bb5ff447ed6cc70739d8bcd5da39b5e59fa3bedf3e38 SHA512 f80653f38f9d4e5d6196f3c4d7643c8b9ed4198b56125a1348ea458faba7e202ffce8d36b5cc58223b76bbb5a4957405b4087d26cc67e203b55be7fe1eb1bf7a +AUX apinger-0.4.1-stray-backslash.patch 433 BLAKE2B 99eb5ad5765fdc0f12aee3a1a537579d222a8ea986305710841bcf7a9a7dc84b834357d6edbde4be39e89e8afa0978175fb0f007123bc0d857f1376e91ccf749 SHA512 f84c0b789ca3918b5f8679553448f0d4f4cbf018c46b86b388c8aa05cd656b675d3edf93fba042940143f5b53ce4f1fa711b7978896870d42a2ef64e885e0924 DIST apinger-0.4.1.tar.gz 26328 BLAKE2B 72eb19c043642dc00e02f24bfd8f3f9f704cc8a2fb5b5937756706db561dd7dc5173706c7ede73dde778964a516b7b138fe664c243db5351ac440fc80244c843 SHA512 b8a67149f43da5b6e240dee97315c31a3e6257f1de70da81a6aa63d1e1d7d5bff0b54abe5085a57e90eb7789b7fa8b83c09a51411a6247a81b6f99de3d83120f +EBUILD apinger-0.4.1-r1.ebuild 733 BLAKE2B 51db5b417614c778eb4ec100eed95ddac2d8049756cba6e45a97be97a11126a969a3d4f9355cd93a74f1b75cc92cafbf16dac4f37238adfae4b85128197d2fc7 SHA512 23c71ab5e2d1582b0b0f69b7044d1c6a5425f98bfa60a5a874ceb1e81764520ce96ab73e224e9c98a4fa0af519a9f9d648477c7bf8bcf0d42188c3c390b7e07d EBUILD apinger-0.4.1.ebuild 746 BLAKE2B 99207dcc1472f12e2f777073b5a836054818e68ea9c85d21e78ed434ca2628258c6ea6193c36d0dc73a4e80178e21db9d61ea6a08bfa7b04cf47459ca8b9d803 SHA512 c7741f08b76a7e101d17f790d0353144346f29739081f873514e278480326551d722e5c5361659413f26a4cb27a250a253bcf72be2690eb674013a0e7d5ef2e8 MISC metadata.xml 359 BLAKE2B 929365ca07ce887876998e51742a78e8f4a9250c42367ad458458d450b4f08ccc91d510bd6269b916f788ffb59c3ec61f0792722c83cfd54020b2913b7ea8773 SHA512 d4166ecf10d6c588adc68ccd871986e7de28191c76a18b45922925552d30534e1631b61974e21a477f9c9facedf698a964256f08b04ad3e0bbdfec87c5246d8b diff --git a/net-analyzer/apinger/apinger-0.4.1-r1.ebuild b/net-analyzer/apinger/apinger-0.4.1-r1.ebuild new file mode 100644 index 000000000000..9126a208502a --- /dev/null +++ b/net-analyzer/apinger/apinger-0.4.1-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Alarm Pinger" +HOMEPAGE="https://github.com/Jajcus/apinger/" +SRC_URI="https://github.com/Jajcus/apinger/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + sys-devel/flex + virtual/yacc +" +DOCS=( AUTHORS ChangeLog NEWS README TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-0.4.1-fno-common.patch + "${FILESDIR}"/${PN}-0.4.1-stray-backslash.patch +) +S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}" + +src_prepare() { + default + eautoreconf +} + +src_compile() { + emake -C src/ cfgparser1.h + default +} + +src_install() { + default + insinto /etc + doins src/${PN}.conf +} diff --git a/net-analyzer/apinger/files/apinger-0.4.1-fno-common.patch b/net-analyzer/apinger/files/apinger-0.4.1-fno-common.patch new file mode 100644 index 000000000000..d74dc1c66f27 --- /dev/null +++ b/net-analyzer/apinger/files/apinger-0.4.1-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/apinger.h ++++ b/src/apinger.h +@@ -99,7 +99,7 @@ + void *target_id; + }; + +-struct target *targets; ++extern struct target *targets; + + extern int foreground; + extern char *config_file; diff --git a/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch b/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch new file mode 100644 index 000000000000..61db76fb9232 --- /dev/null +++ b/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch @@ -0,0 +1,13 @@ +--- acinclude.m4 ++++ b/acinclude.m4 +@@ -39,8 +39,8 @@ + [$jk_inet_includes + $jk_icmp_includes]) + +-AC_CHECK_MEMBERS([struct icmp.icmp_type, struct icmp.icmp_code,\ +-struct icmp.icmp_cksum, struct icmp.icmp_seq,\ ++AC_CHECK_MEMBERS([struct icmp.icmp_type, struct icmp.icmp_code, ++struct icmp.icmp_cksum, struct icmp.icmp_seq, + struct icmp.icmp_id],[], + AC_MSG_ERROR(struct icmp not defined or not compatible), + [$jk_inet_includes diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index d390e17b5f1c..9311fb7dbb06 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -1,8 +1,10 @@ AUX argus-3.0.5-Makefile.patch 437 BLAKE2B 95d853328925c46dcf9ff3edc98be0ce581cf9349f75f94cfb3eb122b9e78c353187ec5a26d646468df55bbd1d63106f33908f0c8395d4b8f08addaa5e5e3916 SHA512 cec8fae0027bcd48bf878781ed5b0352a1501cdd6a0470a76b6346aab3587b275d877434e1a3feddeebe3f4e166d42d07fd007a4b60cbef15d29076c188993b7 AUX argus-3.0.7.3-DLT_IPNET.patch 538 BLAKE2B b909831f15f56d34281d8001dd525a0e8f3ea76ae5449c682b7727237ad8a2ee6d55d6da8f45d34581f393464ae9c3a4a5f74aad7dcecee0f3c5378581d3fd92 SHA512 3f52c9531675713177cecb208d4b9c11e26ce60c4fa2e932520969dcbf74f37979443c2ad5039e61b803385058ea6a45e19afeed9f4b815a4dbf43ee5628621c AUX argus-3.0.8.1-disable-tcp-wrappers-automagic.patch 591 BLAKE2B 2a04cb018d385820e6bf7fcf2bcf20abf92bd3c43e11dadb9a0c4e2727d60dcc90aa1eacdc220ed3ce23ecec811eb1e1f8dc5156104072d965c2459ae1fd82d7 SHA512 325cdc2c18ccf8665db11ab52f500395a0a76660c4c6d2620c8500a966e5f432c77d53b88549825bb90378929c6be47e35db792b59a9e74acec45a8c8ff73037 +AUX argus-3.0.8.2-fno-common.patch 929 BLAKE2B 9fee5b11eb3d0436547e6d26fef654e6c9bfc2929cac2cfb411710ff28fd4110e5a90ebf02f46f6b71f11ba1d46d0164c8e41ac32e4953e5267bc7361e46a357 SHA512 1f5501095f712dc3107753849e91736a15768060b71f18dbe2ef9c0c4015ecc78481fc97d05fe821a4191bb9b04346f91734b75625ef967685f65a94f5859475 AUX argus-3.0.8.2-rpc.patch 1425 BLAKE2B c71d72db164a343114ac39f754cdd7a9d19bf4338ea809966c5de1de5a71d6c339a11021207c1c20f5029052e6ce7cc43298e227574a96369a9fee1c40adc3e2 SHA512 61136d8d736429a4e291f0a92e47bb02ec5706e0e9e8b68db4e5213baebff064427733edd054d163e582ed0288209d008b38b7f1ab77f54b1968f246b8c6db77 AUX argus.initd 365 BLAKE2B 1b7841cd53679b10444a1da1af0f0226bc84c08e9e5427f964622c03f4a8661997cd2b31db35d804f7373ca89ca4eca006662c6d08d26d6b65d13c209ae92aa0 SHA512 54cbc2a0d92e5d0813ff6aecbf5f6d083e7de708a974af8aa90ce112e2d697b53b00e7918405973f487b2d9733bd2326a083ed13b52ee8dbbda4b06b73d95231 DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 EBUILD argus-3.0.8.2-r1.ebuild 2068 BLAKE2B 4abc49f4b8e0e3d9053a6914056c7c6ea2178f385360fd2b2eea2f41ce3b36d72f25cead041bf91a2c56e491a44bf29f1dfad5870cb189a85ef6b7facca04ba1 SHA512 67e0564bb467a658444508d3898c0f6e4b002c8ce6d0baa51c7de81caa5227eece17b402da8f79d4ffb3b50728a9c202ceabaec67d45a68641cf6b108d2c5e3a +EBUILD argus-3.0.8.2-r2.ebuild 2166 BLAKE2B cfd0204916f57849156ed13adbcfa57732d93260e0454cc85d087b18e11e05ecb555f129a801d0cdecbe4eb5919fceb7bdf9e29714882eb1929230941b7d1ecc SHA512 deab478d98123dd96ab98db4605f075430a26e1c0f757f81524e2788c8dbc5b20bb0f869796d532c64e17699a58678abee44c70e00ace713e462bc5019c6731c MISC metadata.xml 468 BLAKE2B ce716483a5c126030c044618343341e853b367516f0fb6142b5cf7140738a5950eec5fcc514a856dd119310d7a1e05adab9f4ac0e802e01ee873a6c81f14a2e4 SHA512 64c97706da7a48ebaf5d3bd9aecdd11b1eff9516d5e99993ba65217b169c503bb509fdf19ade828925c85a82573b186aab89991b5870161681c42985a244771f diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild b/net-analyzer/argus/argus-3.0.8.2-r2.ebuild new file mode 100644 index 000000000000..73a6fd17e88f --- /dev/null +++ b/net-analyzer/argus/argus-3.0.8.2-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools user + +DESCRIPTION="network Audit Record Generation and Utilization System" +HOMEPAGE="https://openargus.org/" +SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="debug +libtirpc sasl tcpd" + +RDEPEND=" + net-libs/libnsl:= + net-libs/libpcap + sys-libs/zlib + !libtirpc? ( sys-libs/glibc[rpc(-)] ) + libtirpc? ( net-libs/libtirpc ) + sasl? ( dev-libs/cyrus-sasl ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) +" + +DEPEND=" + ${RDEPEND} + >=sys-devel/bison-1.28 + >=sys-devel/flex-2.4.6 +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.5-Makefile.patch + "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch + "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch + "${FILESDIR}"/${PN}-3.0.8.2-fno-common.patch +) +S=${WORKDIR}/${P/_rc/.rc.} + +pkg_setup() { + enewgroup argus + enewuser argus -1 -1 /var/lib/argus argus +} + +src_prepare() { + find . -type f -execdir chmod +w {} \; #561360 + sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ + -i argus/argus.c \ + -i support/Config/argus.conf \ + -i man/man8/argus.8 \ + -i man/man5/argus.conf.5 || die + + sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ + -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ + -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ + -i support/Config/argus.conf || die + + default + eautoreconf +} + +src_configure() { + use debug && touch .debug # enable debugging + econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) +} + +src_compile() { + emake CCOPT="${CFLAGS} ${LDFLAGS}" +} + +src_install () { + doman man/man5/*.5 man/man8/*.8 + + dosbin bin/argus{,bug} + + dodoc ChangeLog CREDITS README + + insinto /etc/argus + doins support/Config/argus.conf + + newinitd "${FILESDIR}/argus.initd" argus + keepdir /var/lib/argus +} + +pkg_preinst() { + enewgroup argus + enewuser argus -1 -1 /var/lib/argus argus +} + +pkg_postinst() { + elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" + elog "possible that the init script will fail to work." +} diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch new file mode 100644 index 000000000000..66f950d0c04d --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch @@ -0,0 +1,45 @@ +--- a/include/argus/bootp.h ++++ b/include/argus/bootp.h +@@ -45,6 +45,8 @@ + unsigned char bp_vend[64]; /* vendor-specific area */ + }; + ++extern struct bootp *bp; ++ + /* + * UDP port numbers, server and client. + */ +--- a/argus/ArgusUdp.c ++++ b/argus/ArgusUdp.c +@@ -40,9 +40,6 @@ + #include <argus_compat.h> + #include <ArgusModeler.h> + +-#include <argus/bootp.h> +-struct bootp *bp; +- + void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *); + + void +--- a/argus/ArgusUdt.c ++++ b/argus/ArgusUdt.c +@@ -40,9 +40,6 @@ + #include <argus_compat.h> + #include <ArgusModeler.h> + +-#include <argus/bootp.h> +-struct bootp *bp; +- + struct ArgusSystemFlow * + ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt) + { +--- a/argus/ArgusModeler.c ++++ b/argus/ArgusModeler.c +@@ -43,7 +43,6 @@ + + #include <argus.h> + +-#include <argus/bootp.h> + #include <signal.h> + + #include <sched.h> diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest index a1da80587ae3..a700c0d24704 100644 --- a/net-analyzer/arping/Manifest +++ b/net-analyzer/arping/Manifest @@ -1,7 +1,7 @@ DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2 DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2 DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282 -EBUILD arping-2.17.ebuild 720 BLAKE2B d519da4e3ed1674a47d53391641a7b23027b63dc738013c7721c1cd97f0ee772e46b285afad0014b34cd7199757abb499ab8255e43df01ffb2723c18b57c5d40 SHA512 c03e11c22b971862c4d1b95838d587977f70c3afaed5d3038b348d49ec83ecad2853d4da37146942876f2d35b0b653ef06a169051fdc61d0dd4c458ff5459b26 +EBUILD arping-2.17.ebuild 721 BLAKE2B 8b4f66ca6ca756ed0f3c67158f6d85cfff11136dd3a040bdd64c5a92b1941647ed93b76d39df5837bb5cc6d242d142d023a8cc79daa00e95134ee026c39a05db SHA512 ea3a398b3e582b5a14a2e9643e9ba386a3371c73da524a4ae7a98a21ab1c72fc79eb7d9ce616fc8647d88a06ae15fafcfb9dc5055fd31cee27f8a22017a28316 EBUILD arping-2.19.ebuild 729 BLAKE2B af75619dbd47a05ddd7956da56bac240eb19017df187f895ba5ecc74623bee988a2e256f330a0614dc3cde14226b9672aea3d20c56d7d6c09abda012f24b5a02 SHA512 4519008c8b2de9c878243cb07a78f5dd4166fdfb118289bd9ade85496ca9eb9658576ab99fe3243fdc2e1370ae97a041885830fb2acb17211d12e2f12c4ef74b EBUILD arping-2.20.ebuild 811 BLAKE2B 823c9a759cdfe2a831fca83d6e02dcfff9c4fac95af8c7f134809191414c896c1b5af1e4e5092fbc51bfd4531d09245081b925d5d07055af8f0c9a50338c235b SHA512 4a40d0e652c6384966946b2de7a983a26895c2e30158aa5581053eca20802b6339b778a49ec29d560fb5ede72d8f87b28dd6d0ea71bde7f9c2ae2c534eeb6f1e EBUILD arping-9999.ebuild 628 BLAKE2B 90f247f73d143e302004ac102e67baacf27385e1943d2e0bda9667aa8511fc3c5839b55738c4cce91bd649eaa51ba04d7face31680e561effd9e16db38f86753 SHA512 51046ede312bd8de290bb6c96bdea0aa2c95b2b6975af2bffc5147e3d82766b0f1d7528dd22c97eb838aadfc48b672927cc1a5a638b010105824d109aca4b12b diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild index d835ad002b19..ba98b7b1a18d 100644 --- a/net-analyzer/arping/arping-2.17.ebuild +++ b/net-analyzer/arping/arping-2.17.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest index 26c2122a4bae..461b6ea03e01 100644 --- a/net-analyzer/carl/Manifest +++ b/net-analyzer/carl/Manifest @@ -1,3 +1,3 @@ DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e -EBUILD carl-0.9-r2.ebuild 402 BLAKE2B 85081031c5702ebc649634359c5d57877d417c7dea26c00bd5b44b1e7e5edfb5b9917f796a3104af508c50a778362c7d0c064cb43ee3cc5eff2ec9bceb035886 SHA512 eb96c04461232cd7ca0da23825a0feaa88a08c2150e3552681bf10e8ceffbb5ce097eb6228f82db97521a0daae2cf09c75d61c742d95e2937024ef136ab26b8c +EBUILD carl-0.9-r2.ebuild 403 BLAKE2B 5da99348747895b206411612fdb640889fd847e039fd99a0ba3e4e45c6b98b26069618e69946d6591666b5de09b63482419354c8b5826eb6184237333e913edb SHA512 443493f48acf4fe4bacfed526f8a503c3ee43be89179b77e07942876cd0796ffeedee7b068d1fa539d1907126646efa7b3a868be566f3c137393ec40d2c33379 MISC metadata.xml 356 BLAKE2B bcdfa5dbbe63451ed8f27bfdcc926c60452ebf67fdcf486c487bb284b95c06f4baae460e7a6b607b698110175f2a21ad1fc702b3807ef53e2c6c40437bbdfb1b SHA512 e61b1bac117a325c4e96c7d8c594bd0de46379e573e8b89df72dfca572922807af29b2741c86be602d01856bed58bd369e72d65f0fef508d54001c00578d8637 diff --git a/net-analyzer/carl/carl-0.9-r2.ebuild b/net-analyzer/carl/carl-0.9-r2.ebuild index 38f658a30c73..2a253f333ee2 100644 --- a/net-analyzer/carl/carl-0.9-r2.ebuild +++ b/net-analyzer/carl/carl-0.9-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 x86" +KEYWORDS="~alpha amd64 x86" IUSE="" DOCS="README" diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest index 5f065856db30..60c8868c41bc 100644 --- a/net-analyzer/cloudshark/Manifest +++ b/net-analyzer/cloudshark/Manifest @@ -2,7 +2,7 @@ AUX cs_log_dir.patch 402 BLAKE2B 4605bc98eaa08729d8b622f212941dd7eb7b99654f2e74a DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86 DIST cloudshark-plugin-1.0.2-174.tgz 143067 BLAKE2B 629ce8ee1fc4f50945228f6ada55a6f4ef88c8aa52cdbccf851a97581d9a2939d4322933747c090aa9261c6bffc619d6f250fa2dfad6583f0830457165ceb8f1 SHA512 42445e67630b1bd2968f0836f625acb3792f22257de104ec0b90c59fa8d2096649eba2252cd6161ce57c8ff79095d52c5663d2fa018c650667896c9905e9dd7e DIST cloudshark-plugin-1.0.3-180.tgz 143381 BLAKE2B ed27e2a7102f72e12da9908160a365f511fc3ea568cb9d8b5a2796d3f85bb1c73ca5be7c82ad4de9abb42267ceef4739cad66e369b06a480c85a80b411470474 SHA512 765144e6a2c7ce17eaa05f8170216e08ccac224ba6c11750893ae5caa8f40a2b6bee883fd9be91fa800ad3b45dc42d2ec81e564aa573015a91a8537be8384c73 -EBUILD cloudshark-1.0.2.174.ebuild 1637 BLAKE2B f3bc7d47c1b48cf21cb24547227c4b9bae93b80ad9248741f0f21dc5468edb8bdccea96855552839e6c3f65817b372f9e1e8468ce489ce505ada83e93e331f98 SHA512 4602b794455e48c99edd96c84edb72630981e12e86ff73827d9a44336fda8514dca2f2c61b1ac02d237c1f6aa6a76dca6bf413f04e8c93fd4f2774d2731fbd91 -EBUILD cloudshark-1.0.3.180.ebuild 1634 BLAKE2B 063a8fe4b6e5ac021242d5762a70ffb7c0a7ab0ee4dc57480f107af8fe00bdd12de984c18c709b6a37a3a5b813432dc700b113a28b4dd856fae568f28c1cfa29 SHA512 9983487c7d5a65de2d3a38392d22eb7e33a1f1be8429e984781f5b4289909baa861f0662d4fa7a0febd075c3ee88ea99366f73c6c3026f68464a2e2069c10655 -EBUILD cloudshark-1.0.4.ebuild 1225 BLAKE2B b09293a7525b3433a605e19c25310e4a614301505a9dece1a44fdb8a473dfa3f640af5d2750ba5c56810d81f5449522f376084c2dcd1b03b26adeda54ec91425 SHA512 1eeec680d1631a708185fcf64b3e1fe44ef60fc7f32ae51a1ac064e2af09c4505026e65ae5cff03f3cd52d11c361a6a0d2bf053009e38b80f573edff07ded47e +EBUILD cloudshark-1.0.2.174.ebuild 1674 BLAKE2B dedf98fdde4cfb800cb2ef1360dc9ee92dd1b66386d1816c6a72571de7e4e136ead887116d4664becd753ace673f47438027a827376530d9ecd703fb50206a18 SHA512 303e58648779f332d5b41ec15f915d65799fd3da007c24b478813a26dc849e0257cb8a8d37952228b1a1048a850a76af29b0730b72ff941c9133238cfd366ea2 +EBUILD cloudshark-1.0.3.180.ebuild 1671 BLAKE2B e3524389c07ae4698131135775ee8ea2bfbe19f5cd819df361b55353f5d3282cdb7831d74864bbe5455a471604edcbcd741a855afd4cf13f087995151e090066 SHA512 12c8ccacbf8c7f25e5760b9541b6f32200a08267a7dfeaf8e8ab8586ced97b7770667feb9089d7571e77b5e7ff2b2538ce8fed1f30d50e0e7a205f7e29e585f9 +EBUILD cloudshark-1.0.4.ebuild 1262 BLAKE2B e43313f5c67e64091bbb681f1ff13e4e10def9b80ed55df1ec0d462239efe67a27fb22a314118d22878b0cad13f8ca8891d2e7ac56d28a64bb2434860777e54a SHA512 7fa81e8be152c47922e249a247e959e3518c85ff4ef47192a337a2b7dae5c7db8cbc994e302286782f65c7897b2369f095786be19d89ab5fe65575a822510dc7 MISC metadata.xml 339 BLAKE2B 449159f04e85fc4eebd7f95580b2e0f006d4927a5b7891c65fec216f329f2cd6d4ff7af02bf23a82b5925a80d17ed0295c712c3c1d945732e1ab0a77e91ce7ab SHA512 6f455d12f82e69560c68af083929907b4ba2d5389bdd7acc08725609bde578d8081245185a2c4f1571cf89c7693cbd49ce713ed4f4cb529f58758bdfa8b08272 diff --git a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild index 81f442abebfe..14e9a59b9b81 100644 --- a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild +++ b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit eutils multilib SV="1.0.2-174" DESCRIPTION="Easily upload your wireshark captures to CloudShark" -HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html" +HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" SRC_URI="http://appliance.cloudshark.org/downloads/${PN}-plugin-${SV}.tgz" LICENSE="GPL-2" diff --git a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild index 5ca1303bbd5f..2925d93b8e5b 100644 --- a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild +++ b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -8,7 +8,7 @@ inherit eutils multilib SV="1.0.3-180" DESCRIPTION="Easily upload your wireshark captures to CloudShark" -HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html" +HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" SRC_URI="http://appliance.cloudshark.org/plugin/${PN}-plugin-${SV}.tgz" LICENSE="GPL-2" diff --git a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild index 191d0601fc8a..c25a86e3f199 100644 --- a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild +++ b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,7 +6,7 @@ EAPI=5 inherit eutils multilib DESCRIPTION="Easily upload your wireshark captures to CloudShark" -HOMEPAGE="http://appliance.cloudshark.org/plug-ins-wireshark.html" +HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" SRC_URI="https://github.com/${PN}/wireshark-plugin/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest index 7d03e84ec26a..e4cb5baa151e 100644 --- a/net-analyzer/echoping/Manifest +++ b/net-analyzer/echoping/Manifest @@ -1,7 +1,9 @@ AUX echoping-6.0.2_p434-fix_implicit_declarations.patch 422 BLAKE2B be78c11c2665df1b9d1e9ef9f474974f73a6ea682d7db56ba69d014a9eef498dfc9a2c7a9affc66f3b72f0fb22dca38e070a68e7c0704073411d903e5eb61c8d SHA512 533a7da90d5ba39d4d4137d5e00e74b010cdf3ec957a46fdf39588e8b87e2d75382d14cc53f4b0b7c0aea029d5327353cd79975011c637390872bab8a3846be2 +AUX echoping-6.0.2_p434-fno-common.patch 2751 BLAKE2B fe623ef782dbefafc28399af331bc1e991f15734c63976b574b75dd3a26f5e62e63454d93a94609c5934fd4f456c0cc118f0f04565a87fafc8eb0155927e3b1c SHA512 cbc2bde26c4896cbef7249c884c56130458ce493597ff868009b088134873b5e5238323ebd9bea7d783782337688456184db7daffdb2ed9c0a188c5c09f1c731 AUX echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch 595 BLAKE2B 76363f96ff38ad793ef55707b59e102c7fac3c75a4437d51d32245f4e06539004cd7303884edf905c4f32d23c7e138ee9d3997c306f7a14167655c599d5f1709 SHA512 4bec1c8a77f17a163437dca9ce2ef49a355db041b08df7eb087352e03eede069f869e271d9414fc62d88a5e36687787e4719e7405f4b5ba96bbf8534af06ca52 AUX echoping-6.0.2_p434-gnutls_session.patch 492 BLAKE2B 4a3841f87c70147c120b2fb15227c18d18d2db38ae984306c17c83fcc6405ef98417de7c13e6c2b6c23454a27b7d846f98b327298ddff3c0489c5f53465c9b92 SHA512 99362748feb0ab02172ee4f21c9630c505b899c78483077ef4f056e136854037ea165dd57d2637bed791ff3e8407b08733efab864d68e726b0d31d31a4c17525 DIST echoping-6.0.2_p434.tar.gz 74568 BLAKE2B 881cc0e3d0be0f704968cbc02e4ac6abe73fe1ccf7019bb33dc522934d2f50f2ba5f70845c81024d3f4101c0acc5837599e05ba7a44f34b1453b470ca30d4b9b SHA512 1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd237620000d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799 EBUILD echoping-6.0.2_p434-r2.ebuild 1333 BLAKE2B d7d37308cd7d3b053dd88efc703ed1b3340a66ae86a6b1da9bb6b247127c26da6b1e0ba38e6757ab12ca73a4de0e38f39ccd1bca06ad86cd5e171bf0340a2aa8 SHA512 9f308e6a3766a8f7d7dc98d6abb70904931f8894c01b6a1e54198ca1205ebd53ebbf7184664bee1e4130ff639bd0dd1790d7d4a01f9dbc6d9041a28f1d69a667 EBUILD echoping-6.0.2_p434-r3.ebuild 1394 BLAKE2B f852dc2bd286fc2575bb73a612c9c12d348ffabc14b3ed9ad1e012de4fd3aa76e8557d896ddb6e0723689a1d81bf1bad045eee8f4ea07a00cdf4c183dc447139 SHA512 78b79c0238264d0b26c816a622016141624d4d316174f44d200cd39782a793f0bd13cf6cb88395194288ae6021186dcbb2a19b5cd1157f42059880dea019aac0 +EBUILD echoping-6.0.2_p434-r4.ebuild 1458 BLAKE2B f4a9acdba9ae31df1aaa776a0361124fef086369072d0ad30de97f31535e5f688e86592a0d5b2200585979daa47a77fe845d4597f62da2932ce7e75f33a37e37 SHA512 7f358016dd82ebf6897136173a604b371b5dc7093a9a6a60d4ffd9f80029f06a8dec1fcd24b2830e56ce288565cb280bdcadf2a4ae9bd621296fa3570637e7dd MISC metadata.xml 702 BLAKE2B 7a3a21935981a54b2fea15c7e02163bedc02e519a1aeca06bf08e61b237bd152cb999a9b1aae62f98499956bf36e2bbf610cf11b1803a25f9f2957e3cc419020 SHA512 db906d89ac30011c740e44f73fad23a4f9b8d8c318b6a0b9240e17dc31c897850ed2f22890b8516633c6a10f44154b77a4c198e851eb8793a55c36497ebb702f diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild new file mode 100644 index 000000000000..17e0727353a8 --- /dev/null +++ b/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="Small program to test performances of remote servers" +HOMEPAGE="http://echoping.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap" +RESTRICT="test" + +RDEPEND=" + idn? ( net-dns/libidn ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:* ) + ssl? ( + gnutls? ( >=net-libs/gnutls-3.3:= ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) +" +DEPEND=" + ${RDEPEND} + >=sys-devel/libtool-2 +" + +REQUIRED_USE="gnutls? ( ssl )" +DOCS=( AUTHORS ChangeLog DETAILS NEWS README TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch + "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch + "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch + "${FILESDIR}"/${PN}-6.0.2_p434-fno-common.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable http) \ + $(use_enable icp) \ + $(use_enable priority) \ + $(use_enable smtp) \ + $(use_enable tos) \ + $(use_with idn libidn) \ + $(usex gnutls $(use_with gnutls) $(use_with ssl)) \ + --config-cache \ + --disable-static \ + --disable-ttcp +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch new file mode 100644 index 000000000000..5eafb8a401d2 --- /dev/null +++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-fno-common.patch @@ -0,0 +1,111 @@ +--- a/echoping.c ++++ b/echoping.c +@@ -38,6 +38,25 @@ + struct timeval good_results[MAX_ITERATIONS]; + extern int tvcmp(); + ++char *server; ++#ifdef LIBIDN ++char *locale_server, *ace_server, *utf8_server; ++#endif ++ ++#ifndef IN_PLUGIN ++init_f plugin_init; ++start_f plugin_start; ++start_raw_f plugin_raw_start; ++execute_f plugin_execute; ++terminate_f plugin_terminate; ++#endif ++ ++struct timeval null_timeval; ++struct timeval max_timeval; ++ ++boolean timeout_flag; ++char big_recvline[MAXTOREAD]; ++ + int + main(argc, argv) + int argc; +--- a/echoping.h ++++ b/echoping.h +@@ -118,7 +118,6 @@ + struct timeval timevalue; + }; + +-boolean timeout_flag; + struct echoping_struct { + boolean udp; /* Use the UDP protocol (TCP is the default) */ + boolean ttcp; +@@ -132,21 +131,21 @@ + /* Initializes the plugin with its arguments. Returns the port name or number or NULL if the plugin wants to use the raw interface. */ + typedef char *(*init_f) (const int argc, const char **argv, + const echoping_options global_options); +-init_f plugin_init; ++extern init_f plugin_init; + typedef void (*start_f) (struct addrinfo *); +-start_f plugin_start; ++extern start_f plugin_start; + typedef void (*start_raw_f) (); +-start_raw_f plugin_raw_start; ++extern start_raw_f plugin_raw_start; + typedef int (*execute_f) (); +-execute_f plugin_execute; ++extern execute_f plugin_execute; + typedef void (*terminate_f) (); +-terminate_f plugin_terminate; ++extern terminate_f plugin_terminate; + #endif + + #endif + +-struct timeval null_timeval; +-struct timeval max_timeval; ++extern struct timeval null_timeval; ++extern struct timeval max_timeval; + + #define ECHO_TCP_PORT "echo" + #define DISCARD_TCP_PORT "discard" +@@ -169,9 +168,9 @@ + + #define CHARGENERATED " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefg"; + +-char *server; ++extern char *server; + #ifdef LIBIDN +-char *locale_server, *ace_server, *utf8_server; ++extern char *locale_server, *ace_server, *utf8_server; + #endif + + /* My functions */ +@@ -230,6 +229,9 @@ + + extern boolean timeout_flag; + ++extern char big_recvline[MAXTOREAD]; ++ ++ + #include "compilation.h" + + #ifndef HEADER_INCLUDED +--- a/http.c ++++ b/http.c +@@ -6,8 +6,6 @@ + #include "HTParse.h" + + +-char big_recvline[MAXTOREAD]; +- + char * + make_http_sendline(char *url, char *host, int port, int nocache) + { +--- a/smtp.c ++++ b/smtp.c +@@ -8,8 +8,6 @@ + + #ifdef SMTP + +-char big_recvline[MAXTOREAD]; +- + int + smtp_read_response_from_server(FILE * fs) + { diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest index 1faf6583dba4..af353520c98f 100644 --- a/net-analyzer/ettercap/Manifest +++ b/net-analyzer/ettercap/Manifest @@ -1,4 +1,5 @@ +AUX ettercap-0.8.3-fno-common.patch 741 BLAKE2B 907c78c720e2a55bc7325f8611ec0bd8a869b9b0a172445e45f064faa988c5e2863bd46d3f2a724613c9f6311e4d925472d701aee4963546a2b4e771b4a04255 SHA512 6c896bdbfac24bd698f49ed33617f2a9b43f4ec080b292e9d1b06e038b53b3dfaeadc3d6d0e08a968f8a1e9ccc71cff266412a1858bbf4bfbb9c294947c795cf DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7 -EBUILD ettercap-0.8.3.ebuild 1769 BLAKE2B 48ce2bbbd78731ca8ed81942d7e4076372c5ce71f57b2fe992c5cef3169b17ef7fa55c158e91376d99a14a237d76d1ea3d482fb98d03bcbc60f3c624d9f69ca3 SHA512 0bb95b7563a38ecb7c141548b7d450de99f5bde8031fe681f0e13cbeeb47fac38cc0c2e963c1e76660c469b39292eac2e6e26d5ef64a0063f74618d08a7b2416 -EBUILD ettercap-9999.ebuild 1728 BLAKE2B 6349c5252483f16d8f2481d0bda8715113d373af5992638fcd384be8c0adfe9605a3004e5095e669b6e381feb3baccbba3a269b0d003ad6b03c4fbb23f6331a2 SHA512 8dcd83c19513d6770a4c6b3b1dcd7d1a2e6dbec9d879e1300aea26f1fe9f52cefb8ddd0f8635cd884454f72e47be6ed6ff0efbf267478222171ce774c13ec993 +EBUILD ettercap-0.8.3.ebuild 1825 BLAKE2B 67ea7421490b802862350501d505722efcfce8779a0e65a6815980ca4e25f3be75f8a50d94f3c2478375a79d04721d2b0ac9718932cb569a3050b5c91e6b592b SHA512 ef4f1d1488fd92569f42e699494eef056ed0252b287ec6c94eb21f92ef071772158a07fec18a1387c7a77d9ef01b4c3e73fb426df4886fa8eb8eecdf92c291f6 +EBUILD ettercap-9999.ebuild 1784 BLAKE2B fc95ad8135e4a4fa34c4b7ca09d1cb2279ce37b67a2aea48cd0a69502ebc8b610ab7d50b28b33bf27a1b885a3ba06551defba4258cdb6372a85c17ee59f800a4 SHA512 4aae70b5170b1edc944d1994d8a2729d8a8c17f0ab4a74c006b1b168002fe89c10d47cb03b67469854aed81449d4e3dcb0b822b9bf05af33bd0c7e4a5f882f98 MISC metadata.xml 657 BLAKE2B e32e3fbc55029a9398399a2e2b69974f720826f8769379868ae80e32d2a9b2a69bfeb59b349dae91b7f27a759647091f58ea07a9b23a6dcf32d373966310bdde SHA512 0b682cb596f905882f2c0682c163d31410b94ca873a468db93e155103aeb1e943bff1c55bde1c9537478ce324d368f468bcb91c98f0aefb9dfa2a2239d7f73d5 diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.ebuild index 5a67e97e5162..f49ef8cf2e4f 100644 --- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild +++ b/net-analyzer/ettercap/ettercap-0.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -47,6 +47,9 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) sys-devel/flex virtual/yacc" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch +) src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild index 8db7873acf3e..047be22f8f4c 100644 --- a/net-analyzer/ettercap/ettercap-9999.ebuild +++ b/net-analyzer/ettercap/ettercap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,6 +46,9 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) sys-devel/flex virtual/yacc" +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-fno-common.patch +) src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch new file mode 100644 index 000000000000..eddca836905f --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch @@ -0,0 +1,22 @@ +--- a/include/ec_threads.h ++++ b/include/ec_threads.h +@@ -12,7 +12,7 @@ + }; + + /* a value to be used to return errors in fuctcions using pthread_t values */ +-pthread_t EC_PTHREAD_NULL; ++extern pthread_t EC_PTHREAD_NULL; + #define EC_PTHREAD_SELF EC_PTHREAD_NULL + #define PTHREAD_ID(id) (*(unsigned long*)&(id)) + +--- a/src/ec_threads.c ++++ b/src/ec_threads.c +@@ -46,6 +46,8 @@ + #define INIT_LOCK do{ DEBUG_MSG("thread_init_lock"); pthread_mutex_lock(&init_mtx); } while(0) + #define INIT_UNLOCK do{ DEBUG_MSG("thread_init_unlock"); pthread_mutex_unlock(&init_mtx); } while(0) + ++pthread_t EC_PTHREAD_NULL; ++ + /* protos... */ + + pthread_t ec_thread_detached(char *name, char *desc, void *(*function)(void *), void *args, int detached); diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index 80f82c1619c8..a40b72523f82 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -2,7 +2,7 @@ DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4 DIST fail2ban-0.10.5.tar.gz 520460 BLAKE2B 872b1b2d96d5c79b228cf7c38923161336e452c33fddce75d25004454a5b5d119d435aeb789d55576de4e24bbf8d8288d9fc2fb3f17323074a27857a08e3c6a4 SHA512 d2ad64999031537f2adfc01efd02d2db0718485e38745736339c2e3a1792cd82147fb6cf5a3d371d83dbe91d1afe34e741e038ed4d84d6f444ea1922dc4bb658 DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6 EBUILD fail2ban-0.10.4-r2.ebuild 3253 BLAKE2B b5c9029ea540ba99cff9a91b19ace9a94080092c0ad283f973c21a98c405ac59432d11b3353c1dee0afc562910957b215d22b76bce9ee2db2ff5aed71725dbcf SHA512 9c5d57795148503c6e3d94f9b120b9798f3b5f816bf0d508afc1eaee12d80c3c181d859f7061fd8e7145f3633a11bb4fb501baadc6d8eddf87fae6dbb5e06637 -EBUILD fail2ban-0.10.4.ebuild 3209 BLAKE2B 7b97cd973514c6ced851e5b588fcc86799a8c183bc421b970992dc389f64dbe2b6293bf87a1d6c270e63615238b858752bd6137f26aefa0954229729fbf291c0 SHA512 5d060e1bd805203e9327c3105e0ee0fbc306daa3efcd4e942478e46e2a6f07da294e1695da1b035d4b9ea3495dca87a76a85ed0fa7ce58ead81a6cea9b91ac35 +EBUILD fail2ban-0.10.4.ebuild 3210 BLAKE2B 803d84132701b9f7b832322a8058a883751ba6a57cbd479470543c3743fb9e5628284eba1d930da0e4ffee56dcf541884c7f880827c5bf95c1512995d185b3b9 SHA512 7e25b8c1f8271e4d45cc39427255ce5b29a33140cfac31820b2bcc7493dc02cf5b31de3e0701a79d60af7baba52e0b35659b5865ff7b29013e17e218297caa9e EBUILD fail2ban-0.10.5-r1.ebuild 3375 BLAKE2B 2caf8bb71a3f8383545bd1a838cf97d8b251b663440c69910a7d4e2de293a5828072dfc499d5b151a2540a855e44aebba683adc0ff49f9e490abd2a74da765d3 SHA512 79b65d7c462988fad37a8d6a92d2e2904240ab1a52adb7601d1ceae0a22bf9f0f7c58ab1cc01dc45e4eb860cb41c01b10e5e766ade479f70b6407dbc13a895b9 EBUILD fail2ban-0.11.1-r1.ebuild 3325 BLAKE2B e860b1f850a3a2b1e8b45ec1fdafd6847d6699c68d9c623f09f1292c33839c436f22fa80bdccad83b9d542fdd4ef7a89a0a3e8de456c3063a058ee510e751bf3 SHA512 413c0c0f67cf4fbcc4c91e79400b52dcf9a448bc7a5315e9089dec70f2cbfabe6256b436da7cda8557ec84a0abf42c4d6c0284b97a67b7ccaa09afaabb301ca3 EBUILD fail2ban-99999999.ebuild 3254 BLAKE2B 88ae6054ad2c1bf962ad98f8f53d5bb11a01d21077712a5a6344312169adb6272afbb9a2fd1b44e0235f4752052bdf3e0e0cded86da48e9051953322049e6205 SHA512 162c2f7ab46427731c87bb12f07392e04bb9a8937540027adf725462bb236bcf54d07d3ddbade544768d7bf7023725edca6d7f452f31e15f1b5731b2681bede7 diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild index 8cac6a35ee6e..7acd5a03851b 100644 --- a/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.10.4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86" IUSE="selinux systemd" # TODO support ipfw and ipfilter diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index f8c3eee6eb4b..c970e4041469 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1,3 +1,4 @@ +AUX flow-tools-0.68.5.1-fno-common.patch 965 BLAKE2B 183dc878e05baa7ba9e9c26079e8c22f4e0eee68cec917048bbd81911980bce88c5da753a7481eb35fc5f38e821d92bf80de4b8f6a1e5c974c1f7f696e540623 SHA512 bff9bcb57063cbdffbb169590e16d1d215b58726bf0fb6f069883cd9b483503d7f488cb76091e249905c8ad2a23b915b049f693b83eeca655d0c111363d9bef0 AUX flow-tools-0.68.5.1-openssl11.patch 1251 BLAKE2B 682c34b207517fc74e090c6aa04ba9acd7b4aa7bb2ea7b8cae45d608777b1a8760d6e22759dd10fcb4d5f3a9e258b34d07454efd2cc93134125d195b36714cd5 SHA512 c43cc2de4243b0567c07f66f0b674cb6974dee5689bbea50716ebc5cd49f4d66a739c39ff4ccadef23c7f84e26fe3a3cc4999b7db0bdda77035dbd5cfc678861 AUX flow-tools-0.68.5.1-run.patch 493 BLAKE2B dc1ab3e5abd6a7d502aa2bc1150c97a569c0d6e55bdb96e2a3404966487f637fef064191a00ba1cfb63c62ecbbb9c0359e231381e193ae13340820418908b371 SHA512 90c9f8bc6aba4c31315294ba80ebc3f7a8b86796d6fc108ef9ebf7619df73474e1a97524b709964ba899f4569a0158d0cc0a2d5bb00e8b185186cf765b87ce9d AUX flow-tools-0.68.5.1-syslog.patch 979 BLAKE2B c3ae5017c5f2f7c6c69cbce88b38f95a8def62fb5e14a769262f3f62a32df50d5831d883935ec26e01ece35388855fce3855cfba44f72064e3115a46b4ea8920 SHA512 d2d37816f437c5546916ca53bd460707366b3675ac9e9105a9611ed436d322afd6ee56fa29b1d6e68f3a02c97a62ca009d392fdb63fca411ace851dc29419537 @@ -5,5 +6,5 @@ AUX flowcapture.confd 1928 BLAKE2B db22630c3741867466c1292651364e41028dafeeaf10d AUX flowcapture.initd 816 BLAKE2B 6e27085fa0b8048f1b6f2d449d154a0fe9f2d7b8fa511de53d7eca684ef716b8ceeaaa3fedf9e0a01e76b1723e6646b6727bc76c3e9b2168060fe3bd7b363af7 SHA512 c3f62821efc94fb6305ba3c54415319c42a624a3c604c96497af0fdd7b4076e618a070006146346eb3de0549bc2bc36e3e3ffd9f7aba832dd18c29da0370463a AUX linkme 283 BLAKE2B 1c1e84a29f8fccc62dc84ba8ffbd182255a5bda7979132ff721fc537bb523e221b3963e3dce4f5700f53586ef4c4acccbab605099edf7e068bf6dd2e71882721 SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359 DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 -EBUILD flow-tools-0.68.5.1-r10.ebuild 1637 BLAKE2B 29bae346e3b76f36438d2c242a69ff82c4586cc603c626f9d3a24df64fd841d35d7668177e565d319a64ff3d2343240b7ae62860bd1a8a59171fad0de1130644 SHA512 4ab063f2495e3f362613e2877afa9e3e6df8e8e5058762d115aca7cc98732eda06b5fd88c2e15cd3291b7434d34f6c45d73a4266a5c021127bb842af9ad2b45b +EBUILD flow-tools-0.68.5.1-r10.ebuild 1674 BLAKE2B 0388edf037c985e35961e04268db72741ca859bf0018759849e54e66451bea1876c65dd0bc419d3b05d53755aeb6b7d1a8b722845d53d124638a469b04503cac SHA512 954c240c465fdda3dad18f15b95fcde793979c5589f5db31f3c67fc12e0aca539e91c6052f13daffae806010d1b3d26be132048a9ab4d9ab9ea64e2b256fa63e MISC metadata.xml 902 BLAKE2B 16f4780c8fc2a803580d1ad9321e1db662c1c720f744f544b57a2eb65f9859c02dced677f3ea1732b05afe70abb55b4a9c349fb375ee24abf083b8376d521fb1 SHA512 45f900d25bc2b968ce9a04fd143106962c1a242b776840eb2c1b51f0e02d71000f9a2fdf19286f7873e07c25aa9d528597f1b1fe0e7e083c29de5304b87aeab3 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch new file mode 100644 index 000000000000..14623fa93f36 --- /dev/null +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch @@ -0,0 +1,42 @@ +--- ./src/acl2.h ++++ ./src/acl2.h +@@ -48,7 +48,7 @@ + #define ACL_TYPE_STD 1 + #define ACL_TYPE_EXT 2 + +-struct acl_list { ++typedef struct acl_list { + int num; /* number of entries */ + int num_std; /* number of standard acl entries */ + int num_ext; /* number of extended acl entries */ +@@ -59,6 +59,8 @@ + /* num_ext of these */ + }; + ++extern struct acl_list acl_list; ++ + struct acl_names { + int num; /* index into standard or extended list */ + char *name; /* name of this acl */ +--- a/src/aclyacc.y ++++ b/src/aclyacc.y +@@ -7,8 +7,6 @@ + unsigned char fmt_buf[32]; + unsigned char fmt_buf2[32]; + +-extern struct acl_list acl_list; +- + int x; + + %} +--- a/src/flow-filter.c ++++ b/src/flow-filter.c +@@ -56,8 +56,6 @@ + int debug; + int ip_net_only; + +-struct acl_list acl_list; +- + int yyparse (void); + void usage(void); + void yyerror(const char *msg); diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild index 4a048f0d81c0..8656ded05688 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${P}-run.patch "${FILESDIR}"/${P}-syslog.patch "${FILESDIR}"/${P}-openssl11.patch + "${FILESDIR}"/${P}-fno-common.patch ) pkg_setup() { diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest index bc58ce496b28..bf0c4dbbcab4 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -1,15 +1,18 @@ AUX fping-2.4_beta2_p161-err.h.patch 191 BLAKE2B 265658587236ab7fa67c07f45fa72256bfd25ad4211bdc0c0b95aa312f5729190b2ef2161354e78896a629d85c4f7cce660b5616164c1cf576dd575b8c61b7ea SHA512 f716398d2615e3f5707b3c4bad3ad84088f2acb06b90efcc25af87c54bbc4228326213c2b58b1703a4490a909a3ad59249361a55d9e36a59afc019a25d48d08d AUX fping-2.4_beta2_p161-min-time.patch 1653 BLAKE2B e25af1458375d03c981e5f2f0301f32a2b9c4751927eba0577aec0731e4efddfd9ae64e557c4fca5fb8276fba33462b5de08ff8a36f3b1c6cab32b341339727d SHA512 46f34c26de425c96193b5d9e2182cfae38899bd5e63538d508b7d6c713f5518dd56bfb84bfda1e1b81b48aaaf3f4a09cfd0c5e2e2c83e01dbd04a5f7213d2793 AUX fping-4.1-ipv6.patch 328 BLAKE2B e65293ba588b2a653d8f0d1779f3094aa24f0937d4d35f7634a208370bf2fb83e8b3ef5c98f5d812cde92fc54ce8f37b9992bb9c30da3fb3abd64e0c1138378a SHA512 dd1a598a4ec6f93435f26066c739ea8ba798691ab5365901584e8cd3f6c8ea6fcf566ca0d8ba30bf3c2b8790d24849045751506e00dbc8ced4f260e811af04b7 +AUX fping-4.2-fno-common.patch 283 BLAKE2B 7758e7da9fb4da39bb9d77a36312bfec434b961765d510b071b49dd222a7136515bda0232440b719b8ad4146754dfbeb5648d3ef919a674ad9d81aecd9af977a SHA512 9328e40190691fd54d7059289a84e06dcddedc7cafd1a2af16c682038925d267b0945f4959b37a9acd7dd1ec909322c769e971c743b3bb8454a8fe9edcb1ff7a +AUX fping-4.2-fping6-6.patch 688 BLAKE2B b8c9c0e3cc24bd877e5eb44fe1adfb6d8b0e2fbc39204bc3ac4362fdf59f98cdfe41cfd3e0c9a54f5583ba6f90f8b0d7c8a1ec2fb0154b51b07cdbcda236a52a SHA512 019ebf767b41cc5ad81a1cb4f3b58f2adb52d5192673256be5f068bfd83b66af57fe52efc80aba6af032c6551ecac7eed28f90ff6fea29e918730da28cda8c78 DIST fping-3.13.tar.gz 155976 BLAKE2B 6f5b825fd215a4329c35022e326df2e9dc7454b03e9a960074aef451277d2d99af23ccf451379d44a76776fec135983c7948c8bd54bde98c7f79180e59ced616 SHA512 d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d DIST fping-4.0.tar.gz 170060 BLAKE2B 1142ed700a28f28ff8710b65300754139734f89123db01fa4a3772f0a804cfa58477b30ab749426be384f7e007437a82138d319ab6a702702314e24c915db44d SHA512 5dca650e9c34dd2e1bdbb981df61cf092230f07a15c4ccef105b9f58aaaa43e0d85dc9665db89631feded503ecc6f6be86446719de18e59349adb7c2f3e9757e DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f50a8af1b20c34f51b3dca9b4238fd934b46ad11cb71c539c3a1f82531b44f585c774a0c28a4786105e3c0c SHA512 cd31ea336985f8d727b0db3c70213b827f0282b0c382694e10c72a89c425f2f7383d07f8f2febdc23aa246ebbf65ac9751b2404be405088963a682945edc80ba DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 -EBUILD fping-2.4_beta2_p161-r2.ebuild 1191 BLAKE2B ef4b1cdc6f9d323f13aa0336d9f4278d806050c472611170a3b908a751ac76478fe18d6b6ef8756f1e635d27c0789f72db9302f557eae4506593b13a01c77c5c SHA512 b8d2c5dadd676ac4ad58095689f7c98ea9b8f88774fdc44cf47b2cc75e57adf363f39a0ef50645bdc843ecaa429868b2fcde02a9041df6e4f855a232040667db -EBUILD fping-3.13.ebuild 551 BLAKE2B c876528450868e8f9daff6b630bb0d45d25c2a7721010c8e68a8a7800ad65ba1cca964154b02598f614aaa1153ef7289b132dd58a7e856fde8f9c610bf197303 SHA512 bae1d752b7344690a5f8c4398fd174d8631980276306deeaa279633acf19f1cc05a44780750a7e72fe09996ada85f0e799758ba31ba8c08376ce6ac29268b9a5 +EBUILD fping-2.4_beta2_p161-r2.ebuild 1192 BLAKE2B d3f11b563f6eff24fe533165f63202de9701a61af15ec33f58cdbdef3a26f16451b71018a8e1682eed3830b287fbea58524c28d24e657a72d0f0529f1cc54039 SHA512 09ce80d20aff0b7cffa3be736b82833a6e65ba7864598244983eebc6bf78a10b2a032e940829213cf08f5f693dff6e8d5f06904a1f60b701075f53ffbc9cc05f +EBUILD fping-3.13.ebuild 552 BLAKE2B 1e58a0cfe5ece5cedc7763fbfb43b1ee1a8b291b3321dcbcfe582e42faa85260de5881b667f32bbc2cc67eefaaee5cc073022845ee8f0d745be9569f44c03289 SHA512 691bc35a5621f3048388f0e666e0476cddb9762a2681dbe27296c421cbd41a10c647df3431e0ea04918e4465a96a9989f061b1abd60858aa73d03725e9284487 EBUILD fping-4.0.ebuild 524 BLAKE2B 37afe8c889ff6a04e9a452686a22bc06378b20f09bb7eca6e4c9087dddcf3eda4c2db965f2125ad9c584cb13624f54a02fc8225fcc9810b0ec6200dcfe0d35ac SHA512 e561eb0d9a1090dfdaae4d9fbc5d3207ff27969a26d659e9c3d5a35b6488755d00be8064f578e97ef54a7d40d2521e6d761c8a0e1e0ff2dd7443591deb3579b2 EBUILD fping-4.1.ebuild 573 BLAKE2B cacfc3f9367c046a70e96ed2980a8ac416a383d63cc915f1cf9a42093f9e40eaa8405a46cc8dbee6111d92fbe440921efe26546cb8eca7552a90e1cbc1fe98a4 SHA512 466941d669576fe07cd4e34b75e8b7e648a8e9997776fad2a2fcb419da54f3810844ac1125d0ddbcdb827d0b1794d7c31363c37d6505b19fdbfe2bc3add3e58f -EBUILD fping-4.2.ebuild 523 BLAKE2B 2101cba13f09dd408d5985d212f6042b0721872d37eea8f3271b8319c67df22707a10e2ae1c27a70746582d9ce37afcd2c9ac09d5a723e2f988e90d3515471a3 SHA512 9615242021bb6d0e2256f9e6db87b7860cae610dbdafd683431f4c593a74a08579c224363de61e91f65a658511ebca8cd6da978747e3126ac38254e9a7800953 +EBUILD fping-4.2-r1.ebuild 729 BLAKE2B 0e09d1adf6f798e073347356e687d1bf7d31b950d8dc0cd8630665bb6558bbd259d296156597de1a4f2cb7f933144007610ac7a10fc270fa56205cbb6028c325 SHA512 576c28d07fac7010c5febdeea586e5a0e4fbbfb217a7560eecc07f44308e071b15a95277e969d88469bd4e8a438b85fe918357bb12f6628d204f86503c60aa91 +EBUILD fping-4.2.ebuild 578 BLAKE2B 570b1faf781599b7ad1b5cffbd226bef804fbf808ccaab33712f7cc4874e1434fee0c4ae8c19e6930df4144d5fbd9ced8ae3dc4555f7f2a601dd40299eeff161 SHA512 bcd33d815cc898b6a806560047b584af353f00515bbc5f3a9c2203083b2faf7eefeaeaf58b800803d1c8f939fe94b50377654f4d448da36a3ff257a7138e1eef MISC metadata.xml 432 BLAKE2B 26cf2b8675d43f68216b366862c04fd46072965de423ad87a6ed12feded8e978ebc2378ce582917534699586a69b7690533385c6420c0187cfe0acc089dff5fa SHA512 16121fbc4071e437cac8d026dd418f9e6efd1110424de9e08c32dd27c55d204c566faf3a790f7e301795d19ceb427c565752583ef20e8a1828d3cb3474fb218f diff --git a/net-analyzer/fping/files/fping-4.2-fno-common.patch b/net-analyzer/fping/files/fping-4.2-fno-common.patch new file mode 100644 index 000000000000..d18af66b0637 --- /dev/null +++ b/net-analyzer/fping/files/fping-4.2-fno-common.patch @@ -0,0 +1,11 @@ +--- a/src/fping.h ++++ b/src/fping.h +@@ -11,7 +11,7 @@ + void crash_and_burn( char *message ); + void errno_crash_and_burn( char *message ); + int in_cksum( unsigned short *p, int n ); +-int random_data_flag; ++extern int random_data_flag; + + /* socket.c */ + int open_ping_socket_ipv4(); diff --git a/net-analyzer/fping/files/fping-4.2-fping6-6.patch b/net-analyzer/fping/files/fping-4.2-fping6-6.patch new file mode 100644 index 000000000000..63138d3e2d2c --- /dev/null +++ b/net-analyzer/fping/files/fping-4.2-fping6-6.patch @@ -0,0 +1,21 @@ +From 6fd4f8bd91abc43f80078bdd0084cb6d2b1de7f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johan=20Str=C3=B6m?= <johan@stromnet.se> +Date: Tue, 25 Jun 2019 14:03:14 +0200 +Subject: [PATCH] Do not fail if using fping6 with -6 flag + +Mostly for backwards compatability +--- + src/fping.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/fping.c ++++ b/src/fping.c +@@ -435,7 +435,7 @@ + break; + case '6': + #ifdef IPV6 +- if (hints_ai_family != AF_UNSPEC) { ++ if (hints_ai_family != AF_UNSPEC && hints_ai_family != AF_INET6) { + fprintf(stderr, "%s: can't specify both -4 and -6\n", prog); + exit(1); + } diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild index fda799ceef6f..d345c30aa0ed 100644 --- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild +++ b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://fping.sourceforge.net/ https://packages.qa.debian.org/f/fping.h SLOT="0" LICENSE="fping" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="ipv6" S="${WORKDIR}/fping-2.4b2_to-ipv6" diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild index 7a7584960a7b..12cfd9d1d089 100644 --- a/net-analyzer/fping/fping-3.13.ebuild +++ b/net-analyzer/fping/fping-3.13.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://fping.org/dist/${P}.tar.gz" LICENSE="fping" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="ipv6 suid" src_configure() { diff --git a/net-analyzer/fping/fping-4.2-r1.ebuild b/net-analyzer/fping/fping-4.2-r1.ebuild new file mode 100644 index 000000000000..0e1b61dd97e7 --- /dev/null +++ b/net-analyzer/fping/fping-4.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit fcaps + +DESCRIPTION="A utility to ping multiple hosts at once" +HOMEPAGE="https://fping.org/" +SRC_URI="https://fping.org/dist/${P}.tar.gz" + +LICENSE="fping" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="ipv6 suid" + +FILECAPS=( cap_net_raw+ep usr/sbin/fping ) +PATCHES=( + "${FILESDIR}"/${PN}-4.2-fno-common.patch + "${FILESDIR}"/${PN}-4.2-fping6-6.patch +) + +src_configure() { + econf $(use_enable ipv6) +} + +src_install() { + default + + if use suid; then + fperms u+s /usr/sbin/fping + fi + + if use ipv6; then + dosym fping /usr/sbin/fping6 + fi +} diff --git a/net-analyzer/fping/fping-4.2.ebuild b/net-analyzer/fping/fping-4.2.ebuild index b181b90c670f..fff3fa9ccd77 100644 --- a/net-analyzer/fping/fping-4.2.ebuild +++ b/net-analyzer/fping/fping-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,6 +12,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="ipv6 suid" +PATCHES=( + "${FILESDIR}"/${PN}-4.2-fno-common.patch +) + src_configure() { econf $(use_enable ipv6) } diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index 9e93843f92ea..290ee954e27d 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -2,6 +2,6 @@ AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697 AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532 DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a SHA512 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436 DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb -EBUILD graphite-web-1.1.3-r1.ebuild 3070 BLAKE2B 749d592c00234f530bb8fb37984bfe087ea546e9651177a1246bc00a9758c616b78f5030d37fa67f6fad3401a0ececb5ec4428ae2d73fc3df412cea49a6d2c91 SHA512 7db1218772eb9dcf10fea99ef326d040131538b157c7d17d9f18df326c23d0e455a9418643366c67420d31459ed77fb84b8f90a23fccf2efc4a557fcff86db8c -EBUILD graphite-web-1.1.5.ebuild 3100 BLAKE2B 060cbaef3a075dc24746bec0f98174c509841b8e698eaecb4a0e3bf1fdf19abe9ccb6ff5aa9e498503fc251fca1c0c6d3eab1ffb70b278058f6988b8f889b2cd SHA512 b95dbde4b0aa115c606b557eb00badd7a339d98010b30c72775be5787786213f5cbb2f750d075c27932de2ed3a967e8f3fd56f31f97cbc68afce8d7d74040831 +EBUILD graphite-web-1.1.3-r1.ebuild 3064 BLAKE2B 8cd2537a70c4961026fe8ee5b18b767f2ab0702ab5ea10f5de7e9dbe6d34ee4f9c7d77bdb4465be629dc65a1fb439d3583ff52af124595f67483854a07c824e7 SHA512 9e36b3167883563fce2a48df1948efa7de49b8c5f5e8c47047340064faa438ebcf2feaa5cf7cba6b1bb5713096aba8df2188adab287b38ae6bc7eac7aa10f489 +EBUILD graphite-web-1.1.5.ebuild 3094 BLAKE2B 1db35a156c7ccbae29aa475415833015fcaadd450cb0391a00b2600ef501da8af165816d1aa4e49ce627be4430271b0ab64182cfb46a31e5e9441fd3661eeba0 SHA512 14a1ad66884c01131e703e1074ff8a812c76ca65786836988c8e9256d0004b4278a9e1fbd97af71eae46dccc151adf9564efaa013961bbcb5f2841b61e45fabf MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98 diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild index 15d71752cb7d..cd145d29ab6f 100644 --- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild +++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 prefix diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild index 4b7b32088923..25a6afa9f356 100644 --- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild +++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) # 3.7 dropped due to dep-hell +PYTHON_COMPAT=( python3_6 ) # 3.7 dropped due to dep-hell inherit distutils-r1 prefix diff --git a/net-analyzer/gsm-receiver/Manifest b/net-analyzer/gsm-receiver/Manifest deleted file mode 100644 index c70e1f3eb198..000000000000 --- a/net-analyzer/gsm-receiver/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX 0001-gsm-receiver-build-against-gnuradio-3.7.patch 13458 BLAKE2B c032c5fec1cec8218a2034e8327d8e3cb1e4594e4dd84f4eec61f0b2e5ecf9f07d8ad9578117a24fb1d4784a8cd7ad18063f7ec4a3dc98bcc177bc61f193cd39 SHA512 29d7ec1845ec7b5d126cb2844b8704410c37031ffd267b170e3d5a80971dc95c9c1ad38038b66feec3a01ce67fb25dba292d12972cea3d94dccf3b119498ecd4 -EBUILD gsm-receiver-9999.ebuild 961 BLAKE2B 416ee9cdfc213c1d0b9025e0d81ba94fad1b2c30e2cf136ae96f858286044ec9b7390a0c9b0f3256f18deb01957d7de19c9c80cffb3803009809307b5e42e3b1 SHA512 5345f3ebec1b587a7dc48bcad1200baaa112c950f79b5ed12bb2669e40991b773f2b56a1079b71a5a721769c7d844632a06ed9991cc2b3f03ad4fb75d521cc41 -MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f diff --git a/net-analyzer/gsm-receiver/files/0001-gsm-receiver-build-against-gnuradio-3.7.patch b/net-analyzer/gsm-receiver/files/0001-gsm-receiver-build-against-gnuradio-3.7.patch deleted file mode 100644 index b7683f38b683..000000000000 --- a/net-analyzer/gsm-receiver/files/0001-gsm-receiver-build-against-gnuradio-3.7.patch +++ /dev/null @@ -1,323 +0,0 @@ -From c9809ac05224ccf3a7fce1dda8c7eddedbbf3a56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= - <chithanh@gentoo.org> -Date: Wed, 5 Feb 2014 03:21:37 +0100 -Subject: [PATCH] gsm-receiver: build against gnuradio-3.7 - -This is the result of blindly following -http://gnuradio.org/redmine/projects/gnuradio/wiki/Move_3-6_to_3-7 -The result builds, but it may or may not work. ---- - gsm-receiver/Makefile.common | 7 ++-- - gsm-receiver/config/Makefile.am | 2 +- - .../config/gr_libgnuradio_core_extra_ldflags.m4 | 40 ---------------------- - .../config/gr_libgnuradio_runtime_extra_ldflags.m4 | 40 ++++++++++++++++++++++ - gsm-receiver/config/gr_standalone.m4 | 5 ++- - gsm-receiver/gsm-receiver.pc.in | 2 +- - gsm-receiver/src/lib/gsm.i | 15 ++++++-- - gsm-receiver/src/lib/gsm_receiver_cf.cc | 16 ++++----- - gsm-receiver/src/lib/gsm_receiver_cf.h | 18 +++++----- - 9 files changed, 76 insertions(+), 69 deletions(-) - delete mode 100644 gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4 - create mode 100644 gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4 - -diff --git a/gsm-receiver/Makefile.common b/gsm-receiver/Makefile.common -index b5dcb2e..0592f70 100644 ---- a/gsm-receiver/Makefile.common -+++ b/gsm-receiver/Makefile.common -@@ -28,7 +28,7 @@ AM_CPPFLAGS = \ - $(STD_DEFINES_AND_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ - $(CPPUNIT_INCLUDES) \ -- $(GNURADIO_CORE_CPPFLAGS) -+ $(GNURADIO_RUNTIME_CPPFLAGS) - - #!! remove this - TCH_DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder/openbtsstuff -@@ -36,9 +36,8 @@ TCH_DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder/openbtsstuff - STD_DEFINES_AND_INCLUDES = \ - -I$(DECODER_INCLUDEDIR) \ - -I$(MAIN_INCLUDEDIR) \ -- -I$(GNURADIO_CORE_INCLUDEDIR) \ -- -I$(GNURADIO_CORE_INCLUDEDIR)/swig \ -- -I$(GRUEL_INCLUDEDIR)/gruel/swig \ -+ -I$(GNURADIO_RUNTIME_INCLUDEDIR) \ -+ -I$(GNURADIO_RUNTIME_INCLUDEDIR)/gnuradio/swig \ - $(LIBOSMOCORE_CFLAGS) \ - -I$(TCH_DECODER_INCLUDEDIR) - -diff --git a/gsm-receiver/config/Makefile.am b/gsm-receiver/config/Makefile.am -index 5858d22..1fdc0e5 100644 ---- a/gsm-receiver/config/Makefile.am -+++ b/gsm-receiver/config/Makefile.am -@@ -51,7 +51,7 @@ m4macros = \ - gr_fortran.m4 \ - gr_gprof.m4 \ - gr_lib64.m4 \ -- gr_libgnuradio_core_extra_ldflags.m4 \ -+ gr_libgnuradio_runtime_extra_ldflags.m4 \ - gr_no_undefined.m4 \ - gr_omnithread.m4 \ - gr_pwin32.m4 \ -diff --git a/gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4 b/gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4 -deleted file mode 100644 -index 43f872c..0000000 ---- a/gsm-receiver/config/gr_libgnuradio_core_extra_ldflags.m4 -+++ /dev/null -@@ -1,40 +0,0 @@ --# Check for (MinGW)win32 extra ld options. -*- Autoconf -*- -- --# Copyright 2003,2004,2005 Free Software Foundation, Inc. --# --# This file is part of GNU Radio --# --# GNU Radio is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 3, or (at your option) --# any later version. --# --# GNU Radio is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. --# --# You should have received a copy of the GNU General Public License --# along with GNU Radio; see the file COPYING. If not, write to --# the Free Software Foundation, Inc., 51 Franklin Street, --# Boston, MA 02110-1301, USA. -- --dnl --AC_DEFUN([GR_LIBGNURADIO_CORE_EXTRA_LDFLAGS], [ --AC_REQUIRE([AC_PROG_LD]) --# on Mingw32 extra LDFLAGS are required to ease global variable linking --LIBGNURADIO_CORE_EXTRA_LDFLAGS="" -- --AC_MSG_CHECKING([whether $LD accepts --enable-runtime-pseudo-reloc]) --if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1 --then -- # libtool requires the quotes -- LIBGNURADIO_CORE_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\"" -- AC_MSG_RESULT(yes) --else -- AC_MSG_RESULT(no) --fi -- --AC_SUBST(LIBGNURADIO_CORE_EXTRA_LDFLAGS) -- --]) -diff --git a/gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4 b/gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4 -new file mode 100644 -index 0000000..92e8c97 ---- /dev/null -+++ b/gsm-receiver/config/gr_libgnuradio_runtime_extra_ldflags.m4 -@@ -0,0 +1,40 @@ -+# Check for (MinGW)win32 extra ld options. -*- Autoconf -*- -+ -+# Copyright 2003,2004,2005 Free Software Foundation, Inc. -+# -+# This file is part of GNU Radio -+# -+# GNU Radio is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3, or (at your option) -+# any later version. -+# -+# GNU Radio is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GNU Radio; see the file COPYING. If not, write to -+# the Free Software Foundation, Inc., 51 Franklin Street, -+# Boston, MA 02110-1301, USA. -+ -+dnl -+AC_DEFUN([GR_LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS], [ -+AC_REQUIRE([AC_PROG_LD]) -+# on Mingw32 extra LDFLAGS are required to ease global variable linking -+LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS="" -+ -+AC_MSG_CHECKING([whether $LD accepts --enable-runtime-pseudo-reloc]) -+if ${LD} --enable-runtime-pseudo-reloc --version >/dev/null 2>&1 -+then -+ # libtool requires the quotes -+ LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS="\"-Wl,--enable-runtime-pseudo-reloc\"" -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+AC_SUBST(LIBGNURADIO_RUNTIME_EXTRA_LDFLAGS) -+ -+]) -diff --git a/gsm-receiver/config/gr_standalone.m4 b/gsm-receiver/config/gr_standalone.m4 -index 4e097d2..14f286c 100644 ---- a/gsm-receiver/config/gr_standalone.m4 -+++ b/gsm-receiver/config/gr_standalone.m4 -@@ -114,7 +114,6 @@ m4_define([GR_STANDALONE], - AC_CHECK_PROG([XMLTO],[xmlto],[yes],[]) - AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes]) - -- PKG_CHECK_MODULES(GNURADIO_CORE, gnuradio-core >= 3) -- LIBS="$LIBS $GNURADIO_CORE_LIBS" -- PKG_CHECK_MODULES(GRUEL, gruel >= 3) -+ PKG_CHECK_MODULES(GNURADIO_RUNTIME, gnuradio-runtime >= 3) -+ LIBS="$LIBS $GNURADIO_RUNTIME_LIBS" - ]) -diff --git a/gsm-receiver/gsm-receiver.pc.in b/gsm-receiver/gsm-receiver.pc.in -index 0a18d4b..9ceca56 100644 ---- a/gsm-receiver/gsm-receiver.pc.in -+++ b/gsm-receiver/gsm-receiver.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: gsm-receiver - Description: The GSM receiver block which does FCCH burst search, sch decoding and normal burst demodulation --Requires: gnuradio-core -+Requires: gnuradio-runtime - Version: @VERSION@ - Libs: -L${libdir} -lgsm-receiver - Cflags: -I${includedir} -diff --git a/gsm-receiver/src/lib/gsm.i b/gsm-receiver/src/lib/gsm.i -index b3c1d81..3f58e16 100644 ---- a/gsm-receiver/src/lib/gsm.i -+++ b/gsm-receiver/src/lib/gsm.i -@@ -37,18 +37,27 @@ - #include "gsm_receiver_cf.h" - #include <stdexcept> - /* #include "gsm_constants.h" */ -+#include <gnuradio/block.h> -+#include <gnuradio/sync_block.h> -+#include <gnuradio/sync_decimator.h> -+#include <gnuradio/sync_interpolator.h> -+#include <gnuradio/tagged_stream_block.h> -+#include <gnuradio/block_gateway.h> -+#include <gnuradio/feval.h> -+#include <gnuradio/py_feval.h> -+#include <gnuradio/high_res_timer.h> - %} - - // ---------------------------------------------------------------- - - GR_SWIG_BLOCK_MAGIC(gsm,receiver_cf); - --gsm_receiver_cf_sptr gsm_make_receiver_cf ( gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration); -+gsm_receiver_cf_sptr gsm_make_receiver_cf ( gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration); - --class gsm_receiver_cf : public gr_block -+class gsm_receiver_cf : public gr::block - { - private: -- gsm_receiver_cf ( gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr); -+ gsm_receiver_cf ( gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr); - }; - - // ---------------------------------------------------------------- -diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.cc b/gsm-receiver/src/lib/gsm_receiver_cf.cc -index b4e7a69..6bfdf5d 100644 ---- a/gsm-receiver/src/lib/gsm_receiver_cf.cc -+++ b/gsm-receiver/src/lib/gsm_receiver_cf.cc -@@ -24,8 +24,8 @@ - #include "config.h" - #endif - --#include <gr_io_signature.h> --#include <gr_math.h> -+#include <gnuradio/io_signature.h> -+#include <gnuradio/math.h> - #include <math.h> - #include <Assert.h> - #include <boost/circular_buffer.hpp> -@@ -289,7 +289,7 @@ typedef std::vector<float> vector_float; - typedef boost::circular_buffer<float> circular_buffer_float; - - gsm_receiver_cf_sptr --gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration) -+gsm_make_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration) - { - return gsm_receiver_cf_sptr(new gsm_receiver_cf(tuner, synchronizer, osr, key, configuration)); - } -@@ -302,10 +302,10 @@ static const int MAX_OUT = 1; // maximum number of output streams - /* - * The private constructor - */ --gsm_receiver_cf::gsm_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration) -- : gr_block("gsm_receiver", -- gr_make_io_signature(MIN_IN, MAX_IN, sizeof(gr_complex)), -- gr_make_io_signature(MIN_OUT, MAX_OUT, 142 * sizeof(float))), -+gsm_receiver_cf::gsm_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration) -+ : gr::block("gsm_receiver", -+ gr::io_signature::make(MIN_IN, MAX_IN, sizeof(gr_complex)), -+ gr::io_signature::make(MIN_OUT, MAX_OUT, 142 * sizeof(float))), - d_OSR(osr), - d_chan_imp_length(CHAN_IMP_RESP_LENGTH), - d_tuner(tuner), -@@ -751,7 +751,7 @@ void gsm_receiver_cf::set_frequency(double freq_offset) - inline float gsm_receiver_cf::compute_phase_diff(gr_complex val1, gr_complex val2) - { - gr_complex conjprod = val1 * conj(val2); -- return gr_fast_atan2f(imag(conjprod), real(conjprod)); -+ return gr::fast_atan2f(imag(conjprod), real(conjprod)); - } - - bool gsm_receiver_cf::reach_sch_burst(const int nitems) -diff --git a/gsm-receiver/src/lib/gsm_receiver_cf.h b/gsm-receiver/src/lib/gsm_receiver_cf.h -index 039a774..3478585 100644 ---- a/gsm-receiver/src/lib/gsm_receiver_cf.h -+++ b/gsm-receiver/src/lib/gsm_receiver_cf.h -@@ -24,9 +24,9 @@ - - #include <vector> - #include <list> --#include <gr_block.h> --#include <gr_complex.h> --#include <gr_feval.h> -+#include <gnuradio/block.h> -+#include <gnuradio/gr_complex.h> -+#include <gnuradio/feval.h> - #include <gsm_constants.h> - #include <gsm_receiver_config.h> - -@@ -42,7 +42,7 @@ class gsm_receiver_cf; - typedef boost::shared_ptr<gsm_receiver_cf> gsm_receiver_cf_sptr; - typedef std::vector<gr_complex> vector_complex; - --gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration); -+gsm_receiver_cf_sptr gsm_make_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration); - - /** GSM Receiver GNU Radio block - * -@@ -52,7 +52,7 @@ gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synch - * \ingroup block - */ - --class gsm_receiver_cf : public gr_block -+class gsm_receiver_cf : public gr::block - { - private: - std::map<char,int> d_hex_to_int; -@@ -76,8 +76,8 @@ class gsm_receiver_cf : public gr_block - gr_complex d_sch_training_seq[N_SYNC_BITS]; ///<encoded training sequence of a SCH burst - gr_complex d_norm_training_seq[TRAIN_SEQ_NUM][N_TRAIN_BITS]; ///<encoded training sequences of a normal bursts and dummy bursts - -- gr_feval_dd *d_tuner; ///<callback to a python object which is used for frequency tunning -- gr_feval_dd *d_synchronizer; ///<callback to a python object which is used to correct offset of USRP's internal clock -+ gr::feval_dd *d_tuner; ///<callback to a python object which is used for frequency tunning -+ gr::feval_dd *d_synchronizer; ///<callback to a python object which is used to correct offset of USRP's internal clock - - /** Countes samples consumed by the receiver - * -@@ -120,8 +120,8 @@ class gsm_receiver_cf : public gr_block - // GSM Stack - GS_CTX d_gs_ctx;//TODO: remove it! it'a not right place for a decoder - -- friend gsm_receiver_cf_sptr gsm_make_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration); -- gsm_receiver_cf(gr_feval_dd *tuner, gr_feval_dd *synchronizer, int osr, std::string key, std::string configuration); -+ friend gsm_receiver_cf_sptr gsm_make_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration); -+ gsm_receiver_cf(gr::feval_dd *tuner, gr::feval_dd *synchronizer, int osr, std::string key, std::string configuration); - - /** Function whis is used to search a FCCH burst and to compute frequency offset before - * "synchronized" state of the receiver --- -1.8.3.2 - diff --git a/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild b/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild deleted file mode 100644 index 36a54f59e1e6..000000000000 --- a/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools git-2 python-single-r1 - -DESCRIPTION="GSM receiver block from the airprobe suite" -HOMEPAGE="https://svn.berlin.ccc.de/projects/airprobe/" -SRC_URI="" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - net-libs/libosmocore - >=net-wireless/gnuradio-3.7_rc:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -EGIT_REPO_URI="git://git.gnumonks.org/airprobe.git" -EGIT_SOURCEDIR="${S}" -S+=/${PN} - -src_prepare() { - epatch "${FILESDIR}"/0001-${PN}-build-against-gnuradio-3.7.patch - python_fix_shebang "${S}" - eautoreconf -} - -src_configure() { - # fails to create .deps directory without dependency tracking - econf --enable-dependency-tracking -} - -src_install() { - default - - dobin src/python/*.py - insinto /usr/share/doc/${PF}/examples - doins src/python/*.sh -} diff --git a/net-analyzer/gsm-receiver/metadata.xml b/net-analyzer/gsm-receiver/metadata.xml deleted file mode 100644 index 1570f891c6a3..000000000000 --- a/net-analyzer/gsm-receiver/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>radio@gentoo.org</email> - <name>Radio</name> - </maintainer> -</pkgmetadata> diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest index 92b867a54855..65ea81bced8b 100644 --- a/net-analyzer/hping/Manifest +++ b/net-analyzer/hping/Manifest @@ -7,6 +7,7 @@ AUX hping-3_pre20051105-tcl.patch 260 BLAKE2B b8ad9492a1d4a4ff2b45cdf0263457d16e AUX hping-3_pre20051105-tclsh-proper-escaping.patch 550 BLAKE2B 463c740662c2477379df97a795afb58725c30258eadbd4e1e3495b5ffa9e9cc04e5d4eec2a33dfa619d6a4450f79cba4c89463f250cdd7bf50bc1a6ed9f77b68 SHA512 349286fe6e22f491debe399bdf68d99f27c1baaf27bc9fd976691fc8bcb6fcfb03dae09b3796c1e181a0deca279c6e8a0721d39862a302d02bb05d7557b505ab AUX hping-3_pre20051105.patch 1036 BLAKE2B c06043dbd14fd7f7806a9404f5523a3ece4e9af3b619cb19965cc983191f553d28df1bedae0b534029d374fb2bc49ae6c5bff84a6b4f829081e92a1835a90913 SHA512 ab1a6f85d8ba6e91097260b2044502f69033dd7466869cac19d50a1830a9eeea105617ec62e14cebe953b49992a3548c08f243638171de3524cb0058cf6d713e AUX hping-3_pre20141226-compile.patch 1043 BLAKE2B a58b97bd9404c1c360c5a6604959a91912ac5bc7df9096661cf9bb057d9421ce7170497a97596417547f396f4034dfd587f9e835a82a03c0e352adca656204ea SHA512 bc34affaefddb8515ce3e478b72683937d4a7e64ce7037e827dc957326d652a3c41a6016cf5a25f7f0185316a349d448a87c5f8d343002f833998826f6125c50 +AUX hping-3_pre20141226-fno-common.patch 229 BLAKE2B 75d9474d97444d636dae1012496ac94353b79fec632ffefa5d1e9d86410375fc42edbbfeae2cc5e4cf2cbf25927db8f68c276c659202194896c38593d968f49e SHA512 c994a2a9775556870b4b0ed26147b06773756c97a221c38bcfde01c5defd8736a52dd6b58b1c27632c0960090ad0aa06787573d2c137531a2650012a13be3954 AUX hping-3_pre20141226-hping2-2-hping.patch 9089 BLAKE2B 319a656267ecff667550940ae2c5be2471c6c0308d4750a53f42c698e442119ddb8025ecdd3fd9835e22eef87d53f73d9bd1bb3de89bf523e25a1f1cbd00d9b8 SHA512 a660375853d37e3dfb3a1ad1e09dfbdd70ed88900d4a9d07d32c8d1cc782e2d4e357eb0fdc78b46711b6c8e5bf21b8572bc2e696874cf6f52a3a14d54b395bd6 AUX hping-3_pre20141226-indent.patch 217 BLAKE2B 7db91fb6ae7585bdcedcf07f5f0373967dcbce4a34785574e9e0392fcee720190f087466dbdd6272102c6280a56a7640c2a2726539ed8dd557d277c4b2d40c76 SHA512 bfb024c3d50a7674969472ac38019d6f06622bbe8a7392c3babd1bb99c3c4c6c5a553cf7a9e1bc7ad9c6636e1fa5d8faca8679df191995b8b76d6c5f6aa936e9 AUX hping-3_pre20141226-pcap-bpf.patch 421 BLAKE2B ff0b48788abe2151c60ab3a99c8800f817a01f64e3eaa40218c227fb180a1abd1e23cf4c98f689ba8ec7a8ac5ac2698a574d0264b64c9d8edf1bc8729309ed5a SHA512 58b493b860a8fb702292faf17bb6d033a855748dcb7db173025ba7ca54a1ecd8e8f9bfa32e0c36a3988c38baec2757b99be12afae052196d338ee24f3100a975 @@ -14,6 +15,6 @@ AUX hping-3_pre20141226-scan-overflow.patch 316 BLAKE2B 7d43d98fe736dc78a2e104c0 AUX hping-3_pre20141226-unused-but-set.patch 1272 BLAKE2B 8ae0bfad0bab0c8f0f7592b5ec370ebe146bb31c2dd5a53651d2bd27441c605114f46ab98ec9a97e9f5d386cae5a561c80c420c4c15d6d9424440ac4a53736ef SHA512 a9f031c39a448b0d1f6b076193a07c7a9628756af46a06c2f0d8a2859a02e55bbff5ae55ee4341297b19c4e1ba041b5dd2cdee9b64bdf35e6aff5dc4b8faf6db DIST hping-3_pre20141226.zip 648502 BLAKE2B 4c75bdb886a37180a4561a8179e00ea5bb6534e32b6fa749cd53824e36dfbeaa38b1a772b58f61d68056f510a294f6c3363f56705adb75f42fec11f4f4cd8fa1 SHA512 33ca573d66d7f6285f69a060f56a95e7307bc24d6c81b5e1752c72b8487ab9c85ac6e4499f9c4897e2656a67e12d608a0a149ca5502bdcf18cf97c88d4a2309b DIST hping3-20051105.tar.gz 584001 BLAKE2B b99b7d2310e1706926ec5c649cd03a8889e3cff36f2a8e1f899799ddb1f4e6e432ab2b83c82b741ab827f715dbf8649a94831e75ef22793c7730e80d49c576c1 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 -EBUILD hping-3_pre20051105-r6.ebuild 1597 BLAKE2B 4ea4ceffe2ddfc9be4e333c282c4f76d820a560f37450359d5b73096a2bef5d03ccc057f9f63740fb6930d433e9723382ad3306a075ea39352ea854fc94da089 SHA512 22f7aa3764f5d91779ab281bd0a173fc8dffad1f61a8886b82d7b0716fe7b36d1d01eb5ae59452859807f3d6dd50cc7d496893140a60dff9b9be09f60d940617 -EBUILD hping-3_pre20141226.ebuild 1522 BLAKE2B 9b69e1a45466607d39a4b79feab0b68017519d52139583e2900959bec47a46506a22e918ed85f88c35f94bf8a86de837f8b1198227b7b751e4f3e687abfede5e SHA512 a971eff457c48e4ef62090ce15633483e9957eee5e37e17564376a23fdc748ae64929eed44ad756819d48636a1e173ff922e2abdcda6847ff387cf2386352414 +EBUILD hping-3_pre20051105-r6.ebuild 1598 BLAKE2B d146b4e7dca3903a4946854411c83f20677b2417f2e4fb16a2b64b26a26d0c72b5b4a1bd28902dd74de3c2c68259d55fb49563b622c1fdb6c6e102de94f8b130 SHA512 15de8e9b07877fb00115c58922791dc73e6703a145aa391af6698789e442e71e40c723d2adaa903942814eda7172d0f033241604421fa32741fdd54eb7a774d4 +EBUILD hping-3_pre20141226.ebuild 1571 BLAKE2B ab837befdc5d18d7d2ceaf015002c7e8a81a2feaf6cb0ed7fea6adf74861bfd8e062eb629325cc1474a4ca8124599d75e1bc193284042f52483d87de8f97d9d7 SHA512 5e9b6abc08d35bdb08f4dd097a565b5b4863ba9b2c82109b2df4b7fb5cbf1a32aa0e2ebe5ffcdca81b59973944906a442180f65836ac3aae934387603f401345 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/hping/files/hping-3_pre20141226-fno-common.patch b/net-analyzer/hping/files/hping-3_pre20141226-fno-common.patch new file mode 100644 index 000000000000..e21a6d513c59 --- /dev/null +++ b/net-analyzer/hping/files/hping-3_pre20141226-fno-common.patch @@ -0,0 +1,11 @@ +--- a/hping2.h ++++ b/hping2.h +@@ -357,8 +357,6 @@ + int status; + }; + +-volatile struct delaytable_element delaytable[TABLESIZE]; +- + /* protos */ + void nop(void); /* nop */ + int parse_options(int, char**); /* option parser */ diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild index bf8d34d47be1..888c752b7bf5 100644 --- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild +++ b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86" +KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86" IUSE="tcl" S="${WORKDIR}/${MY_P}" diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild index 72c3c7249331..3c3a3f166ea6 100644 --- a/net-analyzer/hping/hping-3_pre20141226.ebuild +++ b/net-analyzer/hping/hping-3_pre20141226.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3_pre20141226-pcap-bpf.patch "${FILESDIR}"/${PN}-3_pre20141226-scan-overflow.patch "${FILESDIR}"/${PN}-3_pre20141226-unused-but-set.patch + "${FILESDIR}"/${PN}-3_pre20141226-fno-common.patch ) src_configure() { diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index 6036f1c717d2..98f2dfc37537 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,10 +1,13 @@ AUX hydra-8.0-configure.patch 1089 BLAKE2B 7aa67a47f3fa8174b0a72b86e4bdf743750450559327ec8da31506b817d59a0f3e6b96f32acc4a8658f98845053f50ff089c57f16b9251bc0daa38795a93e2ac SHA512 d7fbc56b9d0fd6cc89ca689a07c0dcf618827bfaafb332217b695b38cc6382c32aedfec4c046575dc34c0946c9b0212a22d82554a296697d1b922ad45084a0bd AUX hydra-8.4-configure.patch 1217 BLAKE2B 005cd700dd32e56405afa7a37d630aa8b2fe66f94b16b1fe09e6a5172aa5ef1c5e6896b697717e6b0524b5fd8b41443a8c5a734b1273843e54a6aebaed563c62 SHA512 18d76ac35660955a07ba435bf00ceebcd62423fd08c97237f7aa3be4187532f454997008be5395b2d8ae9d66e10204f76905481034c3e5cb1761aec2b02e32c3 +AUX hydra-9.0-unneeded-buf.patch 1503 BLAKE2B 3d8da1b656263e2abcc68e3b2b2f6c2c4937d684c7080105c2821678711146d864c6ccb2985df0e17673f4e762b5e0fc078c35e5f460a93df9891920e873ca23 SHA512 34ffce41ebebed70529eec9a6f617493fc323792fc2f7771fb1fd62bfd6fa5ae5fa96c49910dc79f8e72cee6cdc88afe0505b8f41053db8e3f64016e8f479a01 +AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1fc8f8c83f98d6429499ffd6d5d54983242415676a9556caedf5c58163ad0b09a00db2545d26f9630c145 SHA512 a4f554526cbfdf0560c1866f158a210b0fbd510a60fa2ad8e8c2cca0bb4ecf58e3eeb10d3bac747162231585c3ea827e10c0a4f4fb9e949832673afc6f9b93cf DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f6210dd6128d3ab48ad16ca3a8fad49709163830049ed8b9bb6891861f9c3f5fd5a6179b0a87a072877e829af SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338 -EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5 +EBUILD hydra-8.1.ebuild 2232 BLAKE2B bbd80c05a0689455f7fb6be8ac1da7a076b464bc76abaea121c1437512e555759c030b4963c3ea28e035821136aaaf378b96d6eef1e3bbddde4f3f7f9ea08eed SHA512 41e1b07452dfe5752cd5204328acbad7205ec4ba76117655768d427aa0097a20ab241f69d588571b055302de0d4870acc87a324433411174e2b7ad9c202143a3 EBUILD hydra-8.9.1.ebuild 2394 BLAKE2B 942e94342043c63494b63125d11bce1b789245e7ef40b473736ec3d7b0f14f759e80607c73d1b0b0a938b8de89bc27e7ad5e1a8556498a428db316145bb4acff SHA512 78af7fbdf73aaf1e1cc7e35352f070eee13cd757f502c229fd9b30d6e807bf0360a7344ac1e8106ee3c8f590b6df4a650f4f251d4b7541849363ad040e03f303 +EBUILD hydra-9.0-r1.ebuild 3780 BLAKE2B 98de0efd400e19c14e9575d3fb36e082ff3ae10d6f7f67ed941bf1520cc25e29ded776e7b9d174d58ad63f0246c1bb5f4d58d62d6fe6c91803d942e7484db799 SHA512 7ba1f10e2da24b8f0c3ceb86a0f0de42a50105e4cba7d21edc12bb10c6133e3152bfcc655eebcd5ad2473bcac9c6ddb9213f552c42284488b9dbaf0c0f548399 EBUILD hydra-9.0.ebuild 3659 BLAKE2B 2630cf4e6cb3c2fa8ef7bdc00cab68ec20cb65160027216082a8828f7209766b414f3aa3e028267335388d91f43631648c2740fff34758b236362f0d92952ff2 SHA512 506906ec7e84934468f99449dd53bcea8ebef07e8176f17792b2641791404aa8ffc343b9ff425bbff204095d01c7e90bcaff30b4cb8959d1d8aae004a8606a23 -EBUILD hydra-9999999.ebuild 3602 BLAKE2B 00bfabe6800b5f180343e001a7f2513a96b487b9186edf9943e27a0fcaf9c0aeb321ee392c06f6f4ae19783618b62d9e8cc6d618838fcf0621d066e6266f0b03 SHA512 55af31206a407598877cacd13112af5951ff730227dc2040bab8f388975777092f227fe2dc87d2adca0e9fd6b6550b87fe63b4c3aa1e194c7e2a6f9e5de1ce8d +EBUILD hydra-9999999.ebuild 3629 BLAKE2B a4067027c780bc3bf3d2bd3b662b79e7ff90c0c909134a7d739fd34ffe373e7447048b7fdf5b60cec6614e5dbe29843a4b6534c61709e3db8a5f4170e1ed84cf SHA512 74ee710cb68a48abba67f2edcd4f89229cdfbbeafe6c6815d5eabe9bc482f0e409d42be5b7b05051872ccf02011dcb0342b7fd12a2deae4397048d41ce7d1520 MISC metadata.xml 570 BLAKE2B fba8cf56f3f091fdf16a86ee3a1b964e9dfc0cae8a32e6fb81b8ccec3f1efe47dfac838c86fadd80e736d4a82233e8f84695c0a0987d4f426ab88fe0841df70f SHA512 45d0573055b0fe5f820e92cd43627e5c48dee8a1151ef06c7f65dddb8078ff62197bd5c8bbd1e1b12a42df61e399f2e3bff337201fa37df085339de24c8b50ba diff --git a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch new file mode 100644 index 000000000000..0055257b04a0 --- /dev/null +++ b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch @@ -0,0 +1,60 @@ +--- a/hydra-irc.c ++++ b/hydra-irc.c +@@ -7,7 +7,6 @@ RFC 1459: Internet Relay Chat Protocol + */ + + extern char *HYDRA_EXIT; +-char *buf; + char buffer[300] = ""; + int32_t myport = PORT_IRC, mysslport = PORT_IRC_SSL; + +--- a/hydra-rexec.c ++++ b/hydra-rexec.c +@@ -5,7 +5,6 @@ + #define COMMAND "/bin/ls /" + + extern char *HYDRA_EXIT; +-char *buf; + + int32_t start_rexec(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { + char *empty = ""; +--- a/hydra-rlogin.c ++++ b/hydra-rlogin.c +@@ -12,7 +12,6 @@ no memleaks found on 110425 + #define TERM "vt100/9600" + + extern char *HYDRA_EXIT; +-char *buf; + + int32_t start_rlogin(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { + char *empty = ""; +--- a/hydra-rsh.c ++++ b/hydra-rsh.c +@@ -11,7 +11,6 @@ no memleaks found on 110425 + */ + + extern char *HYDRA_EXIT; +-char *buf; + + int32_t start_rsh(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { + char *empty = ""; +--- a/hydra-rtsp.c ++++ b/hydra-rtsp.c +@@ -12,7 +12,6 @@ + #include "sasl.h" + + extern char *HYDRA_EXIT; +-char *buf; + char packet[500]; + char packet2[500]; + +--- a/hydra-teamspeak.c ++++ b/hydra-teamspeak.c +@@ -36,7 +36,6 @@ struct team_speak { + extern int32_t hydra_data_ready_timed(int32_t socket, long sec, long usec); + + extern char *HYDRA_EXIT; +-char *buf; + + int32_t start_teamspeak(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { + char *empty = ""; diff --git a/net-analyzer/hydra/files/hydra-9.0-vnc.patch b/net-analyzer/hydra/files/hydra-9.0-vnc.patch new file mode 100644 index 000000000000..69c933ee8386 --- /dev/null +++ b/net-analyzer/hydra/files/hydra-9.0-vnc.patch @@ -0,0 +1,11 @@ +--- a/hydra-vnc.c ++++ b/hydra-vnc.c +@@ -75,7 +75,7 @@ int32_t start_vnc(int32_t s, char *ip, int32_t port, unsigned char options, char + //supported security type + switch (buf2[3]) { + case 0x0: +- hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf[3]); ++ hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf2[3]); + hydra_child_exit(0); + break; + case 0x1: diff --git a/net-analyzer/hydra/hydra-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild index 80610ce9cb2e..2aef23f9b8fd 100644 --- a/net-analyzer/hydra/hydra-8.1.ebuild +++ b/net-analyzer/hydra/hydra-8.1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion" RDEPEND=" diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild new file mode 100644 index 000000000000..402929ea2301 --- /dev/null +++ b/net-analyzer/hydra/hydra-9.0-r1.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Parallelized network login hacker" +HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" +SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE=" + debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses + oracle pcre postgres rdp libssh subversion zlib +" + +RDEPEND=" + gtk? ( + dev-libs/atk + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) + firebird? ( dev-db/firebird ) + gcrypt? ( dev-libs/libgcrypt ) + idn? ( net-dns/libidn:0= ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + memcached? ( dev-libs/libmemcached[sasl] ) + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:0= ) + ncp? ( net-fs/ncpfs ) + ncurses? ( sys-libs/ncurses:= ) + oracle? ( dev-db/oracle-instantclient-basic ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql:* ) + rdp? ( net-misc/freerdp ) + libssh? ( >=net-libs/libssh-0.4.0 ) + subversion? ( dev-vcs/subversion ) + zlib? ( sys-libs/zlib ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${PN}-9.0-unneeded-buf.patch + "${FILESDIR}"/${PN}-9.0-vnc.patch +) +S=${WORKDIR}/thc-${P} + +src_prepare() { + default + + # None of the settings in Makefile.unix are useful to us + mv Makefile.unix{,.gentoo_unused} || die + touch Makefile.unix || die + + sed -i \ + -e 's:|| echo.*$::' \ + -e '/\t-$(CC)/s:-::' \ + -e '/^OPTS/{s|=|+=|;s| -O3||}' \ + -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ + Makefile.am || die +} + +src_configure() { + # Note: the top level configure script is not autoconf-based + tc-export CC PKG_CONFIG + + append-cflags -fcommon + + export OPTS="${CFLAGS}" + + hydra_sed() { + if use ${1}; then + einfo "Enabling ${1}" + if [[ -n "${3}" ]]; then + sed -i 's#'"${2}"'#'"${3}"'#' configure || die + fi + else + einfo "Disabling ${1}" + sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die + fi + } + + hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD' + hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT' + hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H' + hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH' + hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' + hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' + hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' + hydra_sed ncp '-lncp' '' '-DLIBNCP' + hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' + hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' + hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' + hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE' + hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2' + # TODO: https://bugs.gentoo.org/686148 + #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' + hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' + hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' + + sh configure \ + $(use gtk || echo --disable-xhydra) \ + $(usex debug '--debug' '') \ + --nostrip \ + --prefix=/usr \ + || die + + if use gtk ; then + pushd hydra-gtk || die + econf + fi +} + +src_compile() { + emake XLIBPATHS='' + use gtk && emake -C hydra-gtk +} + +src_install() { + dobin hydra pw-inspector + use gtk && dobin hydra-gtk/src/xhydra + dodoc CHANGES README +} diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild index 9ef6f73c7ec4..3ff5496cc9b3 100644 --- a/net-analyzer/hydra/hydra-9999999.ebuild +++ b/net-analyzer/hydra/hydra-9999999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 toolchain-funcs +inherit flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Parallelized network login hacker" HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" @@ -64,6 +64,7 @@ src_prepare() { src_configure() { # Note: the top level configure script is not autoconf-based tc-export CC PKG_CONFIG + append-cflags -fcommon export OPTS="${CFLAGS}" @@ -81,21 +82,21 @@ src_configure() { hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD' hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT' - hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H' - hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH' - hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' - hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' + hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H' + hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH' + hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' + hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' hydra_sed ncp '-lncp' '' '-DLIBNCP' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' - hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' + hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' + hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' + hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE' - hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2' + hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2' # TODO: https://bugs.gentoo.org/686148 - #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' + #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' + hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' sh configure \ $(use gtk || echo --disable-xhydra) \ diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest index 37e911b72f00..c240a0bd0604 100644 --- a/net-analyzer/iftop/Manifest +++ b/net-analyzer/iftop/Manifest @@ -2,12 +2,13 @@ AUX ax_pthread.m4 12983 BLAKE2B b1cbb45242493f9bf998ec82cf754b894d77ee4e1d3ed33b AUX iftop-1.0_pre4-Makefile.am.patch 378 BLAKE2B 52029c14bc6afcd4d8cb86099fa78f00720af3d26384cdf059d005d768b8c226b459b5c1ebe2c936f20bb1afa033aa4560c488f98400b6cef162ebdcff3b7e03 SHA512 c7a81669de83701054493ee0f9979da8bfa481bd0769a501364598889cfb5aa762473e5099904ee13dad9052bfdd27913306df8ad4a91132532ac874504321fa AUX iftop-1.0_pre4-configure.ac.patch 9916 BLAKE2B deab542e4b33905e0ad215aa70498671cf5c4f7118a1ab3b8639bd992f540068a0cd3c7f846120686662825db864be9e3307cc1691b1ef86c8bc73b0e847d0f0 SHA512 5b83cdb69805d3ed8b188b1390d1d536dc99732312fa49951fad38810c7eb9c931d04daaaea7152d5289352dd3d167907ac5a25a994e4b1584b7b5a578fc0698 AUX iftop-1.0_pre4-fix-MAC-formatting.patch 681 BLAKE2B b2e08269284722d55d08329d45c2628c0813d72ba96df76280e601c3dbbbd6eeb02b7b53a35ae921e0625321c5c91e64ddffa84cc611490747dfdb4445f313f8 SHA512 7a7a2fdc756d0f31a1950f8c1c26f76eda09f9ea673f8224f98deb82026c0c3ec00d7001a5ba3175a4e4660927604334988a6b08b6208bfdd16be9afd4a5ed37 +AUX iftop-1.0_pre4-fno-common.patch 1194 BLAKE2B 4270667d232ade7db8d99f215789f00f8dde7550e6677b66a924ab8d74e22a0f6e4298e85cc05a0dc707208788ff37a74345966d3c4778d29098e70d6ea836ac SHA512 7a98fe8dbcaab0164b34916c4ab9538781531b8eabb46ac452c369ff06968632bd0e5c865c133e18b7f0cf2ea77fb806002195ec183593e54b119806ea56b9b0 AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a919abcaf578babc2d7de05b7828a7c847a2ad65ece44e91bab29aead849d0f65bffae0ed680e03fe07f218a15cefe13fd SHA512 8fed0043412a25a702d252f0bbf36b199c9222c18ac9bb47ef725885a9faaacb12bf6e5debd5885544ace68065bfda12c2b6ccf7e11f2834cf3f86f6657bfcba AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22 -EBUILD iftop-1.0_pre4-r2.ebuild 932 BLAKE2B 8366d108b7c183a5dbda391f4ca3e134b6e794840faed54609b63ff8eca3e34a6344f369ba8787f6dc16302bb857daf73a243a7688cf3c45a4405ec684c009a9 SHA512 49523a3f3ac3e61e0e93b2cbcecc058dcd32aab67691e62c18e37b9d432539340dd22a0a174d778aac5d164773f1ba816b9ee681c3861b7a49340d3091e2dccb +EBUILD iftop-1.0_pre4-r2.ebuild 933 BLAKE2B ce758a0de766e481f8f1186145fd8cb1e2f5a7a96a62739ee6ddfd187329b3e9d2f5b7c32d80d6ad7e851c65fa8a864c2f4995c7c43054b5a970de7583e117a6 SHA512 1c3324960619e5513d6ace90ff71455f84161107fd19233e66ca24495b7a0fbc08ad4dd10dfb5ebecea23854506601c154305d746148516db43bfb140e88aa22 EBUILD iftop-1.0_pre4-r3.ebuild 967 BLAKE2B 3c772cb506cb89668fec11e768e7fd3a8867883c553a91d12c718391afc7c6f66236a5a298f8181a5e9b497e347e3e56ffb2abf6800730325bf02a728b6da0af SHA512 99150916518329e9af9b0c005f728f9280405ed5c6aab1caa01b035481d11c97e68d898bcaa5a742224c081bc1b9b4b3cd100ba12ccbcef0cb9c074d5e848af6 -EBUILD iftop-1.0_pre4-r4.ebuild 1059 BLAKE2B 6f1da490a679870a64d3a6e7a332142c0b1b3e5db264f51b008298d22a85161cbe5d24be17a7f428394cda43dae3e273dbb0aef09468675223f305b32bc89156 SHA512 e6230f7bfc694be260f7f842cc1c436ee6d54be1a37eef53310e5437ae0667d1401c0123c322b2a7929758f022c6c706bc6beb2fc40330dcb048a6ed3e4eccfa -EBUILD iftop-9999999.ebuild 832 BLAKE2B feb1cc2f49365a06098ec2d90cbe02edb4edd0a598f390431473b829edc88ddcd415fbc902ab3f392481bda43085641e4fdd7ed875219209285b4d2abd64b199 SHA512 ce61354496ce1eb4e5e6073b61ac5eccd39b836c981a44f81e63b455d0206e0b4096642627554b01a0b6c5cb758f5a12e1a2859d3d66b078423d8b6a21ff3337 +EBUILD iftop-1.0_pre4-r4.ebuild 1106 BLAKE2B 3ee1172d92c73c97245755b626d11ca1b6763714e2add23dfebec41b764d7e666c99a44e1d6ddb144f9468968c1ed12b77206c375b86d75e266c6e8160aa2e8e SHA512 ccec613b80b771d0de500c6aaf07e079f59933a4dad5fd30d888468e8bf3b66bc9f933c0277d4a5e5611a8d9ac361f2f48a89f6f3435370d8564b2dbbca5b186 +EBUILD iftop-9999999.ebuild 879 BLAKE2B e9dec0c2587a447d304892be2b038542a3ac00e0cb47ce2465a8979c10829cf0d5a453ca4c40d5bfe3828900f855288eda1387225a5b6978d19344483d7eb64d SHA512 c8e2c9f166973105ae8786d98e790fa79cd9add436504ecdc4cfb5f154e485070b9b8d630485ed2c08f98945104c274ab5b807da0b1e3890496e8a3f20447e11 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760 diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch new file mode 100644 index 000000000000..13e0f1058f40 --- /dev/null +++ b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch @@ -0,0 +1,56 @@ +--- a/ui_common.c ++++ b/ui_common.c +@@ -28,6 +28,13 @@ + extern int history_pos; + extern int history_len; + ++sorted_list_type screen_list; ++host_pair_line totals; ++int peaksent, peakrecv, peaktotal; ++history_type history_totals; ++hash_type* screen_hash; ++hash_type* service_hash; ++ + /* + * Compare two screen lines based on bandwidth. Start comparing from the + * specified column +--- a/ui_common.h ++++ b/ui_common.h +@@ -33,12 +33,12 @@ + + extern options_t options; + +-sorted_list_type screen_list; +-host_pair_line totals; +-int peaksent, peakrecv, peaktotal; ++extern sorted_list_type screen_list; ++extern host_pair_line totals; ++extern int peaksent, peakrecv, peaktotal; + extern history_type history_totals; +-hash_type* screen_hash; +-hash_type* service_hash; ++extern hash_type* screen_hash; ++extern hash_type* service_hash; + + void analyse_data(void); + void screen_list_init(void); +--- a/ui.c ++++ b/ui.c +@@ -253,7 +253,6 @@ + } + } + +-extern history_type history_totals; + + + void ui_print() { +--- a/iftop.c ++++ b/iftop.c +@@ -66,7 +66,6 @@ + extern options_t options; + + hash_type* history; +-history_type history_totals; + time_t last_timestamp; + time_t first_timestamp; + int history_pos = 0; diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild index 66d4ef612643..c283ad552512 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="" RDEPEND=" diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild index 8221ce61ddb3..3f9d11ed9b42 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,6 +26,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0_pre4-tsent-set-but-not-used.patch "${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch + "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch ) S="${WORKDIR}"/${P/_/} diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild index 5e2de84db474..f67befd3bc29 100644 --- a/net-analyzer/iftop/iftop-9999999.ebuild +++ b/net-analyzer/iftop/iftop-9999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,6 +25,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch "${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch + "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch ) src_prepare() { diff --git a/net-analyzer/ipguard/Manifest b/net-analyzer/ipguard/Manifest index c7ce69bbefd1..7d75b07717a6 100644 --- a/net-analyzer/ipguard/Manifest +++ b/net-analyzer/ipguard/Manifest @@ -1,4 +1,8 @@ +AUX ipguard-1.04-fno-common.patch 2149 BLAKE2B d87d6c8f8d92ffdcc0db658b6275f32b6904fcb8b3e772c8e25fd07de2d19309a327d3e7d21d0228956b7a69740e4ffb92b562dee7e64ab400347124ee089a68 SHA512 de897dd7be90aa218a4c36341afa582bf478963bb4e91b8d51d2de81546634b6c0400086cd89de54becfe94b79a9920651beed147391c72ca0dffd218ce05cde +AUX ipguard-1.04-gentoo.patch 1208 BLAKE2B ee4ee3284822422c6993bce0c282c608f5f9bc58f6007f4364a50eb2e0279c82bcfcf65bff4cb0e08a71653095a1a2c4ee6fd29d450369ef2d5a46ddcc31eb54 SHA512 762ca395c95eb2f2a01117d4a6856b2949c8bd2bebe06c1c857310044e0358bb0bc33ac36c1beedf8998b71bee508e381024ed9aa229094bc2567d86aa1465bf +AUX ipguard-1.04-init.d.patch 931 BLAKE2B e18d1a5d9058f34a47262c0033e9a93118ee9c8b811a2938de9e6dc41352e7fe02e6be3893c56c6891202cc9449fd3b506d526cb32d8fc348f2c3f0ac1f6cc94 SHA512 1715711f7ef90f4e7c4c92a7b9f411ce3af633b6599bdcd393fa9cf0f0272170b1b9b190a177f447068e1d17bf29de1783148ce51e21e254e63859e77efb5fc8 +AUX ipguard-1.04-runpath.patch 288 BLAKE2B 45658be6e0478b1d4e29f27f9b6e39999368202b985b2ebc9ff4fd20c71388974250f555b9c9790b985095190d12df13625b83200636cbb31c1f6de2d0acb353 SHA512 49b07785bbf188ed1fd522591f3ee1af7a4001bf9baffabe63de6a27738a365f79ffc268d039ae9567622c26898cc68ffee61cb8ecf31bddd207f69897ed5a7c AUX ipguard.confd 186 BLAKE2B cd3e58efb088134c2ff340360be06ab0f9159b14c766b159dcb546d0136ccd65807b7c33bb89d45565179ead01d43f8da29bfdb19dfe59ba5e0008dc81dc2e82 SHA512 efb47689d944ce77863b7cd1722bba974fbf573af2e1051c08166a535dd8284f2cc820a624531d1c60e099e6da06d59f3659ab52b4b3557f3e1f4bf5c572f58d DIST ipguard-1.04.tar.gz 24566 BLAKE2B c9d543e6f7886c3b6377fbfe95e91e2d786da6a92fe445c9500c8b7ea6fb859bf8550daf9c83de425494376d0ed7197158e5ff9499a97417793b439e82004326 SHA512 c29c3f594e09ad1c06ca7297f794ddfada48da7ec2b98786694cd6af7508cbff232889e0c90718d96519297870b93132b7b0f9f310a0e4d7a7c2d54a30ca893c -EBUILD ipguard-1.04-r1.ebuild 1236 BLAKE2B 534eb12f57b29e922d67c27cb1c470f03c9a5cd9eab2eb4e0788fbb0327e700e7fe3cf77f2d5eccdf55474e2acddb0f866b2c0666a6cfb3b60e4adaa2d12b416 SHA512 e860a8c4ee4893cc380ba3e1d12d760661f4bf50229fb43a4f0ffff1dc93f88ecdb7aa858c9f15133019b69797235a089bec713cb0b74e514d625b0ea88a6c11 +EBUILD ipguard-1.04-r1.ebuild 956 BLAKE2B 5a0e60ae2a7ffe1e483c9c946a52ad77034f894e658ed2e93f4f6196ec9170b352d9cbfdcf96e1dab97e857aa3de2e62277f52484ddea2d88329b3869ddfc45a SHA512 bdc54abe0e7304b68171f41de9a3dc401f4679873b867fdfba866c4d0cbfd149366eb98d96379ec23d706daf0eb48275ac8a418a5e58c1240b28b1975b6403c0 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/ipguard/files/ipguard-1.04-fno-common.patch b/net-analyzer/ipguard/files/ipguard-1.04-fno-common.patch new file mode 100644 index 000000000000..414a91ec09a0 --- /dev/null +++ b/net-analyzer/ipguard/files/ipguard-1.04-fno-common.patch @@ -0,0 +1,98 @@ +--- a/ipguard.c ++++ b/ipguard.c +@@ -29,6 +29,34 @@ + + #include "ipguard.h" + ++char iface[IFNAMSIZ]; ++char ethers_name[PATH_MAX]; ++char log_name[PATH_MAX]; ++char pid_name[PATH_MAX]; ++char fmac[18]; ++char pcapf[PCAPFSIZ]; ++char suser[MAXLOGNAME]; ++int ethers_update; ++int fake_regen; ++int fake_num; ++int fake_time; ++int buffer_num; ++int addr_nosubst; ++int nofirst; ++int grant; ++int read_only; ++int duplex; ++int fixbc; ++int hidden; ++int promisc; ++int debug; ++int verbose; ++ ++unsigned int all, good, grat, wgrat, zmac, zip, bad, bmac, bsip, btip, ++ bnew, bgrat, mymac, fake, pfake, nzh, nbe, mis; ++char pfmac[18]; ++char s[128+1]; ++ + void usage(char *name) { + fprintf(stdout, "%s v%s (c) %s <%s>\n\n", NAME, VERSION, AUTHOR, MAIL); + fprintf(stdout, "usage: %s [-h] [-ajgrxziovd]\n", name); +--- a/ipguard.h ++++ b/ipguard.h +@@ -68,33 +68,33 @@ + #define NOTICE 3 + #define INFO 4 + +-char iface[IFNAMSIZ]; +-char ethers_name[PATH_MAX]; +-char log_name[PATH_MAX]; +-char pid_name[PATH_MAX]; +-char fmac[18]; +-char pcapf[PCAPFSIZ]; +-char suser[MAXLOGNAME]; +-int ethers_update; +-int fake_regen; +-int fake_num; +-int fake_time; +-int buffer_num; +-int addr_nosubst; +-int nofirst; +-int grant; +-int read_only; +-int duplex; +-int fixbc; +-int hidden; +-int promisc; +-int debug; +-int verbose; ++extern char iface[IFNAMSIZ]; ++extern char ethers_name[PATH_MAX]; ++extern char log_name[PATH_MAX]; ++extern char pid_name[PATH_MAX]; ++extern char fmac[18]; ++extern char pcapf[PCAPFSIZ]; ++extern char suser[MAXLOGNAME]; ++extern int ethers_update; ++extern int fake_regen; ++extern int fake_num; ++extern int fake_time; ++extern int buffer_num; ++extern int addr_nosubst; ++extern int nofirst; ++extern int grant; ++extern int read_only; ++extern int duplex; ++extern int fixbc; ++extern int hidden; ++extern int promisc; ++extern int debug; ++extern int verbose; + +-unsigned int all, good, grat, wgrat, zmac, zip, bad, bmac, bsip, btip, ++extern unsigned int all, good, grat, wgrat, zmac, zip, bad, bmac, bsip, btip, + bnew, bgrat, mymac, fake, pfake, nzh, nbe, mis; +-char pfmac[18]; +-char s[128+1]; ++extern char pfmac[18]; ++extern char s[128+1]; + + /* ethers.c + */ diff --git a/net-analyzer/ipguard/files/ipguard-1.04-gentoo.patch b/net-analyzer/ipguard/files/ipguard-1.04-gentoo.patch new file mode 100644 index 000000000000..7d66038581b2 --- /dev/null +++ b/net-analyzer/ipguard/files/ipguard-1.04-gentoo.patch @@ -0,0 +1,50 @@ +--- a/Makefile ++++ b/Makefile +@@ -28,13 +28,13 @@ + STATIC= + CC=gcc + +-CFLAGS+=-g -Wall -DETHERS='"$(ETHERS)"' ++CFLAGS+=-Wall -DETHERS='"$(ETHERS)"' + + OBJS=ethers.o ipguard.o packet.o system.o + + .c.o: + @echo Compiling $*.c +- @$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< ++ $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFINES) $< + + all: start $(NAME) + +@@ -47,7 +47,7 @@ + + $(NAME): $(OBJS) + @echo Linking $@ +- @$(CC) -o $@ $(OBJS) $(LIBS) $(STATIC) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(STATIC) + + clean: + @echo Cleaning OBJS +@@ -58,16 +58,16 @@ + @rm -f $(NAME) + + install: all +- mkdir -p -m 755 $(PREFIX)/sbin +- install -s -m 755 $(NAME) $(PREFIX)/sbin/$(NAME) +- mkdir -p -m 755 $(PREFIX)/man/man8 +- install -m 644 doc/$(NAME).8 $(PREFIX)/man/man8/$(NAME).8 ++ mkdir -p -m 755 ${D}$(PREFIX)/sbin ++ install -m 755 $(NAME) ${D}$(PREFIX)/sbin/$(NAME) ++ mkdir -p -m 755 ${D}$(PREFIX)/share/man/man8 ++ install -m 644 doc/$(NAME).8 ${D}$(PREFIX)/share/man/man8/$(NAME).8 + + uninstall: deinstall + + deinstall: +- rm -f $(PREFIX)/man/man8/$(NAME).8 +- rm -f $(PREFIX)/sbin/$(NAME) ++ rm -f ${D}$(PREFIX)/share/man/man8/$(NAME).8 ++ rm -f ${D}$(PREFIX)/sbin/$(NAME) + + ethers.o: ipguard.h + ipguard.o: ipguard.h diff --git a/net-analyzer/ipguard/files/ipguard-1.04-init.d.patch b/net-analyzer/ipguard/files/ipguard-1.04-init.d.patch new file mode 100644 index 000000000000..447d818bf965 --- /dev/null +++ b/net-analyzer/ipguard/files/ipguard-1.04-init.d.patch @@ -0,0 +1,36 @@ +--- a/doc/ipguard.gentoo ++++ b/doc/ipguard.gentoo +@@ -1,7 +1,7 @@ + #! /sbin/runscript + ## $Id: ipguard.gentoo,v 1.5 2010/07/12 03:46:52 sead Exp $ + +-opts="reload" ++extra_commands="reload" + + depend() { + use net +@@ -9,20 +9,20 @@ + + start() { + ebegin "Starting ipguard" +- start-stop-daemon --start --quiet --pidfile /var/run/ipguard.pid \ +- --exec /usr/sbin/ipguard -- -u 300 -xz ++ start-stop-daemon --start --quiet --pidfile /run/ipguard.pid \ ++ --exec /usr/sbin/ipguard -- ${OPTS} ${IFACE} + eend $? + } + + stop() { + ebegin "Stopping ipguard" +- start-stop-daemon --stop --quiet --pidfile /var/run/ipguard.pid ++ start-stop-daemon --stop --quiet --pidfile /run/ipguard.pid + eend $? + } + + reload() { + ebegin "Reloading ipguard" +- start-stop-daemon --stop --quiet --pidfile /var/run/ipguard.pid \ ++ start-stop-daemon --stop --quiet --pidfile /run/ipguard.pid \ + --signal HUP + eend $? + } diff --git a/net-analyzer/ipguard/files/ipguard-1.04-runpath.patch b/net-analyzer/ipguard/files/ipguard-1.04-runpath.patch new file mode 100644 index 000000000000..930f2cc84fde --- /dev/null +++ b/net-analyzer/ipguard/files/ipguard-1.04-runpath.patch @@ -0,0 +1,11 @@ +--- a/ipguard.h ++++ b/ipguard.h +@@ -53,7 +53,7 @@ + + #define ETHERSFILE ETHERS + #define LOGNAME "/var/log/ipguard" +-#define PIDNAME "/var/run/ipguard" ++#define PIDNAME "/run/ipguard" + #define FAKEMAC "de:ad:xx:xx:xx:xx" + #define PCAPFSIZ 128 + diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild index a30baf79b5e9..73efd0b68720 100644 --- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild +++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild @@ -19,27 +19,12 @@ DEPEND=" RDEPEND=" ${DEPEND} " - -src_prepare() { - default - - sed -i \ - -e 's|-g ||g' \ - -e 's| @$(CC)| $(CC)|g' \ - -e 's| -s | |g' \ - -e 's| -o | $(CFLAGS) $(LDFLAGS)&|g' \ - -e 's|$(PREFIX)|${D}&|g' \ - -e 's|/man/|/share&|g' \ - Makefile || die - sed -i \ - -e 's|opts=|extra_commands=|g' \ - -e 's|/var/run/|/run/|g' \ - -e 's|-u 300 -xz|${OPTS} ${IFACE}|g' \ - doc/${PN}.gentoo || die - sed -i \ - -e 's|/var/run/|/run/|g' \ - doc/${PN}.8 ${PN}.h || die -} +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-init.d.patch + "${FILESDIR}"/${P}-runpath.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_compile() { emake \ diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest index becb9d59b2c9..8793e99baea8 100644 --- a/net-analyzer/iplog/Manifest +++ b/net-analyzer/iplog/Manifest @@ -1,5 +1,5 @@ AUX 2.2.3-DLT_LINUX_SSL.patch 7265 BLAKE2B a20edebe47d65d066b1b3e214d8365b4a5811a7be4f600028edc11fc4c17e48f8396c34335a855299da17534a52dc89c916c890ae50a147620988b5f3c6ca8d9 SHA512 de93d97688e1079e480c138abc1a25572c47f2e045f70c98b7ba2c2098bcfffdb36997aab0a4272cbe908bead503b2531543368ac35624527cb8c0640594ad4b AUX iplog.rc6 776 BLAKE2B fba34208b2d16ba508cc9c3592e21eb7f0a479a89bf4617320bd9627047024f0cadde7fef55304baf25f7ccc56836e899b71801141b1802facc8b885b9b121ad SHA512 f0c3965810f7005e1ae183a2f3ed66ba06c054fcfd78da6277eaa364518ebffb9f44a0c99200b0d3042a63d4c57141d5b29823e8bc1d3f030e00d8e913021a34 DIST iplog-2.2.3.tar.gz 133639 BLAKE2B f8108259f3f9b662297785988c40711d9d4ce6381377ed9a797f441c84fd1dcd9f0c3832e07ed9a660ddcc41bc52777136204274de873b72bce151327738ec2d SHA512 d7669e39b728af366b5199c58d396c6907496b4895ffb1ba0cba54fae0646f9792170f932de1eae9634b5ac356644a5d6d0ccaf7bc77a62641695992245c9aed -EBUILD iplog-2.2.3-r2.ebuild 709 BLAKE2B b2f78c39fa5ca485475a1b40dd9153bd048f89987b408cbcd99cb7d1a5e8fc5b004a380946991154643d614f0515ca1fafd6db2f09c09d0c42099d627dc4eeab SHA512 b2aa94771961b9c9e98c9616c1e929819dd9b5da08dd3b75cdb9a8035d30ff11002f6babcbc9604f2919dabfd687109aa8ada13012da22594ebae80c4fa274bb +EBUILD iplog-2.2.3-r2.ebuild 710 BLAKE2B e26ba8cd202c6ecb76ef55beb9ce88e1c13890bff25504189bf0670839e6974f718e737e5504db3d7a16550c97cdc8864f7791068cea06be05a464290479f41c SHA512 9678939395ab90371d9de92960780610481ae3019109edfc336d43b756cb31f3467a1b6a7ee963c874744590f09d04d9f61e845fbc198de62fa1c74428da2e82 MISC metadata.xml 423 BLAKE2B f00b41a2638be0f6eeeae4f6471603053085b171569584bc999c903ad6413c43bdea2e27084c987d1246f17a82353c72b14b9f72f6b1c3d5d14b850e27c923c7 SHA512 e3bd873037dd3fbbdb8fa401e2da3c8c6bb35305b63c2bb4cbc0213d5089e714b48c67fa625037b9342c5f8d136363e558583acd864e99e0f5bc591a9bec639d diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild index fc60e63e57a1..90c0ebe9275b 100644 --- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild +++ b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz" LICENSE="|| ( GPL-2 FDL-1.1 )" SLOT="0" -KEYWORDS="alpha ~amd64 ~mips ppc sparc x86" +KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest index f5bb8f2d27a8..66f74a906bee 100644 --- a/net-analyzer/iptraf-ng/Manifest +++ b/net-analyzer/iptraf-ng/Manifest @@ -3,7 +3,7 @@ AUX iptraf-ng-1.1.4-sprintf-format.patch 551 BLAKE2B 93a83234723924f80fa267b7bd2 AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bffd28bec622e008baa532353e90c5f275f10333dbbe1b67d9e2b801bbb424ea56628808b0f0a6f06fda6ee682deed42c71c9387a3ab SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6 DIST iptraf-ng-1.1.4-github.tar.gz 556843 BLAKE2B 6f4e2bd8c4cf271d90732810f0ba6ab146b3471b723e657c180cf95ce8e1361d18c6803d5da56e872b0e49234956304fe1ff5532fde1332bc30a51a77ef8bdc0 SHA512 675165e08f979daf70fdbd0bd7ae24803860a182f3f1f6e6905f79f65b283470eedcc7e2f8608006c92af258cfad49c0b571652d843107cc79ad8eda63d4e5cb DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774 -EBUILD iptraf-ng-1.1.4-r1.ebuild 1330 BLAKE2B 909e0003854fd0fc6221705b7e1a43fa9ecad1f2a2e1660479288ae8a265efebb51743f08096d03b9e7c470e18df92e458fc79e8c331fd5de4a99d6f634dbf9e SHA512 8e47e2b556632445670916d1fddea8254f9078c3237c4c48f076cf7b61ebe5ccae30600d7485cb518b56ccf9e235dbdd72e3bbcd18a08a591bfde3ba3702b85c +EBUILD iptraf-ng-1.1.4-r1.ebuild 1331 BLAKE2B 43d7a54c5b1379f53552014095f2b5f091a8545710606806584bb29bd7da9a070be9c096fec71dfaa553cd51a51e698fa05a1f4a582d2a49b9d90769b1ef1e2e SHA512 1669c4f978e68550df83eedda832e25ce53e7dc210ece67869263bd7d80405e7b15134ad8d4bb81fac536be0822d3a7b3518ec402d45a4fbc86475a7cb673a22 EBUILD iptraf-ng-1.1.4-r2.ebuild 1434 BLAKE2B 557210a6fd82005b9dc18c56b531d34d35f47d87090a807818eb59107853b8a41e5a5ba4f5f7d4ee0e79a8c60b3194b7cf1903927579471966699e4565340bf0 SHA512 71fd8f9b5fcc3f36b46a09d15e6a1d1bfcf1643574a958b0a8228cfb1c56f542ee163de7aa661ad79fd4d6df06fb4d02399843d1372bf4552464ab468afda8e7 EBUILD iptraf-ng-1.1.4-r3.ebuild 1452 BLAKE2B fbbd65c88f6eaf0d715e6afd1a29ba83faa1e2a4bb86c08037808f1ea963f85fe6751e0cd124a9bdcce91d74247c86ec414f9db1cfe5df9b4afaefe2b5fccba2 SHA512 a9562595ce49b76f2edcef73a76219ede0c98a02e37bd79cce2797e79591d445a08c5b5bfdb5b617f5dcd5c20070842dad832939b207b923609822685e8b1f1d EBUILD iptraf-ng-9999.ebuild 1211 BLAKE2B de919ac3801e2b9b526f0c7064b5f5eb6ecaeab908b063e550060b93961dbb7b7bd9fc8cd2519c56bbad174d169ec2028c87b000f42c192c1046da6e0d4ba512 SHA512 68ab03abef69a33d4dd9e1349ec95e7ff0c932d116226f1fad114f805f05e58257d3616623b52da59b69836e6a03a3c4fb028e5b8308250d7507c675f78341fd diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild index def3a784a7ea..c02e763e16f2 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="doc" RESTRICT="test" diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest index f66a4be17ed3..0d8eeb224ef3 100644 --- a/net-analyzer/ipv6toolkit/Manifest +++ b/net-analyzer/ipv6toolkit/Manifest @@ -1,6 +1,7 @@ +AUX ipv6toolkit-2.1_p20190919-fno-common.patch 5414 BLAKE2B cf9f97ed1155044211e31f7c0d081d283681de63b5f9f00a910f29f91055675f8af8045db7ec77277a9f5bc518063677c9cd0d1cf7df44606a9b253f48089ed1 SHA512 939b9a113867d8a308c4a3802ca55d6c8e5bc050e5dc50ecf8558b2008bca6e734996ee091db33a16a6efbf14a12a00bc213616f0229fb143259d7b069dfe7dc DIST ipv6toolkit-2.0_p20160422.tar.gz 796716 BLAKE2B 468375afbf385ac9b571708be1baff0b0c56a0895bb73f3711522120b0e5fdfded3d73fea2a7d48b38f1e6387e0d63674c08eb503281f6eb635ea131ae67ec47 SHA512 532d6b76159fca03bdcebe341540a4071d2381dd3046469d0dfa5e8eecda5ffb4182d40658ef14c67bd11b781773bff1192e96d0ac4210c5ca095c6475d6c26d DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9 EBUILD ipv6toolkit-2.0_p20160422.ebuild 1245 BLAKE2B e108d57bf264bc9b0d1f42e83b638354520832267bfa6c700dd7630e163e5da3aeebe332be7786c21cb86dcbd216e579ed669d402373135440d98ea0fdabe014 SHA512 f3c18c571a6c341697135c3cb1b355bed43bc79a61bdf048c112819e312658b260b8afca432e046fa391a16af8e97d36644daf77dd11d236d3b70ae263d88ea7 -EBUILD ipv6toolkit-2.1_p20190919.ebuild 1158 BLAKE2B be8f899af0570e84204eb8f72cc4199f9d486b9ffe10d1a98496463577fe6d62b69add5e4e07fa93a5193f396cb7f772d2ce04f6759faebdae1fe6f9625127ae SHA512 29b9e9fbc19dd1f9400bf5fa4e350c5859ca1b650410f8f57a92898d3d933a67cec8af2e1d25fea1e44b09d091cc091e8705cf1ea91b26ba9d8c00ef88c58cfd -EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1 +EBUILD ipv6toolkit-2.1_p20190919.ebuild 1222 BLAKE2B 6f5666e4a94bdcfac16aa92f591c14199fd4b2d007adaded56bbe06b6d0648b2d9cb36e228efdf89283247f88267159735648181436c39dd76ee578e109c7613 SHA512 c31766b0b48b0fd62b459bef37a905722612c6f2ec86ab329f6f0cc56643a01b1cecc48aaf9efec6acba257cda496a87f300478991fbe511b67b86659d1bf8c9 +EBUILD ipv6toolkit-99999999.ebuild 1093 BLAKE2B 3dac02bc93aeb2d5428b074ea38655851d191ce32ac33fb31258909782f05cc1d93e7336dd47c5276ca7f50a7d2a33fa5e417514312d7541e3bbc555ee3f713c SHA512 fb3df9ea5c010e0a94d554fa87600b8a6d46b68127cf151008ac8daa9d9caca9dae930f2e603901a2a0b8ba71fb0f3906ba2d4aadc69fa7251649472b113cac4 MISC metadata.xml 527 BLAKE2B e275ef7193981f8415d0aa0973743deb8b4b0302fb093a26254dd0e681e072e175466869335c909c2f39ecc241f2de1e1a8135b0f6f59f17a566fcd5d9065e51 SHA512 acec773e132e352f4f81af6840f3370da00f48e5e13f39a2fccc441e5d119c5fac4319b24745eef1b4fb0921e8ace7456f7230432fd86978bb27cc54b7de3ec4 diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch new file mode 100644 index 000000000000..9d4a3dcffe9e --- /dev/null +++ b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch @@ -0,0 +1,192 @@ +--- a/tools/flow6.c ++++ b/tools/flow6.c +@@ -85,8 +85,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/frag6.c ++++ b/tools/frag6.c +@@ -94,8 +94,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/icmp6.c ++++ b/tools/icmp6.c +@@ -114,8 +114,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/ipv6toolkit.h ++++ b/tools/ipv6toolkit.h +@@ -2,3 +2,10 @@ + #define MAX_CMDLINE_OPT_LEN 40 + #define DATE_STR_LEN 40 + ++#include <pcap.h> ++#include <setjmp.h> ++ ++extern char errbuf[PCAP_ERRBUF_SIZE]; ++extern struct bpf_program pcap_filter; ++extern sigjmp_buf env; ++extern unsigned int canjump; +--- a/tools/jumbo6.c ++++ b/tools/jumbo6.c +@@ -80,8 +80,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/na6.c ++++ b/tools/na6.c +@@ -61,8 +61,7 @@ + struct in6_addr *pkt_ipv6addr; + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; + unsigned char buffer[65556]; + unsigned char *v6buffer, *ptr, *startofprefixes; +--- a/tools/ni6.c ++++ b/tools/ni6.c +@@ -90,8 +90,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + char domain[MAX_DOMAIN_LEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; +--- a/tools/ns6.c ++++ b/tools/ns6.c +@@ -59,8 +59,7 @@ + const u_char *pktdata; + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + + unsigned char buffer[65556]; + unsigned char *v6buffer, *ptr, *startofprefixes; +--- a/tools/path6.c ++++ b/tools/path6.c +@@ -88,8 +88,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/ra6.c ++++ b/tools/ra6.c +@@ -64,8 +64,7 @@ + struct in6_addr *pkt_ipv6addr; + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; + + unsigned char buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD]; +--- a/tools/rd6.c ++++ b/tools/rd6.c +@@ -106,8 +106,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/rs6.c ++++ b/tools/rs6.c +@@ -60,8 +60,7 @@ + struct in6_addr *pkt_ipv6addr; + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; + + unsigned char buffer[65556]; +--- a/tools/scan6.c ++++ b/tools/scan6.c +@@ -153,8 +153,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + char line[LINE_BUFFER_SIZE]; + unsigned char *v6buffer, *ptr, *startofprefixes; +@@ -269,10 +268,6 @@ + 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080}; + + +-/* IPv6 Address Resolution */ +-sigjmp_buf env; +-unsigned int canjump; +- + int main(int argc, char **argv){ + extern char *optarg; + int r; +--- a/tools/tcp6.c ++++ b/tools/tcp6.c +@@ -116,8 +116,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; +--- a/tools/udp6.c ++++ b/tools/udp6.c +@@ -99,8 +99,7 @@ + + bpf_u_int32 my_netmask; + bpf_u_int32 my_ip; +-struct bpf_program pcap_filter; +-char dev[64], errbuf[PCAP_ERRBUF_SIZE]; ++char dev[64]; + unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN]; + unsigned char *v6buffer, *ptr, *startofprefixes; + char *pref; diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild index 6a4df21782ca..bff5e134fff8 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild @@ -21,6 +21,9 @@ RDEPEND=" ${DEPEND} sys-apps/hwids " +PATCHES=( + "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch +) HWIDS_OUI_PATH=/usr/share/misc/oui.txt diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild index 8a862e677183..2248b0b2e758 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild @@ -19,6 +19,9 @@ RDEPEND=" ${DEPEND} sys-apps/hwids " +PATCHES=( + "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch +) HWIDS_OUI_PATH=/usr/share/misc/oui.txt diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest index e8137607816f..ed8814983e17 100644 --- a/net-analyzer/knocker/Manifest +++ b/net-analyzer/knocker/Manifest @@ -1,6 +1,7 @@ AUX knocker-0.7.1-fency.patch 5350 BLAKE2B 936b898918d794e3065eec8d867e467246c5b4e33ca3e92c5d37c0d3c66644ae1edb2d246e26c7178639f8295a0a67577e29778c5f8d99d650151b34d99ef4de SHA512 6836be77417fc4a5e98c9a5aa619a66eae012037162b78532fd0269ebeec54c7f91537c159d9a1374b1c9b470a632ba1a90d28cd7514155d98752bc59ab6d17b +AUX knocker-0.7.1-fno-common.patch 6208 BLAKE2B b8a77d7763f8725240aff2c49499fc9a16b52435cd859905540653dc08583b9f37b2172895b73735b35a15924b49d25ecab69dfc538015c38c45576073c3aa9d SHA512 f9f0292e8ee2d1dc91f17899fd911072325fbca80ae3bb0cd5aec7c6d3120f9ebbd35dc40acec34927927822f5685fd90a208c873dae82b65b42d3ff4ad26d38 AUX knocker-0.7.1-free.patch 607 BLAKE2B c19a36088b6cdce6b9e79555c349871e0aa47a9bcd9285cfa8944a267548e20fdc7df6f27c6dc3d8d123a8350b108325bbe754984b4cc9a05764a31daffc894c SHA512 f1f237747394a2ca6b14105be5461c98e441ecd3c4da0c1475ac6dfa717d2a0b004d3fb702b026b45f5f873c88d3f60b4fd5234dd445fd27346c95bc4c5c5671 AUX knocker-0.7.1-knocker_user_is_root.patch 221 BLAKE2B 45143bc54b31b1cce735499836682cc006dc2288bd927bf2269713582c3189ebd6ebf468bd019b00b8a31aa47f6f423b0a2c5fbc70719bb663c49ff525f6b6ce SHA512 42b4d4de839e0a606d091909f7bbba0031a6e337fa7b766bb737fd60006afdc87c368cdb642e9bf14ee1d7d0c5bd7b6193006ab0240230f819b67df155f1822d DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2 -EBUILD knocker-0.7.1-r3.ebuild 573 BLAKE2B 10d6aac45c603c55882c6a473603c0e083d6ef2f1314c1e47b3e7181ea0536339d38f2baa9db70a744503b818056c5cb026d4d2245d9de17a9a9f99bd8ef2bfe SHA512 c7fc5a7d144276829f3e6e4abbd9fb2adbdbc4768afdc32fb7ec97677c41c2453a3f6ed95b31f902d73c8efd9438c0db4dc8fb7f066095ca3e70d002017c2c87 +EBUILD knocker-0.7.1-r3.ebuild 608 BLAKE2B 3175166968725797d46f00947f67485e616436527926cd9dc1bbee4a04795c9af92f6cc1389a11d2bc1cdc7cdc39d64dfe62328e4956824510750b48ec2278b5 SHA512 72e82125db8319e9bcf183502a77c36f4f0bee383154e92e256f10d96b1f2d4ad46d8b4dc41e8bc8ec382db97d85eab192c27f6c6eeacd191346916f6d9ca0d8 MISC metadata.xml 357 BLAKE2B 14daef425c693f2b57dd70d7aea0b0e854305052d7751386339e4a34c47b6ff574cc9cfbce4986bab92e639e51760addf85a3517594621f991ba4c148d416ed2 SHA512 e74b8f089a05b739cd6e7864802a5e6759b416d41f122e45ea529feadd69ecd04aff2ed695687710eba64dc24087f4fd364dbda33b59f9983aa453c3d699ba69 diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch b/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch new file mode 100644 index 000000000000..0b5247a653a4 --- /dev/null +++ b/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch @@ -0,0 +1,215 @@ +--- a/src/knocker_args.c ++++ b/src/knocker_args.c +@@ -34,6 +34,7 @@ + + static int _have_last_host = 0; /* tells if we've got the host with the --last-host option */ + ++knocker_args_t knocker_args; /* command line arguments structure */ + + /* + ============================================================================ +--- a/src/knocker_args.h ++++ b/src/knocker_args.h +@@ -93,7 +93,7 @@ + } knocker_args_t; + + +-knocker_args_t knocker_args; /* command line arguments structure */ ++extern knocker_args_t knocker_args; /* command line arguments structure */ + + /* + Initialize a knocker_args_t type of structure +--- a/src/knocker_conf.c ++++ b/src/knocker_conf.c +@@ -31,6 +31,11 @@ + #include "knocker_user.h" + #include "knocker_conf.h" + ++int KNOCKER_USER_COLOR; ++int KNOCKER_COLOR_1; ++int KNOCKER_COLOR_2; ++int KNOCKER_COLOR_1_ATTR; ++int KNOCKER_COLOR_2_ATTR; + + /* + ============================================================================ +--- a/src/knocker_conf.h ++++ b/src/knocker_conf.h +@@ -46,11 +46,11 @@ + /* The actual values variable */ + /* these values are read from the conf file */ + /* by the knocker_conf_parse function */ +-int KNOCKER_USER_COLOR; +-int KNOCKER_COLOR_1; +-int KNOCKER_COLOR_2; +-int KNOCKER_COLOR_1_ATTR; +-int KNOCKER_COLOR_2_ATTR; ++extern int KNOCKER_USER_COLOR; ++extern int KNOCKER_COLOR_1; ++extern int KNOCKER_COLOR_2; ++extern int KNOCKER_COLOR_1_ATTR; ++extern int KNOCKER_COLOR_2_ATTR; + + void knocker_conf_configure ( void ); + int knocker_conf_parse ( void ); +--- a/src/knocker_core.c ++++ b/src/knocker_core.c +@@ -50,6 +50,9 @@ + static void knocker_core_free_host_ip_string (knocker_core_host_t * hinfo); + + ++char *knocker_core_last_hostip; /* string of the last resolved host ip address */ ++char *knocker_core_last_hostname; /* string of the last used host name */ ++char *knocker_core_last_service; /* string of the last service */ + + /* + ============================================================================ +--- a/src/knocker_core.h ++++ b/src/knocker_core.h +@@ -164,9 +164,9 @@ + static const char knocker_core_author_email[] = _KNOCKER_CORE_AUTHOR_EMAIL_; + + /* allocated and deallocated within knocker_core_init, knocker_core_quit */ +-char *knocker_core_last_hostip; /* string of the last resolved host ip address */ +-char *knocker_core_last_hostname; /* string of the last used host name */ +-char *knocker_core_last_service; /* string of the last service */ ++extern char *knocker_core_last_hostip; /* string of the last resolved host ip address */ ++extern char *knocker_core_last_hostname; /* string of the last used host name */ ++extern char *knocker_core_last_service; /* string of the last service */ + + + int knocker_core_init ( void ); +--- a/src/knocker_led.c ++++ b/src/knocker_led.c +@@ -50,6 +50,9 @@ + #define LED_VALUE_SCR LED_SCR + + ++knocker_led_t knocker_led_status; ++int ledt; ++ + #ifndef NO_LED + static int initialized = 0; + #endif +--- a/src/knocker_led.h ++++ b/src/knocker_led.h +@@ -65,7 +65,7 @@ + int sequence; /* used in knocker_led_sequence() only */ + } knocker_led_t; + +-knocker_led_t knocker_led_status; ++extern knocker_led_t knocker_led_status; + + void knocker_led_turn_on (int led); + void knocker_led_turn_off (int led); +@@ -75,7 +75,7 @@ + void knocker_led_reset ( void ); + + #define led_delay 1 +-int ledt; ++extern int ledt; + + #endif /* _KNOCKER_LED_H_ */ + +--- a/src/knocker_log.c ++++ b/src/knocker_log.c +@@ -30,7 +30,7 @@ + const char knocker_log_header[] = + "+-----------------------------------------------------------------------------+\n|--=| k n o c k e r -- t h e -- n e t -- p o r t s c a n n e r |=-=[logfile]=-|\n+-----------------------------------------------------------------------------+\n"; + +-char *knocker_time; ++FILE *knocker_log_fp; + + /* + ============================================================================ +--- a/src/knocker_log.h ++++ b/src/knocker_log.h +@@ -33,7 +33,7 @@ + #include <string.h> + + #define KNOCKER_LOG_FILE "knocker_scan.log" +-FILE *knocker_log_fp; ++extern FILE *knocker_log_fp; + + int knocker_log_open (const char *filename); + void knocker_log_host_info (char *hostname_str, char *hostip_str); +--- a/src/knocker_output.c ++++ b/src/knocker_output.c +@@ -38,8 +38,6 @@ + }; + + +-char *knocker_time; +- + /* + ============================================================================ + ============================================================================ +--- a/src/knocker_services.c ++++ b/src/knocker_services.c +@@ -28,6 +28,9 @@ + #include "knocker_services.h" + #include "knocker_core.h" + ++int knocker_core_services_db_init; ++char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; ++ + /* this following list of services has been automatically + generated from /etc/services */ + +--- a/src/knocker_services.h ++++ b/src/knocker_services.h +@@ -29,9 +29,9 @@ + + #define SERVICES_DB_TOTAL_SERVICES 30000 /* was erroneously 231 */ + +-int knocker_core_services_db_init; ++extern int knocker_core_services_db_init; + +-char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; ++extern char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; + + int init_knocker_core_services_db ( void ); + void free_knocker_core_services_db ( void ); +--- a/src/knocker_time.c ++++ b/src/knocker_time.c +@@ -40,6 +40,7 @@ + static struct timeval timer_start; + #endif + ++char *knocker_time; + + void knocker_time_start_timer (void) + { +--- a/src/knocker_time.h ++++ b/src/knocker_time.h +@@ -30,6 +30,8 @@ + + #include <time.h> + ++extern char *knocker_time; ++ + void knocker_time_start_timer (void); + double knocker_time_get_ticks (void); + void knocker_time_delay (unsigned long ms); +--- a/src/knocker_user.c ++++ b/src/knocker_user.c +@@ -41,6 +41,8 @@ + #define KNOCKER_LASTSCAN_FILE "lastscan" + #define KNOCKER_TOKEN "|" + ++knocker_user_t knocker_user; ++ + static int _dir_exists (const char *path); + static int _dir_create (const char *path); + static int _file_exists (const char *path); +--- a/src/knocker_user.h ++++ b/src/knocker_user.h +@@ -30,7 +30,7 @@ + int super; /* user is root or not */ + } knocker_user_t; + +-knocker_user_t knocker_user; ++extern knocker_user_t knocker_user; + + int knocker_user_is_root ( void ); + char *knocker_user_get_username ( void ); diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild index 30d70e219a09..0e56cfddb098 100644 --- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild +++ b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 - inherit toolchain-funcs DESCRIPTION="Knocker is an easy to use security port scanner written in C" @@ -17,8 +16,8 @@ PATCHES=( "${FILESDIR}"/${P}-fency.patch "${FILESDIR}"/${P}-free.patch "${FILESDIR}"/${P}-knocker_user_is_root.patch + "${FILESDIR}"/${P}-fno-common.patch ) - DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO ) src_configure() { diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest index d2f922c2e752..5f75ef3cde4d 100644 --- a/net-analyzer/mk-livestatus/Manifest +++ b/net-analyzer/mk-livestatus/Manifest @@ -1,5 +1,7 @@ AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 BLAKE2B f02aee31116dede718ef3671fe86b228ce3031f01fad987ed8622e7e434747e07fc535798f9c5122125f951257a7446f76fc42f7b1f063cc1b5897eeca0cfbf2 SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BLAKE2B fb036de5371602ad2ef36ad4916d2f6193a8e8fef4ea2adebe1ace6225ae9c76ffc3ec72ec6649b3ed45e423e3cf6351f86d82d0f524c1a6842066f1e43be99e SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404 +AUX mk-livestatus-1.2.8_p26-fno-common.patch 671 BLAKE2B a0f49e00c040cc8fab5bc343042195d62087172c549d331375d51832a3234e56cff09a0f0c3c9a53ddeb7e824db26084ac16ce7051d1c4bc885e4d8610ebae06 SHA512 067b1c5af81ff668dda6a713306bedb9b3c6795a1bc146988ff9f351a62cb39cea889bfe77474a918ab69c8f97fee506372ff3115deabea400ced605e60f0520 +AUX mk-livestatus-1.2.8_p26-rm.patch 254 BLAKE2B 789318a34cbedb65595e930c3e9c3f3a641d581cc1f9045c54445f501c8173475bb4fef49bc16352749036ceff380e81c83e18aff386150ed85014ef8d490bf2 SHA512 df8b7337206922a7aa5f980e19a5f1d4b0a8a92d5b0603339a7437d5eb4a78a3a3148d9c27f84869d91e73b42b7aa18e2c3868650efe179cc856cb90491f392c AUX mk-livestatus-1.5.0_p22-rm.patch 306 BLAKE2B ac45ad1c89a8a067cf780ae13d24a50e4a983c619846ee1e6dcc5a56e3fe8d541b82b8a3f14e7b32f934acefdaa8890635e1745a6e7f17e04f46dd603e461803 SHA512 b172fbd35f7d9b06017bf9df56f8c8ec106f1d71e77dbf6a6a55d974dcf4ccf3548379164c7b4fdac8c1b28456268433d061049c0d2781d9cf3434682e32ebb7 DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4 @@ -7,6 +9,6 @@ DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6 DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6 EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b EBUILD mk-livestatus-1.2.8_p16.ebuild 3422 BLAKE2B b74281fdd86bb819ead989d84c3feb3dbf3d7d24fdd4dd8ff723445dfe94e30b3cf3daf25acb8da3549d5c907524df1605cfe51679cf02d17fbc12b6552dfbc3 SHA512 af5de45ec84d07af5c10b47b74e2e4f752cb85a913981d3c4a0ed4202c781506148314959dc8e360d92c94d944dc956b5e5c2268f563d26e3432fc33c644edab -EBUILD mk-livestatus-1.2.8_p26.ebuild 3390 BLAKE2B 380082a961401822aa98abc221becf7bc7fae44bf2064e41f4847ee218f746b82bf83b79533e4a6061ad869e79674acd3f1468f11df4fc99c13db60183e9559a SHA512 fe3029d2dc50db99c3be8407befca9023bb83cdcbffdab82fe671cbbc60cb71c17fd32257f752b4f93be8f728f3698a76273d316409dffc9ae314e48141bb156 -EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3564 BLAKE2B ab61245038fdd308462b21281e73670bcd0ec64a7e18a6afffdcc3df1fc3bbb8d1e93b13967626b8bd5721faa8777df29ecde3a1a75b75dd141746e789cf2a7f SHA512 ab4458b4797ba6171314863018b4020538e85d355197fb760f557ef249bdc2eb66f724d727fe1bb9e482bba5dbe7eb9785a319d3ba2bc342722cf46aafb798d6 +EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3458 BLAKE2B 377a5248a9c79b7a5b372ca17fd3589c1a503c7bee8d0f6fd1c0fe7763be532d000aea495eecd9332db5000a220edb6f08997380b993fd8e59693d15ca381f2a SHA512 e4ebf2170393ca705be4defbd6a439b139bdde80e87bf357981b5cbef0283708f270b05f74e47bc6a42dd6bc385d4a4e6a7a09250d64d874280b497dc2a97126 +EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3562 BLAKE2B 26e5dbf7ab2d0fba9d357f55dbcf665d510f1a9f27aa2f2827711224d44524a462106b3e39aa091e8ab8009db1d404ed6a0a0e8e4fb8b526d182f8a5ce652d9c SHA512 0a7854b54d63c01473f07a01ab5888d3b0fa62288599ecb552142123a9154af15c5697deb7c36c7e13c8910f976e86f553f7bf65b19f9196965df4fce8dcc328 MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2 diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch new file mode 100644 index 000000000000..e0dc8469c15a --- /dev/null +++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch @@ -0,0 +1,29 @@ +--- a/src/logger.h ++++ b/src/logger.h +@@ -27,6 +27,7 @@ + + #include "config.h" // IWYU pragma: keep + #include <syslog.h> ++#include <pthread.h> + + #ifdef CMC + #define LG_DEBUG LOG_INFO +@@ -49,6 +50,8 @@ + extern "C" { + #endif + ++extern pthread_t g_mainthread_id; ++ + void logger(int priority, const char *loginfo, ...) + __attribute__((format(printf, 2, 3))); + void open_logfile(); +--- a/src/module.c ++++ b/src/module.c +@@ -95,7 +95,6 @@ + char g_logfile_path[4096]; + int g_debug_level = 0; + int g_should_terminate = false; +-pthread_t g_mainthread_id; + pthread_t *g_clientthread_id; + unsigned long g_max_cached_messages = 500000; + unsigned long g_max_lines_per_logfile = diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch new file mode 100644 index 000000000000..abdb2e01691b --- /dev/null +++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch @@ -0,0 +1,10 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -62,7 +62,6 @@ + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(pkglibdir) + $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) +- rm -f $(DESTDIR)$(pkglibdir)/livestatus.so + + clean-local: + rm -f *~ diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild index a1b4fa136b85..481cb302ca67 100644 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild +++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -58,6 +58,8 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch" "${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch" + "${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch + "${FILESDIR}"/${PN}-1.2.8_p26-rm.patch ) src_prepare() { @@ -140,7 +142,7 @@ EOF fi if use python; then - python_foreach_impl python_domodule api/python/livestatus.py + python_domodule api/python/livestatus.py if use examples; then docinto / diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild index 658d951078ac..a0d42e5b3a7e 100644 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild +++ b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild @@ -120,7 +120,7 @@ src_install() { cat <<EOF >"${T}"/nagios.cfg # Ensure all data is set to event brokers event_broker_options=-1 -broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o +broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o EOF # same for icinga cat <<EOF >"${T}"/icinga.cfg diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index b8f2b4667ab8..2124ccd62616 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -2,5 +2,5 @@ AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51 DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 -EBUILD mrtg-2.17.7.ebuild 1015 BLAKE2B 89007a52bfda9d30f19218f44a228acf686b7140b1cc19220c3d189ffa80f9dfe17369c59a3c1bf0150235984605054dbe0f00c88e5720836ba459a42b3469d4 SHA512 7997a451c8841a366d8133196c087fab3a3a32e72c77cf8e65d7b2677a229c486d9edf7523a2bf36f9501627f23af1c223625829c1cfa19a82de591df09c5104 +EBUILD mrtg-2.17.7.ebuild 1016 BLAKE2B f5420f2f094df1ddf546093bb5d453c3a68de4acd380e2539d70ec56288280f0865221e1fe3cac71488c541e163e3579e23cbb31f70db1ca6ea0bffa7c4a511f SHA512 39d55fca85b6fa77c08e1e260e4039a5e52b4e5f59b255d0915e423b96562d3841e0750b99c7ccb2d026e14897e6f0ab95993afb424f01d9faba5532a3acdae5 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.7.ebuild index 6ac3bd8f2fe2..51a836c03df3 100644 --- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild +++ b/net-analyzer/mrtg/mrtg-2.17.7.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86" IUSE="selinux" DEPEND=" diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest index f8166e82b689..484d3344f4a9 100644 --- a/net-analyzer/mtr/Manifest +++ b/net-analyzer/mtr/Manifest @@ -5,7 +5,7 @@ AUX mtr-0.88-tinfo.patch 450 BLAKE2B 7241ab3ffcf80c9775700328de031c39172f3842583 DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021 -EBUILD mtr-0.87.ebuild 1156 BLAKE2B 034cb794c10bcf59fb8ac37c0d8e7e0d9d2890c5020c79166e4e72daae1b4c20dfbd245712db04df999951e0656e955aab1700e9e5a3ea6a8a148028603f417e SHA512 aebbbceb187ae310b0b5201e9a6714c4b5edecf3a449b94898591948850b95994066d4d617cd81e00bfab3fea330be630f93d2d1953bc716d117b6b1aa95018e +EBUILD mtr-0.87.ebuild 1157 BLAKE2B 55ca9586657721fa8a2826ee307b0c7673eb8dba2de3b2066380a670a5ea5d3694e09579bba9ef3dff71f2a223390c23ab45b709a044fe88adf11d2e91251771 SHA512 e08a21d7600c588ea14207b4e6f89bbebddba73f5e02201c60014da2502f9e63a53cb03901e336c0c00aa34d45e9a7d31969467ee527e689a7c9cea766799ea8 EBUILD mtr-0.92-r1.ebuild 1424 BLAKE2B b8ac6ee0aee8c14de230a724f29c9a02bf828546b68689e95cd890037ab609754560a23d5bb922a8109262916aaa6af36f8696827734f4f36ff32fab224d0c57 SHA512 66552bf4dc1f2a765cc27afa7e070fe82fd551d30d45dca4f9be10133117aa8428d608637594bdc76d784a0cf2e3608c82b4338121c2d9d5161736c23374498c EBUILD mtr-0.93-r1.ebuild 1516 BLAKE2B dc40f0a55e8ae08ff73b89491b7dbd56715b80871a6ab16cf91415c4d3ee5512c83b02ac4c357206fad0a160b1efbcc27b8b72120df88ce8f7226d4c725e606b SHA512 3f686ba48e6c67ce7cde669d23dcb3fb97c5405b23099f9e1857d6ec51d21823abb3a25872303346a7c5b1e9c0be69eaee58b2687a2f55c332db9b727e57af15 EBUILD mtr-9999.ebuild 1265 BLAKE2B 8b8bdca8bbfd8b9c1a61296a34d561fc7fad185440ea00ef1d5aa3b63f70dfc65ca61d180c86d1e40045b4c1e9a456da3883853e3369c7ff9d1f4f60b8d28166 SHA512 bdb92c834b3f4c8a3b1848c6c40564ecdb1d7d1d688a77c39870be0179172b0fe6104914e5b3d3137885610a4ac63b69343af8d561f963c380832d1752642b24 diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild index 6cfd1bd5b83d..7035e58a4376 100644 --- a/net-analyzer/mtr/mtr-0.87.ebuild +++ b/net-analyzer/mtr/mtr-0.87.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="gtk ipv6" RDEPEND=" diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 41b0c28d6e59..32ef375aee1f 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -19,6 +19,6 @@ DIST munin-2.0.54-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051 DIST munin-2.0.54.tar.gz 2270295 BLAKE2B d0f573a46eedf9e9a7de61428de6c2261f6c9fddd3aa5696966c2ffdaa82a432dca72d60cd2e4b75601f312ad07918090a9dd45a10e3c9c81371b97200e28b12 SHA512 b9a8c7403b34d393115d833ee41e3b5c325e072729b66f6b8b7fd3546ab4660e59e59c6f192eabb706e2bc9c73aea9c50c880c2c36826c5f2962bca46098e732 EBUILD munin-2.0.49.ebuild 12302 BLAKE2B f943778e48a625a0fc342ca5cc7d9323092ebbbd4d4fbce281d11d11f0d68425a734290ac2e63b3e221fed2fa6ce9b6a52dc99c4c0ac23c1fbecaaa599ce31f8 SHA512 fe270e67ff999c30c5f88b6b9ef4143de37b2f4e6708dac876ce35f44efd8cab7efec1fa08d49466e091e549020384676b2b6598d3a21f7811cb143fe3e89faf EBUILD munin-2.0.52-r1.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 -EBUILD munin-2.0.52.ebuild 12392 BLAKE2B 93020da1b15e1c227005120156a44186c8e2c1e1b6d8438af1fdc83c27e6f7a0f2d91624cea3a61f7ea474cdbc9fb0b204027337a50a0a8b0ccd07040901aea4 SHA512 0b5dfd06dd1d6df52cbb088d278bc3d5debf5fd42c70218aa3afd691623f182e51fd4d423099908ba76981c7a5854de4da19f155712b75c1e5745e872e7d4e13 +EBUILD munin-2.0.52.ebuild 12389 BLAKE2B 4e1046e310948f97ed2469cb58f67c4c7cc6b66ef2fc401a409f2069c2c3b717a1b76d5b9f51add689c00e7daa6a555e927b98f9290ee7e24aac81202f17c557 SHA512 3f1edf0c2c9a35f17794003e143fbde255f60527e0f595a40233b63c1cfaf3bb00416902f6f45941c597987eb292d6b507cc8eb3720d2a17793607f9099ed823 EBUILD munin-2.0.54.ebuild 12256 BLAKE2B 1c6d426aff660c76e03ab64745e4aaab525291e8a182a98902ed0707a1bd907895d5e6b7e6f14e3063efc631ee377d4374f0897c5b594303c5379b902ee9ef10 SHA512 a055bfaa3d168343afc4fda050b9a99027ec17fe94b673f2cc23ebedc5ffbce9ad9cb2cf149fac16ec55c54d35a32e4a4f37242116fc3e82c4f02c493128c446 MISC metadata.xml 3920 BLAKE2B cb28e1a3e95ffcc305975d7edc26a5cf852a2a29f8c56376c9bbc90fd2b2850bfeb614d750e7700870aa0c10c8dcfcd2b845c210a5518f591ccfbb7571971cda SHA512 9d12c61750f5ee42cfcb6672facf3b46a024872d918c7acb26631c1b9bab29802a6ac9f4d895b9f4ef18a6f283ad64d4bd6e313df0489a6ed82185c660c42083 diff --git a/net-analyzer/munin/munin-2.0.52.ebuild b/net-analyzer/munin/munin-2.0.52.ebuild index b36fc5f88fcd..56f3cf00bae6 100644 --- a/net-analyzer/munin/munin-2.0.52.ebuild +++ b/net-analyzer/munin/munin-2.0.52.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" diff --git a/net-analyzer/nagios-check_multiple/Manifest b/net-analyzer/nagios-check_multiple/Manifest index f0e64423ff50..9e32f683de64 100644 --- a/net-analyzer/nagios-check_multiple/Manifest +++ b/net-analyzer/nagios-check_multiple/Manifest @@ -1,3 +1,3 @@ DIST nagios-check_multiple-0.0.1.tar.gz 9376 BLAKE2B 2db464b7edd4aa704560a3f16a5d70e4cdef7cd35284e3c679f3e10e5ef6eaaba19dc361efbb10a77f87c14726439869e4b415fe7e393a1d7ac23233b3bfa66a SHA512 a75bcd821afc6daca612f42c552fb965a3068dc04a94df41ff41d36928c764d44bcf72e1bd6d776bf4b443c73fc3946c0a91443a562019fcd1b6e8687d0ebcd2 -EBUILD nagios-check_multiple-0.0.1.ebuild 1356 BLAKE2B 2656b3d6558fbbfc33c216e8734ab496d069d59dfb4ceb2b19fbd4fc0bf58a73d1e7ff3d8c896e86aef48eacec653b736c554f9359a4aff4251c79589295417e SHA512 d690763ff2a233ad99209f9df71e3121fa8542cf4692cb48067c2c77341c378767467eafecea994fadccbdd007479d311a9b11a6ae0300349645262abe4f3bac +EBUILD nagios-check_multiple-0.0.1.ebuild 1362 BLAKE2B 494a32342d216b847e557f29e92bf03d2b6d3f2cff3eb9b6a39e01804e62f2a1d97151218a64a20402f233d2cee331d9234a4019ce8559eb94a1a5b321b583aa SHA512 c541a6638141d4fd1649e3613f039bbbd6382fccd7ca4d61fbba88956490a719ca9dd80663b3ce1fd66c83bcdf3ceaa18a604499ddb419a5b1b0ae8c1fec4146 MISC metadata.xml 346 BLAKE2B 16270d3fccdcd1c5519beddf3e520377a2538ca793fc1d0c9e3f1e640db66b562971900d5595754104cc30390661c6ff714ac790868e6aeae719e68c72eb2d0d SHA512 7f773b9c98c57e43fb394a2db6bc357d49c4561f44419aff7867fdc07eece455a473309646e90ed065ab11c64576d4dd764d134403330bd83e9f71e680d5a932 diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild index 2ab9a4401b09..cb417ce910b5 100644 --- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild +++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild @@ -9,7 +9,7 @@ inherit distutils-r1 MY_PN="check_multiple" DESCRIPTION="A Nagios plugin to execute multiple checks in parallel" -HOMEPAGE="https://github.com/clarkbox/${MY_PN}" +HOMEPAGE="https://github.com/clarkbox/check_multiple" SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index a5cdca6f7623..6e1ce7a75e75 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -5,7 +5,7 @@ AUX lighttpd_nagios4.conf 325 BLAKE2B f89b9d5aed8305d54f76adf29c65ba20bee74b6c82 DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 -EBUILD nagios-core-4.3.4.ebuild 6633 BLAKE2B b179113b24ff38a5c147de20cd48db21fa1379f4ab377c7c354a1f107f9651f1b348f7dbd26825aaacb1fe8ce54d8feedbd7a44b65d3c897480d1c87a1fd4183 SHA512 43668b229464870ff2843790b1fd3bed7e3e2c4ba58f8cc19b90d8e85418c0e86b3b604089ccf52a63f24f6c0fb5e9ea4045769b2f63df96dc7d70c53d3e8411 +EBUILD nagios-core-4.3.4.ebuild 6634 BLAKE2B e0ea4b62e058ed5e7534b2b6180eb048878b7ebbf64097bbf4b01d6a028cf2ba99016b317fa81374432d31897dccb24ff52cc0b7fe23ea3176d86eeaaa875243 SHA512 2094a3907667916087f286b10ea69242ef552986f0ac2be176e401b1faf5e75b7d5d0130de42ff77ecebcfc60888ddf49efd93df4bd9d9b26c6065bf0030965f EBUILD nagios-core-4.4.5-r3.ebuild 7470 BLAKE2B ceb783a9c27047b42b6464a2570452125f2ff6f5c7c6a3333a63f113b2c78037ca7cea1db6cd6ca783d58d3d4bfaa491fade7217bff29b76f2cbaa7496c74dc4 SHA512 4962381b6508363c2f330e81dd81d3de878cb7ef7428f8ba9fc71193c6a3de2c93c8c32298212312feaa72e76b0094fec7ff9e04a9f07072be8181c12497a82a EBUILD nagios-core-4.4.5-r6.ebuild 8044 BLAKE2B 14761a831bb22669589931e9d66fc50907b6caab8fce0f06a26c0098d61d8261241037f4276ec8cfb87b957b2e5c28de59df4b6c83b773ed5e8112df8f758391 SHA512 cc0d4a90b62bbb6cc7a8bf04bbe388e07106241d98133aa5f345e332bab043b72a55dda194959161580ad9f47832e0490ae9cdefc3c5a5dedd76743ad36a1ada MISC metadata.xml 1466 BLAKE2B 655e382c72b7fcf8f4283055a503e2ad79dbfc695f730980543e6a7381f5aa093ab279341cd2df19a1d5e5053b2c686ecf6884c541a7b984dce60fc1ae4d4599 SHA512 51f819fc2cbe3b87ee96b048fd0e622f78673a29d5b42b2b8f1d963f6f71ead679b057863f5f1a56e997c1e19ff26edf52697c02f79ba89ed6a5480d0ae2296b diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild index 1df849693e9b..c0b24dec6719 100644 --- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" IUSE="apache2 classicui lighttpd perl +web vim-syntax" # In pkg_postinst(), we change the group of the Nagios configuration diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest index 5fddcc204780..ae05508db26b 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest +++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest @@ -1,3 +1,4 @@ +AUX nagios-plugins-linux-madrisan-25-fix-fno-common.patch 1276 BLAKE2B 2dbae02f3b64590e091e2f6d4ce8d3462046eec02ed2a1234858e553c862922623fca7a1bc171d3381ac62f6953b9425f1e2a9bee11d8d42759002d9d11da50d SHA512 bc8e3a1870cc327d7519c248f33b4aa20e2689d48e76bffdcb0ca388a85b110d5484b115c78353e3369f0fe2d004325d43299eb1f03973c570de6a8efca2d15c DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec -EBUILD nagios-plugins-linux-madrisan-25-r1.ebuild 1027 BLAKE2B efb8e3ad6283580d948b083c65984d9dffd338d7e2a2ee8be01b8bd2af578e8afbd457cf61fb61d27472a00519208bf3d9ddf2d6c05e5524f20d3d2b4801c6f7 SHA512 0d55a77d5cfa4d741c6388cf984b8eb376284f35d4f5979a7b326d446e2f48b16d411fdda8b1595b36e0283f1d9a0b13841a4f4824fbe0929cca096b45355766 +EBUILD nagios-plugins-linux-madrisan-25-r1.ebuild 1171 BLAKE2B 7d2ad802b89681b59b38ffb0bf074c75967df6fabe2298fff43a66852f2a7d8d654d2a7b94af1b2ce1c0c69ff8441e236d9379c5b94831d97ab07ee3df17dd0a SHA512 e466b0150c1081a58234091894efa581611b42b44587b5e6efaabbc309300ffb4ce05f1c8522ba65ffc6c930657e548210c03821779ba013404be1258f19ff8e MISC metadata.xml 517 BLAKE2B b78b662d5028f2d3a6739be37b771af2ee51c35fa47b9aeff228dbcf67a8feaee45ea8db57acf2c6ac490b19ec87f97d0ba4db2883406945f5e37d30e430921e SHA512 b3a1dfedeb45883a101e1194643a6cfbc5041cf772f9ac70d32de38d909ef5aa5a1403b283e797c721b663498953d4b0810887a4c3e2ab51655084122b2e7ce3 diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch new file mode 100644 index 000000000000..74bddd66e749 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch @@ -0,0 +1,37 @@ +From 4936ca25f3e9a2875ce063033e5e8f3a3590dab2 Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <davide.madrisan@gmail.com> +Date: Mon, 27 Jan 2020 22:00:41 +0100 +Subject: [PATCH] The build fails when '-fno-common' is added to CFLAGS + +As reported by 'sbraz', the build stops with the error message: + + (.bss+0x8): multiple definition of `program_name' + (.bss+0x0): multiple definition of `program_name_short' + +This flag will be apparently enabled by default in gcc 10. + +Fix this build problem by correctly referencing as extern both +the variables in the header file. + +Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com> +--- + include/progname.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/progname.h b/include/progname.h +index 576ed16..847122a 100644 +--- a/include/progname.h ++++ b/include/progname.h +@@ -25,10 +25,10 @@ extern "C" { + #endif + + /* String containing name the program is called with. */ +- const char *program_name; ++ extern const char *program_name; + + /* String containing a short version of 'program_name'. */ +- const char *program_name_short; ++ extern const char *program_name_short; + + /* Set program_name, based on argv[0]. + argv0 must be a string allocated with indefinite extent, and must not be diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild index 6367fdc2f4e7..284d0d9d1a83 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,10 @@ IUSE="curl" DEPEND="curl? ( net-misc/curl:0= )" RDEPEND="${DEPEND}" +# https://github.com/madrisan/nagios-plugins-linux/issues/48 +# Will be in the next release +PATCHES=( "${FILESDIR}/${P}-fix-fno-common.patch" ) + S="${WORKDIR}/${MY_P}" src_prepare() { diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index b1d32737de3a..4020fdd648fc 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,7 +1,7 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac02042147d162a452e17480433a8fd8ffcf3ce506d6930215e8a8eaa219d7811adffbcc2b3ee6a004661ca2a1f8bdc3339bf3526 SHA512 18cb9be96b3e39a07eeb1cf6bccbbe26766ac355f4822c132253e25a6909c418071c2dc546fb60c055b78f620180035e57436a8ebb771ae1096b78d2e1c7c6ec DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a -EBUILD nagios-plugins-2.2.1-r3.ebuild 3116 BLAKE2B d8d272c092af7fe6cab2c5f08f73e6a836e7862b98e65a42edb0125c87446504f89fa01d54663e7bd31da35bf45bfebd58b98ce137c4c6949ebc1e5b77932458 SHA512 9e59c607ff8177ddb930ad3e5cafd2ccf6dda76faa6b935532ecfae2c27ff696d4b7f5e8cca04164a98f3a1829c6ad969e41ac0a1fff3748f467df0387dfccc6 +EBUILD nagios-plugins-2.2.1-r3.ebuild 3117 BLAKE2B 02b59f5f96bac525180b90d714becad1427a989cb2b62d105ba896cca0e174b0216032bd96f406ada9bb592ff171a617a7493e0b02f9d27f339255d964549006 SHA512 0a05a987bca4ba9f5e2f22f911eefab193453bb93605527780983b9e424fd13515405bdcac2b2a8757b0da7e596c2eed9c9b63fbb17225116437356c3fe69aea EBUILD nagios-plugins-2.2.1-r4.ebuild 3102 BLAKE2B 71b4e4382bd6ad0d2278db3a21e952cf38e551bc8f3619297ff24f508c2ffe4a4261093135e950212c8b8dab80e2cac294fc07a91bf3e273a03a09ac47822307 SHA512 9d8af2f74fd41c3bd660f72dc66665b2436671d899df8e9f06c1691df963f549320dda0dada32a39fc6214af11285fc329415e8038f35d10e245ac15f416259a EBUILD nagios-plugins-2.3.1-r1.ebuild 3050 BLAKE2B 9fd1e5e2c46c357bf8f4c3266dc58f1ada6aac4d932d2b07f7b2b33116a975f3a95a6cdf415c0af10e021ba3249b039da5819d06003ac9df3771327839eaea1c SHA512 5ad9ee299b4906176e6a546be5d545fb1b94163a556fd4361e68af2b6c47b00e015278b49b2b740643e7018b0480abe8caa5e072b63b5a3582c0f1f4a69ecb37 MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72 diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild index a978a750c7aa..df82bfc3f848 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86" IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" # Most of the plugins use automagic dependencies, i.e. the plugin will diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest index b777f77d646c..94fc2a9658a5 100644 --- a/net-analyzer/nagios/Manifest +++ b/net-analyzer/nagios/Manifest @@ -1,3 +1,3 @@ -EBUILD nagios-4.3.4.ebuild 391 BLAKE2B 31a1586c68f74b862b0ee308ae8818c574a1e33f94a2b3daaa6d3a7d52622a61bcda61a5c968dcd911ad55ac03797dd0b54f85d4d98ebc79630fb0ed655c671e SHA512 80f20980638b39862e3026ff34e1a4827161366ad1c8079a32b8bd2736a67a3d4da2d042e9da54b6c0eef6dd2b3d196c7cdcb2949ac796d614e92fa9817cd85b +EBUILD nagios-4.3.4.ebuild 392 BLAKE2B d9dfb8dc5a542796dcd0990ab9b29998ec4525ced104048236688dc57105a42508f5a88ffaa5c43f4c13882f7024dc08c3091e20c115ab34381f80f4db67a16f SHA512 6105b5a10d1f79c33147060360de926156d4218211d4c2826bccc32bfffdb32e6dd2249b688b2d0590c66edb5757f1bab083c9f9ad5ff192346d36ba3f18c5c7 EBUILD nagios-4.4.5.ebuild 397 BLAKE2B 244121a98f46b570281d36276ca17413b51a015a46835b1bd1f568328d0b12a90bd5f001199a3bd11f4121287bb78762e36007f9e206e75dcfad5af792ce10e0 SHA512 c260ebfa1f7578fd20bb76ba8ae0dfe9dcd495b185c8c5272b09657918b08d194b539428642f4e9e20afa9ba6cdb73a73806f47e9e4e80a321021e04c3f5b405 MISC metadata.xml 1110 BLAKE2B a3577be74f7ae7da47c1add86da6b9cd2972ebea1e4e4241886027e7c4aecb936ffa776a32bcc0b77498c393ebb4c81aa9a98a3c8d45cbd5556f8b9014384e52 SHA512 7614b25879899b4939a136de6cd4cbd3995372747e95d2d6b90ccd8e074800b6acb738df5f9c852625c34f5a72c3072c0dec910266068ec8a72184f75aa204e1 diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.3.4.ebuild index 820a19606479..ad8db2639dfb 100644 --- a/net-analyzer/nagios/nagios-4.3.4.ebuild +++ b/net-analyzer/nagios/nagios-4.3.4.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://www.nagios.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" IUSE="" RDEPEND="~net-analyzer/nagios-core-${PV} diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index 7a6e1ce1dbee..d379f4054122 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -3,7 +3,9 @@ AUX nagstamon-3.0-setup.patch 1139 BLAKE2B f399c6c600785629c7c90b1de396c17805882 DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6 +DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd EBUILD nagstamon-2.0.1.ebuild 1184 BLAKE2B e3266f765f3cd0a6bb64e3b851358d152cf6bc107125ac21fc334c8b8ce56551ce4f01c9cf786f81fadbce2e1b479e6656dd6c2194147088f9f166f41e0f5733 SHA512 69d8101e5720eb8dfc4ccb2997a274e995623b948357ef5c20fb3c7e5c9bd372e1f51299b09d508ba033debd9284cd68108cee62d8c35302641b71003097f608 EBUILD nagstamon-3.0.2-r1.ebuild 1374 BLAKE2B 093e6a2ecfc4712ab8b2b032c7ccdc38de68e769aa7efaa15631cfb13b41021c3d80cedf37b9e8379105a3d2cfa9b093c53114c96d468d9bf8f2da918f50728e SHA512 d903857718fd239725f39f2e347bda8a8857c9159531abd2d445bf44e1fe30281d1c480f75e63ac056d928b5e66d46f44fc502c999d700433f045f1f73e06685 EBUILD nagstamon-3.2.1.ebuild 1503 BLAKE2B 3255251edb70611db3e397159aba274599afbf10060274d3e8943ecbeccd3493f2d65a71bebdfb91cbf81f91d6f2a8369c2a6c6c758c3bcba8de495aa65f51d7 SHA512 a84d5bef3ef5d6238f27849116e9838eb16ce05aec6b38f82466f83c790dcb3df26c867bd2250dbba62d4a92f255897f707177c8de719b73dfff569dfddd1a11 +EBUILD nagstamon-3.4.1.ebuild 1503 BLAKE2B 3255251edb70611db3e397159aba274599afbf10060274d3e8943ecbeccd3493f2d65a71bebdfb91cbf81f91d6f2a8369c2a6c6c758c3bcba8de495aa65f51d7 SHA512 a84d5bef3ef5d6238f27849116e9838eb16ce05aec6b38f82466f83c790dcb3df26c867bd2250dbba62d4a92f255897f707177c8de719b73dfff569dfddd1a11 MISC metadata.xml 525 BLAKE2B ad9c68b36b1260f907ceb8f50389fd0e035d441d33e99c71bb8dd493cda5cdaaa4e2ec32746d2b96d15b776d9de03070e411515f34e90c93063dd4b6b803c155 SHA512 5a1bf5be48ee8d28b501dceea33c65791b13cf0301c6bb170e4fe5ecd7b771cc28d3e9a49b82440770800854146961069cb26529ed5fe3e2c9a796329b085c64 diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild new file mode 100644 index 000000000000..bb891b8c5697 --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python3_6 ) + +inherit eutils python-r1 distutils-r1 + +MY_PN="Nagstamon" +MY_P="${MY_PN}-${PV/_p/-}" + +DESCRIPTION="status monitor for the desktop" +DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" +HOMEPAGE="https://nagstamon.ifw-dresden.de" +SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/secretstorage[${PYTHON_USEDEP}] + >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] + dev-python/requests-kerberos[${PYTHON_USEDEP}] + virtual/python-typing[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" + +S="${WORKDIR}/${MY_PN}" + +PATCHES="${FILESDIR}/${PN}-3.0-setup.patch" + +src_prepare() { + default_src_prepare + + # pre-compressed already + rm Nagstamon/resources/nagstamon.1.gz || die + sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die + + mv ${PN}.py ${PN} || die + + rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die +} diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index adb6efc7511b..85c7abe5d46d 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1,6 +1,8 @@ AUX nessusd-initd 582 BLAKE2B 67c5e73262512c590b5b4fc0668297a504677aa3d771fdeee2809c921d988faef19cbf10a7fb26d52114e1a67d33ef197e32c561cd5b2003c8abbde2dfe5cb4f SHA512 f825fad89564303aeff423f3c32a1544ee4b063ef57702cd54220aebed8e01e7b178ff5bd10b48b654ebdee78657a9bc41caf779a23968d008916fd51e88b2f4 DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08 DIST Nessus-8.8.0-es7.x86_64.rpm 77275432 BLAKE2B 437d4f958d0f45924cb0c994710d908b6a0a48bbee9ffa184391e7a31484d9c933a210c7d4c6d68fa918a873e09874a58ed40ca81203aaef5c44541037777dbd SHA512 d779703db9c114a51e282dde35257121278fa4ec6035c0c861ebc9f04e967aa2a0cde1efdd4f08c2652ecfab3978a8853970081759e9dee492a3ebe8c4fc502b +DIST Nessus-8.9.0-es7.x86_64.rpm 81085048 BLAKE2B fc4717c31b59261199e87e2080f04a492a96fced562b2ded36741303d0f1c0fc447113f080cf64d2fd606148109f558499383433b39caafb2b8f77684f1b2ad5 SHA512 d397dd545a6c02f906b998c55f2d3b0ae06b247d648f1c25d260190ca4f161199f494d903c430cf2d9a664345b88f6ca5f4cd865a6a39b19be22a1d8a236c603 EBUILD nessus-bin-8.5.2.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df EBUILD nessus-bin-8.8.0.ebuild 1654 BLAKE2B 0d59c80388e1119268776c8c98c6996d1c702d6362e2d4d1f3f69c950352aa420c9484c48d636904e8842e38478d3af86c4a458b9833d24f4a7923a9e8d7e70c SHA512 97b5baa4b22213b5211acccfb63292f210170c4ee6156f1035e077b0a914c6f4aea263f10a76f8530cfecca50bd0bfd1b82b7261c5b001f51dbce7b0a37252df +EBUILD nessus-bin-8.9.0.ebuild 1654 BLAKE2B c6a96ee9a5c51dfc0a1b1fc30743436a983746dfb350ffdb74945c9647a4fa269f386bdcfa360b027198b93aa1022e6974ae23e3b0c39c1db2fb4cbc217170bd SHA512 5ac2ee1ff272d8c7561e86fedaafecdd20fcb5387f99eba614dbc47bf5bc5e4b58ce930f12e899ed7562f189c2fb74abd664c8180d6acdd506a7cc4462bfa3a4 MISC metadata.xml 345 BLAKE2B 05fdd17a4decd9a096175a59991a6df8260591c09193fef114895d7d29e0f08210aacd4517678410813d06a27b1032889c529e2966427c5a9ad454f9534d25f5 SHA512 3535519b1c621f6df120e6aa39f9a11ec132b68499a029915650218c16e9ca1a07cb30409ace95b2aa0204194a61c7b4743051e1f4ffc94cb5ba3372cac72e8c diff --git a/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild new file mode 100644 index 000000000000..eedc870324ec --- /dev/null +++ b/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit rpm pax-utils systemd + +MY_P="Nessus-${PV}-es7" + +DESCRIPTION="A remote security scanner for Linux" +HOMEPAGE="https://www.tenable.com/" +SRC_URI="${MY_P}.x86_64.rpm" + +LICENSE="GPL-2 Nessus-EULA" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="mirror fetch strip" + +QA_PREBUILT="opt/nessus/bin/nasl + opt/nessus/bin/ndbg + opt/nessus/bin/nessus-mkrand + opt/nessus/lib/nessus/libjemalloc.so.2 + opt/nessus/lib/nessus/libnessus-glibc-fix.so + opt/nessus/sbin/nessus-service + opt/nessus/sbin/nessuscli + opt/nessus/sbin/nessusd" + +S="${WORKDIR}" + +pkg_nofetch() { + einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" + einfo "The archive should then be placed into your DISTDIR directory." +} + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + pax-mark m "${D}"/opt/nessus/sbin/nessusd + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus/com/nessus/CA + keepdir /opt/nessus/etc/nessus + keepdir /opt/nessus/var/nessus/logs + keepdir /opt/nessus/var/nessus/tmp + + newinitd "${FILESDIR}"/nessusd-initd nessusd-bin + systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To get started launch the nessusd-bin service, then point your Web browser to" + elog " https://<yourhost>:8834/" + else + elog "You may want to restart the nessusd-bin service to use" + elog "the new version of Nessus." + fi +} diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 934edae4f5d5..68bdda192fa3 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -14,7 +14,7 @@ AUX snmptrapd.service 190 BLAKE2B 6994e2f82e0ba03b31c2f079844a23c0070ff70726dd3c DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 -EBUILD net-snmp-5.8-r1.ebuild 5264 BLAKE2B 92dd24ccb4cb1b431bff22d4e3712fe86c126e64bd870b927a5c8cb5bb6ce8f32eff0cdaa55fb88e44ea0ad4d8d6bc9704c922ccf480cd20cf2af8c88ac3ce57 SHA512 91b3a19e4e96ba6f6bce0bd91d8b963b68d42da0cdc31a2bf527402367bbf1621c131e7c3848f005459f30290bdc839f64c79b80d1d0fe1c7840242a87b455b3 +EBUILD net-snmp-5.8-r1.ebuild 5265 BLAKE2B 04d86f624987dd202722a37b61eb95a9fb0dbbf057ab116dbd1123f24c83051996a6f9f8bffad164134c5012bc935b27d40495bbba5493c64b3fb6e213973d8b SHA512 f321b8658d5d1ee8a0951b5588f9ad37c498676a1a839d4962c921d417a92026b21b795282f9f2ddc68219cfb75a6461224f3de1a8391d58b184ce5b59404a2e EBUILD net-snmp-5.8-r2.ebuild 5321 BLAKE2B 6518dc5b01b36a4a231186bdee13c955b9df155d06e16c3561df12625b3f5637467dc8daaf27acac2694a1b22f54b8d29669ee779de54e25a1b17cc57c3efdb9 SHA512 c1de2dd6516e2230203d085090790ab566d500975ab94c14c07afafe8c1822b3458f60dae6bb2c55bb576d5c5c5ed73c697d51fa5d8ce947cca6b0198cfa3461 EBUILD net-snmp-5.8-r5.ebuild 5525 BLAKE2B 78ebeb7d3c888a68f268571154fac87df9fd93b75323ca67c5b4ce99f75bd66be9b4e77e91c762cacfae59fd693168e705f45347adfcb8c1eab10c3cb2210fbc SHA512 ea563da2076f4e4bc8801f70edbbfba08143d54a0edb6a718e34b84a555cae4bec1c5a8ac6606c997be1e1966c593eba80aa27ff67fb4d47069feb446a235f33 EBUILD net-snmp-5.8.1_pre1.ebuild 5537 BLAKE2B 39899e3b6a102411899a2aa6f97333b7089fe7b57efc52f0f73480d9ec68f14eabda144014df20f18b1e622a3941f80d973f26534d73b30ee47c6ef3adfc194d SHA512 5c7700d10594a526198834b3e8c3ce2386c788174cd559b3f77f6cda54cc7b709d8379520e8b32be7c5e4dd98f0f71f9f14307b4f1b47811e254b96e6ca3797b diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild index 99e0bd51b933..8c4fab7b6892 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/${P/_/.} # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0/35" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" COMMON_DEPEND=" diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest index 1ecd69611b9f..70f00caccc86 100644 --- a/net-analyzer/netcat/Manifest +++ b/net-analyzer/netcat/Manifest @@ -2,6 +2,6 @@ DIST nc-v6-20000918.patch.gz 8740 BLAKE2B 56274ee32a77f335c31b5593ae92afdb1758ee DIST nc110.20180111.tar.xz 69984 BLAKE2B cb345db31d8857fc1c3973eba45c7a45ec0c5721829a19c46f1ec91a792d9d6309930b3bba5df1180989025f7a04ec8c85cf4832ac6f4199d13f15764f000420 SHA512 4413849c07c6ec5aae07c6e2baa1ba9a99721fa6ac08cf9e7d15379937a207246eb4f4299dd8c049445a72eac9cfe0a3633a87e4e01e21036db1217ea7a1e330 DIST nc110.tgz 75267 BLAKE2B 203b5f54805ddef2c3e9627300dfb6d14f098e88433ca807c8db01f009dec1ccc329925025238dae00b5e82e91c0787ef25536d08310ac127cda1775cfb2afb3 SHA512 c9a7f5045f76d9ffef4e83fcc3e82f69ac4eb05e061686db51e9367949bfe0b90226b290a059dc68dcf3bf2040b95b5c78545199674da57a7c73e2f9145cf812 DIST netcat-110-patches-1.0.tar.bz2 25751 BLAKE2B c0be51a057981ad1df932f7317a1c317c8788efa670778a4f5bbf67c9d983754bd20188a15e7ced3d849a25244926afc54129e0a2df07bc34932d15a3efbf302 SHA512 b9e7e35aa7e26d30f0115d87aff34fd0cadfad99fdb77cc5aa3ba51bec331f632e180484927c4368172ee9cc6c996b8691bd19bad8806912d8820158a98eab46 -EBUILD netcat-110-r9.ebuild 1625 BLAKE2B 7bcb48d35af7e8dae00fbf0a1933cdf2ffe777315ca5df9f80090b1fc3314d0681c317acafdd5d281f6332c0a90e324ffe0c0c1d6a904b7cc91b79a62bca2319 SHA512 e865ffeebe9ee492535e30179d325e893b3af4caa4466a7e17d66bf82ae31a6d85b24d2ddd96ccd0c2c5dc5dbb759d1e557514ab91f7a4a31fce72ff3ed0cf38 +EBUILD netcat-110-r9.ebuild 1626 BLAKE2B d86ad69663f32bf5c5a978f7ee3faa965bb3d45b9b0642b0a5d37d81e62d188722d6b0b9dbcf3dca1e50115fcb7140e0923f6db7db4da92253842b5171b2cb4b SHA512 f35ffefc3262415a45cf2ca3f54a5c24a22cfa35450a775862997a4b65090b960d53623e90f686679e6020ee7671347aa530ce4791468424388393729bf630df EBUILD netcat-110.20180111.ebuild 1279 BLAKE2B 32b1fc5499ed4959ac9cbfec93ed55cbf3d2f28e1711f9ebecd7b554c5572eac2c15350084237d3ec600bde72edd2032d39c3b3f1b5a3475b6cce156dcfd16cc SHA512 bc38cfc75e3ccb33f818f5392bfb814d41b2e7a37f3b883168cea3a28a5239adf3433d6d1491227dde6cdb70d137b761b5743904db0483eac78ed66ee1a95f8b MISC metadata.xml 420 BLAKE2B 2ecb5d0734634fa00dbe4aecc8353dcad2a6d76bfb6ff22522b52ca2e67298a0923e46fd2d32c31f48262b06c6f46b02e4e065853c56efc793186132b2e92570 SHA512 f6d0b317880cf10065aa552d4653f3338c89fc36b2175d64b6b17bcdafbea03e0c02608904ffca7a934f2bdcc794758f4132b7cd279fc91530ab077eb2115ccf diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index 12914d4ca99a..e1ed2f09644c 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz LICENSE="netcat" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" IUSE="crypt ipv6 static" LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )" diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 4eaed2360faf..c13f5764012c 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1,5 +1,6 @@ +AUX netdata-1.19.0-fno-common.patch 3807 BLAKE2B 42908f83322a9dab98b52fba245d31ad56b86ea8fd37ed614b3399ee07fff30fc1afbc26fda2834177869c9e8cedb4a97480a18c9c7649b9f52021a6850e391d SHA512 1e032488fb8035a87024b9085cc12a87ba87ff99cb2084db56bcdeb280ba4cfca8042647b6df1a9a06cbb9627b6c25a350782408efeb3a7d780bd1ca3a6d86a8 AUX netdata-1.19.0-prometheus-spelling.patch 1149 BLAKE2B 567e93c8099f7edc6afd3c40a6249162f44dca30f9cccf1702df453523203ee2e79fb4d03a53f5b1c4e5dd6dfaa52961b0717546aa21bc25bb3927a9280598ad SHA512 a498b04683138fd56e71bcf1191b4f3a655be03746f850d9f407bbe24c28f16dd564967401c856ce404f58c6a947b8277e2fa0868dbe7c0aa63ff05a8b465561 DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea -EBUILD netdata-1.19.0-r2.ebuild 3301 BLAKE2B b112d96251fec1cb4492aeea5d236841b54011f70604ee425239bed81b7cc0c65c4eea9567c53535d8471a108b2390c5260cd7df300dc955b568e20263c80e3f SHA512 fc0241a4053a6804288ad791477887d165b5763ae7e2d6c7b0ed2cf30e97fc51ef511c28b7272c96a3ee30d6ce65702074e1c5d99bf38cb22b05e6c08ca12af6 -EBUILD netdata-9999.ebuild 3242 BLAKE2B 7fc66998ce13afdd645676053b71d6b857e8a6098a5b2bda72125b26b6fa55c42d58238f9306cd4930b0426de7d7a9794611098856cb452e4c64216c42c0246f SHA512 e9a16abf1c0c99fe134a60e8a088c95381c22d171652ce23b98478ccaf9d258950b842176ef72a7422609633e855aa9a501e9ec09dc61ab3e63fe895f469c936 +EBUILD netdata-1.19.0-r2.ebuild 3338 BLAKE2B 81e86da1f2cd4bb0a0e5d497c4943e70631249707fedfd1542e61e3275172d363a1c898f5ee7e44fed88f135b6c815f613530f486e755999189c48e729847037 SHA512 b92b0c0be7194af2716ed6ef4acf10aa48dd3543bee30945d145d8d4d19adaaef17fbdff6aeb14f42490296483998da2cee80ae94d3a0fb5f86a0ce8cc594bc3 +EBUILD netdata-9999.ebuild 3167 BLAKE2B cbac02716221ec467e1d994bd6b6a4f54da1691ff018ee805e4d45dda6d63d0f4e04860c97bf83d1762ec50235b7022b57d18450bdd616be8f7998442e8c1378 SHA512 966e9c1a1504482234b8785efbebc46a2c67c4c8714ca82ce866a01de9e531178eb24559d438f3703572c9c78facf7ec6192a25fae20c51338ba5bc5dbfaadb6 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf diff --git a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch new file mode 100644 index 000000000000..1b6d5b75020d --- /dev/null +++ b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch @@ -0,0 +1,126 @@ +https://github.com/netdata/netdata/pull/7877 + +From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001 +From: Thiago Marques <thiagoftsm@gmail.com> +Date: Tue, 28 Jan 2020 13:59:20 +0000 +Subject: [PATCH 1/2] missing_extern: Fix missing + +Fix few externs that were missing in global variables +--- + daemon/common.h | 2 +- + health/health.h | 2 +- + libnetdata/health/health.h | 2 +- + web/api/web_api_v1.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/daemon/common.h b/daemon/common.h +index 6ac3cb3c87..59dbc41a8d 100644 +--- a/daemon/common.h ++++ b/daemon/common.h +@@ -84,6 +84,6 @@ extern char *netdata_configured_timezone; + extern int netdata_zero_metrics_enabled; + extern int netdata_anonymous_statistics_enabled; + +-int netdata_ready; ++extern int netdata_ready; + + #endif /* NETDATA_COMMON_H */ +diff --git a/health/health.h b/health/health.h +index 9da90d70c9..d77318fd78 100644 +--- a/health/health.h ++++ b/health/health.h +@@ -52,7 +52,7 @@ extern unsigned int default_health_enabled; + + #define HEALTH_SILENCERS_MAX_FILE_LEN 10000 + +-char *silencers_filename; ++extern char *silencers_filename; + + extern void health_init(void); + extern void *health_main(void *ptr); +diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h +index a3dc0775fc..f7580edab2 100644 +--- a/libnetdata/health/health.h ++++ b/libnetdata/health/health.h +@@ -44,7 +44,7 @@ typedef struct silencers { + SILENCER *silencers; + } SILENCERS; + +-SILENCERS *silencers; ++extern SILENCERS *silencers; + + extern SILENCER *create_silencer(void); + extern int health_silencers_json_read_callback(JSON_ENTRY *e); +diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h +index 4fe3c8f6be..edeea98bed 100644 +--- a/web/api/web_api_v1.h ++++ b/web/api/web_api_v1.h +@@ -29,6 +29,6 @@ extern void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation); + extern void web_client_api_v1_init(void); + extern void web_client_api_v1_management_init(void); + +-char *api_secret; ++extern char *api_secret; + + #endif //NETDATA_WEB_API_V1_H + +From c0275ddaad62459a6da1eee0a0c76282a1391590 Mon Sep 17 00:00:00 2001 +From: Thiago Marques <thiagoftsm@gmail.com> +Date: Tue, 28 Jan 2020 14:06:56 +0000 +Subject: [PATCH 2/2] missing_extern: Variables + +This commit declares the variables inside .c files +--- + daemon/common.c | 2 +- + health/health.c | 1 + + libnetdata/health/health.c | 2 ++ + web/api/web_api_v1.c | 2 ++ + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/daemon/common.c b/daemon/common.c +index e28f6cf000..67497a4e93 100644 +--- a/daemon/common.c ++++ b/daemon/common.c +@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir = VARLIB_DIR; + char *netdata_configured_home_dir = CACHE_DIR; + char *netdata_configured_host_prefix = NULL; + char *netdata_configured_timezone = NULL; +- ++int netdata_ready; +diff --git a/health/health.c b/health/health.c +index 1124cf9107..4a84ef7fca 100644 +--- a/health/health.c ++++ b/health/health.c +@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status { + }; + + unsigned int default_health_enabled = 1; ++char *silencers_filename; + + // ---------------------------------------------------------------------------- + // health initialization +diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c +index e03538db3f..98d26d295f 100644 +--- a/libnetdata/health/health.c ++++ b/libnetdata/health/health.c +@@ -1,5 +1,7 @@ + #include "health.h" + ++SILENCERS *silencers; ++ + /** + * Create Silencer + * +diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c +index aafcbc70be..4ac50524ad 100644 +--- a/web/api/web_api_v1.c ++++ b/web/api/web_api_v1.c +@@ -2,6 +2,8 @@ + + #include "web_api_v1.h" + ++char *api_secret; ++ + static struct { + const char *name; + uint32_t hash; diff --git a/net-analyzer/netdata/netdata-1.19.0-r2.ebuild b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild index 2c99a7a4fe82..322bebf5a280 100644 --- a/net-analyzer/netdata/netdata-1.19.0-r2.ebuild +++ b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild @@ -86,6 +86,7 @@ FILECAPS=( PATCHES=( "${FILESDIR}/${P}-prometheus-spelling.patch" + "${FILESDIR}/${P}-fno-common.patch" ) pkg_setup() { diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 6e2a420b82c9..ba797abab3c0 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -115,13 +115,10 @@ src_install() { rm -rf "${D}/var/cache" || die - # Remove unneeded .keep files - find "${ED}" -name ".keep" -delete || die - - fowners -Rc netdata:netdata /var/log/netdata keepdir /var/log/netdata - fowners -Rc netdata:netdata /var/lib/netdata + fowners -Rc netdata:netdata /var/log/netdata keepdir /var/lib/netdata + fowners -Rc netdata:netdata /var/lib/netdata keepdir /var/lib/netdata/registry fowners -Rc root:netdata /usr/share/${PN} diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest index 323ce68823eb..4bfd093deb01 100644 --- a/net-analyzer/netdiscover/Manifest +++ b/net-analyzer/netdiscover/Manifest @@ -1,6 +1,8 @@ +AUX netdiscover-0.3_beta6-fno-common.patch 837 BLAKE2B 9b980d3de4565b4c139b7a325873c6602eef4825d7874ef79e94759a71fa07209c607548f89d46a44cad1be52c5bdd49fdb567c10d154cd1701c2a69dd873ccb SHA512 b4ce0c7c3b152a95f08bcc1190b971b632b325af8ef10d0b21ea5ed5b17b890366d7ea79eeefa3422e3906f447fa046051122795738a66574c738d5c629f8ddf AUX netdiscover-0.3_beta6-gentoo.patch 668 BLAKE2B fa0f3080a27e41029e604b0018ecdcb5569ddec556cf0ff8da216128b6c598a0f48ffa1a113d92b8c5b3e91d92a75d30552a493e1ae2805fbc62101f7f9315df SHA512 f05aea3f8ef120f3f1a33f1dfff401fc5045cb6e71735dcdc135bb33b5bb338eb90fb442d474a0e8a993df5d67f70fcd676f12c582ca1509d5550724d4f53b99 AUX netdiscover-0.3_beta6-misc.patch 432 BLAKE2B 740fd53b60002d4c5577a23ad492d268f4c75aa4057b999fd3ebccecd187aba15982c1e94ff9044d1a5fefc46ff51ea31deb57e6df58de72eec24f179c2bf867 SHA512 bf67008aa25558d2a8d1a2a5731fdafb555b5336db2be3ffc6f15e89312341eff9bd351115a2cbd21078d823f4b79a81f0583b0380d44eb617a2770838c07de7 DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151434 BLAKE2B 14a406b766cc9dd5e3bbf98556077b51c88fe7f4aab46a45291b35a5fa4a38d33d86ee7592c6672d7c3b573893bca285f04ec22cf8735f090d3444e795774838 SHA512 936f030bac30cf54d1b9b6bb23045c2cad201a21529706436ab0732c356dc4ab27e3f2a8472437f9ac76d9b819ebc6d8faa05405be13d3d6beda5e261ebf93da DIST netdiscover-0.3-beta6.tar.gz 411018 BLAKE2B 319ad0d4589867ded2747794b6c0074a68285b2abdac57a4f569f92e9bf09c71c7e9db64400dcce9aa44804d202d7d2fc2c0d427b92a9f99ff05a632fe5a794c SHA512 b8205322c34684642d52bf58f8fffa12a0dea387da713caf2935ba348c74b2e6cac717bf1626c9de816e45dce7c42b6b9584b5253351040af806f7ba262ce4d2 EBUILD netdiscover-0.3_beta6-r3.ebuild 806 BLAKE2B ea2b8deecd4de9eec8fa06a85b9c93321070a4ec3077d454ba2766a69e979a6b0d8f5181701a22b65c1537acc76b291718f6c5da7fe5395912d31335a89e2fa6 SHA512 0ab1f50c3c82a95996ecbdbbcb61c09281bb58ff4a3561f73327a7ed26cfc0ce2f23ede1e2984b5774e89b36bc9da2d1ff9684c2fc21f54e88b31b8212319366 +EBUILD netdiscover-0.3_beta6-r4.ebuild 835 BLAKE2B 59f29c798abaa3d3b00c69e31d63e4b5f709a99dc872e9342d8f6ece2cfa62f86e351f73649e3bde53bf208adf352c7b149c2ad1696bcfa35179ca7d69c1ae8c SHA512 2a29385c3d687f5d0ef2e9237875af40bb45ba78ee373c1f1391c46660154f7ab1c3d162064f04fe238172958237e2d1fcfec111a7f5f2419de13938918f6978 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch new file mode 100644 index 000000000000..8355321085d1 --- /dev/null +++ b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch @@ -0,0 +1,42 @@ +--- ./src/ifaces.c ++++ ./src/ifaces.c +@@ -72,6 +72,7 @@ + unsigned char smac[ETH_ALEN]; + struct p_header *temp_header; + ++char *ourmac, errbuf[PCAP_ERRBUF_SIZE]; + + /* Start Sniffing on given iface */ + void *start_sniffer(void *args) +--- ./src/ifaces.h ++++ ./src/ifaces.h +@@ -46,7 +46,7 @@ + + + // Shitty globals +- char *ourmac, errbuf[PCAP_ERRBUF_SIZE]; ++ extern char *ourmac, errbuf[PCAP_ERRBUF_SIZE]; + + // Sniffer Functions + void *start_sniffer(void *); +--- a/src/screen.c ++++ b/src/screen.c +@@ -48,6 +48,7 @@ + struct arp_rep_c *arprep_count; + struct winsize win_sz; + pthread_mutex_t *listm; ++char *current_network; + + int scroll; + int smode, oldmode; +--- ./src/screen.h ++++ ./src/screen.h +@@ -24,7 +24,7 @@ + + + /* Ohh no, more globals */ +-char *current_network; ++extern char *current_network; + + + /* Structs for counters */ diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild new file mode 100644 index 000000000000..264eea20d328 --- /dev/null +++ b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +DESCRIPTION="An active/passive address reconnaissance tool" +HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/" +LICENSE="GPL-2" +SRC_URI=" + http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz + https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2 +" + +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" + +DEPEND=" + net-libs/libnet:1.1 + >=net-libs/libpcap-0.8.3-r1 +" +RDEPEND="${DEPEND}" +S=${WORKDIR}/${P/_/-} +DOCS=( AUTHORS ChangeLog README TODO ) +PATCHES=( + "${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-misc.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest index 0b90569f49a8..a5a3b655ea79 100644 --- a/net-analyzer/netperf/Manifest +++ b/net-analyzer/netperf/Manifest @@ -6,5 +6,5 @@ AUX netperf-2.7.0-inline.patch 974 BLAKE2B 4e3174761db0b72656e22e361841bbb887da6 AUX netperf-2.7.0-space.patch 455 BLAKE2B aa4fae48102f2d767a0c72a13b20820d9e42f782455876766399e7edc5625cd6ff0c740c3268aee4443d844ef6b28da69144c039bfdc63519a7279d2cc1ad433 SHA512 e39bfcec70da00fa886b1f8389f54eca6bac83fc8ff48a72427fcd30c3f605e4ec2d01d2f7161ae0fa26bd56283c03593caf756db7d808f0e3e4d3a90d50f1fc AUX netperf-fix-scripts.patch 819 BLAKE2B 59779076ad1e3315712f7db54451256dcbd04c2712020d0b39c0fb1969fbfec0cbf8a3f1b6203ce5622b45a2cc6877b1c1448b0d505aa98a034c2a7fd2f285e3 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad -EBUILD netperf-2.7.0-r2.ebuild 1919 BLAKE2B 21aae85ceff1b2d4728ee3a984c28796b2848e7a65de9513cd5a088ac9e747aa65370f6700ddf7f3f2f09c20b322fd3590e4894cb4459b5301cecebb84bf74f3 SHA512 b511f47c363bf844415c281fe664b7b96898eefbadcaf87189933a83dd17e349e7ddd7f8af2ee9a91c0cfb6919bdbec4a2b63a25829cfdf3817812661ce1a734 +EBUILD netperf-2.7.0-r2.ebuild 1942 BLAKE2B 5fec2182c7d9d6e61c9cfac7de0844485d56b1a02cc2088c5e838747517a5919fbe083c1f6364dd7ddaca9406639b764e6fc135f446a05d430c9041af4083f86 SHA512 7b078ce7081ad3dc8e9cf110505bd7199efd11d4d69599e3b4594d3feafc3318faf2c9e9385820cc70a5eeb3803a215e5e780bb3173d67b432da341c406fc115 MISC metadata.xml 855 BLAKE2B 20c4b64a1abe9e4f83a56e759b9d7cfb161886dd06a4672dc96828a80d3f91c064665138a87c263815c217091a869e7ced811fca059405bf047de337814c52a5 SHA512 628efc289da10094d7fab1c0c47e8acd67260fffc036e2d4eaa1430e1b91fd2610d681134211cff4dcd5f84858199a4bbf36aaaa73f3e507bef1114a64b4e588 diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild index 99c1d045b092..86849c8d0dd7 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ inherit eutils flag-o-matic user DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86" HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" @@ -39,14 +39,16 @@ src_prepare() { doc/examples/udp_stream_script \ || die - # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ - # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ - append-cppflags -D_GNU_SOURCE - eapply_user } src_configure() { + append-cflags -fcommon + + # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ + # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ + append-cppflags -D_GNU_SOURCE + econf \ $(use_enable demo) \ $(use_enable sctp) diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest index 42fda23795f3..80af8d5bc55e 100644 --- a/net-analyzer/netselect/Manifest +++ b/net-analyzer/netselect/Manifest @@ -2,6 +2,6 @@ AUX netselect-0.4-bsd.patch 1573 BLAKE2B 62405aa2962ffe74fce014341433d114f6785fd AUX netselect-0.4-flags.patch 172 BLAKE2B 17acc10b64404c9d8525147f5ca526f661a2b2c2b7e7ae31b19186784ef4b4714b14e43ccb77d318016b60c6ff80e381acf9b006487f0d9ebed06e70cb026a3a SHA512 3f665743859e243126de95340da5b9dd42ff671d82f3809e294b752a568b7ede96b13f6a63e18cc522ce19d1537b137d5c05e0e49ce533e8fc337922e18ea74a DIST netselect-0.4-ipv6.patch.xz 18272 BLAKE2B 6197057085e892c156a9fb3a82ac0030a2ff1b4276dde48405de2d2bcfdcef066c4f3eeff174f766af23d2807085f97e459dbffc87b2a2950a472e7964f2e3fc SHA512 422b54df5be45379fe7d6776b6e653a8e49df6fb77421527f2eb6c687597f36cccc7ab5cc5206e9823c318f6facd84fb4e8c0dbffbf9641cee593401cb73abea DIST netselect-0.4.tar.gz 22095 BLAKE2B 1dd83c4dcd38ab7b987ead76f4e7e727980bbad91b59c56948e13540307e685984cc11ea94292d38959c8253f1f6ec2e6e6e044302f26b09153717d6e29e96be SHA512 eee9639122b7cc89218c610794d090582aecb3df138bcef41472c8d40c0f7e998b2c4b04aace13795fda5c710ee28cc2c0784a680ad6d1aa6a14eb441a408bfa -EBUILD netselect-0.4-r1.ebuild 971 BLAKE2B 763fdcf48e8117f6aee40abae77518e1368ef14cff7b11aac8d635b018dc5b88a99500963e41291618e2968a38123298ab78fd4a99f4f53814bd121ab1404653 SHA512 c827f560baefb52e52775043e610eb4baac9872dd323e0cc7a2bf0347c198fe554f5b1991eead44bdf8c4b100df7fa9fe9ae986bc3bd7a8f49d55975c5ad6de0 +EBUILD netselect-0.4-r1.ebuild 972 BLAKE2B 0c03c6cb60bd4459a13810d8a4c3fcaac8c7653f96da7c2b8d627a5b0541f9bc3428a6ced72a9d812074a2378cbd4616f952dc3a9c4ed9806c53e37b3eef63f3 SHA512 d74fca06bcda4818555e06ab7d945f9785ac231aa938e8872773a90aeb645c1db5775ba127e607899cfb44b5acb2ae452dbe048b4ac45cfac1eeea3fd3ec6984 EBUILD netselect-9999.ebuild 900 BLAKE2B 581801a56b90a1a856796e0995c6bd4037d52fd14eeb2e1aad47eaf980c0996d8a865b1e95429bd0913e750b4bd0ded217a4ec8a00b308c1a81f02305c6651f6 SHA512 c2619dacf3aba239f68a245ef283f1a7839fcc639fafcd41e8acbebf36e11396997074faab2e36a61c71c0a7665a695f0df838f351bf95a321cabf9a45493b0f MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild index f4159861bdb5..8099016f9ff8 100644 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ b/net-analyzer/netselect/netselect-0.4-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="ipv6" PATCHES=( diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest index 2aedd7c23223..0213f46c469d 100644 --- a/net-analyzer/netwatch/Manifest +++ b/net-analyzer/netwatch/Manifest @@ -1,9 +1,11 @@ AUX netwatch-1.3.0.1-append_ldflags.patch 558 BLAKE2B cdfe908ef103ba484ab6e375dabd6b7bd60bd1c93d4b834d1da640a73ce3912541f75632ac8ee51c3dbf38a4168b7301c73c3986bbe043890071da761f4e73dd SHA512 afee222f8f0c18de7b1c5f62d0f3705e40dccb09827410c67f61da9a0dc951c2d01b0e02cc4b6154d17ef8aaa625dd4265c4514a97d7df9dd9dc14da8a851338 AUX netwatch-1.3.0.1-do-not-call.patch 307 BLAKE2B 686d4d6d5ada26620ca8a2b02021be1fef17d3ba8da8149bb7dc037c386e1590f44a62357d779ce87732496cc8f9957a1df9e29947f6def7d18cf4e8b3dc29cb SHA512 988516e66e0f02edd484854488fe232c6ae8158d135a2e26837b9c2178650111cf2d33c29bee3f9c0b01b21d7ded0eebf93b39fa7a714a04e3d99f490f7690ea AUX netwatch-1.3.0.1-fix-fortify.patch 313 BLAKE2B 1f5d672118dfd3ef9b907e77b8a575f1e025d66b584dc4c74ac500ccf03a353dda5841a19a920a97224cd6fe784adfb40878ccd43ed82387d0ffa4ffd76f2ccb SHA512 ed33d1df73293c172982f016d033bf2bd35fca50e89e20433ae867b418446a44614da49b161f190c7579b21cfb1d01e514fc77fddb3ca5f469f0daec2acab0cf +AUX netwatch-1.3.0.1-fno-common.patch 1075 BLAKE2B a2329a590a088ff0a5b4e985945d6f92cbe02dd2865ed0f4caaa356671aba03cabbf9850c3f0651416fc93d5e794b528b72814d478fe32d90b1cb5f8dfb5504f SHA512 a257ce4ca20abcdc268cdf86a2ceee683f016f67af78622f620f18d9aaa4a0f3c0cfbae0edf8fefa718996d86353f094a4c6b886edda6ccd906f408398377789 AUX netwatch-1.3.0.1-includes.patch 489 BLAKE2B 9528ed80f11b33652824e9239022b85e1ec8331b2b1e31c5000d8f8ae863d572fd12d15d003b829c4487faee09b28fd29ec51579072b2a731f01990b597ddfbf SHA512 dd1005f58772aeef3909342df0b4a1f14bbd509b51361ab52f752b274fb51ab3a45a93b6af4feaaedb4fbace94ae55c7e153c9f1eb8257f66549c72a957885f1 AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc6b89a215c979bc3086b3d4a5834af9a4c461dc24ffee4163c6d544f1e3f2eaf2fba7e638eb0ceecd11e1c00396e0 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54 AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a EBUILD netwatch-1.3.0.1-r3.ebuild 1004 BLAKE2B d671a299e4e4ad06b26774c37b4b8fbe3d47bac238927e48c7f9c7efbf62501ebac117e5c7787d82abb57d722586b92bc92b65e8795302f1cd70cbcb49d88391 SHA512 75964e3687c8323ba835b249de104cf8b49e6de8bff300bd0229c5dbe3fb835ffddc4d4b01477b87992a5ae58c3c434398f609ea82648f99febca3a51e197c59 +EBUILD netwatch-1.3.0.1-r4.ebuild 1000 BLAKE2B 86158179f80a298a250376ed784d0275e8f9e9c54b5c8d390d445fcab3edfe3dc17bd55a13d332a3ef5e4703d5bbd6b887bb9d0d8b9830206bbf729f0abb37f9 SHA512 78b635977bfae6c3997a213ceed364c33b64d76767475f4e37a0d9ce5f42fb13aa9799a1b9a2c5c612df3b753f375f006098f950cf6ddf69ede5b4dc4a6d5cdc MISC metadata.xml 274 BLAKE2B 75e74aa7e81d0d0097bcd02f91b106e38607e8c17cd10ecf224e3423d3b117d6110bfd0345a723b1e84a4b5d63ab07e8be1661e71f83eaaffcf6164d780e8858 SHA512 1d248e6ffe1a07fd1e2d6ca9f83f8108d8d5941b5067860e8c8daf5cf383446d21008f9fc1555fa6d3b045138173661e0426fb68b923969ffec027bc858bd53d diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-fno-common.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fno-common.patch new file mode 100644 index 000000000000..02331e7deead --- /dev/null +++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fno-common.patch @@ -0,0 +1,44 @@ +--- a/dispdata.c ++++ b/dispdata.c +@@ -173,7 +173,6 @@ + extern int simchange; + extern int simfwdir; + extern int simarr[8]; +-char *simfmt; + extern int iseth; + extern int nw_logall; + extern char nw_allname[256]; +--- a/netwatch.c ++++ b/netwatch.c +@@ -161,6 +161,9 @@ + char mylog[MAXFILENAME] = "/root/.log"; + char specconfigfile[MAXFILENAME] = "/root/.netwatch.conf"; + ++struct port_info *tcp_port_types[TCPHASH]; ++struct port_info *udp_port_types[UDPHASH]; ++ + int fdlog; + + #if defined(_LINUX_IF_ETHER_H) || defined(_NETINET_IF_ETHER_H) +--- a/netwatch.h ++++ b/netwatch.h +@@ -209,16 +209,17 @@ + }; + + #define TCPHASH 1786 +-struct port_info *tcp_port_types[TCPHASH]; ++extern struct port_info *tcp_port_types[TCPHASH]; + + #define UDPHASH 1786 +-struct port_info *udp_port_types[UDPHASH]; ++extern struct port_info *udp_port_types[UDPHASH]; + + int hashport( int port, int hash); + void initlist(struct port_info *first[], int hash); + char *searchlist(struct port_info *first[], int port, int hash); + char *servicenm( char *s, int port); + ++extern char *simfmt; + + + struct hostinfo { diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild new file mode 100644 index 000000000000..df6024cd6534 --- /dev/null +++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +MY_PV=$(ver_cut 1-3)-$(ver_cut 4) + +DESCRIPTION="Ethernet/PPP IP Packet Monitor" +HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html" +SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND="sys-libs/ncurses" +DEPEND=" + ${RDEPEND} + sys-kernel/linux-headers + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${P}-append_ldflags.patch + "${FILESDIR}"/${P}-open.patch + "${FILESDIR}"/${P}-fix-fortify.patch + "${FILESDIR}"/${P}-do-not-call.patch + "${FILESDIR}"/${P}-includes.patch + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-fno-common.patch +) +S=${WORKDIR}/${PN}-$(ver_cut 1-3) + +src_prepare() { + default + eautoreconf +} + +src_install() { + dosbin netresolv netwatch + + doman netwatch.1 + dodoc BUGS CHANGES README* TODO + + if use doc; then + docinto html + dodoc NetwatchKeyCommands.html + fi +} diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest index e359c237e51f..87abdc165968 100644 --- a/net-analyzer/ngrep/Manifest +++ b/net-analyzer/ngrep/Manifest @@ -4,6 +4,6 @@ AUX ngrep-1.45-setlocale.patch 495 BLAKE2B 10d70be3c787344f120ed2faf527425af68ab AUX ngrep-1.47-regex.patch 683 BLAKE2B 5eaed7398a140dee747664ce05c3f9afb9f57f827ef96efd4ad284be313dd234c15603bcd842c7d2c96a46900de46205cec1d0270cc83d36b5e9feedf1f3b2b3 SHA512 e435f1e4fb35fbed0eeef414da2fd19c09311287b466e667c9150d53a1ae52abbe31173758192c9638eaecf54e4c3be99020e9831a2543b2e4d0c61f5b9f55de DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657 -EBUILD ngrep-1.45-r3.ebuild 1054 BLAKE2B bfd9bdbaeee4b01ebf2ecb3da4a86799bf4d4731c043b2710d27c51ff957fd5ffca8b909c2818bce8412deceebddd740a93e78798ef7be60ad6ce9be8a7f5e55 SHA512 4cfbb8c069c4b758bb29e87a179c790f2b8c3ed4a8f057944cbf5d7b119b2812cfabb572180027ca4260dec247a7aa1adcad3e02dd6933823d154bc4f8834680 +EBUILD ngrep-1.45-r3.ebuild 1055 BLAKE2B f12e6f78977bf2b3070f41b55b9725d180e084622d9820214824e6d095af0dbc62b221bfe707d24984f4661a7d3497c2e27be44c20a326daed168f58707cfac2 SHA512 50b8d40ad5422c2322dac5f07f969268c6176ef626e085f9991e1796a72b017a59af5fea21293c026a64e58dacd9711100659e774e5519512d3188056eab1d8d EBUILD ngrep-1.47.ebuild 988 BLAKE2B 5631f03e2291665a5dbeb50a4143b02dd1345d4f4a6444fdfb764f1f5383c93fe366a8e187400bd12afe125f94a0108b054b5ebd18bb732dd561d0953d0fc789 SHA512 4db4e6f7204430823aafd035e1df7961e4b8e704c3d855975c1ffd1ea81c4b602feb4b3a256c4d2958e7692a15cf3c59f5722f664f95eb8e5b4f39a41b716fe4 MISC metadata.xml 669 BLAKE2B 79852bd4c0d1185bcbf60e5ba9e5a9c58b6d6720942cd0cd6d7f8f4f6d445d9ba3fa888bbfba625d1627df4a0aaed22513163075806483a576e199acb9c5fb4d SHA512 d680774ca1d7a66bbe9badb840ebf3f0249c80d0850a229797d17a09da27e2fad9510449ceecfb62b3141ad105fd2970713a14879df57e0bb14c26ac66c807ad diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild index 6afb5aa76ca9..cb6e6155ab76 100644 --- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild +++ b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2" LICENSE="ngrep" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" DEPEND=" diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 0bbb5424ca2b..7edd9c67e2b9 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -9,12 +9,11 @@ AUX nmap-7.25-no-FORTIFY_SOURCE.patch 2258 BLAKE2B 28e3dbd2d2ccac4d01fc640377fd8 AUX nmap-7.31-libnl.patch 498 BLAKE2B 15ba0015ce0c5f266adf1f6b53ad99db82521a3ef8b226f040acc4f0f7759af762fafbce2a1820675e55e04d6b4dfbe04f67711d3fdd1e9dabd750b200ef9d3a SHA512 e7047faaac2bec6c8e0aaae04cbc6e97a8da7999fbb1a8ff015a78ffafe3ce645b71746fd6da826e3ad9baa8d8a917d3791836e67a346dc9c1ca6678cd04e7c8 AUX nmap-7.70-time.patch 586 BLAKE2B 5354fffebb073c2e96ec744ac746b140ef1b528539faea0ba9423283b2bb535e4310423cbae9671b13ef3af4381182cb61a6662bf314f597cc2fbcaf16b9d11e SHA512 5b948f7393fae98bc0d94e3aef585308476728fe1530fd59bc67aa16ab8f8d790f06b9efa30c9c0a924e690c088453f213520b086ec233a80aa7de8205d79276 AUX nmap-7.80-ac-config-subdirs.patch 849 BLAKE2B d46ad183900ca2f541a1577a2add5c13cebf97007867e737bd8f2c4d45e0716ddd0a8ea0e193eca17fd26d8f5acc1c2b4cd7166d8ddc1942e75e0adbaca17f01 SHA512 e1c1aee3fc5e0030409b258c7bb8838844c2008cde48457105ae43e6d8dd705672bfba269911807105e0735ff0b25fc86304be9dc4c3dc33b3f722a9c492ecd4 -AUX nmap-9999-constify-continued.patch 801 BLAKE2B a11f5293343ec0d710bfb8648de5b82d5f8d2d10f21e6dcda8ebf963337fedc62248da635b66c956eb64eeb1058b65d4a4ed20e44086c84ae1898fd5c93ff753 SHA512 95f51a1def778ebea9f85a06f3908636b4a849b9e35b027f495da3a37f5293f49046f1f29c778162c8bbb5707e8288a4e37e9362f3310e4fafa238b84ee47af0 -AUX nmap-9999-netutil-else.patch 785 BLAKE2B cfa912b8a31ee26b1c0be2b63e8612794099ea9797a0bfccd56bd6a96b11ff76cb82f9fb4aaae326e845c016d9cf933b431b718b89e14a67c45f7f23d15d1cf0 SHA512 05d61d3ac52b77521fd989ff3f100089ead4af17f1e3654f07b9557b63af92f8a3adc2fccd1be2a4425735018e7f05eda9154c1fe139e3df9d10a874cf418052 +AUX nmap-9999-netutil-else.patch 373 BLAKE2B 39f28e3b6a8ddf55029f1db1444200ee475e9351105c7348fe9fd48156e452d8f9697b83a7860ffb188a7f8089c3696c8eef49322a7b029496a334972ae1a180 SHA512 1e062a571eaefbea55f8c4164d8c2b7da177f7c5dd7e846bea5515f81847248bfcaffdb58433fee5f2e08cba387c1ddda21bacbd86efc32a6cdea486cac57cd1 DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 -EBUILD nmap-7.70.ebuild 4511 BLAKE2B 1a5599df259671c105270d6be62aef9d0da5c707da9ec952eea374cfeddb7674dc49d742a7ef1e895f0a13aead05ddf5c310f258f83fe1305a16d7912a95822d SHA512 03f87c2848fc01424b036006ad4628637c4fe57711b79a8dffa4047c65ab4dd8f19f4612e56334cb0aeb711c2eebe9607f14165abce431c72dec96985b92de81 +EBUILD nmap-7.70.ebuild 4512 BLAKE2B 4fd051bb66fe938fa41a587ad79d68044cc9ee0b94f74030cab6c93f71c72a36ce4c4e15050517f8505823268fa8b92e8d119eb574fa1616630e068827b84d13 SHA512 9fddc38177a452869eb958577ed616a991d947578311d58d08db24ab35229e930724ef726f86e12e7178fe9bcaed019322e4e386d0da8db24476a8e0739d3720 EBUILD nmap-7.80.ebuild 4404 BLAKE2B 5b14582a9f8ba7fb1872b18bc7e4f3a12f91cb46ec71a872947f004fc4b1cb018f65d0839cf06d5f153ccd0ab84c36b9ec549d2955cf5e90f5ef02a468f01c13 SHA512 0eadaa7891d91fe15355d0a24694eae1ef31c72899c841a436eb11e34a4200f61144e0916a05891e765fcee6120420b48378fff6e65407c94e00c5f33786baed -EBUILD nmap-9999.ebuild 4365 BLAKE2B 4cefc1c460a5f0988831a3a4f966cf9ba7f235d54deb3a67a444e6b7b5f63a7e8214bfef9c830ec2bde3f7507acf552a15b6dd5c275f8d732ed5fe39d4f62e17 SHA512 5750c06832dac64095e4956c799ce9e93a12632574ed5be759b690fc0c7dff29209302168c28884e0252449aa8ebcf183cfad473ed3a313dcde857ec861e1138 +EBUILD nmap-9999.ebuild 4314 BLAKE2B 17c2e9ce5472fbf6f0fae03648a6f4d95f6156e99844d8bebd913016a20b1a2fbfede0c4d4bb281f3b0204ae84df90cddb6772618c0ceeba9bb84f1f794bacdc SHA512 707c22d6849f3bb7c8fd7c46f88b3e6481613c714a00734279445a4608012a56ff3869b1131be70380410f46a2c5c5a2b4d077d59cad139018c301f09d6d0738 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185 diff --git a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch deleted file mode 100644 index 04738f408231..000000000000 --- a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libnetutil/EthernetHeader.cc -+++ b/libnetutil/EthernetHeader.cc -@@ -284,7 +284,7 @@ int EthernetHeader::setEtherType(u16 val){ - - - /** Returns destination port in HOST byte order */ --u16 EthernetHeader::getEtherType() const { -+const u16 EthernetHeader::getEtherType() const { - return ntohs(this->h.eth_type); - } /* End of getEtherType() */ - ---- a/scan_engine.cc -+++ b/scan_engine.cc -@@ -166,7 +166,7 @@ extern "C" int g_has_npcap_loopback; - #endif - - --int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const { -+const int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const { - const struct sockaddr_storage *lss, *rss; - lss = (lhs) ? lhs->target->TargetSockAddr() : ss; - rss = (rhs) ? rhs->target->TargetSockAddr() : ss; diff --git a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch index a96a04b7a87f..c9b3350d9865 100644 --- a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch +++ b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch @@ -9,12 +9,3 @@ /* TCP Flags */ p = tflags; -@@ -2633,7 +2633,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) { - (tcpoptinfo[0]!='\0') ? " " : "", - tcpoptinfo, ipinfo); - } -- } else{ -+ } else { - /* If the packet does not fall into any other category, then we have a - really screwed-up packet. */ - /* This ought to be unreachable; if static analysis flags it as such, delete it. */ diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild index 7eaa1c0767d7..4dd557296213 100644 --- a/net-analyzer/nmap/nmap-7.70.ebuild +++ b/net-analyzer/nmap/nmap-7.70.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE=" ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index c45c2c6b4ce3..e5440fa3e63e 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,7 +66,6 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-9999-constify-continued.patch "${FILESDIR}"/${PN}-9999-netutil-else.patch ) S="${WORKDIR}/${MY_P}" diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest index 1d4e61d09540..6e2df0b4357b 100644 --- a/net-analyzer/nmbscan/Manifest +++ b/net-analyzer/nmbscan/Manifest @@ -1,4 +1,4 @@ AUX nmbscan-1.2.5-head.diff 442 BLAKE2B e97b6359f9479b76eae7cddc837df06a02b5adf886ee142f5e0b6dfe27debda30d49197c0184e802686d00df510ed0f6a47ea90c294ee1e124fb980b379121e9 SHA512 6fd79b7b9462700245df3c91345a197cbadafb30f60737b2426285f9a4bff969c752bd68bdde4f305cdd8079a5c89fa1be75360a2e35caf495489c01081b0ceb DIST nmbscan-1.2.5.tar.gz 44749 BLAKE2B be49afa46c6ed1533f3e3d7b5c6fbe54b83802385ed9b670f1cdc0105eae99135000be5e98a693ad2adca54f9948ebacc8cd4fc677828a61a5fa85667d584fcd SHA512 37030c6759cc8b257356274b54ec7474e49ddc523be20180c509064f9238da3350f0f0e73e84f2e89201405e93a350a7a7cdc24ef890e638b62648ee2fc4feb9 -EBUILD nmbscan-1.2.5-r1.ebuild 560 BLAKE2B 34984ad2f4247700faef22e15f49e78950e40c4c0f6481a95b0b24344ff6e19de9cd0c5d14512c1ac32d837ec5b8f9fe629853d2d5717ceb953d448aec5da04c SHA512 6ac78a6009bbd489436f97776e435ba73e58e477d795a461780b9bb110a7f5c3e81d35aa4578a36b76d0ba77604d7e436cfeeeaf13cf7d25879725a817786616 +EBUILD nmbscan-1.2.5-r1.ebuild 561 BLAKE2B 6f44f5c4387e50c82a65e972a26ff5dec7a76bfe0ca8ba98b1eb780c93c4732602f210eeec27f5eeb8cddf539c73b808cd2ca82776a4af882e6458c655d5ac56 SHA512 6c8186bb104bd6e6f3b0638094e56d34eb68cae2950816bbad9ff629a65c34bc454e17bb579934f25a0a43979c6f8e5d0da068aaf57b2232f5ee9f6bc151e8ec MISC metadata.xml 683 BLAKE2B 8a9b8ad3c95bf0889477f9f8bb0a5f150f24e6d1cdc796a870c8f315497c1383c585b51b18c43dbf2f66122cd0db332c4f10da05ec62647573ba02fe2b450f16 SHA512 f0bb01d9be906681f1e7bf349e776b7cfc15a61be7a3e944e7291dac9f42a3fe151b05e20c6a13b98c8bad598d56811699a8365ba9227419bea4e2373de26b19 diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index 85b5ba140bc1..89d220b28873 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 s390 ~sparc x86" RDEPEND="net-dns/bind-tools net-fs/samba diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest index 2ee465d781da..c6f083cbf09f 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -3,6 +3,6 @@ AUX nrpe.init 1152 BLAKE2B eea4c8554ef02b7eb9e602a4b0750565520dd830435586043f615 AUX nrpe.service 242 BLAKE2B 715f0e8b91d6c40405d6d1f3689bbbf750e61e78e1d727debbe998ae81922b36f1d5f7c011f6881979e485a81c08d3f1f405b962023fecea643c8f7a9e04c3df SHA512 ffd67467cc4f5ccdf73e0860d1355a8cc3e528d0c67f2054b0ad76c02a43f9c5a8964a3f6df6f91eaa8e15c3c9596259aa964ad69aa2da60678d68fa892b2346 AUX nrpe.xinetd.2 245 BLAKE2B 3e9db31c7d5b28dab18d2f5855d0465f25fc9cf4a70deac9a5d0c87c7cc546a33b432dbca172a49addadc0bd6583d870ec0fe350bf60e015e325d8bb923aca47 SHA512 d687cb2a5babfd28a97d3a5f1ac665758341ecc37fdd0193dbf0df4cba68c88aa24776a33a706989843fa5356b2e3e995662a823ceb2b86ba8f846f8c47e18fb DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 -EBUILD nrpe-3.2.1-r1.ebuild 2516 BLAKE2B c9221e5f220d7231f9c293a0fbbd5aca68600806538f8dc7bba18c03d1f9d72ab3298ef3098483475212a5f10c2c520ed7fd1914d868b5de2016001b7baf03b5 SHA512 669ba9444ddb021969ec9987fa27bd32bb059410acfdcc344e505cfd562088123fcf227d8bd0d17987670332924fe2dbfd11beaeae146aa49f3cc4a3b8f63348 +EBUILD nrpe-3.2.1-r1.ebuild 2517 BLAKE2B 2ce55ccba8a725a7674fed9d4ec1a0a7c3545591c571fea7f41a6c2fad0aaa28940d24d083eb6078ca1654aa3bee7a0a18e8e7c31a2f8c20b14e8bb9ff13ea7e SHA512 124c23865e04627ee332b71040440078a63d60139fd615b1130fed08ac615ec7fd6d7a048498cfd5337036389221b2984a8e71c2c23cecb91cc3b7a7381e8e1d EBUILD nrpe-3.2.1-r3.ebuild 2822 BLAKE2B 6d2b46889d9da9a40d2d67b21c62aa714b1bcc5dcb504bd5079c87f95dbd5967178ba025d84d9e577c4c8053e4cf3831f8e28814f093b6c51b9dcb5cd2ff5482 SHA512 5097efacb350bea0b2f181a43d950481ce1c1703d488dd27fbd35efe9d15d0fd28e2213f8b77ff1adbfc6d0dff19f57247c98c4cb021342e55f0669802799d51 MISC metadata.xml 770 BLAKE2B 93991f7ee4c1b6c26b67e873fae0cdb66170cd93ba6b79d6e798cb2605126888a996f633eccd038ece2a822d1b92498c2036746bb3a1add2e336c6026c2db86d SHA512 48693abab21581eff977b8deaa5fabc5d388960c9cd090b590a1f6d3c8d37b63fe33ec86d6f95d7435404314b84053f8c2ca84b0f33c6c7241ea7260f82a3a27 diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild index 3b3a1932e211..445556998c61 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild +++ b/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" IUSE="command-args libressl selinux ssl" DEPEND="sys-apps/tcp-wrappers diff --git a/net-analyzer/nsca/Manifest b/net-analyzer/nsca/Manifest index fac4b353b406..4ef58a613318 100644 --- a/net-analyzer/nsca/Manifest +++ b/net-analyzer/nsca/Manifest @@ -1,5 +1,5 @@ AUX nsca.conf 219 BLAKE2B 0ce329240a846e3fc011b82322e2635aa396bfd5eecadf5834becb08b1085e32d30be337b174d777208a882dd2fdcc71939d3fed100534e0c6b431a4e11f9b5a SHA512 c7dda1f94611e028b52ae6bf330db1415b18a88590a8a7c54d1f862aaa326751b39e88380cd24217aab11f32ef5842c6b1d4a0333ca0310a5be0e94c573165b2 AUX nsca.init 645 BLAKE2B baa298df97c4c29fa563a1dde1ef6cf962acf2ec50797b68f073f744fd56eadf97b6163196c497e83d49b4daf8c2eac04378d8b4d00ffae32796e0f8e926ab3d SHA512 88fab799a388dc6f10a2eac94b1ee5d1a76687c408958cc8cf5c22219d10b439d0c9c64a9ae9f34211e19eccb95cb2417e4b972c5549d23ef4bdd5493cdaf224 DIST nsca-2.7.2.tar.gz 104953 BLAKE2B 74dce7b59149cd41fe316dc48588d744131efbbe8073d0defe3542a774ac7dd7429a23e5e7f6b2c9b9e45fa1938cdb2994bfcf93e745c12c8fb5bfbbeb627e6e SHA512 f84cac3613bbd0ded4ec700c1dadac71ed075544d0f48281a70946a67792b7f4bcdf6dc3bd5ccf1293cc6a0277638e0f034c33064bf9c05696b4f015e7f15010 -EBUILD nsca-2.7.2-r103.ebuild 2125 BLAKE2B 74ce2b3b0a356d1cda5a1095be7592847c9368feed4e08adbdd9abac2cbd09fcfeea993232be01228145b617dee015d5a7b732997f7094ffe1bcddd26cac7cd5 SHA512 336f8f99d4fedb82b6e692f061917bcb87ba5c74b618b209ceb14a3cbe7e46a2294bac63302caaddd200d3e429f296542122e359db38c1f9b2ce808d130d9917 +EBUILD nsca-2.7.2-r103.ebuild 2126 BLAKE2B 8eb4fe80f5aae2fc5061786016b50beef2c044fd68950c6592399599aa4478efb1dd81dd8f5f5beca5f0393e8a580fd7b7eec0d5a5850ac9fd01809fda73ad7b SHA512 02b103c5680c30bef0d7a9e3ac7897d80118476e9bd3256ea67e723bb3c7a2940b4b5f6ca491aeb38d44b2e4eac6b4ed75ce3664b9253d956b4775d1ec871136 MISC metadata.xml 1732 BLAKE2B 9a1c8c74f4a0b8fb4d79340d3f1860ecb0b885b5709f54ea63eb7a8b288b99ce31875d54829c87b5865b62fa75126f2713f64febc2e812981113c7172fe3aa70 SHA512 1e24a8adef9fb860b05eed48d741e7b2b981ca826300f14ee3c2b7ddd6a497fbc3318a31a9f284eb11a7f216d71ad567d4a4438e03876c83985bd8683b525a1b diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild index d342f7a3adc6..6f224e4451c0 100644 --- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild +++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86" IUSE="tcpd +crypt minimal" DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest index 5ee16967a107..62ff12c7942b 100644 --- a/net-analyzer/nstats/Manifest +++ b/net-analyzer/nstats/Manifest @@ -3,5 +3,5 @@ AUX nstats-0.4-makefile.patch 611 BLAKE2B a876d89f3ecc8c7dddf8ef5b83342bad300acd AUX nstats-0.4-tinfo.patch 469 BLAKE2B f75ad2c31a66a30c3bbf2cd667a60914289e228ef7a356132f6d5abb93e40c9786bdbf99e2899f735c3c78ed0c87de3a8c30ff363678174de4af8155898d7e8d SHA512 e7c99f91adacd33222f1f9c4fa1b0b342dfc8309a459b9239eb099f1a79972a3065d76560df0b0455c20f994c343f43b5be55de0464031f064c03b4e1dfba843 DIST nstats-0.4.tar.gz 71526 BLAKE2B bc9e4baab1c425d1248b8669a598f85843465c62a3990ea8ea99f979bee9be8eb351111e58b0ece4748b3e199278acd4f0a06ddde2b4cd6e55ca9ff99096e7e8 SHA512 89e88eb0f707cb125fbf02bef93a0bbbd1409f3516d4b333e06d0a3ffe42f5e8d2b655fa6c7a0c63b7d71c7a2f74f6207e5ed158f7d102f6d47ac6e436da3315 EBUILD nstats-0.4-r2.ebuild 666 BLAKE2B aea120694a33f74267346fdb635a6282e612aa100be0cecefde4ac906190ec1c6a27f0bca9bd195ad1aef9127f1465dc2b36c744892d9a68dd9525119aabb4cd SHA512 638b36ecf53a9f6f7bf906af617f98e71719d61b6b00260873220da5d8a6bbaea164541492f2b46a7d06399dba90a925b22de75d1d9ed48fc51eb26a408c1e82 -EBUILD nstats-0.4-r3.ebuild 660 BLAKE2B e8b1dd38e7e2741d8829ac5fd687d6a7d0f6f1bffa77b26f7889ef2169078c8a5afb1a83c05665971a4b7391144d1557904bea1cc4123ff8eb24a69b8a3c39be SHA512 35ae27c5489b92952ca950775d91819af385ed5335d184489acca21339bca3114eba83c244cee8b7bbc3eb6721a0253b76c1d72396f638a74234d497678af433 +EBUILD nstats-0.4-r3.ebuild 726 BLAKE2B cf3bd5942e80a288246236b6b387eb91dcac39cfb6616edf7d40182ae28d23ac4ef8d69ddf8608ec81715162e37a151a1846924f47dd284015f1d71f18b1729b SHA512 caa4166dc3f552f3b697ad3e4db307d506453bb32486a49e9c4a96a66ed4d41d578141da4763d32691ad4b369ea93daa24d54d1f7e53c836c1437525c2e22f8d MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r3.ebuild index 06b4455c4cf1..8a5efdfe1627 100644 --- a/net-analyzer/nstats/nstats-0.4-r3.ebuild +++ b/net-analyzer/nstats/nstats-0.4-r3.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" @@ -29,6 +29,10 @@ DOCS=( BUGS doc/TODO doc/ChangeLog ) src_prepare(){ default - eautoreconf } + +src_configure() { + append-cflags -fcommon + default +} diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest index f5df66321db9..d47fdf31ac49 100644 --- a/net-analyzer/packit/Manifest +++ b/net-analyzer/packit/Manifest @@ -1,4 +1,6 @@ +AUX packit-1.0-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3 DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2 -EBUILD packit-1.6.1.ebuild 654 BLAKE2B c5b20ee89d1b46a6009a06ac8574ceec62c3ca7d771bce7119b366cf15a89871e97fec4cced29cefb9020fdb2d7061ef56b5920e910b58bcaf23a799557da7ff SHA512 895b69e7667302cf82a94454b3b1b404a885d165716dfb2c57e4247b1bd0a1684491137ec1bf562338e6dd1a50e71000c76439dc83242e44634e442a4b3f7ea3 +EBUILD packit-1.6.1.ebuild 696 BLAKE2B cf233f44a417f2316df16e8a888be45d81ec6e4718f976ac4a49f1fdb9b996571a760ddf02c74e7143d8c9dbaa8c0a4df97975c94a11b57faf3aa515ab797e7f SHA512 9deb152b0682d2d2cbe6043ffdda2dbe79bac4d96b7f58fd67f4776d0660c3ffa540d665808ab28c2e3692f94895ed3c6f461c922e7d6ef45f7ff9e902fc4ca4 +EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/packit/files/packit-1.0-fno-common.patch b/net-analyzer/packit/files/packit-1.0-fno-common.patch new file mode 100644 index 000000000000..f4813d868ab1 --- /dev/null +++ b/net-analyzer/packit/files/packit-1.0-fno-common.patch @@ -0,0 +1,251 @@ +--- a/src/capture_defs.h ++++ b/src/capture_defs.h +@@ -30,12 +30,12 @@ + #define READ_TIMEOUT 500 + #define SNAPLEN_DEFAULT 68 + +-u_int16_t g_display; +-u_int16_t g_link_layer; +-u_int16_t g_dump_pkt; +-u_int16_t g_time_gmt; +-u_int16_t g_t_rst; +-u_int16_t g_snap_len; +-u_int32_t g_pkt_rst; ++extern u_int16_t g_display; ++extern u_int16_t g_link_layer; ++extern u_int16_t g_dump_pkt; ++extern u_int16_t g_time_gmt; ++extern u_int16_t g_t_rst; ++extern u_int16_t g_snap_len; ++extern u_int32_t g_pkt_rst; + + #endif /* __CAPTURE_DEFS_H */ +--- a/src/error.c ++++ b/src/error.c +@@ -26,6 +26,8 @@ + + #include "error.h" + ++char error_buf[ERRBUF_MAXLEN]; ++ + void + fatal_error(char *err,...) + { +--- a/src/error.h ++++ b/src/error.h +@@ -33,7 +33,7 @@ + #define SUCCESS 1 + #define FAILURE -1 + +-char error_buf[ERRBUF_MAXLEN]; ++extern char error_buf[ERRBUF_MAXLEN]; + + void fatal_error(char *,...); + +--- a/src/globals.h ++++ b/src/globals.h +@@ -138,20 +138,20 @@ + #define P_INT64 0x7FFFFFFFFFFFFFFF + #define P_UINT64 0xFFFFFFFFFFFFFFFF + +-char g_w_file[OPT_MAXLEN]; +-char g_r_file[OPT_MAXLEN]; ++extern char g_w_file[OPT_MAXLEN]; ++extern char g_r_file[OPT_MAXLEN]; + +-pcap_t *g_pkt; +-u_int8_t g_tr_fin; +-char *g_filter; +-char *g_device; +-u_int16_t g_hdr_len; +-u_int16_t g_pkt_len; +-u_int16_t g_verbose; +-u_int16_t g_resolve; +-u_int16_t g_p_mode; +-u_int64_t g_cnt; +-u_int64_t g_inj_cnt; +-u_int64_t g_cap_cnt; ++extern pcap_t *g_pkt; ++extern u_int8_t g_tr_fin; ++extern char *g_filter; ++extern char *g_device; ++extern u_int16_t g_hdr_len; ++extern u_int16_t g_pkt_len; ++extern u_int16_t g_verbose; ++extern u_int16_t g_resolve; ++extern u_int16_t g_p_mode; ++extern u_int64_t g_cnt; ++extern u_int64_t g_inj_cnt; ++extern u_int64_t g_cap_cnt; + + #endif /* __GLOBALS_H */ +--- a/src/inject_defs.h ++++ b/src/inject_defs.h +@@ -30,7 +30,7 @@ + #ifndef __INJECTION_STRUCTS_H + #define __INJECTION_STRUCTS_H + +-struct ip4hdr_opts ++extern struct ip4hdr_opts + { + u_int16_t p; /* protocol type */ + u_int16_t rand_p; +@@ -59,7 +59,7 @@ + u_int16_t rand_d_addr; + } g_ip4hdr_o; + +-struct tcphdr_opts ++extern struct tcphdr_opts + { + u_int16_t s_port; /* tcp source port */ + u_int16_t d_port; /* tcp destination port */ +@@ -82,7 +82,7 @@ + + } g_thdr_o; + +-struct udphdr_opts ++extern struct udphdr_opts + { + u_int16_t s_port; /* udp source port */ + u_int16_t d_port; /* udp destination port */ +@@ -90,7 +90,7 @@ + u_int16_t sum; /* udp checksum */ + } g_uhdr_o; + +-struct icmp4hdr_opts ++extern struct icmp4hdr_opts + { + u_int16_t type; /* icmp4 type */ + u_int16_t code; /* icmp4 code */ +@@ -132,7 +132,7 @@ + u_int32_t ttime; /* transmit timestamp */ + } g_i4hdr_o; + +-struct enethdr_opts ++extern struct enethdr_opts + { + u_int16_t rand_s_addr; + u_int16_t rand_d_addr; +@@ -143,7 +143,7 @@ + u_int8_t dhw_addr[18]; + } g_ehdr_o; + +-struct arphdr_opts ++extern struct arphdr_opts + { + u_int16_t op_type; /* arp operation */ + +@@ -163,28 +163,28 @@ + u_int8_t rhw_addr[18]; + } g_ahdr_o; + +-libnet_t *g_pkt_d; ++extern libnet_t *g_pkt_d; + +-u_int16_t g_init_type; +-u_int16_t g_rand_d_port; +-u_int16_t g_rand_s_port; +-u_int16_t g_s_port; +-u_int16_t g_d_port; +-u_int16_t g_port_range; +-u_int16_t g_interval_sec; +-u_int16_t g_interval_usec; +-u_int16_t g_injection_type; +-u_int16_t g_r_timeout; +-u_int16_t g_burst_rate; +-u_int16_t g_payload_len; +-u_int8_t *g_payload; +-u_int8_t g_hex_payload; +-u_int8_t *g_s_d_port; +-u_int8_t g_hwaddr_p[18]; +-u_int8_t g_rawip; ++extern u_int16_t g_init_type; ++extern u_int16_t g_rand_d_port; ++extern u_int16_t g_rand_s_port; ++extern u_int16_t g_s_port; ++extern u_int16_t g_d_port; ++extern u_int16_t g_port_range; ++extern u_int16_t g_interval_sec; ++extern u_int16_t g_interval_usec; ++extern u_int16_t g_injection_type; ++extern u_int16_t g_r_timeout; ++extern u_int16_t g_burst_rate; ++extern u_int16_t g_payload_len; ++extern u_int8_t *g_payload; ++extern u_int8_t g_hex_payload; ++extern u_int8_t *g_s_d_port; ++extern u_int8_t g_hwaddr_p[18]; ++extern u_int8_t g_rawip; + +-struct timeval g_bf_pcap; +-struct timeval g_af_pcap; ++extern struct timeval g_bf_pcap; ++extern struct timeval g_af_pcap; + + + #endif /* __INJECTION_STRUCTS_H */ +--- a/src/main.c ++++ b/src/main.c +@@ -30,6 +30,62 @@ + + #include "main.h" + ++char g_w_file[OPT_MAXLEN]; ++char g_r_file[OPT_MAXLEN]; ++ ++pcap_t *g_pkt; ++u_int8_t g_tr_fin; ++char *g_filter; ++char *g_device; ++u_int16_t g_hdr_len; ++u_int16_t g_pkt_len; ++u_int16_t g_verbose; ++u_int16_t g_resolve; ++u_int16_t g_p_mode; ++u_int64_t g_cnt; ++u_int64_t g_inj_cnt; ++u_int64_t g_cap_cnt; ++ ++/* capture_defs.h */ ++u_int16_t g_display; ++u_int16_t g_link_layer; ++u_int16_t g_dump_pkt; ++u_int16_t g_time_gmt; ++u_int16_t g_t_rst; ++u_int16_t g_snap_len; ++u_int32_t g_pkt_rst; ++ ++/* inject_defs.h */ ++u_int16_t g_init_type; ++u_int16_t g_rand_d_port; ++u_int16_t g_rand_s_port; ++u_int16_t g_s_port; ++u_int16_t g_d_port; ++u_int16_t g_port_range; ++u_int16_t g_interval_sec; ++u_int16_t g_interval_usec; ++u_int16_t g_injection_type; ++u_int16_t g_r_timeout; ++u_int16_t g_burst_rate; ++u_int16_t g_payload_len; ++u_int8_t *g_payload; ++u_int8_t g_hex_payload; ++u_int8_t *g_s_d_port; ++u_int8_t g_hwaddr_p[18]; ++u_int8_t g_rawip; ++ ++struct timeval g_bf_pcap; ++struct timeval g_af_pcap; ++ ++struct arphdr_opts g_ahdr_o; ++struct enethdr_opts g_ehdr_o; ++struct icmp4hdr_opts g_i4hdr_o; ++struct ip4hdr_opts g_ip4hdr_o; ++struct tcphdr_opts g_thdr_o; ++struct udphdr_opts g_uhdr_o; ++ ++libnet_t *g_pkt_d; ++ + void + parse_capture_options(int argc, char *argv[]) + { diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild index ddeeeb77d2bf..9a88e995d225 100644 --- a/net-analyzer/packit/packit-1.6.1.ebuild +++ b/net-analyzer/packit/packit-1.6.1.ebuild @@ -18,6 +18,7 @@ DEPEND=" " RDEPEND="${DEPEND}" PATCHES=( + "${FILESDIR}"/${PN}-1.0-fno-common.patch "${FILESDIR}"/${PN}-1.0-noopt.patch ) diff --git a/net-analyzer/packit/packit-9999.ebuild b/net-analyzer/packit/packit-9999.ebuild new file mode 100644 index 000000000000..d58eaf300f88 --- /dev/null +++ b/net-analyzer/packit/packit-9999.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools git-r3 + +DESCRIPTION="network packet generator and capture tool" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" +EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/packit" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" + +DEPEND=" + net-libs/libnet:1.1 + net-libs/libpcap +" +RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.0-noopt.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + dodoc docs/* +} diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index 0c720fb5c032..6e97d76b7bec 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -11,6 +11,6 @@ EBUILD pmacct-1.6.2.ebuild 1790 BLAKE2B be2fe64588677200a54a4866e2946cb5516fb65d EBUILD pmacct-1.7.1-r1.ebuild 2131 BLAKE2B 93f73d535296d1c3634968a262a1d4aea8b7e27150310ed051a5e7a0bd42c95f09452b7bd0116521763b8acf890a71742ce0772c0468eadfb5dd17717ff5750c SHA512 e2cb9688373c62963391d989f99b909ae246d5b890333d7352871abe9f8feda20bcc046e29777bf0002fee5e6952f1ec49b6ea0decd927b240c919d8c4b2f5cf EBUILD pmacct-1.7.2-r1.ebuild 2125 BLAKE2B 8a2d62e19cf7e5c6f2de12956cbdda845825648b18c19c4d37190e1cbdd4cc0dd926e8c2330b5bc5acbaee2c989cbbb8f928d31fbe1566fa049549972a9f5828 SHA512 55d6e8b369a0f734e81175829472b2312cf7e24a23acfb3609a76adcbe3f72e2df4ff6460b87fc4c381ea78cd95f446ce26f956b35e4a46d9ebce8ec1ac597e1 EBUILD pmacct-1.7.3-r2.ebuild 2220 BLAKE2B 15f3fab589baa6544681cfff7f5d0a7c8582eacc4ad880764b9dc8702bc56fc19c7e128304f555e1695173c8a98b25550a4c8d439cc2e254bb86071cc0e468e8 SHA512 54ffea328edcc50c4cc4212ca044db234defa0287db3fad4e07f9e3ac103af96bf6d3c2c2322b321e6bae59cc92ec87f8d81a3144ca43aad8c2e699565c7672c -EBUILD pmacct-1.7.4.ebuild 2261 BLAKE2B 905115a9a89b599dca598d388828b32ea3806fffb7754aa137822a712d444895f0a9f213fdc2885a258b42e60c806b4a253d4f1aa7f5622fe20e21b37eccb717 SHA512 89766a9ba588580b41a8292f41391e7c721c3af59ee299731eb041975b227f4d68bdaafa78062a47ea28e910703de6523660597545c6de119bc5c0c506d22978 -EBUILD pmacct-999999.ebuild 2268 BLAKE2B dd835c166e6f16ce4e86a9aece0b181bd6814d8bafd5bb36201ea350b38ac8612afca39af2cabf19f06f41d6e0faac3e3538fde792ab58b0f8a7ce16d3282a76 SHA512 f9f3aec4aad756675440e4936c5b01442159ed8da7cab5351048989124ea3e0bae42cc2a56ffd6bfe156445bf4214c5869613f954ad9d2052b09237f69d6f0a0 +EBUILD pmacct-1.7.4.ebuild 2236 BLAKE2B 3cde1024527435d97409cc455abc619398ff506f1a63f92fb6a467f92d3a408775ed9ffa67a86e5d17628cf7e763218cb2f075a0fd574b70b7ff83f48e618d8e SHA512 596821332b1ea6990945dfec619a29807a49434e9821e12472c6dd8d00638be374318956eb976478c7862b546a96e98c0f8e3ee16fcf89109f43449d6eb3427f +EBUILD pmacct-999999.ebuild 2159 BLAKE2B 923a394086afd477ecd91e4d972ba2dcee6281d09bf97311078a1b6e63a3070a8e3363f7777489bad0e09329e1d4f26ecd2da9046e012c991ddb755b57bb5978 SHA512 57c69bd316361ec7a57388ee5718bcda93e2a758d9a364941a86622ac4dddd86c157b7d0cbecc723901c253e285ac9e7721f0594cc18fa6aac7bbc9bba43e334 MISC metadata.xml 1424 BLAKE2B 75ce1e74993587289adbef0841807d758f0a587bc5b0429cb03a86be690d49479a2cf37211006ae905473528f3f4714ec2827e5bc556a4bcaf368215f97db7b8 SHA512 ddfd0eaac09d66640660baffe80ca83911000632416602eb258b2c01e630ada343ebeff7191c53fe71e4d5e658c94eac9a95bf4527a9ba40ee674ffa9442d856 diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild index 159a6edac6d8..99560fad9a73 100644 --- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild +++ b/net-analyzer/pmacct/pmacct-1.7.4.ebuild @@ -60,7 +60,7 @@ src_prepare() { src_configure() { tc-export CC AR RANLIB - append-cppflags -DMYSQL_SERVER_VERSION=99999999 + append-cflags -fcommon econf \ $(use_enable 64bit) \ diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild index 36566e6c719e..a4410a2887e1 100644 --- a/net-analyzer/pmacct/pmacct-999999.ebuild +++ b/net-analyzer/pmacct/pmacct-999999.ebuild @@ -12,7 +12,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="" IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql + +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq " REQUIRED_USE=" @@ -32,7 +32,7 @@ RDEPEND=" <dev-libs/mongo-c-driver-0.98 ) mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-2.4:= ) + ndpi? ( >=net-libs/nDPI-3.0:= ) nflog? ( net-libs/libnetfilter_log ) postgres? ( dev-db/postgresql:* ) rabbitmq? ( net-libs/rabbitmq-c ) @@ -43,9 +43,6 @@ DEPEND=" ${RDEPEND} virtual/pkgconfig " -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch -) DOCS=( CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE @@ -60,10 +57,9 @@ src_prepare() { src_configure() { tc-export CC AR RANLIB - append-cppflags -DMYSQL_SERVER_VERSION=99999999 + append-cflags -fcommon econf \ - $(use_enable 64bit) \ $(use_enable bgp-bins) \ $(use_enable bmp-bins) \ $(use_enable geoip) \ diff --git a/net-analyzer/portmon/Manifest b/net-analyzer/portmon/Manifest index 201ac828806a..5e87d0f65d47 100644 --- a/net-analyzer/portmon/Manifest +++ b/net-analyzer/portmon/Manifest @@ -1,4 +1,6 @@ +AUX portmon-2.0-fno-common.patch 995 BLAKE2B 889ae8a440efcf4c6b9cd9ee6ec3a29a8c0b5ae80d4a5fe119729a19e3f01c6d0faa9220766fc6ffe1522e4c8fc7adc3c80a441026b1c26df99e3139165bd47e SHA512 d79091359494924e8c838695eb79beb215e534dc50021dcf767112545b20cac215056f492a2aabfa5a168de8c07707d8484e3feb5f32df768b68fb53e96027f2 AUX portmon.init 633 BLAKE2B 1989ff9f35abaf8f5e4ea2b86bec3d7c4a708d70571554518077f3b327f2cac2be7e98a1bb5838169cb6f0b45d351160c9ea31acee96458bfb19aaea7ca8f0de SHA512 7bd26de7d5031c79afd3c2a04ca6f4e95af994c552973c89951a39d49a22b2856d02f7d9eef885fc26fb59a0f7063799230fb161682047debe70764565228eda DIST portmon-2.0.tar.gz 107246 BLAKE2B 0f3d33aecca7d41a5af08c656bdb9665c9560aaee78dab7b02bf330d21ddde3fcc916a06b7b48ea1ae305b5188e62073065a8c745fd31310415b47ce3b29a733 SHA512 1feafd1a8701d269c2f2e36f46ef51eeda8975aeca85d6f720cf5805e3f8bd031eb681117fa9414e775ea46c543066deb3532e7cc7d26c655daf6163fac77e25 +EBUILD portmon-2.0-r1.ebuild 652 BLAKE2B b9d507e4d7a9dc88c079e54d18652aeb5018d361748fd67fc885359f0ece81e554c7ec39b587ebc6c27c522737fa9c55f0bf74499909a0b6e331cc5bf6a92d2d SHA512 5007643b187229e05f586e11c05f08476d4acad8afdd5e92a4d928680cd891ca4ef8e5fb7efb3845b5e52ca1cf5f5b4bf7c27647736b099d85e1694ddfceff84 EBUILD portmon-2.0.ebuild 604 BLAKE2B 933852fb1cccea6f20727bc3d4e064739e78c30a0937ddf628fd3d47f90060cb3c2c4d04af5835360613cf9c302fab486b6c6a9d544539bc458d69b7b09dcd3b SHA512 1508fd4b918f0ffe6ea7ff88d82339060fab39776ea18f47239dff8da0f8a2fb5307ad5400e1f84578606bac80211fa9d1db89a500e87b6d4cd686a7bc8a8a21 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/portmon/files/portmon-2.0-fno-common.patch b/net-analyzer/portmon/files/portmon-2.0-fno-common.patch new file mode 100644 index 000000000000..bfe6a914635e --- /dev/null +++ b/net-analyzer/portmon/files/portmon-2.0-fno-common.patch @@ -0,0 +1,58 @@ +--- a/src/portmon.c ++++ b/src/portmon.c +@@ -35,6 +35,15 @@ + #include <getopt.h> + #endif + ++int report_flag; ++int daemonize_flag; ++ ++struct host_struct *hosts; ++char *err_msg; ++char logfile[STRLARGE]; ++int timeout; ++int verbose; ++ + void version(void) + { + printf("This is %s, version %s\n", PACKAGE, VERSION); +--- a/src/portmon.h ++++ b/src/portmon.h +@@ -31,8 +31,8 @@ + #define STRLARGE 512 + + // flags +-int report_flag; +-int daemonize_flag; ++extern int report_flag; ++extern int daemonize_flag; + + struct port + { +@@ -43,7 +43,7 @@ + }; + + // create an array of hosts +-struct host_struct ++extern struct host_struct + { + char name[STRMED]; + struct port ports[STRSMALL]; +@@ -52,13 +52,13 @@ + *hosts; + + // place to hold error messages +-char *err_msg; ++extern char *err_msg; + // place we log crap +-char logfile[STRLARGE]; ++extern char logfile[STRLARGE]; + // timeout (seconds) +-int timeout; ++extern int timeout; + // verbose mode +-int verbose; ++extern int verbose; + + // Functions in various files + diff --git a/net-analyzer/portmon/portmon-2.0-r1.ebuild b/net-analyzer/portmon/portmon-2.0-r1.ebuild new file mode 100644 index 000000000000..824a242bbd0c --- /dev/null +++ b/net-analyzer/portmon/portmon-2.0-r1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Portmon is a network service monitoring daemon" +HOMEPAGE="http://aboleo.net/software/portmon/" +SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz" + +KEYWORDS="~amd64 ~ppc ~x86" +SLOT="0" +LICENSE="GPL-2" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch +) + +src_configure() { + econf --sysconfdir=/etc/portmon +} + +src_install() { + into /usr + dosbin src/portmon + + doman extras/portmon.8 + + insinto /etc/portmon + doins extras/portmon.hosts.sample + dodoc AUTHORS BUGS README + + newinitd "${FILESDIR}"/portmon.init portmon +} diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest index 93c2e983255d..1f81a34af812 100644 --- a/net-analyzer/prelude-correlator/Manifest +++ b/net-analyzer/prelude-correlator/Manifest @@ -2,12 +2,10 @@ AUX prelude-correlator-4.1.1-fix_python3.patch 984 BLAKE2B 5b51c44d1da541e16b687 AUX prelude-correlator.initd 654 BLAKE2B 10bb6e1ba38c916394cbeab1d314e39ee61753c6f46e613f2a500fb3deffa3d62861ffb41fb1dbed30126cc3cb1a7afd381632c229cc33732d6e6a627ef08ef6 SHA512 15be6f991499d6d2b72bd11cd91343a1be164c13454c702b6f42f55b69dbfdda4a380cc6f24aecbf0e9d6a2b3f21b1a947838038ad95e7d7377c3d36118f12e5 AUX prelude-correlator.run 139 BLAKE2B 2eac955ca980c1e49d39946d3890c5dba1b7f5a40670c28f788d66535e1a52735fb8620a78a1ec6cdb59ae517d0317c363c72779087fcfbdc7011e3b1bdd9370 SHA512 f05c771f387b2eb59e37006ba5bb959d8d67cbdbdfdd5a7c5a42b592d2c9d4532bfa425565722745ad52e7fb1d327738c02f1602e0eeb42ea403275d69380f51 AUX prelude-correlator.service 339 BLAKE2B 25275e92b5471521e1f8e3f23d1a0a483c7cb3300edbcc563cb84c280f64a7555b47e4cbe97c00ee76777e9f44de9bbd911de69deec5bec2898a09c1a206f7a1 SHA512 8f0d0478bea87e2bdc8266044e580f983b12dcaafec1b7cb87074f9cd3825a9c0b2b6d59fba8fc4a62a5af0b9f0dede6f8c5d3cbf436fcf900b031947ea20f68 -DIST prelude-correlator-3.0.1.tar.gz 181019 BLAKE2B 9156b7c76ac641326dcbb6e89f336ad1a65ed9c0af3b32acaa2d4430d3ba0b5015b5baf6372bdeb8e08d269b7742304f84ac026c512b63ca8710cc757697d0c6 SHA512 2aa159251cf7f9fead117737f67cc01e7cb2012c4fd9db77454c7d639cf477888d5ea6476661bf501c2da7aaef58ea7101b7780669f025af1480acd9480ce8d3 DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597 DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd -EBUILD prelude-correlator-3.0.1-r1.ebuild 723 BLAKE2B 7eadb37a0f6316a87acd061ea90011fdf5158b2d1e0dd025eaa8b07426959af0fe55a57dc76bac474eaa1a43fadf4836621a60f6a708682bcb30ce49f2aca2c5 SHA512 23cfb488a3d604f4bc5351de67c2fedfafc9668c04e81ada545525f0b134ec5765b6555329f8b50fd5ffe7f3f41a79801d556a9faa67b17cd0e4c45604a3c9d1 -EBUILD prelude-correlator-4.0.0.ebuild 750 BLAKE2B 9b56784560d7d8878a4a7628d72e38e602a0cf9cd59a577c5fc97cd0d27277013e91bd31b4c25a39951a32b44f2736ac0c09973e5d4ca376a2152b12f51b6ba7 SHA512 ea44d448216ab4f47686d734454efbcf922f05a855d80ea95797fc4a4804d7961bc4e00c1f8e16fd15d4e21c97c74b38ea7e0e4c9b28b4f18048c66f4d793f1a -EBUILD prelude-correlator-4.1.1.ebuild 808 BLAKE2B 8b176bde732306db2357376cc3e11f0f3f3b00a66103f1c089fbe6cffe911e9dab158ed9240f04425b72f5abc1bf4383af4fd36c4d1e1ec76d6278168d974eb2 SHA512 6676802aa703fd738470fb5d1182a357f3fe530ef4fb78bc8ded7f09160ba6a03064b707b76aaa321de8b78817c539c4e0b38bc73fe3a5338ebd4801a9d25ed6 +EBUILD prelude-correlator-4.0.0.ebuild 744 BLAKE2B 9c8bd8db36fda98e2f550ea932f50af9666eacc543099138a4acf7fedaa860fc28c3ff2d595e6791509ecad650f93ccbf4369c4e94e97e29bbd805af70e9fcea SHA512 2750e8ba8632395ef76e3b1a9dab51bf53581cf098cf7a63a0a58553f474509730e28a82b9701973735d1bc16238df41a93dae55e4fcf6ab1ab856d71ff0d237 +EBUILD prelude-correlator-4.1.1.ebuild 802 BLAKE2B 8528650cb4cafd831b77dbe5f95a0d2f2efa8a3bedd0579aeceee460a6b24f9fb5c35eca106c6f32a5e142eef7dd3fecaa93797b42a91725c9ae15cf61fe013e SHA512 58fb60ce4dd8d32347c35598a623f2f6a08dc89b377a466b0c46137f463a1b7da7b7ae8a0181f29033d01d7046d355f5dde67f6ee50694dfc07f614224f7bf06 EBUILD prelude-correlator-5.1.0.ebuild 749 BLAKE2B bab459f78c726959988daa71cf2125b01a0e074cfedcfb96a5638def4efc88b95c773f7e22ea9e7755439ebdf7f3bbb3dcc367c1d6daa314149a8cfee72b8646 SHA512 c0242da96d1337bccf3154399405b68965570496dde459ad74f950825c3517a508838fa9aae268434559795d8c6c4370989ceb28a821f15146fd01ac472e0a3b MISC metadata.xml 824 BLAKE2B c17f62271dea0b8f93fdc83b0ccf67545ea24c5bd3f71d782832bc9c8588bdd98b513ed3f6bc5c307aebb3bc3be76e7e8311e38438234779d5da6f248383fb15 SHA512 3b0db2aace5a45f8994622063ca9fb32a06bcb385b63fb013c191606f07e9bb03c1354549b07ac4c17d74a9f25db44be7ea45fc34d6332079209cc56f5262209 diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild deleted file mode 100644 index 68d50b36d690..000000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit systemd distutils-r1 - -DESCRIPTION="Real time correlator of events received by Prelude Manager" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-python/setuptools" - -RDEPEND="dev-python/netaddr[${PYTHON_USEDEP}] - dev-libs/libprelude[python,${PYTHON_USEDEP}]" - -src_install() { - distutils-r1_src_install - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild index d7861468dbf9..147c825eb4c2 100644 --- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild +++ b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 systemd diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild index 2bcda4ece273..384e4b199c8c 100644 --- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild +++ b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 systemd diff --git a/net-analyzer/rain/Manifest b/net-analyzer/rain/Manifest index ca50f47d8240..ae6ba9b7bb2c 100644 --- a/net-analyzer/rain/Manifest +++ b/net-analyzer/rain/Manifest @@ -1,5 +1,8 @@ +AUX rain-1.2.9_beta1-die-on-error.patch 1748 BLAKE2B a265ef9f2a749110419360f179acd3e8f1444daafbc25caa7f33c9d68d7bc9ea46f866a8fb5bd70a917f016f387b9328a0ab918ea11854231ffa44cc08cbd983 SHA512 5a2b300acf7f6c6799e5427edf604f835383ca7addeee9a8abb52928d2d7258c2554232c847e284e2306454c33a78f471083533c79b9c00a4f48d08163b75136 +AUX rain-1.2.9_beta1-fno-common.patch 3313 BLAKE2B 84ced105416324dde778aa1f251118ccc9c109dc98be81569565cfd381dd4b7ec50ab291501b42da0599cd5b9722e0f4d52dc754a18fcd851e912fb194ef825f SHA512 f4bc6e7c2fdad082dabad48d36c4f952f70a686fde68ff8e01345f061c7fb73bad04bec04ee11392303bd54995cc831945449c3fdb1f8b6e089d3d7558323f68 AUX rain-1.2.9_beta1-gentoo.patch 1213 BLAKE2B 3017ebfb59b8be96568cb6efa225fe76db91a5a79dc1ad5e7157edd7a3ef994f4d4e6385d4fb417fdaa9f837be270f5da02c7b6d99ccefc51a3b22ce4b8334c4 SHA512 7a7f623ee8d7e72c91fce9f4185c14e5c4ac6764229f63f37a324f5683c4fa8b99c298e04d2fa51d093eb86547fde2c98c4e66e592c3ec92970616684d672a69 DIST rain_1.2.9beta1-1.diff.gz 1828 BLAKE2B b50743f0eb141c2d07462a717cfd14d6671b1428869398f6220e13adf653df368adb6f421af6d584ab782ef0bd4244f237412ec02f6a16f25c31378eedcf6ebe SHA512 5e871fddbf475d8e73c88a3f7340199cdfae8f54446aced599be7658e0be2c6b7a7ef2626cd13dff577df5c81187fa07bc8ec3a7ab386752e4be321d9a372843 DIST rain_1.2.9beta1.orig.tar.gz 79098 BLAKE2B cb9302bdf024df0e49a250b5ef5feed07c7dcaf0c734513177ac6161496d7df1fa7b5262a23730f83fe4a237f4108539911318a17cb604efbfe82b50b9ed3485 SHA512 5e61ac26872e453c6da9e600e3fb427425d2f79a7a5f569ab93308c0b0f4509b6a0d5b45b138f04b9f8bee7b16b8b63be28b7ede65a92f5d4a3384e73e12036d +EBUILD rain-1.2.9_beta1-r1.ebuild 840 BLAKE2B 3f37eb044c27d486c5d72fc71801696eecfd22556f3530dc07887b00ecc3aa9d1dcf8245ca08f66f3911da2b50eff0f4b8b02ceee5bb2597f6815783d2fbfbad SHA512 8741a456519b84073da14c6982de6ce046c51bd4c2d4ad54cf3b9c936edbc82f59d4f57171ae21b6b40b20324f03b018044955fe5bf76978bac9f2ee5752da76 EBUILD rain-1.2.9_beta1.ebuild 708 BLAKE2B a52913e44e2929f00360bbcb373dc698ac82b79cde22c6c5229a76f2b665898b192127fe3b03c4577da40a7b680b761786c3fa4bc24eea40dabab51fe4016232 SHA512 7a8757eed74b9b3fc790b023f4bdd7e4bf7fc13d3c436f06651610503f0bc2a1e6308ac7bda792d95179578eca7e46764734f342587cef493f43a567f7bb17fa MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/rain/files/rain-1.2.9_beta1-die-on-error.patch b/net-analyzer/rain/files/rain-1.2.9_beta1-die-on-error.patch new file mode 100644 index 000000000000..ac73a0f5390e --- /dev/null +++ b/net-analyzer/rain/files/rain-1.2.9_beta1-die-on-error.patch @@ -0,0 +1,40 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -15,22 +15,22 @@ + + all: + @echo Making all +- -$(CC) $(CFLAGS) -c source/rain_command_line.c +- -$(CC) $(CFLAGS) -c source/rain_defaults.c +- -$(CC) $(CFLAGS) -c source/rain_die.c +- -$(CC) $(CFLAGS) -c source/rain_icmp.c +- -$(CC) $(CFLAGS) -c source/rain_igmp.c +- -$(CC) $(CFLAGS) -c source/rain_inet_common.c +- -$(CC) $(CFLAGS) -c source/rain_mem.c +- -$(CC) $(CFLAGS) -c source/rain_resolv.c +- -$(CC) $(CFLAGS) -c source/rain_services.c +- -$(CC) $(CFLAGS) -c source/rain_signal.c +- -$(CC) $(CFLAGS) -c source/rain_string.c +- -$(CC) $(CFLAGS) -c source/rain_tcp.c +- -$(CC) $(CFLAGS) -c source/rain_udp.c +- -$(CC) $(CFLAGS) -c source/rain_main.c ++ $(CC) $(CFLAGS) -c source/rain_command_line.c ++ $(CC) $(CFLAGS) -c source/rain_defaults.c ++ $(CC) $(CFLAGS) -c source/rain_die.c ++ $(CC) $(CFLAGS) -c source/rain_icmp.c ++ $(CC) $(CFLAGS) -c source/rain_igmp.c ++ $(CC) $(CFLAGS) -c source/rain_inet_common.c ++ $(CC) $(CFLAGS) -c source/rain_mem.c ++ $(CC) $(CFLAGS) -c source/rain_resolv.c ++ $(CC) $(CFLAGS) -c source/rain_services.c ++ $(CC) $(CFLAGS) -c source/rain_signal.c ++ $(CC) $(CFLAGS) -c source/rain_string.c ++ $(CC) $(CFLAGS) -c source/rain_tcp.c ++ $(CC) $(CFLAGS) -c source/rain_udp.c ++ $(CC) $(CFLAGS) -c source/rain_main.c + +- -$(CC) $(CFLAGS) $(LDFLAGS) -o rain rain_command_line.o rain_defaults.o rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o ++ $(CC) $(CFLAGS) $(LDFLAGS) -o rain rain_command_line.o rain_defaults.o rain_die.o rain_icmp.o rain_igmp.o rain_inet_common.o rain_main.o rain_mem.o rain_resolv.o rain_services.o rain_signal.o rain_string.o rain_tcp.o rain_udp.o + + @echo done. + diff --git a/net-analyzer/rain/files/rain-1.2.9_beta1-fno-common.patch b/net-analyzer/rain/files/rain-1.2.9_beta1-fno-common.patch new file mode 100644 index 000000000000..06eb84fc2e77 --- /dev/null +++ b/net-analyzer/rain/files/rain-1.2.9_beta1-fno-common.patch @@ -0,0 +1,111 @@ +--- a/include/rain_inet_common.h ++++ b/include/rain_inet_common.h +@@ -368,14 +368,14 @@ + /* + * global variables + */ +-u_int16_t packetsize; +-unsigned char *buffer; /* For holding packets. Declared globally to ensure it is freed when the program exits */ +-time_t send_start; /* for storing start and finish time of total packets sent */ +-time_t send_finish; +-unsigned long packets_sent; +-u_short verbose; +-struct in_addr group; /* for ICMP gateway and IGMP group addresses */ +-int sendflags; /* stores flags for sendto(); Default is 0 */ ++extern u_int16_t packetsize; ++extern unsigned char *buffer; /* For holding packets. Declared globally to ensure it is freed when the program exits */ ++extern time_t send_start; /* for storing start and finish time of total packets sent */ ++extern time_t send_finish; ++extern unsigned long packets_sent; ++extern u_short verbose; ++extern struct in_addr group; /* for ICMP gateway and IGMP group addresses */ ++extern int sendflags; /* stores flags for sendto(); Default is 0 */ + /*---------------------------*/ + + +--- a/source/rain_inet_common.c ++++ b/source/rain_inet_common.c +@@ -17,6 +17,18 @@ + *-------------------------------------------------*/ + #include "rain_common.h" + ++/* ++ * global variables ++ */ ++u_int16_t packetsize; ++unsigned char *buffer; /* For holding packets. Declared globally to ensure it is freed when the program exits */ ++time_t send_start; /* for storing start and finish time of total packets sent */ ++time_t send_finish; ++unsigned long packets_sent; ++u_short verbose; ++struct in_addr group; /* for ICMP gateway and IGMP group addresses */ ++int sendflags; /* stores flags for sendto(); Default is 0 */ ++/*---------------------------*/ + + /* + * Internet checksum routine (RFC 1071) +--- a/include/rain_icmp.h ++++ b/include/rain_icmp.h +@@ -20,7 +20,7 @@ + + + +-unsigned char icmpinfo[56][56][56]; ++extern unsigned char icmpinfo[56][56][56]; + + + /* +--- a/source/rain_icmp.c ++++ b/source/rain_icmp.c +@@ -17,6 +17,7 @@ + *-------------------------------------------------*/ + #include "rain_common.h" + ++unsigned char icmpinfo[56][56][56]; + + /* + * Prints all the ICMP type/code combinations +--- a/include/rain_igmp.h ++++ b/include/rain_igmp.h +@@ -18,7 +18,7 @@ + #ifndef _RAIN_IGMP_H + #define _RAIN_IGMP_H + +-unsigned char igmpinfo[56][56][5]; ++extern unsigned char igmpinfo[56][56][5]; + + + extern void print_igmp_info(void); +--- a/source/rain_igmp.c ++++ b/source/rain_igmp.c +@@ -17,7 +17,7 @@ + *-------------------------------------------------*/ + #include "rain_common.h" + +- ++unsigned char igmpinfo[56][56][5]; + + /* + * Prints IGMP type/code descriptions +--- a/include/rain_tcp.h ++++ b/include/rain_tcp.h +@@ -20,7 +20,7 @@ + #ifndef _RAIN_TCP_H + #define _RAIN_TCP_H + +-unsigned char tcpinfo[25]; ++extern unsigned char tcpinfo[25]; + + extern void tcp_info_init(struct pkt_info_tcp *); + extern int tcp_shower_connect(struct sockaddr_in *, struct pkt_info *); +--- a/source/rain_tcp.c ++++ b/source/rain_tcp.c +@@ -17,7 +17,7 @@ + *-------------------------------------------------*/ + #include "rain_common.h" + +- ++unsigned char tcpinfo[25]; + + /* + * tcp_info_init(): diff --git a/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild new file mode 100644 index 000000000000..84351e1ba87e --- /dev/null +++ b/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools + +MY_P=${P/_/} +MY_P=${MY_P/-/_} +DESCRIPTION="powerful tool for testing stability of utilizing IP protocols" +HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +SRC_URI=" + mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz + mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz +" + +DOCS=( BUGS CHANGES README TODO ) +S="${WORKDIR}/${MY_P/_/-}" +PATCHES=( + "${WORKDIR}"/${MY_P}-1.diff + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-die-on-error.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_install() { + default + gunzip "${ED}"/usr/share/man/man1/${PN}.1.gz || die +} diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 1496c28d0a76..6b4de33097c5 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -12,7 +12,7 @@ AUX rrdtool-1.7.1-rrdcached.socket.patch 733 BLAKE2B a9ca7691e1589061e65ed4acd3d DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 -EBUILD rrdtool-1.6.0-r1.ebuild 4258 BLAKE2B 4e6effe766e867419f463459767d592c9a8c80457be70442a1c96aaf6a4c3ce41111708d834b5e9a02d47f10cb3eac5dc0701937e42c47c36b8f399ace6f7968 SHA512 7d2080aee08d9ee99858001a69d983b4359362f91ac810183bc5621cec9bc615395c44f8a67f1009f058c1d366c06a99eb2c604a67667715d82f6a9af81aa104 +EBUILD rrdtool-1.6.0-r1.ebuild 4259 BLAKE2B f209b058d69b86d91e163a47a7ed4860e0fcd67a74f5e8d7c2cb12553e872fab7b00a7262a386023433647083634be079a530c144d485be2e6bbd6c6522008a5 SHA512 bc2aff19438e01bca05d2b00ba578df53291f411c8b6344e85885569b0a8be4ae669e0e00d32a9b840dfd4b6febf22bb15e27865fc65ac68f4fba01a71f65e7a EBUILD rrdtool-1.7.1.ebuild 4261 BLAKE2B 6afa7adff86c88ad084bacd0c6ac1fbb4a5cfd394a39e7cabea028db06fed7cfd5994e882e6e0bcd0fa35292beae3cfa25de5cd94640b3e990d0b5f4c1056141 SHA512 43f62d0fef4a571bf7464d555c8dcf6e7e87080f9e9fd704a5c08c4187c6de2d96ee0538410d974ee977e066dba541f12c8b7ca382db3de2132b88b57edc12c5 EBUILD rrdtool-1.7.2.ebuild 4209 BLAKE2B 02442e375f23612dabe41b9fe2334de9953e1dd1e47f39a25b044be24c81baeb47021b6a47a251c2ee4398d57e9bd1166ef2cf5d72bcf5fae48405a8dca24dcb SHA512 5e3c5b7a5ea126dd5f8a09b9847dcd5dbd4443a3f6240b0d8ce72971938cc257160284de12115e4448e969ba8a256e76689274bda08ae17a521a81d8729e362f MISC metadata.xml 486 BLAKE2B d4e04c193a7b46a532791a0a448c7db4acaa4b4d4d775db70b6ab843ba32b616c91b516dbaca5b4e0a30649743553325a134291edb0ee17fe2ca049ed1e720ff SHA512 ddca3904aa3e0f1d2f543ae9329298a2dc69bbc0803c568d0871bb5ace21d2dee4d0b226e5eef0258fd59dd2cf046ee807afaa588e31db35e574f3d707894a23 diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild index a8b6b2a7e51f..0ace14532e0d 100644 --- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0/8.0.0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index 2c7a90cb94ff..db7ef372d378 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -7,8 +7,8 @@ AUX sarg-2.4.0-configure.patch 1497 BLAKE2B 2cd26287e2a5b3cbd641ead5953fb499c542 AUX sarg-2.4.0-fabs.patch 245 BLAKE2B be45ebf17fe6d7588fa7bd8d94da305347f7f017b61875ffc3249ac1a2788ddbee7e09fc855328e0da961866375b43f5a25c2421462b95fcb8265653c3fd2803 SHA512 9fd403ea0ddc411b99645f27e4b0209d9609355735601aa225621fce74270ebaae0e5569ae111bfba88fbd97cb41099f6eaf14047d09f2ceaac25dd85b6b134b AUX sarg-2.4.0-format.patch 400 BLAKE2B 020927621edfb7512f962fb12d0536b6a9a471c784b11f4105a27b533ec609cd9be3d97a43e45a2b2f45342a633ee300f6e39274ffb3aa48a556c44c95a49260 SHA512 fa6f3c0eaf0950c03d5cd8561e0e51cb06b008a90ae4df322933b56e92b73873f4903e3caf6adc7bbe886e2b7d3a53355637c5fa334b7d55b271384876d93c86 DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6 -DIST sarg-2.4.0-pre3.tar.gz 1364547 BLAKE2B 94729294de60ded125abd346d38833c64b3f0b320b0e07fc8153e287ce84b09ff83259fe2189afa087a46e6617d47628c162e3bda209563e3f7618d71ffd0cd5 SHA512 136313e36a8107f1ba84f7653aa3a0972beea05b89d77d8bd02a564c62881696f87bd2ed6cd0069624fe2ed013042cd604932220c8476d62702d27e68e8fd655 +DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B 4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675 SHA512 cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b EBUILD sarg-2.3.11-r1.ebuild 849 BLAKE2B dadaef09ee5131c4aec4bec7a5d27084a9a5da0bcb0bc18f7648ece30d5ff7b8da5345bbc3833c423c3530c2596cdebb837396aacccd2f11471e26a53d78b448 SHA512 395e8bbb6c7b752637393f6ad1b90b964cc7502f3750674888a1ae94da13de0efa890c52f5dd59af0e23f54a4976180859cab86aa3b9ce0dc62bdbe74c0b3973 EBUILD sarg-2.3.11-r2.ebuild 900 BLAKE2B ae2ee2cec4f73a97a4f2191a2a5659ab2cb314bd6e17b886085c246cc8aec0ac699f22aece2c3516380d107191b8267a211d496372a7ef5005776d32369134f4 SHA512 1905afac5cb561d9f28f11e86a4f594ab01a2667bbb84ac2504a916f43710a4c3547a8213094da9d70727ee6d14d2dea61ec6e2ea78f600a1486cf82ba9a7dfe -EBUILD sarg-2.4.0_pre3.ebuild 1217 BLAKE2B 298dbdce30c542511a51f16b1f3b345cfb5035e2c9cad2c39e127a010068d934488d8a83eefaf7297c8a172705671bacdad0d13eda8b724e177fd2d53a35c237 SHA512 c38ab11a82e2c2488215326c26f34d91b0f6027fbb3c2c0b298ba89746933d3ae8b0d6a66b88a38e8eaae1e42b64382a72a6f59a688a2ddeb07c1e97a2e5d1d3 +EBUILD sarg-2.4.0.ebuild 1254 BLAKE2B 5624dd6745918d98c704d301073e299245925021fc8714d78c8663118a53d89c88153dd690b70c4ccffa1d3069ba63c7676308f8dc6c25eeb6465aeebd922ba0 SHA512 00cdc41e41c4524ea684accecea8fdf3d81cdc018116fdfc95699b1da5c3eb68050776f14e0df51d0d643245ea94762c486a4d5bf3b3f3a99eacb35c0a78e242 MISC metadata.xml 997 BLAKE2B b0103361ea70e01da884621e5243317afdae68481b50c18296122617b0bc29669d50d6c6dda00c85d77e48186111bdf9252419a1b0627993b91dc652b263ca32 SHA512 0b24013475c4e92553539de23c2e88dff9e0bf9c42b3c5d6cb46e54dc113ceb8bc5889ac1d1c397f73bfde600ec6a394b2ba0da2520351f9050ec873b2c8d49c diff --git a/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild b/net-analyzer/sarg/sarg-2.4.0.ebuild index 992488f78a3c..6fbc48405afe 100644 --- a/net-analyzer/sarg/sarg-2.4.0_pre3.ebuild +++ b/net-analyzer/sarg/sarg-2.4.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="Squid Analysis Report Generator" HOMEPAGE="https://sourceforge.net/projects/sarg/" @@ -40,6 +40,7 @@ src_prepare() { } src_configure() { + append-cflags -fcommon econf \ $(use_enable doublecheck) \ $(use_with bzip2 bzlib) \ diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest index 8a46ee9a5f8f..c283b54c9c7d 100644 --- a/net-analyzer/scapy/Manifest +++ b/net-analyzer/scapy/Manifest @@ -3,6 +3,6 @@ DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06 DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede EBUILD scapy-2.3.2-r1.ebuild 869 BLAKE2B a1695ad6505bc5367342dfc3ffbd9a5d8e537f3cbdda910e69f617e1a93932d4f2bdd2a7bba2b1d887de7bb7f79a14dca981d12a7c4468683fe3eaae7820a67c SHA512 375c40a3da50a5ba136034c2c3cccba46d61c6ac63ff29c12d0ceeb3e20fece28812b0a1bd22710ec1ec0be62c57263f5744a652052bdd461099f657d63636f5 EBUILD scapy-2.4.2.ebuild 1013 BLAKE2B 4af428aa0b92bd5c174fc79d8d5a7ef010b220049d5a3db9b9b204235629ad9711c42d57635905be3f3f50965b215f539086d6fc5bf8be047c98075f90158208 SHA512 0655992680d112db6c7dc5b9c88c5effca5cb274eaaa2f6e055a52162b995f28a29a436279900c7bf1cfe21452b8a10fddc76a43d9b7014eddce0e8fcf946a23 -EBUILD scapy-2.4.3.ebuild 1007 BLAKE2B 6edc7972a1bfa098191eebedc09f60b529446c9d3fd52224de76669f5a0c1a2c02c4f7d1580529be28aee9a732ab3050f731bcd5e1fffd072e50099338103f3c SHA512 ce625f9ad780400c15ed27fc32163e5e4b2caa10e681ea8fe4e1c1f28cac4e7e6e0ee9d185ee4cf5048963c4de9ec3d497298a026e02e3fca85a2f6f47dd5796 -EBUILD scapy-9999.ebuild 969 BLAKE2B 7198f47406b105b9868360fa6401cc43dba652b9f4ed8f51db77b260fa5219a46f205272481c7ac6c1df0f114d97aabd655082cb7350a3d1ca5626a0492b2dee SHA512 0eeedf2e36137c56561d783a8b0b592e1e98f374a86a69f2e7f4fb0ad52d1ceec5d0c2b3783f2c53dbf566b1fd13ac0606776b4798c1bfea773d3c7f8ee5e263 +EBUILD scapy-2.4.3.ebuild 1007 BLAKE2B 3283551001272acd470c718de2bca0ec10089a6d28e4c8f746f10422f9c09ae0a6195bdda98f6e5b22affec7b6cb35e321da78cbfe745918a78629742fea6584 SHA512 4af0b1feb54fe45bb7cd009ec2dd8f26c5c8aa601b33ad1abc67a4df0573a7b200ec2aba72b5555b73d6b108f6e67a353f1bd975380710cbdcf87c2b485bb6a7 +EBUILD scapy-9999.ebuild 969 BLAKE2B dbf38248cce514847dc8b3dd735c7aefef4a283327db74af9cf39591f543936c5fc91e213d522edbd8aaa0708dee682523ef2fcced676e11a5d272f3f3f97f22 SHA512 b9d85c1dab47372522248772444fe8530ca16dd9ac1c1f4e4419b247c66b102d7236bb3d3c7b58902b55e8c42dadae6b3378e357f97cba30720d9b7fe94fcf6f MISC metadata.xml 674 BLAKE2B 9aeb70531e3395462033100fc9b709533c158bf7939aa46930558b48e9f750030bc26f750b574f3e31ee5779c65a7afb48ed74f8db9d738849e9ab97d621f351 SHA512 54bbc8a152f8433e3da143261bc530df95e8a5808791582e2d2115476001f63381219a3738bb80c1833f56d331ee54908cf72f3c72cc27e05100f6de8edc6caf diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild index 6d48ba472755..01f3a461396c 100644 --- a/net-analyzer/scapy/scapy-2.4.3.ebuild +++ b/net-analyzer/scapy/scapy-2.4.3.ebuild @@ -20,8 +20,8 @@ DOC_CONTENTS=" Scapy has optional support for the following packages: dev-python/cryptography - dev-python/gnuplot-py dev-python/ipython + dev-python/matplotlib dev-python/pyx media-gfx/graphviz net-analyzer/tcpreplay diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild index 0293cc5ace34..3ed8c5033ab1 100644 --- a/net-analyzer/scapy/scapy-9999.ebuild +++ b/net-analyzer/scapy/scapy-9999.ebuild @@ -20,8 +20,8 @@ DOC_CONTENTS=" Scapy has optional support for the following packages: dev-python/cryptography - dev-python/gnuplot-py dev-python/ipython + dev-python/matplotlib dev-python/pyx media-gfx/graphviz net-analyzer/tcpreplay diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest index 959751a8f237..b6a9cbcce58e 100644 --- a/net-analyzer/sniffit/Manifest +++ b/net-analyzer/sniffit/Manifest @@ -1,9 +1,10 @@ AUX sniffit-0.3.7-gentoo.patch 1164 BLAKE2B 0d35dab5ae42180ae0eab4133f2a5c752d39fbf20577b06d697ea2bcfa745c3fa51b2318e5043783eea0c54c398478f8939d050fcb9a6c28aa4e3ac483f09135 SHA512 e71684e0be70228c347fe61afdee7e6bf0f116b0ecb603ed4dd6838f457b5b480092ac735297ce64f84f9c8858b5b11d7a1e746c0790380fbf6f7cf8d9875865 AUX sniffit-0.3.7-misc.patch 2957 BLAKE2B 7315c4f977642819cb7ccff3f1337d5d3f0ee4a298a6984338a44cd8f1295a6a490aeb89e4d06d61c863665f67ca8894951fe4a3d1d52d226895581d84038e49 SHA512 d07298642bab1903c7a93a2b076dcf2cf50a2a5ef5b05e7e9abacaa88cff3089c9028e7721cacbc403b992ad170f64976e83835e441b44e6ac69ee0753e2714e AUX sniffit-0.3.7-tinfo.patch 1063 BLAKE2B 8d3b781c7c71201639ba77e8dadb063dd85d7bd0a04c4717bb2f6dbad8b2245f2a43b6c563567f813e76f2bc3dab5d414081cd8c337a8ff81e4bab3856d7cd29 SHA512 d4959d6c27928c3d3f85fdfdfb1afd4f7ad24000adb61f565fef68b46b46aba96b61572177db058875dc3a70154223cb620077e6681c8a7f62483e614f8e92c6 +AUX sniffit-0.4.0-fno-common.patch 6287 BLAKE2B 6480ee02366d834b9a6097a36023dd2ea707fc85ba2f6e5dae75cdd6e05c1107ed26ff869d57557d2ac3d3f850e21d99c1eec6d8028ecc7dc8257adae16265e0 SHA512 3b293d71c3b9b9c05d6d2077f6cc759f469af91c0dffe243dbfe75ba93677f18f24e62b78d2a2ca3b5ac99aac318da6802ec4e5c3012569c428662f40fe7f355 AUX sniffit-0.4.0-tinfo.patch 434 BLAKE2B 15295b6ed19928dcbf9f3905278cb3e3390bcf34feb7eb59ac438bba61459625376b6a9c2903605fd4a232db42ce9b782d50a2ebd43b1fa0a1e83b886daaa7ac SHA512 27d5e6fa9bc786b5a3018d26613131e257e5f4cfe0e688b1868857521d7aa931b41319dee7abfd6ef8d76c24f28bfef699c48e82df6e24c90507e1ee462e47d6 DIST sniffit-0.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1 EBUILD sniffit-0.3.7-r4.ebuild 792 BLAKE2B 91723d785619de8ab8de16708d365e07a43310e093cae0f3b794d5b38054588a9760cf9c26639feef7cb83f612aacfe08b804ff585ec2b01469ac54105254c12 SHA512 2f44f2881473aa1744c62b68d6eab2f4eebf9470a17a069430bf9c2fdaef1c755de543c42d9153d975cc1bef7a848ae8b78398a56f1400c4d1280d5ddc344d35 -EBUILD sniffit-0.4.0.ebuild 587 BLAKE2B 70f3b41f380075af20c2ce630bf4752a424d48badd00ce10aff803bc8a938b2e9990f5e47b9f0df82a6ffb1a88bace06ffeb193b7c7d313b1e3fea15934783cf SHA512 590199b70c414ffd649e7db6f790be0aea3395a1de705a50edc652b18e38573b96ade3271a1cb40fd6d925fa043f3f56b8c5f04214ca16664f61d903822b485d +EBUILD sniffit-0.4.0.ebuild 631 BLAKE2B d2411739bbf645031179c22bb82cb6ee485e46aa3e6f73de1ec75e0e38d8700bdafd40ff6fd7e76bbaca72c87bfcf03f46d2cc7d170534289094840250d36675 SHA512 7ca9b61f2da0120d31737c9936901506ec5c51353a500f64efda06d97d4829449b883dec644e48057cfd402661ad93b03b528aa26ca24669936c0d662f2fa94a MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch b/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch new file mode 100644 index 000000000000..6a576acf1d2b --- /dev/null +++ b/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch @@ -0,0 +1,181 @@ +--- a/src/sn_data.h ++++ b/src/sn_data.h +@@ -101,7 +101,7 @@ + char IP[256]; + unsigned long SNIFLEN; /* bytes we need to snif */ + short DEST_PORT, SRC_PORT; /* destination port */ +-char non_printable, *logging_device; ++char non_printable; + + /**** Global data (packets) *************************************************/ + int PROTO_HEAD; /* Base Protocol head length (ethernet, PPP ,....) */ +@@ -147,43 +147,6 @@ + /**** Global data (plugins) *************************************************/ + char Plugin_Active[10]; + +-/**** Global data (interactive) *********************************************/ +-#ifdef INCLUDE_INTERFACE +- +-/**** shared memory pointers ************************************************/ +-char *SHARED, *connection_data, *timing, *running_connections, +- *logged_connections; +-int *LISTlength, *DATAlength, memory_id; +-unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; +-unsigned int *IP_nr_of_packets; +-unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; +-int *DESC_LEN; +- +-/**** data structures *******************************************************/ +-struct snif_mask *mask; +-struct shared_logged_conn *log_conn; +-FILE *log_dev_stream; +-struct stat log_dev_stat; +- +-volatile int LOGGING=0, screen_busy=0; +-char PACKET_INFO; +-int POINTpos=0, LISTpos=0; +-unsigned char COLOR_AVAIL=0; +- +-/**** screen **************************************************************/ +-int MASK_WINDOW_ROWS, MASK_WINDOW_COLS; +-int MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; +-int INFO_WINDOW_ROWS, INFO_WINDOW_COLS; +-int DATA_WINDOW_ROWS, DATA_WINDOW_COLS; +-int INFO_WINDOW_X, INFO_WINDOW_Y; +-int MASK_WINDOW_X, MASK_WINDOW_Y; +-int DATA_WINDOW_X, DATA_WINDOW_Y; +- +-WINDOW *menu_window; +-struct box_window data_box, main_box, mask_box, packets_box; +-int Pid=0; +-#endif +- + /* DEBUG section */ + #ifdef DEBUG + FILE *debug_dev; +--- a/src/sn_global.h ++++ b/src/sn_global.h +@@ -4,7 +4,6 @@ + /* currently some option data */ + + char SNIFMODE, DUMPMODE, PROTOCOLS, ASC, WILDCARD, CFG_FILE, NO_CHKSUM; +-char INTERACTIVE_EXTEND; + int LOGPARAM; + /* All option shit */ + +--- a/src/sn_interface.c ++++ b/src/sn_interface.c +@@ -18,37 +18,37 @@ + #include "sn_generation.h" + #include "sn_resolv.h" + +-/*** extern stuff ********/ +-extern char *SHARED, *connection_data, *timing, *running_connections, ++/*** global stuff ********/ ++char *SHARED, *connection_data, *timing, *running_connections, + *logged_connections; +-extern int *LISTlength, *DATAlength, memory_id; +-extern unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int *IP_nr_of_packets; +-extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; +-extern int *DESC_LEN; /* For the connection desciption */ +- +-extern char INTERACTIVE_EXTEND; +- +-extern struct snif_mask *mask; +-extern struct shared_logged_conn *log_conn; +-extern FILE *log_dev_stream; +-extern struct stat log_dev_stat; +- +-extern volatile int LOGGING, screen_busy; +-extern char PACKET_INFO; +-extern int POINTpos, LISTpos; +-extern unsigned char COLOR_AVAIL; +- +-extern WINDOW *menu_window; +-extern struct box_window data_box, main_box, mask_box, packets_box; +-extern int Pid; +-extern char *logging_device; ++int *LISTlength, *DATAlength, memory_id; ++unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int *IP_nr_of_packets; ++unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; ++int *DESC_LEN; /* For the connection desciption */ ++ ++char INTERACTIVE_EXTEND; ++ ++struct snif_mask *mask; ++struct shared_logged_conn *log_conn; ++FILE *log_dev_stream; ++struct stat log_dev_stat; ++ ++volatile int LOGGING, screen_busy; ++char PACKET_INFO; ++int POINTpos, LISTpos; ++unsigned char COLOR_AVAIL; ++ ++WINDOW *menu_window; ++struct box_window data_box, main_box, mask_box, packets_box; ++int Pid; ++char *logging_device; + + + /*** Screen Parameters ***/ +-extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; +-extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; +-extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; +-extern int DATA_WINDOW_X, DATA_WINDOW_Y; ++int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; ++int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; ++int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; ++int DATA_WINDOW_X, DATA_WINDOW_Y; + + + /*** Sreen operations ***/ +--- a/src/sn_interface.h ++++ b/src/sn_interface.h +@@ -1,9 +1,46 @@ + /* Sniffit Data File */ + ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <unistd.h> + #include "pcap.h" + + typedef void (*sig_hand)(int ); /* sighandler_t gave errors, weird */ + ++/*** global stuff ********/ ++extern unsigned int *IP_nr_of_packets; ++extern char *SHARED, *connection_data, *timing, *running_connections, ++ *logged_connections; ++extern int *LISTlength, *DATAlength, memory_id; ++extern unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; ++extern unsigned int *IP_nr_of_packets; ++extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; ++extern int *DESC_LEN; /* For the connection desciption */ ++ ++extern char INTERACTIVE_EXTEND; ++ ++extern struct snif_mask *mask; ++extern struct shared_logged_conn *log_conn; ++extern FILE *log_dev_stream; ++extern struct stat log_dev_stat; ++ ++extern volatile int LOGGING, screen_busy; ++extern char PACKET_INFO; ++extern int POINTpos, LISTpos; ++extern unsigned char COLOR_AVAIL; ++ ++extern WINDOW *menu_window; ++extern struct box_window data_box, main_box, mask_box, packets_box; ++extern int Pid; ++extern char *logging_device; ++ ++ ++/*** Screen Parameters ***/ ++extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; ++extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; ++extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; ++extern int DATA_WINDOW_X, DATA_WINDOW_Y; ++ + int add_itemlist(char *, char *, char *); + void child_exit (void); + void clear_shared_mem(char); diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild b/net-analyzer/sniffit/sniffit-0.4.0.ebuild index a4e8e10f5060..6761ff0d80e0 100644 --- a/net-analyzer/sniffit/sniffit-0.4.0.ebuild +++ b/net-analyzer/sniffit/sniffit-0.4.0.ebuild @@ -19,6 +19,7 @@ DEPEND=" ${RDEPEND} " PATCHES=( + "${FILESDIR}"/${PN}-0.4.0-fno-common.patch "${FILESDIR}"/${PN}-0.4.0-tinfo.patch ) S=${WORKDIR}/${PN}-${P} diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index bf8bb00dc8e9..cba9b38d69d6 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -1,4 +1,5 @@ AUX snort-2.9.12-snort.pc.patch 301 BLAKE2B 856d8b12dab5c6d6158f5717fd9e851fd81b62a378bedc9ab485b54bce489730ad76a4340d1eed8f9fb72d07643a939ce61e95e23eaa2b65751cd7755e6027f1 SHA512 0cbd3035a902728927fb1cebe220dd00ed7352c29416129ae7e72ede5549e8a36809ce106cd77fc5f73d03973449ca2f880fd08071c910e1fa00a6a0ebe03c74 +AUX snort-2.9.15.1-fno-common.patch 3174 BLAKE2B 46fbd5f5309321adb96acb0ba730dceb19c1d9c04cc1fc840ce87aebab35d048b04b45f8d9125c3309589d5471d1bf55f3ecdce3268b254ac0f8199c0cb188d8 SHA512 2c0e557806d93cd4999405a88a986a4724d4484ded85d9c706ea4c0e44a5f09af345fa8df5862bebf29cf709994db74cefc471168984bb27db9399a0fc0e0fb6 AUX snort-2.9.8.3-no-implicit.patch 299 BLAKE2B 61079829bd82915a8f7b98d9645cb7dda062c3c92558baad9d6052993b3c1f6ea668a1067b5c57e1f570be49e114bb526e45813aff662ff225e88ec4d201d8d6 SHA512 e3cc85c8a8608126880f46220cf889fcd8a7f6819c17bc14cdec2366a0673ec26734637c0185fa4a6be831efdc112678c6f3df08445922d362c79861d0aca832 AUX snort-2.9.8.3-rpc.patch 1010 BLAKE2B 69301ee21b7efb0bc7f4e3b266de315078d7cbc37a9ae8a4127091bc711650c65f2dc46e0f780a58653fc27606d7116d07a496af7bf7ea3693fc0d69f85b5e63 SHA512 1336fb39ad8f0a5f07c09a5310e4830058b4171fe70b549ad00cba4809f9e18ed0be559abd5c516c5c85b0be90340af3096d5963d9cf098ab26952b1cf93f5a9 AUX snort.confd.2 420 BLAKE2B 984bc3a1b4f9fea044b150d1362950cc2bc0fae07a92351a88f428befbe1fa35166809dfb9d350cd811bec1dd22f5392910a5f2ee2ec11f20a3dfe6bdff4c4c5 SHA512 f8b0dd74a601a8bfadc96f75caeb037059ba4330dc2b52cc113ce9be38b020f098cbc747bfe977ca4dfa6e2ce634a64949ca5cf41a40c16fa90227e49ac9052f @@ -10,7 +11,7 @@ DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482 DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687 EBUILD snort-2.9.12.ebuild 8872 BLAKE2B 84895cf9afb5ddf3079773ff50d730c56af2b01fc912c9d1fa74bead53fe30332d4971dde35cd3091057fadb06f32c25971823904c8d00caf185d9547ec32a63 SHA512 26ed8dc6c1d020a1fb73d1f12a81700a3d18103038340d00eb44d9891391eb49b2e8a611a3f46bf4d8423cb0586e8449933e7863e0184030f152b246e6696070 -EBUILD snort-2.9.15.1.ebuild 8847 BLAKE2B 9bf936653b94ad7bdf1cb0634cdf126b6c735240f089e589de424527bd2d3c062ba090231dc2f4cf99a667a95db3274b8d252d31a6bb21268f705e84ccaf6703 SHA512 58fc58ea9ee1fb1659969061f0ca037f37afa6f7f7b8e856b6b4f2b6432cffd04228f2dc0d630def5fd1a10914f76723477192a1aaa2a4eb9fa4677809ce679c +EBUILD snort-2.9.15.1.ebuild 8322 BLAKE2B a30af887835e0d9c4205c323c1227402c444d31ad7fdb6a663932e4b885722f6e25b7c24bc9074c4573fe84facbb95790daa877267901d4dc5aa9a45ea2d0c1c SHA512 26fdf6db522b842641d3fef0ed7e16f1c2a8c1f260277769c8ae12566fad88337236231df2e2015cf8a7efeb04ed953c5edbc9ab8bbd9fe970919b896b3dc6d2 EBUILD snort-2.9.15.ebuild 8847 BLAKE2B 0103540218a24cceb191285c4dac236621c25f140a4842c7bf70cd3e438afcdebdacf66d9a23de6319028b7f7d8e891f3f2e1eaf0230bc8b034dc1b2e3b34ea5 SHA512 52e5f4bd4f68bb5a85ce4bd27e8067d6ed16b9586fd92f4dce18ccf4380232a78c8249967dc85a9e181c68b70ac3d3d92aa402bf24b146051f465d47e84e2e89 EBUILD snort-2.9.8.3-r2.ebuild 8505 BLAKE2B 82e9e4dbb2527f80ff87f3c95befb2b141e8ca55e1b097581b688c65e990c7cc0206388d98859f47e0f6b0a9ea52d2f6ff566ed67085de4f33c5023e7e4b86dc SHA512 8444c62e53db68fa39a85048b1ce01f30d16d636f4dd5eb3e51a1a5af3e393ca9bf0d4615c44b38bd57de050735b3666222c542c215b08f4f75c49613988a390 MISC metadata.xml 4042 BLAKE2B 931c99e6b1aee3727e47f32dff6399dc821624fc9cc3be496ba711d480edb04920d2ffcdc9ce4fe6a253be2bbcd4bb45f56a34da530c6dd60140c77b5cc45856 SHA512 2ade0995e40052f3be40a073458a19ea380bb2f75e24905c06b45e88d8956b118db73fbb0a1062e5c0ca837e04d1805a54785a84283e701534ec47c320833b1f diff --git a/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch b/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch new file mode 100644 index 000000000000..9fe39933ddfe --- /dev/null +++ b/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch @@ -0,0 +1,106 @@ +--- a/src/preprocessors/Stream6/stream_paf.h ++++ b/src/preprocessors/Stream6/stream_paf.h +@@ -68,12 +68,14 @@ + uint16_t s5_paf_port_registration_all (void* pv, uint16_t port, bool c2s, bool flush); + uint16_t s5_paf_service_registration (void* pv, uint16_t service, bool c2s, bool flush); + +-enum FlushMode ++typedef enum + { + FLUSH_MODE_NORMAL = 0, + FLUSH_MODE_PRE_DISCARD, + FLUSH_MODE_DISCARD +-}FlushMode; ++} FlushMode_t; ++ ++extern FlushMode_t FlushMode; + + typedef struct { + void* user[MAX_PAF_USER]; // arbitrary user data +--- a/src/sfutil/util_jsnorm.h ++++ b/src/sfutil/util_jsnorm.h +@@ -42,5 +42,7 @@ + uint16_t alerts; + }JSState; + ++extern int hex_lookup[256]; ++ + int JSNormalizeDecode(char *, uint16_t , char *, uint16_t destlen, char **, int *, JSState *, uint8_t *); + void InitJSNormLookupTable(void); +--- a/src/preprocessors/spp_session.h ++++ b/src/preprocessors/spp_session.h +@@ -28,6 +28,8 @@ + #include "decode.h" + #include "session_common.h" + ++extern PreprocStats sessionPerfStats; ++ + /* list of function prototypes for this preprocessor */ + void SetupSessionManager(void); + void SessionReload(struct _SessionCache* lws_cache, uint32_t max_sessions, +--- a/src/preprocessors/spp_httpinspect.c ++++ b/src/preprocessors/spp_httpinspect.c +@@ -161,7 +161,6 @@ + MemPool *http_mempool = NULL; + MemPool *mime_decode_mempool = NULL; + MemPool *mime_log_mempool = NULL; +-int hex_lookup[256]; + int valid_lookup[256]; + + char** xffFields = NULL; +--- a/src/detection-plugins/sp_session.c ++++ b/src/detection-plugins/sp_session.c +@@ -80,7 +80,7 @@ + #include "snort.h" + #include "profiler.h" + #ifdef PERF_PROFILING +-PreprocStats sessionPerfStats; ++PreprocStats sp_sessionPerfStats; + extern PreprocStats ruleOTNEvalPerfStats; + #endif + +@@ -149,7 +149,7 @@ + /* map the keyword to an initialization/processing function */ + RegisterRuleOption("session", SessionInit, NULL, OPT_TYPE_LOGGING, NULL); + #ifdef PERF_PROFILING +- RegisterPreprocessorProfile("session", &sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL); ++ RegisterPreprocessorProfile("session", &sp_sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL); + #endif + DEBUG_WRAP(DebugMessage(DEBUG_PLUGIN, "Plugin: Session Setup\n");); + } +@@ -287,7 +287,7 @@ + FILE *session; /* session file ptr */ + PROFILE_VARS; + +- PREPROC_PROFILE_START(sessionPerfStats); ++ PREPROC_PROFILE_START(sp_sessionPerfStats); + + /* if there's data in this packet */ + if(p != NULL) +@@ -298,7 +298,7 @@ + + if(session == NULL) + { +- PREPROC_PROFILE_END(sessionPerfStats); ++ PREPROC_PROFILE_END(sp_sessionPerfStats); + return DETECTION_OPTION_MATCH; + } + +@@ -308,7 +308,7 @@ + } + } + +- PREPROC_PROFILE_END(sessionPerfStats); ++ PREPROC_PROFILE_END(sp_sessionPerfStats); + return DETECTION_OPTION_MATCH; + } + +--- a/src/detection-plugins/sp_session.h ++++ b/src/detection-plugins/sp_session.h +@@ -29,5 +29,6 @@ + void SetupSession(void); + uint32_t SessionHash(void *d); + int SessionCompare(void *l, void *r); ++extern PreprocStats sp_sessionPerfStats; + + #endif /* __SP_SESSION_H__ */ diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild index 03b19a935318..21aba42de764 100644 --- a/net-analyzer/snort/snort-2.9.15.1.ebuild +++ b/net-analyzer/snort/snort-2.9.15.1.ebuild @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch + "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch ) pkg_setup() { @@ -49,20 +50,6 @@ pkg_setup() { src_prepare() { default - # Multilib fix for the sf_engine - ebegin "Applying multilib fix" - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \ - || die "sed for sf_engine failed" - - # Multilib fix for the curent set of dynamic-preprocessors - for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \ - || die "sed for $i failed." - done - eend - mv configure.{in,ac} || die AT_M4DIR=m4 eautoreconf diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index 3be28213839a..76ca33084ccf 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -5,5 +5,5 @@ AUX suricata-5.0.1_default-config.patch 813 BLAKE2B 5758447f2dc6fa50bb6a388c2c83 AUX suricata.service 501 BLAKE2B 00631ada0d2993eae97a028ef950b031b91bb3af346ee3538bd7f0deb9d76bb8552761b4666a3ac80673fe31ffd95424f2ff71e35db0f5fe6667b32478fab4c4 SHA512 4e4e87735731fd0e18ab26e536e7904833a19ce8785ffdd15b22d494673c73044137908feee74800486960f9efd09d1ddc2c75a490a2e35ef06caf23c7439a0c AUX suricata.tmpfiles 24 BLAKE2B 150b74a6775137704915015871ab4455b8d0b9204a75c398ea746e9194b0c0a787904f9015b98f36a685fac0dbb0fcb43746096dd403bf882afa5dfef12af94d SHA512 1530aed4efb35f988e2f0134388ea11ffc3ba1f217845a2c5dd47f947983ed4d343126e49d66a86ca7894ff60b5134464ddbe07509dcc80c001131f09cb7e2dd DIST suricata-5.0.1.tar.gz 23721536 BLAKE2B 529837e8e4d6c33d2093df8208bf03519e0d60deef92eadf9d0a44b7416eae2f900b2f72349815acb86d9bdd9d4253bbc5d7c4c1a34157f544982b0788291624 SHA512 db0797a7992abf0ddf170cb603fdac06b0ff92278bb91343860bccbbe029ea0e83131dfb9805ca44bcbbe3925502119259e350a17e94209b21d1f8b610d965a6 -EBUILD suricata-5.0.1.ebuild 6159 BLAKE2B 09a165bbee254f1b7d6b8a5ede8f3514301d58b85291f8336dc02d0c8c3c1ee5b89fdc63837af5bec3bb038ad8d5b919e13976a55af584a2620f6da5da36d492 SHA512 cde3097df89de194d045ea22843b9b4924b69fb7bb8fced588c8d3865cdafb5e14db0e22a065fec743835fa525d836f4ade6d02e4f469e76b81e46d5e5b2f482 +EBUILD suricata-5.0.1.ebuild 6229 BLAKE2B 46d8b05dfb1d25c5efb6867872be88a2080b739805af87eac562c97613f01966179bdfacb78d0df59b945cebfafc5879830077478d077b29b77b781cf2f17ae1 SHA512 3d81c148662e8450676e4eaa481ba97003cd7db6b617e421b38828d4cacb371362d28f4177d2e9ce6faa19437feb05b5e11f83f26e9998ee78e21735619c52fd MISC metadata.xml 1015 BLAKE2B 355c550ad2fe7a37d69b92f0bd710824d68a3353be687876449ad5b7d8e2c98b06b833e59ebcf479410aff09dce71e1f7f64be860c348f3d6c3519cd8fe2acf2 SHA512 0837e07a0130baff435e684b47a6b463991aec73b4f570672d0091a70adf163c5e83d19887e1575f12db783d6246050777011d25dc658fe4767cd3fe8fc1d4a5 diff --git a/net-analyzer/suricata/suricata-5.0.1.ebuild b/net-analyzer/suricata/suricata-5.0.1.ebuild index 676947405976..d09d4b1a9847 100644 --- a/net-analyzer/suricata/suricata-5.0.1.ebuild +++ b/net-analyzer/suricata/suricata-5.0.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools linux-info python-single-r1 systemd +inherit autotools flag-o-matic linux-info python-single-r1 systemd DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" HOMEPAGE="https://suricata-ids.org/" @@ -71,6 +71,9 @@ pkg_pretend() { } src_prepare() { + # Bug #707204 + append-cflags $(test-flags-CC -fcommon) + default sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" eautoreconf diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 649e56a42519..3096679c61d6 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1,6 +1,6 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a45da05d0b47894368d39d2c8432f68ff47740d30c34868a60e6e300e08a1a1b5b8e17bb9519c945e39f81014a6 SHA512 eb12b115c8c6f0a2b7bb84712fe3dda5ddde3e6acb56d00000e97abc007b26a1411ddf6be793205bf7c76ccecc3915c417124870326745e3896ae6963bb42341 DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 EBUILD tcpdump-4.9.3-r1.ebuild 1930 BLAKE2B 27db7633b2afaf4d15024e1493d828a13a291ec94379a311173c2adef25f58b2dc207f3f665c4c7f7a54c006332bb94580f98d290d5508aafde63329e6b9ff78 SHA512 68c84a450281cfbcf079cc1b5087f8867632ae65754cf9d70d253ab2a68f45dfca2562edcb5f5e772dad0261644a1b2ae80e2531e10f3580109449688d910b1a -EBUILD tcpdump-4.9.3.ebuild 1972 BLAKE2B 212f414d858a2b428777373768e08d51bb3d57be9a8d3434bc84b96975dfaeccd527af5d12aae8151a5ef162f429fd9830b3e069c65226eefe88cf04a1de0146 SHA512 f4c2e94bdad0b57fa985b836c59ab02ad86b04b67a1bfac68d08a673dbabfd9272054af6d46e9f823f5aaf0fd4da8435f21ad15b2bd0ca67e15a34f60a8f62f9 +EBUILD tcpdump-4.9.3.ebuild 1973 BLAKE2B 62eaae055f4efc70140710f2bf5a86aa7cca74f08da9fe2f2d8de0a555fee9a2ac16f0f1f13686157e05442ed704e98307958f1c26d8b9cad6f1aef4fb360379 SHA512 03c2b1f549fa25da311a19fef8a8deebb7a2fc378a75ccf0957dc0637dca581d4be65d53378b7413e81007e1b06c976cee1464498a2bfd711dce069dff922505 EBUILD tcpdump-9999.ebuild 2243 BLAKE2B 2e86614481c991ecf8e087bfcdce3bf22f203589456a7279c38446d321efbd10bf3912845d0334175a296b762154d12ad510ce5b94c3facdf9778823e26e9cee SHA512 2a7dbdfdbb19b19e1f3d30da1f843a070a1d19f929a6509a99d843ebc8fd5c644cbb58f37b93c72e8ad8937938fddd1a893dfd3df526b5a1d0ad49a531746eb1 MISC metadata.xml 639 BLAKE2B 2bbc5e38a9e172b7aa6dc69d211311d263007bb0da6e268cb9de953f0f862de3562b12e2ba3be267963ed2ef78254e7622951ab997550d78eb56fb057621e3ab SHA512 b765372f84fc597e257acf7d7e7daa5d9b220831ceb041851a9ef08da0fd419f36b12244cae9da0c3ef2b1b5c3fae9e4d234818ab4d58caf209c2c22604de392 diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild index c4d7bb454a9d..2dde1660cd29 100644 --- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild +++ b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="+drop-root libressl smi ssl samba suid test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest index 8da627f81144..28f341fcc9dd 100644 --- a/net-analyzer/traceroute/Manifest +++ b/net-analyzer/traceroute/Manifest @@ -1,7 +1,7 @@ DIST traceroute-2.0.20.tar.gz 68907 BLAKE2B 0b80836fe05cad955f8d1a31ecad56f46b29f4710c949c43cac2f908aef551867f808672e3e750cf4b228a94685dca0032c3d2d3ed9d8d5982dfffbe824adbf4 SHA512 ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721adbecaecee1deff9324bdca8be26e9b821131f84e01411455806c07ded5bdb34b6ab64d4572ffef24af3cfd17c39 SHA512 f7981188b5aa13b6a6c26e7bb3b6cbab88b1adec53a04bff4b878f800bb32a62d82fa389fb36aefd81cc3e9da31740e095f6b6f7eba4dd5926520ad3cff7a92c DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3 -EBUILD traceroute-2.0.20.ebuild 935 BLAKE2B 4fdd83f5d2693a48fe82361f964a38bc2c32eed38a8ebf63e07512d1d24c45b64780f26796b1b59c746d45c4b2e328aedc24268b9fa6a9cb35a3d9ce7d5987cc SHA512 c3fe4478b265decaa6129e9d554cf5ea20555268db14bbbb7e825e39b7b9f830b6561ed59ef83c263d041ed2c78ad15f5e95c07a20b7c899a1b4e35a37fba1d7 +EBUILD traceroute-2.0.20.ebuild 936 BLAKE2B db5c2cc976b6f5e1b364aefbd6aab0e0ade8aa3365932c1504f0de7b7ed960bdb2853ff79a5902e26c2f9e409487a35df062339164ec8fb34d4c3147a1c5e056 SHA512 b4309d9994f6255f20adda0cec9db60638c5c4aff1eb70d2e830365e150dfd14fd9365a0b869a8cd88dc24733badba60de9157465ee4d72271ccf27bff6f967c EBUILD traceroute-2.0.22.ebuild 886 BLAKE2B ef7ed7acedb3721376c68b2bdab8eba6b3f068b2e608c75a9cb1e7b5ac223859d56ce3c34bc93f9fbdf57f957857689806c690527164d2ca4cc680758530abd7 SHA512 38f00d14c9f5271ce85b21be8d69f32383d9da15db39583da46d6013b21f004ed4b696a3d586428c609067a14cd7f3f989fe60035697ed10a01bca15978b5da6 -EBUILD traceroute-2.1.0.ebuild 873 BLAKE2B e25c05be75c5811f88629c60ed1d1271f848ca25d038d06449cee0ff45f7fd2ce69b8dab759eeee2357e8e933d613d8702078878c65d99f6b320c0a54e95f4cd SHA512 9de83871e0ffdf7365e5b8c9a0280c6fb995233e5f78f854ea98b0dc36490ee3380fedfec1403b1b9ae3ef6ffc3297673c9f158aa3d0530178e876804fcf4335 +EBUILD traceroute-2.1.0.ebuild 874 BLAKE2B dea56da37f4a1a415b496da31ed5334c6080f77aa323b35d481fcb3ad576393d4331ac2b0d6b5e4cbbf3cdb31b9fc9f1d49be4bfaebedf8e5ce87f831d7e17e7 SHA512 d6b912e18799b5b08789339fe4cd562f55b12d242c2980fba2f308907737d204068f9e7508655b30495460f41ca4e2367e55b6e0d1af0554c53c3309882aacd7 MISC metadata.xml 437 BLAKE2B bbef3a65676e67e78b4f78846a46986a3ffc8b74bb73517795b4796b2865ee0ae4d6ecf99edb1a9b12dc97988cc51fb161dfb757e8ef449a3b46fa1eac5c8411 SHA512 928cbbbcefe88681f5f797616d8f8b4de75cf789157afa536a757e7e72f44b07c337105380816aa79713ec143c324ae16577351648357a77267b6625b962924d diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild index 971891b00d0c..198afbfb40e8 100644 --- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild +++ b/net-analyzer/traceroute/traceroute-2.0.20.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" IUSE="static" RDEPEND="!<net-misc/iputils-20121221-r1 diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild index 94ae91ce4716..69f8a0cf30ff 100644 --- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="static" RDEPEND="!<net-misc/iputils-20121221-r1 diff --git a/net-analyzer/webfuzzer/Manifest b/net-analyzer/webfuzzer/Manifest index 7be26578da97..d6e37b56798d 100644 --- a/net-analyzer/webfuzzer/Manifest +++ b/net-analyzer/webfuzzer/Manifest @@ -1,3 +1,6 @@ +AUX webfuzzer-0.2.0-flags.patch 640 BLAKE2B f403d4505c912314e9966b17ac20b1c883c2bfad705dde711105fd10f20c7ab71dd3b29069398e1ee8532628893e94273e9eff9e710039aaa6f5c4e913075cdf SHA512 3c9827a44b1a3c6aa8851eb791eb61b43d7760cec4d77366491afeebf3db6d32ae836a7dc5ab475cccf70020d90ec96a9cf98ef933cb9d3e205cd84ae3352bac +AUX webfuzzer-0.2.0-fno-common.patch 896 BLAKE2B 018272d0921634b669211a32f5a31e05abf5a6822701f3e3fc17034a6d3a3095cc7325b36b91041a889cc8e038531e02f32958849995903dcd539e0cc7ca4236 SHA512 5c62759e17809be3f26efd52043608408b1dbc493e07b72bc514cb0e73f92461c6c14994e0597c2efd1a1b0d44544e74b1aca9221025f7859b5e10a1ede8060d DIST webfuzzer-0.2.0.tar.gz 29664 BLAKE2B 38c03f826c99887d8e8531a19634b250a73dad5cfa92386a033015c354739ba403c90faf9b0e99ac705ecd42cafe564d11edff9bdb71b9c4b29c048cbe64c1cc SHA512 7cb858178dd11e7b6020f2b0db1092462401aab552af6bdb8b8c95c018bd35572a981338226def07dc45ed8f0b5a0b282ad681e9d86bec14d14ffd623518082e EBUILD webfuzzer-0.2.0-r1.ebuild 613 BLAKE2B 364a247e782af1584e2bd3f4c899367a7ab92880d2bb58e847940b5615c0e06c3bf4b0f62d0f30c4a249015dc898639863dd517fffc2254824f17b3fafa930d8 SHA512 e70b8c6c76fa58c93e90b3924d7a98ffc3da0f23e8c09943e12946a44f54dba5a6e61fd596e7bee475bc20796beef27903ccebba6da7c83cdd05a77cd090615e +EBUILD webfuzzer-0.2.0-r2.ebuild 571 BLAKE2B a73aead55c7f50d0a45593af1bd07071dd4b86c849d2d63ffb7d605b8820feb89ee8b7648c1674a8f2458927f7c1ed1d2662b8a0d145c1ea661e89a8e61d151c SHA512 95bbc014327b4807ae76bc318c1faf11c4be82538ad3a1933a2f8271eb2c1d8edb5ae9ee22cc516f4735d771b0ae1d02ae7e94fce03e6c4786640bb65807a85f MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/webfuzzer/files/webfuzzer-0.2.0-flags.patch b/net-analyzer/webfuzzer/files/webfuzzer-0.2.0-flags.patch new file mode 100644 index 000000000000..9c40ecf167f7 --- /dev/null +++ b/net-analyzer/webfuzzer/files/webfuzzer-0.2.0-flags.patch @@ -0,0 +1,24 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ + # Makefile for Webfuzzer (c) gunzip + # + +-CFLAGS=-g -O3 -Wall -DCOLORS ++CFLAGS+= -Wall -DCOLORS + CC=gcc + LIBS=-lsocket -lnsl -lresolv + MOBJS=util.o getpost.o header.o parseform.o hash.o network.o parselinks.o cookies.o webfuzzer.o +@@ -13,10 +13,10 @@ + default: webfuzzer + + webfuzzer: main.c $(MOBJS) +- $(CC) $(CFLAGS) -o webfuzzer main.c $(MOBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o webfuzzer main.c $(MOBJS) + + sunos: main.c $(MOBJS) +- $(CC) $(CFLAGS) -o webfuzzer main.c $(MOBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o webfuzzer main.c $(MOBJS) $(LIBS) + + clean: + rm -rf *.o webfuzzer core diff --git a/net-analyzer/webfuzzer/files/webfuzzer-0.2.0-fno-common.patch b/net-analyzer/webfuzzer/files/webfuzzer-0.2.0-fno-common.patch new file mode 100644 index 000000000000..ca40c4ee4f81 --- /dev/null +++ b/net-analyzer/webfuzzer/files/webfuzzer-0.2.0-fno-common.patch @@ -0,0 +1,37 @@ +--- a/webfuzzer.h ++++ b/webfuzzer.h +@@ -30,11 +30,11 @@ + /** + ** GLOBAL HASHTABLES + **/ +-struct node * HTlinks[ HT_SIZE ]; +-struct node * HTforms[ HT_SIZE ]; +-struct node * HTusers[ HT_SIZE ]; +-struct node * HTtools[ HT_SIZE ]; +-struct node * HTcookies[ HT_SIZE ]; ++extern struct node * HTlinks[ HT_SIZE ]; ++extern struct node * HTforms[ HT_SIZE ]; ++extern struct node * HTusers[ HT_SIZE ]; ++extern struct node * HTtools[ HT_SIZE ]; ++extern struct node * HTcookies[ HT_SIZE ]; + + #define VERSION "0.2.0" + #define BANNER GREEN "Webfuzzer " DEF VERSION " (c) gunzip" +--- a/webfuzzer.c ++++ b/webfuzzer.c +@@ -29,6 +29,15 @@ + #include "technic.h" + + /** ++ ** GLOBAL HASHTABLES ++ **/ ++struct node * HTlinks[ HT_SIZE ]; ++struct node * HTforms[ HT_SIZE ]; ++struct node * HTusers[ HT_SIZE ]; ++struct node * HTtools[ HT_SIZE ]; ++struct node * HTcookies[ HT_SIZE ]; ++ ++/** + ** PROTOTYPES + **/ + diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild new file mode 100644 index 000000000000..66622a2b52db --- /dev/null +++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Poor man's web vulnerability scanner" +HOMEPAGE="http://gunzip.altervista.org/g.php?f=projects" +SRC_URI="http://gunzip.altervista.org/webfuzzer/webfuzzer-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S=${WORKDIR}/devel +PATCHES=( + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-fno-common.patch +) + +src_compile() { + emake CC=$(tc-getCC) +} + +src_install() { + dodoc CHANGES README TODO + dobin webfuzzer +} diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 016b05f27989..b2cecc057a56 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -5,11 +5,7 @@ AUX wireshark-99999999-about_dialog-plugins_add_description.patch 758 BLAKE2B cd AUX wireshark-99999999-androiddump-wsutil.patch 428 BLAKE2B 1385ce244836fa79c88d885616754c3645b6b658eb2e43988137a651dc3cdd34e21064ffa3b9ccf61011cc8542a5ad8ef817c497a679ef0aae2d7ba463ab2f61 SHA512 6f5dcf91cadc96272f8b9e7002319dc3c91b2a2495477da0102b87ba73a3240fea29c6c9ea655953290d4f6ed1799c049ec23b0b0cff498e2b7b6e78f49f784e AUX wireshark-99999999-qtsvg.patch 160 BLAKE2B f282867fc9cf3d770fb6abb5e6e9b471e3a117e216d3b0e1ba370e1bda3346fc041bedb8d14813dd17fea72441c5cd49a192ecd5fa864dedde88154e729d73fb SHA512 d5e78204767db49b5da6295418cdbb242f91181348fea8042e6ed7fd4b82b19ddef91f0ac10e1f3b7a0f9316a0a8dc7ba0a9b5fb3550dcd7c8814c92989d902e AUX wireshark-99999999-ui-needs-wiretap.patch 211 BLAKE2B f27c7ecdc3ee769020ad5d361fb335e6d70bcedb6ff0d19b48df2c1739b636f5585d329d50a9da0c741caed7c42cdc758668312b851d4eec440d782e2e9b1d24 SHA512 5ad342a062c560f729a7ec2b667aa88e2b9b3c6d547d9ecb96e3dc30224a4d766d1bc8806b08f608c5514309cc8bdf6903f39e232afe21003afe9f1e88082ea3 -DIST wireshark-3.0.3.tar.xz 30923980 BLAKE2B 05f29f55061d0bed9be284e145d260fca5e0051893c044b1389e1389f2c9865c7ec4c548ea040c6bd853d4fe1c482c5c86fdb23aa79d588ad34b91ed1901bcf0 SHA512 78d4aa68e47a72b641cb2a694028de743c195a41c42fb58f510402581a213c1239f63cad1f9163b13d64608fcedf64c7367a4888021b80613cb7e9a6ddbf8750 -DIST wireshark-3.0.7.tar.xz 30851928 BLAKE2B 98d31a260b2f5f74a567161e9dc0c136bb6bb29bcd4fc303f099c8b1379668194c2463e0661041061fe4c462db20c846694beae9286d322ce887332cce45341b SHA512 64e242510865ca69e688677e3ee1f72d3efa2155f07bc1aacc6de19ffab06f26b1ef8a3f91a90e91a6612b10d75651aea6400f8c5852e6a7e82e5d3f3e88e031 DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530 -EBUILD wireshark-3.0.3.ebuild 6555 BLAKE2B 15e190ef89a4ec08342d68ae383b100294d5e63a9f5ada2bbd895419f9aca1c0d9008ba02e8e22a5c23f5d7dd1c63d248de6d8ab8d24a1320ee637801786b661 SHA512 e4e20eb5b47aa02831626969d93672798dd460dcea865818b840d7b9f18f1d2a83b14d4bacb81543eb999f838c429536605cc9a478fff069e9ee4d6241da3387 -EBUILD wireshark-3.0.7.ebuild 6593 BLAKE2B a296ff8807c208aa809e5aca04a7e2c9b1ad30f8287eb6c5dd765a34771f67a3410dfe76d2f73793958ccdc93c95ffa0d8cd0d80a96196c0e8b39ebaef1710b7 SHA512 761798113a2db0ce1c37c70f115987c60e5a99bde42ca85662ba141108d857d94de05e9c0b37d4a4c9b4a02e59a3389b30f56b0490a6b707e580ec033af672f9 -EBUILD wireshark-3.2.1.ebuild 6787 BLAKE2B b6b458d9170660f4dbb04f21bf2c3bfaaa4de1398a06e7912ad876d957fb926def74042c0149b0f482d192c48c48d5749a3145ed0e442bbd7fb7101891251cad SHA512 a9049918fb39372acb1cd70743948d12092af48dac36984d5b47e13e0e5c59ab35bbaa33aff366998b41d899b651048e22b4c061cd8feb20449015b6b30e585d +EBUILD wireshark-3.2.1.ebuild 6785 BLAKE2B af47ab8bfc94e3b9dcedf61a38a8abfda54435a32640a94603085364bc68b16323d2e01a8b5293c80d1563f7d934162cad4002c5feae6ba9a3f10a795397ebbe SHA512 0e3ee73c443e12a7ab37364ff0b65473c26121bb3eccd47c3bce2213299da41d45faf27937c0a601411ecebe8ead91ed8286531ee15ba3483f33386ccc84b31f EBUILD wireshark-99999999.ebuild 6473 BLAKE2B 90f269e669b6510bec652d255cd7ed799f43d278262519ca5ea2902fcb38a7f631a01e9596b0aded3412971df16e8bc9bd36664dc757f2164f75c8a2c0294653 SHA512 aaf738de7189ab83ac74b9140693089fb68b22f4afd910454c0bb1ac1b459c27005a67be6266e4c663f213868ea7d79ee1636d4696e09f604f63f3f6fc94b5dc -MISC metadata.xml 4963 BLAKE2B b3c0a51c2ffc96313fe46be2f4b970c0a22d7b479a3701a717531f7b9c46ff5b00b1d3a29a54295abb90989226afb679f2d4842c2ade5f4f1c2d7923121591b8 SHA512 03cdfa1a78a23ae572eb0eacf787b1edba135541ab94d899dad77c6f0d482d9303fa0168033a3a60a8e12dd54506999ea5bd323dc0a90c58d87d8640bda139d2 +MISC metadata.xml 4887 BLAKE2B fe155238f794922efa1707256697726e556138179e431ca65376fa66c9904ef1cdbbe6018b583f61af3969be618e90b999969da92ce1b782f30f412b0c8305ca SHA512 40e145145120e0301aae8438d8b8782d2414946ac80f5e3d051261eb9372b823a74e4f779d5c4413fe9eb833c2f48e149ca64259f7498bb97275eadc0238a7b3 diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 651879bc6f82..95f198ad6c4a 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -27,7 +27,6 @@ can be applied to the packet list for quick, intuitive analysis, 12) output can be exported to XML, PostScript®, CSV, or plain text. </longdescription> <use> -<flag name="adns">Use <pkg>net-dns/c-ares</pkg> to resolve DNS names</flag> <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> <flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> <flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag> diff --git a/net-analyzer/wireshark/wireshark-3.0.3.ebuild b/net-analyzer/wireshark/wireshark-3.0.3.ebuild deleted file mode 100644 index 6879b34e8a9d..000000000000 --- a/net-analyzer/wireshark/wireshark-3.0.3.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="alpha" -IUSE=" - adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap - +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd - smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark - +udpdump zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - dev-libs/libgcrypt:0 - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - netlink? ( dev-libs/libnl:3 ) - pcap? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - sshdump? ( >=net-libs/libssh-0.6 ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) - ${PYTHON_DEPS} -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} -" -BDEPEND=" - !<perl-core/Pod-Simple-3.170 - !<virtual/perl-Pod-Simple-3.170 - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch - "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch - "${FILESDIR}"/${PN}-99999999-qtsvg.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_configure() { - local mycmakeargs - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup 'python3*' - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_CARES=$(usex adns) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - ) - - cmake-utils_src_configure -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; then - local s - for s in 16 32 48 64 128 256 512 1024; do - insinto /usr/share/icons/hicolor/${s}x${s}/apps - newins image/wsicon${s}.png wireshark.png - done - for s in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes - newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" - ewarn "that only trusted users are allowed to sniff your traffic." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-3.0.7.ebuild b/net-analyzer/wireshark/wireshark-3.0.7.ebuild deleted file mode 100644 index 0813a4658f42..000000000000 --- a/net-analyzer/wireshark/wireshark-3.0.7.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit fcaps flag-o-matic multilib python-r1 qmake-utils user xdg-utils cmake-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86" -IUSE=" - adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap - +netlink +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd - smi snappy spandsp sshdump ssl sdjournal +text2pcap tfshark +tshark - +udpdump zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - dev-libs/libgcrypt:0 - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - netlink? ( dev-libs/libnl:3 ) - pcap? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - sshdump? ( >=net-libs/libssh-0.6 ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) - ${PYTHON_DEPS} -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} -" -BDEPEND=" - !<perl-core/Pod-Simple-3.170 - !<virtual/perl-Pod-Simple-3.170 - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch - "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch - "${FILESDIR}"/${PN}-99999999-qtsvg.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_configure() { - local mycmakeargs - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup 'python3*' - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_CARES=$(usex adns) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - ) - - cmake-utils_src_configure -} - -src_test() { - cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; then - local s - for s in 16 32 48 64 128 256 512 1024; do - insinto /usr/share/icons/hicolor/${s}x${s}/apps - newins image/wsicon${s}.png wireshark.png - done - for s in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes - newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" - ewarn "that only trusted users are allowed to sniff your traffic." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild b/net-analyzer/wireshark/wireshark-3.2.1.ebuild index 521ee2a97f08..2427bff3fd55 100644 --- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild +++ b/net-analyzer/wireshark/wireshark-3.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc64 x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86" IUSE=" androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest index 0035ce2df986..282d14232bca 100644 --- a/net-analyzer/yersinia/Manifest +++ b/net-analyzer/yersinia/Manifest @@ -1,7 +1,9 @@ AUX yersinia-0.7.1-no-ncurses.patch 330 BLAKE2B 86c2cb84542012c6424fdcae398e07769647bcdda300d6efdbb263451c8765e23cd272f76e4e0e84751272df3de46a77b32fd2321a0ab3bc70cc8199b457adf6 SHA512 c0a0ef6456727eaa0ae9ea50667e04a72afb01c5b75d13965836657e4d1946df550840afd091ec58e8875b1a551df5966feb98b655183cec6dadaf4f5de23e4f AUX yersinia-0.7.3-tinfo.patch 563 BLAKE2B 6203584c6ff7b8e5438f57ad74b5b1ee7ee61d08b2bee21234fd4cfbb6aa37b9b1cb69b4a7af11e57434b215e346f6384a195ffdd47b9504fe6eb93b3d2109e9 SHA512 9a53505e050a9658f49809ad989d534e542fb0cf21ae70a9271b536a9a478a4306e49c9b0493ab522d5ffb82849eed043b212e399505c916792372a64d96c319 +AUX yersinia-9999-tinfo.patch 563 BLAKE2B ef2b554f82037dde165373fd6db71503ee124062cef4689062e7e1799f5ae26afd5758468f3c860690046aa4cb6e12dafd7ed3189a765a52565b5530a322d11a SHA512 a0edb5a47281bc66f0296914597fc4a9901f0e50640b43b6b31a30ddc4b6a5202220207039c3936f32769161f2c61d78afc5a3d7725d04ea41afd301312efa24 DIST yersinia-0.7.3.tar.gz 378124 BLAKE2B 032015045cd5683c8853504bd821ebb3decbeaeea933a14983eec6498de33db79771ddeb08934c6ddf82db620aba89c84ac8c369af25e7bc19d820395ba68b57 SHA512 60a1b58e6d76448e9332656645b468a6aa66afa0f45ea4b70a929651194a294b9b559bbe5fbacaeb475126e7ac248cd97c29f3177e5080286b2f551f1400d339 DIST yersinia-0.8.2.tar.gz 387889 BLAKE2B 67fe92b9cd1253874c61fa38c8e89e023f7d0ec3b83fe3001b5bc203d4033e36cb94b453ed56426b34d942036a143bd135f247466425337478f292797a433652 SHA512 2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd EBUILD yersinia-0.7.3.ebuild 980 BLAKE2B 09c0454f6e0cafef056d9fee8e9ca72f18b220939fd90130fcc4ab2320a063742af2ea9e1536af37cb753c29c7b9dc2006f84e04cd2e804de1a1431c05144e35 SHA512 df6a775cc7761a450f408439dda555f1864384516ee88b7406512b9eef3f6f3beda7cbb75ba4b070e98d4eeefdda152b3206fa04a5855b36e38bf1e874c706e3 -EBUILD yersinia-0.8.2.ebuild 1038 BLAKE2B 2be39326cbdbbad9900a22c612c699eac71818225e62f7ccd9de3045f9467be7646e2523531343819e8853cb06081059f965ae16899ff92bf48d700552b2dbcb SHA512 4385b3fe96879188680c992ed430e71d267cc892e222582962b1539c76c806bf0924c6eaa6314bd0ead7c2b1bdeb200870cfaac771b7d6cf235b7b840254743c +EBUILD yersinia-0.8.2.ebuild 1073 BLAKE2B 4a3e9b457adbc9b58858581562ce2a8e9b82f1ac268b85e4f8bac8c9c495a2b8dd226851d82e6c4f9adbed3818fdada84ef520a4d5215607392632737e3ec56c SHA512 b9bc63584bd24feff8a6344b44b68dbb099e43c60e2c2a6512a7c815c560adc7a8625455615db92c3a0d874341d7ce4ec332e52450f1a5e49460ddd577b4d552 +EBUILD yersinia-9999.ebuild 1049 BLAKE2B d39ae8cc02fc3c7196e09d2924278f06eaf7dc229dfd0209a6b60df39f4fd3316638471f608c6ddce08cfb3e1bfc40f6251a9b0ff95dfc395007884f4fd40a84 SHA512 73641e8b11c20b57f5d500da14d9943b39e93b70d8e2551181976c155a60f481c64da39dd250e86c8afc4cd552a291e0c76e7106c422bbbb04b6b6b969f7d8c5 MISC metadata.xml 513 BLAKE2B bf48a4589a561ec123290ebac68b7c500d17447c10b5c3fe67f39eca9566db84a968598071e84dab84cd159ee927c5e421070ef391a13ea43fe63927454b21ce SHA512 47b3fd2bc0c3c09d142113fcf3ac23256364a5737692f4c5a30f4980325c6a706d95c55d26365ac878e8a34c2a2471984c4c608ac4ecad2606836ea990bd468b diff --git a/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch b/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch new file mode 100644 index 000000000000..b5bf566c107d --- /dev/null +++ b/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch @@ -0,0 +1,27 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -467,6 +467,7 @@ + AC_DEFINE(HAVE_REMOTE_ADMIN) + fi + ++PKG_CHECK_MODULES(ncurses,ncurses) + + dnl Curses detection: Munged from Midnight Commander's configure.in + dnl +@@ -616,6 +617,16 @@ + AC_DEFINE(USE_NCURSES) + AC_DEFINE(HAS_CURSES) + has_curses=true ++ else ++ if test "$ncurses_LIBS" ; then ++ CURSES_LIBS="$ncurses_LIBS" ++ CURSES_INCLUDEDIR="$ncurses_CFLAGS" ++ search_ncurses=false ++ screen_manager="ncurses" ++ AC_DEFINE(USE_NCURSES) ++ AC_DEFINE(HAS_CURSES) ++ has_curses=true ++ fi + fi + ) + diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2.ebuild index 4ec918539c0f..669aa0df2290 100644 --- a/net-analyzer/yersinia/yersinia-0.8.2.ebuild +++ b/net-analyzer/yersinia/yersinia-0.8.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A framework for layer 2 attacks" HOMEPAGE="http://www.yersinia.net/" @@ -45,6 +45,8 @@ src_prepare() { } src_configure() { + append-cflags -fcommon + econf \ --enable-admin \ --with-pcap-includes=/usr/include \ diff --git a/net-analyzer/yersinia/yersinia-9999.ebuild b/net-analyzer/yersinia/yersinia-9999.ebuild new file mode 100644 index 000000000000..f2825d6f6f13 --- /dev/null +++ b/net-analyzer/yersinia/yersinia-9999.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools flag-o-matic git-r3 + +DESCRIPTION="A framework for layer 2 attacks" +HOMEPAGE="https://github.com/tomac/yersinia" +EGIT_REPO_URI="https://github.com/tomac/yersinia" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="gtk ncurses" + +RDEPEND=" + ncurses? ( >=sys-libs/ncurses-5.5:= ) + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf + =x11-libs/gtk+-2* + ) + >=net-libs/libnet-1.1.2 + >=net-libs/libpcap-0.9.4 +" +DEPEND=" + virtual/pkgconfig + ${RDEPEND} +" +DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch + "${FILESDIR}"/${PN}-9999-tinfo.patch +) + +src_prepare() { + default + + if ! use gtk; then + #bug #514802 + sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die + fi + + eautoreconf +} + +src_configure() { + append-cflags -fcommon + + econf \ + --enable-admin \ + --with-pcap-includes=/usr/include \ + $(use_with ncurses) \ + $(use_enable gtk) +} + +src_compile() { + emake CFLAGS="${CFLAGS}" +} |