[arch-commits] Commit in sane/trunk (5 files)

[David Runge]

    Date: Tuesday, February 16, 2021 @ 10:47:49
  Author: dvzrv
Revision: 408211

upgpkg: sane 1.0.32-2: Rebuild to fix problems with svn and overlinking.

Rename the saned at .service to saned.service, because svn is silly and has
issues with @ in file names.
Manipulate libtool after configure to circumenvent overlinking of libraries.

Added:
  sane/trunk/66-saned.rules
  sane/trunk/sane.sysusers
  sane/trunk/saned.service
Modified:
  sane/trunk/PKGBUILD
Deleted:
  sane/trunk/saned at .service

----------------+
 66-saned.rules |    2 ++
 PKGBUILD       |   21 +++++++++++++--------
 sane.sysusers  |    1 +
 saned.service  |   18 ++++++++++++++++++
 saned at .service |   18 ------------------
 5 files changed, 34 insertions(+), 26 deletions(-)

Added: 66-saned.rules
===================================================================
--- 66-saned.rules	                        (rev 0)
+++ 66-saned.rules	2021-02-16 10:47:49 UTC (rev 408211)
@@ -0,0 +1,2 @@
+# udev rule for saned (SANE scanning daemon) to be able to write on usb port
+ENV{libsane_matched}=="yes", ENV{DEVNAME}!="", RUN+="/usr/bin/setfacl -m g:saned:rw $env{DEVNAME}"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-16 10:27:45 UTC (rev 408210)
+++ PKGBUILD	2021-02-16 10:47:49 UTC (rev 408211)
@@ -7,7 +7,7 @@
 _name=backends
 pkgname=sane
 pkgver=1.0.32
-pkgrel=1
+pkgrel=2
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('x86_64')
@@ -22,19 +22,19 @@
 source=("https://gitlab.com/sane-project/${_name}/-/archive/${pkgver}/${_name}-${pkgver}.tar.gz"
         "66-${pkgname}d.rules"
         "${pkgname}.sysusers"
+        "${pkgname}d.service"
         "${pkgname}d.socket"
-        "${pkgname}d at .service"
 )
 sha512sums=('a0f6b185704af2a34f67587ef79af3fd5f54dbe540a08a8db4cebd502d08217d07a5a19a855020a772509b6679f53cb028108e62c3aff4847f8a816e7ba16b6c'
             'd0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41'
             'd8cd194b57eff2249df2b8d540a892e518aa3e3bba6387211ed21230dc235e98c49b71f262f0b1007e8c859c59776410840376244e0aec1f06363881b2c81fd8'
-            'a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093'
-            'baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47')
+            'baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47'
+            'a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093')
 b2sums=('e2e0c617a2e9ec45f5dd3aa8e393b54a52ecb6543ac0e7057a9b4306493fe578de006bf0d8fa128f4d1925cfb6524eb56d15565baaf41045b3b32d5af2cd8dfa'
         'c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27'
         '2a4ddc9849562e3a0adcaec1859391e3f37a63f25c27dbc140cabd697bd65b89a0fc812c4516cbdfb36d1f30844df34934b3c1c59650101f54fc1ac0acb3f5d9'
-        '5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9'
-        '272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802')
+        '272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802'
+        '5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9')
 
 prepare() {
   cd "${_name}-${pkgver}"
@@ -63,6 +63,11 @@
     --with-poppler-glib \
     --with-systemd \
     --with-usb
+
+  # circumvent overlinking in libraries
+  sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
+      -i libtool
+
   make
 }
 
@@ -89,8 +94,8 @@
   # systemd integration
   install -vDm 644 "../${pkgname}d.socket" \
       -t "${pkgdir}/usr/lib/systemd/system/"
-  install -vDm 644 "../${pkgname}d at .service" \
-      -t "${pkgdir}/usr/lib/systemd/system/"
+  install -vDm 644 "../${pkgname}d.service" \
+      "${pkgdir}/usr/lib/systemd/system/${pkgname}d at .service"
   install -vDm 644 "../66-${pkgname}d.rules" "${pkgdir}/usr/lib/udev/rules.d/"
   # sysusers.d
   install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"

Added: sane.sysusers
===================================================================
--- sane.sysusers	                        (rev 0)
+++ sane.sysusers	2021-02-16 10:47:49 UTC (rev 408211)
@@ -0,0 +1 @@
+u saned - "SANE daemon user" - -

Added: saned.service
===================================================================
--- saned.service	                        (rev 0)
+++ saned.service	2021-02-16 10:47:49 UTC (rev 408211)
@@ -0,0 +1,18 @@
+[Unit]
+Description=Scanner Service
+Requires=saned.socket
+
+[Service]
+User=saned
+Group=saned
+ExecStart=/usr/bin/saned
+StandardInput=null
+StandardOutput=journal
+StandardError=journal
+Environment=SANE_CONFIG_DIR=/etc/sane.d
+# 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

Deleted: saned at .service
===================================================================
--- saned at .service	2021-02-16 10:27:45 UTC (rev 408210)
+++ saned at .service	2021-02-16 10:47:49 UTC (rev 408211)
@@ -1,18 +0,0 @@
-[Unit]
-Description=Scanner Service
-Requires=saned.socket
-
-[Service]
-User=saned
-Group=saned
-ExecStart=/usr/bin/saned
-StandardInput=null
-StandardOutput=journal
-StandardError=journal
-Environment=SANE_CONFIG_DIR=/etc/sane.d
-# 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