From 4bee3bdc1fe30a1311b365265357fb2034fe626e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 05 2019 19:40:35 +0000
Subject: import cups-filters-1.20.0-18.el8


---

diff --git a/SOURCES/pdftopdf-nocrypt.patch b/SOURCES/pdftopdf-nocrypt.patch
new file mode 100644
index 0000000..24caf5c
--- /dev/null
+++ b/SOURCES/pdftopdf-nocrypt.patch
@@ -0,0 +1,20 @@
+diff --git a/filter/pdftopdf/qpdf_pdftopdf_processor.cc b/filter/pdftopdf/qpdf_pdftopdf_processor.cc
+index 73e4f06..0752a99 100644
+--- a/filter/pdftopdf/qpdf_pdftopdf_processor.cc
++++ b/filter/pdftopdf/qpdf_pdftopdf_processor.cc
+@@ -623,6 +623,7 @@ void QPDF_PDFTOPDF_Processor::emitFile(FILE *f,ArgOwnership take) // {{{
+   if (!extraheader.empty()) {
+     out.setExtraHeaderText(extraheader);
+   }
++  out.setPreserveEncryption(false);
+   out.write();
+ }
+ // }}}
+@@ -642,6 +643,7 @@ void QPDF_PDFTOPDF_Processor::emitFilename(const char *name) // {{{
+   if (!extraheader.empty()) {
+     out.setExtraHeaderText(extraheader);
+   }
++  out.setPreserveEncryption(false);
+   out.write();
+ }
+ // }}}
diff --git a/SPECS/cups-filters.spec b/SPECS/cups-filters.spec
index 8c5842e..24f23ef 100644
--- a/SPECS/cups-filters.spec
+++ b/SPECS/cups-filters.spec
@@ -4,7 +4,7 @@
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
 Version: 1.20.0
-Release: 14%{?dist}.1
+Release: 18%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -31,7 +31,12 @@ Patch04: cups-filters-cleareof.patch
 # instead of 'cups-browsed' as Ubuntu does. I can repack the project later,
 # so cups-browsed would have separate sub package, so the link would be correct
 Patch05: cups-browsed.8.patch
+# change in ghostscript broke printing for several printer models, the fix is to use
+# different ghostscript option, taken from upstream
+# bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1712814
 Patch06: 0001-foomatic-rip-Changed-Ghostscript-call-to-count-pages.patch
+# rebuild and patch for FIPS compliance, backported from upstream (#1605101)
+Patch07: pdftopdf-nocrypt.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -143,8 +148,10 @@ This is the development package for OpenPrinting CUPS filters and backends.
 %patch04 -p1 -b .cleareof
 # 1609264 - man pages: wrong links in man cups-browsed
 %patch05 -p1 -b .manpage
-# 1713461 - Removed option from Ghostscript causes breakage of printing by foomatic-rip filter
+# 1712814 - Removed option from Ghostscript causes breakage of printing by foomatic-rip filter
 %patch06 -p1 -b .foomatic-rip-crash
+# 1605101 - qpdf: should not re-implement crypto
+%patch07 -p1 -b .pdftopdf-nocrypt
 
 %build
 # work-around Rpath
@@ -212,32 +219,6 @@ make check
 %post
 %systemd_post cups-browsed.service
 
-# Initial installation
-if [ $1 -eq 1 ] ; then
-    IN=%{_sysconfdir}/cups/cupsd.conf
-    OUT=%{_sysconfdir}/cups/cups-browsed.conf
-    keyword=BrowsePoll
-
-    # We can remove this after few releases, it's just for the introduction of cups-browsed.
-    if [ -f "$OUT" ]; then
-        echo -e "\n# NOTE: This file is not part of CUPS.\n# You need to enable cups-browsed service\n# and allow ipp-client service in firewall." >> "$OUT"
-    fi
-
-    # move BrowsePoll from cupsd.conf to cups-browsed.conf
-    if [ -f "$IN" ] && grep -iq ^$keyword "$IN"; then
-        if ! grep -iq ^$keyword "$OUT"; then
-            (cat >> "$OUT" <<EOF
-
-# Settings automatically moved from cupsd.conf by RPM package:
-EOF
-            ) || :
-            (grep -i ^$keyword "$IN" >> "$OUT") || :
-            #systemctl enable cups-browsed.service >/dev/null 2>&1 || :
-        fi
-        sed -i -e "s,^$keyword,#$keyword directive moved to cups-browsed.conf\n#$keyword,i" "$IN" || :
-    fi
-fi
-
 %preun
 %systemd_preun cups-browsed.service
 
@@ -317,8 +298,18 @@ fi
 %{_libdir}/libfontembed.so
 
 %changelog
-* Mon May 27 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.20.0-14.1
-- 1713461 - Removed option from Ghostscript causes breakage of printing by foomatic-rip filter
+* Mon Sep 02 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.20.0-18
+- 1605101 - qpdf: should not re-implement crypto
+
+* Wed Aug 07 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.20.0-17
+- 1738533 - rpm -V failed for /etc/cups/cups-browsed.conf
+
+* Fri Jun 28 2019 Marek Kasik <mkasik@redhat.com> - 1.20.0-16
+- Rebuild due to soname bump in poppler-0.66.0-21
+- Resolves: #1715836
+
+* Thu May 23 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1.20.0-15
+- 1712814 - Removed option from Ghostscript causes breakage of printing by foomatic-rip filter
 
 * Mon Nov 12 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1.20.0-14
 - 1609264 - man pages: wrong links in man cups-browsed