Initial release

3 files changed, 159 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8e557bfa21a..e3f07efe483a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = sane-git
 	pkgdesc = Scanner Access Now Easy
-	pkgver = 1.0.27_4_g2b0028b4
+	pkgver = 20181220.2d14283d
 	pkgrel = 1
 	url = http://www.sane-project.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = texlive-latexextra
 	depends = libtiff>=4.0.0
 	depends = libgphoto2
 	depends = libjpeg>=8
@@ -42,6 +43,7 @@ pkgbase = sane-git
 	backup = etc/sane.d/epjitsu.conf
 	backup = etc/sane.d/epson.conf
 	backup = etc/sane.d/epson2.conf
+	backup = etc/sane.d/epsonds.conf
 	backup = etc/sane.d/fujitsu.conf
 	backup = etc/sane.d/genesys.conf
 	backup = etc/sane.d/gphoto2.conf
@@ -69,6 +71,7 @@ pkgbase = sane-git
 	backup = etc/sane.d/net.conf
 	backup = etc/sane.d/p5.conf
 	backup = etc/sane.d/pie.conf
+	backup = etc/sane.d/pieusb.conf
 	backup = etc/sane.d/pixma.conf
 	backup = etc/sane.d/plustek.conf
 	backup = etc/sane.d/plustek_pp.conf
@@ -96,16 +99,16 @@ pkgbase = sane-git
 	backup = etc/sane.d/xerox_mfp.conf
 	backup = etc/sane.d/v4l.conf
 	backup = etc/xinetd.d/sane
-	source = git://anonscm.debian.org/sane/sane-backends.git
+	source = git+http://gitlab.com/sane-project/backends.git
 	source = sane.xinetd
 	source = saned.socket
 	source = saned.service
 	source = network.patch
-	md5sums = SKIP
-	md5sums = bc2c8b4f7b3012c8936c7da21f60e2ac
-	md5sums = e57e9e15528f47f5f1b3f1411135ed5d
-	md5sums = 3f9fe36b0c4ff0b01b53b1cffa5d9700
-	md5sums = 44e77692c52db15b0f530a1d9a8e1296
+	sha256sums = SKIP
+	sha256sums = 9d288d4fef0833da31ca1f1e9b4e567f81a4c03219af3b496d3fc3b6aac394eb
+	sha256sums = c06fdd54128b06efbf8fbcb40b145512fa8e8a1c470c5cb60abc839a6002fdf1
+	sha256sums = 9e5274b0184249aaf1066e64c08fed2d65445e4ca95717497b30fc9d30a55ae3
+	sha256sums = 23785948c7d9dc071fcc066754001dc2c1bd17a904051ed3ae6ec7f4e3b8e66b
 
 pkgname = sane-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b0799d1cc624..0560af91aed7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,81 +1,80 @@
-# Contributor: Christopher Reimer <mail+aur[at]c-reimer[dot]de>
-# Contributor: eric <eric@archlinux.org>
+# Maintainer: Josef Miegl <josef@miegl.cz>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Tom Tobin <archlinux@tomxtobin.com>
+# Contributor: eric <eric@archlinux.org>
 
+pkgname=sane-git
 _pkgname=sane
-pkgname=$_pkgname-git
-pkgver=1.0.27_4_g2b0028b4
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+pkgver=20181220.2d14283d
 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')
-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)
-conflicts=('sane')
-provides=('sane')
-source=("git://anonscm.debian.org/sane/sane-backends.git"
+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=(git+http://gitlab.com/sane-project/backends.git
         'sane.xinetd'
         'saned.socket'
         'saned.service'
         'network.patch')
-md5sums=('SKIP'
-         'bc2c8b4f7b3012c8936c7da21f60e2ac'
-         'e57e9e15528f47f5f1b3f1411135ed5d'
-         '3f9fe36b0c4ff0b01b53b1cffa5d9700'
-         '44e77692c52db15b0f530a1d9a8e1296')
+
+sha256sums=('SKIP'
+            '9d288d4fef0833da31ca1f1e9b4e567f81a4c03219af3b496d3fc3b6aac394eb'
+            'c06fdd54128b06efbf8fbcb40b145512fa8e8a1c470c5cb60abc839a6002fdf1'
+            '9e5274b0184249aaf1066e64c08fed2d65445e4ca95717497b30fc9d30a55ae3'
+            '23785948c7d9dc071fcc066754001dc2c1bd17a904051ed3ae6ec7f4e3b8e66b')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}-backends"
-  git describe --tags | sed 's/RELEASE_//;s/_/./g;s/-/_/g'
+	cd "${srcdir}/backends"
+	git log -1 --format='%cd.%h' --date=short | tr -d -
 }
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-backends"
-   # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
-   patch -Np1 -i ${srcdir}/network.patch
+	cd "${srcdir}/backends"
+	# 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"
+	cd "${srcdir}/backends"
 
-  ./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 \
-    --without-api-spec
-  make
+	./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"
-  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/49-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
+	cd "${srcdir}/backends"
+	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/49-sane.rules"
+
+	# fix udev rules
+	sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/49-sane.rules"
   
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
+	# 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@.service"
-}
+	# 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@.service"
+}
diff --git a/segfault-avahi-fix-kodakio.patch b/segfault-avahi-fix-kodakio.patch
new file mode 100644
index 000000000000..23f9d1ca9e3b
--- /dev/null
+++ b/segfault-avahi-fix-kodakio.patch
@@ -0,0 +1,98 @@
+From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001
+From: Paul Newall <quandry@ntlworld.com>
+Date: Mon, 14 Oct 2013 22:22:53 +0100
+Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners
+ return unexpected data via avahi auto discovery
+
+---
+ backend/kodakaio.c             |   43 ++++++++++++++++++++++++++++++----------
+ doc/descriptions/kodakaio.desc |    2 +-
+ 3 files changed, 37 insertions(+), 12 deletions(-)
+
+diff --git a/backend/kodakaio.c b/backend/kodakaio.c
+index 8c4583a..b442e50 100644
+--- a/backend/kodakaio.c
++++ b/backend/kodakaio.c
+@@ -127,7 +127,7 @@ for ubuntu 12.10
+ 
+ #define KODAKAIO_VERSION	02
+ #define KODAKAIO_REVISION	4
+-#define KODAKAIO_BUILD		6
++#define KODAKAIO_BUILD		7
+ 
+ /* for usb (but also used for net though it's not required). */
+ #define MAX_BLOCK_SIZE		32768
+@@ -2184,6 +2184,7 @@ static void resolve_callback(
+     AvahiLookupResultFlags flags,
+     AVAHI_GCC_UNUSED void* userdata) {
+ 
++	AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
+ 	char *pidkey, *pidvalue;
+ 	char *vidkey, *vidvalue;
+ 	size_t valuesize;
+@@ -2204,20 +2205,40 @@ static void resolve_callback(
+             avahi_address_snprint(a, sizeof(a), address);
+ 
+ /* Output short for Kodak ESP */
+-	DBG(min(10,DBG_AUTO), "%s:%u  %s  ", a,port,host_name);
+-	avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), 
+-		&vidkey, &vidvalue, &valuesize);
+-	DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
+-	avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), 
+-		&pidkey, &pidvalue, &valuesize);
+-	DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
++	DBG(min(10,DBG_AUTO), "%s:%u  %s\n", a,port,host_name);
+ 
++	vid_pair_list = avahi_string_list_find(txt, "vid");
++	if(vid_pair_list != NULL) {
++		avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
++		DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
++	}
++	else	DBG(min(10,DBG_AUTO), "failed to find key vid\n");
++
++	pid_pair_list = avahi_string_list_find(txt, "pid");
++	if(pid_pair_list != NULL) {
++		avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
++		DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
++	}
++	else	DBG(min(10,DBG_AUTO), "failed to find key pid\n");
++
++	if(pid_pair_list != NULL && vid_pair_list != NULL) {
+ 		ProcessAvahiDevice(name, vidvalue, pidvalue, a);
+-	avahi_free(vidkey); avahi_free(vidvalue);
+-	avahi_free(pidkey); avahi_free(pidvalue);
++	}
++	else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
++
++	if(vid_pair_list != NULL) {
++		avahi_free(vidkey); 
++		avahi_free(vidvalue);
++		DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
++	}
++	if(pid_pair_list != NULL) {
++		avahi_free(pidkey); 
++		avahi_free(pidvalue);
++		DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
++	}
+         }
+     }
+-
++    DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
+     avahi_service_resolver_free(r);
+ }
+ 
+diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
+index 7882513..5fb18ed 100644
+--- a/doc/descriptions/kodakaio.desc
++++ b/doc/descriptions/kodakaio.desc
+@@ -1,6 +1,6 @@
+ :backend "kodakaio"
+ :url "http://sourceforge.net/projects/cupsdriverkodak/" 
+-:version "2.4.6"
++:version "2.4.7"
+ :manpage "sane-kodakaio"
+ :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
+ :devicetype :scanner
+-- 
+1.7.10.4
+