pool/john
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 878770 from security

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/878770
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/john?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger
2021-03-15 09:55:04 +00:00
committed by Git OBS Bridge
parent 60ec5b4868 f376b388de
commit c5330b9370
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
john-1.9.0-jumbo-gcc10.patch Normal file
View File

@@ -0,0 +1,21 @@
--- john-1.9.0-jumbo-1/src/ztex/pkt_comm/word_gen.h
+++ john-1.9.0-jumbo-1/src/ztex/pkt_comm/word_gen.h
@@ -32,7 +32,7 @@
//unsigned char magic; // 0xBB <- added by pkt_word_gen_new()
};
-struct word_gen word_gen_words_pass_by;
+extern struct word_gen word_gen_words_pass_by;
struct pkt *pkt_word_gen_new(struct word_gen *word_gen);
--- john-1.9.0-jumbo-1/src/ztex/ztex.h
+++ john-1.9.0-jumbo-1/src/ztex/ztex.h
@@ -159,7 +159,6 @@
int ztex_reset_cpu(struct ztex_device *dev, int r);
// firmware image loaded from an ihx (Intel Hex format) file.
-const int IHX_SIZE_MAX;
struct ihx_data {
short *data;
};

6
john.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 13 10:10:12 UTC 2021 - Dirk Müller <dmueller@suse.com>
- enable ztex support (fix usb dependency):
add john-1.9.0-jumbo-gcc10.patch to fix fcommon related build failures
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 6 18:02:51 UTC 2020 - simmphonie@opensuse.org Tue Oct 6 18:02:51 UTC 2020 - simmphonie@opensuse.org

7
john.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package john # spec file for package john
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -35,14 +35,15 @@ Source8: https://www.openwall.com/john/k/%{jumboversion}.tar.xz
Source9: https://www.openwall.com/john/k/%{jumboversion}.tar.xz.sign Source9: https://www.openwall.com/john/k/%{jumboversion}.tar.xz.sign
# PATCH-FIX-UPSTREAM cl-device.patch gh#openwall/john#4331 # PATCH-FIX-UPSTREAM cl-device.patch gh#openwall/john#4331
Patch0: cl-device.patch Patch0: cl-device.patch
Patch1: john-1.9.0-jumbo-gcc10.patch
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
BuildRequires: libusb-devel
BuildRequires: opencl-headers BuildRequires: opencl-headers
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(OpenCL) BuildRequires: pkgconfig(OpenCL)
BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
%description %description
@@ -56,6 +57,7 @@ cd %{jumboversion} && cp -a ./* ..
cd .. cd ..
rm -r %{jumboversion} rm -r %{jumboversion}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# adapt the configs # adapt the configs
perl -pi -e "s#Wordlist = (.*)#Wordlist = %{johndir}/password.lst#g" $RPM_BUILD_DIR/%{name}-%{version}/run/john.conf perl -pi -e "s#Wordlist = (.*)#Wordlist = %{johndir}/password.lst#g" $RPM_BUILD_DIR/%{name}-%{version}/run/john.conf
perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h perl -pi -e 's#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g' $RPM_BUILD_DIR/%{name}-%{version}/src/params.h
@@ -71,6 +73,7 @@ pushd src
%configure --with-systemwide \ %configure --with-systemwide \
--disable-openmp \ --disable-openmp \
--enable-fuzz \ --enable-fuzz \
--enable-ztex=yes \
--enable-experimental-code \ --enable-experimental-code \
--enable-pkg-config \ --enable-pkg-config \
%ifarch x86_64 %ifarch x86_64