From a462d0cbaa5f056e59e35d419b416ef42a0bd7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 15:54:38 +0200 Subject: Refresh patches/0155-hurd_PATH_MAX.patch --- debian/changelog | 6 + debian/patches/0155-hurd_PATH_MAX.patch | 329 ++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+) diff --git a/debian/changelog b/debian/changelog index 62bfd8d..9108ac8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sane-backends (1.0.29-1~experimental3) UNRELEASED; urgency=medium + + * Refresh patches/0155-hurd_PATH_MAX.patch. + + -- Jörg Frings-Fürst Sat, 11 Apr 2020 19:45:50 +0200 + sane-backends (1.0.29-1~experimental2) experimental; urgency=medium * New debian/patches/0150-i386-test.patch: diff --git a/debian/patches/0155-hurd_PATH_MAX.patch b/debian/patches/0155-hurd_PATH_MAX.patch index b1d6056..88a2614 100644 --- a/debian/patches/0155-hurd_PATH_MAX.patch +++ b/debian/patches/0155-hurd_PATH_MAX.patch @@ -16,3 +16,332 @@ Index: trunk/backend/escl/escl_capabilities.c struct cap { char *memory; +Index: trunk/backend/escl/escl.h +=================================================================== +--- trunk.orig/backend/escl/escl.h ++++ trunk/backend/escl/escl.h +@@ -61,6 +61,10 @@ + # define DBGDUMP(level, buf, size) + #endif + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + #define ESCL_CONFIG_FILE "escl.conf" + + typedef struct { +Index: trunk/backend/canon630u.c +=================================================================== +--- trunk.orig/backend/canon630u.c ++++ trunk/backend/canon630u.c +@@ -67,6 +67,10 @@ + + #include "canon630u-common.c" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + typedef struct Canon_Device + { + struct Canon_Device *next; +Index: trunk/backend/canon_pp.c +=================================================================== +--- trunk.orig/backend/canon_pp.c ++++ trunk/backend/canon_pp.c +@@ -85,6 +85,11 @@ + #include "../include/sane/sanei_backend.h" + /* #include "../include/sane/sanei_debug.h" */ + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ ++ + + /* Prototypes */ + static SANE_Status init_device(struct parport *pp); +Index: trunk/backend/gt68xx.h +=================================================================== +--- trunk.orig/backend/gt68xx.h ++++ trunk/backend/gt68xx.h +@@ -53,4 +53,8 @@ + + #define GT68XX_CONFIG_FILE "gt68xx.conf" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + #endif /* not GT68XX_H */ +Index: trunk/backend/hp3900_sane.c +=================================================================== +--- trunk.orig/backend/hp3900_sane.c ++++ trunk/backend/hp3900_sane.c +@@ -54,6 +54,11 @@ + + #include "hp3900_rts8822.c" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ ++ + struct st_convert + { + SANE_Int colormode; +Index: trunk/backend/hp4200.h +=================================================================== +--- trunk.orig/backend/hp4200.h ++++ trunk/backend/hp4200.h +@@ -27,6 +27,10 @@ + #define min(a, b) (((a) < (b)) ? (a) : (b)) + #define max(a, b) (((a) > (b)) ? (a) : (b)) + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + + /*--------------------------------------------------------------------------*/ + +Index: trunk/backend/hp5400_sane.c +=================================================================== +--- trunk.orig/backend/hp5400_sane.c ++++ trunk/backend/hp5400_sane.c +@@ -109,6 +109,9 @@ + + #define NUM_GAMMA_ENTRIES 65536 + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif + + /* options enumerator */ + typedef enum +Index: trunk/backend/hpsj5s.c +=================================================================== +--- trunk.orig/backend/hpsj5s.c ++++ trunk/backend/hpsj5s.c +@@ -58,6 +58,9 @@ + #include + #include + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif + + #define LINES_TO_FEED 480 /*Default feed length */ + +Index: trunk/backend/leo.c +=================================================================== +--- trunk.orig/backend/leo.c ++++ trunk/backend/leo.c +@@ -78,6 +78,10 @@ + + #include "leo.h" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /*--------------------------------------------------------------------------*/ + + /* Lists of possible scan modes. */ +Index: trunk/backend/lexmark.c +=================================================================== +--- trunk.orig/backend/lexmark.c ++++ trunk/backend/lexmark.c +@@ -47,6 +47,10 @@ + + #include "lexmark.h" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + #define LEXMARK_CONFIG_FILE "lexmark.conf" + #define BUILD 32 + #define MAX_OPTION_STRING_SIZE 255 +Index: trunk/backend/matsushita.c +=================================================================== +--- trunk.orig/backend/matsushita.c ++++ trunk/backend/matsushita.c +@@ -82,6 +82,10 @@ + + #include "matsushita.h" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /*--------------------------------------------------------------------------*/ + + /* Lists of possible scan modes. */ +Index: trunk/backend/p5_device.c +=================================================================== +--- trunk.orig/backend/p5_device.c ++++ trunk/backend/p5_device.c +@@ -1,3 +1,8 @@ ++ ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /** + * Description of the Primax PagePartner model + */ +Index: trunk/backend/pie.c +=================================================================== +--- trunk.orig/backend/pie.c ++++ trunk/backend/pie.c +@@ -134,8 +134,11 @@ + + #define min(a,b) (((a)<(b))?(a):(b)) + #define max(a,b) (((a)>(b))?(a):(b)) +- +- ++ ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /* names of scanners that are supported because */ + /* the inquiry_return_block is ok and driver is tested */ + +Index: trunk/backend/pieusb.c +=================================================================== +--- trunk.orig/backend/pieusb.c ++++ trunk/backend/pieusb.c +@@ -109,6 +109,10 @@ extern void write_tiff_rgbi_header (FILE + #define DBG_info_scan 11 /* information scanner commands */ + #define DBG_info_usb 13 /* information usb level functions */ + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /* device flags */ + + #define FLAG_SLIDE_TRANSPORT 0x01 +Index: trunk/backend/plustek-usb.c +=================================================================== +--- trunk.orig/backend/plustek-usb.c ++++ trunk/backend/plustek-usb.c +@@ -119,6 +119,10 @@ static TabDef usbVendors[] = { + /** we use at least 8 megs for scanning... */ + #define _SCANBUF_SIZE (8 * 1024 * 1024) + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /********************** the USB scanner interface ****************************/ + + /** remove the slash out of the model-name to obtain a valid filename +Index: trunk/backend/sceptre.c +=================================================================== +--- trunk.orig/backend/sceptre.c ++++ trunk/backend/sceptre.c +@@ -80,6 +80,10 @@ + + #include "sceptre.h" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /*--------------------------------------------------------------------------*/ + + static const SANE_String scan_mode_list[] = { LINEART_STR, HALFTONE_STR, +Index: trunk/backend/sp15c.c +=================================================================== +--- trunk.orig/backend/sp15c.c ++++ trunk/backend/sp15c.c +@@ -228,6 +228,10 @@ + #include "sp15c-scsi.h" + #include "sp15c.h" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /* ------------------------------------------------------------------------- */ + + static const char negativeStr[] = "Negative"; +Index: trunk/backend/stv680.c +=================================================================== +--- trunk.orig/backend/stv680.c ++++ trunk/backend/stv680.c +@@ -101,6 +101,10 @@ + + #define TIMEOUT 1000 + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /*--------------------------------------------------------------------------*/ + /* Lists of possible scan modes. */ + static SANE_String_Const scan_mode_list[] = { +Index: trunk/backend/teco1.c +=================================================================== +--- trunk.orig/backend/teco1.c ++++ trunk/backend/teco1.c +@@ -86,6 +86,10 @@ + #define sanei_scsi_close(a) SANE_STATUS_GOOD + #endif + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /*--------------------------------------------------------------------------*/ + + /* Lists of possible scan modes. */ +Index: trunk/backend/teco2.c +=================================================================== +--- trunk.orig/backend/teco2.c ++++ trunk/backend/teco2.c +@@ -106,6 +106,10 @@ + #define sanei_scsi_close(a) SANE_STATUS_GOOD + #endif + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /* For debugging purposes: output a stream straight out from the + * scanner without reordering the colors, 0=normal, 1 = raw. */ + static int raw_output = 0; +Index: trunk/backend/teco3.c +=================================================================== +--- trunk.orig/backend/teco3.c ++++ trunk/backend/teco3.c +@@ -78,6 +78,10 @@ + + #include "teco3.h" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + /*--------------------------------------------------------------------------*/ + + /* Lists of possible scan modes. */ +Index: trunk/backend/test.c +=================================================================== +--- trunk.orig/backend/test.c ++++ trunk/backend/test.c +@@ -76,6 +76,10 @@ + + #define TEST_CONFIG_FILE "test.conf" + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + static SANE_Bool inited = SANE_FALSE; + static SANE_Device **sane_device_list = 0; + static Test_Device *first_test_device = 0; -- cgit v1.2.3 From d43640c4220b71b4b21667ac9a0d48df6ea2d836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 15:56:36 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9108ac8..dda03ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -sane-backends (1.0.29-1~experimental3) UNRELEASED; urgency=medium +sane-backends (1.0.29-1~experimental3) experimental; urgency=medium * Refresh patches/0155-hurd_PATH_MAX.patch. - -- Jörg Frings-Fürst Sat, 11 Apr 2020 19:45:50 +0200 + -- Jörg Frings-Fürst Sun, 12 Apr 2020 15:55:41 +0200 sane-backends (1.0.29-1~experimental2) experimental; urgency=medium -- cgit v1.2.3