Compare commits
No commits in common. "c9-beta" and "c10s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
18
.gitignore
vendored
18
.gitignore
vendored
@ -1 +1,17 @@
|
||||
SOURCES/sane-airscan-0.99.24.tar.gz
|
||||
/sane-airscan-0.99.11.tar.gz
|
||||
/sane-airscan-0.99.12.tar.gz
|
||||
/sane-airscan-0.99.13.tar.gz
|
||||
/sane-airscan-0.99.14.tar.gz
|
||||
/sane-airscan-0.99.15.tar.gz
|
||||
/sane-airscan-0.99.16.tar.gz
|
||||
/sane-airscan-0.99.17.tar.gz
|
||||
/sane-airscan-0.99.18.tar.gz
|
||||
/sane-airscan-0.99.19.tar.gz
|
||||
/sane-airscan-0.99.20.tar.gz
|
||||
/sane-airscan-0.99.21.tar.gz
|
||||
/sane-airscan-0.99.22.tar.gz
|
||||
/sane-airscan-0.99.23.tar.gz
|
||||
/sane-airscan-0.99.24.tar.gz
|
||||
/sane-airscan-0.99.25.tar.gz
|
||||
/sane-airscan-0.99.26.tar.gz
|
||||
/sane-airscan-0.99.27.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
37faa4a1f23430bf686864df7625a6924f5c8501 SOURCES/sane-airscan-0.99.24.tar.gz
|
||||
26
0001-Fixed-missed-include-stdlib.h-see-305.patch
Normal file
26
0001-Fixed-missed-include-stdlib.h-see-305.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From c042a6895fe6f663d4bcb8c27d1c7b34fbd68b48 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Pevzner <pzz@apevzner.com>
|
||||
Date: Sat, 2 Dec 2023 21:49:40 +0300
|
||||
Subject: [PATCH 1/2] Fixed missed #include <stdlib.h> (see #305)
|
||||
|
||||
This code used to compile on everywhere, but explicit #include <stdlib.h>
|
||||
was actually missed. Seems that sometimes it can cause problems.
|
||||
---
|
||||
airscan-xml.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/airscan-xml.c b/airscan-xml.c
|
||||
index f376f31..5071ca9 100644
|
||||
--- a/airscan-xml.c
|
||||
+++ b/airscan-xml.c
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "airscan.h"
|
||||
|
||||
#include <fnmatch.h>
|
||||
+#include <stdlib.h>
|
||||
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/tree.h>
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From 144e7d4187c73566ffc2780ac91ab7e1826826e0 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Pevzner <pzz@apevzner.com>
|
||||
Date: Sat, 2 Dec 2023 22:29:55 +0300
|
||||
Subject: [PATCH 2/2] Fixed build with recent versions of libxml2 (fixes #305)
|
||||
|
||||
libxml2 recently changed a prototype of the xmlStructuredErrorFunc callback,
|
||||
adding const modifier to the second parameter.
|
||||
|
||||
Adding an explicit cast seems to fix the problem (but I will not be surprised, if
|
||||
this fix will not work equally well on all distros).
|
||||
|
||||
Found for a first time and fixed on Arch linux on about 2 Dec 2023 (Arch is rolling
|
||||
release, so there is no explicit release number)
|
||||
---
|
||||
airscan-xml.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/airscan-xml.c b/airscan-xml.c
|
||||
index 5071ca9..10f290c 100644
|
||||
--- a/airscan-xml.c
|
||||
+++ b/airscan-xml.c
|
||||
@@ -124,7 +124,7 @@ xml_rd_parse (xmlDoc **doc, const char *xml_text, size_t xml_len)
|
||||
goto DONE;
|
||||
}
|
||||
|
||||
- ctxt->sax->serror = xml_rd_error_callback;
|
||||
+ ctxt->sax->serror = (xmlStructuredErrorFunc) xml_rd_error_callback;
|
||||
|
||||
/* Parse the document */
|
||||
if (xmlCtxtResetPush(ctxt, xml_text, xml_len, NULL, NULL)) {
|
||||
--
|
||||
2.43.0
|
||||
|
||||
25
gating.yaml
Normal file
25
gating.yaml
Normal file
@ -0,0 +1,25 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_testing
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#Rawhide
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_context: bodhi_update_push_stable
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
||||
|
||||
#gating rhel
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-*
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
||||
36
plans.fmf
Normal file
36
plans.fmf
Normal file
@ -0,0 +1,36 @@
|
||||
/tier1-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/sane-airscan.git
|
||||
name: /plans/tier1/internal
|
||||
|
||||
/tier1-public:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/sane-airscan.git
|
||||
name: /plans/tier1/public
|
||||
|
||||
/tier2-tier3-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/sane-airscan.git
|
||||
name: /plans/tier2-tier3/internal
|
||||
|
||||
/tier2-tier3-public:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/sane-airscan.git
|
||||
name: /plans/tier2-tier3/public
|
||||
|
||||
/others-internal:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/sane-airscan.git
|
||||
name: /plans/others/internal
|
||||
|
||||
/others-public:
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.com/redhat/centos-stream/tests/sane-airscan.git
|
||||
name: /plans/others/public
|
||||
|
||||
@ -4,21 +4,29 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: sane-airscan
|
||||
Version: 0.99.24
|
||||
Release: 3%{?dist}
|
||||
Version: 0.99.27
|
||||
Release: 14%{?dist}
|
||||
Summary: SANE backend for AirScan (eSCL) and WSD document scanners
|
||||
# SANE related source and header files - GPL 2.0+ with SANE exception
|
||||
# http_parser.c/.h - MIT
|
||||
# the exception is defined in LICENSE, meant for SANE project in most cases
|
||||
License: GPLv2+ with exceptions
|
||||
License: GPL-2.0-or-later WITH SANE-exception AND MIT
|
||||
URL: https://github.com/alexpevzner/sane-airscan
|
||||
Source: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# backported from upstream
|
||||
# https://github.com/alexpevzner/sane-airscan/commit/c042a6895 - missing stdlib
|
||||
Patch001: 0001-Fixed-missed-include-stdlib.h-see-305.patch
|
||||
# https://github.com/alexpevzner/sane-airscan/commit/144e7d4187 - fix warning by conversion
|
||||
Patch002: 0002-Fixed-build-with-recent-versions-of-libxml2-fixes-30.patch
|
||||
|
||||
|
||||
# needed for querying and getting mDNS messages from local network
|
||||
BuildRequires: avahi-devel
|
||||
# project is written in C
|
||||
BuildRequires: gcc
|
||||
# fuzzer for testing is written in C++
|
||||
BuildRequires: gcc-c++
|
||||
# git is used during autosetup
|
||||
BuildRequires: git-core
|
||||
# creating credentials and SHA256 for UUID
|
||||
@ -27,14 +35,18 @@ BuildRequires: gnutls-devel
|
||||
BuildRequires: libjpeg-turbo-devel, libpng-devel
|
||||
# XML data are carried on HTTP protocol, we need to create them and parse them
|
||||
BuildRequires: libxml2-devel
|
||||
# uses make
|
||||
BuildRequires: make
|
||||
# uses meson
|
||||
BuildRequires: meson
|
||||
# used in Makefile to get the correct compile and link flags
|
||||
BuildRequires: pkgconf-pkg-config
|
||||
# package is meant to be as one of SANE backends - it uses SANE API for handling
|
||||
# devices, strings, words (bytes) and backend itself
|
||||
BuildRequires: sane-backends-devel
|
||||
|
||||
%if 0%{?fedora} >= 38 || 0%{?rhel} >= 9
|
||||
Recommends: ipp-usb
|
||||
%endif
|
||||
|
||||
# needs shared library implementing the backend
|
||||
Requires: libsane-airscan%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -45,6 +57,11 @@ when automatic discovery fails - airscan-discover.
|
||||
%package -n libsane-airscan
|
||||
Summary: SANE backend for eSCL or WSD
|
||||
|
||||
# USB scanners which support IPP-over-USB interface can communicate
|
||||
# via sane-airscan once ipp-usb brings up an IPP interface for them
|
||||
# remove for now until migration app is implemented
|
||||
#Recommends: ipp-usb
|
||||
|
||||
%description -n libsane-airscan
|
||||
This package contain a SANE backend for MFP and document scanners that
|
||||
implements either eSCL (AirScan/AirPrint scanning) or WSD "driverless"
|
||||
@ -55,16 +72,16 @@ scanning protocol.
|
||||
%autosetup -S git
|
||||
|
||||
%build
|
||||
# we need to set default CFLAGS, CPPFLAGS and LDFLAGS to get flags
|
||||
# from build system into the build, otherwise project's default
|
||||
# are used
|
||||
%set_build_flags
|
||||
%make_build
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}/
|
||||
%make_install STRIP=''
|
||||
%meson_install
|
||||
|
||||
rm -f %{buildroot}%{_libdir}/sane/libsane-airscan.so
|
||||
|
||||
%files
|
||||
%license COPYING LICENSE
|
||||
@ -85,12 +102,54 @@ mkdir -p %{buildroot}/
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.99.24-3
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.99.27-14
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.99.24-2
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.99.27-13
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.27-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Dec 08 2023 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-11
|
||||
- fix FTBFS
|
||||
|
||||
* Wed Aug 30 2023 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-10
|
||||
- applied accepted license exception - SANE-exception
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.27-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Feb 23 2023 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-8
|
||||
- move to meson
|
||||
|
||||
* Thu Feb 02 2023 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-7
|
||||
- 2165612 - IPP-USB as a weak dependency of CUPS and sane-airscan
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.27-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.27-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Mar 31 2022 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-4
|
||||
- remove ipp-usb for now until there is a migration path
|
||||
|
||||
* Wed Mar 23 2022 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-3
|
||||
- recommend ipp-usb in case of USB scanner capable of IPP-over-USB
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.27-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Oct 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.27-1
|
||||
- 2012253 - sane-airscan-0.99.27 is available
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.26-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Apr 19 2021 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.26-1
|
||||
- 1949055 - sane-airscan-0.99.26 is available
|
||||
|
||||
* Thu Feb 04 2021 Zdenek Dohnal <zdohnal@redhat.com> - 0.99.24-1
|
||||
- 1922563 - sane-airscan-0.99.24 is available
|
||||
Loading…
Reference in New Issue
Block a user