cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SECURITY update to sane-backends-1.0.30.

Browse Source 
CVE-2020-12867, CVE-2020-12862, CVE-2020-12863, CVE-2020-12865,
CVE-2020-12866, CVE-2020-12864
This commit is contained in:
ajacoutot 2020-05-17 15:30:11 +00:00
parent 8921d9c50b
commit fdc963bb49
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/sane-backends/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.90 2020/03/20 16:44:24 naddy Exp $
# $OpenBSD: Makefile,v 1.91 2020/05/17 15:30:11 ajacoutot Exp $
BROKEN-alpha= ICE hp5590.c:1141: error: unrecognizable insn
COMMENT= API for accessing scanners, backends
DISTNAME= sane-backends-1.0.29
REVISION= 0
DISTNAME= sane-backends-1.0.30
SHARED_LIBS += sane 2.1 # unknown
@ -21,7 +20,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c execinfo iconv jpeg lzma m png
WANTLIB += tiff usb-1.0 v4l1 v4l2 v4lconvert xml2 z zstd
MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/54f858b20a364fc35d820df935a86478/
MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/c3dd60c9e054b5dee1e7b01a7edc98b0/
COMPILER= base-clang ports-gcc

4
graphics/sane-backends/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (sane-backends-1.0.29.tar.gz) = qgJ7Tl9ZhJzUG4wm1UWEzzH//ZhgSQGb5q1BQOEeqO0=
SIZE (sane-backends-1.0.29.tar.gz) = 7201950
SHA256 (sane-backends-1.0.30.tar.gz) = P12WqcR/YSSka7V3x3a7xIlt0XuSA9i/vH/oy7zyeaM=
SIZE (sane-backends-1.0.30.tar.gz) = 7204519

21
graphics/sane-backends/patches/patch-backend_Makefile_in
View File

@ -1,14 +1,4 @@
$OpenBSD: patch-backend_Makefile_in,v 1.12 2020/02/08 13:35:52 ajacoutot Exp $
2nd chunk:
From 17d760a5f848f4034fbaa19657567fae52f8c150 Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Wed, 5 Feb 2020 21:30:11 +0900
Subject: [PATCH] Remove libxml2 linker/loader flags from dependencies. Re #239
From 7415a9f5c97acc655dae357dbffe7ff6b69ef82d Mon Sep 17 00:00:00 2001
From: Olaf Meeuwissen <paddy-hack@member.fsf.org>
Date: Thu, 6 Feb 2020 20:56:21 +0900
Subject: [PATCH] Really remove libxml2 linker/loader flags from dependencies. Re #239
$OpenBSD: patch-backend_Makefile_in,v 1.13 2020/05/17 15:30:11 ajacoutot Exp $
Index: backend/Makefile.in
--- backend/Makefile.in.orig
@ -22,12 +12,3 @@ Index: backend/Makefile.in
DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
@@ -3270,7 +3270,7 @@ libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
libsane_la_LIBADD = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_LIBS) $(DL_LIBS) $(XML_LIBS)
# WARNING: Automake is getting this wrong so have to do it ourselves.
-libsane_la_DEPENDENCIES = $(COMMON_LIBS) $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
+libsane_la_DEPENDENCIES = ../lib/liblib.la $(PRELOADABLE_BACKENDS_ENABLED) libdll_preload.la sane_strstatus.lo ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo $(PRELOADABLE_BACKENDS_DEPS)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am