diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/0125-multiarch_dll_search_path.patch | 54 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 30 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog index 879a77a..ab1124e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ sane-backends (1.0.27-3) UNRELEASED; urgency=medium (Thanks to Michael Westwind <wormrunner@gmail.com>). * Declare compliance with Debian Policy 4.2.1 (No changes needed). * Remove outdated makedev dependency (Closes: #907017). + * Reactivate and refresh debian/patches/0125-multiarch_dll_search_path.patch + to allow driver from non-multiarch directories (Closes: #910103). -- Jörg Frings-Fürst <debian@jff.email> Thu, 04 Oct 2018 19:05:03 +0200 diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch index 21c93f6..de28245 100644 --- a/debian/patches/0125-multiarch_dll_search_path.patch +++ b/debian/patches/0125-multiarch_dll_search_path.patch @@ -7,53 +7,53 @@ Index: trunk/backend/dll.c =================================================================== --- trunk.orig/backend/dll.c +++ trunk/backend/dll.c -@@ -430,7 +430,7 @@ load (struct backend *be) +@@ -450,7 +450,7 @@ load (struct backend *be) if (path) { -- src_len = strlen (path) + strlen (LIBDIR) + 1 + 1; -+ src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1; +- src_len = strlen (path) + strlen (DIR_SEP) + strlen(LIBDIR) + 1; ++ src_len = strlen (path) + strlen (DIR_SEP) + strlen(DEB_DLL_LIBDIR) + 1; src = malloc (src_len); if (!src) { -@@ -438,12 +438,11 @@ load (struct backend *be) - return SANE_STATUS_NO_MEM; - } +@@ -460,11 +460,11 @@ load (struct backend *be) + if (orig_src) + free (orig_src); orig_src = src; -- snprintf (src, src_len, "%s:%s", path, LIBDIR); -+ snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR); +- snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR); ++ snprintf (src, src_len, "%s%s%s", path, DIR_SEP, DEB_DLL_LIBDIR); } else { - src = LIBDIR; -- src = strdup (src); -+ src = strdup (DEB_DLL_LIBDIR); ++ src = DEB_DLL_LIBDIR; + src = strdup (src); if (!src) { - DBG (1, "load: strdup failed: %s\n", strerror (errno)); Index: trunk/backend/Makefile.in =================================================================== --- trunk.orig/backend/Makefile.in +++ trunk/backend/Makefile.in -@@ -1914,7 +1914,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" - AM_LDFLAGS = @STRICT_LDFLAGS@ - # The -rpath option is added because we are creating _LTLIBRARIES based - # on configure substitution. This causes automake to not know the +@@ -1753,7 +1753,8 @@ AMTAR = @AMTAR@ + AM_CFLAGS = @AM_CFLAGS@ + AM_CPPFLAGS = @AM_CPPFLAGS@ -I. -I$(srcdir) -I$(top_builddir)/include \ + -I$(top_srcdir)/include $(USB_CFLAGS) \ +- -DLIBDIR="\"$(libdir)/sane\"" ++ -DLIBDIR="\"$(libdir)/sane\"" \ ++ -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + AM_LDFLAGS = @AM_LDFLAGS@ $(STRICT_LDFLAGS) + AR = @AR@ Index: trunk/backend/Makefile.am =================================================================== --- trunk.orig/backend/Makefile.am +++ trunk/backend/Makefile.am -@@ -24,7 +24,7 @@ USB_LIBS = @USB_LIBS@ - SCSI_LIBS = @SCSI_LIBS@ - PTHREAD_LIBS = @PTHREAD_LIBS@ +@@ -4,7 +4,7 @@ + ## This file is part of the "Sane" build infra-structure. See + ## included LICENSE file for license information. --AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -+AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\"" +-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\"" - V_MAJOR = @V_MAJOR@ - V_MINOR = @V_MINOR@ + AM_LDFLAGS += $(STRICT_LDFLAGS) + # The -rpath option is added because we are creating _LTLIBRARIES based diff --git a/debian/patches/series b/debian/patches/series index 8b454dc..9a7db3b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,7 +15,7 @@ #0700-mk_reproducible_results.patch 0705-kfreebsd.patch 0710-sane-desc.c_debian_mods.patch -#0125-multiarch_dll_search_path.patch +0125-multiarch_dll_search_path.patch #0135-saned-remotescanners.patch #0500-CVE-2017-6318.patch 0140-avahi.patch |