[Debian-astro-maintainers] Bug#1069909: dcraw: diff for NMU version 9.28-5.1

[Joao Eriberto Mota Filho]

Control: tags 1069909 + pending

Dear maintainer,

I've prepared an NMU for dcraw (versioned as 9.28-5.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should cancel or delay it longer.

Regards,

Eriberto

diff -Nru dcraw-9.28/debian/changelog dcraw-9.28/debian/changelog
--- dcraw-9.28/debian/changelog	2024-03-26 06:42:04.000000000 -0300
+++ dcraw-9.28/debian/changelog	2024-05-25 12:18:40.000000000 -0300
@@ -1,3 +1,12 @@
+dcraw (9.28-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/remove-duplicate-memmem.patch: created to avoid a FTBFS
+    caused by a redundant duplicate implementation of memmem(). Thanks to
+    Steve Langasek <steve.langasek at canonical.com>. (Closes: #1069909)
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sat, 25 May 2024 12:18:40 -0300
+
 dcraw (9.28-5) unstable; urgency=low
 
   * Added missing headers for Fuji cameras; Closes: #1066465
diff -Nru dcraw-9.28/debian/patches/remove-duplicate-memmem.patch dcraw-9.28/debian/patches/remove-duplicate-memmem.patch
--- dcraw-9.28/debian/patches/remove-duplicate-memmem.patch	1969-12-31 21:00:00.000000000 -0300
+++ dcraw-9.28/debian/patches/remove-duplicate-memmem.patch	2024-05-25 12:18:40.000000000 -0300
@@ -0,0 +1,28 @@
+Description: don't reimplement memmem()
+ memmem() is implemented in glibc, don't have a redundant duplicate
+ implementation with a different prototype.
+Author: Steve Langasek <steve.langasek at canonical.com>
+Last-Update: 2024-04-09
+Forwarded: no
+
+Index: dcraw-9.28/parse.c
+===================================================================
+--- dcraw-9.28.orig/parse.c
++++ dcraw-9.28/parse.c
+@@ -1213,16 +1213,6 @@
+   }
+ }
+ 
+-char *memmem (char *haystack, size_t haystacklen,
+-              char *needle, size_t needlelen)
+-{
+-  char *c;
+-  for (c = haystack; c <= haystack + haystacklen - needlelen; c++)
+-    if (!memcmp (c, needle, needlelen))
+-      return c;
+-  return NULL;
+-}
+-
+ /*
+    Identify which camera created this file, and set global variables
+    accordingly.	 Return nonzero if the file cannot be decoded.
diff -Nru dcraw-9.28/debian/patches/series dcraw-9.28/debian/patches/series
--- dcraw-9.28/debian/patches/series	2024-03-26 06:42:04.000000000 -0300
+++ dcraw-9.28/debian/patches/series	2024-05-25 12:18:40.000000000 -0300
@@ -8,3 +8,4 @@
 iowrap.diff
 0009-missing_headers.patch
 0010-Fuji-headers.patch
+remove-duplicate-memmem.patch