From a4003c4478b023c4dc26afc384d5017be4e83321 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 14 Apr 2020 18:07:33 +0200
Subject: [PATCH] - added backroot-readable patch (allow backends requiring
 root to be readable by others); release 2

---
 cups-backroot-readable.patch | 11 +++++++++++
 cups.spec                    | 10 +++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 cups-backroot-readable.patch

diff --git a/cups-backroot-readable.patch b/cups-backroot-readable.patch
new file mode 100644
index 0000000..5e3cb14
--- /dev/null
+++ b/cups-backroot-readable.patch
@@ -0,0 +1,11 @@
+--- cups-2.3.1/scheduler/job.c.orig	2020-04-13 22:03:43.447639630 +0200
++++ cups-2.3.1/scheduler/job.c	2020-04-14 06:17:15.043886518 +0200
+@@ -1340,7 +1340,7 @@
+       else if (stat(command, &backinfo))
+ 	backroot = 0;
+       else
+-        backroot = !(backinfo.st_mode & (S_IWGRP | S_IRWXO));
++        backroot = !(backinfo.st_mode & (S_IWGRP | S_IWOTH | S_IXOTH));
+ 
+       argv[0] = job->printer->sanitized_device_uri;
+ 
diff --git a/cups.spec b/cups.spec
index eb40976..71a0654 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):	Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
 Version:	2.3.1
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL v2 (libraries), GPL v2 (the rest)
 Group:		Applications/Printing
@@ -37,7 +37,7 @@ Patch10:	%{name}-peercred.patch
 Patch11:	%{name}-usb.patch
 Patch12:	%{name}-desktop.patch
 Patch13:	%{name}-systemd-socket.patch
-
+Patch14:	%{name}-backroot-readable.patch
 Patch15:	reactivate_recommended_driver.patch
 Patch16:	read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
 Patch18:	%{name}-final-content-type.patch
@@ -282,7 +282,7 @@ bibliotecas do CUPS.
 #%patch11 -p1
 %patch12 -p1
 %patch13 -p1
-
+%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch18 -p1
@@ -358,9 +358,9 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,modprobe.d,securit
 
 if [ "%{_lib}" != "lib" ] ; then
 	install -d $RPM_BUILD_ROOT%{_libdir}
-	mv $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
+	%{__mv} $RPM_BUILD_ROOT%{_ulibdir}/*.so* $RPM_BUILD_ROOT%{_libdir}
 %if %{with static_libs}
-	mv $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
+	%{__mv} $RPM_BUILD_ROOT%{_ulibdir}/*.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 fi
 
-- 
2.43.0