Auto sync2gitlab import of sane-backends-1.0.27-22.el8.src.rpm

2022-05-26 14:21:08 -04:00 · 2022-05-26 14:21:08 -04:00 · 30d4672d31
commit 30d4672d31
parent 99eb99e3b7
16 changed files with 2241 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+/sane-backends-1.0.27.tar.gz
+/sane.png
--- a/0001-epson2-Rewrite-network-I-O.patch
+++ b/0001-epson2-Rewrite-network-I-O.patch
@ -0,0 +1,225 @@
+diff -up sane-backends-1.0.27/backend/epson2_net.c.epsonds-issues sane-backends-1.0.27/backend/epson2_net.c
+--- sane-backends-1.0.27/backend/epson2_net.c.epsonds-issues	2016-10-06 02:02:57.000000000 +0200
+++ sane-backends-1.0.27/backend/epson2_net.c	2020-07-28 15:04:58.385405722 +0200
+@@ -32,11 +32,12 @@
+ 
+ #include "sane/sanei_debug.h"
+ 
+-static int
+static ssize_t
+ sanei_epson_net_read_raw(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
+ 		       SANE_Status *status)
+ {
+-	int ready, read = -1;
+	int ready;
+	ssize_t read = -1;
+ 	fd_set readable;
+ 	struct timeval tv;
+ 
+@@ -62,111 +63,136 @@ sanei_epson_net_read_raw(Epson_Scanner *
+ 	return read;
+ }
+ 
+-int
+-sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
+static ssize_t
+sanei_epson_net_read_buf(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
+ 		       SANE_Status * status)
+ {
+-	ssize_t size;
+ 	ssize_t read = 0;
+-	unsigned char header[12];
+ 
+-	/* read from buffer, if available */
+-	if (s->netptr != s->netbuf) {
+-		DBG(23, "reading %lu from buffer at %p, %lu available\n",
+-			(u_long) wanted, s->netptr, (u_long) s->netlen);
+	DBG(23, "%s: reading up to %lu from buffer at %p, %lu available\n",
+		__func__, (u_long) wanted, s->netptr, (u_long) s->netlen);
+ 
+-		memcpy(buf, s->netptr, wanted);
+-		read = wanted;
+	if ((size_t) wanted > s->netlen) {
+		*status = SANE_STATUS_IO_ERROR;
+		wanted = s->netlen;
+	}
+ 
+-		s->netlen -= wanted;
+	memcpy(buf, s->netptr, wanted);
+	read = wanted;
+ 
+-		if (s->netlen == 0) {
+-			DBG(23, "%s: freeing %p\n", __func__, s->netbuf);
+-			free(s->netbuf);
+-			s->netbuf = s->netptr = NULL;
+-			s->netlen = 0;
+-		}
+	s->netptr += read;
+	s->netlen -= read;
+ 
+-		return read;
+	if (s->netlen == 0) {
+		DBG(23, "%s: freeing %p\n", __func__, s->netbuf);
+		free(s->netbuf);
+		s->netbuf = s->netptr = NULL;
+		s->netlen = 0;
+	}
+
+	return read;
+}
+
+ssize_t
+sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
+		       SANE_Status * status)
+{
+	if (wanted < 0) {
+		*status = SANE_STATUS_INVAL;
+		return 0;
+	}
+
+	size_t size;
+	ssize_t read = 0;
+	unsigned char header[12];
+
+	/* read from remainder of buffer */
+	if (s->netptr) {
+		return sanei_epson_net_read_buf(s, buf, wanted, status);
+ 	}
+ 
+ 	/* receive net header */
+-	size = sanei_epson_net_read_raw(s, header, 12, status);
+-	if (size != 12) {
+	read = sanei_epson_net_read_raw(s, header, 12, status);
+	if (read != 12) {
+ 		return 0;
+ 	}
+ 
+	/* validate header */
+ 	if (header[0] != 'I' || header[1] != 'S') {
+ 		DBG(1, "header mismatch: %02X %02x\n", header[0], header[1]);
+ 		*status = SANE_STATUS_IO_ERROR;
+ 		return 0;
+ 	}
+ 
+	/* parse payload size */
+ 	size = be32atoh(&header[6]);
+ 
+-	DBG(23, "%s: wanted = %lu, available = %lu\n", __func__,
+-		(u_long) wanted, (u_long) size);
+-
+ 	*status = SANE_STATUS_GOOD;
+ 
+-	if (size == wanted) {
+-
+-		DBG(15, "%s: full read\n", __func__);
+	if (!s->netbuf) {
+		DBG(15, "%s: direct read\n", __func__);
+		DBG(23, "%s: wanted = %lu, available = %lu\n", __func__,
+			(u_long) wanted, (u_long) size);
+ 
+-		read = sanei_epson_net_read_raw(s, buf, size, status);
+-
+-		if (s->netbuf) {
+-			free(s->netbuf);
+-			s->netbuf = NULL;
+-			s->netlen = 0;
+		if ((size_t) wanted > size) {
+			wanted = size;
+ 		}
+ 
+-		if (read < 0) {
+-			return 0;
+-		}
+-		
+-/*	} else if (wanted < size && s->netlen == size) { */
+		read = sanei_epson_net_read_raw(s, buf, wanted, status);
+ 	} else {
+-		DBG(23, "%s: partial read\n", __func__);
+		DBG(15, "%s: buffered read\n", __func__);
+		DBG(23, "%s: bufferable = %lu, available = %lu\n", __func__,
+			(u_long) s->netlen, (u_long) size);
+ 
+-		read = sanei_epson_net_read_raw(s, s->netbuf, size, status);
+-		if (read != size) {
+-			return 0;
+		if (s->netlen > size) {
+			s->netlen = size;
+ 		}
+ 
+-		s->netlen = size - wanted;
+-		s->netptr += wanted;
+-		read = wanted;
+-
+-		DBG(23, "0,4 %02x %02x\n", s->netbuf[0], s->netbuf[4]);
+-		DBG(23, "storing %lu to buffer at %p, next read at %p, %lu bytes left\n",
+-			(u_long) size, s->netbuf, s->netptr, (u_long) s->netlen);
+		/* fill buffer */
+		read = sanei_epson_net_read_raw(s, s->netbuf, s->netlen, status);
+		s->netptr = s->netbuf;
+		s->netlen = (read > 0 ? read : 0);
+ 
+-		memcpy(buf, s->netbuf, wanted);
+		/* copy wanted part */
+		read = sanei_epson_net_read_buf(s, buf, wanted, status);
+ 	}
+ 
+ 	return read;
+ }
+ 
+-
+-int
+size_t
+ sanei_epson_net_write(Epson_Scanner *s, unsigned int cmd, const unsigned char *buf,
+ 			size_t buf_size, size_t reply_len, SANE_Status *status)
+ {
+ 	unsigned char *h1, *h2, *payload;
+ 	unsigned char *packet = malloc(12 + 8 + buf_size);
+ 
+-	/* XXX check allocation failure */
+	if (!packet) {
+		*status = SANE_STATUS_NO_MEM;
+		return 0;
+	}
+ 
+ 	h1 = packet;
+ 	h2 = packet + 12;
+ 	payload = packet + 12 + 8;
+ 
+ 	if (reply_len) {
+-		s->netbuf = s->netptr = malloc(reply_len);
+		if (s->netbuf) {
+			DBG(23, "%s, freeing %p, %ld bytes unprocessed\n",
+				__func__, s->netbuf, (u_long) s->netlen);
+			free(s->netbuf);
+			s->netbuf = s->netptr = NULL;
+			s->netlen = 0;
+		}
+		s->netbuf = malloc(reply_len);
+		if (!s->netbuf) {
+			free(packet);
+			*status = SANE_STATUS_NO_MEM;
+			return 0;
+		}
+ 		s->netlen = reply_len;
+-		DBG(24, "allocated %lu bytes at %p\n",
+-			(u_long) reply_len, s->netbuf);
+		DBG(24, "%s: allocated %lu bytes at %p\n", __func__,
+			(u_long) s->netlen, s->netbuf);
+ 	}
+ 
+ 	DBG(24, "%s: cmd = %04x, buf = %p, buf_size = %lu, reply_len = %lu\n",
+diff -up sane-backends-1.0.27/backend/epson2_net.h.epsonds-issues sane-backends-1.0.27/backend/epson2_net.h
+--- sane-backends-1.0.27/backend/epson2_net.h.epsonds-issues	2016-10-06 02:02:57.000000000 +0200
+++ sane-backends-1.0.27/backend/epson2_net.h	2020-07-28 14:51:59.666593530 +0200
+@@ -4,9 +4,9 @@
+ #include <sys/types.h>
+ #include "../include/sane/sane.h"
+ 
+-extern int sanei_epson_net_read(struct Epson_Scanner *s, unsigned char *buf, ssize_t buf_size,
+extern ssize_t sanei_epson_net_read(struct Epson_Scanner *s, unsigned char *buf, ssize_t buf_size,
+ 				SANE_Status *status);
+-extern int sanei_epson_net_write(struct Epson_Scanner *s, unsigned int cmd, const unsigned char *buf,
+extern size_t sanei_epson_net_write(struct Epson_Scanner *s, unsigned int cmd, const unsigned char *buf,
+ 				size_t buf_size, size_t reply_len,
+ 				SANE_Status *status);
+ extern SANE_Status sanei_epson_net_lock(struct Epson_Scanner *s);
--- a/0001-epsonds-Prevent-possible-buffer-overflow-when-readin.patch
+++ b/0001-epsonds-Prevent-possible-buffer-overflow-when-readin.patch
@ -0,0 +1,72 @@
+From b9b0173409df73e235da2aa0dae5edd21fb55967 Mon Sep 17 00:00:00 2001
+From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
+Date: Mon, 27 Apr 2020 18:48:29 +0900
+Subject: [PATCH] epsonds: Prevent possible buffer overflow when reading image
+ data
+
+Addresses GHSL-2020-084, re #279.
+---
+ backend/epsonds-cmd.c |  5 +++++
+ backend/epsonds.c     | 12 +++++++-----
+ backend/epsonds.h     |  1 +
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/backend/epsonds-cmd.c b/backend/epsonds-cmd.c
+index 9a4db3080..c182aa51a 100644
+--- a/backend/epsonds-cmd.c
+++ b/backend/epsonds-cmd.c
+@@ -876,6 +876,11 @@ esci2_img(struct epsonds_scanner *s, SANE_Int *length)
+ 		return parse_status;
+ 	}
+ 
+	/* more data than was accounted for in s->buf */
+	if (more > s->bsz) {
+		return SANE_STATUS_IO_ERROR;
+	}
+
+ 	/* ALWAYS read image data */
+ 	if (s->hw->connection == SANE_EPSONDS_NET) {
+ 		epsonds_net_request_read(s, more);
+diff --git a/backend/epsonds.c b/backend/epsonds.c
+index ff5d68106..fb9694a88 100644
+--- a/backend/epsonds.c
+++ b/backend/epsonds.c
+@@ -1230,16 +1230,18 @@ sane_start(SANE_Handle handle)
+ 	if (s->line_buffer == NULL)
+ 		return SANE_STATUS_NO_MEM;
+ 
+-	/* ring buffer for front page, twice bsz */
+	/* transfer buffer size, bsz */
+ 	/* XXX read value from scanner */
+-	status = eds_ring_init(&s->front, (65536 * 4) * 2);
+	s->bsz = (65536 * 4);
+
+	/* ring buffer for front page */
+	status = eds_ring_init(&s->front, s->bsz * 2);
+ 	if (status != SANE_STATUS_GOOD) {
+ 		return status;
+ 	}
+ 
+-	/* transfer buffer, bsz */
+-	/* XXX read value from scanner */
+-	s->buf = realloc(s->buf, 65536 * 4);
+	/* transfer buffer */
+	s->buf = realloc(s->buf, s->bsz);
+ 	if (s->buf == NULL)
+ 		return SANE_STATUS_NO_MEM;
+ 
+diff --git a/backend/epsonds.h b/backend/epsonds.h
+index 0427ef3b4..401b0f32c 100644
+--- a/backend/epsonds.h
+++ b/backend/epsonds.h
+@@ -160,6 +160,7 @@ struct epsonds_scanner
+ 	Option_Value val[NUM_OPTIONS];
+ 	SANE_Parameters params;
+ 
+	size_t bsz;		/* transfer buffer size */
+ 	SANE_Byte *buf, *line_buffer;
+ 	ring_buffer *current, front, back;
+ 
+-- 
+2.25.4
+
--- a/66-saned.rules
+++ b/66-saned.rules
@ -0,0 +1,2 @@
+# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+ENV{libsane_matched}=="yes", RUN+="/usr/bin/setfacl -m g:saned:rw $env{DEVNAME}"
--- a/1
+++ b/1
@ -1 +0,0 @@
- 
--- a/README.Fedora
+++ b/README.Fedora
@ -0,0 +1,28 @@
+README.Fedora
+-------------
+
+This file is meant as README for Fedora specific changes for sane-backends
+package.
+
+SANE daemon is moved to subpackage
+----------------------------------
+sane-backends daemon - saned - its manual page and systemd unit files are moved
+into subpackage named sane-backends-daemon. It was done because daemon provides
+access to scanning devices on remote server, which nowadays isn't common 
+usage of sane-backends, so it wasn't necessary to ship it with main package.
+
+Several scanners need proprietary driver for working
+----------------------------------------------------
+Several scanners (e.g. Samsung, Brother, Epson) sometimes need special backends,
+whose isn't shipped with sane-backends or cannot be shipped in Fedora because of
+licensing problem. If your scanner isn't working with basic sane-backends:
+
+1) if your scanner is Epson, try to install iscan-firmware package or Image Scan from Epson official site
+2) if your scanner is Samsung, try to find driver on https://support.hp.com/gb-en/drivers/selfservice/
+3) if your scanner is Brother, see http://support.brother.com/g/s/id/linux/en/download_scn.html
+
+Ad2) Samsung proprietary driver is needed when user needs JPEG compression - this
+feature support was added to sane-backends upstream by commit 926bfade544de4a4fd5,
+which contained patches from Samsung. But this commit broke scanning for Samsung
+scanners, so this patch was reverted with consequences of losing JPEG compression 
+feature for Samsung scanners.
--- a/sane-backends-1.0.23-sane-config-multilib.patch
+++ b/sane-backends-1.0.23-sane-config-multilib.patch
@ -0,0 +1,36 @@
+From d0c61e7e9b13185f424dff1f4ac697ec53089d69 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Tue, 4 Sep 2012 16:45:14 +0200
+Subject: [PATCH] patch: sane-config-multilib
+
+Squashed commit of the following:
+
+commit 81aa4f41bf102b08258c8e1de1c0476835329ec5
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Tue Sep 4 16:43:34 2012 +0200
+
+    make installed sane-config multi-lib aware again
+
+    This partially reverts commit 77c4ea1a7aa680fb1c3ee4daa1404f21439b2c9b.
+---
+ tools/sane-config.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/tools/sane-config.in b/tools/sane-config.in
+index 8e4b52a..1fae2e5 100644
+--- a/tools/sane-config.in
+++ b/tools/sane-config.in
+@@ -10,10 +10,6 @@ scriptname="sane-config"
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+-# using our installed *.pc only - neither default nor user paths
+-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
+-export PKG_CONFIG_PATH=""
+-
+ pkgconfig_package=sane-backends
+ 
+ usage ()
+-- 
+1.7.11.4
+
--- a/sane-backends-1.0.23-soname.patch
+++ b/sane-backends-1.0.23-soname.patch
@ -0,0 +1,49 @@
+From 031cd8dd376ed6537afd06ca5aec5e67f5da0489 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Fri, 31 Aug 2012 16:14:49 +0200
+Subject: [PATCH] patch: soname
+
+Squashed commit of the following:
+
+commit 2035ced803168210a70c4946814440764e5d0186
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Fri Aug 31 16:13:51 2012 +0200
+
+    don't use the same SONAME for backend libs and main lib
+---
+ ltmain.sh | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index f3eb4c8..17d1508 100755
+--- a/ltmain.sh
+++ b/ltmain.sh
+@@ -8101,25 +8101,6 @@ EOF
+ 	  dlname=$soname
+ 	fi
+ 
+-	# Local change for sane-backends: internal name for every lib
+-	# is "libsane" not "libsane-backendname". So linking to each
+-	# backend is possible. Also the following test was moved to this
+-	# location.
+-	# If -module or -export-dynamic was specified, set the dlname
+-	if test "$module" = yes || test "$export_dynamic" = yes; then
+-	  # On all known operating systems, these are identical.
+-	  dlname="$soname"
+-	fi
+-	case $host in
+-	  *mingw*)
+-	    ;;
+-	  *aix*)
+-	    ;;
+-	  *)
+-	    soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"`
+-	esac
+-	# End of local change
+-
+ 	lib="$output_objdir/$realname"
+ 	linknames=
+ 	for link
+-- 
+1.7.11.4
+
--- a/sane-backends-1.0.25-udev.patch
+++ b/sane-backends-1.0.25-udev.patch
@ -0,0 +1,72 @@
+From 252f347d59fff3ab1877f77a36613b318651725e Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Tue, 8 Oct 2013 16:29:13 +0200
+Subject: [PATCH] patch: udev
+
+Squashed commit of the following:
+
+commit fb6d1f4c0d17f1df33429bf03a64cd4fbb819ea5
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Tue Oct 8 16:24:49 2013 +0200
+
+    adapt generated udev rules for Fedora
+
+commit 8bffaccc1eeb19ecbaddb4ac9da73954af4c5d4f
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Mon Sep 10 12:20:43 2012 +0200
+
+    use group and mode macros consistently
+---
+ tools/sane-desc.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tools/sane-desc.c b/tools/sane-desc.c
+index badc8ce..f992bf5 100644
+--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
+@@ -57,9 +57,9 @@
+ #define COLOR_NEW          "\"#F00000\""
+ #define COLOR_UNKNOWN      "\"#000000\""
+ 
+-#define DEVMODE  "0664"
+#define DEVMODE  "0644"
+ #define DEVOWNER "root"
+-#define DEVGROUP "scanner"
+#define DEVGROUP "root"
+ 
+ #ifndef PATH_MAX
+ # define PATH_MAX 1024
+@@ -3564,7 +3564,8 @@ print_udev (void)
+     }
+ 
+   printf("\n# The following rule will disable USB autosuspend for the device\n");
+-  printf("ENV{libsane_matched}==\"yes\", RUN+=\"/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo on > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo on > /sys/$env{DEVPATH}/power/level; fi'\"\n");
+  printf("ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n");
+  printf("ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
+ 
+   printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
+ 
+@@ -3641,10 +3642,8 @@ print_udev (void)
+     }
+   printf ("LABEL=\"libsane_scsi_rules_end\"\n");
+ 
+-  if (mode == output_mode_udevacl)
+-    printf("\nENV{libsane_matched}==\"yes\", RUN+=\"/bin/setfacl -m g:%s:rw $env{DEVNAME}\"\n", DEVGROUP);
+-  else
+-    printf ("\nENV{libsane_matched}==\"yes\", MODE=\"664\", GROUP=\"scanner\"\n");
+  if (mode != output_mode_udevacl)
+    printf ("\nENV{libsane_matched}==\"yes\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+ 
+   printf ("\nLABEL=\"libsane_rules_end\"\n");
+ }
+@@ -3695,6 +3694,7 @@ print_udevhwdb (void)
+ 
+   printf("# The following rule will disable USB autosuspend for the device\n");
+   printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");
+  printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
+ 
+   printf ("SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n");
+   printf ("GOTO=\"libsane_rules_end\"\n\n");
+-- 
+2.5.0
+
--- a/sane-backends-canon-lide-100.patch
+++ b/sane-backends-canon-lide-100.patch
@ -0,0 +1,17 @@
+diff -up sane-backends-1.0.27/backend/genesys.c.canon-lide-100 sane-backends-1.0.27/backend/genesys.c
+--- sane-backends-1.0.27/backend/genesys.c.canon-lide-100	2018-02-01 10:37:26.160044539 +0100
+++ sane-backends-1.0.27/backend/genesys.c	2018-02-01 10:45:44.616653277 +0100
+@@ -2070,11 +2070,9 @@ genesys_white_shading_calibration (Genes
+   dev->model->cmd_set->set_lamp_power (dev, dev->calib_reg, SANE_TRUE);
+   dev->model->cmd_set->set_motor_power (dev->calib_reg, motor);
+ 
+-  /* if needed, go back before doin next scan, by using rewind, registers and
+-   * slopes table are kept intact from previous scan */
+-  if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK && dev->model->cmd_set->rewind)
+  if (dev->model->flags & GENESYS_FLAG_SHADING_REPARK)
+     {
+-      status = dev->model->cmd_set->rewind (dev);
+      status = dev->model->cmd_set->slow_back_home (dev, SANE_TRUE);
+     }
+ 
+   status =
--- a/sane-backends-revert-samsung-patch.patch
+++ b/sane-backends-revert-samsung-patch.patch
@ -0,0 +1,406 @@
+From 9b13d4c18b2424eaed02b72a928e9607921ec265 Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Tue, 17 Apr 2018 22:43:15 +0200
+Subject: [PATCH] Revert "Color scanning for Samsung models, which support JPEG
+ Lossy compression."
+
+This reverts commit 926bfade544de4a4fd5f1a8082b85a97e2443770, leaving
+the new IDs in.
+As tracked in #315876, this breaks scanning with multiple Samsung scanners
+
+Conflicts:
+	backend/xerox_mfp.c
+	backend/xerox_mfp.h
+	doc/descriptions/xerox_mfp.desc
+---
+ backend/Makefile.am             |   2 +-
+ backend/Makefile.in             |   7 +-
+ backend/xerox_mfp.c             | 193 +-------------------------------
+ backend/xerox_mfp.h             |   5 -
+ doc/descriptions/xerox_mfp.desc |  10 +-
+ 5 files changed, 14 insertions(+), 203 deletions(-)
+
+diff --git a/backend/Makefile.am b/backend/Makefile.am
+index 18695a4a..3225b133 100644
+--- a/backend/Makefile.am
+++ b/backend/Makefile.am
+@@ -1086,7 +1086,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
+ libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+ EXTRA_DIST += xerox_mfp.conf.in
+ 
+ libdll_preload_la_SOURCES =  dll.c
+diff --git a/backend/Makefile.in b/backend/Makefile.in
+index d1dca4a2..2643bb77 100644
+--- a/backend/Makefile.in
+++ b/backend/Makefile.in
+@@ -1430,10 +1430,9 @@ libsane_v4l_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ libsane_xerox_mfp_la_DEPENDENCIES = $(COMMON_LIBS) libxerox_mfp.la \
+ 	../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo \
+ 	../sanei/sanei_config.lo sane_strstatus.lo \
+-	$(am__DEPENDENCIES_1) ../sanei/sanei_usb.lo \
+-	../sanei/sanei_tcp.lo $(am__DEPENDENCIES_1) \
+	../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ nodist_libsane_xerox_mfp_la_OBJECTS =  \
+ 	libsane_xerox_mfp_la-xerox_mfp-s.lo
+ libsane_xerox_mfp_la_OBJECTS = $(nodist_libsane_xerox_mfp_la_OBJECTS)
+@@ -2754,7 +2753,7 @@ libxerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ nodist_libsane_xerox_mfp_la_SOURCES = xerox_mfp-s.c
+ libsane_xerox_mfp_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=xerox_mfp
+ libsane_xerox_mfp_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
+-libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo @SANEI_SANEI_JPEG_LO@ $(JPEG_LIBS) ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
+ libdll_preload_la_SOURCES = dll.c
+ libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
+ libdll_la_SOURCES = dll.c
+diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
+index 8b8c8956..d37a6237 100644
+--- a/backend/xerox_mfp.c
+++ b/backend/xerox_mfp.c
+@@ -33,9 +33,6 @@
+ #include "../include/sane/sanei_usb.h"
+ #include "../include/sane/sanei_config.h"
+ #include "../include/sane/sanei_backend.h"
+-#ifdef HAVE_LIBJPEG
+-#include <jpeglib.h>
+-#endif
+ #include "xerox_mfp.h"
+ 
+ #define BACKEND_BUILD 13
+@@ -93,128 +90,6 @@ static char *str_cmd(int cmd)
+ }
+ 
+ #define MAX_DUMP 70
+-const char *encTmpFileName = "/tmp/stmp_enc.tmp";
+-
+-static int decompress(struct device __sane_unused__ *dev,
+-                      const char __sane_unused__ *infilename)
+-{
+-#ifdef HAVE_LIBJPEG
+-    int rc;
+-    int row_stride, width, height, pixel_size;
+-    struct jpeg_decompress_struct cinfo;
+-    struct jpeg_error_mgr jerr;
+-    unsigned long bmp_size = 0;
+-    FILE *pInfile = NULL;
+-    JSAMPARRAY buffer;
+-
+-    if ((pInfile = fopen(infilename, "rb")) == NULL) {
+-        fprintf(stderr, "can't open %s\n", infilename);
+-        return -1;
+-    }
+-
+-    cinfo.err = jpeg_std_error(&jerr);
+-
+-    jpeg_create_decompress(&cinfo);
+-
+-    jpeg_stdio_src(&cinfo, pInfile);
+-
+-    rc = jpeg_read_header(&cinfo, TRUE);
+-    if (rc != 1) {
+-        jpeg_destroy_decompress(&cinfo);
+-        fclose(pInfile);
+-        return -1;
+-    }
+-
+-    jpeg_start_decompress(&cinfo);
+-
+-    width = cinfo.output_width;
+-    height = cinfo.output_height;
+-    pixel_size = cinfo.output_components;
+-    bmp_size = width * height * pixel_size;
+-    dev->decDataSize = bmp_size;
+-
+-    row_stride = width * pixel_size;
+-
+-    buffer = (*cinfo.mem->alloc_sarray)
+-             ((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
+-
+-    while (cinfo.output_scanline < cinfo.output_height) {
+-        buffer[0] = dev->decData + \
+-                    (cinfo.output_scanline) * row_stride;
+-        jpeg_read_scanlines(&cinfo, buffer, 1);
+-    }
+-    jpeg_finish_decompress(&cinfo);
+-    jpeg_destroy_decompress(&cinfo);
+-    fclose(pInfile);
+-    return 0;
+-#else
+-    return -1;
+-#endif
+-}
+-
+-static int copy_decompress_data(struct device *dev, unsigned char *pDest, int maxlen, int *destLen)
+-{
+-    int data_size = 0;
+-    size_t result = 0, retVal = 0;
+-
+-
+-    if (0 == dev->decDataSize) {
+-        *destLen = 0;
+-        return retVal;
+-    }
+-    data_size = dev->decDataSize - dev->currentDecDataIndex;
+-    if (data_size > maxlen) {
+-        data_size = maxlen;
+-    }
+-    memcpy(pDest, dev->decData+dev->currentDecDataIndex, data_size);
+-    result = data_size;
+-    *destLen = result;
+-    dev->currentDecDataIndex += result;
+-    retVal = result;
+-
+-    if (dev->decDataSize == dev->currentDecDataIndex) {
+-        dev->currentDecDataIndex = 0;
+-        dev->decDataSize = 0;
+-    }
+-
+-    return retVal;
+-}
+-
+-static int decompress_tempfile(struct device *dev)
+-{
+-    decompress(dev, encTmpFileName);
+-    remove(encTmpFileName);
+-    return 0;
+-}
+-
+-static int dump_to_tmp_file(struct device *dev)
+-{
+-    unsigned char *pSrc = dev->data;
+-    int srcLen = dev->datalen;
+-    FILE *pInfile;
+-    if ((pInfile = fopen(encTmpFileName, "a")) == NULL) {
+-        fprintf(stderr, "can't open %s\n", encTmpFileName);
+-        return 0;
+-    }
+-
+-    fwrite(pSrc, 1, srcLen, pInfile);
+-    fclose(pInfile);
+-    return srcLen;
+-}
+-
+-static int isSupportedDevice(struct device __sane_unused__ *dev)
+-{
+-#ifdef HAVE_LIBJPEG
+-    /* Checking device which supports JPEG Lossy compression for color scanning*/
+-    if (dev->compressionTypes & (1 << 6))
+-        return 1;
+-    else
+-        return 0;
+-#else
+-    return 0;
+-#endif
+-}
+-
+ static void dbg_dump(struct device *dev)
+ {
+     int i;
+@@ -639,11 +514,9 @@ static void set_parameters(struct device *dev)
+     dev->para.pixels_per_line = dev->win_width / px_to_len;
+     dev->para.bytes_per_line = dev->para.pixels_per_line;
+ 
+-    if (!isSupportedDevice(dev)) {
+ #if BETTER_BASEDPI
+-        px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
+	px_to_len = 1213.9 / dev->val[OPT_RESOLUTION].w;
+ #endif
+-    }
+     dev->para.lines = dev->win_len / px_to_len;
+     if (dev->composition == MODE_LINEART ||
+         dev->composition == MODE_HALFTONE) {
+@@ -765,13 +638,6 @@ static int dev_set_window(struct device *dev)
+     cmd[0x11] = (SANE_Byte)floor(dev->win_off_y);
+     cmd[0x12] = (SANE_Byte)((dev->win_off_y - floor(dev->win_off_y)) * 100);
+     cmd[0x13] = dev->composition;
+-    /* Set to JPEG Lossy Compression, if mode is color (only for supported model)...
+-     * else go with Uncompressed (For backard compatibility with old models )*/
+-    if (dev->composition == MODE_RGB24) {
+-        if (isSupportedDevice(dev)) {
+-            cmd[0x14] = 0x6;
+-        }
+-    }
+     cmd[0x16] = dev->threshold;
+     cmd[0x17] = dev->doc_source;
+ 
+@@ -843,7 +709,6 @@ dev_inquiry(struct device *dev)
+                       dev->res[0x3e] << 8 |
+                       dev->res[0x3f];
+     dev->line_order = dev->res[0x31];
+-    dev->compressionTypes = dev->res[0x32];
+     dev->doc_loaded = (dev->res[0x35] == 0x02) &&
+                       (dev->res[0x26] & 0x03);
+ 
+@@ -942,10 +807,6 @@ dev_free(struct device *dev)
+         free(UNCONST(dev->sane.type));
+     if (dev->data)
+         free(dev->data);
+-    if (dev->decData) {
+-        free(dev->decData);
+-        dev->decData = NULL;
+-    }
+     memset(dev, 0, sizeof(*dev));
+     free(dev);
+ }
+@@ -1283,19 +1144,6 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+     /* if there is no data to read or output from buffer */
+     if (!dev->blocklen && dev->datalen <= PADDING_SIZE) {
+ 
+-        /* copying uncompressed data */
+-        if (dev->composition == MODE_RGB24 &&
+-            isSupportedDevice(dev) &&
+-            dev->decDataSize > 0) {
+-            int diff = dev->total_img_size - dev->total_out_size;
+-            int bufLen = (diff < maxlen) ? diff : maxlen;
+-            if (0 < diff &&
+-                0 < copy_decompress_data(dev, buf, bufLen, lenp)) {
+-                dev->total_out_size += *lenp;
+-                return SANE_STATUS_GOOD;
+-            }
+-        }
+-
+         /* and we don't need to acquire next block */
+         if (dev->final_block) {
+             int slack = dev->total_img_size - dev->total_out_size;
+@@ -1311,10 +1159,7 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+                 /* this will never happen */
+                 DBG(1, "image overflow %d bytes\n", dev->total_img_size - dev->total_out_size);
+             }
+-            if (isSupportedDevice(dev) &&
+-                dev->composition == MODE_RGB24) {
+-                remove(encTmpFileName);
+-            }
+
+             /* that's all */
+             dev_stop(dev);
+             return SANE_STATUS_EOF;
+@@ -1365,18 +1210,9 @@ sane_read(SANE_Handle h, SANE_Byte *buf, SANE_Int maxlen, SANE_Int *lenp)
+ 
+         if (buf && lenp) { /* read mode */
+             /* copy will do minimal of valid data */
+-            if (dev->para.format == SANE_FRAME_RGB && dev->line_order) {
+-                if (isSupportedDevice(dev)) {
+-                    clrlen = dump_to_tmp_file(dev);
+-                    /* decompress after reading entire block data*/
+-                    if (0 == dev->blocklen) {
+-                        decompress_tempfile(dev);
+-                    }
+-                    copy_decompress_data(dev, buf, maxlen, &olen);
+-                } else {
+-                    clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
+-                }
+-            } else
+            if (dev->para.format == SANE_FRAME_RGB && dev->line_order)
+				clrlen = copy_mix_bands_trim(dev, buf, maxlen, &olen);
+            else
+                 clrlen = copy_plain_trim(dev, buf, maxlen, &olen);
+ 
+             dev->datalen -= clrlen;
+@@ -1455,9 +1291,6 @@ sane_start(SANE_Handle h)
+     if (!dev->data && !(dev->data = malloc(DATASIZE)))
+         return ret_cancel(dev, SANE_STATUS_NO_MEM);
+ 
+-    if (!dev->decData && !(dev->decData = malloc(POST_DATASIZE)))
+-        return ret_cancel(dev, SANE_STATUS_NO_MEM);
+-
+     if (!dev_acquire(dev))
+         return dev->state;
+ 
+@@ -1479,22 +1312,6 @@ sane_start(SANE_Handle h)
+ 
+     dev->total_img_size = dev->para.bytes_per_line * dev->para.lines;
+ 
+-    if (isSupportedDevice(dev) &&
+-        dev->composition == MODE_RGB24) {
+-	int fd;
+-        remove(encTmpFileName);
+-
+-	/* Precreate temporary file in exclusive mode. */
+-	fd = open(encTmpFileName, O_CREAT|O_EXCL, 0600);
+-	if (fd == -1) {
+-	    DBG(3, "%s: %p, can't create temporary file %s: %s\n", __func__,
+-		(void *)dev, encTmpFileName, strerror(errno));
+-	    return ret_cancel(dev, SANE_STATUS_ACCESS_DENIED);
+-	}
+-	close(fd);
+-    }
+-    dev->currentDecDataIndex = 0;
+-
+     return SANE_STATUS_GOOD;
+ }
+ 
+diff --git a/backend/xerox_mfp.h b/backend/xerox_mfp.h
+index 3d93f06d..ea89dda2 100644
+--- a/backend/xerox_mfp.h
+++ b/backend/xerox_mfp.h
+@@ -74,10 +74,6 @@ struct device {
+ #define DATATAIL(dev) ((dev->dataoff + dev->datalen) & DATAMASK)
+ #define DATAROOM(dev) dataroom(dev)
+ 
+-#define POST_DATASIZE 0xFFFFFF
+-    SANE_Byte *decData;
+-    int decDataSize;
+-    int currentDecDataIndex;
+     /* data from CMD_INQUIRY: */
+     int resolutions;		/* supported resolution bitmask */
+     int compositions;		/* supported image compositions bitmask */
+@@ -102,7 +98,6 @@ struct device {
+     int composition;		/* MODE_ */
+     int doc_source;		/* document source */
+     int threshold;		/* brightness */
+-    int compressionTypes;
+ 
+     /* CMD_READ data. It is per block only, image could be in many blocks */
+     int blocklen;			/* image data block len (padding incl.) */
+diff --git a/doc/descriptions/xerox_mfp.desc b/doc/descriptions/xerox_mfp.desc
+index d21a6be6..67253b38 100644
+--- a/doc/descriptions/xerox_mfp.desc
+++ b/doc/descriptions/xerox_mfp.desc
+@@ -320,7 +320,7 @@
+ 
+ :model "SCX-3405W"
+ :interface "Ethernet"
+-:status :good
+:status :basic
+ 
+ :model "SCX-3400"
+ :interface "USB"
+@@ -335,17 +335,17 @@
+ :model "SCX-4729FD"
+ :interface "USB"
+ :usbid "0x04e8" "0x3453"
+-:status :good
+:status :basic
+ 
+ :model "CLX-6260"
+ :interface "USB"
+ :usbid "0x04e8" "0x3455"
+-:status :good
+:status :minimal
+ 
+ :model "CLX-3300 Series"
+ :interface "USB"
+ :usbid "0x04e8" "0x3456"
+-:status :good
+:status :basic
+ 
+ :model "SCX-470x"
+ :interface "USB"
+@@ -355,7 +355,7 @@
+ :model "CLX-4190"
+ :interface "USB"
+ :usbid "0x04e8" "0x345a"
+-:status :good
+:status :minimal
+ 
+ :model "SCX-4650 4x21S Series"
+ :interface "USB"
+-- 
+2.17.0
+
--- a/sane-backends-saned-manpage.patch
+++ b/sane-backends-saned-manpage.patch
@ -0,0 +1,28 @@
+diff -up sane-backends-1.0.27/doc/saned.man.saned-manpage sane-backends-1.0.27/doc/saned.man
+--- sane-backends-1.0.27/doc/saned.man.saned-manpage	2017-11-27 12:42:05.077326419 +0100
+++ sane-backends-1.0.27/doc/saned.man	2017-11-27 12:43:21.169769553 +0100
+@@ -223,8 +223,22 @@ installed on the system. this is the pre
+ Saned can be used wih systemd without the systemd integration 
+ compiled in, but then logging of debug information is not supported. 
+ 
+-The systemd configuration is different for the 2 options, so
+-both are described below.
+The systemd configuration is different for the 2 options, but you need
+to create unit files in both options and then run as root:
+.PP
+.RS
+systemctl start saned.socket
+.RE
+.PP
+to start saned. If you want to have saned.socket running after startup, run as
+root: 
+.PP
+.RS
+systemctl enable saned.socket
+.RE
+.PP
+
+The systemd configuration of both options is described below.
+ .SH Systemd configuration for saned with systemd support compiled in
+ for the systemd configuration we need to add 2 configuration files in
+ .I /etc/systemd/system.
--- a/sane-backends.spec
+++ b/sane-backends.spec
--- a/saned.socket
+++ b/saned.socket
@ -0,0 +1,10 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+MaxConnections=1
+
+[Install]
+WantedBy=sockets.target
--- a/saned@.service.in
+++ b/saned@.service.in
@ -0,0 +1,18 @@
+[Unit]
+Description=Scanner Service
+Requires=saned.socket
+
+[Service]
+ExecStart=/usr/sbin/saned
+User=saned
+Group=saned
+StandardInput=null
+StandardOutput=syslog
+StandardError=syslog
+Environment=SANE_CONFIG_DIR=@CONFIGDIR@
+# If you need to debug your configuration uncomment the next line and
+# change it as appropriate to set the desired debug options
+# Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_NET=255
+
+[Install]
+Also=saned.socket
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+SHA512 (sane-backends-1.0.27.tar.gz) = c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
+SHA512 (sane.png) = aa88a56f992b94c775358f78a5466535673d11a12a2c14cf29009878477879aa82f58b8ed8e226f3bc2c4d33cddd87024a4ba104d03235106a69082ed3295714