[packages/hydra] - fix building on x32 - rel 3

baggins baggins at pld-linux.org
Tue Oct 23 23:46:34 CEST 2018


commit 1c40b52c79d015799fe1814b6ecb762740967dc7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 23 23:46:14 2018 +0200

    - fix building on x32
    - rel 3

 hydra.spec | 13 +++++++++++--
 x32.patch  | 13 +++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/hydra.spec b/hydra.spec
index a70318b..6734536 100644
--- a/hydra.spec
+++ b/hydra.spec
@@ -5,12 +5,13 @@ Summary:	Parallized network authentication cracker
 Summary(pl.UTF-8):	Zrównoleglony łamacz uwierzytelnień sieciowych
 Name:		hydra
 Version:	8.6
-Release:	2
+Release:	3
 License:	GPL
 Group:		Networking
 Source0:	https://github.com/vanhauser-thc/THC-Archive/blob/master/Tools/%{name}-%{version}.tar.gz?raw=true&/%{name}-%{version}.tar.gz
 # Source0-md5:	5d909cfea627a1f2482b82dfbd64956c
 Patch0:		%{name}-nonsl.patch
+Patch1:		x32.patch
 URL:		http://www.thc.org/thc-hydra/
 BuildRequires:	gtk+2-devel
 BuildRequires:	libssh2-devel
@@ -44,9 +45,17 @@ Wersja GTK+ programu hydra.
 %prep
 %setup -q
 %patch0 -p1
+%ifarch x32
+%patch1 -p1
+%endif
 
 %build
-%configure
+# this is not autoconf
+WSSL_LIB_PATH=%{_libdir} \
+./configure \
+	--prefix=%{_prefix} \
+	--fhs
+
 %{__make} \
 	CC="%{__cc}"
 
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..ab8b5a5
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,13 @@
+--- hydra-8.6/configure~	2018-10-23 23:42:15.000000000 +0200
++++ hydra-8.6/configure	2018-10-23 23:44:33.583059343 +0200
+@@ -131,9 +131,7 @@
+   fi
+ fi
+ LIBDIRS=`cat /etc/ld.so.conf /etc/ld.so.conf.d/* 2> /dev/null | grep -v '^#' | sort | uniq`
+-if [ "$SIXFOUR" = "64" ]; then
+-  LIBDIRS="$LIBDIRS /lib64 /usr/lib64 /usr/local/lib64 /opt/local/lib64"
+-fi
++LIBDIRS="$LIBDIRS /libx32 /usr/libx32 /usr/local/libx32 /opt/local/libx32"
+ if [ -d "/Library/Developer/CommandLineTools/usr/lib" ]; then
+   LIBDIRS="$LIBDIRS /Library/Developer/CommandLineTools/usr/lib /Library/Developer/CommandLineTools/lib"
+ fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hydra.git/commitdiff/1c40b52c79d015799fe1814b6ecb762740967dc7



More information about the pld-cvs-commit mailing list