[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Mike Frysinger]

commit:     5b4e41636160c276f88c65e903b2c32ee5ecdd69
Author:     Brian Norris <briannorris <AT> chromium <DOT> org>
AuthorDate: Thu Mar 24 23:47:08 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 23:51:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4e4163

net-print/cups-filters: add upstream fixes for pkg-config handling

 .../cups-filters/cups-filters-1.8.2-r1.ebuild      |   1 +
 .../cups-filters-1.8.2-configure-PKG_CONFIG.patch  | 107 +++++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
index 276c3a0..b8ea043 100644
--- a/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.8.2-r1.ebuild
@@ -50,6 +50,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-disable-ijs.patch #574992
 	epatch "${FILESDIR}"/${P}-gstoraster.patch
+	epatch "${FILESDIR}"/${P}-configure-PKG_CONFIG.patch
 	eautoreconf
 }
 

diff --git a/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch b/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch
new file mode 100644
index 0000000..6263c4a
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.8.2-configure-PKG_CONFIG.patch
@@ -0,0 +1,107 @@
+Use PKG_CHECK_MODULES() / $PKG_CONFIG
+
+Autotools docs suggest that the $PKG_CONFIG variable should be respected:
+
+https://autotools.io/pkgconfig/cross-compiling.html
+
+However, we aren't using the autotools macros properly, and we ignore
+$PKG_CONFIG for the most part. This causes problems for some cross-compilation
+environments which rely on it.
+
+This patch fixes up configure.ac to use PKG_CHECK_MODULES() for most things,
+and to appropriately use $PKG_CONFIG (instead of self-derived $PKGCONFIG) for
+the remainder.
+
+Reported (and accepted) here:
+
+  https://bugs.linuxfoundation.org/show_bug.cgi?id=1347
+
+---
+=== modified file 'configure.ac'
+--- configure.ac	2016-03-03 19:46:43 +0000
++++ configure.ac	2016-03-21 20:59:37 +0000
+@@ -249,9 +249,6 @@
+ # Check for modules needed by utils/
+ # ==================================
+ 
+-dnl Check for pkg-config, which is used for some other tests later on...
+-AC_PATH_PROG(PKGCONFIG, pkg-config)
+-
+ dnl Avahi for cups-browsed
+ AVAHI_LIBS=""
+ AVAHI_CFLAGS=""
+@@ -272,17 +269,9 @@
+ 	[AS_HELP_STRING([--with-avahi-includes], [Set directory for Avahi includes])],
+ 	AVAHI_CFLAGS="-I$withval $AVAHI_CFLAGS",)
+ 
+-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
+-	AC_MSG_CHECKING(for Avahi)
+-	if $PKGCONFIG --exists avahi-client; then
+-		AC_MSG_RESULT(yes)
+-		AVAHI_CFLAGS="$AVAHI_CFLAGS `$PKGCONFIG --cflags avahi-client`"
+-		AVAHI_LIBS="$AVAHI_LIBS `$PKGCONFIG --libs avahi-client`"
+-		AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])
+-	else
+-		AC_MSG_RESULT(no)
+-		enable_avahi=no
+-	fi
++if test "x$enable_avahi" != xno; then
++	PKG_CHECK_MODULES(AVAHI, avahi-client,
++		[AC_DEFINE(HAVE_AVAHI, [], [Define if you have the avahi library])])
+ fi
+ 
+ AC_SUBST(AVAHI_LIBS)
+@@ -336,26 +325,18 @@
+ AC_SUBST(GLIB_CFLAGS)
+ AC_SUBST(GLIB_LIBS)
+ 
+-if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
++if test x$enable_avahi != xno; then
+ 	PKG_CHECK_MODULES(AVAHI_GLIB, [avahi-glib])
+ fi
+ 
+ AC_SUBST(AVAHI_GLIB_CFLAGS)
+ AC_SUBST(AVAHI_GLIB_LIBS)
+ 
+-GIO_CFLAGS=""
+-GIO_LIBS=""
+-if test "x$PKGCONFIG" != x; then
+-	PKG_CHECK_MODULES(GIO, [gio-2.0])
+-fi
++PKG_CHECK_MODULES(GIO, [gio-2.0])
+ AC_SUBST(GIO_CFLAGS)
+ AC_SUBST(GIO_LIBS)
+ 
+-GIO_UNIX_CFLAGS=""
+-GIO_UNIX_LIBS=""
+-if test "x$PKGCONFIG" != x; then
+-	PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
+-fi
++PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0])
+ AC_SUBST(GIO_UNIX_CFLAGS)
+ AC_SUBST(GIO_UNIX_LIBS)
+ 
+@@ -715,17 +696,17 @@
+ AC_ARG_ENABLE(braille, AS_HELP_STRING([--enable-braille],[enable Braille embosing filters, requires liblouis]),
+ 	      enable_braille=$enableval,enable_braille=yes)
+ AC_MSG_CHECKING(for liblouis)
+-if $PKGCONFIG --exists liblouis; then
++PKG_CHECK_EXISTS([liblouis], [
+ 	AC_MSG_RESULT(yes)
+-	if test "x$PKGCONFIG" != x -a "x$enable_braille" = xyes; then
+-		TABLESDIR=`$PKGCONFIG --variable=tablesdir liblouis`
++	if test "x$enable_braille" = xyes; then
++		TABLESDIR=`$PKG_CONFIG --variable=tablesdir liblouis`
+ 	else
+ 		TABLESDIR=/usr/share/liblouis/tables
+ 	fi
+-else
++], [
+ 	AC_MSG_RESULT(no)
+ 	TABLESDIR=/usr/share/liblouis/tables
+-fi
++])
+ AM_CONDITIONAL(ENABLE_BRAILLE, test "x$enable_braille" = xyes)
+ AC_SUBST(TABLESDIR)
+ 
+

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     2497ad2bba67d4e2e895e57c3e63398250ccf9a0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 19:52:16 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 19:59:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2497ad2b

net-print/cups-filters: Bump to version 1.8.3

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/Manifest                    |   1 +
 net-print/cups-filters/cups-filters-1.8.3.ebuild   | 118 +++++++++++++++++++++
 .../cups-filters/files/cups-browsed.init.d-r1      |   9 ++
 3 files changed, 128 insertions(+)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 616bd64..afd3694 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,3 +2,4 @@ DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc6
 DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e
 DIST cups-filters-1.8.1.tar.xz 1372152 SHA256 4e7d8953f910b7a992471d641590964c20f26da5d94c10de932dde4f5c03e91e SHA512 9b254dbcc90df335b8162495f5c2846f77c8006128458e54753877d0b5e6b1d696ae28378b4b9a8275626d7f537651e1cb55aac67588ee5fa319898912dd9e08 WHIRLPOOL 7a41fdeed84ee1f0f18aa201633ce5e77040499bf7a2ac5cf324f45876ca2a8072ddf5b947d8ac6526839bcd15c351324d556967d4e303d6b96aaf5bd44c2ed3
 DIST cups-filters-1.8.2.tar.xz 1372508 SHA256 06d1c2a65e45d92d0e2dc854d13161d01072094efe4fadc23319700c9a259c69 SHA512 71cd08b7955a334fa04834e99365ac8e83d34ba71a4de8a4a3e7cf7fd50768332d1a0588b963b9301f5a88170d3c700c36cf596a45497032202f3e5f18f93f2e WHIRLPOOL eae8c0c7ec83d131e91d89ace89ad12b76ac323e44f395e83cdb39340c9228a1e9436b2ccbe2c32ac02b2b868bce204a28f48261f71d8a2fccd4b7cfaff27814
+DIST cups-filters-1.8.3.tar.xz 1373028 SHA256 e1e786f1fbcd3a203d87ebb4106a0ba8d579953cbe22056d12d4ee8143f5341a SHA512 5c3648670ae141038a373c4e800e81a7584759e3caf8c4e4468cb0da11c0ff521ac80678e603856c7209da6638673400305c38903cb27e3b4d792d17947e2af4 WHIRLPOOL 0c0ff9b767f35a61f4b9b2f57392d1a6afce35decf9216e77f7503b62bd67da0fa05f9ed507518599e03d27de50458823499989bf6bfd8d3a3da162292819157

diff --git a/net-print/cups-filters/cups-filters-1.8.3.ebuild b/net-print/cups-filters/cups-filters-1.8.3.ebuild
new file mode 100644
index 0000000..a8a9625
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.8.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit eutils perl-module systemd
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups PDF filters"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
+
+RDEPEND="
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+"
+
+src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--localstatedir="${EPREFIX}"/var \
+		--with-cups-rundir="${EPREFIX}"/run/cups \
+		$(use_enable dbus) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable static-libs static) \
+		$(use_enable foomatic) \
+		$(use_enable ldap) \
+		$(use_enable postscript ghostscript) \
+		$(use_enable postscript ijs) \
+		--with-fontdir="fonts/conf.avail" \
+		--with-pdftops=pdftops \
+		--enable-imagefilters \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		--with-rcdir=no \
+		--with-browseremoteprotocols=DNSSD,CUPS \
+		--without-php
+}
+
+src_compile() {
+	MAKEOPTS=-j1 default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	prune_libtool_files --all
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}

diff --git a/net-print/cups-filters/files/cups-browsed.init.d-r1 b/net-print/cups-filters/files/cups-browsed.init.d-r1
new file mode 100644
index 0000000..dddfe7b
--- /dev/null
+++ b/net-print/cups-filters/files/cups-browsed.init.d-r1
@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+
+pidfile="/var/run/cups-browsed.pid"
+command="/usr/sbin/cups-browsed"
+command_background="true"
+
+depend() {
+	need cupsd avahi-daemon
+}

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     87416be42b779943a5915da5ca76f8df7cc95b3c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 13:27:52 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 13:29:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87416be4

net-print/cups-filters: Fixed build with =app-text/poppler-0.67.0

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 net-print/cups-filters/cups-filters-1.20.4.ebuild  |  4 ++++
 .../files/cups-filters-1.20.4-poppler-0.67.0.patch | 28 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index be4ec7dfe0f..4774200f026 100644
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.4.ebuild
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/dejavu )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.20.4-poppler-0.67.0.patch"
+)
+
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf

diff --git a/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
new file mode 100644
index 00000000000..69376e1c84d
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.20.4-poppler-0.67.0.patch
@@ -0,0 +1,28 @@
+From 07a0a423a8469a2dd6d7f64bb3b62ba6ac42cc28 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 20 Jul 2018 15:20:11 +0200
+Subject: [PATCH] GooString needs to be const since >=poppler-0.64.0
+
+This only fails with >=poppler-0.67.0 but the change to const was done
+in 0.64.0
+---
+ filter/pdf.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/filter/pdf.cxx b/filter/pdf.cxx
+index 206ccf88..665eab09 100644
+--- a/filter/pdf.cxx
++++ b/filter/pdf.cxx
+@@ -734,6 +734,9 @@ extern "C" int pdf_fill_form(pdf_t *doc, opt_t *opt)
+         }
+ 
+         FormField *ff = fm_text->getField();
++#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 64
++        const
++#endif
+         GooString *field_name;
+         field_name = ff->getFullyQualifiedName();
+         if ( ! field_name )
+-- 
+2.18.0
+

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     a65b125b85b64534a995da2e918073a15f404e38
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  5 06:45:09 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep  5 06:45:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a65b125b

net-print/cups-filters: Fixed build against app-text/qpdf-9.0.0

Closes: https://bugs.gentoo.org/693498
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/cups-filters-1.25.4.ebuild       |  4 ++++
 .../files/cups-filters-1.25.4-missing_cstring.patch     | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/net-print/cups-filters/cups-filters-1.25.4.ebuild b/net-print/cups-filters/cups-filters-1.25.4.ebuild
index cdc922f82de..03ae82bd13c 100644
--- a/net-print/cups-filters/cups-filters-1.25.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.4.ebuild
@@ -48,6 +48,10 @@ DEPEND="${RDEPEND}
 	test? ( media-fonts/dejavu )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-missing_cstring.patch" #693498
+)
+
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf

diff --git a/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch
new file mode 100644
index 00000000000..1b051221b6e
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch
@@ -0,0 +1,17 @@
+From 1878ecd2ef533c3dbe6e6bc29018ce4bf8246e83 Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 4 Sep 2019 18:13:11 +0200
+Subject: [PATCH] bannertopdf: Added missing "#include <cstring>" to pdf.cxx.
+
+diff --git a/filter/pdf.cxx b/filter/pdf.cxx
+index 5b212ca9..f12607f8 100644
+--- a/filter/pdf.cxx
++++ b/filter/pdf.cxx
+@@ -20,6 +20,7 @@
+ #include "pdf.h"
+ #include <vector>
+ #include <string>
++#include <cstring>
+ #include <qpdf/QPDF.hh>
+ #include <qpdf/QPDFObjectHandle.hh>
+ #include <qpdf/QPDFWriter.hh>

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     f4a93d9aa47e07e4a67da35a12d2cf411094a3c4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 09:13:37 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 09:13:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a93d9a

net-print/cups-filters: Removed old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/Manifest                    |   3 -
 net-print/cups-filters/cups-filters-1.22.6.ebuild  | 135 ---------------------
 net-print/cups-filters/cups-filters-1.25.10.ebuild | 134 --------------------
 net-print/cups-filters/cups-filters-1.25.6.ebuild  | 134 --------------------
 .../cups-filters-1.25.4-missing_cstring.patch      |  17 ---
 5 files changed, 423 deletions(-)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 34fd819e393..cdd495dd79b 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,6 +1,3 @@
 DIST cups-filters-1.21.6.tar.xz 1474944 BLAKE2B a4c3418accb9d2bf46a366ec6004919d2a5c2c0a02022102270da17fb81915428275aadf58f1f50f8ca022e1c09cbdbd7300492fa38c53d4a2cbc4c4b86a09e3 SHA512 804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a
-DIST cups-filters-1.22.6.tar.xz 1477584 BLAKE2B 7d833c3e97c510eabcc906bbd01d4d1ef2bf3106d963bdec7f735942e96a830c53ec2c03a4ef580d9fc01f19bae3962c1bd2a98d2af7f03f71988ae374366fee SHA512 6c1c46bd74f700b3ab0a46cb4b5b7ecc93000122e9deb20b43878d876cbe2ceeeb4a3c16ef6de00497b10447d04f2689a5d939d0d49212e7274cc51b4617c296
-DIST cups-filters-1.25.10.tar.xz 1483276 BLAKE2B 34961ec157db992b4225413143566e9d74f8effc879848ff4a47cbd1b87d3fab7b41b75d3a48310c2b56cc834e7999d4268eaa5f30a7e20a3969c13cb4c98585 SHA512 1ac2e05e4a9c7ccc000f39d4a0cfa66e1328a049154cede71602bdef5ba5a19a13fa4e48d33adb7e19849bc4f659559ff73151f8b2b36c1eb6d1625396704abf
 DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
 DIST cups-filters-1.25.12.tar.xz 1484148 BLAKE2B 55f05d9c5bf8ae7eb3416de8b1bc2fe919a43875753ee0c02a1fae319d72e7d71a2e46ae8888e840972ba79bb39d515a54b276729648c872ac6c59bfbca02fa0 SHA512 587b8d550923fb5be9f71172e613af7b2bd0e70f780143574482c5efcc2cf869f7d715f63323e63a8f00acd3f08f7e0803cc5a723cdd903229389e7ce11b0c16
-DIST cups-filters-1.25.6.tar.xz 1482160 BLAKE2B 13587dc5153e7e0368b2d4edcfab0aec3864b1b17e403fc54bd1f0677ed8611934b55bfbd5ce2a474486a9e56e946530493afba3a7d7bc2731f08bb11dbe2bdb SHA512 14c958bcb98e4addde84c3c0d27e7056f1b4790b8502f5fb0c23c1e2cf80a6fd22fa39816a2f2e6c0501272a57cfcc84ce939a8614563e795e5d2ae035972f33

diff --git a/net-print/cups-filters/cups-filters-1.22.6.ebuild b/net-print/cups-filters/cups-filters-1.22.6.ebuild
deleted file mode 100644
index 18623608c7d..00000000000
--- a/net-print/cups-filters/cups-filters-1.22.6.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable postscript ijs)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/cups-filters-1.25.10.ebuild b/net-print/cups-filters/cups-filters-1.25.10.ebuild
deleted file mode 100644
index e581c47e5e4..00000000000
--- a/net-print/cups-filters/cups-filters-1.25.10.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/cups-filters-1.25.6.ebuild b/net-print/cups-filters/cups-filters-1.25.6.ebuild
deleted file mode 100644
index e581c47e5e4..00000000000
--- a/net-print/cups-filters/cups-filters-1.25.6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch b/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch
deleted file mode 100644
index 1b051221b6e..00000000000
--- a/net-print/cups-filters/files/cups-filters-1.25.4-missing_cstring.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From 1878ecd2ef533c3dbe6e6bc29018ce4bf8246e83 Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Wed, 4 Sep 2019 18:13:11 +0200
-Subject: [PATCH] bannertopdf: Added missing "#include <cstring>" to pdf.cxx.
-
-diff --git a/filter/pdf.cxx b/filter/pdf.cxx
-index 5b212ca9..f12607f8 100644
---- a/filter/pdf.cxx
-+++ b/filter/pdf.cxx
-@@ -20,6 +20,7 @@
- #include "pdf.h"
- #include <vector>
- #include <string>
-+#include <cstring>
- #include <qpdf/QPDF.hh>
- #include <qpdf/QPDFObjectHandle.hh>
- #include <qpdf/QPDFWriter.hh>

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     e64d6fba8ed13603a8280f7c633211d4542cb5d0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 08:14:49 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 08:15:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64d6fba

net-print/cups-filters: Revbump to fix segfault in cups-browsed

Reported-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Closes: https://bugs.gentoo.org/700024
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...25.12.ebuild => cups-filters-1.25.12-r1.ebuild} |  4 ++
 .../cups-filters-1.25.12-browsed_segfault.patch    | 69 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/net-print/cups-filters/cups-filters-1.25.12.ebuild b/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
similarity index 98%
rename from net-print/cups-filters/cups-filters-1.25.12.ebuild
rename to net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
index cc938610ec4..1179f01061e 100644
--- a/net-print/cups-filters/cups-filters-1.25.12.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
@@ -53,6 +53,10 @@ BDEPEND="
 	test? ( media-fonts/dejavu )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-browsed_segfault.patch" #700024
+)
+
 src_prepare() {
 	default
 	[[ "${PV}" == "9999" ]] && eautoreconf

diff --git a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
new file mode 100644
index 00000000000..8ab644155c3
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
@@ -0,0 +1,69 @@
+From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 13 Nov 2019 18:49:01 +0100
+Subject: [PATCH] cups-browsed: Added missing memory allocations leading to a
+ segfault.
+
+---
+ NEWS                 |  5 +++++
+ utils/cups-browsed.c | 21 ++++++++++++---------
+ 2 files changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 67d1c18f..2de5dab4 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,6 +1,11 @@
+ NEWS - OpenPrinting CUPS Filters v1.25.12 - 2019-11-12
+ ------------------------------------------------------
+ 
++CHANGES IN V1.25.13
++
++	- cups-browsed: Added some missing memory allocations leading
++	  to a segfault (Issue #175).
++
+ CHANGES IN V1.25.12
+ 
+ 	- libcupsfilters: Use the text names "Draft", "Normal", and
+diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
+index adbf5002..f0e05746 100644
+--- a/utils/cups-browsed.c
++++ b/utils/cups-browsed.c
+@@ -2837,6 +2837,15 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
+       debug_printf("Default MediaType: %s\n", media_type);
+     }
+       
++    if (temp->media_type == NULL) {
++      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
++					   "media-type-supported")) {
++        temp->media_type = (char*)malloc(sizeof(char)*32);
++        strcpy(temp->media_type, AUTO_OPTION);
++        debug_printf("Default MediaType: " AUTO_OPTION "\n");
++      }
++    }
++
+     if ((media_attr = ippFindAttribute(media_col, "media-source",
+ 				       IPP_TAG_KEYWORD)) != NULL) {
+       pwg_ppdize_name(ippGetString(media_attr, 0, NULL), media_source,
+@@ -2852,18 +2861,12 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
+     if (temp->media_source == NULL) {
+       if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
+ 					   "media-source-supported")) {
+-        strcpy(temp->media_source,AUTO_OPTION);
+-        debug_printf("Default MediaSource: %s\n", media_source);
++        temp->media_source = (char*)malloc(sizeof(char)*32);
++        strcpy(temp->media_source, AUTO_OPTION);
++        debug_printf("Default MediaSource: " AUTO_OPTION "\n");
+       }
+     }
+ 
+-    if (temp->media_type == NULL) {
+-      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
+-					   "media-type-supported")) {
+-        strcpy(temp->media_type, AUTO_OPTION);
+-        debug_printf("Default MediaType: %s\n", media_type);
+-      }
+-    }
+     media_col_default = ippAddCollection(*merged_attributes, IPP_TAG_PRINTER,
+ 					 "media-col-default", NULL);
+     current_media = create_media_col(temp->x, temp->y, temp->left_margin,

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     27ebbc807c485eee52e886b67a07f80ec3b0b542
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 11:35:22 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 11:35:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ebbc80

net-print/cups-filters: Removed old

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/Manifest                    |   1 -
 .../cups-filters/cups-filters-1.25.12-r1.ebuild    | 143 ---------------------
 .../cups-filters-1.25.12-browsed_segfault.patch    |  69 ----------
 3 files changed, 213 deletions(-)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 18993bd0cc4..8076bf73927 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,3 @@
 DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff74b661b35c3af560081f12d4f9a26102e009bac9d4741e15dc257dd477967b18ae23911647f8f56b361e9f8d51b0d619f2 SHA512 67e7c624952b5e2db33a698ac1287a3448a4787fa28000cefc5a982c2fa18a4f56e11e3ba65da8a6e565a53a193c6eb31ba1867ad36ca8dc7e61250f11232681
-DIST cups-filters-1.25.12.tar.xz 1484148 BLAKE2B 55f05d9c5bf8ae7eb3416de8b1bc2fe919a43875753ee0c02a1fae319d72e7d71a2e46ae8888e840972ba79bb39d515a54b276729648c872ac6c59bfbca02fa0 SHA512 587b8d550923fb5be9f71172e613af7b2bd0e70f780143574482c5efcc2cf869f7d715f63323e63a8f00acd3f08f7e0803cc5a723cdd903229389e7ce11b0c16
 DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611
 DIST cups-filters-1.26.0.tar.xz 1489308 BLAKE2B 4a0c67f9dba60c409cd62c3f47e167b79be01fd53c51d08c368e62919020d9f1ebe72ebd570e773537053ae4cc42846f426c166675faa0a18392afdb1d66c284 SHA512 a6e0a1b8dfec2e46cb2475639b33f60da3a74090718334883564711530e13c7524952b9f145303c1063e1ae21eb585dce1fd9c87e4ce7884ec687fdef58f2124

diff --git a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild b/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
deleted file mode 100644
index 1179f01061e..00000000000
--- a/net-print/cups-filters/cups-filters-1.25.12-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-browsed_segfault.patch" #700024
-)
-
-src_prepare() {
-	default
-	[[ "${PV}" == "9999" ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ipp_autosetup auto-setup-driverless)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch b/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
deleted file mode 100644
index 8ab644155c3..00000000000
--- a/net-print/cups-filters/files/cups-filters-1.25.12-browsed_segfault.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9bf6937633b35cc92bbf30e9eec91ef3c4bb6aad Mon Sep 17 00:00:00 2001
-From: Till Kamppeter <till.kamppeter@gmail.com>
-Date: Wed, 13 Nov 2019 18:49:01 +0100
-Subject: [PATCH] cups-browsed: Added missing memory allocations leading to a
- segfault.
-
----
- NEWS                 |  5 +++++
- utils/cups-browsed.c | 21 ++++++++++++---------
- 2 files changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 67d1c18f..2de5dab4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,6 +1,11 @@
- NEWS - OpenPrinting CUPS Filters v1.25.12 - 2019-11-12
- ------------------------------------------------------
- 
-+CHANGES IN V1.25.13
-+
-+	- cups-browsed: Added some missing memory allocations leading
-+	  to a segfault (Issue #175).
-+
- CHANGES IN V1.25.12
- 
- 	- libcupsfilters: Use the text names "Draft", "Normal", and
-diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
-index adbf5002..f0e05746 100644
---- a/utils/cups-browsed.c
-+++ b/utils/cups-browsed.c
-@@ -2837,6 +2837,15 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
-       debug_printf("Default MediaType: %s\n", media_type);
-     }
-       
-+    if (temp->media_type == NULL) {
-+      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
-+					   "media-type-supported")) {
-+        temp->media_type = (char*)malloc(sizeof(char)*32);
-+        strcpy(temp->media_type, AUTO_OPTION);
-+        debug_printf("Default MediaType: " AUTO_OPTION "\n");
-+      }
-+    }
-+
-     if ((media_attr = ippFindAttribute(media_col, "media-source",
- 				       IPP_TAG_KEYWORD)) != NULL) {
-       pwg_ppdize_name(ippGetString(media_attr, 0, NULL), media_source,
-@@ -2852,18 +2861,12 @@ void get_cluster_default_attributes(ipp_t** merged_attributes,
-     if (temp->media_source == NULL) {
-       if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
- 					   "media-source-supported")) {
--        strcpy(temp->media_source,AUTO_OPTION);
--        debug_printf("Default MediaSource: %s\n", media_source);
-+        temp->media_source = (char*)malloc(sizeof(char)*32);
-+        strcpy(temp->media_source, AUTO_OPTION);
-+        debug_printf("Default MediaSource: " AUTO_OPTION "\n");
-       }
-     }
- 
--    if (temp->media_type == NULL) {
--      if (cluster_supports_given_attribute(cluster_name, IPP_TAG_KEYWORD,
--					   "media-type-supported")) {
--        strcpy(temp->media_type, AUTO_OPTION);
--        debug_printf("Default MediaType: %s\n", media_type);
--      }
--    }
-     media_col_default = ippAddCollection(*merged_attributes, IPP_TAG_PRINTER,
- 					 "media-col-default", NULL);
-     current_media = create_media_col(temp->x, temp->y, temp->left_margin,

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     b3c035d4f5883f12deb1e704bfa8843cf7f2df3e
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 11 07:27:52 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 11 07:28:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c035d4

net-print/cups-filters: Bump to version 1.28.2

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/Manifest                    |   1 +
 net-print/cups-filters/cups-filters-1.28.2.ebuild  | 148 +++++++++++++++++++++
 ...rs-1.28.2-make-missing-testfont-non-fatal.patch |  14 ++
 3 files changed, 163 insertions(+)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 22f016c71f3..7651b4c12ba 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,2 +1,3 @@
 DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
 DIST cups-filters-1.27.5.tar.xz 1494864 BLAKE2B 457968139f0bc1a5fd4c587dfe4a88d1904eb0ca9ee2aa88c1360785eb53b59e7eb823535ef01a9f81551628514441077562e91487a55a9f0c9e6c9dbdba98b7 SHA512 8bc917b2a168add1062d091d02d99c39d72861c0d0cb1242c34b2bf117c9943e7fdc1fe002de7cde4cb1919fbce41073adc34916c328fc99e66e389b0a4fe103
+DIST cups-filters-1.28.2.tar.xz 1502352 BLAKE2B e0d95a7e1596d4dc05a8e2d32b2ee573cfa1ec304288e476a38c8b51de5ed8e0b6a71e371d2196802b116d63aea1e750e0b3a6c8fae749377de0ab72f92aa86e SHA512 aa5f075927286a8278259025aa5baf95445809a83b88e2d4654e8f0a124012591b045df115294242fae60a283d983d6cdbaafc6a51224af30a7e56b58d831da5

diff --git a/net-print/cups-filters/cups-filters-1.28.2.ebuild b/net-print/cups-filters/cups-filters-1.28.2.ebuild
new file mode 100644
index 00000000000..d3c34b7f443
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	local need_eautoreconf=
+
+	default
+
+	if ! use test ; then
+		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
+		need_eautoreconf=yes
+	elif [[ "${PV}" == "9999" ]] ; then
+		need_eautoreconf=yes
+	fi
+
+	[[ -n ${need_eautoreconf} ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}

diff --git a/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch
new file mode 100644
index 00000000000..8447929a524
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch
@@ -0,0 +1,14 @@
+--- cups-filters-1.28.2/configure.ac
++++ cups-filters-1.28.2/configure.ac
+@@ -790,7 +790,10 @@
+ )
+ 
+ AS_IF([test "x$cross_compiling" != "xyes" && ! test -f "$with_test_font_path"],
+-	[AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
++	[
++		AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)]
++		AC_DEFINE([TESTFONT])
++	]
+ )
+ AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])
+ 

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Lars Wendler]

commit:     088c01594da71978fd7c2807e12b414f60229058
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  8 21:00:09 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan  8 21:00:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088c0159

net-print/cups-filters: Removed old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/Manifest                    |   3 -
 net-print/cups-filters/cups-filters-1.27.4.ebuild  | 148 ---------------------
 net-print/cups-filters/cups-filters-1.27.5.ebuild  | 148 ---------------------
 net-print/cups-filters/cups-filters-1.28.2.ebuild  | 148 ---------------------
 ...1.27.5-make-missing-testfont-non-fatal-r1.patch |  14 --
 5 files changed, 461 deletions(-)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 2ce49aa9269..f6598a7fd15 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,2 @@
-DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
-DIST cups-filters-1.27.5.tar.xz 1494864 BLAKE2B 457968139f0bc1a5fd4c587dfe4a88d1904eb0ca9ee2aa88c1360785eb53b59e7eb823535ef01a9f81551628514441077562e91487a55a9f0c9e6c9dbdba98b7 SHA512 8bc917b2a168add1062d091d02d99c39d72861c0d0cb1242c34b2bf117c9943e7fdc1fe002de7cde4cb1919fbce41073adc34916c328fc99e66e389b0a4fe103
-DIST cups-filters-1.28.2.tar.xz 1502352 BLAKE2B e0d95a7e1596d4dc05a8e2d32b2ee573cfa1ec304288e476a38c8b51de5ed8e0b6a71e371d2196802b116d63aea1e750e0b3a6c8fae749377de0ab72f92aa86e SHA512 aa5f075927286a8278259025aa5baf95445809a83b88e2d4654e8f0a124012591b045df115294242fae60a283d983d6cdbaafc6a51224af30a7e56b58d831da5
 DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727

diff --git a/net-print/cups-filters/cups-filters-1.27.4.ebuild b/net-print/cups-filters/cups-filters-1.27.4.ebuild
deleted file mode 100644
index f3809128d29..00000000000
--- a/net-print/cups-filters/cups-filters-1.27.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.27.4-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/cups-filters-1.27.5.ebuild b/net-print/cups-filters/cups-filters-1.27.5.ebuild
deleted file mode 100644
index 583024a642b..00000000000
--- a/net-print/cups-filters/cups-filters-1.27.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.27.5-make-missing-testfont-non-fatal-r1.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/cups-filters-1.28.2.ebuild b/net-print/cups-filters/cups-filters-1.28.2.ebuild
deleted file mode 100644
index 0803df22be6..00000000000
--- a/net-print/cups-filters/cups-filters-1.28.2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-DESCRIPTION="Cups filters"
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--with-pdftops=pdftops
-		--with-rcdir=no
-		--without-php
-		$(use_enable dbus)
-		$(use_enable foomatic)
-		$(use_enable ldap)
-		$(use_enable pclm)
-		$(use_enable pdf mutool)
-		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
-		$(use_enable zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch b/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
deleted file mode 100644
index 43aa6bf3b5a..00000000000
--- a/net-print/cups-filters/files/cups-filters-1.27.5-make-missing-testfont-non-fatal-r1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -791,7 +791,10 @@ AC_ARG_WITH([test-font-path],
- 
- AS_IF([test -f "$with_test_font_path"],
- 	[AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests])],
--	[AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)]
-+	[
-+		AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)
-+		AC_DEFINE([TESTFONT])
-+	]
- )
- 
- # ================

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Pacho Ramos]

commit:     98dbb3a6950134916429ed27553e5c1e854bf813
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 28 08:35:18 2021 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Oct 28 08:35:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98dbb3a6

net-print/cups-filters: Fix /run path and poppler subslot dep

Closes: https://bugs.gentoo.org/685300
Bug: https://bugs.gentoo.org/609570
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../cups-filters/cups-filters-1.28.10-r1.ebuild    | 149 +++++++++++++++++++++
 .../cups-filters/files/cups-browsed.init.d-r2      |   9 ++
 2 files changed, 158 insertions(+)

diff --git a/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild
new file mode 100644
index 00000000000..dafc22ff2b7
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.10-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	local need_eautoreconf=
+
+	default
+
+	if ! use test ; then
+		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
+		need_eautoreconf=yes
+	elif [[ "${PV}" == "9999" ]] ; then
+		need_eautoreconf=yes
+	fi
+
+	[[ -n ${need_eautoreconf} ]] && eautoreconf
+}
+
+src_configure() {
+	# Bug #626800
+	append-cxxflags -std=c++11
+
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		--disable-static
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null || die
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null || die
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null || die
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}"/utils/cups-browsed.service
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely"
+		ewarn "necessary. net-print/foomatic-filters as a replacement is deprecated and unmaintained."
+	fi
+}

diff --git a/net-print/cups-filters/files/cups-browsed.init.d-r2 b/net-print/cups-filters/files/cups-browsed.init.d-r2
new file mode 100644
index 00000000000..4fea546a05c
--- /dev/null
+++ b/net-print/cups-filters/files/cups-browsed.init.d-r2
@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+
+pidfile="/run/cups-browsed.pid"
+command="/usr/sbin/cups-browsed"
+command_background="true"
+
+depend() {
+	need cupsd avahi-daemon
+}

[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/files/, net-print/cups-filters/

[Matthias Maier]

commit:     d8827cf3d0bb159273e683698824d4572882af9e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 08:00:01 2023 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May 24 08:04:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8827cf3

net-print/cups-filters: apply patch for CVE-2023-24805

Bug: https://bugs.gentoo.org/906944
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../cups-filters/cups-filters-1.28.17-r2.ebuild    | 150 ++++++++++++++
 .../cups-filters-1.28.17-CVE-2023-24805.patch      | 225 +++++++++++++++++++++
 2 files changed, 375 insertions(+)

diff --git a/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild b/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
new file mode 100644
index 000000000000..95c9acf0f386
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL=no
+inherit perl-module systemd flag-o-matic
+
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+SRC_URI="
+	https://github.com/OpenPrinting/cups-filters/releases/download/${PV}/${P}.tar.xz
+	https://www.openprinting.org/download/${PN}/${P}.tar.xz
+"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	exif? ( media-libs/libexif )
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	ldap? ( net-nds/openldap:= )
+	pdf? ( app-text/mupdf:= )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:= )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.28.17-c++17.patch
+	"${FILESDIR}"/${PN}-1.28.17-CVE-2023-24805.patch
+)
+
+src_configure() {
+	# Bug #898156
+	append-cxxflags -std=c++17
+
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+
+		$(use_enable exif)
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	if use perl; then
+		pushd "${S}"/scripting/perl > /dev/null || die
+		perl-module_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}"/scripting/perl > /dev/null || die
+		perl-module_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	# Avoid perl-module_src_test
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null || die
+		perl-module_src_test
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}"/scripting/perl > /dev/null || die
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null || die
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}"/utils/cups-browsed.service
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely"
+		ewarn "necessary. net-print/foomatic-filters as a replacement is deprecated and unmaintained."
+	fi
+}

diff --git a/net-print/cups-filters/files/cups-filters-1.28.17-CVE-2023-24805.patch b/net-print/cups-filters/files/cups-filters-1.28.17-CVE-2023-24805.patch
new file mode 100644
index 000000000000..58b562504d0d
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.28.17-CVE-2023-24805.patch
@@ -0,0 +1,225 @@
+Modified version from:
+
+  https://packages.debian.org/de/sid/cups-filters
+
+  From: Thorsten Alteholz <debian@alteholz.de>
+  Date: Fri, 19 May 2023 10:49:35 +0200
+  Subject: fix CVE-2023-24805
+
+Original patch:
+
+https://github.com/OpenPrinting/cups-filters/commit/8f274035756c04efeb77eb654e9d4c4447287d65
+
+From 8f274035756c04efeb77eb654e9d4c4447287d65 Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@gmail.com>
+Date: Wed, 17 May 2023 11:12:37 +0200
+Subject: [PATCH] Merge pull request from GHSA-gpxc-v2m8-fr3x
+
+* beh backend: Use execv() instead of system() - CVE-2023-24805
+
+With execv() command line arguments are passed as separate strings and
+not the full command line in a single string. This prevents arbitrary
+command execution by escaping the quoting of the arguments in a job
+with forged job title.
+
+* beh backend: Extra checks against odd/forged input - CVE-2023-24805
+
+- Do not allow '/' in the scheme of the URI (= backend executable
+  name), to assure that only backends inside /usr/lib/cups/backend/
+  are used.
+
+- Pre-define scheme buffer to empty string, to be defined for case of
+  uri being NULL.
+
+- URI must have ':', to split off scheme, otherwise error.
+
+- Check return value of snprintf() to create call path for backend, to
+  error out on truncation of a too long scheme or on complete failure
+  due to a completely odd scheme.
+
+* beh backend: Further improvements - CVE-2023-24805
+
+- Use strncat() instead of strncpy() for getting scheme from URI, the latter
+  does not require setting terminating zero byte in case of truncation.
+
+- Also exclude "." or ".." as scheme, as directories are not valid CUPS
+  backends.
+
+- Do not use fprintf() in sigterm_handler(), to not interfere with a
+  fprintf() which could be running in the main process when
+  sigterm_handler() is triggered.
+
+- Use "static volatile int" for global variable job_canceled.
+
+---
+ backend/beh.c | 107 +++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 84 insertions(+), 23 deletions(-)
+
+diff --git a/backend/beh.c b/backend/beh.c
+index 225fd27..8d51235 100644
+--- a/backend/beh.c
++++ b/backend/beh.c
+@@ -22,12 +22,13 @@
+ #include "backend-private.h"
+ #include <cups/array.h>
+ #include <ctype.h>
++#include <sys/wait.h>
+ 
+ /*
+  * Local globals...
+  */
+ 
+-static int		job_canceled = 0; /* Set to 1 on SIGTERM */
++static volatile int	job_canceled = 0; /* Set to 1 on SIGTERM */
+ 
+ /*
+  * Local functions...
+@@ -213,21 +214,40 @@ call_backend(char *uri,                 /* I - URI of final destination */
+ 	     char **argv,		/* I - Command-line arguments */
+ 	     char *filename) {          /* I - File name of input data */
+   const char	*cups_serverbin;	/* Location of programs */
++  char          *backend_argv[8];	/* Arguments for backend */
+   char		scheme[1024],           /* Scheme from URI */
+                 *ptr,			/* Pointer into scheme */
+-		cmdline[65536];		/* Backend command line */
+-  int           retval;
++		backend_path[2048];	/* Backend path */
++  int           pid = 0, 		/* Process ID of backend */
++                wait_pid,		/* Process ID from wait() */
++                wait_status, 		/* Status from child */
++                retval = 0;
++  int           bytes;
+ 
+  /*
+   * Build the backend command line...
+   */
+ 
+-  strncpy(scheme, uri, sizeof(scheme) - 1);
+-  if (strlen(uri) > 1023)
+-    scheme[1023] = '\0';
++  scheme[0] = '\0';
++  strncat(scheme, uri, sizeof(scheme) - 1);
+   if ((ptr = strchr(scheme, ':')) != NULL)
+     *ptr = '\0';
+-
++  else {
++    fprintf(stderr,
++	    "ERROR: beh: Invalid URI, no colon (':') to mark end of scheme part.\n");
++    exit (CUPS_BACKEND_FAILED);
++  }
++  if (strchr(scheme, '/')) {
++    fprintf(stderr,
++	    "ERROR: beh: Invalid URI, scheme contains a slash ('/').\n");
++    exit (CUPS_BACKEND_FAILED);
++  }
++  if (!strcmp(scheme, ".") || !strcmp(scheme, "..")) {
++    fprintf(stderr,
++	    "ERROR: beh: Invalid URI, scheme (\"%s\") is a directory.\n",
++	    scheme);
++    exit (CUPS_BACKEND_FAILED);
++  }
+   if ((cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
+     cups_serverbin = CUPS_SERVERBIN;
+ 
+@@ -235,16 +255,29 @@ call_backend(char *uri,                 /* I - URI of final destination */
+     fprintf(stderr,
+ 	    "ERROR: beh: Direct output into a file not supported.\n");
+     exit (CUPS_BACKEND_FAILED);
+-  } else
+-    snprintf(cmdline, sizeof(cmdline),
+-	     "%s/backend/%s '%s' '%s' '%s' '%s' '%s' %s",
+-	     cups_serverbin, scheme, argv[1], argv[2], argv[3],
+-	     /* Apply number of copies only if beh was called with a
+-		file name and not with the print data in stdin, as
+-	        backends should handle copies only if they are called
+-	        with a file name */
+-	     (argc == 6 ? "1" : argv[4]),
+-	     argv[5], filename);
++  }
++
++  backend_argv[0] = uri;
++  backend_argv[1] = argv[1];
++  backend_argv[2] = argv[2];
++  backend_argv[3] = argv[3];
++  /* Apply number of copies only if beh was called with a file name
++     and not with the print data in stdin, as backends should handle
++     copies only if they are called with a file name */
++  backend_argv[4] = (argc == 6 ? "1" : argv[4]);
++  backend_argv[5] = argv[5];
++  backend_argv[6] = filename;
++  backend_argv[7] = NULL;
++
++  bytes = snprintf(backend_path, sizeof(backend_path),
++		   "%s/backend/%s", cups_serverbin, scheme);
++  if (bytes < 0 || bytes >= sizeof(backend_path))
++  {
++    fprintf(stderr,
++	    "ERROR: beh: Invalid scheme (\"%s\"), could not determing backend path.\n",
++	    scheme);
++    return (CUPS_BACKEND_FAILED);
++  }
+ 
+  /*
+   * Overwrite the device URI and run the actual backend...
+@@ -253,18 +286,44 @@ call_backend(char *uri,                 /* I - URI of final destination */
+   setenv("DEVICE_URI", uri, 1);
+ 
+   fprintf(stderr,
+-	  "DEBUG: beh: Executing backend command line \"%s\"...\n",
+-	  cmdline);
++	  "DEBUG: beh: Executing backend command line \"%s '%s' '%s' '%s' '%s' '%s' %s\"...\n",
++	  backend_path, backend_argv[1], backend_argv[2], backend_argv[3],
++	  backend_argv[4], backend_argv[5], backend_argv[6]);
+   fprintf(stderr,
+ 	  "DEBUG: beh: Using device URI: %s\n",
+ 	  uri);
+ 
+-  retval = system(cmdline) >> 8;
++  if ((pid = fork()) == 0) {
++   /*
++    * Child comes here...
++    */
++
++    /* Run the backend */
++    execv(backend_path, backend_argv);
+ 
+-  if (retval == -1)
+     fprintf(stderr, "ERROR: Unable to execute backend command line: %s\n",
+ 	    strerror(errno));
+ 
++    exit(1);
++  } else if (pid < 0) {
++   /*
++    * Unable to fork!
++    */
++
++    return (CUPS_BACKEND_FAILED);
++  }
++
++  while ((wait_pid = wait(&wait_status)) < 0 && errno == EINTR);
++
++  if (wait_pid >= 0 && wait_status) {
++    if (WIFEXITED(wait_status))
++      retval = WEXITSTATUS(wait_status);
++    else if (WTERMSIG(wait_status) != SIGTERM)
++      retval = WTERMSIG(wait_status);
++    else
++      retval = 0;
++  }
++
+   return (retval);
+ }
+ 
+@@ -277,8 +336,10 @@ static void
+ sigterm_handler(int sig) {		/* I - Signal number (unused) */
+   (void)sig;
+ 
+-  fprintf(stderr,
+-	  "DEBUG: beh: Job canceled.\n");
++  const char * const msg = "DEBUG: beh: Job canceled.\n";
++  /* The if() is to eliminate the return value and silence the warning
++     about an unused return value. */
++  if (write(2, msg, strlen(msg)));
+ 
+   if (job_canceled)
+     _exit(CUPS_BACKEND_OK);