From 623d66853bf9c3b51e84ba9990614b4b0fddb332 Mon Sep 17 00:00:00 2001
From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
Date: Sun, 27 Oct 2019 23:58:34 -0300
Subject: sane-backends: update to 1.0.28 (WIP)

Just Need runtime tests

* libsane dependency on libusb moved to those drivers that requires it
* clean up some ./configure args
* added saned-ricoh2 for new backend
* enabled saned-gphoto2 (after c8fbe26c532aced97ab8a4d42f1289db2a3e6d65)
* disabled kvs40xx and mustek_usb2 that requires pthread while the issue is
not solved (https://gitlab.com/sane-project/backends/issues/153)
* patches refreshed:
 - 002-remove-uneeded.patch
* patches dropped:
 - 031-fix_uclibc.patch
 - 050-remove_linked_libs_for_unused_preload.patch (with --disable-preload)

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
---
 utils/sane-backends/files/etc/xinetd.d/sane-port | 14 --------------
 utils/sane-backends/files/saned.sbin             | 24 ++++++++++++++++++++++++
 utils/sane-backends/files/saned.xinetd           | 15 +++++++++++++++
 utils/sane-backends/files/usr/sbin/saned         | 24 ------------------------
 4 files changed, 39 insertions(+), 38 deletions(-)
 delete mode 100644 utils/sane-backends/files/etc/xinetd.d/sane-port
 create mode 100755 utils/sane-backends/files/saned.sbin
 create mode 100644 utils/sane-backends/files/saned.xinetd
 delete mode 100755 utils/sane-backends/files/usr/sbin/saned

(limited to 'utils/sane-backends/files')

diff --git a/utils/sane-backends/files/etc/xinetd.d/sane-port b/utils/sane-backends/files/etc/xinetd.d/sane-port
deleted file mode 100644
index 9119973f6..000000000
--- a/utils/sane-backends/files/etc/xinetd.d/sane-port
+++ /dev/null
@@ -1,14 +0,0 @@
-# default: off
-# description: The saned provides scanner service via the network.  \
-#	Applications like kooka, xsane or xscanimage can use the remote \
-#	scanner. 
-service sane-port
-{
-	socket_type = stream
-	port        = 6566
-	wait        = no
-	user        = root
-	group       = root
-	server      = /usr/sbin/saned
-	disable     = yes
-}
diff --git a/utils/sane-backends/files/saned.sbin b/utils/sane-backends/files/saned.sbin
new file mode 100755
index 000000000..711492633
--- /dev/null
+++ b/utils/sane-backends/files/saned.sbin
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+usblp_driver="/sys/bus/usb/drivers/usblp"
+
+inuse=""
+if [ -e /sys/bus/usb/devices ]; then
+	for usbdev_driver in /sys/bus/usb/devices/*/driver; do
+		[ -e "$usbdev_driver" ] || continue
+		[ "$(readlink -f "$usbdev_driver")" = "$usblp_driver" ] || continue
+		usbdev="${usbdev_driver%/*}"
+		inuse="$inuse ${usbdev##*/}"
+	done
+fi
+
+/usr/lib/sane/saned "$@"
+err=$?
+
+for usbdev in $inuse; do
+	[ -e "/sys/bus/usb/devices/$usbdev/driver" ] && continue
+	logger -t saned "binding device $usbdev back to usblp..."
+	printf '%s' "$usbdev" > "$usblp_driver/bind"
+done
+
+exit $err
diff --git a/utils/sane-backends/files/saned.xinetd b/utils/sane-backends/files/saned.xinetd
new file mode 100644
index 000000000..bc4dff8a7
--- /dev/null
+++ b/utils/sane-backends/files/saned.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# description: The saned provides scanner service via the network.  \
+#	Applications like kooka, xsane or xscanimage can use the remote \
+#	scanner. 
+service sane-port
+{
+	socket_type = stream
+	port        = 6566
+	wait        = no
+	user        = root
+#	user        = saned
+	group       = scanner
+	server      = /usr/sbin/saned
+	disable     = yes
+}
diff --git a/utils/sane-backends/files/usr/sbin/saned b/utils/sane-backends/files/usr/sbin/saned
deleted file mode 100755
index 711492633..000000000
--- a/utils/sane-backends/files/usr/sbin/saned
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-usblp_driver="/sys/bus/usb/drivers/usblp"
-
-inuse=""
-if [ -e /sys/bus/usb/devices ]; then
-	for usbdev_driver in /sys/bus/usb/devices/*/driver; do
-		[ -e "$usbdev_driver" ] || continue
-		[ "$(readlink -f "$usbdev_driver")" = "$usblp_driver" ] || continue
-		usbdev="${usbdev_driver%/*}"
-		inuse="$inuse ${usbdev##*/}"
-	done
-fi
-
-/usr/lib/sane/saned "$@"
-err=$?
-
-for usbdev in $inuse; do
-	[ -e "/sys/bus/usb/devices/$usbdev/driver" ] && continue
-	logger -t saned "binding device $usbdev back to usblp..."
-	printf '%s' "$usbdev" > "$usblp_driver/bind"
-done
-
-exit $err
-- 
cgit v1.2.3