Hello community,
here is the log from the commit of package hdjmod for openSUSE:Factory checked in at 2017-07-02 13:38:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hdjmod (Old)
and /work/SRC/openSUSE:Factory/.hdjmod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdjmod"
Sun Jul 2 13:38:41 2017 rev:16 rq:507550 version:1.28
Changes:
--------
--- /work/SRC/openSUSE:Factory/hdjmod/hdjmod.changes 2014-09-17 10:11:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.hdjmod.new/hdjmod.changes 2017-07-02 13:38:43.102491317 +0200
@@ -1,0 +2,12 @@
+Sat Jul 1 18:41:37 UTC 2017 - marix@marix.org
+
+- Added hdjmod_fix_buffer_overrun_in_device_name_handling.patch:
+ Fixes a potential buffer overrun in device name handling.
+
+-------------------------------------------------------------------
+Fri May 26 17:45:41 UTC 2017 - marix@marix.org
+
+- Added hdjmod_kernel_4.11.patch: Fixes build on Kernel 4.11 and
+ up.
+
+-------------------------------------------------------------------
New:
----
hdjmod_fix_buffer_overrun_in_device_name_handling.patch
hdjmod_kernel_4.11.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hdjmod.spec ++++++
--- /var/tmp/diff_new_pack.2miaqn/_old 2017-07-02 13:38:43.850385851 +0200
+++ /var/tmp/diff_new_pack.2miaqn/_new 2017-07-02 13:38:43.854385288 +0200
@@ -1,8 +1,8 @@
#
# spec file for package hdjmod
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2008-2014 Matthias Bach
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2008-2017 Matthias Bach
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,7 @@
%else
BuildRequires: %kernel_module_package_buildreqs
%endif
+BuildRequires: libelf-devel
Summary: Support for Hercules DJ Devices
License: GPL-2.0+
Group: System/Kernel
@@ -51,6 +52,10 @@
Patch7: hdjmod_kernel_3.7.patch
# PATCH-FIX-UPSTREAM hdjmod_kernel_3.16.patch marix@marix.org -- Fix build on kernel 3.16 and newer
Patch8: hdjmod_kernel_3.16.patch
+# PATCH-FIX-UPSTREAM hdjmod_kernel_4.11.patch marix@marix.org -- Fix build on kernel 4.11 and newer
+Patch9: hdjmod_kernel_4.11.patch
+# PATCH-FIX-UPSTREAM hdjmod_fix_buffer_overrun_in_device_name_handling.patch marix@marix.org -- Fix build on kernel 4.11 and newer
+Patch10: hdjmod_fix_buffer_overrun_in_device_name_handling.patch
%suse_kernel_module_package -p%_sourcedir/preamble
@@ -73,6 +78,8 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
set -- *
mkdir source
mv "$@" source/
++++++ hdjmod_fix_buffer_overrun_in_device_name_handling.patch ++++++
From: Matthias Bach
Date: 20117-07-01 20:40:00 +0200
Subject: Fix a buffer overrun
Upstream: to be done
The code messed up handling of the offset when calculating the
maximum number of bytes it can copy into a buffer at a certain
offset.
diff -Naru hdjmod-1.28o/device.c hdjmod-1.28/device.c
--- hdjmod-1.28o/device.c 2009-01-27 15:25:50.000000000 +0100
+++ hdjmod-1.28/device.c 2017-07-01 20:39:07.129497940 +0200
@@ -1769,7 +1769,7 @@
memset(shortname,0,sizeof(shortname));
snprintf(shortname,sizeof(shortname)-1,"Hercules ");
strncpy(shortname+strlen(shortname),
- card->shortname,sizeof(shortname)+strlen(shortname)-1);
+ card->shortname,sizeof(shortname)-strlen(shortname)-1);
memset(card->shortname,0,sizeof(card->shortname));
strncpy(card->shortname,shortname,sizeof(card->shortname)-1);
}
++++++ hdjmod_kernel_4.11.patch ++++++
From: Matthias Bach
Date: 20117-05-26 20:20:00 +0200
Subject: Fix compile on kernel 4.11
Upstream: to be done
The module no longer compiled on 4.11
diff -Naru hdjmod-1.28o/bulk.c hdjmod-1.28/bulk.c
--- hdjmod-1.28o/bulk.c 2009-01-27 15:25:50.000000000 +0100
+++ hdjmod-1.28/bulk.c 2017-05-26 20:00:46.941268724 +0200
@@ -37,6 +37,9 @@
#if ( LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24) )
#include
#endif
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) )
+#include
+#endif
#include
#include
#include
diff -Naru hdjmod-1.28o/configuration_manager.c hdjmod-1.28/configuration_manager.c
--- hdjmod-1.28o/configuration_manager.c 2009-01-27 15:25:50.000000000 +0100
+++ hdjmod-1.28/configuration_manager.c 2017-05-26 20:02:11.079953245 +0200
@@ -29,6 +29,9 @@
#if ( LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,24) )
#include
#endif
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0) )
+#include
+#endif
#include
#include
#include