net-print/cups: Multiple bug fixes

- Fix missing dep on avahi[dbus] (#695438)
- Ensure server path is always correct (#615438)
- Recommend sys-auth/nss-mdns when needed (#634048)
- Fix /run paths (#685308)
- Respect empty LINGUAS (#771162)
- Fix empty dirs handling (#798855)
- Fix printing on some Samsung devices (#801316)
- Apply other upstream accepted patches widely tested on Fedora and Debian.

Closes: https://bugs.gentoo.org/695438
Thanks-to: Mart Raudsepp
Closes: https://bugs.gentoo.org/615438
Thanks-to: Stefan Schmid
Closes: https://bugs.gentoo.org/634048
Closes: https://bugs.gentoo.org/685308
Thanks-to: Bertrand Jacquin
Closes: https://bugs.gentoo.org/771162
Thanks-to: i.Dark_Templar
Closes: https://bugs.gentoo.org/798855
Thanks-to: Marco Scardovi (scardracs)
Closes: https://bugs.gentoo.org/801316
Thanks-to: Gentlenoob
Thanks-to: mehw
Thanks-to: Volkmar W. Pogatzki
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
This commit is contained in:
Pacho Ramos
2021-10-28 11:49:01 +02:00
parent 36d57f978e
commit 8f6d1abb62
6 changed files with 469 additions and 0 deletions

View File

@@ -0,0 +1,326 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools flag-o-matic linux-info xdg multilib-minimal optfeature pam systemd toolchain-funcs
MY_PV="${PV/_beta/b}"
MY_PV="${MY_PV/_rc/rc}"
MY_PV="${MY_PV/_p/op}"
MY_P="${PN}-${MY_PV}"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
# EGIT_REPO_URI="https://github.com/apple/cups.git"
EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
else
# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
fi
DESCRIPTION="The Common Unix Printing System"
HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
REQUIRED_USE="usb? ( threads )"
# upstream includes an interactive test which is a nono for gentoo
RESTRICT="test"
BDEPEND="
acct-group/lp
acct-group/lpadmin
virtual/pkgconfig
"
DEPEND="
app-text/libpaper
sys-libs/zlib
acl? (
kernel_linux? (
sys-apps/acl
sys-apps/attr
)
)
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
pam? ( sys-libs/pam )
!pam? ( virtual/libcrypt:= )
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd )
usb? ( virtual/libusb:1 )
X? ( x11-misc/xdg-utils )
xinetd? ( sys-apps/xinetd )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
"
RDEPEND="${DEPEND}
acct-group/lp
acct-group/lpadmin
selinux? ( sec-policy/selinux-cups )
"
PDEPEND=">=net-print/cups-filters-1.0.43"
PATCHES=(
"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.3.3-user-AR.patch"
# Upstream patches (from Debian and Fedora)
"${FILESDIR}/${PN}-2.3.3-timeout.patch"
"${FILESDIR}/${PN}-2.3.3-enforcing-read-limits.patch"
"${FILESDIR}/${PN}-2.3.3-manpage.patch"
"${FILESDIR}/${PN}-2.3.3-ipp-retry-validate.patch"
)
MULTILIB_CHOST_TOOLS=(
/usr/bin/cups-config
)
S="${WORKDIR}/${MY_P}"
pkg_setup() {
#enewgroup lp -> acct-group/lp
# user lp already provided by baselayout
#enewuser lp -1 -1 -1 lp
#enewgroup lpadmin 106
if use kernel_linux; then
linux-info_pkg_setup
if ! linux_config_exists; then
ewarn "Can't check the linux kernel configuration."
ewarn "You might have some incompatible options enabled."
else
# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
if use usb; then
if linux_chkconfig_present USB_PRINTER; then
elog "Your USB printers will be managed via libusb. In case you run into problems, "
elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
elog "usblp kernel module."
elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
fi
else
#here we should warn user that he should enable it so he can print
if ! linux_chkconfig_present USB_PRINTER; then
ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
ewarn "support in your kernel."
ewarn "Please enable it:"
ewarn " CONFIG_USB_PRINTER=y"
ewarn "in /usr/src/linux/.config or"
ewarn " Device Drivers --->"
ewarn " USB support --->"
ewarn " [*] USB Printer support"
ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
fi
fi
fi
fi
}
src_prepare() {
default
# Remove ".SILENT" rule for verbose output (bug 524338).
sed 's#^.SILENT:##g' -i Makedefs.in || die
# Fix install-sh, posix sh does not have 'function'.
sed 's#function gzipcp#gzipcp()#g' -i install-sh || die
# Do not add -Werror even for live ebuilds
sed '/WARNING_OPTIONS/s@-Werror@@' \
-i config-scripts/cups-compiler.m4 || die
AT_M4DIR=config-scripts eaclocal
eautoconf
# custom Makefiles
multilib_copy_sources
}
multilib_src_configure() {
export DSOFLAGS="${LDFLAGS}"
# explicitly specify compiler wrt bug 524340
#
# need to override KRB5CONFIG for proper flags
# https://github.com/apple/cups/issues/4423
local myeconfargs=(
CC="$(tc-getCC)"
CXX="$(tc-getCXX)"
KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
--libdir="${EPREFIX}"/usr/$(get_libdir)
--localstatedir="${EPREFIX}"/var
--with-exe-file-perm=755
--with-rundir="${EPREFIX}"/run/cups
--with-cups-user=lp
--with-cups-group=lp
--with-docdir="${EPREFIX}"/usr/share/cups/html
--with-system-groups=lpadmin
--with-xinetd="${EPREFIX}"/etc/xinetd.d
$(multilib_native_use_enable acl)
$(use_enable dbus)
$(use_enable debug)
$(use_enable debug debug-guards)
$(use_enable debug debug-printfs)
$(use_enable kerberos gssapi)
$(multilib_native_use_enable pam)
$(use_enable static-libs static)
$(use_enable threads)
$(use_enable ssl gnutls)
$(use_enable systemd)
$(multilib_native_use_enable usb libusb)
$(use_enable zeroconf avahi)
--disable-dnssd
$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
)
# Handle empty LINGUAS properly, bug #771162
if [ -n "${LINGUAS+x}" ] ; then
myeconfargs+=(
--with-languages="${LINGUAS}"
)
fi
if tc-is-static-only; then
myeconfargs+=(
--disable-shared
)
fi
# install in /usr/libexec always, instead of using /usr/lib/cups, as that
# makes more sense when facing multilib support.
sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
econf "${myeconfargs[@]}"
sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
# additional path corrections needed for prefix, see bug 597728
sed \
-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
-i Makedefs || die
}
multilib_src_compile() {
if multilib_is_native_abi; then
default
else
emake libs
fi
}
multilib_src_test() {
multilib_is_native_abi && default
}
multilib_src_install() {
if multilib_is_native_abi; then
emake BUILDROOT="${D}" install
else
emake BUILDROOT="${D}" install-libs install-headers
dobin cups-config
fi
}
multilib_src_install_all() {
dodoc {CHANGES,CREDITS,README}.md
# move the default config file to docs
dodoc "${ED}"/etc/cups/cupsd.conf.default
rm "${ED}"/etc/cups/cupsd.conf.default || die
# clean out cups init scripts
rm -r "${ED}"/etc/{init.d/cups,rc*} || die
# install our init script
local neededservices=(
$(usex zeroconf avahi-daemon '')
$(usex dbus dbus '')
)
[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
cp "${FILESDIR}"/cupsd.init.d-r4 "${T}"/cupsd || die
sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
doinitd "${T}"/cupsd
if use pam ; then
rm "${ED}"/etc/pam.d/${PN} || die
pamd_mimic_system cups auth account
fi
if use xinetd ; then
# correct path
sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
"${ED}"/etc/xinetd.d/cups-lpd || die
# it is safer to disable this by default, bug #137130
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
# write permission for file owner (root), bug #296221
fperms u+w /etc/xinetd.d/cups-lpd
else
# always configure with --with-xinetd= and clean up later,
# bug #525604
rm -r "${ED}"/etc/xinetd.d || die
fi
keepdir /etc/cups/{interfaces,ppd,ssl}
if ! use X ; then
rm -r "${ED}"/usr/share/applications || die
fi
# create /etc/cups/client.conf, bug #196967 and #266678
echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
# the following file is now provided by cups-filters:
rm -r "${ED}"/usr/share/cups/banners || die
# the following are created by the init script
rm -r "${ED}"/var/cache || die
rm -r "${ED}"/run || die
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} /var/log/cups /var/spool/cups/tmp
}
pkg_preinst() {
xdg_pkg_preinst
}
pkg_postinst() {
# Update desktop file database and gtk icon cache (bug 370059)
xdg_pkg_postinst
local v
for v in ${REPLACING_VERSIONS}; do
if ! ver_test ${v} -ge 2.2.2-r2 ; then
ewarn "The cupsd init script switched to using pidfiles. Shutting down"
ewarn "cupsd will fail the next time. To fix this, please run once as root"
ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
break
fi
done
for v in ${REPLACING_VERSIONS}; do
elog
elog "For information about installing a printer and general cups setup"
elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
break
done
optfeature_header "CUPS may need installing the following for certain features to work:"
use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns
}
pkg_postrm() {
# Update desktop file database and gtk icon cache (bug 370059)
xdg_pkg_postrm
}

View File

@@ -0,0 +1,29 @@
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 13 Apr 2021 15:47:37 +0200
Subject: backend/usb-libusb.c: Revert enforcing read limits
This commit reverts the change introduced by 2.2.12 [1] - its
implementation caused a regression with Lexmark filters.
[1] https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35
Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
Bug: https://github.com/OpenPrinting/cups/issues/72
---
backend/usb-libusb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index fbb0d9d..89b5182 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference)
* Make sure this loop executes no more than once every 250 miliseconds...
*/
- if ((g.wait_eof || !g.read_thread_stop))
+ if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
+ (g.wait_eof || !g.read_thread_stop))
usleep(250000);
}
while (g.wait_eof || !g.read_thread_stop);

View File

@@ -0,0 +1,43 @@
From 6e6999b1f74457b7fd6057a31f1d3606de19a05b Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Fri, 9 Apr 2021 10:20:04 -0400
Subject: [PATCH] Retry Validate-Job once, if needed (Issue #132)
---
CHANGES.md | 1 +
backend/ipp.c | 14 +++++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/backend/ipp.c b/backend/ipp.c
index 63353a66d..020ab7fd4 100644
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -256,6 +257,7 @@ main(int argc, /* I - Number of command-line args */
get_job_attrs = 0, /* Does printer support Get-Job-Attributes? */
send_document = 0, /* Does printer support Send-Document? */
validate_job = 0, /* Does printer support Validate-Job? */
+ validate_retried = 0, /* Was Validate-Job request retried? */
copies, /* Number of copies for job */
copies_remaining; /* Number of copies remaining */
const char *content_type, /* CONTENT_TYPE environment variable */
@@ -1559,7 +1561,17 @@ main(int argc, /* I - Number of command-line args */
ipp_status == IPP_STATUS_ERROR_BAD_REQUEST)
break;
else if (job_auth == NULL && ipp_status > IPP_STATUS_ERROR_BAD_REQUEST)
+ {
+ if (!validate_retried)
+ {
+ // Retry Validate-Job operation once, to work around known printer bug...
+ validate_retried = 1;
+ sleep(10);
+ continue;
+ }
+
goto cleanup;
+ }
}
/*
--
2.26.3

View File

@@ -0,0 +1,23 @@
From: Didier Raboud <odyx@debian.org>
Date: Fri, 12 Feb 2021 13:47:22 +0100
Subject: Let cups.1 point to client.conf.5, not client.conf.7
Bug: https://github.com/OpenPrinting/cups/pull/92
Closes: #982303
---
man/cups.1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/man/cups.1 b/man/cups.1
index 706620d..751ad9a 100644
--- a/man/cups.1
+++ b/man/cups.1
@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using applications such as
.BR ippeveprinter (1).
.SH SEE ALSO
.BR cancel (1),
-.BR client.conf (7),
+.BR client.conf (5),
.BR cupsctl (8),
.BR cupsd (8),
.BR lp (1),

View File

@@ -0,0 +1,26 @@
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 13 Apr 2021 15:44:14 +0200
Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel
Some older models malfunction if timeout is too short.
Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
Bug: https://github.com/OpenPrinting/cups/issues/160
Bug-Debian: https://bugs.debian.org/989073
---
backend/usb-libusb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index d6b0eb4..fbb0d9d 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference)
readstatus = libusb_bulk_transfer(g.printer->handle,
g.printer->read_endp,
readbuffer, rbytes,
- &rbytes, 250);
+ &rbytes, 60000);
if (readstatus == LIBUSB_SUCCESS && rbytes > 0)
{
fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", (int)rbytes);

View File

@@ -0,0 +1,22 @@
#!/sbin/openrc-run
# Copyright 1999-2021 Gentoo Authors
description="The Common Unix Printing System daemon"
command="/usr/sbin/cupsd"
command_args="-f -c /etc/cups/cupsd.conf -s /etc/cups/cups-files.conf"
pidfile="/run/cupsd.pid"
start_stop_daemon_args="-b -m --pidfile ${pidfile}"
depend() {
use net
@neededservices@
before nfs
after logger
}
start_pre() {
checkpath -q -d -m 0775 -o root:lp /var/cache/cups
checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss
checkpath -q -d -m 0755 -o root:lp /run/cups
checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs
}