From 61be2007557a41721b30d061b82bb5c996fdbc37 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Oct 10 2020 10:08:45 +0000 Subject: Update to latest version. --- diff --git a/.gitignore b/.gitignore index 4f07107..fea8950 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libinsane-1.0.4.tar.gz /libinsane-1.0.6.tar.gz /libinsane-1.0.7.tar.gz +/libinsane-1.0.8.tar.gz diff --git a/0001-Fix-execute_session_scan_read-on-big-endian-machines.patch b/0001-Fix-execute_session_scan_read-on-big-endian-machines.patch deleted file mode 100644 index d83a64b..0000000 --- a/0001-Fix-execute_session_scan_read-on-big-endian-machines.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e90e9d982e344da89c1746606990df7709bb88df Mon Sep 17 00:00:00 2001 -From: Elliott Sales de Andrade -Date: Wed, 2 Sep 2020 06:18:36 -0400 -Subject: [PATCH] Fix execute_session_scan_read on big endian machines. - -The buffer contains an `int`, and `msg_out->raw.iov_len` is a `size_t`, -which is twice the size on 64-bit machines. On big-endian machines, the -4 bytes of the `int` will be put in the MSB, meaning `malloc` will be -called with a really big number. - -Signed-off-by: Elliott Sales de Andrade ---- - .../libinsane/src/workarounds/dedicated_process/worker.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/subprojects/libinsane/src/workarounds/dedicated_process/worker.c b/subprojects/libinsane/src/workarounds/dedicated_process/worker.c -index e6a84e3..732d8e9 100644 ---- a/subprojects/libinsane/src/workarounds/dedicated_process/worker.c -+++ b/subprojects/libinsane/src/workarounds/dedicated_process/worker.c -@@ -630,9 +630,11 @@ static enum lis_error execute_session_scan_read(struct lis_msg *msg_in, struct l - { - const void *ptr_in; - struct lis_scan_session *session; -+ int buffer_size; - - ptr_in = msg_in->raw.iov_base; -- lis_unpack(&ptr_in, "pd", &session, &msg_out->raw.iov_len); -+ lis_unpack(&ptr_in, "pd", &session, &buffer_size); -+ msg_out->raw.iov_len = buffer_size; - - msg_out->raw.iov_base = malloc(msg_out->raw.iov_len); - if (msg_out->raw.iov_base == NULL) { --- -2.26.2 - diff --git a/libinsane.spec b/libinsane.spec index 28a7aa5..8c70262 100644 --- a/libinsane.spec +++ b/libinsane.spec @@ -1,13 +1,11 @@ Name: libinsane -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?dist} Summary: Cross-platform access to image scanners License: LGPLv3+ URL: https://doc.openpaper.work/libinsane/latest/ Source0: https://gitlab.gnome.org/World/OpenPaperwork/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz -# https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/merge_requests/37 -Patch0001: 0001-Fix-execute_session_scan_read-on-big-endian-machines.patch BuildRequires: meson BuildRequires: gcc @@ -120,6 +118,9 @@ Vala bindings for libinsane. %changelog +* Sat Oct 10 2020 Elliott Sales de Andrade - 1.0.8-1 +- Update to latest version (#1886948) + * Tue Sep 01 2020 Elliott Sales de Andrade - 1.0.7-1 - Update to latest version (#1873874) diff --git a/sources b/sources index 31b6a56..e6f6e44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinsane-1.0.7.tar.gz) = 9c9f884fa3f99a7b04882a4cf866ab5c0b7abb1f60ac75ba921856184ad1471de41dc5a0c312eba93eb82c75d54bea9e30c76f2ee8b647904da700e013fe3ba9 +SHA512 (libinsane-1.0.8.tar.gz) = 810a7e7005b93a4da53aefa6b3c63824800eba5fee9b945d45f64372a98e04e6fd5fd554db817f2b41c481ec78b3723b151337de6cb5784d423868e19bd36aa3