Accepting request 1194622 from graphics

OBS-URL: https://build.opensuse.org/request/show/1194622
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=97

remove_unnecessary_unicode_character.patch

@@ -0,0 +1,33 @@
+From 8cf5af772cba2c94ff7cee4f052de650ff2cd14b Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 26 Jul 2024 09:25:35 +0200
+Subject: [PATCH] backend/kodakio.c: Remove unnecessary Unicode character
+
+There is an bidirectional Unicode character <202d> in the comment.
+The character looks like a typo, because it does not look fitting
+there, so IMHO it can be removed.
+
+Checking tools like rpminspect are wary of Unicode characters in the
+code after CVE regarding bidirectional Unicode characters from several
+years ago, and character <202d> is for left-to-right override in
+Unicode, so tools report them as an issue.
+---
+ backend/kodakaio.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backend/kodakaio.c b/backend/kodakaio.c
+index 0241e2a84..da3e234f4 100644
+--- a/backend/kodakaio.c
++++ b/backend/kodakaio.c
+@@ -1827,7 +1827,7 @@ k_init_parametersta(KodakAio_Scanner * s)
+ 	    SANE_UNFIX(s->val[OPT_BR_X].w), SANE_UNFIX(s->val[OPT_BR_Y].w));
+ 
+ 	/*
+-	 * The default color depth is stored in mode_params.depth:‭
++	 * The default color depth is stored in mode_params.depth:
+ 	 */
+ 	if (mode_params[s->val[OPT_MODE].w].depth == 1)
+ 		s->params.depth = 1;
+-- 
+GitLab
+

sane-backends.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Aug  6 13:46:39 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Cherry-pick upstream patch to remove unnecessary Unicode character
+  * remove_unnecessary_unicode_character.patch
+- Use individual %patch statements over %autosetup to allow
+  for different levels of path stripping for both patches
+
 -------------------------------------------------------------------
 Thu May 23 15:17:34 UTC 2024 - Arnav Singh <opensuse@arnavion.dev>
 

sane-backends.spec

@@ -85,6 +85,8 @@ Source201:      create_sane-backends-autoconfig.rules
 # Sources 202 and 203 are files to enable socket based service activation which replaced xinetd
 Source202:      saned@.service
 Source203:      saned.socket
+# PATCH-FIX-UPSTREAM - gl/sane-project/backends#848 - backend/kodakio.c: Remove unnecessary Unicode character
+Patch0:         remove_unnecessary_unicode_character.patch
 # Patch100... is SUSE specific stuff:
 # Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
 # (see https://bugzilla.opensuse.org/show_bug.cgi?id=788756#c14).
@@ -189,7 +191,9 @@ Saned allows access to locally attached scanners over the network.
 # Patch100... is SUSE specific stuff:
 # Patch102 adapt_epkowa.desc_for_yast2-scanner.patch adapts epkowa.desc for yast2-scanner
 # see https://bugzilla.opensuse.org/show_bug.cgi?id=788756#c14
-%autosetup -p0 -n backends-%{version}
+%setup -n backends-%{version}
+%patch -P0 -p1
+%patch -P102 -p0
 
 # Remove hpoj.desc completely to avoid confusion with its successor hpaio.desc
 # because since openSUSE 10.3 the package hp-officeJet (for hpoj.desc) is dropped.