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

Accepting request 839887 from home:Simmphonie:branches:security

Browse Source 
- Fix typedef that already defined CL_DEVICE_TOPOLOGY_AMD gh#4331

OBS-URL: https://build.opensuse.org/request/show/839887
OBS-URL: https://build.opensuse.org/package/show/security/john?expand=0&rev=66
This commit is contained in:
Torsten Gruner
2020-10-06 18:52:33 +00:00
committed by Git OBS Bridge
parent 94e92a547e
commit d68fba8b9d
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cl-device.patch Normal file
View File

@@ -0,0 +1,12 @@
--- a/src/opencl_common.h
+++ b/src/opencl_common.h
@@ -81,6 +81,9 @@
#ifndef CL_DEVICE_TOPOLOGY_AMD
#define CL_DEVICE_TOPOLOGY_AMD 0x4037
+#endif
+
+#ifndef CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD
typedef union {
struct {
cl_uint type;

5
john.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 6 18:02:51 UTC 2020 - simmphonie@opensuse.org
- Fix typedef that already defined CL_DEVICE_TOPOLOGY_AMD gh#4331
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 12 08:06:37 UTC 2020 - Martin Pluskal <mpluskal@suse.com> Fri Jun 12 08:06:37 UTC 2020 - Martin Pluskal <mpluskal@suse.com>

3
john.spec
View File

@@ -33,6 +33,8 @@ Source6: mailer.8
Source7: relbench.8 Source7: relbench.8
Source8: https://www.openwall.com/john/k/%{jumboversion}.tar.xz 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
Patch0: cl-device.patch
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: gmp-devel BuildRequires: gmp-devel
BuildRequires: libpcap-devel BuildRequires: libpcap-devel
@@ -53,6 +55,7 @@ number of other hash types are supported to that end.
cd %{jumboversion} && cp -a ./* .. cd %{jumboversion} && cp -a ./* ..
cd .. cd ..
rm -r %{jumboversion} rm -r %{jumboversion}
%patch0 -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