[arch-commits] Commit in sane/trunk (PKGBUILD network.patch)

[Antonio Rojas]

    Date: Monday, May 18, 2020 @ 19:37:21
  Author: arojas
Revision: 385488

Update to 1.0.30

Modified:
  sane/trunk/PKGBUILD
Deleted:
  sane/trunk/network.patch

---------------+
 PKGBUILD      |   20 ++++++--------------
 network.patch |   42 ------------------------------------------
 2 files changed, 6 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-18 19:15:18 UTC (rev 385487)
+++ PKGBUILD	2020-05-18 19:37:21 UTC (rev 385488)
@@ -4,7 +4,7 @@
 # Contributor: eric <eric at archlinux.org>
 
 pkgname=sane
-pkgver=1.0.29
+pkgver=1.0.30
 pkgrel=1
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
@@ -13,23 +13,15 @@
 depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' '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,epsonds.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,pieusb.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=(https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/sane-backends-$pkgver.tar.gz
+source=(https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/sane-backends-$pkgver.tar.gz
         'sane.xinetd'
         'saned.socket'
-        'saned.service'
-        'network.patch')
-sha512sums=('9ee431b0c048119719e15905f8743c7a0fd8bc6fcee81d75df8459a989cab7e39bf045518976713a7e1d94c816dd1a1e0fa190612d815c0ddb6a51d2abf3fd54'
+        'saned.service')
+sha512sums=('e9f4ab1f21d5ab0e09b101389c325947824945af968f08b307485f79d4dc4c134b8a1979fb0cf0cfa72435abffe70d0060748a2c2ec46514eb15a0442ee181a5'
             '8f9f18d432087e5445aa533be375a811daf320512069c108d41a79121868937e1a7ffa21ee7d33adcf9fbb670bca460ff06423ce39602f35151eccc243d9d4ec'
             '62654a59fae3216be9c0ae4f810375de1232133ab12732529a3e064cc83d94563560e01950dea4b25aa298294c5f0421436c5e095a3a00ad8ef78b471f3105f4'
-            'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536'
-            '04b65a06d2c76dde6fce501ba823e999eb89ea41573f887f9e7d5347f3aa5e35310fad69313e99f873640e29a9849372d2ff995678593a0781fba73b464bec0d')
+            'c4cd4427ee8e5cb128c5d54006fafbb4f846508582dffc293f16ab14ab638e6ee3dc5df0eb06f6d0d3839941ab74623c7163ac13bcdfec87b10308587a697536')
 
-prepare() {
-  cd sane-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 sane-backends-${pkgver}
 
@@ -45,7 +37,7 @@
   make
 }
 
-package () {
+package() {
   cd sane-backends-${pkgver}
   make DESTDIR="${pkgdir}" install
   # fix hp officejets

Deleted: network.patch
===================================================================
--- network.patch	2020-05-18 19:15:18 UTC (rev 385487)
+++ network.patch	2020-05-18 19:37:21 UTC (rev 385488)
@@ -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;
- }