commit: f44c94234dbbd19d1d3c4462aab6066f3add728a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 25 03:55:56 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 25 03:55:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f44c9423
net-print/cups-browsed: drop 2.0.0, 2.0.1 Signed-off-by: Sam James <sam <AT> gentoo.org> net-print/cups-browsed/Manifest | 2 - net-print/cups-browsed/cups-browsed-2.0.0.ebuild | 82 ---------------------- net-print/cups-browsed/cups-browsed-2.0.1.ebuild | 79 --------------------- ...rowsed.c-Fix-build-with-avahi-disabled-20.patch | 34 --------- 4 files changed, 197 deletions(-) diff --git a/net-print/cups-browsed/Manifest b/net-print/cups-browsed/Manifest index 264b5176ce29..89d84f12c031 100644 --- a/net-print/cups-browsed/Manifest +++ b/net-print/cups-browsed/Manifest @@ -1,3 +1 @@ -DIST cups-browsed-2.0.0.tar.xz 426132 BLAKE2B e1724c03302d61cf131c8886a95f6ad8f0236b134f1deaadb783fa185141b83cd8ac5c5d993ded37d04c7fd806c5cde157a792a90a2f372075f24a5bd2423dc5 SHA512 592493ef82c65b2418b86b555c4d24bdf352f78516993a021d106240b8c399fd9f4fcc27e396e895d94da889a97f2bbc5e96bfa92c58c8be80802ee8df43db80 -DIST cups-browsed-2.0.1.tar.xz 427060 BLAKE2B 06c9c8f8c50a165b11f029804dbb20db0ebfd7cddc93c274851e1ab849d0a200fcb8e7dfc489656fa1255c7d6540ae5407467161bd51edca3e8ce04e7d02b78f SHA512 9e9a11708daa861ef58b19a3bda636f1e1fccf0cf12ad5880096d61132f1df9bfa8b81f437247064d199e3aa6a5438061ba085a6d6df52c1ba6021f3b32d9d00 DIST cups-browsed-2.1.1.tar.xz 419892 BLAKE2B 3d6cde7fb257e4db2deecd899431cb45ce815ff8553a84f2a2ab952edfbf5b1200ccb062f937007b9940873f5d9bd52d2f5f09023cbedf8fb9a48f082ef6c15b SHA512 b5048bce179fc037f7dd737b4ab2a7c8b5bdf8fd5554ebb742675792f05b984c7286c2760797c07bca3fccf635259d924acf9579908681488ef1f37ce830d335 diff --git a/net-print/cups-browsed/cups-browsed-2.0.0.ebuild b/net-print/cups-browsed/cups-browsed-2.0.0.ebuild deleted file mode 100644 index 70e7ba061326..000000000000 --- a/net-print/cups-browsed/cups-browsed-2.0.0.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -DESCRIPTION="helper daemon to browse for remote CUPS queues and IPP network printers" -HOMEPAGE="https://github.com/OpenPrinting/cups-browsed"; -SRC_URI="https://github.com/OpenPrinting/cups-browsed/releases/download/${PV}/${P}.tar.xz"; - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="ldap test zeroconf" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" - -RDEPEND=" - dev-libs/glib:2 - >=net-print/cups-2 - >=net-print/cups-filters-2.0.0 - ldap? ( net-nds/openldap:= ) - test? ( net-print/cups[zeroconf] ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/gdbus-codegen - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -# The tests are new since the split out of cups-filters. Actually running them -# seems to be challenging. You need: -# - cups tools that are USE-optional -# - running avahi-daemon (as root!) -# - disable portage's pid-sandbox, which interferes with avahi -# - ipptool still fails to connect to port 8xxx -# -# If anything fails, a `while true` loop fails to successfully launch and break -# out of the loop, leading to a hang. Until there's an obvious recipe for -# successfully running the tests, restrict it. -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch -) - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - --with-browseremoteprotocols=DNSSD,CUPS - --with-cups-rundir="${EPREFIX}"/run/cups - --with-rcdir=no - - $(use_enable ldap) - $(use_enable zeroconf avahi) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Requires avahi running. Hangs forever if not available. - avahi-daemon --check 2>/dev/null || die "no running avahi daemon found, cannot run tests" - - default -} - -src_install() { - default - - cp "${FILESDIR}"/cups-browsed.init.d "${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}"/daemon/cups-browsed.service || die - fi - - doinitd "${T}"/cups-browsed - systemd_dounit "${S}"/daemon/cups-browsed.service - -} diff --git a/net-print/cups-browsed/cups-browsed-2.0.1.ebuild b/net-print/cups-browsed/cups-browsed-2.0.1.ebuild deleted file mode 100644 index 1b600d43be39..000000000000 --- a/net-print/cups-browsed/cups-browsed-2.0.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd - -DESCRIPTION="helper daemon to browse for remote CUPS queues and IPP network printers" -HOMEPAGE="https://github.com/OpenPrinting/cups-browsed"; -SRC_URI="https://github.com/OpenPrinting/cups-browsed/releases/download/${PV}/${P}.tar.xz"; - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" -IUSE="ldap test zeroconf" - -RDEPEND=" - dev-libs/glib:2 - >=net-print/cups-2 - >=net-print/cups-filters-2.0.0 - ldap? ( net-nds/openldap:= ) - test? ( net-print/cups[zeroconf] ) - zeroconf? ( net-dns/avahi[dbus] ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/gdbus-codegen - >=sys-devel/gettext-0.18.3 - virtual/pkgconfig -" - -# The tests are new since the split out of cups-filters. Actually running them -# seems to be challenging. You need: -# - cups tools that are USE-optional -# - running avahi-daemon (as root!) -# - disable portage's pid-sandbox, which interferes with avahi -# - ipptool still fails to connect to port 8xxx -# -# If anything fails, a `while true` loop fails to successfully launch and break -# out of the loop, leading to a hang. Until there's an obvious recipe for -# successfully running the tests, restrict it. -RESTRICT="test" - -src_configure() { - local myeconfargs=( - --localstatedir="${EPREFIX}"/var - # Omit cups here for bug #940311 (CVE-2024-47176 mitigation) - --with-browseremoteprotocols=dnssd - --with-cups-rundir="${EPREFIX}"/run/cups - --with-rcdir=no - - $(use_enable ldap) - $(use_enable zeroconf avahi) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Requires avahi running. Hangs forever if not available. - avahi-daemon --check 2>/dev/null || die "no running avahi daemon found, cannot run tests" - - default -} - -src_install() { - default - - cp "${FILESDIR}"/cups-browsed.init.d "${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}"/daemon/cups-browsed.service || die - fi - - doinitd "${T}"/cups-browsed - systemd_dounit "${S}"/daemon/cups-browsed.service - -} diff --git a/net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch b/net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch deleted file mode 100644 index f72d3919c037..000000000000 --- a/net-print/cups-browsed/files/0001-cups-browsed.c-Fix-build-with-avahi-disabled-20.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream: https://github.com/OpenPrinting/cups-browsed/commit/08af74bfbf9aa8ccab45a2ee74e95951839756ba.patch -From 08af74bfbf9aa8ccab45a2ee74e95951839756ba Mon Sep 17 00:00:00 2001 -From: Timo Gurr <[email protected]> -Date: Wed, 27 Sep 2023 13:01:46 +0200 -Subject: [PATCH] cups-browsed.c: Fix build with avahi disabled (#20) - -Fixes #19 ---- - daemon/cups-browsed.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/daemon/cups-browsed.c b/daemon/cups-browsed.c -index b06461b4..c1e64fab 100644 ---- a/daemon/cups-browsed.c -+++ b/daemon/cups-browsed.c -@@ -400,6 +400,7 @@ typedef struct pagesize_count_s - int count; - } pagesize_count_t; - -+#ifdef HAVE_AVAHI - typedef struct resolver_args_s - { - AvahiIfIndex interface; -@@ -414,6 +415,7 @@ typedef struct resolver_args_s - AvahiLookupResultFlags flags; - void* userdata; - } resolver_args_t; -+#endif // HAVE_AVAHI - - typedef struct create_args_s - { --- -2.41.0 -
