[arch-commits] Commit in sane/repos/testing-x86_64 (8 files)
David Runge
dvzrv at archlinux.org
Tue Feb 16 10:48:01 UTC 2021
Date: Tuesday, February 16, 2021 @ 10:48:01
Author: dvzrv
Revision: 408212
archrelease: copy trunk to testing-x86_64
Added:
sane/repos/testing-x86_64/66-saned.rules
(from rev 408211, sane/trunk/66-saned.rules)
sane/repos/testing-x86_64/PKGBUILD
(from rev 408211, sane/trunk/PKGBUILD)
sane/repos/testing-x86_64/sane.sysusers
(from rev 408211, sane/trunk/sane.sysusers)
sane/repos/testing-x86_64/saned.service
(from rev 408211, sane/trunk/saned.service)
sane/repos/testing-x86_64/saned.socket
(from rev 408211, sane/trunk/saned.socket)
Deleted:
sane/repos/testing-x86_64/PKGBUILD
sane/repos/testing-x86_64/saned.socket
sane/repos/testing-x86_64/saned at .service
----------------+
66-saned.rules | 2
PKGBUILD | 211 ++++++++++++++++++++++++++++---------------------------
sane.sysusers | 1
saned.service | 18 ++++
saned.socket | 20 ++---
saned at .service | 18 ----
6 files changed, 139 insertions(+), 131 deletions(-)
Copied: sane/repos/testing-x86_64/66-saned.rules (from rev 408211, sane/trunk/66-saned.rules)
===================================================================
--- 66-saned.rules (rev 0)
+++ 66-saned.rules 2021-02-16 10:48:01 UTC (rev 408212)
@@ -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}"
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-16 10:47:49 UTC (rev 408211)
+++ PKGBUILD 2021-02-16 10:48:01 UTC (rev 408212)
@@ -1,103 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Simo L. <neotuli at yahoo.com>
-# Contributor: eric <eric at archlinux.org>
-
-_name=backends
-pkgname=sane
-pkgver=1.0.32
-pkgrel=1
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('x86_64')
-license=('GPL2')
-# NOTE: libgphoto2 can be moved to makedepends once the package also provides
-# libgphoto2_port.so
-depends=('bash' 'cairo' 'gcc-libs' 'glibc' 'libgphoto2' 'libnl'
-'libpng' 'libxml2' 'libieee1284' 'net-snmp' 'openssl' 'v4l-utils')
-makedepends=('autoconf-archive' 'avahi' 'curl' 'glib2' 'libjpeg-turbo'
-'libtiff' 'libusb' 'poppler-glib' 'python' 'systemd' 'texlive-latexextra')
-provides=('libsane.so')
-source=("https://gitlab.com/sane-project/${_name}/-/archive/${pkgver}/${_name}-${pkgver}.tar.gz"
- "66-${pkgname}d.rules"
- "${pkgname}.sysusers"
- "${pkgname}d.socket"
- "${pkgname}d at .service"
-)
-sha512sums=('a0f6b185704af2a34f67587ef79af3fd5f54dbe540a08a8db4cebd502d08217d07a5a19a855020a772509b6679f53cb028108e62c3aff4847f8a816e7ba16b6c'
- 'd0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41'
- 'd8cd194b57eff2249df2b8d540a892e518aa3e3bba6387211ed21230dc235e98c49b71f262f0b1007e8c859c59776410840376244e0aec1f06363881b2c81fd8'
- 'a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093'
- 'baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47')
-b2sums=('e2e0c617a2e9ec45f5dd3aa8e393b54a52ecb6543ac0e7057a9b4306493fe578de006bf0d8fa128f4d1925cfb6524eb56d15565baaf41045b3b32d5af2cd8dfa'
- 'c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27'
- '2a4ddc9849562e3a0adcaec1859391e3f37a63f25c27dbc140cabd697bd65b89a0fc812c4516cbdfb36d1f30844df34934b3c1c59650101f54fc1ac0acb3f5d9'
- '5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9'
- '272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802')
-
-prepare() {
- cd "${_name}-${pkgver}"
- # create version files, so that autotools macros can use them:
- # https://gitlab.com/sane-project/backends/-/issues/440
- echo "${pkgver}" > .tarball-version
- echo "${pkgver}" > .version
- autoreconf -fiv
-}
-
-build() {
- cd "${_name}-${pkgver}"
-
- ./configure --prefix=/usr \
- --disable-rpath \
- --docdir="/usr/share/doc/${pkgname}" \
- --enable-locking \
- --enable-pthread \
- --enable-pnm-backend \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --with-avahi \
- --with-libcurl \
- --with-pic \
- --with-poppler-glib \
- --with-systemd \
- --with-usb
- make
-}
-
-package() {
- depends+=('libavahi-client.so' 'libavahi-common.so' 'libcurl.so'
- 'libgphoto2.so' 'libglib-2.0.so' 'libgobject-2.0.so' 'libpoppler-glib.so'
- 'libsystemd.so' 'libtiff.so' 'libusb-1.0.so')
-
- cd "${_name}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- # generate udev udev+hwdb
- install -vdm 755 "${pkgdir}/usr/lib/udev/rules.d/"
- tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${pkgdir}/usr/lib/udev/rules.d/65-${pkgname}.rules"
- tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${pkgdir}/usr/lib/udev/rules.d/65-${pkgname}.rules"
- # generate udev hwdb
- install -vdm 755 "${pkgdir}/usr/lib/udev/hwdb.d/"
- tools/sane-desc -m hwdb -s doc/descriptions/ > "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb"
- # NOTE: an empty new line is required between the two .desc collections
- printf "\n" >> "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb"
- tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb"
-
- # 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 "../66-${pkgname}d.rules" "${pkgdir}/usr/lib/udev/rules.d/"
- # sysusers.d
- install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-
- # add files below /etc/sane.d to backup array
- cd "${pkgdir}"
- # trick extract_function_variable() in makepkg into not detecting the
- # backup array modification and adding remaining configuration files
- [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) )
-}
Copied: sane/repos/testing-x86_64/PKGBUILD (from rev 408211, sane/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-16 10:48:01 UTC (rev 408212)
@@ -0,0 +1,108 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Simo L. <neotuli at yahoo.com>
+# Contributor: eric <eric at archlinux.org>
+
+_name=backends
+pkgname=sane
+pkgver=1.0.32
+pkgrel=2
+pkgdesc="Scanner Access Now Easy"
+url="http://www.sane-project.org/"
+arch=('x86_64')
+license=('GPL2')
+# NOTE: libgphoto2 can be moved to makedepends once the package also provides
+# libgphoto2_port.so
+depends=('bash' 'cairo' 'gcc-libs' 'glibc' 'libgphoto2' 'libnl'
+'libpng' 'libxml2' 'libieee1284' 'net-snmp' 'openssl' 'v4l-utils')
+makedepends=('autoconf-archive' 'avahi' 'curl' 'glib2' 'libjpeg-turbo'
+'libtiff' 'libusb' 'poppler-glib' 'python' 'systemd' 'texlive-latexextra')
+provides=('libsane.so')
+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"
+)
+sha512sums=('a0f6b185704af2a34f67587ef79af3fd5f54dbe540a08a8db4cebd502d08217d07a5a19a855020a772509b6679f53cb028108e62c3aff4847f8a816e7ba16b6c'
+ 'd0d1b6bd6fbb04d610e7186e26d04c2233a620cc7c731ca3acd7fb860dd033fbe99d8974ffa1dd59c8affcc4aa2664d76ab3dfd6f7b2a734b31d7e3832359c41'
+ 'd8cd194b57eff2249df2b8d540a892e518aa3e3bba6387211ed21230dc235e98c49b71f262f0b1007e8c859c59776410840376244e0aec1f06363881b2c81fd8'
+ 'baf2cf2fdff689f776973ac4f69ea02b131f2a1a754a8d52a8e8ad33b0e559ba286649a891723a7ad94b2bcb01ec88155d43c36eaeb35e47fbc8ea80c49c5d47'
+ 'a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093')
+b2sums=('e2e0c617a2e9ec45f5dd3aa8e393b54a52ecb6543ac0e7057a9b4306493fe578de006bf0d8fa128f4d1925cfb6524eb56d15565baaf41045b3b32d5af2cd8dfa'
+ 'c9c6ba224b9b27f4ecc6b1ded6621a8abb52b1ded2d9078e4cad31177290b788e286fad74545a5cb09e1f6726515adc22003988eb646dc986e87f1a8061a0e27'
+ '2a4ddc9849562e3a0adcaec1859391e3f37a63f25c27dbc140cabd697bd65b89a0fc812c4516cbdfb36d1f30844df34934b3c1c59650101f54fc1ac0acb3f5d9'
+ '272b4860dbd3f2b69eedfed4532cf8a388629c003c9a0e0ee98defbc2023e07edc26275a17f56ea9fd4d90e9b3b6532c5b10d1e2b91e6ab4df242ac44101d802'
+ '5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9')
+
+prepare() {
+ cd "${_name}-${pkgver}"
+ # create version files, so that autotools macros can use them:
+ # https://gitlab.com/sane-project/backends/-/issues/440
+ echo "${pkgver}" > .tarball-version
+ echo "${pkgver}" > .version
+ autoreconf -fiv
+}
+
+build() {
+ cd "${_name}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --disable-rpath \
+ --docdir="/usr/share/doc/${pkgname}" \
+ --enable-locking \
+ --enable-pthread \
+ --enable-pnm-backend \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --with-avahi \
+ --with-libcurl \
+ --with-pic \
+ --with-poppler-glib \
+ --with-systemd \
+ --with-usb
+
+ # circumvent overlinking in libraries
+ sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \
+ -i libtool
+
+ make
+}
+
+package() {
+ depends+=('libavahi-client.so' 'libavahi-common.so' 'libcurl.so'
+ 'libgphoto2.so' 'libglib-2.0.so' 'libgobject-2.0.so' 'libpoppler-glib.so'
+ 'libsystemd.so' 'libtiff.so' 'libusb-1.0.so')
+
+ cd "${_name}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ # generate udev udev+hwdb
+ install -vdm 755 "${pkgdir}/usr/lib/udev/rules.d/"
+ tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${pkgdir}/usr/lib/udev/rules.d/65-${pkgname}.rules"
+ tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${pkgdir}/usr/lib/udev/rules.d/65-${pkgname}.rules"
+ # generate udev hwdb
+ install -vdm 755 "${pkgdir}/usr/lib/udev/hwdb.d/"
+ tools/sane-desc -m hwdb -s doc/descriptions/ > "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb"
+ # NOTE: an empty new line is required between the two .desc collections
+ printf "\n" >> "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb"
+ tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${pkgdir}/usr/lib/udev/hwdb.d/20-${pkgname}.hwdb"
+
+ # systemd integration
+ install -vDm 644 "../${pkgname}d.socket" \
+ -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"
+
+ # add files below /etc/sane.d to backup array
+ cd "${pkgdir}"
+ # trick extract_function_variable() in makepkg into not detecting the
+ # backup array modification and adding remaining configuration files
+ [[ /usr/bin/true ]] && backup=( ${backup[@]} $(find "etc/${pkgname}.d/" -type f) )
+}
Copied: sane/repos/testing-x86_64/sane.sysusers (from rev 408211, sane/trunk/sane.sysusers)
===================================================================
--- sane.sysusers (rev 0)
+++ sane.sysusers 2021-02-16 10:48:01 UTC (rev 408212)
@@ -0,0 +1 @@
+u saned - "SANE daemon user" - -
Copied: sane/repos/testing-x86_64/saned.service (from rev 408211, sane/trunk/saned.service)
===================================================================
--- saned.service (rev 0)
+++ saned.service 2021-02-16 10:48:01 UTC (rev 408212)
@@ -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.socket
===================================================================
--- saned.socket 2021-02-16 10:47:49 UTC (rev 408211)
+++ saned.socket 2021-02-16 10:48:01 UTC (rev 408212)
@@ -1,10 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-MaxConnections=1
-
-[Install]
-WantedBy=sockets.target
Copied: sane/repos/testing-x86_64/saned.socket (from rev 408211, sane/trunk/saned.socket)
===================================================================
--- saned.socket (rev 0)
+++ saned.socket 2021-02-16 10:48:01 UTC (rev 408212)
@@ -0,0 +1,10 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+MaxConnections=1
+
+[Install]
+WantedBy=sockets.target
Deleted: saned at .service
===================================================================
--- saned at .service 2021-02-16 10:47:49 UTC (rev 408211)
+++ saned at .service 2021-02-16 10:48:01 UTC (rev 408212)
@@ -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
More information about the arch-commits
mailing list