Upgrade to evince-3.14.1

[hvlinux.git] / stage5 / pkg / sane-backends

diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends
index 260dc6b..c747e2f 100644 (file)
--- a/stage5/pkg/sane-backends
+++ b/stage5/pkg/sane-backends
@@ -11,17 +11,16 @@ hvconfig_pre()
     fi
 
     # Add group for UDEV rules
-    hv_groupadd scanner
+    groupadd --system -f scanner
 
-    hv_groupadd saned
-    hv_useradd -c saned -d /dev/null -g saned -s /bin/false saned
+    # Group for sane server
+    hv_useradd --system -c saned -d /dev/null -g scanner -s /bin/false saned
 
-    # Fixes an obsolete udev parameter:
-    sed -i 's/SYSFS/ATTRS/g' ${LFS_TMP}/${PACKAGE}/tools/sane-desc.c
-
-    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()
@@ -29,6 +28,8 @@ hvbuild_post()
     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
@@ -55,6 +56,7 @@ service sane
    protocol       = tcp
    wait           = no
    user           = saned
+   group          = scanner
    server         = /usr/sbin/saned
    log_type       = SYSLOG local4 info
 }