[arch-commits] Commit in sane/repos (24 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Sat Oct 5 19:26:39 UTC 2013
Date: Saturday, October 5, 2013 @ 21:26:39
Author: tpowa
Revision: 195929
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
sane/repos/extra-i686/PKGBUILD
(from rev 195928, sane/trunk/PKGBUILD)
sane/repos/extra-i686/network.patch
(from rev 195928, sane/trunk/network.patch)
sane/repos/extra-i686/sane.xinetd
(from rev 195928, sane/trunk/sane.xinetd)
sane/repos/extra-i686/saned.service
(from rev 195928, sane/trunk/saned.service)
sane/repos/extra-i686/saned.socket
(from rev 195928, sane/trunk/saned.socket)
sane/repos/extra-x86_64/PKGBUILD
(from rev 195928, sane/trunk/PKGBUILD)
sane/repos/extra-x86_64/network.patch
(from rev 195928, sane/trunk/network.patch)
sane/repos/extra-x86_64/sane.xinetd
(from rev 195928, sane/trunk/sane.xinetd)
sane/repos/extra-x86_64/saned.service
(from rev 195928, sane/trunk/saned.service)
sane/repos/extra-x86_64/saned.socket
(from rev 195928, sane/trunk/saned.socket)
Deleted:
sane/repos/extra-i686/1.0.23-hp2400c.patch
sane/repos/extra-i686/PKGBUILD
sane/repos/extra-i686/kodakaio.c.patch
sane/repos/extra-i686/network.patch
sane/repos/extra-i686/sane.xinetd
sane/repos/extra-i686/saned.service
sane/repos/extra-i686/saned.socket
sane/repos/extra-x86_64/1.0.23-hp2400c.patch
sane/repos/extra-x86_64/PKGBUILD
sane/repos/extra-x86_64/kodakaio.c.patch
sane/repos/extra-x86_64/network.patch
sane/repos/extra-x86_64/sane.xinetd
sane/repos/extra-x86_64/saned.service
sane/repos/extra-x86_64/saned.socket
-----------------------------------+
/PKGBUILD | 144 ++++++++++++++++++++++++++++++++++++
/network.patch | 84 +++++++++++++++++++++
/sane.xinetd | 22 +++++
/saned.service | 16 ++++
/saned.socket | 18 ++++
extra-i686/1.0.23-hp2400c.patch | 81 --------------------
extra-i686/PKGBUILD | 80 --------------------
extra-i686/kodakaio.c.patch | 11 --
extra-i686/network.patch | 42 ----------
extra-i686/sane.xinetd | 11 --
extra-i686/saned.service | 8 --
extra-i686/saned.socket | 9 --
extra-x86_64/1.0.23-hp2400c.patch | 81 --------------------
extra-x86_64/PKGBUILD | 80 --------------------
extra-x86_64/kodakaio.c.patch | 11 --
extra-x86_64/network.patch | 42 ----------
extra-x86_64/sane.xinetd | 11 --
extra-x86_64/saned.service | 8 --
extra-x86_64/saned.socket | 9 --
19 files changed, 284 insertions(+), 484 deletions(-)
Deleted: extra-i686/1.0.23-hp2400c.patch
===================================================================
--- extra-i686/1.0.23-hp2400c.patch 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/1.0.23-hp2400c.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,81 +0,0 @@
-From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev at free.fr>
-Date: Mon, 3 Jun 2013 06:33:08 +0200
-Subject: [PATCH] bug 314293 fix
-
-- don't use non-existent end of records
----
- ChangeLog | 3 +++
- backend/genesys_gl646.c | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
-index c6a5af5..2d5cddc 100644
---- a/backend/genesys_gl646.c
-+++ b/backend/genesys_gl646.c
-@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
- i = 0;
- dpi = 9600;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* computes distance and keep mode if it is closer than previous */
- if (sensor == sensor_master[i].sensor
-@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
- dpi = 0;
- dist = 9600;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
-
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
-
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
- * sensor mode setting */
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- if (dev->model->ccd_type == sensor_master[i].sensor
- && sensor_master[i].dpi == xresolution
-@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
- * motor mode setting */
- i = 0;
- nb = sizeof (motor_master) / sizeof (Motor_Master);
-- while (motor_master[i].motor != -1 && i < nb)
-+ while (i < nb)
- {
- if (dev->model->motor_type == motor_master[i].motor
- && motor_master[i].dpi == resolution
-@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
- /* now we can search for the specific sensor settings */
- i = 0;
- nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
-- while (sensor_settings[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- if (sensor->sensor == sensor_settings[i].sensor
- && sensor->cksel == sensor_settings[i].cksel)
---
-1.7.2.5
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/PKGBUILD 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,80 +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=7
-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' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-makedepends=('texlive-latexextra')
-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'
- '1.0.23-hp2400c.patch')
-options=(!libtool)
-
-prepare() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
- # fix FS#35549
- patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
- # 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
-}
-
-build() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
- ./configure --prefix=/usr --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-docdir=/usr/share/doc/sane \
- --enable-avahi \
- --enable-pthread \
- --disable-rpath \
- --enable-libusb_1_0 \
- --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'
- 'bc2c8b4f7b3012c8936c7da21f60e2ac'
- 'e57e9e15528f47f5f1b3f1411135ed5d'
- '3f9fe36b0c4ff0b01b53b1cffa5d9700'
- 'e65dbefb7c3d69955fb6eb3ace14aa12'
- '44e77692c52db15b0f530a1d9a8e1296'
- '0c8bfabcaa499c4a2583aa2fe53d1686')
Copied: sane/repos/extra-i686/PKGBUILD (from rev 195928, sane/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,72 @@
+# $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.24
+pkgrel=1
+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' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+makedepends=('texlive-latexextra')
+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'
+ 'network.patch')
+options=(!libtool)
+
+prepare() {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+ # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+ patch -Np1 -i ${srcdir}/network.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+
+ ./configure --prefix=/usr --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-docdir=/usr/share/doc/sane \
+ --enable-avahi \
+ --enable-pthread \
+ --disable-rpath \
+ --enable-libusb_1_0 \
+ --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=('1ca68e536cd7c1852322822f5f6ac3a4'
+ 'bc2c8b4f7b3012c8936c7da21f60e2ac'
+ 'e57e9e15528f47f5f1b3f1411135ed5d'
+ '3f9fe36b0c4ff0b01b53b1cffa5d9700'
+ '44e77692c52db15b0f530a1d9a8e1296')
Deleted: extra-i686/kodakaio.c.patch
===================================================================
--- extra-i686/kodakaio.c.patch 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/kodakaio.c.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,11 +0,0 @@
---- 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/network.patch
===================================================================
--- extra-i686/network.patch 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/network.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,42 +0,0 @@
-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;
- }
Copied: sane/repos/extra-i686/network.patch (from rev 195928, sane/trunk/network.patch)
===================================================================
--- extra-i686/network.patch (rev 0)
+++ extra-i686/network.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -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.xinetd
===================================================================
--- extra-i686/sane.xinetd 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/sane.xinetd 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,11 +0,0 @@
-service sane-port
-{
- port = 6566
- socket_type = stream
- wait = no
- user = nobody
- group = scanner
- server = /usr/bin/saned
- # disabled by default!
- disable = yes
- }
Copied: sane/repos/extra-i686/sane.xinetd (from rev 195928, sane/trunk/sane.xinetd)
===================================================================
--- extra-i686/sane.xinetd (rev 0)
+++ extra-i686/sane.xinetd 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,11 @@
+service sane-port
+{
+ port = 6566
+ socket_type = stream
+ wait = no
+ user = nobody
+ group = scanner
+ server = /usr/bin/saned
+ # disabled by default!
+ disable = yes
+ }
Deleted: extra-i686/saned.service
===================================================================
--- extra-i686/saned.service 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/saned.service 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/bin/saned
-StandardInput=socket
-StandardError=syslog
Copied: sane/repos/extra-i686/saned.service (from rev 195928, sane/trunk/saned.service)
===================================================================
--- extra-i686/saned.service (rev 0)
+++ extra-i686/saned.service 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Scanner Service
+
+[Service]
+Group=scanner
+ExecStart=/usr/bin/saned
+StandardInput=socket
+StandardError=syslog
Deleted: extra-i686/saned.socket
===================================================================
--- extra-i686/saned.socket 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-i686/saned.socket 2013-10-05 19:26:39 UTC (rev 195929)
@@ -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 195928, sane/trunk/saned.socket)
===================================================================
--- extra-i686/saned.socket (rev 0)
+++ extra-i686/saned.socket 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,9 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-x86_64/1.0.23-hp2400c.patch
===================================================================
--- extra-x86_64/1.0.23-hp2400c.patch 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/1.0.23-hp2400c.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,81 +0,0 @@
-From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev at free.fr>
-Date: Mon, 3 Jun 2013 06:33:08 +0200
-Subject: [PATCH] bug 314293 fix
-
-- don't use non-existent end of records
----
- ChangeLog | 3 +++
- backend/genesys_gl646.c | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
-index c6a5af5..2d5cddc 100644
---- a/backend/genesys_gl646.c
-+++ b/backend/genesys_gl646.c
-@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
- i = 0;
- dpi = 9600;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* computes distance and keep mode if it is closer than previous */
- if (sensor == sensor_master[i].sensor
-@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
- dpi = 0;
- dist = 9600;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
-
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
-
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
- * sensor mode setting */
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- if (dev->model->ccd_type == sensor_master[i].sensor
- && sensor_master[i].dpi == xresolution
-@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
- * motor mode setting */
- i = 0;
- nb = sizeof (motor_master) / sizeof (Motor_Master);
-- while (motor_master[i].motor != -1 && i < nb)
-+ while (i < nb)
- {
- if (dev->model->motor_type == motor_master[i].motor
- && motor_master[i].dpi == resolution
-@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
- /* now we can search for the specific sensor settings */
- i = 0;
- nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
-- while (sensor_settings[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- if (sensor->sensor == sensor_settings[i].sensor
- && sensor->cksel == sensor_settings[i].cksel)
---
-1.7.2.5
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/PKGBUILD 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,80 +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=7
-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' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-makedepends=('texlive-latexextra')
-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'
- '1.0.23-hp2400c.patch')
-options=(!libtool)
-
-prepare() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
- # fix FS#35549
- patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
- # 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
-}
-
-build() {
- cd "${srcdir}/${pkgname}-backends-${pkgver}"
-
- ./configure --prefix=/usr --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-docdir=/usr/share/doc/sane \
- --enable-avahi \
- --enable-pthread \
- --disable-rpath \
- --enable-libusb_1_0 \
- --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'
- 'bc2c8b4f7b3012c8936c7da21f60e2ac'
- 'e57e9e15528f47f5f1b3f1411135ed5d'
- '3f9fe36b0c4ff0b01b53b1cffa5d9700'
- 'e65dbefb7c3d69955fb6eb3ace14aa12'
- '44e77692c52db15b0f530a1d9a8e1296'
- '0c8bfabcaa499c4a2583aa2fe53d1686')
Copied: sane/repos/extra-x86_64/PKGBUILD (from rev 195928, sane/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,72 @@
+# $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.24
+pkgrel=1
+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' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
+makedepends=('texlive-latexextra')
+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'
+ 'network.patch')
+options=(!libtool)
+
+prepare() {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+ # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+ patch -Np1 -i ${srcdir}/network.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-backends-${pkgver}"
+
+ ./configure --prefix=/usr --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-docdir=/usr/share/doc/sane \
+ --enable-avahi \
+ --enable-pthread \
+ --disable-rpath \
+ --enable-libusb_1_0 \
+ --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=('1ca68e536cd7c1852322822f5f6ac3a4'
+ 'bc2c8b4f7b3012c8936c7da21f60e2ac'
+ 'e57e9e15528f47f5f1b3f1411135ed5d'
+ '3f9fe36b0c4ff0b01b53b1cffa5d9700'
+ '44e77692c52db15b0f530a1d9a8e1296')
Deleted: extra-x86_64/kodakaio.c.patch
===================================================================
--- extra-x86_64/kodakaio.c.patch 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/kodakaio.c.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,11 +0,0 @@
---- 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/network.patch
===================================================================
--- extra-x86_64/network.patch 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/network.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,42 +0,0 @@
-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;
- }
Copied: sane/repos/extra-x86_64/network.patch (from rev 195928, sane/trunk/network.patch)
===================================================================
--- extra-x86_64/network.patch (rev 0)
+++ extra-x86_64/network.patch 2013-10-05 19:26:39 UTC (rev 195929)
@@ -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.xinetd
===================================================================
--- extra-x86_64/sane.xinetd 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/sane.xinetd 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,11 +0,0 @@
-service sane-port
-{
- port = 6566
- socket_type = stream
- wait = no
- user = nobody
- group = scanner
- server = /usr/bin/saned
- # disabled by default!
- disable = yes
- }
Copied: sane/repos/extra-x86_64/sane.xinetd (from rev 195928, sane/trunk/sane.xinetd)
===================================================================
--- extra-x86_64/sane.xinetd (rev 0)
+++ extra-x86_64/sane.xinetd 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,11 @@
+service sane-port
+{
+ port = 6566
+ socket_type = stream
+ wait = no
+ user = nobody
+ group = scanner
+ server = /usr/bin/saned
+ # disabled by default!
+ disable = yes
+ }
Deleted: extra-x86_64/saned.service
===================================================================
--- extra-x86_64/saned.service 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/saned.service 2013-10-05 19:26:39 UTC (rev 195929)
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/bin/saned
-StandardInput=socket
-StandardError=syslog
Copied: sane/repos/extra-x86_64/saned.service (from rev 195928, sane/trunk/saned.service)
===================================================================
--- extra-x86_64/saned.service (rev 0)
+++ extra-x86_64/saned.service 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,8 @@
+[Unit]
+Description=Scanner Service
+
+[Service]
+Group=scanner
+ExecStart=/usr/bin/saned
+StandardInput=socket
+StandardError=syslog
Deleted: extra-x86_64/saned.socket
===================================================================
--- extra-x86_64/saned.socket 2013-10-05 19:26:19 UTC (rev 195928)
+++ extra-x86_64/saned.socket 2013-10-05 19:26:39 UTC (rev 195929)
@@ -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 195928, sane/trunk/saned.socket)
===================================================================
--- extra-x86_64/saned.socket (rev 0)
+++ extra-x86_64/saned.socket 2013-10-05 19:26:39 UTC (rev 195929)
@@ -0,0 +1,9 @@
+[Unit]
+Description=saned incoming socket
+
+[Socket]
+ListenStream=6566
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
More information about the arch-commits
mailing list