[packages/sane-backends] - updated to 1.0.24 - removed obsolete umax-init-error patch

[qboosh]

commit 5da8394f1d1c806b06880ae30ea86881ee945a0a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 26 18:53:48 2014 +0100

    - updated to 1.0.24
    - removed obsolete umax-init-error patch

 sane-backends-1.0.23-umax-init-error.patch | 38 ------------------------------
 sane-backends-cups.patch                   | 11 ---------
 sane-backends.spec                         | 12 ++++------
 3 files changed, 5 insertions(+), 56 deletions(-)
---
diff --git a/sane-backends.spec b/sane-backends.spec
index 4f2aa76..df5acbb 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -11,13 +11,13 @@ Summary(ko.UTF-8):	스캐너를 다루는 소프트웨어
 Summary(pl.UTF-8):	SANE - prosta obsługa skanerów lokalnych i sieciowych
 Summary(pt_BR.UTF-8):	SANE - acesso a scanners locais e em rede
 Name:		sane-backends
-Version:	1.0.23
-Release:	2
+Version:	1.0.24
+Release:	1
 License:	relaxed GPL v2+ (libraries), Public Domain (docs)
 Group:		Libraries
 # Source0:	ftp://ftp2.sane-project.org/pub/sane/%{name}-%{version}.tar.gz
 Source0:	http://ftp.de.debian.org/debian/pool/main/s/sane-backends/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	e226a89c54173efea80e91e9a5eb6573
+# Source0-md5:	1ca68e536cd7c1852322822f5f6ac3a4
 Source1:	%{name}.rc-inetd
 Source2:	%{name}.m4
 Patch0:		%{name}-lockpath_group.patch
@@ -25,9 +25,8 @@ Patch1:		%{name}-mustek-path.patch
 Patch2:		%{name}-spatc.patch
 Patch4:		%{name}-link.patch
 Patch5:		sane-backends-1.0.23-sane-config-multilib.patch
-Patch6:		sane-backends-1.0.23-umax-init-error.patch
-Patch7:		%{name}-format.patch
-Patch8:		%{name}-cups.patch
+Patch6:		%{name}-format.patch
+Patch7:		%{name}-cups.patch
 URL:		http://www.sane-project.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake
@@ -259,7 +258,6 @@ mv -f acinclude.m4.tmp acinclude.m4
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 %{__libtoolize}
diff --git a/sane-backends-1.0.23-umax-init-error.patch b/sane-backends-1.0.23-umax-init-error.patch
deleted file mode 100644
index 5cb1c61..0000000
--- a/sane-backends-1.0.23-umax-init-error.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b7ee97acddee63c5991d901b0c9ea506fb33f611 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils at redhat.com>
-Date: Fri, 1 Feb 2013 16:47:30 +0100
-Subject: [PATCH] patch: umax-init-error
-
-Squashed commit of the following:
-
-commit 13fb7a94adfa786b81a11755f22e8ab647cfac69
-Author: Nils Philippsen <nils at redhat.com>
-Date:   Wed Jan 16 11:57:37 2013 +0100
-
-    umax: initialize reader_pid early in sane_start()
-
-    This avoids that subsequent errors followed by do_cancel() attempt to
-    phtread_cancel() an invalid thread (which may cause a crash).
-    (cherry picked from commit defdc1ab5c365735ac85e347d463a01cf96fc72d)
----
- backend/umax.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/backend/umax.c b/backend/umax.c
-index a9d1723..b2ceb00 100644
---- a/backend/umax.c
-+++ b/backend/umax.c
-@@ -7285,6 +7285,10 @@ SANE_Status sane_start(SANE_Handle handle)
- 
-   DBG(DBG_sane_init,"sane_start\n");
- 
-+  /* Initialize reader_pid to invalid so a subsequent error and following call
-+   * to do_cancel() won't trip over it. */
-+  scanner->reader_pid = -1;
-+
-   mode = scanner->val[OPT_MODE].s;
- 
-   if (scanner->device->sfd == -1)   /* first call, don`t run this routine again on multi frame or multi image scan */
--- 
-1.8.1
-
diff --git a/sane-backends-cups.patch b/sane-backends-cups.patch
index 5721b48..6f3538c 100644
--- a/sane-backends-cups.patch
+++ b/sane-backends-cups.patch
@@ -15,14 +15,3 @@
  
  dnl ***********
  dnl USB Support
---- sane-backends-1.0.23/backend/Makefile.am.orig	2013-05-28 18:08:38.883558658 +0200
-+++ sane-backends-1.0.23/backend/Makefile.am	2013-05-28 18:14:56.790209468 +0200
-@@ -627,7 +627,7 @@
- nodist_libsane_kodakaio_la_SOURCES = kodakaio-s.c
- libsane_kodakaio_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=kodakaio
- libsane_kodakaio_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
--libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo  ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo  $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS)
-+libsane_kodakaio_la_LIBADD = $(COMMON_LIBS) libkodakaio.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo  ../sanei/sanei_config.lo ../sanei/sanei_config2.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_scsi.lo ../sanei/sanei_tcp.lo ../sanei/sanei_udp.lo  $(USB_LIBS) $(SOCKET_LIBS) $(MATH_LIB) $(RESMGR_LIBS) $(CUPS_LIBS)
- EXTRA_DIST += kodakaio.conf.in
- 
- libkvs1025_la_SOURCES = kvs1025.c kvs1025_low.c kvs1025_opt.c kvs1025_usb.c \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sane-backends.git/commitdiff/5da8394f1d1c806b06880ae30ea86881ee945a0a