diff --git a/app-forensics/mysql-magic/mysql-magic-9999.ebuild b/app-forensics/mysql-magic/mysql-magic-9999.ebuild index 392a01043..403ae7543 100644 --- a/app-forensics/mysql-magic/mysql-magic-9999.ebuild +++ b/app-forensics/mysql-magic/mysql-magic-9999.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="dump mysql client password from memory" HOMEPAGE="https://github.com/hc0d3r/mysql-magic" EGIT_REPO_URI="https://github.com/hc0d3r/mysql-magic.git" -LICENSE="" +LICENSE="MIT" SLOT="0" KEYWORDS="" diff --git a/app-fuzz/dotdotpwn/Manifest b/app-fuzz/dotdotpwn/Manifest index 742aeddf3..38906e9c0 100644 --- a/app-fuzz/dotdotpwn/Manifest +++ b/app-fuzz/dotdotpwn/Manifest @@ -1,2 +1 @@ -DIST dotdotpwn-3.0.2.tar.gz 50440 SHA256 a74b4010a6171cc58d9881b0f2b1b0ac1f4f637386a0cbc62463e7ae227981d5 SHA512 2621e6fd45b2ace56d83d634ee702fce4ec0dec5fd8819bd33ecfa2b5fa286249744377931a512c574f907426fdfdf4a1069f46b07a83b73a1bc00f1045cc973 WHIRLPOOL 9e9883a0659f23de46ec0bea0b6e7e4e615f69502df1b7987f9c2ef56a001f031f53737c2a4f7951b9142358f7891c2ba4451d9c992a86f13d0f637f696b6efe -DIST dotdotpwn-v3.0.tar.gz 50343 SHA256 7c954b9db834e02e36acbc4ebda32cfec3049f30d94668702004db28f42c7afe +DIST dotdotpwn-3.0.2.tar.gz 50440 BLAKE2B 85000525157d99b7842ccb361ac5fa2646d63c957f9f877ebd86973090bbe0d27a2c57e6aeba36ed7e660db28334b97d8659e11e9ba29c3352581f9bb20a8497 SHA512 2621e6fd45b2ace56d83d634ee702fce4ec0dec5fd8819bd33ecfa2b5fa286249744377931a512c574f907426fdfdf4a1069f46b07a83b73a1bc00f1045cc973 diff --git a/app-fuzz/dotdotpwn/dotdotpwn-3.0.2.ebuild b/app-fuzz/dotdotpwn/dotdotpwn-3.0.2.ebuild index a96e6c568..0a2e627e0 100644 --- a/app-fuzz/dotdotpwn/dotdotpwn-3.0.2.ebuild +++ b/app-fuzz/dotdotpwn/dotdotpwn-3.0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils @@ -28,7 +28,7 @@ RDEPEND="dev-lang/perl #} src_prepare() { - epatch "${FILESDIR}"/homedir.patch + eapply "${FILESDIR}"/homedir.patch sed -i -e 's:DotDotPwn/User-Agents.txt:/etc/dotdotpwn/User-Agents.txt:' \ DotDotPwn/HTTP.pm || die diff --git a/app-fuzz/dotdotpwn/dotdotpwn-3.0.ebuild b/app-fuzz/dotdotpwn/dotdotpwn-3.0.ebuild deleted file mode 100644 index 1718ca15c..000000000 --- a/app-fuzz/dotdotpwn/dotdotpwn-3.0.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -DESCRIPTION="The Directory Traversal Fuzzer." -HOMEPAGE="http://dotdotpwn.blogspot.com" -SRC_URI="http://www.brainoverflow.org/code/${PN}-v${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="os-detection" - -RDEPEND="dev-lang/perl - perl-core/Switch - dev-libs/openssl dev-perl/Net-SSLeay - perl-core/Time-HiRes - app-portage/g-cpan - os-detection? ( net-analyzer/nmap )" - -S=${WORKDIR}/${PN}-v${PV} - -perl_site_lib() { - eval "$(perl -V:sitelib )" - SITE_LIB=${sitelib} -} - -src_prepare() { - sed -i -e 's:Reports:/etc/dotdotpwn/Reports:g' \ - dotdotpwn.pl || die - - sed -i -e 's:retrieved_files:/etc/dotdotpwn/retrieved_files:' \ - DotDotPwn/FTP.pm || die - - sed -i -e 's:retrieved_files:/etc/dotdotpwn/retrieved_files:' \ - DotDotPwn/TFTP.pm || die - - sed -i -e 's:DotDotPwn/User-Agents.txt:/etc/dotdotpwn/User-Agents.txt:' \ - DotDotPwn/HTTP.pm || die - - sed -i -e 's:DotDotPwn/User-Agents.txt:/etc/dotdotpwn/User-Agents.txt:' \ - DotDotPwn/HTTP_Url.pm || die -} - -pkg_setup(){ - PERL_MM_USE_DEFAULT=1 cpan -i HTTP::Lite - PERL_MM_USE_DEFAULT=1 cpan -i Net::FTP - PERL_MM_USE_DEFAULT=1 cpan -i TFTP - PERL_MM_USE_DEFAULT=1 cpan -i IO::Socket - PERL_MM_USE_DEFAULT=1 cpan -i Getopt::Std -} - -src_compile() { - einfo "nothing to compile" - true -} - -src_install() { - perl_site_lib - insinto ${SITE_LIB} - doins -r DotDotPwn || die "install DotDotPwn packages failed" - - insinto /etc/dotdotpwn - doins *.txt || die "install info and howto data failed" - doins DotDotPwn/User-Agents.txt || die "install user-agents file failed" - doins -r retrieved_files || die "install retrieved_files dir failed" - - insinto /etc/dotdotpwn - doins -r Reports || die "install Reports dir failed" - fperms 777 /etc/dotdotpwn/Reports - - newbin dotdotpwn.pl dotdotpwn || die "install failed" -} diff --git a/app-fuzz/dotdotpwn/files/homedir.patch b/app-fuzz/dotdotpwn/files/homedir.patch index 98b24dc67..59434cfe4 100644 --- a/app-fuzz/dotdotpwn/files/homedir.patch +++ b/app-fuzz/dotdotpwn/files/homedir.patch @@ -1,5 +1,5 @@ ---- dotdotpwn.pl.orig 2016-11-10 05:33:48.000000000 +0800 -+++ dotdotpwn.pl 2017-04-22 12:44:51.000000000 +0800 +--- a/dotdotpwn.pl 2016-11-10 05:33:48.000000000 +0800 ++++ b/dotdotpwn.pl 2017-04-22 12:44:51.000000000 +0800 @@ -217,10 +217,15 @@ our $report; diff --git a/app-fuzz/dotdotpwn/metadata.xml b/app-fuzz/dotdotpwn/metadata.xml new file mode 100644 index 000000000..e1ef23653 --- /dev/null +++ b/app-fuzz/dotdotpwn/metadata.xml @@ -0,0 +1,11 @@ + + + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Add support for OS detection + + diff --git a/app-fuzz/protos/Manifest b/app-fuzz/protos-bin/Manifest similarity index 100% rename from app-fuzz/protos/Manifest rename to app-fuzz/protos-bin/Manifest diff --git a/app-fuzz/protos/files/protos b/app-fuzz/protos-bin/files/protos similarity index 100% rename from app-fuzz/protos/files/protos rename to app-fuzz/protos-bin/files/protos diff --git a/app-fuzz/protos-bin/metadata.xml b/app-fuzz/protos-bin/metadata.xml new file mode 100644 index 000000000..7e7a6f776 --- /dev/null +++ b/app-fuzz/protos-bin/metadata.xml @@ -0,0 +1,17 @@ + + + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Include DNS + Include H.225.0 + Include HTTP-reply + Include ISAKMP + Include LDAP + Include SIP + Include SNMP + + diff --git a/app-fuzz/protos/protos-1.1-r1.ebuild b/app-fuzz/protos-bin/protos-bin-1.1-r1.ebuild similarity index 89% rename from app-fuzz/protos/protos-1.1-r1.ebuild rename to app-fuzz/protos-bin/protos-bin-1.1-r1.ebuild index bac21615b..6a2ec77bc 100644 --- a/app-fuzz/protos/protos-1.1-r1.ebuild +++ b/app-fuzz/protos-bin/protos-bin-1.1-r1.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: /root/portage/app-fuzz/protos/protos-1.0.ebuild,v 1.1.1.1 2006/03/08 18:55:18 grimmlin Exp $ + +EAPI=7 HTTP_VER="r1" LDAP_VER="r1" @@ -10,7 +11,7 @@ H2250_VER="r2" ISAKMP_VER="r2" DNS_VER="r1" -DESCRIPTION="The protos fuzzing collection, containing http-reply, ldapv3, snmpv1, sip, h2250v4 and isakmp" +DESCRIPTION="The PROTOS fuzzing collection" HOMEPAGE="http://www.ee.oulu.fi/research/ouspg/protos/" SRC_URI="http? ( https://www.ee.oulu.fi/roles/ouspg/PROTOS_Test-Suite_c05-http-reply?action=AttachFile&do=get&target=c05-http-reply-${HTTP_VER}.jar ) ldap? ( https://www.ee.oulu.fi/roles/ouspg/PROTOS_Test-Suite_c06-ldapv3?action=AttachFile&do=get&target=c06-ldapv3-enc-${LDAP_VER}.jar @@ -31,7 +32,8 @@ SLOT="0" KEYWORDS="~x86" IUSE="http ldap snmp sip h2250 isakmp dns" -DEPEND="virtual/jre" +DEPEND="virtual/jre:*" +RDEPEND="${DEPEND}" src_unpack () { einfo "Nothing to unpack" diff --git a/app-fuzz/slowhttptest/files/1.4-add-includes.patch b/app-fuzz/slowhttptest/files/1.4-add-includes.patch index ea5841fe1..82f2a9c78 100644 --- a/app-fuzz/slowhttptest/files/1.4-add-includes.patch +++ b/app-fuzz/slowhttptest/files/1.4-add-includes.patch @@ -1,5 +1,5 @@ ---- src/slowsocket.cc 2012-07-09 00:46:57.189374024 +0200 -+++ src/slowsocket.cc 2012-07-09 00:47:10.448861586 +0200 +--- a/src/slowsocket.cc 2012-07-09 00:46:57.189374024 +0200 ++++ b/src/slowsocket.cc 2012-07-09 00:47:10.448861586 +0200 @@ -40,6 +40,8 @@ #include "slowsocket.h" #include "slowurl.h" @@ -9,8 +9,8 @@ namespace slowhttptest { SlowSocket::SlowSocket() : sockfd_(-1), ---- src/slowhttptestmain.cc 2012-07-09 00:43:46.223420938 +0200 -+++ src/slowhttptestmain.cc 2012-07-09 00:46:04.914727611 +0200 +--- a/src/slowhttptestmain.cc 2012-07-09 00:43:46.223420938 +0200 ++++ b/src/slowhttptestmain.cc 2012-07-09 00:46:04.914727611 +0200 @@ -35,6 +35,8 @@ #include "slowlog.h" #include "slowhttptest.h" @@ -20,8 +20,8 @@ #define DEFAULT_URL "http://localhost/" static void info() { ---- src/slowhttptest.cc 2012-07-09 00:58:31.379212387 +0200 -+++ src/slowhttptest.cc 2012-07-09 00:58:43.038761781 +0200 +--- a/src/slowhttptest.cc 2012-07-09 00:58:31.379212387 +0200 ++++ b/src/slowhttptest.cc 2012-07-09 00:58:43.038761781 +0200 @@ -48,6 +48,8 @@ #include "slowstats.h" #include "text-generator.h" diff --git a/app-fuzz/slowhttptest/files/1.5-ldflags.patch b/app-fuzz/slowhttptest/files/1.5-ldflags.patch index 675ad61e4..26f121e1f 100644 --- a/app-fuzz/slowhttptest/files/1.5-ldflags.patch +++ b/app-fuzz/slowhttptest/files/1.5-ldflags.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig 2013-01-15 07:34:10.000000000 +0800 -+++ src/Makefile.in 2013-01-15 07:38:31.913442442 +0800 +--- a/src/Makefile.in 2013-01-15 07:34:10.000000000 +0800 ++++ b/src/Makefile.in 2013-01-15 07:38:31.913442442 +0800 @@ -97,7 +97,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ diff --git a/app-fuzz/slowhttptest/metadata.xml b/app-fuzz/slowhttptest/metadata.xml new file mode 100644 index 000000000..4fa8ff351 --- /dev/null +++ b/app-fuzz/slowhttptest/metadata.xml @@ -0,0 +1,8 @@ + + + + + proxy-maint@gentoo.org + Proxy Maintainers + + diff --git a/app-fuzz/slowhttptest/slowhttptest-1.7_p20170811.ebuild b/app-fuzz/slowhttptest/slowhttptest-1.7_p20170811.ebuild index 5ce16ef7d..a80e440fc 100644 --- a/app-fuzz/slowhttptest/slowhttptest-1.7_p20170811.ebuild +++ b/app-fuzz/slowhttptest/slowhttptest-1.7_p20170811.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils @@ -12,7 +12,7 @@ SRC_URI="https://github.com/shekyan/slowhttptest/archive/${COMMIT}.tar.gz -> ${P LICENSE="Apache-2.0" SLOT="0" -KEYWORDS=" ~arm amd64 x86" +KEYWORDS="amd64 ~arm x86" IUSE="" DEPEND="dev-libs/openssl:=" @@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${PN}-${COMMIT}" src_prepare() { - epatch "${FILESDIR}"/1.4-add-includes.patch + eapply "${FILESDIR}"/1.4-add-includes.patch eapply_user } diff --git a/app-fuzz/slowhttptest/slowhttptest-1.8.1.ebuild b/app-fuzz/slowhttptest/slowhttptest-1.8.1.ebuild index af2be341b..5c0b65ecd 100644 --- a/app-fuzz/slowhttptest/slowhttptest-1.8.1.ebuild +++ b/app-fuzz/slowhttptest/slowhttptest-1.8.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils @@ -11,14 +11,14 @@ SRC_URI="https://github.com/shekyan/slowhttptest/archive/v${PV}.tar.gz -> ${P}.t LICENSE="Apache-2.0" SLOT="0" -KEYWORDS=" ~arm amd64 x86" +KEYWORDS="amd64 ~arm x86" IUSE="" DEPEND="dev-libs/openssl:=" RDEPEND="${DEPEND}" src_prepare() { - epatch "${FILESDIR}"/1.4-add-includes.patch + eapply "${FILESDIR}"/1.4-add-includes.patch eapply_user } diff --git a/profiles/pentoo/base/package.accept_keywords/app-fuzz b/profiles/pentoo/base/package.accept_keywords/app-fuzz index cec9e0362..1e6f815b3 100644 --- a/profiles/pentoo/base/package.accept_keywords/app-fuzz +++ b/profiles/pentoo/base/package.accept_keywords/app-fuzz @@ -6,7 +6,7 @@ app-fuzz/bss app-fuzz/fuzzer-server app-fuzz/http-fuzz app-fuzz/ohrwurm -app-fuzz/protos +~app-fuzz/protos-bin-1.1-r1 app-fuzz/smtp-fuzz app-fuzz/smudge app-fuzz/snmp-fuzzer