<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b256f5c8102442a8271fde730f1b0af6e2b7e642">https://github.com/macports/macports-ports/commit/b256f5c8102442a8271fde730f1b0af6e2b7e642</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b256f5c8102 hydra: update to 9.3 & use app pg for xhydra
</span>b256f5c8102 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b256f5c8102442a8271fde730f1b0af6e2b7e642
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Mon Feb 7 22:13:11 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> hydra: update to 9.3 & use app pg for xhydra
</span>---
security/hydra/Portfile | 41 +++++++++++++++++++++++----------
security/hydra/files/patch-return.patch | 11 +++++++++
security/hydra/files/xHydra | 6 +++++
3 files changed, 46 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/Portfile b/security/hydra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f8271acb85..8203985bc6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/hydra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/hydra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,9 @@ PortSystem 1.0
</span>
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vanhauser-thc thc-hydra 9.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup vanhauser-thc thc-hydra 9.3 v
</span> name hydra
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories security net
platforms darwin
maintainers {i0ntempest @i0ntempest} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description \
</span> NNTP, VNC, ICQ, Socks5, PCNFS and more services within SSL \
support.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9f23778c9bedb1d1c0cdbd7bed059189c86627f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b0e281c30ce31de339da3383ebc0b7c912bbf45b541db56cbaf6afcf56c38b5b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 614307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 58119d22518fde54a859cb9e4b863acfbf442c34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 02e4c00fb80e3216821a2b1bdbd71afe6c0c62f567a2b73eb348f5825fe43da0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 829960
</span>
depends_lib-append port:libssh \
port:libidn \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,12 +43,12 @@ post-patch {
</span> if {[variant_isset mysql57] || [variant_isset mariadb]} {
reinplace "s|MYSQL_IPATH=\"\$i/mysql\"|MYSQL_IPATH=\"\$i\"|" ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-Wl,--allow-multiple-definition|-W|g" ${worksrcpath}/Makefile.am
</span> }
configure.args --disable-xhydra
build.env-append CC=${configure.cc}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Back port https://github.com/vanhauser-thc/thc-hydra/commit/e5996654ed48b385bc7f842d84d8b2ba72d29be1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-return.patch
</span>
pre-destroot {
reinplace "s|/man/man1|/share/man/man1|g" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,41 +58,58 @@ pre-destroot {
</span> CHANGES \
LICENSE \
LICENSE.OPENSSL \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README \
</span> ${docdir}
}
variant xhydra description {Add xhydra GUI} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:pkgconfig
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-delete --disable-xhydra
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span> reinplace "s|-Wl,--allow-multiple-definition|-W|g" ${worksrcpath}/hydra-gtk/configure
}
patchfiles-append patch-hydra-gtk__make_xhydra.sh-fail-if-xhydra-fails.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.name xHydra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.executable ${filespath}/xHydra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.icon ${worksrcpath}/xhydra.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.identifier com.vanhauser-thc.xhydra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/xHydra.app/Contents/MacOS/xHydra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql96 conflicts postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql96 conflicts postgresql12 postgresql13 postgresql14 \
</span> description {Add support for PostgreSQL 9.6} {
depends_lib-append port:postgresql96
set incdir "${incdir} ${prefix}/include/postgresql96"
set libdir "${libdir} ${prefix}/lib/postgresql96"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql12 conflicts postgresql96 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql12 conflicts postgresql96 postgresql13 postgresql14 \
</span> description {Add support for PostgreSQL 12} {
depends_lib-append port:postgresql12
set incdir "${incdir} ${prefix}/include/postgresql12"
set libdir "${libdir} ${prefix}/lib/postgresql12"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql13 conflicts postgresql96 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql13 conflicts postgresql96 postgresql12 postgresql14 \
</span> description {Add support for PostgreSQL 13} {
depends_lib-append port:postgresql13
set incdir "${incdir} ${prefix}/include/postgresql13"
set libdir "${libdir} ${prefix}/lib/postgresql13"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql14 conflicts postgresql96 postgresql12 postgresql13 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description {Add support for PostgreSQL 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incdir "${incdir} ${prefix}/include/postgresql14"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir "${libdir} ${prefix}/lib/postgresql14"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant mysql57 conflicts mariadb description {Add support for MySQL 5.7} {
depends_lib-append port:mysql57
set incdir "${incdir} ${prefix}/include/mysql57"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/files/patch-return.patch b/security/hydra/files/patch-return.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a420409dba2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/hydra/files/patch-return.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- hydra-http-form.c.old 2022-02-03 17:34:26.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ hydra-http-form.c 2022-02-07 21:40:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -259,7 +259,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptr_header_node existing_hdr, new_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!header || !value || !strlen(header) || !strlen(value))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // get to the last header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (cur_ptr = *ptr_head; cur_ptr && cur_ptr->next; cur_ptr = cur_ptr->next)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/files/xHydra b/security/hydra/files/xHydra
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..db1e6a88d25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/hydra/files/xHydra
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export LANG=${LANG:-C}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+export LC_ALL=${LC_ALL:-C}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PATH=@PREFIX@/bin:$PATH @PREFIX@/bin/xhydra --hydra-path @PREFIX@/bin/hydra
</span></pre><pre style='margin:0'>
</pre>