X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Fsane-backends;h=c747e2f6050895084568a0a752a9058630923c07;hb=78453e212ec7952477a5de2f702bfcab54e7a89c;hp=695a11d77cc7e06b60bddd6c53e7ea492866a29c;hpb=66f439f5c705ed61c76f7839cec305674661b7e8;p=hvlinux.git

diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends
index 695a11d..c747e2f 100644
--- a/stage5/pkg/sane-backends
+++ b/stage5/pkg/sane-backends
@@ -10,22 +10,26 @@ hvconfig_pre()
         USE_X_OPTION="no"
     fi
 
-    hv_groupadd saned
-    hv_useradd -c saned -d /dev/null -g saned -s /bin/false saned
+    # Add group for UDEV rules
+    groupadd --system -f scanner
 
-    # Fixes an obsolete udev parameter:
-    sed -i 's/SYSFS/ATTRS/g' ${LFS_TMP}/${PACKAGE}/tools/sane-desc.c
+    # Group for sane server
+    hv_useradd --system -c saned -d /dev/null -g scanner -s /bin/false saned
 
-    CONFIGURE_OPTS=" \
-        ${CONFIGURE_OPTS} \
-        --with-x=${USE_X_OPTION}"
+    CONFIGURE_OPTS+=" \
+        --with-x=${USE_X_OPTION} \
+        --localstatedir=/var \
+        --with-group=scanner \
+        --enable-libusb_1_0"
 }
 
 hvbuild_post()
 {
-    install -m 644 -v tools/udev/libsane.rules \
+    install -v -m 644 tools/udev/libsane.rules \
         /etc/udev/rules.d/65-scanner.rules
 
+    chgrp -v scanner /var/lock/sane
+
     # Addition to /etc/services (for both the client and server)
     string_add "sane      6566/tcp   saned # SANE Network Scanner Daemon" \
         /etc/services
@@ -36,13 +40,13 @@ hvbuild_post()
     if [ -z "${SANE_SERVER}" ]; then
         # If 'SANE_SERVER' is not defined, then we automatically configure for
         # the SANE Network Daemon.
-    
+
         # Adding entry to '/etc/sane.d/dll.conf'
         #######echo "${SANE_DRIVER}" >> /etc/sane.d/dll.conf
 
         # Creating '/etc/sane.d/saned.conf'
         echo "${LAN_NETWORK_MASK}" > /etc/sane.d/saned.conf
-    
+
         # Addition to xinetd
         cat > /etc/xinetd.d/saned << "EOF"
 service sane
@@ -52,6 +56,7 @@ service sane
    protocol       = tcp
    wait           = no
    user           = saned
+   group          = scanner
    server         = /usr/sbin/saned
    log_type       = SYSLOG local4 info
 }