From bfa2ae8e43fcbab696f272fffd164d0637e965c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Dec 2024 17:05:44 +0100 Subject: New upstream version 1.3.1 --- NEWS | 2 +- tools/create-release.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 91070c0..0578bde 100644 --- a/NEWS +++ b/NEWS @@ -7,7 +7,7 @@ -## New with 1.3.0 (released 2024-02-12) +## New with 1.3.1 (released 2024-05-22) ### Backends diff --git a/tools/create-release.sh b/tools/create-release.sh index 40904d7..7b0ed2d 100755 --- a/tools/create-release.sh +++ b/tools/create-release.sh @@ -54,6 +54,10 @@ cat << EOF >> release.json } EOF +echo '==================================================' +cat release.json +echo '==================================================' + curl --silent --fail --write-out "%{http_code}\n"\ --header "PRIVATE-TOKEN: $PRIVATE_TOKEN" \ --header "Content-Type: application/json" \ -- cgit v1.2.3 From 2185fda6b446374bdd4bf81050a4866f909c12ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Dec 2024 18:29:48 +0100 Subject: Reenable v4l --- debian/changelog | 7 +++++++ debian/control | 1 + debian/rules | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 18224ab..c9266af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sane-backends (1.3.1-1) UNRELEASED; urgency=medium + + * New upstream release. + * Reenable v4l. + + -- Jörg Frings-Fürst Sun, 08 Dec 2024 17:07:00 +0100 + sane-backends (1.3.0-2) unstable; urgency=medium * Fix FTBFS on hurd-i386 & hurd-amd64 (Closes: #1081122). diff --git a/debian/control b/debian/control index a77f110..e25d36b 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,7 @@ Build-Depends: libsystemd-dev [linux-any], libtiff-dev, libusb-1.0-0-dev, + libv4l-dev, libxml2-dev, pkgconf, po-debconf, diff --git a/debian/rules b/debian/rules index d44c8ce..d9f933e 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,6 @@ endif --with-avahi \ --enable-pnm-backend \ --with-usb \ - --without-v4l \ --disable-locking override_dh_autoreconf: -- cgit v1.2.3 From fa53d0396fd70949dbcdedf7b7446da08a14443c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Dec 2024 18:41:07 +0100 Subject: d/libsane1.symbols: Replace hurd-i386 with hurd-any to fix FTBFS; Remove kfreebsd --- debian/changelog | 3 +++ debian/libsane1.symbols | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c9266af..7fc073a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ sane-backends (1.3.1-1) UNRELEASED; urgency=medium * New upstream release. * Reenable v4l. + * debian/libsane1.symbols: + - Replace hurd-i386 with hurd-any to fix FTBFS (Closes: #1081122). + - Remove kfreebsd. -- Jörg Frings-Fürst Sun, 08 Dec 2024 17:07:00 +0100 diff --git a/debian/libsane1.symbols b/debian/libsane1.symbols index b32e02e..4a63c19 100644 --- a/debian/libsane1.symbols +++ b/debian/libsane1.symbols @@ -1,6 +1,6 @@ libsane.so.1 libsane1 #MINVER# * Build-Depends-Package: libsane-dev - (arch=!hurd-i386 !kfreebsd-any)cmsg@Base 1.0.29 + (arch=!hurd-any)cmsg@Base 1.0.29 fail_test@Base 1.0.29 md5_buffer@Base 1.0.27 md5_finish_ctx@Base 1.0.27 -- cgit v1.2.3 From ef47758a26f86d83ec385431f06e192146ca8b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Dec 2024 19:01:08 +0100 Subject: New debian/patches/0185-fix_memory.patch --- debian/changelog | 3 +++ debian/patches/0185-fix_memory.patch | 50 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 54 insertions(+) create mode 100644 debian/patches/0185-fix_memory.patch diff --git a/debian/changelog b/debian/changelog index 7fc073a..5b80a57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ sane-backends (1.3.1-1) UNRELEASED; urgency=medium * debian/libsane1.symbols: - Replace hurd-i386 with hurd-any to fix FTBFS (Closes: #1081122). - Remove kfreebsd. + * New debian/patches/0185-fix_memory.patch: + - Fix memory handling at backends/hp5590_low.c + (Closes: #1071658, #1071660). -- Jörg Frings-Fürst Sun, 08 Dec 2024 17:07:00 +0100 diff --git a/debian/patches/0185-fix_memory.patch b/debian/patches/0185-fix_memory.patch new file mode 100644 index 0000000..fc36e4f --- /dev/null +++ b/debian/patches/0185-fix_memory.patch @@ -0,0 +1,50 @@ +diff --git a/backend/hp5590.c b/backend/hp5590.c +index 78c93132558365c8005c45fb756da57d1dfe9005..56acfb13c308f889daba472e05f1a03bb5967d18 100644 +--- a/backend/hp5590.c ++++ b/backend/hp5590.c +@@ -2154,6 +2154,24 @@ sane_read_internal (struct hp5590_scanner * scanner, SANE_Byte * data, + max_length, + scanner->transferred_image_size); + ++ /* ++ * We will truncate down the buffer size to *under* what the ++ * internal USB reading buffer can supply. This will avoid page read issues ++ * at the end of the buffer. ++ * ++ * See: https://gitlab.com/sane-project/backends/-/issues/781 ++ * ++ */ ++ if (max_length > BULK_READ_PAGE_SIZE * MAX_READ_PAGES) ++ { ++ DBG (DBG_proc, "%s, truncating sane_read buffer from %u to %u\n", ++ __func__, ++ max_length, ++ BULK_READ_PAGE_SIZE * MAX_READ_PAGES); ++ ++ max_length = BULK_READ_PAGE_SIZE * MAX_READ_PAGES; ++ } ++ + SANE_Int length_limited = 0; + *length = max_length; + if ((unsigned long long) *length > scanner->transferred_image_size) +diff --git a/backend/hp5590_low.c b/backend/hp5590_low.c +index 2d19dcf951717919099995a402002e1d18822849..7038f438640c72ede3b9d01d09d14b750f2c0041 100644 +--- a/backend/hp5590_low.c ++++ b/backend/hp5590_low.c +@@ -99,9 +99,15 @@ struct usb_in_usb_ctrl_setup { + #define CORE_FLAG_NOT_READY 1 << 1 + + /* Bulk transfers are done in pages, below their respective sizes */ ++/* ++ * Note that we limit the amount we can supply to sane_read() to avoid ++ * clashes with the size of the internal read buffer. ++ * ++ */ + #define BULK_WRITE_PAGE_SIZE 0x0f000 + #define BULK_READ_PAGE_SIZE 0x10000 +-#define ALLOCATE_BULK_READ_PAGES 16 /* 16 * 65536 = 1Mb */ ++#define ALLOCATE_BULK_READ_PAGES 17 /* 16 * 65536 = 1Mb */ ++#define MAX_READ_PAGES 16 /* maximum that we will return to sane_read() */ + + /* Structure describing bulk read state, because bulk reads will be done in + * pages, but function caller uses its own buffer, whose size is certainly diff --git a/debian/patches/series b/debian/patches/series index 93fa125..5b54a3b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 0200-disable-check-equal-stderr.patch 0610-fix_groff_font_warnings.patch 0180-Escl_force_idle_status.patch +0185-fix_memory.patch -- cgit v1.2.3 From 8ee3a7fbcc49f566e51319e251d76173a84fc293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Dec 2024 19:31:32 +0100 Subject: d/p/0185-fix_memory.patch: Add DEP-3 header --- debian/patches/0185-fix_memory.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/patches/0185-fix_memory.patch b/debian/patches/0185-fix_memory.patch index fc36e4f..137ae31 100644 --- a/debian/patches/0185-fix_memory.patch +++ b/debian/patches/0185-fix_memory.patch @@ -1,3 +1,15 @@ +Description: Fix memory handling at backend/hp5590_low.c +Author: +Origin: upstream, https://gitlab.com/sane-project/backends/-/merge_requests/857 +Bug: https://gitlab.com/sane-project/backends/-/issues/782 + https://gitlab.com/sane-project/backends/-/issues/781 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071658 + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1071660 +Forwarded: not-needed +Applied-Upstream: https://gitlab.com/sane-project/backends/-/merge_requests/857 +Last-Update: 2024-12-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ diff --git a/backend/hp5590.c b/backend/hp5590.c index 78c93132558365c8005c45fb756da57d1dfe9005..56acfb13c308f889daba472e05f1a03bb5967d18 100644 --- a/backend/hp5590.c -- cgit v1.2.3 From 2f664d818ad8c970ef1cf7f0618646cfb4f9dde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 8 Dec 2024 19:34:22 +0100 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 5b80a57..ea3cab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.3.1-1) UNRELEASED; urgency=medium +sane-backends (1.3.1-1) unstable; urgency=medium * New upstream release. * Reenable v4l. @@ -9,7 +9,7 @@ sane-backends (1.3.1-1) UNRELEASED; urgency=medium - Fix memory handling at backends/hp5590_low.c (Closes: #1071658, #1071660). - -- Jörg Frings-Fürst Sun, 08 Dec 2024 17:07:00 +0100 + -- Jörg Frings-Fürst Sun, 08 Dec 2024 19:33:14 +0100 sane-backends (1.3.0-2) unstable; urgency=medium -- cgit v1.2.3