From patchwork Sat Apr 6 13:59:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1079394 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sshhOQkt"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44bywd75Sxz9sPx for ; Sun, 7 Apr 2019 00:59:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 13073861B3; Sat, 6 Apr 2019 13:59:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lPvnG1f0zqn7; Sat, 6 Apr 2019 13:59:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3D95186113; Sat, 6 Apr 2019 13:59:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B0E741BF276 for ; Sat, 6 Apr 2019 13:59:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AE26622775 for ; Sat, 6 Apr 2019 13:59:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uJZRWv6c-maT for ; Sat, 6 Apr 2019 13:59:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 9842020784 for ; Sat, 6 Apr 2019 13:59:18 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a184so9477467wma.2 for ; Sat, 06 Apr 2019 06:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=30bmxFC+rnpe5A19kV/k6g19oQK2qH1p4BIG7BYHzO4=; b=sshhOQktEwzXVlfI44/56hgNmdXcVOJmoTa8teDAau0naeJWTO0bVTCYIlEKcfU8xa PZO91EkDX4F/5Zu7RGHdvAPGOz7ZJLzt5UAt7fsY77SKJ7kQK8FSJSiXfTDJsyvo/spA 0xAlghor7NFK77OsVVoNlYK0YnDipXbvlOd7DSDFuI+YX2tLfuMq8tJ5lSlPTe9PB05u WQtKwPNM193bM19Avek7BHSPenOZz3auG6lt0Ea6amQIuQxsuZWowjzHBdNxQsw30qZ4 3868ANaLhNArzwfz0/yvQah882zNBIv7at9lu/p0HpGJqelprR7/ujHAHdXdiEJvvnNM b41Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=30bmxFC+rnpe5A19kV/k6g19oQK2qH1p4BIG7BYHzO4=; b=Zv8x1ZmSAjt+eELzQBZiOGICeUSwHJXDJsAiOxaaorKg9vQWw8o8hgdwYWf5glzYOK S64XXHZ7K9JqgaKVMd42N2tIZlSnGvcpSeLDoTEPqZNVIvI0IuAE+o0xlTyP+eBI4eMT 2tNZRYZ2OSNt9tR2w/Js7eB0lTZ5NFsQ2b677LJfery8298I+XBYb9fdbVjDCD0Q6gMp crTTTm8jSKXO11YJi9rJl2z2Ejuk0TOWnFMPaM8Ks72TCTOs7s44mi3MRZxTgBRxv8ye KTppuqWOozeRh05HUCFWmMtbwQOt6EjOdOL4SbcdBvo9IrWwKy6byOro0iCbSk2Ftya0 kkrg== X-Gm-Message-State: APjAAAWDS/0qgSrhv8oF4Yq7qEpUWTU9+LEUnf8pSDvUlr9aRCixqu3T ccc7XO3u8Afcn3YeiWcntviarljz X-Google-Smtp-Source: APXvYqxIMZBr8e73RPXzRaq4JaLR6EJq6qeXJiMX0RFZ+WdRZ4r2RQJLa/vx/neAOGZWou+OBAp76A== X-Received: by 2002:a1c:4d02:: with SMTP id o2mr11371663wmh.134.1554559156685; Sat, 06 Apr 2019 06:59:16 -0700 (PDT) Received: from kali.home (lfbn-ren-1-314-196.w2-10.abo.wanadoo.fr. [2.10.15.196]) by smtp.gmail.com with ESMTPSA id t81sm10646076wmb.5.2019.04.06.06.59.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 06 Apr 2019 06:59:15 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 6 Apr 2019 15:59:04 +0200 Message-Id: <20190406135904.12623-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/sane-backends: security bump to version 1.0.27 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Switch site to gitlab - Remove second patch (already in version) - Use new --{with,without}-usb option - Add hash for license file - Fix CVE-2017-6318 Signed-off-by: Fabrice Fontaine --- ...002-Add-missing-sys-types.h-includes.patch | 106 ------------------ ...2-sane_backend-add-missing-config.h.patch} | 0 package/sane-backends/sane-backends.hash | 7 +- package/sane-backends/sane-backends.mk | 9 +- 4 files changed, 10 insertions(+), 112 deletions(-) delete mode 100644 package/sane-backends/0002-Add-missing-sys-types.h-includes.patch rename package/sane-backends/{0003-sane_backend-add-missing-config.h.patch => 0002-sane_backend-add-missing-config.h.patch} (100%) diff --git a/package/sane-backends/0002-Add-missing-sys-types.h-includes.patch b/package/sane-backends/0002-Add-missing-sys-types.h-includes.patch deleted file mode 100644 index 8ab41f1fef..0000000000 --- a/package/sane-backends/0002-Add-missing-sys-types.h-includes.patch +++ /dev/null @@ -1,106 +0,0 @@ -From d33f16f463e888846d69ddfbeeb963d40972b654 Mon Sep 17 00:00:00 2001 -From: Luiz Angelo Daros de Luca -Date: Thu, 15 Oct 2015 12:35:00 +0900 -Subject: [PATCH] Add missing includes - -[Thomas: backport from upstream commit -33495ef9b42a783c8f5f2c056ac5699481d3cc7e, allows to fix the build with -the musl C library.] -Signed-off-by: Thomas Petazzoni ---- - backend/epsonds-io.c | 3 +++ - backend/hp5400.c | 3 +++ - backend/hp5590.c | 3 +++ - backend/kvs20xx_cmd.h | 4 ++++ - backend/kvs40xx.h | 3 +++ - include/sane/sanei_udp.h | 3 +++ - 6 files changed, 19 insertions(+) - -diff --git a/backend/epsonds-io.c b/backend/epsonds-io.c -index 28bacfc..512997d 100644 ---- a/backend/epsonds-io.c -+++ b/backend/epsonds-io.c -@@ -16,6 +16,9 @@ - #include "sane/config.h" - #include - #include /* sleep */ -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #include "epsonds.h" - #include "epsonds-io.h" -diff --git a/backend/hp5400.c b/backend/hp5400.c -index 61de3db..cfa2dc9 100644 ---- a/backend/hp5400.c -+++ b/backend/hp5400.c -@@ -67,6 +67,9 @@ - #include /* malloc, free */ - #include /* memcpy */ - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - - #define HP5400_CONFIG_FILE "hp5400.conf" -diff --git a/backend/hp5590.c b/backend/hp5590.c -index 7b1cd60..5422372 100644 ---- a/backend/hp5590.c -+++ b/backend/hp5590.c -@@ -48,6 +48,9 @@ - #include - #include - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #include "../include/sane/sane.h" - #define BACKEND_NAME hp5590 -diff --git a/backend/kvs20xx_cmd.h b/backend/kvs20xx_cmd.h -index c18b754..4acaf62 100644 ---- a/backend/kvs20xx_cmd.h -+++ b/backend/kvs20xx_cmd.h -@@ -9,6 +9,10 @@ - Panasonic KV-S20xx USB-SCSI scanners. - */ - -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif -+ - #define COMMAND_BLOCK 1 - #define DATA_BLOCK 2 - #define RESPONSE_BLOCK 3 -diff --git a/backend/kvs40xx.h b/backend/kvs40xx.h -index fa17163..02e0da6 100644 ---- a/backend/kvs40xx.h -+++ b/backend/kvs40xx.h -@@ -10,6 +10,9 @@ - - #include "../include/sane/config.h" - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #undef BACKEND_NAME - #define BACKEND_NAME kvs40xx -diff --git a/include/sane/sanei_udp.h b/include/sane/sanei_udp.h -index c44afdd..e32fc1a 100644 ---- a/include/sane/sanei_udp.h -+++ b/include/sane/sanei_udp.h -@@ -27,6 +27,9 @@ - #include - #include - #endif -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp); - extern SANE_Status sanei_udp_open_broadcast(int *fdp); --- -2.7.4 - diff --git a/package/sane-backends/0003-sane_backend-add-missing-config.h.patch b/package/sane-backends/0002-sane_backend-add-missing-config.h.patch similarity index 100% rename from package/sane-backends/0003-sane_backend-add-missing-config.h.patch rename to package/sane-backends/0002-sane_backend-add-missing-config.h.patch diff --git a/package/sane-backends/sane-backends.hash b/package/sane-backends/sane-backends.hash index a7693e2527..ddf82500bb 100644 --- a/package/sane-backends/sane-backends.hash +++ b/package/sane-backends/sane-backends.hash @@ -1,2 +1,5 @@ -# From http://www.sane-project.org/sane-md5sums.txt -md5 f9ed5405b3c12f07c6ca51ee60225fe7 sane-backends-1.0.25.tar.gz +# From https://gitlab.com/sane-project/backends/tags/RELEASE_1_0_27 +sha256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9 sane-backends-1.0.27.tar.gz + +# Hash for license file +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk index ed3b912479..092123e194 100644 --- a/package/sane-backends/sane-backends.mk +++ b/package/sane-backends/sane-backends.mk @@ -4,8 +4,9 @@ # ################################################################################ -SANE_BACKENDS_VERSION = 1.0.25 -SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/4146 +SANE_BACKENDS_VERSION = 1.0.27 +SANE_BACKENDS_SITE = \ + https://gitlab.com/sane-project/backends/uploads/a3ba9fff29253a94e84074917bff581a SANE_BACKENDS_CONFIG_SCRIPTS = sane-config SANE_BACKENDS_LICENSE = GPL-2.0+ SANE_BACKENDS_LICENSE_FILES = COPYING @@ -23,9 +24,9 @@ endif ifeq ($(BR2_PACKAGE_LIBUSB),y) SANE_BACKENDS_DEPENDENCIES += libusb -SANE_BACKENDS_CONF_OPTS += --enable-libusb_1_0 +SANE_BACKENDS_CONF_OPTS += --with-usb else -SANE_BACKENDS_CONF_OPTS += --disable-libusb +SANE_BACKENDS_CONF_OPTS += --without-usb endif ifeq ($(BR2_PACKAGE_JPEG),y)