CVS commit: pkgsrc/security/hydra

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jan 27 13:37:31 UTC 2025

Modified Files:
        pkgsrc/security/hydra: Makefile distinfo
        pkgsrc/security/hydra/patches: patch-Makefile.am patch-configure
            patch-hydra-gtk_src_Makefile.in

Log Message:
hydra: fix linking on NetBSD

Clean up while here.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/security/hydra/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/hydra/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/hydra/patches/patch-Makefile.am \
    pkgsrc/security/hydra/patches/patch-configure \
    pkgsrc/security/hydra/patches/patch-hydra-gtk_src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/hydra/Makefile
diff -u pkgsrc/security/hydra/Makefile:1.114 pkgsrc/security/hydra/Makefile:1.115
--- pkgsrc/security/hydra/Makefile:1.114        Fri Dec 27 08:20:34 2024
+++ pkgsrc/security/hydra/Makefile      Mon Jan 27 13:37:31 2025
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2024/12/27 08:20:34 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.115 2025/01/27 13:37:31 wiz Exp $
 
 DISTNAME=      hydra-7.5
 PKGREVISION=   58
@@ -11,18 +10,13 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Login password cracker
 LICENSE=       gnu-agpl-v3
 
-.include "../../mk/bsd.prefs.mk"
-
 USE_TOOLS+=    pkg-config gmake
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= yes
 
 CONFIGURE_ENV+=        BUILDLINK_DIR=${BUILDLINK_DIR:Q}
 
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
-
-INSTALLATION_DIRS=     bin
-
-LDFLAGS.SunOS+=        -lsocket -lnsl
+LDFLAGS.SunOS+=                -lsocket -lnsl
+LDFLAGS.NetBSD+=       -pthread
 
 .include "options.mk"
 
@@ -30,5 +24,4 @@ LDFLAGS.SunOS+=       -lsocket -lnsl
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/libssh/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/hydra/distinfo
diff -u pkgsrc/security/hydra/distinfo:1.13 pkgsrc/security/hydra/distinfo:1.14
--- pkgsrc/security/hydra/distinfo:1.13 Tue Oct 26 11:17:10 2021
+++ pkgsrc/security/hydra/distinfo      Mon Jan 27 13:37:31 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:17:10 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/01/27 13:37:31 wiz Exp $
 
 BLAKE2s (hydra-7.5.tar.gz) = f3180e39fdd5c6386a89533d0421a489c80fe06b4db11b8fea0be6d3869c6a3b
 SHA512 (hydra-7.5.tar.gz) = b15ca32da6f1cd675d7149e9ef32fbb7b3d01e1fa2d648a1ed12bb6ae38d131f1123d84ff125d5f98677f62cddc97597d98d9cee662fcd305342c6f3fd2e10f8
 Size (hydra-7.5.tar.gz) = 681784 bytes
-SHA1 (patch-Makefile.am) = 9ce2a3c8acfa672786729c161010e56c1055055e
-SHA1 (patch-configure) = 4954b157e6fa201f0542279e961f0e39c66ca23c
-SHA1 (patch-hydra-gtk_src_Makefile.in) = 961b07aeb9e78cb4d5fa3e43213fd6164bcd08c3
+SHA1 (patch-Makefile.am) = 2debd6359e7ed3333497aa53c729f85ced3f59c9
+SHA1 (patch-configure) = 11db76c85c51a86cff3751dde97b8b2d1076526e
+SHA1 (patch-hydra-gtk_src_Makefile.in) = 5f79694febecbd032731100f28d2d0f539aba6f0
 SHA1 (patch-hydra-snmp.c) = 1c17271eae1cdb56b6c89cdb55ea34f31dc7b67f

Index: pkgsrc/security/hydra/patches/patch-Makefile.am
diff -u pkgsrc/security/hydra/patches/patch-Makefile.am:1.1 pkgsrc/security/hydra/patches/patch-Makefile.am:1.2
--- pkgsrc/security/hydra/patches/patch-Makefile.am:1.1 Fri Sep 20 23:10:12 2013
+++ pkgsrc/security/hydra/patches/patch-Makefile.am     Mon Jan 27 13:37:31 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-Makefile.am,v 1.1 2013/09/20 23:10:12 joerg Exp $
+$NetBSD: patch-Makefile.am,v 1.2 2025/01/27 13:37:31 wiz Exp $
+
+Add DESTDIR support.
 
 --- Makefile.am.orig   2013-09-20 22:00:03.000000000 +0000
 +++ Makefile.am
Index: pkgsrc/security/hydra/patches/patch-configure
diff -u pkgsrc/security/hydra/patches/patch-configure:1.1 pkgsrc/security/hydra/patches/patch-configure:1.2
--- pkgsrc/security/hydra/patches/patch-configure:1.1   Fri Sep 20 23:10:12 2013
+++ pkgsrc/security/hydra/patches/patch-configure       Mon Jan 27 13:37:31 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure,v 1.1 2013/09/20 23:10:12 joerg Exp $
+$NetBSD: patch-configure,v 1.2 2025/01/27 13:37:31 wiz Exp $
+
+Only look in buildlink path for libraries.
 
 --- configure.orig     2013-08-02 11:35:56.000000000 +0000
 +++ configure
Index: pkgsrc/security/hydra/patches/patch-hydra-gtk_src_Makefile.in
diff -u pkgsrc/security/hydra/patches/patch-hydra-gtk_src_Makefile.in:1.1 pkgsrc/security/hydra/patches/patch-hydra-gtk_src_Makefile.in:1.2
--- pkgsrc/security/hydra/patches/patch-hydra-gtk_src_Makefile.in:1.1   Fri Sep 20 23:10:12 2013
+++ pkgsrc/security/hydra/patches/patch-hydra-gtk_src_Makefile.in       Mon Jan 27 13:37:31 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-hydra-gtk_src_Makefile.in,v 1.1 2013/09/20 23:10:12 joerg Exp $
+$NetBSD: patch-hydra-gtk_src_Makefile.in,v 1.2 2025/01/27 13:37:31 wiz Exp $
+
+Correctly link against gtk2.
 
 --- hydra-gtk/src/Makefile.in.orig     2013-09-20 22:05:22.000000000 +0000
 +++ hydra-gtk/src/Makefile.in