From b426a5cef3f0ebe3389686a1c145a834d3a1e120 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Sep 2022 10:40:04 +0100 Subject: gentoo auto-resync : 09:09:2022 - 10:40:04 --- net-analyzer/Manifest.gz | Bin 45058 -> 45051 bytes net-analyzer/hydra/Manifest | 4 +- .../hydra/files/hydra-9.4-implicit-func-decl.patch | 33 ++++++ net-analyzer/hydra/hydra-9.4.ebuild | 127 +++++++++++++++++++++ net-analyzer/hydra/hydra-9999999.ebuild | 121 -------------------- 5 files changed, 163 insertions(+), 122 deletions(-) create mode 100644 net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch create mode 100644 net-analyzer/hydra/hydra-9.4.ebuild delete mode 100644 net-analyzer/hydra/hydra-9999999.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 469e7aedf77a..5a9fca305551 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index ed57ce159f28..8872191f88f9 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,11 +1,13 @@ AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a AUX hydra-9.3-pcre2.patch 3854 BLAKE2B 3338fcae138b913008857db9e1678977d5809380e5e916b6b9f022b5e3c88f3030d401702fd0e59297916915ab9869e62113464e2a36b91e66605ea15d9b6cba SHA512 7cd1af834d6ad7fc120d600996bf13a8d6feca571b44bbf6194c4a0205e243b489aa8f80be4a21a5dbe19930b933fdeb56e76075649c1827384a1aeb2d46a977 +AUX hydra-9.4-implicit-func-decl.patch 1325 BLAKE2B 55f9c8fed3dd32e7049cdc59e592901ee40442d7ec71a00a7214ce6bc0543077711da7481345b8b112be5a52102cf42967f3b432f600db5818aec8c936bf5ca4 SHA512 50d09d1c2a2698303bd051143437c3c582418129ba589c23488707b1fbe7cbb36ee8e6295d1c2c71cf4ea43d94d97326166e4ada2af5a2d82b94799d60e84b75 AUX hydra-9999999-respect-cflags-more.patch 1241 BLAKE2B 6f0cab7a763d0eb1cee2e20ab5dc8889e45c3ada5ba1dd9be79a029f2d22ec8d027af18cb61ca22418f1662ba68d7bbf7dad2fcdffc05ce0471f06b7db14fa49 SHA512 b01bd45cecc90984bb1c97749d4c333973d72fea75719f9f1a7d848ce9fba1933a1cb8ff3b452699fad64b5ae716e6e1bc872b077fa2dcb36363de802c0b59b7 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322 DIST hydra-9.3.tar.gz 829856 BLAKE2B 5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54 SHA512 06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4 +DIST hydra-9.4.tar.gz 833465 BLAKE2B 2ba7f7e4a70c4f6c9dc4ec94d652ab7534cb0fb17b88412dfcf1e651d9f31af573ab9acd2d9cb698da6462f4744f53dfb8f87a437c32bebfa4f9a04f2f9136c0 SHA512 de5a1e73673fdc2f193cfb1aeec337c9d8faad52b06524850f352a797a4a5ef08cba8fc51da96fed1db01d141127e58c2aa874027f51c40a94a474de778d5241 EBUILD hydra-9.1-r1.ebuild 3564 BLAKE2B 181579f91649555a378c6ada4f88ecb177378c2c77c9bcc7f59410b93c7113aa9b93f0e9d3204bad420db9cbffe144bb74b0d62664f9c9a7db2bd1e3b8abc1dd SHA512 e8b588bdb0e290a082eb26749239fefc988aa003151dd7d8cfde04b8d4952a6667e3d133fd23bd1cb6a1e6bc5575272078e35f553e4b482228d415c51f303379 EBUILD hydra-9.2-r1.ebuild 3599 BLAKE2B 58ff03bfb0214373529ba1b6bbd9cc6b0f304f01b267d22e6d92a39a77553c49f8c6674528f0db6fc20fecbbcf32875154ec61bb164094568cf3f40dddd71460 SHA512 de54e80aad0c54891c0049503c2319ca9a6e81b35d8fdef6559e5eee14fa49bd28c538ff183a62fa275e4e50ac8247491ee6a77bfbcfb2f585ce23ec5c8005f9 EBUILD hydra-9.3-r1.ebuild 3913 BLAKE2B 736e7175b81d282703fdbfe63f53aa9fa2b7dff62f40c17f804498fec139e40b787d8d5681dc5bde484946a94792408add0d724cda06461ea1f77c7a4f7ee460 SHA512 69cef15abea195f7fdefd518bfdc68647ed5022438dbb9ac05463ac945171ee802227e0ecbe22a40581bf894780311fcc748f18850923e1032e522fd6ed9e0fc -EBUILD hydra-9999999.ebuild 3526 BLAKE2B 4ffc7aae9d712ca4fb31332fca52734a932e4e14d8050b15374039801c410f2739fe1b8ddd406abc62548662b5c655822007b83bf25d7bfefd88e1e3cac589f0 SHA512 ef96a56c78a0941354c8aa2fa130c0041267f5bfb0b928a7624e3752535430a2a1116cc277ce35eb9a5633750d69298f9b9445390836001d501f9ac9f4addc16 +EBUILD hydra-9.4.ebuild 3931 BLAKE2B 8facfee82014f462aaf1efa1d8b85e1c97e1a763394c2c1bd979650a98d382e1d15b435df02e9c0aa613bc7a7045e28a28d6966b7d93dd4f3774c26331a502d2 SHA512 232509cc0c85ac0d481d5b97a03fa95617469c6af3ac92236839515c1829c9c3ee139adbe1e1427890ddbfbb1ba15cc6e3d7b3059fefd62672eb5155f60709d6 MISC metadata.xml 584 BLAKE2B c408a4a825d860594a10c6ba9a562a5fb96344f2a02a5d7ff12622c986ebb2ba05eeff5a7a3c79c09a437c14fc7024df33196ccd7f6566325f2f7920afe2d545 SHA512 e548b8600a0b3d9a548b963c1b3dc6c917606942f165f7c0859ad7e877c21dbe677c964d54f9548e38452170c4a3b4872ec81436100ec7b55123628bf4383da8 diff --git a/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch b/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch new file mode 100644 index 000000000000..bf4dd61e33ce --- /dev/null +++ b/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch @@ -0,0 +1,33 @@ +https://github.com/vanhauser-thc/thc-hydra/pull/786 + +From 613bd02264dcc989eeeb77b83603d4c2f48f0bbc Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 9 Sep 2022 04:32:05 +0100 +Subject: [PATCH] Makefile.am: add -D_GNU_SOURCE for strcasestr +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +strcasestr is not a standard function and per +the man page, needs -D_GNU_SOURCE to be visible. + +Fixes a build error: +``` +hydra-rtsp.c:20:7: error: implicit declaration of function ‘strcasestr’; did you mean ‘strcasecmp’? [-Werror=implicit-function-declaration] + 20 | if (strcasestr(s, "401 Unauthorized") != NULL) { + | ^~~~~~~~~~ + | strcasecmp +``` + +Signed-off-by: Sam James +--- a/Makefile.am ++++ b/Makefile.am +@@ -5,6 +5,7 @@ WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversio + WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align + CFLAGS ?= -g + OPTS=-I. -O3 $(CFLAGS) -fcommon ++CPPFLAGS += -D_GNU_SOURCE + # -Wall -g -pedantic + LIBS=-lm + DESTDIR ?= + diff --git a/net-analyzer/hydra/hydra-9.4.ebuild b/net-analyzer/hydra/hydra-9.4.ebuild new file mode 100644 index 000000000000..156d8dd35936 --- /dev/null +++ b/net-analyzer/hydra/hydra-9.4.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo 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" +S="${WORKDIR}"/thc-${P} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle pcre postgres rdp libssh samba subversion zlib" + +RDEPEND=" + dev-libs/openssl:= + 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= ) + memcached? ( dev-libs/libmemcached[sasl] ) + mongodb? ( dev-libs/mongo-c-driver ) + mysql? ( dev-db/mysql-connector-c:0= ) + ncurses? ( sys-libs/ncurses:= ) + oracle? ( dev-db/oracle-instantclient[sdk] ) + pcre? ( dev-libs/libpcre2 ) + postgres? ( dev-db/postgresql:* ) + rdp? ( net-misc/freerdp ) + libssh? ( >=net-libs/libssh-0.4.0 ) + samba? ( net-fs/samba ) + subversion? ( dev-vcs/subversion ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-9.4-implicit-func-decl.patch +) + +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 + + # Needed to get GTK+ 3 change in configure.in (.in got updated, but + # configure not regen'd.) + #cd hydra-gtk || die + #sed -i -e 's:AC_INIT(configure.in):AC_INIT(configure.ac):' configure.in || die + #eautoreconf +} + +src_configure() { + # Note: the top level configure script is not autoconf-based + tc-export CC PKG_CONFIG + + 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 ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' + hydra_sed pcre '-lpcre2-8' '$( "${PKG_CONFIG}" --libs libpcre2-8 )' '-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 )' '-DLIBFREERDP' + # 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 samba '-lsmbclient' '$( "${PKG_CONFIG}" --libs smbclient )' '-DLIBSMBCLIENT' + hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' + hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' + + edo ./configure \ + $(usev !gtk '--disable-xhydra') \ + $(usev 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 deleted file mode 100644 index 1e7e5e715482..000000000000 --- a/net-analyzer/hydra/hydra-9999999.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit git-r3 toolchain-funcs - -DESCRIPTION="Parallelized network login hacker" -HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra" - -LICENSE="GPL-3" -SLOT="0" -IUSE=" - debug firebird gcrypt gtk idn memcached mongodb mysql 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= ) - dev-libs/openssl:0= - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - 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}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-9999999-respect-cflags-more.patch -) - -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 - - 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 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 )' '-DLIBFREERDP' - # 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 -} -- cgit v1.2.3