Hello community,

here is the log from the commit of package john for openSUSE:Factory checked in 
at 2020-10-07 14:18:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/john (Old)
 and      /work/SRC/openSUSE:Factory/.john.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "john"

Wed Oct  7 14:18:37 2020 rev:35 rq:839938 version:1.9.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/john/john.changes        2020-06-12 
21:47:33.629024516 +0200
+++ /work/SRC/openSUSE:Factory/.john.new.4249/john.changes      2020-10-07 
14:18:45.769498873 +0200
@@ -1,0 +2,6 @@
+Tue Oct  6 18:02:51 UTC 2020 - simmpho...@opensuse.org
+
+- Add cl-device.patch to handle systems that already defined
+  CL_DEVICE_TOPOLOGY_AMD  gh#4331
+
+-------------------------------------------------------------------

New:
----
  cl-device.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ john.spec ++++++
--- /var/tmp/diff_new_pack.toOEGO/_old  2020-10-07 14:18:46.541499487 +0200
+++ /var/tmp/diff_new_pack.toOEGO/_new  2020-10-07 14:18:46.545499490 +0200
@@ -33,6 +33,8 @@
 Source7:        relbench.8
 Source8:        https://www.openwall.com/john/k/%{jumboversion}.tar.xz
 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:  gmp-devel
 BuildRequires:  libpcap-devel
@@ -53,6 +55,7 @@
 cd %{jumboversion} && cp -a ./* ..
 cd ..
 rm -r %{jumboversion}
+%patch0 -p1
 # 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#^(\#define JOHN_SYSTEMWIDE_EXEC)\s.+$#$1\t\"%{johndir}\"#g' 
$RPM_BUILD_DIR/%{name}-%{version}/src/params.h

++++++ cl-device.patch ++++++
--- 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;




Reply via email to