commit: eabfd29399b97d885388cea671349c85f19e5b35 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Sep 27 04:19:23 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 27 04:19:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabfd293
net-print/cups: drop 2.4.2-r7, 2.4.4, 2.4.5 Bug: https://bugs.gentoo.org/907675 Bug: https://bugs.gentoo.org/909018 Signed-off-by: Sam James <sam <AT> gentoo.org> net-print/cups/Manifest | 3 - net-print/cups/cups-2.4.2-r7.ebuild | 325 --------------------- net-print/cups/cups-2.4.4.ebuild | 315 -------------------- net-print/cups/cups-2.4.5.ebuild | 315 -------------------- .../files/cups-2.4.2-no-fortify-override.patch | 18 -- .../cups-2.4.2-openssl-intermediate-certs.patch | 20 -- .../cups/files/cups-2.4.2-scheduler-ipp.patch | 36 --- net-print/cups/files/cups-resolve-local.patch | 97 ------ 8 files changed, 1129 deletions(-) diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 52c116f8ff79..ec197c098c16 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,5 +1,2 @@ -DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f -DIST cups-2.4.4-source.tar.gz 8135056 BLAKE2B 888ebf4630c08a200248ef1472374a002712b4c817f2e16c04c30b3c2e5842bc38656a976b1dd24eb0eec0630cb84b97d48339dca034f2e19fc2a6fc6ec58c7f SHA512 861b7d8e92b5ff2c2f693464f417ce1c22da74508acbfb2cb6a889154d4673f4b3f4dd87c53f8539a01b603d66546ebc6c121b88d483746e2f180d587ff3c675 -DIST cups-2.4.5-source.tar.gz 8133310 BLAKE2B 03921be99081bd0e345100406d2f266581dd7db36e7a1fd45ebc0e9f72642f5d77b5d6a76c0845757b111e27afb9bcbe4dfa5ae785f3fe5e092c45d75700b637 SHA512 ffa37468f28c95bd10db45739d1d442c21f9575f5b36543284f0821bae5d78167228543d7714b1a37c5701d31953e97ebd35cfdc8ec915894bce688431291701 DIST cups-2.4.6-source.tar.gz 8135135 BLAKE2B 4e61112ddaa46f20b1cfcb8f523dd07ba7d82604b9857754b288a2a9c5bc50ce242cfa119867347e4696818dc2eb505cf7fff1f9a0634e314edb2500395b83e4 SHA512 eb748680a748f599e4826c17054a24259d190e6c8e8339f6a7a37ee2a3f4c3fd1829e856b25a854cfdbee1b51279c70a0e847f6142225b8b68f1cd10c4ce4ce4 DIST cups-2.4.7-source.tar.gz 8134809 BLAKE2B d81de62cff37c576ef8fb125b97568c2d86602cec6151d7030552fad421d7bc77a5df1e860d5ac5a241e739cc0d1fe5fcac44b8451ad2fc4dc675cf74fd41382 SHA512 914b574ff6d85de9f3471528b52d4a436c484c441f47651846e1bdfa00aec26774efd416ff466216d2bccf468f8a797b1e0d666b5c82abc87e77550ce8b00d39 diff --git a/net-print/cups/cups-2.4.2-r7.ebuild b/net-print/cups/cups-2.4.2-r7.ebuild deleted file mode 100644 index 50a2154fb462..000000000000 --- a/net-print/cups/cups-2.4.2-r7.ebuild +++ /dev/null @@ -1,325 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools linux-info xdg multilib-minimal optfeature pam 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/OpenPrinting/cups.git"; - [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} -else - 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 ~loong ~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 openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf" - -# As of 2.4.2, they don't actually seem to be interactive (they pass some flags -# by default to input for us), but they fail on some greyscale issue w/ poppler? -RESTRICT="!test? ( test ) 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? ( - !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${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.4.1-nostrip.patch - "${FILESDIR}"/${PN}-2.4.1-user-AR.patch - "${FILESDIR}"/${PN}-2.4.2-no-fortify-override.patch - "${FILESDIR}"/${P}-openssl-intermediate-certs.patch - - # From Fedora - "${FILESDIR}"/${PN}-2.4.2-scheduler-ipp.patch - "${FILESDIR}"/${PN}-resolve-local.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/cups-config -) - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - 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 - 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 - - AT_M4DIR="config-scripts" eautoreconf - - # 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 - # Follow Fedora permission setting - --with-cupsd-file-perm=0755 - --with-exe-file-perm=755 - --with-log-file-perm=0640 - # Used by Debian, also prevents printers from getting - # disabled and users not knowing how to re-enable them - --with-error-policy=retry-job - # Used in Debian and Fedora - --enable-sync-on-close - # - --with-rundir="${EPREFIX}"/run/cups - --with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig - --with-cups-user=lp - --with-cups-group=lp - --with-docdir="${EPREFIX}"/usr/share/cups/html - # See bug #863221 for adding root - --with-system-groups="root 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 test unit-tests) - # USE="ssl" => gnutls - # USE="ssl openssl" => openssl - $(use_with ssl tls $(usex openssl openssl gnutls)) - $(use_with systemd ondemand systemd) - $(multilib_native_use_enable usb libusb) - $(use_with zeroconf dnssd avahi) - $(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 - - # Don't use the libtool build - # https://bugs.gentoo.org/843638 - # https://github.com/OpenPrinting/cups/pull/394 - unset LIBTOOL - - 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() { - # Avoid using /tmp - export CUPS_TESTBASE="${T}"/cups-tests - - mkdir "${T}"/cups-tests || die - - # We only build some of CUPS for multilib, so can't run the tests. - 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 bug #266678 - echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf - - # The following file is now provided by cups-filter: - 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_postinst() { - 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 -} diff --git a/net-print/cups/cups-2.4.4.ebuild b/net-print/cups/cups-2.4.4.ebuild deleted file mode 100644 index 5f2bed2a1d4b..000000000000 --- a/net-print/cups/cups-2.4.4.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools linux-info xdg multilib-minimal optfeature pam 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/OpenPrinting/cups.git"; - [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} -else - 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - fi -fi - -S="${WORKDIR}/${MY_P}" - -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 openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf" - -# As of 2.4.2, they don't actually seem to be interactive (they pass some flags -# by default to input for us), but they fail on some greyscale issue w/ poppler? -RESTRICT="!test? ( test ) 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? ( - !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${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.4.1-nostrip.patch" - "${FILESDIR}/${PN}-2.4.1-user-AR.patch" -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/cups-config -) - -pkg_setup() { - 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 - 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 - - AT_M4DIR="config-scripts" eautoreconf - - # 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 - # Follow Fedora permission setting - --with-cupsd-file-perm=0755 - --with-exe-file-perm=755 - --with-log-file-perm=0640 - # Used by Debian, also prevents printers from getting - # disabled and users not knowing how to re-enable them - --with-error-policy=retry-job - # Used in Debian and Fedora - --enable-sync-on-close - # - --with-rundir="${EPREFIX}"/run/cups - --with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig - --with-cups-user=lp - --with-cups-group=lp - --with-docdir="${EPREFIX}"/usr/share/cups/html - # See bug #863221 for adding root - --with-system-groups="root 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 test unit-tests) - # USE="ssl" => gnutls - # USE="ssl openssl" => openssl - $(use_with ssl tls $(usex openssl openssl gnutls)) - $(use_with systemd ondemand systemd) - $(multilib_native_use_enable usb libusb) - $(use_with zeroconf dnssd avahi) - $(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() { - # Avoid using /tmp - export CUPS_TESTBASE="${T}"/cups-tests - - mkdir "${T}"/cups-tests || die - - # We only build some of CUPS for multilib, so can't run the tests. - 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 bug #266678 - echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf - - # The following file is now provided by cups-filter: - 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_postinst() { - 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 -} diff --git a/net-print/cups/cups-2.4.5.ebuild b/net-print/cups/cups-2.4.5.ebuild deleted file mode 100644 index 5f2bed2a1d4b..000000000000 --- a/net-print/cups/cups-2.4.5.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools linux-info xdg multilib-minimal optfeature pam 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/OpenPrinting/cups.git"; - [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} -else - 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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - fi -fi - -S="${WORKDIR}/${MY_P}" - -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 openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf" - -# As of 2.4.2, they don't actually seem to be interactive (they pass some flags -# by default to input for us), but they fail on some greyscale issue w/ poppler? -RESTRICT="!test? ( test ) 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? ( - !openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] ) - openssl? ( dev-libs/openssl:=[${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.4.1-nostrip.patch" - "${FILESDIR}/${PN}-2.4.1-user-AR.patch" -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/cups-config -) - -pkg_setup() { - 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 - 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 - - AT_M4DIR="config-scripts" eautoreconf - - # 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 - # Follow Fedora permission setting - --with-cupsd-file-perm=0755 - --with-exe-file-perm=755 - --with-log-file-perm=0640 - # Used by Debian, also prevents printers from getting - # disabled and users not knowing how to re-enable them - --with-error-policy=retry-job - # Used in Debian and Fedora - --enable-sync-on-close - # - --with-rundir="${EPREFIX}"/run/cups - --with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig - --with-cups-user=lp - --with-cups-group=lp - --with-docdir="${EPREFIX}"/usr/share/cups/html - # See bug #863221 for adding root - --with-system-groups="root 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 test unit-tests) - # USE="ssl" => gnutls - # USE="ssl openssl" => openssl - $(use_with ssl tls $(usex openssl openssl gnutls)) - $(use_with systemd ondemand systemd) - $(multilib_native_use_enable usb libusb) - $(use_with zeroconf dnssd avahi) - $(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() { - # Avoid using /tmp - export CUPS_TESTBASE="${T}"/cups-tests - - mkdir "${T}"/cups-tests || die - - # We only build some of CUPS for multilib, so can't run the tests. - 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 bug #266678 - echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf - - # The following file is now provided by cups-filter: - 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_postinst() { - 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 -} diff --git a/net-print/cups/files/cups-2.4.2-no-fortify-override.patch b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch deleted file mode 100644 index e9153ce2f082..000000000000 --- a/net-print/cups/files/cups-2.4.2-no-fortify-override.patch +++ /dev/null @@ -1,18 +0,0 @@ -Gentoo already sets -D_FORTIFY_SOURCE=2 by default in GCC (patched in), so -we need to avoid doing this in packages to avoid redefinition errors if -we try to upgrade to e.g. =3. - -So, no effect on users, but important to stop issues w/ F_S=3. ---- a/config-scripts/cups-compiler.m4 -+++ b/config-scripts/cups-compiler.m4 -@@ -106,8 +106,8 @@ AS_IF([test -n "$GCC"], [ - ], [ - # Otherwise use the Fortify enhancements to catch any unbounded - # string operations... -- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" -- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" -+ CFLAGS="$CFLAGS" -+ CXXFLAGS="$CXXFLAGS" - ]) - - # Default optimization options... diff --git a/net-print/cups/files/cups-2.4.2-openssl-intermediate-certs.patch b/net-print/cups/files/cups-2.4.2-openssl-intermediate-certs.patch deleted file mode 100644 index 4ae1d7a9625c..000000000000 --- a/net-print/cups/files/cups-2.4.2-openssl-intermediate-certs.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/OpenPrinting/cups/issues/465 -https://github.com/OpenPrinting/cups/commit/cd84d7fde692237af4996d4a0e985a3eb4a293f0 - -From: Michael R Sweet <[email protected]> -Date: Mon, 5 Sep 2022 09:20:03 -0400 -Subject: [PATCH] The OpenSSL code path wasn't loading the full certificate - chain (Issue #465) - ---- a/cups/tls-openssl.c -+++ b/cups/tls-openssl.c -@@ -1055,7 +1055,7 @@ _httpTLSStart(http_t *http) // I - Connection to server - } - - SSL_CTX_use_PrivateKey_file(context, keyfile, SSL_FILETYPE_PEM); -- SSL_CTX_use_certificate_file(context, crtfile, SSL_FILETYPE_PEM); -+ SSL_CTX_use_certificate_chain_file(context, crtfile); - } - - // Set TLS options... - diff --git a/net-print/cups/files/cups-2.4.2-scheduler-ipp.patch b/net-print/cups/files/cups-2.4.2-scheduler-ipp.patch deleted file mode 100644 index 54147c60de96..000000000000 --- a/net-print/cups/files/cups-2.4.2-scheduler-ipp.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 020609ad9eb84ab5a4c602ff604b2f208a6cdb8d Mon Sep 17 00:00:00 2001 -From: Zdenek Dohnal <[email protected]> -Date: Wed, 22 Jun 2022 09:23:45 +0200 -Subject: [PATCH] scheduler/ipp.c: Allocate device_uri via cupsdSetString() - -If a driverless printer has .local in its URI, we resolve the -URI and save the resolved one as new device URI. The problem was that -a local pointer was assigned to the structure which is passed to the -function as parameter, so the pointer became invalid once the execution -left the create_local_bg_thread() function. - -We need to allocate the device URI via cupsdSetString() - the string is -then freed when the printer is deleted or cupsd shuts down. - -Fixes #419. ---- - CHANGES.md | 1 + - scheduler/ipp.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index 3a849bdb5..b722712f6 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -5307,7 +5307,7 @@ create_local_bg_thread( - return (NULL); - } - -- printer->device_uri = uri; -+ cupsdSetString(&printer->device_uri, uri); - } - - if (httpSeparateURI(HTTP_URI_CODING_ALL, printer->device_uri, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) --- -2.37.1 - diff --git a/net-print/cups/files/cups-resolve-local.patch b/net-print/cups/files/cups-resolve-local.patch deleted file mode 100644 index bc6c96a98211..000000000000 --- a/net-print/cups/files/cups-resolve-local.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/scheduler/ipp.c b/scheduler/ipp.c -index 9984b79..dd85173 100644 ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -5898,6 +5898,11 @@ create_local_printer( - *nameptr, /* Pointer into name */ - uri[1024]; /* printer-uri-supported value */ - const char *ptr; /* Pointer into attribute value */ -+ char scheme[HTTP_MAX_URI], /* Scheme portion of URI */ -+ userpass[HTTP_MAX_URI], /* Username portion of URI */ -+ host[HTTP_MAX_URI], /* Host portion of URI */ -+ resource[HTTP_MAX_URI]; /* Resource portion of URI */ -+ int port; /* Port portion of URI */ - - - /* -@@ -5961,6 +5966,13 @@ create_local_printer( - - return; - } -+ ptr = ippGetString(device_uri, 0, NULL); -+ if (!ptr || !ptr[0]) -+ { -+ send_ipp_status(con, IPP_STATUS_ERROR_BAD_REQUEST, _("Attribute \"%s\" has empty value."), "device-uri"); -+ -+ return; -+ } - - printer_geo_location = ippFindAttribute(con->request, "printer-geo-location", IPP_TAG_URI); - printer_info = ippFindAttribute(con->request, "printer-info", IPP_TAG_TEXT); -@@ -5989,7 +6001,65 @@ create_local_printer( - printer->shared = 0; - printer->temporary = 1; - -- cupsdSetDeviceURI(printer, ippGetString(device_uri, 0, NULL)); -+ /* -+ * Check device URI if it has the same hostname as we have, if so, replace -+ * the hostname by localhost. This way we assure that local-only services -+ * like ipp-usb or Printer Applications always work. -+ * -+ * When comparing our hostname with the one in the device URI, -+ * consider names with or without trailing dot ('.') the same. Also -+ * compare case-insensitively. -+ */ -+ -+#ifdef HAVE_DNSSD -+ if (DNSSDHostName) -+ nameptr = DNSSDHostName; -+ else -+#endif -+ if (ServerName) -+ nameptr = ServerName; -+ else -+ nameptr = NULL; -+ -+ if (nameptr) -+ { -+ int host_len, -+ server_name_len; -+ -+ /* Get host name of device URI */ -+ httpSeparateURI(HTTP_URI_CODING_ALL, ptr, -+ scheme, sizeof(scheme), userpass, sizeof(userpass), host, -+ sizeof(host), &port, resource, sizeof(resource)); -+ -+ /* Take trailing dot out of comparison */ -+ host_len = strlen(host); -+ if (host_len > 1 && host[host_len - 1] == '.') -+ host_len --; -+ -+ server_name_len = strlen(nameptr); -+ if (server_name_len > 1 && nameptr[server_name_len - 1] == '.') -+ server_name_len --; -+ -+ /* -+ * If we have no DNSSDHostName but only a ServerName (if we are not -+ * sharing printers, Browsing = Off) the ServerName has no ".local" -+ * but the requested device URI has. Take this into account. -+ */ -+ -+ if (nameptr == ServerName && host_len >= 6 && (server_name_len < 6 || strcmp(nameptr + server_name_len - 6, ".local") != 0) && strcmp(host + host_len - 6, ".local") == 0) -+ host_len -= 6; -+ -+ if (host_len == server_name_len && strncasecmp(host, nameptr, host_len) == 0) -+ ptr = "localhost"; -+ else -+ ptr = host; -+ -+ httpAssembleURI(HTTP_URI_CODING_ALL, uri, sizeof(uri), scheme, userpass, -+ ptr, port, resource); -+ cupsdSetDeviceURI(printer, uri); -+ } -+ else -+ cupsdSetDeviceURI(printer, ptr); - - if (printer_geo_location) - cupsdSetString(&printer->geo_location, ippGetString(printer_geo_location, 0, NULL));
