Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dcraw for openSUSE:Factory checked
in at 2023-08-12 15:05:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dcraw (Old)
and /work/SRC/openSUSE:Factory/.dcraw.new.11712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcraw"
Sat Aug 12 15:05:40 2023 rev:40 rq:1102675 version:9.28.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/dcraw/dcraw.changes 2022-04-14
17:25:38.547275801 +0200
+++ /work/SRC/openSUSE:Factory/.dcraw.new.11712/dcraw.changes 2023-08-12
15:05:42.206314173 +0200
@@ -1,0 +2,5 @@
+Mon Aug 7 09:53:25 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- add dcraw-glibc-2.38.patch to fix prototype clash on memmem with glibc 2.38+
+
+-------------------------------------------------------------------
New:
----
dcraw-glibc-2.38.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dcraw.spec ++++++
--- /var/tmp/diff_new_pack.Be1eRA/_old 2023-08-12 15:05:43.162320349 +0200
+++ /var/tmp/diff_new_pack.Be1eRA/_new 2023-08-12 15:05:43.166320375 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dcraw
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,6 +47,7 @@
Patch4: dcraw-CVE-2018-5801.patch
Patch5: iowrappers.patch
Patch6: dcraw-CVE-2021-3624.patch
+Patch7: dcraw-glibc-2.38.patch
BuildRequires: gettext-runtime
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
@@ -68,6 +69,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing -fstack-protector-all"
++++++ dcraw-glibc-2.38.patch ++++++
Index: dcraw/parse.c
===================================================================
--- dcraw.orig/parse.c
+++ dcraw/parse.c
@@ -1213,7 +1213,7 @@ void parse_qt (int level, int end)
}
}
-char *memmem (char *haystack, size_t haystacklen,
+static char *my_memmem (char *haystack, size_t haystacklen,
char *needle, size_t needlelen)
{
char *c;
@@ -1239,8 +1239,8 @@ void identify()
tread (head, 1, 32, ifp);
tseek (ifp, 0, SEEK_END);
fsize = ftell(ifp);
- if ((cp = memmem (head, 32, "MMMM", 4)) ||
- (cp = memmem (head, 32, "IIII", 4))) {
+ if ((cp = my_memmem (head, 32, "MMMM", 4)) ||
+ (cp = my_memmem (head, 32, "IIII", 4))) {
parse_phase_one (cp-head);
if (cp-head) parse_tiff (0,0);
} else if (order == 0x4949 || order == 0x4d4d) {
