Current location

narf Source control manager Git

aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Mehani <shtrom@ssji.net>2015-12-26 12:14:35 +0100
committerOlivier Mehani <shtrom@ssji.net>2015-12-26 12:32:51 +0100
commit9970632c1be33222f5926ff9e7a0404c402d5c1f (patch)
treea0d204905ba62bdb96fcddc1eca201dfde40378c
parentc280000990a34948265b26627fede07fe1b7ee5f (diff)
Bump sane-backends to 1.0.25ts212
Change mirror to Alioth. XXX: No TLS cert check. Signed-off-by: Olivier Mehani <shtrom@ssji.net>
-rw-r--r--make/sane-backends.mk12
-rw-r--r--sources/sane-backends/1.0.25/backend-pieusb_buffer.c.patch11
2 files changed, 21 insertions, 2 deletions
diff --git a/make/sane-backends.mk b/make/sane-backends.mk
index d6ab7e3c..6c0e5963 100644
--- a/make/sane-backends.mk
+++ b/make/sane-backends.mk
@@ -4,6 +4,8 @@
#
###########################################################
+WGET+= --no-check-certificate
+
# You must replace "sane-backends" and "SANE_BACKENDS" with the lower case name and
# upper case name of your new package. Some places below will say
# "Do not change this" - that does not include this global change,
@@ -27,7 +29,7 @@
# "NSLU2 Linux" other developers will feel free to edit.
#
-SANE_BACKENDS_RELEASE=1.0.22
+SANE_BACKENDS_RELEASE=1.0.25
SANE_BACKENDS_IPK_VERSION=1
# You should change the next two git variables TOGETHER
@@ -45,7 +47,7 @@ SANE_BACKENDS_SITE=http://git.debian.org/?p=sane/sane-backends.git;a=snapshot;h=
SANE_BACKENDS_VERSION=$(SANE_BACKENDS_RELEASE)+git$(SANE_BACKENDS_GIT_DATE)
SANE_BACKENDS_DIR=sane-backends
else
-SANE_BACKENDS_SITE=ftp://ftp.sane-project.org/pub/sane/sane-backends-$(SANE_BACKENDS_VERSION)
+SANE_BACKENDS_SITE=http://alioth.debian.org/frs/download.php/file/4146/sane-backends-$(SANE_BACKENDS_VERSION)
SANE_BACKENDS_SITE_OLD=ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-$(SANE_BACKENDS_VERSION)
SANE_BACKENDS_VERSION=$(SANE_BACKENDS_RELEASE)
SANE_BACKENDS_DIR=sane-backends-$(SANE_BACKENDS_VERSION)
@@ -74,8 +76,14 @@ ifeq (1.0.19, $(SANE_BACKENDS_RELEASE))
SANE_BACKENDS_PATCHES=$(SANE_BACKENDS_SOURCE_DIR)/1.0.19/Makefile.in.patch \
$(SANE_BACKENDS_SOURCE_DIR)/1.0.19/tools-Makefile.in.patch
else
+ifeq (1.0.22, $(SANE_BACKENDS_RELEASE))
SANE_BACKENDS_PATCHES=$(SANE_BACKENDS_SOURCE_DIR)/Makefile.in.patch \
$(SANE_BACKENDS_SOURCE_DIR)/tools-Makefile.in.patch
+else
+ifeq (1.0.25, $(SANE_BACKENDS_RELEASE))
+SANE_BACKENDS_PATCHES=$(SANE_BACKENDS_SOURCE_DIR)/1.0.25/backend-pieusb_buffer.c.patch
+endif
+endif
endif
#
diff --git a/sources/sane-backends/1.0.25/backend-pieusb_buffer.c.patch b/sources/sane-backends/1.0.25/backend-pieusb_buffer.c.patch
new file mode 100644
index 00000000..e6e57981
--- /dev/null
+++ b/sources/sane-backends/1.0.25/backend-pieusb_buffer.c.patch
@@ -0,0 +1,11 @@
+--- sane-backends/backend/pieusb_buffer.c.orig 2015-12-24 11:34:53.534119001 +0000
++++ sane-backends/backend/pieusb_buffer.c 2015-12-24 11:35:37.834119001 +0000
+@@ -163,7 +163,7 @@
+ snprintf(buffer->buffer_name, L_tmpnam, "/tmp/sane.XXXXXX");
+ if (buffer->data_file != 0) /* might still be open from previous invocation */
+ close(buffer->data_file);
+- buffer->data_file = mkostemp(buffer->buffer_name, O_RDWR | O_CREAT | O_EXCL | O_TRUNC);
++ buffer->data_file = mkstemp(buffer->buffer_name);
+ if (buffer->data_file == -1) {
+ buffer->data_file = 0;
+ buffer->data = NULL;