Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package john for openSUSE:Factory checked in
at 2021-10-19 23:03:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/john (Old)
and /work/SRC/openSUSE:Factory/.john.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "john"
Tue Oct 19 23:03:44 2021 rev:38 rq:926092 version:1.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/john/john.changes 2021-06-09
21:53:16.922579543 +0200
+++ /work/SRC/openSUSE:Factory/.john.new.1890/john.changes 2021-10-19
23:03:54.749275268 +0200
@@ -1,0 +2,6 @@
+Tue Oct 12 15:55:35 UTC 2021 - Sarah Kriesch <sarah.krie...@opensuse.org>
+
+- Upstream patch for Big Endians in s390x-upstream.patch
+- Include johnswap.h in opencl_7z_fmt_plug.c with s390x.patch
+
+-------------------------------------------------------------------
New:
----
s390x-upstream.patch
s390x.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ john.spec ++++++
--- /var/tmp/diff_new_pack.sH3896/_old 2021-10-19 23:03:55.445275583 +0200
+++ /var/tmp/diff_new_pack.sH3896/_new 2021-10-19 23:03:55.449275585 +0200
@@ -37,6 +37,8 @@
Patch0: cl-device.patch
Patch1: john-1.9.0-jumbo-gcc10.patch
Patch2: john-1.9.0-jumbo-gcc11.patch
+Patch3: s390x-upstream.patch
+Patch4: s390x.patch
BuildRequires: dos2unix
BuildRequires: gmp-devel
BuildRequires: libpcap-devel
@@ -60,6 +62,9 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p0
+
# 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
++++++ s390x-upstream.patch ++++++
>From e90800f8000b502fa8d2d687df8a405749351523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claudio=20Andr=C3=A9?= <claudioandre...@gmail.com>
Date: Tue, 12 Oct 2021 11:41:12 -0300
Subject: [PATCH] S390
---
src/opencl_pbkdf2_hmac_sha1_fmt_plug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
b/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
index 23987a934..7eb3de333 100644
--- a/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
+++ b/src/opencl_pbkdf2_hmac_sha1_fmt_plug.c
@@ -226,7 +226,7 @@ static void *get_binary(char *ciphertext)
unsigned char *out = pbkdf2_hmac_sha1_binary(ciphertext);
#if !ARCH_LITTLE_ENDIAN
char *p = strrchr(ciphertext, '$') + 1;
- int len = strlen(p) / 2;
+ int i, len = strlen(p) / 2;
for (i = 0; i < len / sizeof(uint32_t); ++i) {
((uint32_t*)out)[i] = JOHNSWAP(((uint32_t*)out)[i]);
}
--
2.25.1
++++++ s390x.patch ++++++
--- src/opencl_7z_fmt_plug_copy.c 2021-10-17 18:24:14.112418452 +0200
+++ src/opencl_7z_fmt_plug.c 2021-10-17 18:25:35.984598919 +0200
@@ -40,6 +40,8 @@
#include "config.h"
#include "lzma/LzmaDec.h"
#include "lzma/Lzma2Dec.h"
+#include "johnswap.h"
+
#define FORMAT_LABEL "7z-opencl"
#define FORMAT_NAME "7-Zip"
