diff options
| -rw-r--r-- | debian/changelog | 36 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/copyright | 26 | ||||
| -rw-r--r-- | debian/libsane1.lintian-overrides | 9 | ||||
| -rw-r--r-- | debian/libsane1.postinst | 22 | ||||
| -rw-r--r-- | debian/libsane1.postrm | 23 | ||||
| -rw-r--r-- | debian/libsane1.preinst | 16 | ||||
| -rw-r--r-- | debian/libsane1.symbols | 1 | ||||
| -rw-r--r-- | debian/patches/0125-multiarch_dll_search_path.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0210_Correct_segfault_on_backend_escl.patch | 81 | ||||
| -rw-r--r-- | debian/patches/series | 9 |
11 files changed, 131 insertions, 95 deletions
diff --git a/debian/changelog b/debian/changelog index e51c729..6a71972 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +sane-backends (1.4.0-2) UNRELEASED; urgency=medium + + * New debian/patches/0210_Correct_segfault_on_backend_escl.patch: + - Correct segfault when declaring a new device (Closes: #1118476). + * Remove debian/source/lintian-overrides. + * debian/control: + - Remove Rules-Requires-Root: no. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 25 Oct 2025 18:52:14 +0200 + +sane-backends (1.4.0-1) unstable; urgency=medium + + * New upstream release. + - Removal of patches that were applied by upstream: + + debian/patches/0180-Escl_force_idle_status.patch + + debian/patches/0185-fix_memory.patch + + debian/patches/0190-Fix_scanimage_help.patch + + debian/patches/0205-ftbfs_with_GCC-15.patch + - Refresh debian/libsane1.symbols. + * debian/copyright: + - Refresh. + - Fix old FSF address. + * debian/patches/0125-multiarch_dll_search_path.patch: + - Fix compiler warning "unknown escape sequence" (Closes: #1107537). + Thanks to Peter Marschall <peter@adpm.de>. + * Remove after release trixie (protective diversion for + upgrades of files moved from / to /usr). + - debian/libsane1.lintian-overrides. + - debian/libsane1.postinst + - debian/libsane1.postrm + - part of debian/libsane1.preinst. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 13 Sep 2025 17:42:34 +0200 + sane-backends (1.3.1-4) unstable; urgency=medium * New debian/patches/0205-ftbfs_with_GCC-15.patch (Closes: #1097841). @@ -21,7 +55,7 @@ sane-backends (1.3.1-2) unstable; urgency=medium Thanks to Pino Toscano <pino@debian.org>. * Move addgroup from debian/libsane1.postinst to debian/libsane1.preinst (Closes: #1095956). - * New debian/patches/0190-Fix_scanimage_help.patch to Fix_output of + * New debian/patches/0190-Fix_scanimage_help.patch to Fix_output of scanimage --help (Closes: #1094671). * debian/sane-utils.links: Add link from sane-umax_pp.5.gz to umax_pp.5.gz to make lintian happy. diff --git a/debian/control b/debian/control index 77fc0ce..67ca749 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,6 @@ Build-Depends: Homepage: http://www.sane-project.org Vcs-Git: https://git.jff.email/cgit/sane-backends.git Vcs-Browser: https://git.jff.email/cgit/sane-backends.git -Rules-Requires-Root: no Package: sane-utils Architecture: any diff --git a/debian/copyright b/debian/copyright index da8004e..1103f17 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,12 +56,7 @@ License: GPL-2+ Files: backend/qcam.* Copyright: 1997 David Mosberger-Tang 1996 Scott Laird -License: GPL-2+ and EXPAT - -Files: backend/qcam.h -Copyright: 1997 David Mosberger-Tang - 1996 Scott Laird -License: GPL-2 and EXPAT +License: Expat and GPL-2+ with sane exception Files: backend/artec_eplus48u.* Copyright: 2002 Michael Herder <crapsite@gmx.net> @@ -1091,7 +1086,7 @@ License: GPL-2+ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see https://www.gnu.org/licenses/. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. @@ -1125,7 +1120,7 @@ License: GPL-2 GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see https://www.gnu.org/licenses/. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. @@ -1141,7 +1136,7 @@ License: GPL-3 GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/> + along with this program. If not, see https://www.gnu.org/licenses/ . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". @@ -1158,7 +1153,7 @@ License: GPL-3+ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/> + along with this program. If not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". @@ -1176,8 +1171,7 @@ License: LGPL-2.1+ Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; If not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". @@ -1912,8 +1906,7 @@ License: LGPL-2+ Lesser General Public License for more details. . You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; if not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU Library General Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2". @@ -1950,8 +1943,7 @@ License: Expat License: GFDL-1.1+ GNU Free Documentation License Version 1.1, March 2000 - Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2000 Free Software Foundation - Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -2263,7 +2255,7 @@ License: GPL-2+ with sane exception GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see https://www.gnu.org/licenses/. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides deleted file mode 100644 index ee56b5b..0000000 --- a/debian/libsane1.lintian-overrides +++ /dev/null @@ -1,9 +0,0 @@ -# begin-remove-after: released:trixie -# protective diversion for upgrades of files moved from / to /usr -libsane1: systemd-diversion lib/udev/hwdb.d/20-sane.hwdb [preinst:11] -libsane1: systemd-diversion lib/udev/rules.d/60-libsane1.rules [preinst:14] -libsane1: systemd-diversion lib/udev/rules.d/99-libsane1.rules [preinst:17] -libsane1: diversion-for-unknown-file lib/udev/hwdb.d/20-sane.hwdb [preinst:11] -libsane1: diversion-for-unknown-file lib/udev/rules.d/60-libsane1.rules [preinst:14] -libsane1: diversion-for-unknown-file lib/udev/rules.d/99-libsane1.rules [preinst:17] -# end-remove-after diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst deleted file mode 100644 index b5da9aa..0000000 --- a/debian/libsane1.postinst +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -# begin-remove-after: released:trixie -# protective diversion of files moved from / to /usr, to avoid file loss. -# Only for upgrades. -if [ "$1" = "configure" ]; then - # At this point, the package will have installed the same file in */usr*. - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \ - --remove /lib/udev/hwdb.d/20-sane.hwdb - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/60-libsane1.rules - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/99-libsane1.rules -fi -# end-remove-after - - -#DEBHELPER# diff --git a/debian/libsane1.postrm b/debian/libsane1.postrm deleted file mode 100644 index 6448e00..0000000 --- a/debian/libsane1.postrm +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -# begin-remove-after: released:trixie -# protective diversion of files moved from / to /usr, to avoid file loss. -# Only for upgrades. -if [ "$1" = "remove" ] && [ "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = "1" ]; then - # Cleanup in case package is removed before upgrade is finished (postinst ran). - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \ - --remove /lib/udev/hwdb.d/20-sane.hwdb - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/60-libsane1.rules - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/99-libsane1.rules -fi -# end-remove-after - -#DEBHELPER# - diff --git a/debian/libsane1.preinst b/debian/libsane1.preinst index 1f02da9..a3a3fb9 100644 --- a/debian/libsane1.preinst +++ b/debian/libsane1.preinst @@ -2,22 +2,6 @@ set -e -# begin-remove-after: released:trixie -# protective diversion of files moved from / to /usr, to avoid file loss. -# Only for upgrades. -if [ "$1" = "upgrade" ]; then - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \ - --add /lib/udev/hwdb.d/20-sane.hwdb - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \ - --add /lib/udev/rules.d/60-libsane1.rules - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \ - --add /lib/udev/rules.d/99-libsane1.rules -fi -# end-remove-after - #if [ "$1" = "upgrade" ]; then # Add the scanner system group if it doesn't exist if ! getent group | grep -q "^scanner:"; then diff --git a/debian/libsane1.symbols b/debian/libsane1.symbols index 4a63c19..a9db584 100644 --- a/debian/libsane1.symbols +++ b/debian/libsane1.symbols @@ -1,7 +1,6 @@ libsane.so.1 libsane1 #MINVER# * Build-Depends-Package: libsane-dev (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 md5_init_ctx@Base 1.0.27 diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch index 67b9484..125cafa 100644 --- a/debian/patches/0125-multiarch_dll_search_path.patch +++ b/debian/patches/0125-multiarch_dll_search_path.patch @@ -38,7 +38,7 @@ Index: trunk/backend/Makefile.am ## included LICENSE file for license information. -AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\:$(prefix)/lib64/sane\"" ++AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane:$(prefix)/lib64/sane\"" AM_LDFLAGS += $(STRICT_LDFLAGS) # The -rpath option is added because we are creating _LTLIBRARIES based diff --git a/debian/patches/0210_Correct_segfault_on_backend_escl.patch b/debian/patches/0210_Correct_segfault_on_backend_escl.patch new file mode 100644 index 0000000..3d42bc6 --- /dev/null +++ b/debian/patches/0210_Correct_segfault_on_backend_escl.patch @@ -0,0 +1,81 @@ +Description: 'fix-declare-device' +Author: <name and email of author, optional> +Origin: upstream, https://gitlab.com/sane-project/backends/-/commit/a717ed74c7614b2de5b8486efba75b3442b2558b +Bug: https://gitlab.com/sane-project/backends/-/issues/826 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1118476 +Forwarded: not-needed +Last-Update: 2025-10-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/backend/escl/escl.c +=================================================================== +--- trunk.orig/backend/escl/escl.c ++++ trunk/backend/escl/escl.c +@@ -476,6 +476,7 @@ attach_one_config(SANEI_Config __sane_un + int port = 0; + SANE_Status status; + static ESCL_Device *escl_device = NULL; ++ DBG (10, "attach_one_config [%s]\n", line); + if (*line == '#') return SANE_STATUS_GOOD; + if (!strncmp(line, "pdfblacklist", 12)) return SANE_STATUS_GOOD; + if (strncmp(line, "device", 6) == 0) { +@@ -518,6 +519,7 @@ attach_one_config(SANEI_Config __sane_un + } + + if (strncmp(line, "[device]", 8) == 0) { ++ DBG (10, "New Escl_Device"); + escl_device = escl_free_device(escl_device); + escl_device = (ESCL_Device*)calloc(1, sizeof(ESCL_Device)); + if (!escl_device) { +@@ -527,26 +529,27 @@ attach_one_config(SANEI_Config __sane_un + } + else if (strncmp(line, "ip", 2) == 0) { + const char *ip_space = sanei_config_skip_whitespace(line + 2); +- DBG (10, "New Escl_Device IP [%s].", (ip_space ? ip_space : "VIDE")); + if (escl_device != NULL && ip_space != NULL) { ++ DBG (10, "New Escl_Device IP [%s].", (ip_space ? ip_space : "VIDE")); + DBG (10, "New Escl_Device IP Affected."); + escl_device->ip_address = strdup(ip_space); + } + } + else if (sscanf(line, "port %i", &port) == 1 && port != 0) { +- DBG (10, "New Escl_Device PORT [%d].", port); + if (escl_device != NULL) { ++ DBG (10, "New Escl_Device PORT [%d].", port); + DBG (10, "New Escl_Device PORT Affected."); + escl_device->port_nb = port; + } + } + else if (strncmp(line, "model", 5) == 0) { + const char *model_space = sanei_config_skip_whitespace(line + 5); +- DBG (10, "New Escl_Device MODEL [%s].", (model_space ? model_space : "VIDE")); + if (escl_device != NULL && model_space != NULL) { ++ DBG (10, "New Escl_Device MODEL [%s].", (model_space ? model_space : "VIDE")); + DBG (10, "New Escl_Device MODEL Affected."); + escl_device->model_name = strdup(model_space); + } ++ return SANE_STATUS_GOOD; + } + else if (strncmp(line, "type", 4) == 0) { + const char *type_space = sanei_config_skip_whitespace(line + 4); +@@ -555,6 +558,7 @@ attach_one_config(SANEI_Config __sane_un + DBG (10, "New Escl_Device TYPE Affected."); + escl_device->type = strdup(type_space); + } ++ return SANE_STATUS_GOOD; + } + escl_device->is = strdup("flatbed or ADF scanner"); + escl_device->uuid = NULL; +@@ -562,8 +566,10 @@ attach_one_config(SANEI_Config __sane_un + snprintf(url_port, sizeof(url_port), "https://%s:%d", escl_device->ip_address, escl_device->port_nb); + escl_device->tls = escl_is_tls(url_port, escl_device->type); + status = escl_check_and_add_device(escl_device); +- if (status == SANE_STATUS_GOOD) +- escl_device = NULL; ++ if (status == SANE_STATUS_GOOD) { ++ DBG (10, "attach_one_config finish %s://%s:%d", escl_device->type, escl_device->ip_address, escl_device->port_nb); ++ escl_device = NULL; ++ } + return status; + } + diff --git a/debian/patches/series b/debian/patches/series index 6e62f3f..c5f7620 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +0210_Correct_segfault_on_backend_escl.patch 0040-remove_git.patch 0100-source_spelling.patch 0125-multiarch_dll_search_path.patch @@ -12,7 +13,7 @@ 0605-fix_groff-warnings.patch 0200-disable-check-equal-stderr.patch 0610-fix_groff_font_warnings.patch -0180-Escl_force_idle_status.patch -0185-fix_memory.patch -0190-Fix_scanimage_help.patch -0205-ftbfs_with_GCC-15.patch +#0180-Escl_force_idle_status.patch +#0185-fix_memory.patch +#0190-Fix_scanimage_help.patch +#0205-ftbfs_with_GCC-15.patch |