[arch-commits] Commit in sane/repos (28 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Tue Feb 26 16:27:03 UTC 2013
Date: Tuesday, February 26, 2013 @ 17:27:02
Author: tpowa
Revision: 178746
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sane/repos/extra-i686/PKGBUILD
(from rev 178745, sane/trunk/PKGBUILD)
sane/repos/extra-i686/kodakaio.c.patch
(from rev 178745, sane/trunk/kodakaio.c.patch)
sane/repos/extra-i686/network.patch
(from rev 178745, sane/trunk/network.patch)
sane/repos/extra-i686/sane.install
(from rev 178745, sane/trunk/sane.install)
sane/repos/extra-i686/sane.xinetd
(from rev 178745, sane/trunk/sane.xinetd)
sane/repos/extra-i686/saned.service
(from rev 178745, sane/trunk/saned.service)
sane/repos/extra-i686/saned.socket
(from rev 178745, sane/trunk/saned.socket)
sane/repos/extra-x86_64/PKGBUILD
(from rev 178745, sane/trunk/PKGBUILD)
sane/repos/extra-x86_64/kodakaio.c.patch
(from rev 178745, sane/trunk/kodakaio.c.patch)
sane/repos/extra-x86_64/network.patch
(from rev 178745, sane/trunk/network.patch)
sane/repos/extra-x86_64/sane.install
(from rev 178745, sane/trunk/sane.install)
sane/repos/extra-x86_64/sane.xinetd
(from rev 178745, sane/trunk/sane.xinetd)
sane/repos/extra-x86_64/saned.service
(from rev 178745, sane/trunk/saned.service)
sane/repos/extra-x86_64/saned.socket
(from rev 178745, sane/trunk/saned.socket)
Deleted:
sane/repos/extra-i686/PKGBUILD
sane/repos/extra-i686/libv4l-0.8.3.patch
sane/repos/extra-i686/sane.install
sane/repos/extra-i686/sane.xinetd
sane/repos/extra-i686/saned.service
sane/repos/extra-i686/saned.socket
sane/repos/extra-i686/xerox_mfp_fix_usb_devices.patch
sane/repos/extra-x86_64/PKGBUILD
sane/repos/extra-x86_64/libv4l-0.8.3.patch
sane/repos/extra-x86_64/sane.install
sane/repos/extra-x86_64/sane.xinetd
sane/repos/extra-x86_64/saned.service
sane/repos/extra-x86_64/saned.socket
sane/repos/extra-x86_64/xerox_mfp_fix_usb_devices.patch
----------------------------------------------+
extra-i686/PKGBUILD | 137 +++++++++++++------------
extra-i686/kodakaio.c.patch | 11 ++
extra-i686/libv4l-0.8.3.patch | 64 -----------
extra-i686/network.patch | 42 +++++++
extra-i686/sane.install | 14 +-
extra-i686/sane.xinetd | 22 ++--
extra-i686/saned.service | 16 +-
extra-i686/saned.socket | 18 +--
extra-i686/xerox_mfp_fix_usb_devices.patch | 67 ------------
extra-x86_64/PKGBUILD | 137 +++++++++++++------------
extra-x86_64/kodakaio.c.patch | 11 ++
extra-x86_64/libv4l-0.8.3.patch | 64 -----------
extra-x86_64/network.patch | 42 +++++++
extra-x86_64/sane.install | 14 +-
extra-x86_64/sane.xinetd | 22 ++--
extra-x86_64/saned.service | 16 +-
extra-x86_64/saned.socket | 18 +--
extra-x86_64/xerox_mfp_fix_usb_devices.patch | 67 ------------
18 files changed, 322 insertions(+), 460 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/PKGBUILD 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Simo L. <neotuli at yahoo.com>
-# Contributor: eric <eric at archlinux.org>
-
-pkgname=sane
-pkgver=1.0.23
-pkgrel=2
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-makedepends=('texlive-latexextra')
-install=$pkgname.install
-backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
-source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
- 'sane.xinetd'
- 'saned.socket'
- 'saned.service')
-options=(!libtool)
-
-build() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-docdir=/usr/share/doc/sane \
- --enable-avahi \
- --enable-pthread \
- --disable-rpath \
- --disable-locking
- make
-}
-
-package () {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
- make DESTDIR="${pkgdir}" install
- # fix hp officejets
- echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
- # install udev files
- install -D -m0644 tools/udev/libsane.rules \
- "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
- # fix udev rules
- sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
-
- # install xinetd file
- install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-
- # Install the pkg-config file
- install -D -m644 tools/sane-backends.pc \
- "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
- # install systemd files
- install -D -m644 ${srcdir}/saned.socket \
- "${pkgdir}/usr/lib/systemd/system/saned.socket"
- install -D -m644 ${srcdir}/saned.service \
- "${pkgdir}/usr/lib/systemd/system/saned at .service"
-}
-md5sums=('e226a89c54173efea80e91e9a5eb6573'
- 'da946cc36fb83612162cf9505986d4b2'
- 'e57e9e15528f47f5f1b3f1411135ed5d'
- 'e44bd4c994a52d6f472463d1eb0a03be')
Copied: sane/repos/extra-i686/PKGBUILD (from rev 178745, sane/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Simo L. <neotuli at yahoo.com>
+# Contributor: eric <eric at archlinux.org>
+
+pkgname=sane
+pkgver=1.0.23
+pkgrel=3
+pkgdesc="Scanner Access Now Easy"
+url="http://www.sane-project.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+makedepends=('texlive-latexextra')
+install=$pkgname.install
+backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
+source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
+ 'sane.xinetd'
+ 'saned.socket'
+ 'saned.service'
+ 'kodakaio.c.patch'
+ 'network.patch')
+options=(!libtool)
+
+build() {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+
+ # fix FS#33657
+ patch -Np0 -i ${srcdir}/kodakaio.c.patch
+ # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+ patch -Np1 -i ${srcdir}/network.patch
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-docdir=/usr/share/doc/sane \
+ --enable-avahi \
+ --enable-pthread \
+ --disable-rpath \
+ --disable-locking
+ make
+}
+
+package () {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ # fix hp officejets
+ echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
+ # install udev files
+ install -D -m0644 tools/udev/libsane.rules \
+ "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+ # fix udev rules
+ sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+
+ # install xinetd file
+ install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
+
+ # Install the pkg-config file
+ install -D -m644 tools/sane-backends.pc \
+ "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
+ # install systemd files
+ install -D -m644 ${srcdir}/saned.socket \
+ "${pkgdir}/usr/lib/systemd/system/saned.socket"
+ install -D -m644 ${srcdir}/saned.service \
+ "${pkgdir}/usr/lib/systemd/system/saned at .service"
+}
+md5sums=('e226a89c54173efea80e91e9a5eb6573'
+ '5f519030392d599e2ad348159ec4c96f'
+ 'e57e9e15528f47f5f1b3f1411135ed5d'
+ 'e44bd4c994a52d6f472463d1eb0a03be'
+ 'e65dbefb7c3d69955fb6eb3ace14aa12'
+ '44e77692c52db15b0f530a1d9a8e1296')
Copied: sane/repos/extra-i686/kodakaio.c.patch (from rev 178745, sane/trunk/kodakaio.c.patch)
===================================================================
--- extra-i686/kodakaio.c.patch (rev 0)
+++ extra-i686/kodakaio.c.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,11 @@
+--- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100
++++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100
+@@ -2197,7 +2197,7 @@
+
+ reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT,
+ "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
+- if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
++ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
+
+ return 0;
+ }
Deleted: extra-i686/libv4l-0.8.3.patch
===================================================================
--- extra-i686/libv4l-0.8.3.patch 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/libv4l-0.8.3.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils at redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb at jblache.org>
-Date: Wed Feb 16 19:37:43 2011 +0100
-
- Fix v4l build with libv4l 0.8.3+
-
- (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
- Conflicts:
-
- ChangeLog
-
- Signed-off-by: Nils Philippsen <nils at redhat.com>
----
- backend/v4l.c | 3 +--
- backend/v4l.h | 3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
-
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
-
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
-
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
-
-@@ -165,7 +166,7 @@ struct video_channel
-
-
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
-
- #include <../include/sane/sane.h>
-
---
-1.7.4
-
Copied: sane/repos/extra-i686/network.patch (from rev 178745, sane/trunk/network.patch)
===================================================================
--- extra-i686/network.patch (rev 0)
+++ extra-i686/network.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,42 @@
+diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
+index a57d7c7..d0a1e92 100644
+--- a/sanei/sanei_tcp.c
++++ b/sanei/sanei_tcp.c
+@@ -45,6 +45,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+
+ #ifdef HAVE_WINSOCK2_H
+ #include <winsock2.h>
+@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
+ ssize_t
+ sanei_tcp_read(int fd, u_char * buf, int count)
+ {
+- ssize_t bytes_recv = 0, rc = 1;
++ ssize_t bytes_recv = 0, rc = 1;
++ int retry = 5;
+
+ while (bytes_recv < count && rc > 0)
+ {
+ rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
++ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
+ if (rc > 0)
+ bytes_recv += rc;
+-
++ else {
++ if ( errno == EAGAIN && retry-- ) {
++ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry);
++ /* wait for max 1s */
++ struct timespec req;
++ struct timespec rem;
++ req.tv_sec = 0;
++ req.tv_nsec= 100000000;
++ nanosleep(&req, &rem);
++ rc = 1;
++ }
++ }
+ }
+ return bytes_recv;
+ }
Deleted: extra-i686/sane.install
===================================================================
--- extra-i686/sane.install 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/sane.install 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,7 +0,0 @@
-post_install() {
- /bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
Copied: sane/repos/extra-i686/sane.install (from rev 178745, sane/trunk/sane.install)
===================================================================
--- extra-i686/sane.install (rev 0)
+++ extra-i686/sane.install 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,7 @@
+post_install() {
+ /bin/cat <<THEEND
+NOTE
+----
+Add your user to group 'scanner' to use scanner devices.
+THEEND
+}
Deleted: extra-i686/sane.xinetd
===================================================================
--- extra-i686/sane.xinetd 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/sane.xinetd 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,11 +0,0 @@
-service sane-port
-{
- port = 6566
- socket_type = stream
- wait = no
- user = root
- group = scanner
- server = /usr/sbin/saned
- # disabled by default!
- disable = yes
- }
Copied: sane/repos/extra-i686/sane.xinetd (from rev 178745, sane/trunk/sane.xinetd)
===================================================================
--- extra-i686/sane.xinetd (rev 0)
+++ extra-i686/sane.xinetd 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,11 @@
+service sane-port
+{
+ port = 6566
+ socket_type = stream
+ wait = no
+ user = nobody
+ group = scanner
+ server = /usr/sbin/saned
+ # disabled by default!
+ disable = yes
+ }
Deleted: extra-i686/saned.service
===================================================================
--- extra-i686/saned.service 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/saned.service 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/sbin/saned
-StandardInput=socket
-StandardError=syslog
Copied: sane/repos/extra-i686/saned.service (from rev 178745, sane/trunk/saned.service)
===================================================================
--- extra-i686/saned.service (rev 0)
+++ extra-i686/saned.service 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Scanner Service
+
+[Service]
+Group=scanner
+ExecStart=/usr/sbin/saned
+StandardInput=socket
+StandardError=syslog
Deleted: extra-i686/saned.socket
===================================================================
--- extra-i686/saned.socket 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/saned.socket 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
Copied: sane/repos/extra-i686/saned.socket (from rev 178745, sane/trunk/saned.socket)
===================================================================
--- extra-i686/saned.socket (rev 0)
+++ extra-i686/saned.socket 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,9 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-i686/xerox_mfp_fix_usb_devices.patch
===================================================================
--- extra-i686/xerox_mfp_fix_usb_devices.patch 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-i686/xerox_mfp_fix_usb_devices.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc at telekom.ru>
-Date: Tue Mar 8 17:57:19 2011 +0300
-
- keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL; /* sane_get_devices array */
- static struct device *devices_head = NULL; /* sane_get_devices list */
-
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
- { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
- { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
-- { 0 }
- };
-
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
- devices_head = NULL;
- }
-
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+ if (strncmp("tcp", devname, 3) == 0)
-+ return &available_transports[TRANSPORT_TCP];
-+ return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
- return SANE_STATUS_GOOD;
- }
-
-- for (tr = available_transports; tr->ttype; tr++) {
-- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-- break;
-- }
-- if (!tr->ttype)
-- return SANE_STATUS_INVAL;
-+ tr = tr_from_devname(devname);
-
- dev = calloc (1, sizeof (struct device));
- if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
-- transport *tr;
--
-- for (tr = available_transports; tr->ttype; tr++) {
-- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-- return tr->configure_device(devname, list_one_device);
-- }
-- return SANE_STATUS_INVAL;
-+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
-
- SANE_Status
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/PKGBUILD 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-# Contributor: Simo L. <neotuli at yahoo.com>
-# Contributor: eric <eric at archlinux.org>
-
-pkgname=sane
-pkgver=1.0.23
-pkgrel=2
-pkgdesc="Scanner Access Now Easy"
-url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-makedepends=('texlive-latexextra')
-install=$pkgname.install
-backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
-source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
- 'sane.xinetd'
- 'saned.socket'
- 'saned.service')
-options=(!libtool)
-
-build() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-docdir=/usr/share/doc/sane \
- --enable-avahi \
- --enable-pthread \
- --disable-rpath \
- --disable-locking
- make
-}
-
-package () {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
- make DESTDIR="${pkgdir}" install
- # fix hp officejets
- echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
- # install udev files
- install -D -m0644 tools/udev/libsane.rules \
- "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
- # fix udev rules
- sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
-
- # install xinetd file
- install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-
- # Install the pkg-config file
- install -D -m644 tools/sane-backends.pc \
- "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
- # install systemd files
- install -D -m644 ${srcdir}/saned.socket \
- "${pkgdir}/usr/lib/systemd/system/saned.socket"
- install -D -m644 ${srcdir}/saned.service \
- "${pkgdir}/usr/lib/systemd/system/saned at .service"
-}
-md5sums=('e226a89c54173efea80e91e9a5eb6573'
- 'da946cc36fb83612162cf9505986d4b2'
- 'e57e9e15528f47f5f1b3f1411135ed5d'
- 'e44bd4c994a52d6f472463d1eb0a03be')
Copied: sane/repos/extra-x86_64/PKGBUILD (from rev 178745, sane/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+# Contributor: Simo L. <neotuli at yahoo.com>
+# Contributor: eric <eric at archlinux.org>
+
+pkgname=sane
+pkgver=1.0.23
+pkgrel=3
+pkgdesc="Scanner Access Now Easy"
+url="http://www.sane-project.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+makedepends=('texlive-latexextra')
+install=$pkgname.install
+backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane)
+source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
+ 'sane.xinetd'
+ 'saned.socket'
+ 'saned.service'
+ 'kodakaio.c.patch'
+ 'network.patch')
+options=(!libtool)
+
+build() {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+
+ # fix FS#33657
+ patch -Np0 -i ${srcdir}/kodakaio.c.patch
+ # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+ patch -Np1 -i ${srcdir}/network.patch
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-docdir=/usr/share/doc/sane \
+ --enable-avahi \
+ --enable-pthread \
+ --disable-rpath \
+ --disable-locking
+ make
+}
+
+package () {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ # fix hp officejets
+ echo "#hpaio" >> "${pkgdir}/etc/sane.d/dll.conf"
+ # install udev files
+ install -D -m0644 tools/udev/libsane.rules \
+ "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+ # fix udev rules
+ sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
+
+ # install xinetd file
+ install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
+
+ # Install the pkg-config file
+ install -D -m644 tools/sane-backends.pc \
+ "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
+ # install systemd files
+ install -D -m644 ${srcdir}/saned.socket \
+ "${pkgdir}/usr/lib/systemd/system/saned.socket"
+ install -D -m644 ${srcdir}/saned.service \
+ "${pkgdir}/usr/lib/systemd/system/saned at .service"
+}
+md5sums=('e226a89c54173efea80e91e9a5eb6573'
+ '5f519030392d599e2ad348159ec4c96f'
+ 'e57e9e15528f47f5f1b3f1411135ed5d'
+ 'e44bd4c994a52d6f472463d1eb0a03be'
+ 'e65dbefb7c3d69955fb6eb3ace14aa12'
+ '44e77692c52db15b0f530a1d9a8e1296')
Copied: sane/repos/extra-x86_64/kodakaio.c.patch (from rev 178745, sane/trunk/kodakaio.c.patch)
===================================================================
--- extra-x86_64/kodakaio.c.patch (rev 0)
+++ extra-x86_64/kodakaio.c.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,11 @@
+--- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100
++++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100
+@@ -2197,7 +2197,7 @@
+
+ reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT,
+ "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
+- if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
++ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
+
+ return 0;
+ }
Deleted: extra-x86_64/libv4l-0.8.3.patch
===================================================================
--- extra-x86_64/libv4l-0.8.3.patch 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/libv4l-0.8.3.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils at redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb at jblache.org>
-Date: Wed Feb 16 19:37:43 2011 +0100
-
- Fix v4l build with libv4l 0.8.3+
-
- (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
- Conflicts:
-
- ChangeLog
-
- Signed-off-by: Nils Philippsen <nils at redhat.com>
----
- backend/v4l.c | 3 +--
- backend/v4l.h | 3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
-
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
-
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
-
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
-
-@@ -165,7 +166,7 @@ struct video_channel
-
-
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
-
- #include <../include/sane/sane.h>
-
---
-1.7.4
-
Copied: sane/repos/extra-x86_64/network.patch (from rev 178745, sane/trunk/network.patch)
===================================================================
--- extra-x86_64/network.patch (rev 0)
+++ extra-x86_64/network.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,42 @@
+diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
+index a57d7c7..d0a1e92 100644
+--- a/sanei/sanei_tcp.c
++++ b/sanei/sanei_tcp.c
+@@ -45,6 +45,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+
+ #ifdef HAVE_WINSOCK2_H
+ #include <winsock2.h>
+@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
+ ssize_t
+ sanei_tcp_read(int fd, u_char * buf, int count)
+ {
+- ssize_t bytes_recv = 0, rc = 1;
++ ssize_t bytes_recv = 0, rc = 1;
++ int retry = 5;
+
+ while (bytes_recv < count && rc > 0)
+ {
+ rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
++ DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
+ if (rc > 0)
+ bytes_recv += rc;
+-
++ else {
++ if ( errno == EAGAIN && retry-- ) {
++ DBG(1, "%s: waiting %d\n", __FUNCTION__, retry);
++ /* wait for max 1s */
++ struct timespec req;
++ struct timespec rem;
++ req.tv_sec = 0;
++ req.tv_nsec= 100000000;
++ nanosleep(&req, &rem);
++ rc = 1;
++ }
++ }
+ }
+ return bytes_recv;
+ }
Deleted: extra-x86_64/sane.install
===================================================================
--- extra-x86_64/sane.install 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/sane.install 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,7 +0,0 @@
-post_install() {
- /bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
Copied: sane/repos/extra-x86_64/sane.install (from rev 178745, sane/trunk/sane.install)
===================================================================
--- extra-x86_64/sane.install (rev 0)
+++ extra-x86_64/sane.install 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,7 @@
+post_install() {
+ /bin/cat <<THEEND
+NOTE
+----
+Add your user to group 'scanner' to use scanner devices.
+THEEND
+}
Deleted: extra-x86_64/sane.xinetd
===================================================================
--- extra-x86_64/sane.xinetd 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/sane.xinetd 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,11 +0,0 @@
-service sane-port
-{
- port = 6566
- socket_type = stream
- wait = no
- user = root
- group = scanner
- server = /usr/sbin/saned
- # disabled by default!
- disable = yes
- }
Copied: sane/repos/extra-x86_64/sane.xinetd (from rev 178745, sane/trunk/sane.xinetd)
===================================================================
--- extra-x86_64/sane.xinetd (rev 0)
+++ extra-x86_64/sane.xinetd 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,11 @@
+service sane-port
+{
+ port = 6566
+ socket_type = stream
+ wait = no
+ user = nobody
+ group = scanner
+ server = /usr/sbin/saned
+ # disabled by default!
+ disable = yes
+ }
Deleted: extra-x86_64/saned.service
===================================================================
--- extra-x86_64/saned.service 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/saned.service 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/sbin/saned
-StandardInput=socket
-StandardError=syslog
Copied: sane/repos/extra-x86_64/saned.service (from rev 178745, sane/trunk/saned.service)
===================================================================
--- extra-x86_64/saned.service (rev 0)
+++ extra-x86_64/saned.service 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Scanner Service
+
+[Service]
+Group=scanner
+ExecStart=/usr/sbin/saned
+StandardInput=socket
+StandardError=syslog
Deleted: extra-x86_64/saned.socket
===================================================================
--- extra-x86_64/saned.socket 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/saned.socket 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
Copied: sane/repos/extra-x86_64/saned.socket (from rev 178745, sane/trunk/saned.socket)
===================================================================
--- extra-x86_64/saned.socket (rev 0)
+++ extra-x86_64/saned.socket 2013-02-26 16:27:02 UTC (rev 178746)
@@ -0,0 +1,9 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-x86_64/xerox_mfp_fix_usb_devices.patch
===================================================================
--- extra-x86_64/xerox_mfp_fix_usb_devices.patch 2013-02-26 16:26:48 UTC (rev 178745)
+++ extra-x86_64/xerox_mfp_fix_usb_devices.patch 2013-02-26 16:27:02 UTC (rev 178746)
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc at telekom.ru>
-Date: Tue Mar 8 17:57:19 2011 +0300
-
- keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL; /* sane_get_devices array */
- static struct device *devices_head = NULL; /* sane_get_devices list */
-
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
- { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
- { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
-- { 0 }
- };
-
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
- devices_head = NULL;
- }
-
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+ if (strncmp("tcp", devname, 3) == 0)
-+ return &available_transports[TRANSPORT_TCP];
-+ return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
- return SANE_STATUS_GOOD;
- }
-
-- for (tr = available_transports; tr->ttype; tr++) {
-- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-- break;
-- }
-- if (!tr->ttype)
-- return SANE_STATUS_INVAL;
-+ tr = tr_from_devname(devname);
-
- dev = calloc (1, sizeof (struct device));
- if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
-- transport *tr;
--
-- for (tr = available_transports; tr->ttype; tr++) {
-- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
-- return tr->configure_device(devname, list_one_device);
-- }
-- return SANE_STATUS_INVAL;
-+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
-
- SANE_Status
More information about the arch-commits
mailing list