* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2016-01-12 15:50 Matthias Maier
0 siblings, 0 replies; 15+ messages in thread
From: Matthias Maier @ 2016-01-12 15:50 UTC (permalink / raw
To: gentoo-commits
commit: d50613660ebada3bfc9f27799710d4c8d8ec3743
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 15:43:56 2016 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 15:50:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5061366
net-print/cups: version bump to 2.1.2, bug 568428
Gentoo-bugs: 568428
Package-Manager: portage-2.2.26
net-print/cups/Manifest | 1 +
net-print/cups/cups-2.1.2.ebuild | 357 +++++++++++++++++++++
.../cups/files/cups-2.1.2-systemd-socket.patch | 51 +++
3 files changed, 409 insertions(+)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d67a3c2..271c55f 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,2 +1,3 @@
DIST cups-2.0.3-source.tar.bz2 8797220 SHA256 bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881 SHA512 fcc2be8d12cec624423a07706486afd226c9cb29b2ba694d63b8250c16a7d0f39aa51e6c831ca7c978ba5009e98b1daedad4b119a4f3287a88e21e48f0d07e18 WHIRLPOOL d12771b6d941db78854a1b05644a4402fa6a62f8acab1332c7490887e0099463b129684f4dd21b5e9f02e4f8e23bef633a06fca01ad8fa8b34de9298b72ab3ba
DIST cups-2.0.4-source.tar.bz2 8799274 SHA256 e1d5e68d9f24faca317aeaebc164c34102813bc0f1d69c00b3a59b49c49f4abd SHA512 d0db3ce729ee893f260b69814343e84af4b934f1783d96049fcf58204a93ac534d0bf0c1626f5ac55371962419b91c857bd872f499e905223069b5103405c4ae WHIRLPOOL cbeb3f61cf534017180aa0d55f60ec81ac082f92d3626b18b4480aaf9e67b425b829ad260dfa1227ba56a79b52959f1e740848d26dc938fc9fc0159f1844a2bb
+DIST cups-2.1.2-source.tar.bz2 8831726 SHA256 bab0ca3ba80eae48319b3a6b19a5b14fad5ce230f30151a0cfa4c0271df281ad SHA512 c1bd15acdd8ac55a731c9267f0dcf9159a02c3a895d4b032b0e0d0bbb1189eb4b3b4600a9f025a8359a55ce93a5911014058f361f2bc954d1fb2cdbf219e183d WHIRLPOOL e4bb7729bb4ac7d8ba51a18178dfaeaa98c3e4525c7c6beb17dbe78f938e7cb2da466f9b4cb7f68452ddae6a52de36ee3c2b204dd1f5c9e21141cdaf7fdccea0
diff --git a/net-print/cups/cups-2.1.2.ebuild b/net-print/cups/cups-2.1.2.ebuild
new file mode 100644
index 0000000..9406e6f
--- /dev/null
+++ b/net-print/cups/cups-2.1.2.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+ multilib multilib-minimal pam python-single-r1 user versionator \
+ java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="http://www.cups.org/cups.git"
+ if [[ ${PV} != 9999 ]]; then
+ EGIT_BRANCH=branch-${PV/.9999}
+ fi
+else
+ SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+ python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca cs de es fr it ja pt_BR ru"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+ app-text/libpaper
+ acl? (
+ kernel_linux? (
+ sys-apps/acl
+ sys-apps/attr
+ )
+ )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jre-1.6:* )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ !lprng-compat? ( !net-print/lprng )
+ pam? ( virtual/pam )
+ python? ( ${PYTHON_DEPS} )
+ ssl? (
+ >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+
+DEPEND="${CDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND="
+ app-text/ghostscript-gpl[cups]
+ app-text/poppler[utils]
+ >=net-print/cups-filters-1.0.43
+"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+ "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+ "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+ "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+ "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+ "${FILESDIR}/${P}-systemd-socket.patch"
+ "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/cups-config
+)
+
+pkg_setup() {
+ enewgroup lp
+ enewuser lp -1 -1 -1 lp
+ enewgroup lpadmin 106
+
+ use python && python-single-r1_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
+ if use usb; then
+ if linux_chkconfig_present USB_PRINTER; then
+ eerror "Your usb printers will be managed via libusb. In this case, "
+ eerror "${P} requires the USB_PRINTER support disabled."
+ eerror "Please disable it:"
+ eerror " CONFIG_USB_PRINTER=n"
+ eerror "in /usr/src/linux/.config or"
+ eerror " Device Drivers --->"
+ eerror " USB support --->"
+ eerror " [ ] USB Printer support"
+ eerror "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() {
+ base_src_prepare
+ epatch_user
+
+ # Remove ".SILENT" rule for verbose output (bug 524338).
+ sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+
+ # Fix install-sh, posix sh does not have 'function'.
+ sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+ AT_M4DIR=config-scripts eaclocal
+ eautoconf
+
+ # custom Makefiles
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ export DSOFLAGS="${LDFLAGS}"
+
+ einfo LANGS=\"${LANGS}\"
+ einfo LINGUAS=\"${LINGUAS}\"
+
+ local myconf=()
+
+ if tc-is-static-only; then
+ myconf+=(
+ --disable-shared
+ )
+ fi
+
+ # explicitly specify compiler wrt bug 524340
+ #
+ # need to override KRB5CONFIG for proper flags
+ # https://www.cups.org/str.php?L4423
+ econf \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --localstatedir="${EPREFIX}"/var \
+ --with-rundir="${EPREFIX}"/run/cups \
+ --with-cups-user=lp \
+ --with-cups-group=lp \
+ --with-docdir="${EPREFIX}"/usr/share/cups/html \
+ --with-languages="${LINGUAS}" \
+ --with-system-groups=lpadmin \
+ --with-xinetd=/etc/xinetd.d \
+ $(multilib_native_use_enable acl) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable debug debug-guards) \
+ $(multilib_native_use_with java) \
+ $(use_enable kerberos gssapi) \
+ $(multilib_native_use_enable pam) \
+ $(multilib_native_use_with python python "${PYTHON}") \
+ $(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 \
+ --without-perl \
+ --without-php \
+ $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+ "${myconf[@]}"
+
+ # install in /usr/libexec always, instead of using /usr/lib/cups, as that
+ # makes more sense when facing multilib support.
+ 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
+}
+
+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}.txt
+
+ # move the default config file to docs
+ dodoc "${ED}"/etc/cups/cupsd.conf.default
+ rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+ # clean out cups init scripts
+ rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+ # install our init script
+ local neededservices
+ use zeroconf && neededservices+=" avahi-daemon"
+ use dbus && neededservices+=" dbus"
+ [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+ cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
+ sed -i \
+ -e "s/@neededservices@/$neededservices/" \
+ "${T}"/cupsd || die
+ doinitd "${T}"/cupsd
+
+ # install our pam script
+ pamd_mimic_system cups auth account
+
+ 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 || die "fperms failed"
+ else
+ # always configure with --with-xinetd= and clean up later,
+ # bug #525604
+ rm -rf "${ED}"/etc/xinetd.d
+ fi
+
+ keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+ /var/log/cups /var/spool/cups/tmp
+
+ keepdir /etc/cups/{interfaces,ppd,ssl}
+
+ use X || rm -r "${ED}"/usr/share/applications
+
+ # create /etc/cups/client.conf, bug #196967 and #266678
+ echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+ # the following file iw 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/cups || die
+ rm -r "${ED}"/run || die
+
+ # for the special case of running lprng and cups together, bug 467226
+ if use lprng-compat ; then
+ rm -fv "${ED}"/usr/bin/{lp*,cancel}
+ rm -fv "${ED}"/usr/sbin/lp*
+ rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+ rm -fv "${ED}"/usr/share/man/man8/lp*
+ ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+ ewarn "Unless you plan to install an exotic server setup, you most likely"
+ ewarn "do not want this. Disable the useflag then and all will be fine."
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ # Update desktop file database and gtk icon cache (bug 370059)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+
+ # not slotted - at most one value
+ if ! [[ "${REPLACING_VERSIONS}" ]]; then
+ echo
+ elog "For information about installing a printer and general cups setup"
+ elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+ echo
+ fi
+
+ if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+ echo
+ elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+ elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+ elog "You will have to find printers using zeroconf/avahi instead, enter"
+ elog "the location manually, or run cups-browsed from net-print/cups-filters"
+ elog "which re-adds that functionality as a separate daemon."
+ echo
+ fi
+
+ if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+ ewarn
+ ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+ ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+ ewarn
+ fi
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug 370059)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/files/cups-2.1.2-systemd-socket.patch b/net-print/cups/files/cups-2.1.2-systemd-socket.patch
new file mode 100644
index 0000000..2f88924
--- /dev/null
+++ b/net-print/cups/files/cups-2.1.2-systemd-socket.patch
@@ -0,0 +1,51 @@
+diff --git a/scheduler/main.c b/scheduler/main.c
+index b1aa503..2f0f5fe 100644
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -656,8 +656,15 @@ main(int argc, /* I - Number of command-line args */
+
+ #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
+ if (OnDemand)
++ {
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
+- else
++# ifdef HAVE_SYSTEMD
++ sd_notifyf(0, "READY=1\n"
++ "STATUS=Scheduler is running...\n"
++ "MAINPID=%lu",
++ (unsigned long) getpid());
++# endif /* HAVE_SYSTEMD */
++ } else
+ #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
+ if (fg)
+ cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
+diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
+index 1bccc6f..4564164 100644
+--- a/scheduler/org.cups.cupsd.path.in
++++ b/scheduler/org.cups.cupsd.path.in
+@@ -2,7 +2,7 @@
+ Description=CUPS Scheduler
+
+ [Path]
+-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
++PathExistsGlob=@CUPS_REQUESTS@/d*
+
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
+index 0a27c76..0a841a2 100644
+--- a/scheduler/org.cups.cupsd.service.in
++++ b/scheduler/org.cups.cupsd.service.in
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
++After=network.target
+
+ [Service]
+ ExecStart=@sbindir@/cupsd -l
+-Type=simple
++Type=notify
+
+ [Install]
+ Also=org.cups.cupsd.socket org.cups.cupsd.path
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2016-02-06 1:34 Mike Frysinger
0 siblings, 0 replies; 15+ messages in thread
From: Mike Frysinger @ 2016-02-06 1:34 UTC (permalink / raw
To: gentoo-commits
commit: a3183fdee3fcfae6d9bdac88023863aeddbaccac
Author: Brian Norris <briannorris <AT> chromium <DOT> org>
AuthorDate: Sat Feb 6 01:32:08 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 01:32:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3183fde
net-print/cups: disable unused host tools for cross-compiling
net-print/cups/cups-2.0.3.ebuild | 1 +
net-print/cups/cups-2.0.4.ebuild | 1 +
net-print/cups/cups-2.1.2-r2.ebuild | 1 +
net-print/cups/cups-9999.ebuild | 1 +
.../cups/files/cups-2.0.3-cross-compile.patch | 30 ++++++++++++++++++++++
5 files changed, 34 insertions(+)
diff --git a/net-print/cups/cups-2.0.3.ebuild b/net-print/cups/cups-2.0.3.ebuild
index 11d2f69..1b14320 100644
--- a/net-print/cups/cups-2.0.3.ebuild
+++ b/net-print/cups/cups-2.0.3.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/cups-2.0.4.ebuild b/net-print/cups/cups-2.0.4.ebuild
index 0a00f54..cd8a5f10 100644
--- a/net-print/cups/cups-2.0.4.ebuild
+++ b/net-print/cups/cups-2.0.4.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/cups-2.1.2-r2.ebuild b/net-print/cups/cups-2.1.2-r2.ebuild
index 1a45172..49e827a 100644
--- a/net-print/cups/cups-2.1.2-r2.ebuild
+++ b/net-print/cups/cups-2.1.2-r2.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 45127ab..b22cf63 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.0.3-cross-compile.patch b/net-print/cups/files/cups-2.0.3-cross-compile.patch
new file mode 100644
index 0000000..d0893c3
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.3-cross-compile.patch
@@ -0,0 +1,30 @@
+we don't actually install the generated html output, so no point in building
+them. this also helps cross-compiling because the tool to create the html
+uses $CC and has no logic for $BUILD_CC. simpler to disable than fix.
+
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -73,7 +73,7 @@ MAN8 = cupsaccept.$(MAN8EXT) \
+ # Make everything...
+ #
+
+-all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
++all: $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+
+
+ #
+
+similarly, the genstrings tool is used to gather all the translatable strings
+in the code base for passing to gettext. in our builds, those strings already
+exist, so no point in running this tool.
+
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -70,7 +70,6 @@ EXECTARGETS = \
+ TARGETS = \
+ $(LIBTARGETS) \
+ $(EXECTARGETS) \
+- genstrings
+
+
+ #
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2016-02-07 14:45 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2016-02-07 14:45 UTC (permalink / raw
To: gentoo-commits
commit: b8fa126dd2c2241428665c8e5112a6a2abf9d2ef
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 14:45:21 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 14:45:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fa126d
net-print/cups: Bump to version 2.1.3
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-print/cups/Manifest | 1 +
net-print/cups/cups-2.1.3.ebuild | 357 +++++++++++++++++++++
.../files/cups-1.6.0-dont-compress-manpages.patch | 6 +-
.../cups/files/cups-1.6.0-fix-install-perms.patch | 6 +-
net-print/cups/files/cupsd.init.d-r2 | 20 ++
5 files changed, 382 insertions(+), 8 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 271c55f..f911ce0 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,4 @@
DIST cups-2.0.3-source.tar.bz2 8797220 SHA256 bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881 SHA512 fcc2be8d12cec624423a07706486afd226c9cb29b2ba694d63b8250c16a7d0f39aa51e6c831ca7c978ba5009e98b1daedad4b119a4f3287a88e21e48f0d07e18 WHIRLPOOL d12771b6d941db78854a1b05644a4402fa6a62f8acab1332c7490887e0099463b129684f4dd21b5e9f02e4f8e23bef633a06fca01ad8fa8b34de9298b72ab3ba
DIST cups-2.0.4-source.tar.bz2 8799274 SHA256 e1d5e68d9f24faca317aeaebc164c34102813bc0f1d69c00b3a59b49c49f4abd SHA512 d0db3ce729ee893f260b69814343e84af4b934f1783d96049fcf58204a93ac534d0bf0c1626f5ac55371962419b91c857bd872f499e905223069b5103405c4ae WHIRLPOOL cbeb3f61cf534017180aa0d55f60ec81ac082f92d3626b18b4480aaf9e67b425b829ad260dfa1227ba56a79b52959f1e740848d26dc938fc9fc0159f1844a2bb
DIST cups-2.1.2-source.tar.bz2 8831726 SHA256 bab0ca3ba80eae48319b3a6b19a5b14fad5ce230f30151a0cfa4c0271df281ad SHA512 c1bd15acdd8ac55a731c9267f0dcf9159a02c3a895d4b032b0e0d0bbb1189eb4b3b4600a9f025a8359a55ce93a5911014058f361f2bc954d1fb2cdbf219e183d WHIRLPOOL e4bb7729bb4ac7d8ba51a18178dfaeaa98c3e4525c7c6beb17dbe78f938e7cb2da466f9b4cb7f68452ddae6a52de36ee3c2b204dd1f5c9e21141cdaf7fdccea0
+DIST cups-2.1.3-source.tar.bz2 8832400 SHA256 36a70d43584aea2617da914b9331e23341c3501a8254c4d2eae9c11ec01fd4d3 SHA512 5cc715b8521b4d6af29a97a8abf7a1b0973840c00727ee8e7926e89a4a9da8e67565d14cc4b57ab7cfb40b238d4faaed7608b9ab95947cc3671ed87b710f8f36 WHIRLPOOL 161c65b8adc3ab1c65208fe23bf14aefe5dfd84e9b162c69b1a8f977c3a4fc7c31ea92d0c2eaca3c276fa192596a31701052f0c2a1ffd213a09d48c11d446f6f
diff --git a/net-print/cups/cups-2.1.3.ebuild b/net-print/cups/cups-2.1.3.ebuild
new file mode 100644
index 0000000..3f1174b
--- /dev/null
+++ b/net-print/cups/cups-2.1.3.ebuild
@@ -0,0 +1,357 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
+ multilib multilib-minimal pam python-single-r1 user versionator \
+ java-pkg-opt-2 systemd toolchain-funcs
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="http://www.cups.org/cups.git"
+ if [[ ${PV} != 9999 ]]; then
+ EGIT_BRANCH=branch-${PV/.9999}
+ fi
+else
+ SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug java kerberos lprng-compat pam
+ python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+LANGS="ca cs de es fr it ja ru"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} +linguas_${X}"
+done
+
+CDEPEND="
+ app-text/libpaper
+ acl? (
+ kernel_linux? (
+ sys-apps/acl
+ sys-apps/attr
+ )
+ )
+ dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jre-1.6:* )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ !lprng-compat? ( !net-print/lprng )
+ pam? ( virtual/pam )
+ python? ( ${PYTHON_DEPS} )
+ ssl? (
+ >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+ >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+
+DEPEND="${CDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-cups )
+"
+
+PDEPEND="
+ app-text/ghostscript-gpl[cups]
+ app-text/poppler[utils]
+ >=net-print/cups-filters-1.0.43
+"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ usb? ( threads )
+"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+# systemd-socket.patch from Fedora
+PATCHES=(
+ "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+ "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+ "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+ "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
+ "${FILESDIR}/${PN}-2.1.2-systemd-socket.patch"
+ "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/cups-config
+)
+
+pkg_setup() {
+ enewgroup lp
+ enewuser lp -1 -1 -1 lp
+ enewgroup lpadmin 106
+
+ use python && python-single-r1_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
+ if use usb; then
+ if linux_chkconfig_present USB_PRINTER; then
+ eerror "Your usb printers will be managed via libusb. In this case, "
+ eerror "${P} requires the USB_PRINTER support disabled."
+ eerror "Please disable it:"
+ eerror " CONFIG_USB_PRINTER=n"
+ eerror "in /usr/src/linux/.config or"
+ eerror " Device Drivers --->"
+ eerror " USB support --->"
+ eerror " [ ] USB Printer support"
+ eerror "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 "${S}"/Makedefs.in || die "sed failed"
+
+ # Fix install-sh, posix sh does not have 'function'.
+ sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+ AT_M4DIR=config-scripts eaclocal
+ eautoconf
+
+ # custom Makefiles
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ export DSOFLAGS="${LDFLAGS}"
+
+ einfo LANGS=\"${LANGS}\"
+ einfo LINGUAS=\"${LINGUAS}\"
+
+ local myconf=()
+
+ if tc-is-static-only; then
+ myconf+=(
+ --disable-shared
+ )
+ fi
+
+ # explicitly specify compiler wrt bug 524340
+ #
+ # need to override KRB5CONFIG for proper flags
+ # https://www.cups.org/str.php?L4423
+ econf \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --localstatedir="${EPREFIX}"/var \
+ --with-rundir="${EPREFIX}"/run/cups \
+ --with-cups-user=lp \
+ --with-cups-group=lp \
+ --with-docdir="${EPREFIX}"/usr/share/cups/html \
+ --with-languages="${LINGUAS}" \
+ --with-system-groups=lpadmin \
+ --with-xinetd=/etc/xinetd.d \
+ $(multilib_native_use_enable acl) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable debug debug-guards) \
+ $(multilib_native_use_with java) \
+ $(use_enable kerberos gssapi) \
+ $(multilib_native_use_enable pam) \
+ $(multilib_native_use_with python python "${PYTHON}") \
+ $(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 \
+ --without-perl \
+ --without-php \
+ $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
+ "${myconf[@]}"
+
+ # install in /usr/libexec always, instead of using /usr/lib/cups, as that
+ # makes more sense when facing multilib support.
+ 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
+}
+
+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}.txt
+
+ # move the default config file to docs
+ dodoc "${ED}"/etc/cups/cupsd.conf.default
+ rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+ # clean out cups init scripts
+ rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+ # install our init script
+ local neededservices
+ use zeroconf && neededservices+=" avahi-daemon"
+ use dbus && neededservices+=" dbus"
+ [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+ cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die
+ sed -i \
+ -e "s/@neededservices@/$neededservices/" \
+ "${T}"/cupsd || die
+ doinitd "${T}"/cupsd
+
+ # install our pam script
+ pamd_mimic_system cups auth account
+
+ 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 || die "fperms failed"
+ else
+ # always configure with --with-xinetd= and clean up later,
+ # bug #525604
+ rm -rf "${ED}"/etc/xinetd.d
+ fi
+
+ keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+ /var/log/cups /var/spool/cups/tmp
+
+ keepdir /etc/cups/{interfaces,ppd,ssl}
+
+ use X || rm -r "${ED}"/usr/share/applications
+
+ # 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/cups || die
+ rm -r "${ED}"/run || die
+
+ # for the special case of running lprng and cups together, bug 467226
+ if use lprng-compat ; then
+ rm -fv "${ED}"/usr/bin/{lp*,cancel}
+ rm -fv "${ED}"/usr/sbin/lp*
+ rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+ rm -fv "${ED}"/usr/share/man/man8/lp*
+ ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+ ewarn "Unless you plan to install an exotic server setup, you most likely"
+ ewarn "do not want this. Disable the useflag then and all will be fine."
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ # Update desktop file database and gtk icon cache (bug 370059)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+
+ # not slotted - at most one value
+ if ! [[ "${REPLACING_VERSIONS}" ]]; then
+ echo
+ elog "For information about installing a printer and general cups setup"
+ elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+ echo
+ fi
+
+ if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+ echo
+ elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+ elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+ elog "You will have to find printers using zeroconf/avahi instead, enter"
+ elog "the location manually, or run cups-browsed from net-print/cups-filters"
+ elog "which re-adds that functionality as a separate daemon."
+ echo
+ fi
+
+ if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+ ewarn
+ ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+ ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+ ewarn
+ fi
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug 370059)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
index 62db46e..a388b4d 100644
--- a/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
+++ b/net-print/cups/files/cups-1.6.0-dont-compress-manpages.patch
@@ -1,7 +1,5 @@
-Index: config-scripts/cups-manpages.m4
-===================================================================
---- config-scripts/cups-manpages.m4 (Revision 10458)
-+++ config-scripts/cups-manpages.m4 (Arbeitskopie)
+--- a/config-scripts/cups-manpages.m4
++++ b/config-scripts/cups-manpages.m4
@@ -69,10 +69,10 @@
;;
Linux* | GNU* | Darwin*)
diff --git a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
index 2d7a77c..e71934b 100644
--- a/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
+++ b/net-print/cups/files/cups-1.6.0-fix-install-perms.patch
@@ -1,7 +1,5 @@
-Index: Makedefs.in
-===================================================================
---- Makedefs.in (Revision 10520)
-+++ Makedefs.in (Arbeitskopie)
+--- a/Makedefs.in
++++ b/Makedefs.in
@@ -40,14 +40,14 @@
# Installation programs...
#
diff --git a/net-print/cups/files/cupsd.init.d-r2 b/net-print/cups/files/cupsd.init.d-r2
new file mode 100644
index 0000000..7910a3c
--- /dev/null
+++ b/net-print/cups/files/cupsd.init.d-r2
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# $Id$
+
+description="The Common Unix Printing System daemon"
+command="/usr/sbin/cupsd"
+
+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
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2017-01-18 1:39 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2017-01-18 1:39 UTC (permalink / raw
To: gentoo-commits
commit: 042f087883338f72e1f335af8cb85c86159794cb
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 01:38:46 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 01:39:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042f0878
net-print/cups: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-print/cups/Manifest | 2 -
net-print/cups/cups-2.0.3.ebuild | 360 ---------------------
net-print/cups/cups-2.0.4.ebuild | 360 ---------------------
.../cups/files/cups-2.0.2-systemd-socket.patch | 60 ----
net-print/cups/files/cupsd.init.d-r1 | 26 --
5 files changed, 808 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c52e69a..8c7df15 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,5 +1,3 @@
-DIST cups-2.0.3-source.tar.bz2 8797220 SHA256 bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881 SHA512 fcc2be8d12cec624423a07706486afd226c9cb29b2ba694d63b8250c16a7d0f39aa51e6c831ca7c978ba5009e98b1daedad4b119a4f3287a88e21e48f0d07e18 WHIRLPOOL d12771b6d941db78854a1b05644a4402fa6a62f8acab1332c7490887e0099463b129684f4dd21b5e9f02e4f8e23bef633a06fca01ad8fa8b34de9298b72ab3ba
-DIST cups-2.0.4-source.tar.bz2 8799274 SHA256 e1d5e68d9f24faca317aeaebc164c34102813bc0f1d69c00b3a59b49c49f4abd SHA512 d0db3ce729ee893f260b69814343e84af4b934f1783d96049fcf58204a93ac534d0bf0c1626f5ac55371962419b91c857bd872f499e905223069b5103405c4ae WHIRLPOOL cbeb3f61cf534017180aa0d55f60ec81ac082f92d3626b18b4480aaf9e67b425b829ad260dfa1227ba56a79b52959f1e740848d26dc938fc9fc0159f1844a2bb
DIST cups-2.1.3-source.tar.bz2 8832400 SHA256 36a70d43584aea2617da914b9331e23341c3501a8254c4d2eae9c11ec01fd4d3 SHA512 5cc715b8521b4d6af29a97a8abf7a1b0973840c00727ee8e7926e89a4a9da8e67565d14cc4b57ab7cfb40b238d4faaed7608b9ab95947cc3671ed87b710f8f36 WHIRLPOOL 161c65b8adc3ab1c65208fe23bf14aefe5dfd84e9b162c69b1a8f977c3a4fc7c31ea92d0c2eaca3c276fa192596a31701052f0c2a1ffd213a09d48c11d446f6f
DIST cups-2.1.4.tar.gz 9572653 SHA256 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae WHIRLPOOL 217b9024c34369c8839b0a1b2b3924eb00e9b8d87cfd8d50a59ad0c33c1044f53d479246d67dff4598049efd15259def90e4bcddc6c3c20dff38811e159d2c4b
DIST cups-2.2.1.tar.gz 9485107 SHA256 e5864ac2f984a0f8dcb8c1e3a71740f8e4727da73944f93c7ef84adeccc1d971 SHA512 b7f10fcb0bbf1eb977d1568032f660ad4aedb25c0195fa133e1c5b365df8fc38170d9c3fcfeeac3e1a2541cba5ac7218ea17736c601802cffcfb446a4a578ce8 WHIRLPOOL 14080b7cf9791db12b462eb5a7d05cc4218560b0a95d2caedd1ca71996a524f3ad7ea0d65b14a14414a7359f15b112f8ba2d6f5fa489d6d3f5873a902c0cef4c
diff --git a/net-print/cups/cups-2.0.3.ebuild b/net-print/cups/cups-2.0.3.ebuild
deleted file mode 100644
index 7779af6..00000000
--- a/net-print/cups/cups-2.0.3.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib multilib-minimal pam python-single-r1 user versionator \
- java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="http://www.cups.org/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
- KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca cs de es fr it ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-CDEPEND="
- app-text/libpaper
- acl? (
- kernel_linux? (
- sys-apps/acl
- sys-apps/attr
- )
- )
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.6 )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- ssl? (
- >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-
-DEPEND="${CDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND="
- app-text/ghostscript-gpl[cups]
- app-text/poppler[utils]
- >=net-print/cups-filters-1.0.43
-"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/cups-config
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_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
- if use usb; then
- if linux_chkconfig_present USB_PRINTER; then
- eerror "Your usb printers will be managed via libusb. In this case, "
- eerror "${P} requires the USB_PRINTER support disabled."
- eerror "Please disable it:"
- eerror " CONFIG_USB_PRINTER=n"
- eerror "in /usr/src/linux/.config or"
- eerror " Device Drivers --->"
- eerror " USB support --->"
- eerror " [ ] USB Printer support"
- eerror "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() {
- base_src_prepare
- epatch_user
-
- # Remove ".SILENT" rule for verbose output (bug 524338).
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf=()
-
- if tc-is-static-only; then
- myconf+=(
- --disable-shared
- )
- fi
-
- # explicitly specify compiler wrt bug 524340
- #
- # need to override KRB5CONFIG for proper flags
- # https://www.cups.org/str.php?L4423
- econf \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-rundir="${EPREFIX}"/run/cups \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --with-system-groups=lpadmin \
- --with-xinetd=/etc/xinetd.d \
- $(multilib_native_use_enable acl) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable debug debug-guards) \
- $(use_enable debug debug-printfs) \
- $(multilib_native_use_with java) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable pam) \
- $(multilib_native_use_with python python "${PYTHON}") \
- $(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 \
- --without-perl \
- --without-php \
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
- "${myconf[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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
-}
-
-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}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- 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 || die "fperms failed"
- else
- # always configure with --with-xinetd= and clean up later,
- # bug #525604
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # create /etc/cups/client.conf, bug #196967 and #266678
- echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
- # the following files are now provided by cups-filters:
- rm -r "${ED}"/usr/share/cups/banners || die
- rm -r "${ED}"/usr/share/cups/data/testprint || die
-
- # the following are created by the init script
- rm -r "${ED}"/var/cache/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- # not slotted - at most one value
- if ! [[ "${REPLACING_VERSIONS}" ]]; then
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
- echo
- elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
- elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
- elog "You will have to find printers using zeroconf/avahi instead, enter"
- elog "the location manually, or run cups-browsed from net-print/cups-filters"
- elog "which re-adds that functionality as a separate daemon."
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
- ewarn
- ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
- ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
- ewarn
- fi
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/cups-2.0.4.ebuild b/net-print/cups/cups-2.0.4.ebuild
deleted file mode 100644
index 43e89a8..00000000
--- a/net-print/cups/cups-2.0.4.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib multilib-minimal pam python-single-r1 user versionator \
- java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="http://www.cups.org/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca cs de es fr it ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-CDEPEND="
- app-text/libpaper
- acl? (
- kernel_linux? (
- sys-apps/acl
- sys-apps/attr
- )
- )
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.6 )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- ssl? (
- >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-
-DEPEND="${CDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND="
- app-text/ghostscript-gpl[cups]
- app-text/poppler[utils]
- >=net-print/cups-filters-1.0.43
-"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.2-systemd-socket.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/cups-config
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_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
- if use usb; then
- if linux_chkconfig_present USB_PRINTER; then
- eerror "Your usb printers will be managed via libusb. In this case, "
- eerror "${P} requires the USB_PRINTER support disabled."
- eerror "Please disable it:"
- eerror " CONFIG_USB_PRINTER=n"
- eerror "in /usr/src/linux/.config or"
- eerror " Device Drivers --->"
- eerror " USB support --->"
- eerror " [ ] USB Printer support"
- eerror "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() {
- base_src_prepare
- epatch_user
-
- # Remove ".SILENT" rule for verbose output (bug 524338).
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf=()
-
- if tc-is-static-only; then
- myconf+=(
- --disable-shared
- )
- fi
-
- # explicitly specify compiler wrt bug 524340
- #
- # need to override KRB5CONFIG for proper flags
- # https://www.cups.org/str.php?L4423
- econf \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-rundir="${EPREFIX}"/run/cups \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --with-system-groups=lpadmin \
- --with-xinetd=/etc/xinetd.d \
- $(multilib_native_use_enable acl) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable debug debug-guards) \
- $(use_enable debug debug-printfs) \
- $(multilib_native_use_with java) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable pam) \
- $(multilib_native_use_with python python "${PYTHON}") \
- $(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 \
- --without-perl \
- --without-php \
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
- "${myconf[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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
-}
-
-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}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- 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 || die "fperms failed"
- else
- # always configure with --with-xinetd= and clean up later,
- # bug #525604
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # create /etc/cups/client.conf, bug #196967 and #266678
- echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
- # the following files are now provided by cups-filters:
- rm -r "${ED}"/usr/share/cups/banners || die
- rm -r "${ED}"/usr/share/cups/data/testprint || die
-
- # the following are created by the init script
- rm -r "${ED}"/var/cache/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- # not slotted - at most one value
- if ! [[ "${REPLACING_VERSIONS}" ]]; then
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
- echo
- elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
- elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
- elog "You will have to find printers using zeroconf/avahi instead, enter"
- elog "the location manually, or run cups-browsed from net-print/cups-filters"
- elog "which re-adds that functionality as a separate daemon."
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
- ewarn
- ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
- ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
- ewarn
- fi
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/files/cups-2.0.2-systemd-socket.patch b/net-print/cups/files/cups-2.0.2-systemd-socket.patch
deleted file mode 100644
index 6d8d60a..00000000
--- a/net-print/cups/files/cups-2.0.2-systemd-socket.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -up cups-2.0.2/cups/usersys.c.ustTJg cups-2.0.2/cups/usersys.c
---- cups-2.0.2/cups/usersys.c.ustTJg 2015-02-10 13:40:24.294545077 +0100
-+++ cups-2.0.2/cups/usersys.c 2015-02-10 13:46:56.763989233 +0100
-@@ -1017,7 +1017,7 @@ cups_finalize_client_conf(
- struct stat sockinfo; /* Domain socket information */
-
- if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
-- (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
- cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
- else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-2.0.2/scheduler/main.c.ustTJg cups-2.0.2/scheduler/main.c
---- cups-2.0.2/scheduler/main.c.ustTJg 2015-02-10 13:40:24.121547526 +0100
-+++ cups-2.0.2/scheduler/main.c 2015-02-10 13:40:24.295545063 +0100
-@@ -658,8 +658,15 @@ main(int argc, /* I - Number of comm
-
- #if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD)
- if (OnDemand)
-+ {
- cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
-- else
-+# ifdef HAVE_SYSTEMD
-+ sd_notifyf(0, "READY=1\n"
-+ "STATUS=Scheduler is running...\n"
-+ "MAINPID=%lu",
-+ (unsigned long) getpid());
-+# endif /* HAVE_SYSTEMD */
-+ } else
- #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
- if (fg)
- cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.path.in
---- cups-2.0.2/scheduler/org.cups.cupsd.path.in.ustTJg 2014-03-21 15:50:24.000000000 +0100
-+++ cups-2.0.2/scheduler/org.cups.cupsd.path.in 2015-02-10 13:40:24.295545063 +0100
-@@ -2,7 +2,7 @@
- Description=CUPS Scheduler
-
- [Path]
--PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-
- [Install]
- WantedBy=multi-user.target
-diff -up cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg cups-2.0.2/scheduler/org.cups.cupsd.service.in
---- cups-2.0.2/scheduler/org.cups.cupsd.service.in.ustTJg 2014-10-21 13:55:01.000000000 +0200
-+++ cups-2.0.2/scheduler/org.cups.cupsd.service.in 2015-02-10 13:40:24.296545049 +0100
-@@ -1,10 +1,11 @@
- [Unit]
- Description=CUPS Scheduler
- Documentation=man:cupsd(8)
-+After=network.target
-
- [Service]
- ExecStart=@sbindir@/cupsd -l
--Type=simple
-+Type=notify
-
- [Install]
- Also=org.cups.cupsd.socket org.cups.cupsd.path
diff --git a/net-print/cups/files/cupsd.init.d-r1 b/net-print/cups/files/cupsd.init.d-r1
deleted file mode 100644
index b8b913d..00000000
--- a/net-print/cups/files/cupsd.init.d-r1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
- use net
- @neededservices@
- before nfs
- after logger
-}
-
-start() {
- ebegin "Starting cupsd"
-
- 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
-
- start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
- eend $?
-}
-
-stop() {
- ebegin "Stopping cupsd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
- eend $?
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2017-01-19 2:44 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2017-01-19 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 7ee57377c41da4814963ba9a162d03bc466448d8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 02:43:30 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 02:43:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee57377
net-print/cups: Revbump to fix cupsd startup error with USE="-kerberos".
This fixes Gentoo bug #606472.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{cups-2.2.2.ebuild => cups-2.2.2-r1.ebuild} | 6 +++
.../cups/files/cups-2.2.2-no_kerberos_config.patch | 57 ++++++++++++++++++++++
2 files changed, 63 insertions(+)
diff --git a/net-print/cups/cups-2.2.2.ebuild b/net-print/cups/cups-2.2.2-r1.ebuild
similarity index 99%
rename from net-print/cups/cups-2.2.2.ebuild
rename to net-print/cups/cups-2.2.2-r1.ebuild
index 047d637..0e8b61d 100644
--- a/net-print/cups/cups-2.2.2.ebuild
+++ b/net-print/cups/cups-2.2.2-r1.ebuild
@@ -145,6 +145,12 @@ pkg_setup() {
}
src_prepare() {
+ if ! use kerberos ; then
+ PATCHES+=(
+ "${FILESDIR}/${PN}-2.2.2-no_kerberos_config.patch"
+ )
+ fi
+
default
# Remove ".SILENT" rule for verbose output (bug 524338).
diff --git a/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch b/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch
new file mode 100644
index 00000000..a26b399
--- /dev/null
+++ b/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch
@@ -0,0 +1,57 @@
+Don't add kerberos policies into cupsd config when no kerberos support was
+compiled in.
+
+https://bugs.gentoo.org/606472
+
+--- cups-2.2.2/conf/cupsd.conf.in
++++ cups-2.2.2/conf/cupsd.conf.in
+@@ -134,49 +134,3 @@
+ Order deny,allow
+ </Limit>
+ </Policy>
+-
+-# Set the kerberized printer/job policies...
+-<Policy kerberos>
+- # Job/subscription privacy...
+- JobPrivateAccess default
+- JobPrivateValues default
+- SubscriptionPrivateAccess default
+- SubscriptionPrivateValues default
+-
+- # Job-related operations must be done by the owner or an administrator...
+- <Limit Create-Job Print-Job Print-URI Validate-Job>
+- AuthType Negotiate
+- Order deny,allow
+- </Limit>
+-
+- <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
+- AuthType Negotiate
+- Require user @OWNER @SYSTEM
+- Order deny,allow
+- </Limit>
+-
+- # All administration operations require an administrator to authenticate...
+- <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
+- AuthType Default
+- Require user @SYSTEM
+- Order deny,allow
+- </Limit>
+-
+- # All printer operations require a printer operator to authenticate...
+- <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
+- AuthType Default
+- Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+- Order deny,allow
+- </Limit>
+-
+- # Only the owner or an administrator can cancel or authenticate a job...
+- <Limit Cancel-Job CUPS-Authenticate-Job>
+- AuthType Negotiate
+- Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
+- Order deny,allow
+- </Limit>
+-
+- <Limit All>
+- Order deny,allow
+- </Limit>
+-</Policy>
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2017-06-30 21:49 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2017-06-30 21:49 UTC (permalink / raw
To: gentoo-commits
commit: cdbe640f476bba5820955c25f7ed5c19a26c28db
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 21:49:11 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 21:49:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbe640f
net-print/cups: Removed old.
Fixed live ebuild.
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-print/cups/Manifest | 1 -
net-print/cups/cups-2.2.2-r1.ebuild | 352 --------------------
net-print/cups/cups-2.2.2-r2.ebuild | 347 --------------------
net-print/cups/cups-2.2.2-r3.ebuild | 353 ---------------------
net-print/cups/cups-9999.ebuild | 9 +-
.../cups/files/cups-2.2.2-no_kerberos_config.patch | 57 ----
6 files changed, 1 insertion(+), 1118 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index ecf1c7b02ab..a2cc1d96677 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,4 +1,3 @@
DIST cups-2.1.4.tar.gz 9572653 SHA256 1f182f145489e2454969b221056b6b9bac2beb4e38cd75fa12a9ec15d24d5301 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae WHIRLPOOL 217b9024c34369c8839b0a1b2b3924eb00e9b8d87cfd8d50a59ad0c33c1044f53d479246d67dff4598049efd15259def90e4bcddc6c3c20dff38811e159d2c4b
-DIST cups-2.2.2.tar.gz 9489493 SHA256 5e7b396b41f55231dde8dd0465cdd81583cd47ecffe4960c777162fbe3cce03c SHA512 98640b62f706609bbe703318999efb8f78c747e751aafaa1a6f38f4f0dca6fad84ec7e1dfbe9ce17b02ba2ac3fd6e8e480582be5c2cee8eaa707c0ca7eb1978f WHIRLPOOL 745c80114dcac1ed61eec8a8d903ced0d005ec0ad2c05883dcb0aaf9afaf1c410801245ef6bdcb5b77f09a9d96f90e2f94d553b4a19d9425d4005738c8508feb
DIST cups-2.2.3.tar.gz 9496214 SHA256 7aa7e8d581f0eb204f75203082403bfa931f8c058bffae71b210800102e5feb5 SHA512 95d8f18fad5b3fd25fe88cc29d159723dcfa735248503d0285949fcd7451f0ccac286719077d0f8a8eda7ee9a053a3d30fa3fd28cb74b59336b6718552d9d2e8 WHIRLPOOL 3aa43f1b83ee62939939bd148c2ab13985143746f7acc3d9c82283e1b096524c7738ae5e1670e717c9329f8d3e917cfcc1c8a7e33af93baa74ea83837d92b5f9
DIST cups-2.2.4.tar.gz 9984903 SHA256 339fb0c0a70a1edf1ef169f2afb21bab92cdd3074adf630352c427b795f20fa7 SHA512 765fe49d1a7a491d7d5db051f73d039d183d0f7a560e9fd89f6732b8a699d3246080e1aaed4ddfed3a9fbdb876b09aa22939d6ee5da2280b1246e4ba933c55f0 WHIRLPOOL 86557f6244b7aa7b19cc67caff7c845291d09699353bd337090111f92b6afb6b9e175ca68df8a15d8915a5a15fd72348805e4ecb7da532a994f46b2c2d4cdada
diff --git a/net-print/cups/cups-2.2.2-r1.ebuild b/net-print/cups/cups-2.2.2-r1.ebuild
deleted file mode 100644
index 1d638596782..00000000000
--- a/net-print/cups/cups-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib multilib-minimal pam python-single-r1 user versionator \
- java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="http://www.cups.org/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca cs de es fr it ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-CDEPEND="
- 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}] )
- java? ( >=virtual/jre-1.6:* )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- ssl? (
- >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-
-DEPEND="${CDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/cups-config
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_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
- #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() {
- if ! use kerberos ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-2.2.2-no_kerberos_config.patch"
- )
- fi
-
- default
-
- # Remove ".SILENT" rule for verbose output (bug 524338).
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf=()
-
- if tc-is-static-only; then
- myconf+=(
- --disable-shared
- )
- fi
-
- # explicitly specify compiler wrt bug 524340
- #
- # need to override KRB5CONFIG for proper flags
- # https://www.cups.org/str.php?L4423
- econf \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-rundir="${EPREFIX}"/run/cups \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --with-system-groups=lpadmin \
- --with-xinetd=/etc/xinetd.d \
- $(multilib_native_use_enable acl) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable debug debug-guards) \
- $(use_enable debug debug-printfs) \
- $(multilib_native_use_with java) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable pam) \
- $(multilib_native_use_with python python "${PYTHON}") \
- $(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 \
- --without-perl \
- --without-php \
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
- "${myconf[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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
-}
-
-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}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- 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 || die "fperms failed"
- else
- # always configure with --with-xinetd= and clean up later,
- # bug #525604
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # 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/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- # not slotted - at most one value
- if ! [[ "${REPLACING_VERSIONS}" ]]; then
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
- echo
- elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
- elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
- elog "You will have to find printers using zeroconf/avahi instead, enter"
- elog "the location manually, or run cups-browsed from net-print/cups-filters"
- elog "which re-adds that functionality as a separate daemon."
- echo
- fi
-
- if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
- ewarn
- ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
- ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
- ewarn
- fi
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/cups-2.2.2-r2.ebuild b/net-print/cups/cups-2.2.2-r2.ebuild
deleted file mode 100644
index 615f690c477..00000000000
--- a/net-print/cups/cups-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib multilib-minimal pam python-single-r1 user versionator \
- java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/apple/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca cs de es fr it ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-CDEPEND="
- 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}] )
- java? ( >=virtual/jre-1.6:* )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- ssl? (
- >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-
-DEPEND="${CDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/cups-config
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_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
- #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() {
- if ! use kerberos ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-2.2.2-no_kerberos_config.patch"
- )
- fi
-
- default
-
- # Remove ".SILENT" rule for verbose output (bug 524338).
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf=()
-
- if tc-is-static-only; then
- myconf+=(
- --disable-shared
- )
- fi
-
- # explicitly specify compiler wrt bug 524340
- #
- # need to override KRB5CONFIG for proper flags
- # https://www.cups.org/str.php?L4423
- econf \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-rundir="${EPREFIX}"/run/cups \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --with-system-groups=lpadmin \
- --with-xinetd=/etc/xinetd.d \
- $(multilib_native_use_enable acl) \
- $(use_enable dbus) \
- $(use_enable debug) \
- $(use_enable debug debug-guards) \
- $(use_enable debug debug-printfs) \
- $(multilib_native_use_with java) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable pam) \
- $(multilib_native_use_with python python "${PYTHON}") \
- $(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 \
- --without-perl \
- --without-php \
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
- "${myconf[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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
-}
-
-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}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- 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 || die "fperms failed"
- else
- # always configure with --with-xinetd= and clean up later,
- # bug #525604
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # 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/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- local v
-
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.2.2-r2 ${v}; then
- echo
- 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"
- echo
- break
- fi
- done
-
- for v in ${REPLACING_VERSIONS}; do
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- break
- done
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/cups-2.2.2-r3.ebuild b/net-print/cups/cups-2.2.2-r3.ebuild
deleted file mode 100644
index 75fc53e6da9..00000000000
--- a/net-print/cups/cups-2.2.2-r3.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools fdo-mime gnome2-utils flag-o-matic linux-info \
- multilib multilib-minimal pam python-single-r1 user versionator \
- java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/apple/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-LANGS="ca cs de es fr it ja ru"
-for X in ${LANGS} ; do
- IUSE="${IUSE} +linguas_${X}"
-done
-
-CDEPEND="
- 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}] )
- java? ( >=virtual/jre-1.6:* )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- ssl? (
- >=net-libs/gnutls-2.12.23-r6[${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[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-
-DEPEND="${CDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/cups-config
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_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
- #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() {
- if ! use kerberos ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-2.2.2-no_kerberos_config.patch"
- )
- fi
-
- default
-
- # Remove ".SILENT" rule for verbose output (bug 524338).
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LANGS=\"${LANGS}\"
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myconf=()
-
- if tc-is-static-only; then
- myconf+=(
- --disable-shared
- )
- fi
-
- # explicitly specify compiler wrt bug 524340
- #
- # need to override KRB5CONFIG for proper flags
- # https://www.cups.org/str.php?L4423
- econf \
- CC="$(tc-getCC)" \
- CXX="$(tc-getCXX)" \
- KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --localstatedir="${EPREFIX}"/var \
- --with-rundir="${EPREFIX}"/run/cups \
- --with-cups-user=lp \
- --with-cups-group=lp \
- --with-docdir="${EPREFIX}"/usr/share/cups/html \
- --with-languages="${LINGUAS}" \
- --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) \
- $(multilib_native_use_with java) \
- $(use_enable kerberos gssapi) \
- $(multilib_native_use_enable pam) \
- $(multilib_native_use_with python python "${PYTHON}") \
- $(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 \
- --without-perl \
- --without-php \
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) \
- "${myconf[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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 -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die
- sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die
- sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die
- sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" 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}.txt
-
- # move the default config file to docs
- dodoc "${ED}"/etc/cups/cupsd.conf.default
- rm -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- 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 || die "fperms failed"
- else
- # always configure with --with-xinetd= and clean up later,
- # bug #525604
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # 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/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-
- local v
-
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.2.2-r2 ${v}; then
- echo
- 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"
- echo
- break
- fi
- done
-
- for v in ${REPLACING_VERSIONS}; do
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- break
- done
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- fdo-mime_desktop_database_update
-}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 75fc53e6da9..575a7911181 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -88,11 +88,10 @@ RESTRICT="test"
# systemd-socket.patch from Fedora
PATCHES=(
"${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+ "${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.0.3-cross-compile.patch"
)
MULTILIB_CHOST_TOOLS=(
@@ -139,12 +138,6 @@ pkg_setup() {
}
src_prepare() {
- if ! use kerberos ; then
- PATCHES+=(
- "${FILESDIR}/${PN}-2.2.2-no_kerberos_config.patch"
- )
- fi
-
default
# Remove ".SILENT" rule for verbose output (bug 524338).
diff --git a/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch b/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch
deleted file mode 100644
index a26b3995c52..00000000000
--- a/net-print/cups/files/cups-2.2.2-no_kerberos_config.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Don't add kerberos policies into cupsd config when no kerberos support was
-compiled in.
-
-https://bugs.gentoo.org/606472
-
---- cups-2.2.2/conf/cupsd.conf.in
-+++ cups-2.2.2/conf/cupsd.conf.in
-@@ -134,49 +134,3 @@
- Order deny,allow
- </Limit>
- </Policy>
--
--# Set the kerberized printer/job policies...
--<Policy kerberos>
-- # Job/subscription privacy...
-- JobPrivateAccess default
-- JobPrivateValues default
-- SubscriptionPrivateAccess default
-- SubscriptionPrivateValues default
--
-- # Job-related operations must be done by the owner or an administrator...
-- <Limit Create-Job Print-Job Print-URI Validate-Job>
-- AuthType Negotiate
-- Order deny,allow
-- </Limit>
--
-- <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
-- AuthType Negotiate
-- Require user @OWNER @SYSTEM
-- Order deny,allow
-- </Limit>
--
-- # All administration operations require an administrator to authenticate...
-- <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default>
-- AuthType Default
-- Require user @SYSTEM
-- Order deny,allow
-- </Limit>
--
-- # All printer operations require a printer operator to authenticate...
-- <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After Cancel-Jobs CUPS-Accept-Jobs CUPS-Reject-Jobs>
-- AuthType Default
-- Require user @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
-- Order deny,allow
-- </Limit>
--
-- # Only the owner or an administrator can cancel or authenticate a job...
-- <Limit Cancel-Job CUPS-Authenticate-Job>
-- AuthType Negotiate
-- Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
-- Order deny,allow
-- </Limit>
--
-- <Limit All>
-- Order deny,allow
-- </Limit>
--</Policy>
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2018-03-28 7:42 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2018-03-28 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 22db82bdc2c2c3fe25d7f4ba2c8cccf0bc60e378
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 07:40:46 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 07:42:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22db82bd
net-print/cups: Removed old.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-print/cups/Manifest | 1 -
net-print/cups/cups-2.2.4.ebuild | 343 ---------------------
.../cups/files/cups-2.2.4-fix-install-perms.patch | 18 --
3 files changed, 362 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d315b7bf4f3..f7af1802a7a 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,4 +1,3 @@
DIST cups-2.1.4.tar.gz 9572653 BLAKE2B d01242e8188f8b179e2beebc3730cc32588c4512e56e76be740f6a3e63411f277a6e9b241b27cfa12d3b26743ad9ef6e85f70f66e19d4f4c70593707b1bbaec1 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae
-DIST cups-2.2.4.tar.gz 9984903 BLAKE2B c605c4c9a6b7ae8be5b33392980f18c95bd22e83e2b6707de59accb4b7649c92ca7bc46c747253096e22d07dd8e54c970b787c35fa235bb89d7f5179aadf1474 SHA512 765fe49d1a7a491d7d5db051f73d039d183d0f7a560e9fd89f6732b8a699d3246080e1aaed4ddfed3a9fbdb876b09aa22939d6ee5da2280b1246e4ba933c55f0
DIST cups-2.2.6.tar.gz 10317889 BLAKE2B 5d9d8a09e73074a8638913c30e163cbed6bbadc4fa0c6b24dd185a2137f3af72aba553b3de62dbf053f9f92f7737efdb5d06e27bfb84225f39d855d830aea02e SHA512 ae880aa3f675e0c1ad269200d06be3c25675a45a697c7a8b44e6ec0c30f05f333acca35cd965e667ff066d753df5e59447c2eeaea240e72d2731690b3b9dcf76
DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e
diff --git a/net-print/cups/cups-2.2.4.ebuild b/net-print/cups/cups-2.2.4.ebuild
deleted file mode 100644
index 012595d890a..00000000000
--- a/net-print/cups/cups-2.2.4.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \
- multilib multilib-minimal pam python-single-r1 user versionator \
- java-pkg-opt-2 systemd toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/apple/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug java kerberos lprng-compat pam
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
- 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}] )
- java? ( >=virtual/jre-1.6:* )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- !lprng-compat? ( !net-print/lprng )
- pam? ( virtual/pam )
- python? ( ${PYTHON_DEPS} )
- 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[${MULTILIB_USEDEP}] )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-
-DEPEND="${CDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch"
- "${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/cups-config
-)
-
-pkg_setup() {
- enewgroup lp
- enewuser lp -1 -1 -1 lp
- enewgroup lpadmin 106
-
- use python && python-single-r1_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
- #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 "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- AT_M4DIR=config-scripts eaclocal
- eautoconf
-
- # custom Makefiles
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- export DSOFLAGS="${LDFLAGS}"
-
- einfo LINGUAS=\"${LINGUAS}\"
-
- local myeconfargs=()
-
- # explicitly specify compiler wrt bug 524340
- #
- # need to override KRB5CONFIG for proper flags
- # https://github.com/apple/cups/issues/4423
- 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-languages="${LINGUAS}"
- --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)
- $(multilib_native_use_with java)
- $(use_enable kerberos gssapi)
- $(multilib_native_use_enable pam)
- $(multilib_native_use_with python python "${PYTHON}")
- $(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
- --without-perl
- --without-php
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
- )
-
- if tc-is-static-only; then
- myeconfargs+=(
- --disable-shared
- )
- fi
-
- econf "${myeconfargs[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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 -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die
- sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die
- sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die
- sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" 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 -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices
- use zeroconf && neededservices+=" avahi-daemon"
- use dbus && neededservices+=" dbus"
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
- cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/$neededservices/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- # install our pam script
- pamd_mimic_system cups auth account
-
- 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 || die "fperms failed"
- else
- # always configure with --with-xinetd= and clean up later,
- # bug #525604
- rm -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- keepdir /etc/cups/{interfaces,ppd,ssl}
-
- use X || rm -r "${ED}"/usr/share/applications
-
- # 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/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- xdg_desktop_database_update
-
- local v
-
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.2.2-r2 ${v}; then
- echo
- 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"
- echo
- break
- fi
- done
-
- for v in ${REPLACING_VERSIONS}; do
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- break
- done
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch b/net-print/cups/files/cups-2.2.4-fix-install-perms.patch
deleted file mode 100644
index b9fda922d2c..00000000000
--- a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cups-2.2.4/Makedefs.in
-+++ cups-2.2.4/Makedefs.in
-@@ -39,12 +39,12 @@
- #
-
- INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA = $(INSTALL) -c -m 444
-+INSTALL_DATA = $(INSTALL) -c -m 644
- INSTALL_DIR = $(INSTALL) -d
- INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_MAN = $(INSTALL) -c -m 444
-+INSTALL_MAN = $(INSTALL) -c -m 644
- INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
-
- #
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2018-03-29 8:00 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2018-03-29 8:00 UTC (permalink / raw
To: gentoo-commits
commit: c72b59a9ebc037c22bbc10bf2e50543f3351cd23
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 08:00:16 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 08:00:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c72b59a9
net-print/cups: Fixed compilation with USE="-pam".
Closes: https://bugs.gentoo.org/651878
Package-Manager: Portage-2.3.26, Repoman-2.3.7
net-print/cups/cups-2.2.7.ebuild | 1 +
net-print/cups/files/cups-2.3_rc1-no_pam.patch | 164 +++++++++++++++++++++++++
2 files changed, 165 insertions(+)
diff --git a/net-print/cups/cups-2.2.7.ebuild b/net-print/cups/cups-2.2.7.ebuild
index 873f91da5e3..23b3b6a01ce 100644
--- a/net-print/cups/cups-2.2.7.ebuild
+++ b/net-print/cups/cups-2.2.7.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.3_rc1-no_pam.patch" #651878
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.3_rc1-no_pam.patch b/net-print/cups/files/cups-2.3_rc1-no_pam.patch
new file mode 100644
index 00000000000..17e69ab7b0a
--- /dev/null
+++ b/net-print/cups/files/cups-2.3_rc1-no_pam.patch
@@ -0,0 +1,164 @@
+From 3cd7b5e053f8100da1ca8d8daf93976cca3516ef Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Fri, 23 Feb 2018 13:21:56 -0500
+Subject: [PATCH] Fix builds without PAM (Issue #5253)
+
+--- a/scheduler/auth.c
++++ b/scheduler/auth.c
+@@ -67,9 +68,6 @@ static int check_authref(cupsd_client_t *con, const char *right);
+ static int compare_locations(cupsd_location_t *a,
+ cupsd_location_t *b);
+ static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data);
+-#if !HAVE_LIBPAM
+-static char *cups_crypt(const char *pw, const char *salt);
+-#endif /* !HAVE_LIBPAM */
+ static void free_authmask(cupsd_authmask_t *am, void *data);
+ #if HAVE_LIBPAM
+ static int pam_func(int, const struct pam_message **,
+@@ -690,14 +688,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */
+ * client...
+ */
+
+- pass = cups_crypt(password, pw->pw_passwd);
++ pass = crypt(password, pw->pw_passwd);
+
+ if (!pass || strcmp(pw->pw_passwd, pass))
+ {
+ # ifdef HAVE_SHADOW_H
+ if (spw)
+ {
+- pass = cups_crypt(password, spw->sp_pwdp);
++ pass = crypt(password, spw->sp_pwdp);
+
+ if (pass == NULL || strcmp(spw->sp_pwdp, pass))
+ {
+@@ -1991,129 +1989,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */
+ }
+
+
+-#if !HAVE_LIBPAM
+-/*
+- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
+- * as needed.
+- */
+-
+-static char * /* O - Encrypted password */
+-cups_crypt(const char *pw, /* I - Password string */
+- const char *salt) /* I - Salt (key) string */
+-{
+- if (!strncmp(salt, "$1$", 3))
+- {
+- /*
+- * Use MD5 passwords without the benefit of PAM; this is for
+- * Slackware Linux, and the algorithm was taken from the
+- * old shadow-19990827/lib/md5crypt.c source code... :(
+- */
+-
+- int i; /* Looping var */
+- unsigned long n; /* Output number */
+- int pwlen; /* Length of password string */
+- const char *salt_end; /* End of "salt" data for MD5 */
+- char *ptr; /* Pointer into result string */
+- _cups_md5_state_t state; /* Primary MD5 state info */
+- _cups_md5_state_t state2; /* Secondary MD5 state info */
+- unsigned char digest[16]; /* MD5 digest result */
+- static char result[120]; /* Final password string */
+-
+-
+- /*
+- * Get the salt data between dollar signs, e.g. $1$saltdata$md5.
+- * Get a maximum of 8 characters of salt data after $1$...
+- */
+-
+- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++)
+- if (*salt_end == '$')
+- break;
+-
+- /*
+- * Compute the MD5 sum we need...
+- */
+-
+- pwlen = strlen(pw);
+-
+- _cupsMD5Init(&state);
+- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
+- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt);
+-
+- _cupsMD5Init(&state2);
+- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
+- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3);
+- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen);
+- _cupsMD5Finish(&state2, digest);
+-
+- for (i = pwlen; i > 0; i -= 16)
+- _cupsMD5Append(&state, digest, i > 16 ? 16 : i);
+-
+- for (i = pwlen; i > 0; i >>= 1)
+- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1);
+-
+- _cupsMD5Finish(&state, digest);
+-
+- for (i = 0; i < 1000; i ++)
+- {
+- _cupsMD5Init(&state);
+-
+- if (i & 1)
+- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
+- else
+- _cupsMD5Append(&state, digest, 16);
+-
+- if (i % 3)
+- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3);
+-
+- if (i % 7)
+- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
+-
+- if (i & 1)
+- _cupsMD5Append(&state, digest, 16);
+- else
+- _cupsMD5Append(&state, (unsigned char *)pw, pwlen);
+-
+- _cupsMD5Finish(&state, digest);
+- }
+-
+- /*
+- * Copy the final sum to the result string and return...
+- */
+-
+- memcpy(result, salt, (size_t)(salt_end - salt));
+- ptr = result + (salt_end - salt);
+- *ptr++ = '$';
+-
+- for (i = 0; i < 5; i ++, ptr += 4)
+- {
+- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8);
+-
+- if (i < 4)
+- n |= (unsigned)digest[i + 12];
+- else
+- n |= (unsigned)digest[5];
+-
+- to64(ptr, n, 4);
+- }
+-
+- to64(ptr, (unsigned)digest[11], 2);
+- ptr += 2;
+- *ptr = '\0';
+-
+- return (result);
+- }
+- else
+- {
+- /*
+- * Use the standard crypt() function...
+- */
+-
+- return (crypt(pw, salt));
+- }
+-}
+-#endif /* !HAVE_LIBPAM */
+-
+-
+ /*
+ * 'free_authmask()' - Free function for auth masks.
+ */
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2018-06-11 13:26 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2018-06-11 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 19a3c009970d2a917d4dbf7489508e1ebe41aec0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 13:24:52 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 13:26:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a3c009
net-print/cups: Revbumps to fix high system load. Removed old.
Bug: https://bugs.gentoo.org/657526
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../{cups-2.2.8.ebuild => cups-2.2.8-r1.ebuild} | 1 +
...s-2.3_beta5.ebuild => cups-2.3_beta5-r1.ebuild} | 1 +
.../cups/files/cups-2.2.8-validation_fixes.patch | 60 ++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/net-print/cups/cups-2.2.8.ebuild b/net-print/cups/cups-2.2.8-r1.ebuild
similarity index 99%
rename from net-print/cups/cups-2.2.8.ebuild
rename to net-print/cups/cups-2.2.8-r1.ebuild
index 55a2084618d..d9adea70fc4 100644
--- a/net-print/cups/cups-2.2.8.ebuild
+++ b/net-print/cups/cups-2.2.8-r1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.2.8-validation_fixes.patch" #657526
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/cups-2.3_beta5.ebuild b/net-print/cups/cups-2.3_beta5-r1.ebuild
similarity index 99%
rename from net-print/cups/cups-2.3_beta5.ebuild
rename to net-print/cups/cups-2.3_beta5-r1.ebuild
index 608055933fa..ee8375c1474 100644
--- a/net-print/cups/cups-2.3_beta5.ebuild
+++ b/net-print/cups/cups-2.3_beta5-r1.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.2.8-validation_fixes.patch" #657526
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.2.8-validation_fixes.patch b/net-print/cups/files/cups-2.2.8-validation_fixes.patch
new file mode 100644
index 00000000000..ef87b6a81d8
--- /dev/null
+++ b/net-print/cups/files/cups-2.2.8-validation_fixes.patch
@@ -0,0 +1,60 @@
+From 455c52a027ab3548953372a0b7bdb0008420e9ba Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Fri, 8 Jun 2018 22:29:50 +0200
+Subject: [PATCH] Fix validation rejecting all NAME and TEXT attrs
+
+When the UTF-8 validation loop finishes successfully, `*ptr` points at
+the `'\0'` at the end of the string. The code misinterpreted this as a
+control character (`*ptr < ' '`) and failed the validation.
+
+Fixes https://github.com/apple/cups/issues/5325
+---
+ cups/ipp.c | 24 ++++++++++--------------
+ 1 file changed, 10 insertions(+), 14 deletions(-)
+
+diff --git a/cups/ipp.c b/cups/ipp.c
+index 95d53cc44..204c71fcd 100644
+--- a/cups/ipp.c
++++ b/cups/ipp.c
+@@ -5030,15 +5030,13 @@ ippValidateAttribute(
+ else if (*ptr & 0x80)
+ break;
+ else if ((*ptr < ' ' && *ptr != '\n' && *ptr != '\r' && *ptr != '\t') || *ptr == 0x7f)
+- break;
++ {
++ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
++ return (0);
++ }
+ }
+
+- if (*ptr < ' ' || *ptr == 0x7f)
+- {
+- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
+- return (0);
+- }
+- else if (*ptr)
++ if (*ptr)
+ {
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
+ return (0);
+@@ -5088,15 +5086,13 @@ ippValidateAttribute(
+ else if (*ptr & 0x80)
+ break;
+ else if (*ptr < ' ' || *ptr == 0x7f)
+- break;
++ {
++ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
++ return (0);
++ }
+ }
+
+- if (*ptr < ' ' || *ptr == 0x7f)
+- {
+- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
+- return (0);
+- }
+- else if (*ptr)
++ if (*ptr)
+ {
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
+ return (0);
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2018-12-08 12:27 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2018-12-08 12:27 UTC (permalink / raw
To: gentoo-commits
commit: 8fb600024921589ab9b1179523e8eb60057ca9c2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 12:26:04 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 12:27:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb60002
net-print/cups: Security bump to versions 2.2.10 and 2.3_beta6
Fixes for CVE-2018-4700
Removed old beta release.
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-print/cups/Manifest | 3 +-
...cups-2.3_beta5-r1.ebuild => cups-2.2.10.ebuild} | 29 +++++----
...s-2.3_beta5-r1.ebuild => cups-2.3_beta6.ebuild} | 4 +-
.../files/cups-2.3_beta5-validation_fixes.patch | 69 ----------------------
.../files/cups-2.3_beta6-usage_argument_fix.patch | 38 ++++++++++++
5 files changed, 59 insertions(+), 84 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4a79a309841..28e73772df4 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,4 +1,5 @@
+DIST cups-2.2.10-source.tar.gz 10403568 BLAKE2B 42937088758893772545fff7bbfbf4610ae34764b1e962110b7ea88940ddcba92376e55f4665b9815278de566daec07190ad78e5f2b1e37f905447a7fd17bf4e SHA512 1393987a263ebf20089dd3008ae4ed770a27a1f289032604eb9e18f2e863bd0e4215a70118f5a6d3940875625278b6798fbc9070e791ec559179c6cf7dc7b05f
DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e
DIST cups-2.2.8-source.tar.gz 10374921 BLAKE2B 3fc4d5cae3848cbb7fb1263b377210254dfa08d70a1218c7f20d5a277d0536791e071c50bac282ab2049e1cffddfe91438216ceb37ec279d7cb0ec7b57a315da SHA512 6ed44c5e6f1c46c85b06691713ce476330c93834243720ad2c04fa983e20cde9f6ebfc2eb2ba8bb3700f11320471b99856d6402d3641038da690f89c49fbd261
DIST cups-2.2.9-source.tar.gz 10402885 BLAKE2B 6736a2f5efa6ee8eadeea6620b5750e16e3be2e1c46d6f5821146d21078d10cda8e993b111ae326863db93d0c36e55c26d1c91140f8a518759111bafc9c93996 SHA512 423d2a215a115d5f78ce73118e8a2e566662e5d7f8acbffea39e1bfefb2f48f94841c8b85d731b0786b682dc579df8dfb5508570225b5205a182fbb2cd6dd2a5
-DIST cups-2.3b5-source.tar.gz 10176856 BLAKE2B beda07a64ef463371e4e1f25b397caa9487f7acdc982fcfa7edee736a41f6a6875747c772e4c59e2d2746c8c508a0cc87f8608227592f5e1d9c8c48d956ab97c SHA512 48d45f090637bf32bdcc83106272efb8462ff609f74fbe4e82add7f851dcb9173126a1df186848c087d02e8c1441f31a70859faf2714b6ddb1f3738ef8dba60d
+DIST cups-2.3b6-source.tar.gz 10240934 BLAKE2B 16b7381617d97d5c68e7bdf971b2cbc81c8f33208e408e051fce9770cffebed3a9337296d3e9f95a9f0a4e76cffe3201b99207f83169b8397d11455964178f4f SHA512 f9f79bbc694e4bb4f37906f6dffad7c5067d86e07878ca73953ebf519d2637c23fded18646bd086cbd397e49de6b629fe9323f57ccfb2c9bf912c3bfd20b345e
diff --git a/net-print/cups/cups-2.3_beta5-r1.ebuild b/net-print/cups/cups-2.2.10.ebuild
similarity index 92%
copy from net-print/cups/cups-2.3_beta5-r1.ebuild
copy to net-print/cups/cups-2.2.10.ebuild
index f7c6d292fae..b5fcaa92de9 100644
--- a/net-print/cups/cups-2.3_beta5-r1.ebuild
+++ b/net-print/cups/cups-2.2.10.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam user systemd toolchain-funcs
+inherit autotools eapi7-ver gnome2-utils flag-o-matic linux-info xdg-utils multilib multilib-minimal pam python-single-r1 user java-pkg-opt-2 systemd toolchain-funcs
+MY_P="${P/_rc/rc}"
+MY_P="${MY_P/_beta/b}"
MY_PV="${PV/_rc/rc}"
MY_PV="${MY_PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
@@ -19,18 +20,16 @@ if [[ ${PV} == *9999 ]]; then
fi
else
#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
- if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
- fi
+ SRC_URI="https://github.com/apple/cups/releases/download/v${PV}/${P}-source.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
fi
DESCRIPTION="The Common Unix Printing System"
HOMEPAGE="https://www.cups.org/"
-LICENSE="Apache-2.0"
+LICENSE="GPL-2"
SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug java kerberos lprng-compat pam python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
CDEPEND="
app-text/libpaper
@@ -42,9 +41,11 @@ CDEPEND="
)
)
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jre-1.6:* )
kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
!lprng-compat? ( !net-print/lprng )
pam? ( virtual/pam )
+ python? ( ${PYTHON_DEPS} )
ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd )
usb? ( virtual/libusb:1 )
@@ -64,6 +65,7 @@ RDEPEND="${CDEPEND}
PDEPEND=">=net-print/cups-filters-1.0.43"
REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
usb? ( threads )
"
@@ -77,20 +79,19 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${P}-validation_fixes.patch" #657526
)
MULTILIB_CHOST_TOOLS=(
/usr/bin/cups-config
)
-S="${WORKDIR}/${MY_P}"
-
pkg_setup() {
enewgroup lp
enewuser lp -1 -1 -1 lp
enewgroup lpadmin 106
+ use python && python-single-r1_pkg_setup
+
if use kernel_linux; then
linux-info_pkg_setup
if ! linux_config_exists; then
@@ -167,8 +168,10 @@ multilib_src_configure() {
$(use_enable debug)
$(use_enable debug debug-guards)
$(use_enable debug debug-printfs)
+ $(multilib_native_use_with java)
$(use_enable kerberos gssapi)
$(multilib_native_use_enable pam)
+ $(multilib_native_use_with python python "${PYTHON}")
$(use_enable static-libs static)
$(use_enable threads)
$(use_enable ssl gnutls)
@@ -176,6 +179,8 @@ multilib_src_configure() {
$(multilib_native_use_enable usb libusb)
$(use_enable zeroconf avahi)
--disable-dnssd
+ --without-perl
+ --without-php
$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
)
diff --git a/net-print/cups/cups-2.3_beta5-r1.ebuild b/net-print/cups/cups-2.3_beta6.ebuild
similarity index 99%
rename from net-print/cups/cups-2.3_beta5-r1.ebuild
rename to net-print/cups/cups-2.3_beta6.ebuild
index f7c6d292fae..4801eaf8b9a 100644
--- a/net-print/cups/cups-2.3_beta5-r1.ebuild
+++ b/net-print/cups/cups-2.3_beta6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -77,7 +77,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${P}-validation_fixes.patch" #657526
+ "${FILESDIR}/${P}-usage_argument_fix.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.3_beta5-validation_fixes.patch b/net-print/cups/files/cups-2.3_beta5-validation_fixes.patch
deleted file mode 100644
index 29e2533eeb1..00000000000
--- a/net-print/cups/files/cups-2.3_beta5-validation_fixes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 1d677f11f1e3353524d46c2842188eccfcdcd5a2 Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Mon, 11 Jun 2018 09:37:34 -0400
-Subject: [PATCH] Fix regressions in ippValidateAttribute (Issue #5322, Issue
- #5330)
-
-diff --git a/cups/ipp.c b/cups/ipp.c
-index 95d53cc44..325de02b9 100644
---- a/cups/ipp.c
-+++ b/cups/ipp.c
-@@ -5033,16 +5033,19 @@ ippValidateAttribute(
- break;
- }
-
-- if (*ptr < ' ' || *ptr == 0x7f)
-- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-- else if (*ptr)
-- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-+ if (*ptr)
-+ {
-+ if (*ptr < ' ' || *ptr == 0x7f)
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ else
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ }
-
- if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1))
- {
-@@ -5091,16 +5094,19 @@ ippValidateAttribute(
- break;
- }
-
-- if (*ptr < ' ' || *ptr == 0x7f)
-- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-- else if (*ptr)
-+ if (*ptr)
- {
-- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
-- return (0);
-- }
-+ if (*ptr < ' ' || *ptr == 0x7f)
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ else
-+ {
-+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
-+ return (0);
-+ }
-+ }
-
- if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1))
- {
diff --git a/net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch b/net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch
new file mode 100644
index 00000000000..f0ba569a0f4
--- /dev/null
+++ b/net-print/cups/files/cups-2.3_beta6-usage_argument_fix.patch
@@ -0,0 +1,38 @@
+From 7b655b36b349f6db9a7b658d0075c468cff83c2e Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sat, 8 Dec 2018 13:14:06 +0100
+Subject: [PATCH] Fix call to usage which requires an int argument
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise compilation fails:
+
+main.c: In function ‘main’:
+main.c:158:7: error: too few arguments to function ‘usage’
+ usage();
+ ^~~~~
+main.c:73:14: note: declared here
+ static void usage(int status) _CUPS_NORETURN;
+ ^~~~~
+make[1]: *** [../Makedefs:270: main.o] Error 1
+---
+ scheduler/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scheduler/main.c b/scheduler/main.c
+index ce7df89c0..a7df4525f 100644
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -155,7 +155,7 @@ main(int argc, /* I - Number of command-line args */
+ for (i = 1; i < argc; i ++)
+ {
+ if (!strcmp(argv[i], "--help"))
+- usage();
++ usage(1);
+ else if (argv[i][0] == '-')
+ {
+ for (opt = argv[i] + 1; *opt != '\0'; opt ++)
+--
+2.20.0.rc2
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2020-06-12 7:31 Sergei Trofimovich
0 siblings, 0 replies; 15+ messages in thread
From: Sergei Trofimovich @ 2020-06-12 7:31 UTC (permalink / raw
To: gentoo-commits
commit: d25ca58aaf02c09f955e63223a512b693ed06433
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 07:30:53 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 07:31:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25ca58a
net-print/cups: respect user's AR
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-print/cups/cups-2.3.3-r1.ebuild | 1 +
net-print/cups/files/cups-2.3.3-user-AR.patch | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild
index 4ff03c7a6d4..805de00b908 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r1.ebuild
@@ -81,6 +81,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
+ "${FILESDIR}/${PN}-2.3.3-user-AR.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.3.3-user-AR.patch b/net-print/cups/files/cups-2.3.3-user-AR.patch
new file mode 100644
index 00000000000..0e52adb567d
--- /dev/null
+++ b/net-print/cups/files/cups-2.3.3-user-AR.patch
@@ -0,0 +1,22 @@
+AC_PATH_PROG does not search tuple prefixes.
+--- a/config-scripts/cups-common.m4
++++ b/config-scripts/cups-common.m4
+@@ -37,15 +37,15 @@ AC_PROG_CC(clang cc gcc)
+ AC_PROG_CPP
+ AC_PROG_CXX(clang++ c++ g++)
+ AC_PROG_RANLIB
+-AC_PATH_PROG(AR,ar)
++AC_CHECK_TOOL(AR,ar)
+ AC_PATH_PROG(CHMOD,chmod)
+ AC_PATH_PROG(GZIPPROG,gzip)
+ AC_MSG_CHECKING(for install-sh script)
+ INSTALL="`pwd`/install-sh"
+ AC_SUBST(INSTALL)
+ AC_MSG_RESULT(using $INSTALL)
+-AC_PATH_PROG(LD,ld)
+-AC_PATH_PROG(LN,ln)
++AC_CHECK_TOOL(LD,ld)
++AC_CHECK_TOOL(LN,ln)
+ AC_PATH_PROG(MKDIR,mkdir)
+ AC_PATH_PROG(MV,mv)
+ AC_PATH_PROG(RM,rm)
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2021-01-16 11:53 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2021-01-16 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 68545919747ad7b6ac2ca7681255f1371d0ed357
Author: Ørjan Malde <red <AT> foxi <DOT> me>
AuthorDate: Fri Jan 15 17:58:35 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 11:53:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68545919
net-print/cups: drop bogus libtool install invocations
Closes: https://bugs.gentoo.org/765583
Signed-off-by: Ørjan Malde <red <AT> foxi.me>
Closes: https://github.com/gentoo/gentoo/pull/19069
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-print/cups/cups-2.3.3-r1.ebuild | 1 +
net-print/cups/files/cups-2.3.3-no-libtool.patch | 25 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
diff --git a/net-print/cups/cups-2.3.3-r1.ebuild b/net-print/cups/cups-2.3.3-r1.ebuild
index 1e397ff741c..d6375da0adf 100644
--- a/net-print/cups/cups-2.3.3-r1.ebuild
+++ b/net-print/cups/cups-2.3.3-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
"${FILESDIR}/${PN}-2.3.3-user-AR.patch"
+ "${FILESDIR}/${PN}-2.3.3-no-libtool.patch"
)
MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.3.3-no-libtool.patch b/net-print/cups/files/cups-2.3.3-no-libtool.patch
new file mode 100644
index 00000000000..cf891129418
--- /dev/null
+++ b/net-print/cups/files/cups-2.3.3-no-libtool.patch
@@ -0,0 +1,25 @@
+This is not needed and causes problems with more strict
+implementations of libtool.
+
+With slibtool it fails.
+
+--- a/backend/Makefile
++++ b/backend/Makefile
+@@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC)
+ echo Installing backends in $(SERVERBIN)/backend
+ $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
+ for file in $(RBACKENDS); do \
+- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++ $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
+ done
+ for file in $(UBACKENDS); do \
+ $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
+@@ -142,7 +142,7 @@ install-exec: $(INSTALLXPC)
+ install-xpc: ipp
+ echo Installing XPC backends in $(SERVERBIN)/apple
+ $(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
+- $(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple
++ $(INSTALL_BIN) ipp $(SERVERBIN)/apple
+ for file in $(IPPALIASES); do \
+ $(RM) $(SERVERBIN)/apple/$$file; \
+ $(LN) ipp $(SERVERBIN)/apple/$$file; \
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2022-05-22 12:35 Pacho Ramos
0 siblings, 0 replies; 15+ messages in thread
From: Pacho Ramos @ 2022-05-22 12:35 UTC (permalink / raw
To: gentoo-commits
commit: 63db85cc42b284d52b0ee59caa8cfa0147a256df
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 12:35:38 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 22 12:35:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63db85cc
net-print/cups: drop 2.3.3-r4, 2.3.3_p2-r2
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
net-print/cups/Manifest | 1 -
net-print/cups/cups-2.3.3-r4.ebuild | 336 ---------------------------------
net-print/cups/cups-2.3.3_p2-r2.ebuild | 308 ------------------------------
net-print/cups/files/cupsd.init.d-r3 | 22 ---
4 files changed, 667 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 27494be3c394..0dc21ac8d17e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,2 @@
-DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
DIST cups-2.4.1-source.tar.gz 8113914 BLAKE2B 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 SHA512 74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd
diff --git a/net-print/cups/cups-2.3.3-r4.ebuild b/net-print/cups/cups-2.3.3-r4.ebuild
deleted file mode 100644
index d7f3b5fab7e2..000000000000
--- a/net-print/cups/cups-2.3.3-r4.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2022 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 pam systemd toolchain-funcs
-
-MY_PV="${PV/_rc/rc}"
-MY_PV="${MY_PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/apple/cups.git"
- if [[ ${PV} != 9999 ]]; then
- EGIT_BRANCH=branch-${PV/.9999}
- fi
-else
- #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
- if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
- fi
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
-
-CDEPEND="
- 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}] )
- !lprng-compat? ( !net-print/lprng )
- 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[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${CDEPEND}"
-BDEPEND="
- acct-group/lp
- acct-group/lpadmin
- virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
- acct-group/lp
- acct-group/lpadmin
- selinux? ( sec-policy/selinux-cups )
-"
-
-PDEPEND=">=net-print/cups-filters-1.0.43"
-
-REQUIRED_USE="
- usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
- "${FILESDIR}/${PN}-2.3.3-user-AR.patch"
- "${FILESDIR}/${PN}-2.3.3-no-libtool.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
- #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 "${S}"/Makedefs.in || die "sed failed"
-
- # Fix install-sh, posix sh does not have 'function'.
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
- # 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}"
-
- einfo LINGUAS=\"${LINGUAS}\"
-
- # 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-languages="${LINGUAS}"
- --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)
- )
-
- if tc-is-static-only; then
- myeconfargs+=(
- --disable-shared
- )
- fi
-
- econf "${myeconfargs[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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 -f "${ED}"/etc/cups/cupsd.conf.default
-
- # clean out cups init scripts
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
- # install our init script
- local neededservices=(
- $(usex zeroconf avahi-daemon '')
- $(usex dbus dbus '')
- )
- [[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
- cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
- sed -i \
- -e "s/@neededservices@/${neededservices}/" \
- "${T}"/cupsd || die
- doinitd "${T}"/cupsd
-
- if use pam; then
- 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 -rf "${ED}"/etc/xinetd.d
- fi
-
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/log/cups /var/spool/cups/tmp
-
- 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/cups || die
- rm -r "${ED}"/run || die
-
- # for the special case of running lprng and cups together, bug 467226
- if use lprng-compat ; then
- rm -fv "${ED}"/usr/bin/{lp*,cancel}
- rm -fv "${ED}"/usr/sbin/lp*
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
- rm -fv "${ED}"/usr/share/man/man8/lp*
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
- ewarn "Unless you plan to install an exotic server setup, you most likely"
- ewarn "do not want this. Disable the useflag then and all will be fine."
- fi
-}
-
-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
- echo
- 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"
- echo
- break
- fi
- done
-
- for v in ${REPLACING_VERSIONS}; do
- echo
- elog "For information about installing a printer and general cups setup"
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
- echo
- break
- done
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- xdg_pkg_postrm
-}
diff --git a/net-print/cups/cups-2.3.3_p2-r2.ebuild b/net-print/cups/cups-2.3.3_p2-r2.ebuild
deleted file mode 100644
index 2937e9dfac79..000000000000
--- a/net-print/cups/cups-2.3.3_p2-r2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2022 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 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[${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"
-)
-
-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
- #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}"
-
- einfo LINGUAS=\"${LINGUAS}\"
-
- # 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-languages="${LINGUAS}"
- --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)
- )
-
- if tc-is-static-only; then
- myeconfargs+=(
- --disable-shared
- )
- fi
-
- econf "${myeconfargs[@]}"
-
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that
- # makes more sense when facing multilib support.
- 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-r3 "${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 /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
- /var/cache/cups /var/log/cups /var/spool/cups/tmp
-
- 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/cups || die
- rm -r "${ED}"/run || die
-}
-
-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
-}
-
-pkg_postrm() {
- # Update desktop file database and gtk icon cache (bug 370059)
- xdg_pkg_postrm
-}
diff --git a/net-print/cups/files/cupsd.init.d-r3 b/net-print/cups/files/cupsd.init.d-r3
deleted file mode 100644
index 2f563e4c7698..000000000000
--- a/net-print/cups/files/cupsd.init.d-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-
-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="/var/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
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2022-07-11 3:10 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2022-07-11 3:10 UTC (permalink / raw
To: gentoo-commits
commit: 35ad85b847cedb28ab1c2fcd6dbc77ad9c8de75b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 03:02:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 03:02:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ad85b8
net-print/cups: drop 2.4.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-print/cups/Manifest | 1 -
net-print/cups/cups-2.4.1.ebuild | 320 ----------
.../files/0001-Fix-some-web-interface-issues.patch | 667 ---------------------
| 89 ---
.../files/0001-cups-fix-uninit-value-jump.patch | 18 -
...ps-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch | 55 --
.../files/cups-2.0.1-xinetd-installation-fix.patch | 9 -
.../cups-2.0.2-rename-systemd-service-files.patch | 46 --
net-print/cups/files/cups-2.3.3-no-libtool.patch | 25 -
net-print/cups/files/cups-2.4.1-resolve-uri.patch | 31 -
10 files changed, 1261 deletions(-)
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 70e6ff821ff8..9f36a740c252 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,3 +1,2 @@
DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
-DIST cups-2.4.1-source.tar.gz 8113914 BLAKE2B 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 SHA512 74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd
DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
diff --git a/net-print/cups/cups-2.4.1.ebuild b/net-print/cups/cups-2.4.1.ebuild
deleted file mode 100644
index be3e3b15e512..000000000000
--- a/net-print/cups/cups-2.4.1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2022 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/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 ~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 pam selinux +ssl static-libs systemd usb X xinetd zeroconf"
-
-# 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.4.1-nostrip.patch"
- "${FILESDIR}/${PN}-2.4.1-user-AR.patch"
-
- # Upstream patches applied by Fedora
- # https://github.com/OpenPrinting/cups/pull/329
- "${FILESDIR}"/0001-cups-fix-uninit-value-jump.patch
- # https://github.com/OpenPrinting/cups/issues/340
- "${FILESDIR}"/${PN}-2.4.1-resolve-uri.patch
- # https://src.fedoraproject.org/rpms/cups/blob/rawhide/f/cups.spec#_79
- "${FILESDIR}"/0001-Footer-message-corrected.patch
- "${FILESDIR}"/0001-Fix-some-web-interface-issues.patch
- # https://bugzilla.redhat.com/show_bug.cgi?id=2073268
- "${FILESDIR}"/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.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
- #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
- # 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-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_with ssl tls 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() {
- 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_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/0001-Fix-some-web-interface-issues.patch b/net-print/cups/files/0001-Fix-some-web-interface-issues.patch
deleted file mode 100644
index d2a8ec19429d..000000000000
--- a/net-print/cups/files/0001-Fix-some-web-interface-issues.patch
+++ /dev/null
@@ -1,667 +0,0 @@
-diff -up cups-2.4.1/doc/cups.css.css-issues cups-2.4.1/doc/cups.css
---- cups-2.4.1/doc/cups.css.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/cups.css 2022-03-08 13:55:16.075624812 +0100
-@@ -1,5 +1,5 @@
- /* Layout CSS */
--.header {
-+.cups-header {
- background: rgba(46,46,46,.9);
- box-shadow: 0 2px 5px rgba(0,0,0,0.25);
- color: white;
-@@ -11,7 +11,7 @@
- top: 0;
- width: 100%;
- }
--.header ul {
-+.cups-header ul {
- list-style: none;
- margin: 0;
- -webkit-margin-before: 0;
-@@ -20,37 +20,37 @@
- -webkit-margin-end: 5px;
- -webkit-padding-start: 0;
- }
--.header ul li {
-+.cups-header ul li {
- float: left;
- }
--.header a {
-+.cups-header a {
- display: block;
- padding: 5px 10px !important;
- }
--.header a:link, .header a:visited {
-+.cups-header a:link, .cups-header a:visited {
- color: white !important;
- text-decoration: none !important;
- }
--.header a:hover {
-+.cups-header a:hover {
- background: #cccccc !important;
- color: #333333 !important;
- text-decoration: none !important;
- }
--.header a.active {
-+.cups-header a.active {
- background: white !important;
- box-shadow: rgba(0,0,0,0.1) 0 0 10px 0 inset;
- color: black !important;
- text-decoration: none !important;
- }
-
--.body {
-+.cups-body {
- padding: 40px 20px;
- }
--.row .body {
-+.row .cups-body {
- padding: 0;
- }
-
--.footer {
-+.cups-footer {
- background: rgba(46,46,46,.9);
- bottom: 0;
- box-shadow: 0 -2px 5px rgba(0,0,0,0.25);
-@@ -62,7 +62,7 @@
- position: fixed;
- width: 100%;
- }
--.footer a:link, footer a:hover, .footer a:visited {
-+.cups-footer a:link, footer a:hover, .cups-footer a:visited {
- color: white !important;
- text-decoration: none !important;
- }
-@@ -131,6 +131,7 @@ pre {
- }
-
- blockquote {
-+ background: rgba(191,191,191,0.1);
- border-left: solid 2px #777;
- margin: 1em 0;
- padding: 10px;
-@@ -207,7 +208,7 @@ table.page {
- width: 100%;
- }
-
--td.body {
-+td.cups-body {
- height: 100%;
- vertical-align: top;
- }
-@@ -365,7 +366,7 @@ h1.title {
- display: none;
- }
-
--h2.title, h3.title, .row .body h2, .row .body h3 {
-+h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
- border-bottom: solid 2pt black;
- }
-
-@@ -451,8 +452,8 @@ div.sidebar p.l2 {
- }
-
- table.inset {
-- background: rgba(191,191,191,0.15);
-- border: thin solid rgba(191,191,191,0.3);
-+ background: #f4f4f4;
-+ border: thin solid rgba(191,191,191,0.5);
- margin-top: 1em;
- padding: 0;
- width: 100%;
-@@ -471,7 +472,7 @@ table.inset caption {
- }
-
- table.inset td {
-- padding: 2px;
-+ padding: 2px 5px;
- }
-
- dt {
-@@ -525,15 +526,15 @@ div.tab {
- }
-
- /* API documentation styles... */
--div.body h1 {
-+div.cups-body h1 {
- }
--div.body h2 {
-+div.cups-body h2 {
- }
--div.body h3 {
-+div.cups-body h3 {
- }
--div.body h4 {
-+div.cups-body h4 {
- }
--div.body h5 {
-+div.cups-body h5 {
- }
- div.contents {
- }
-@@ -589,9 +590,14 @@ h1, h2, h3, h4, h5, h6 {
- blockquote {
- page-break-inside: avoid;
- }
--p code, li code, p.code, pre, ul.code li {
-- background: rgba(127,127,127,0.1);
-+p.code, pre, ul.code li {
- border-left: thin dotted gray;
-+ background: rgba(191,191,191,0.1);
-+}
-+p code, li code {
-+ background: rgba(191,191,191,0.3);
-+}
-+p code, li code, p.code, pre, ul.code li {
- font-family: monospace;
- hyphens: manual;
- margin: 18pt 0;
-@@ -644,19 +650,19 @@ ul.contents li ul.code, ul.contents li u
- display: none;
- }
-
-- .header {
-+ .cups-header {
- margin: 0;
- position: relative;
- }
-- .header ul li {
-+ .cups-header ul li {
- float: none;
- }
-
-- .body {
-+ .cups-body {
- padding: 0;
- }
-
-- .footer {
-+ .cups-footer {
- font-size: 10px;
- height: auto;
- position: relative;
-@@ -715,6 +721,12 @@ ul.contents li ul.code, ul.contents li u
- hr {
- color: #666;
- }
-+ table.inset {
-+ background: #1d1d1d;
-+ }
-+ h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 {
-+ border-bottom: solid 2pt #ccc;
-+ }
- div.table table td, table.list th {
- background: black;
- }
-diff -up cups-2.4.1/doc/da/index.html.in.css-issues cups-2.4.1/doc/da/index.html.in
---- cups-2.4.1/doc/da/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/da/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Hjem - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Hjem</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Printere</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>CUPS @CUPS_VERSION@</h1>
- <p>CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> til Linux® og andre UNIX<sup>®</sup>-lignende styresystemer. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
-+ <div class="cups-footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/de/index.html.in.css-issues cups-2.4.1/doc/de/index.html.in
---- cups-2.4.1/doc/de/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/de/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Startseite - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Startseite</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Drucker</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
- <p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> zur Unterstützung lokaler und Netzwerkdrucker.</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/es/index.html.in.css-issues cups-2.4.1/doc/es/index.html.in
---- cups-2.4.1/doc/es/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/es/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Inicio - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Inicio</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Impresoras</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>CUPS @CUPS_VERSION@</h1>
- <p>CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para macOS<sup>®</sup> y otros sistemas operativos tipo UNIX<sup>®</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
-+ <div class="cups-footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/fr/index.html.in.css-issues cups-2.4.1/doc/fr/index.html.in
---- cups-2.4.1/doc/fr/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/fr/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Home - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Home</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Imprimantes</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
- <p>Le système d'impression open source basé sur des normes, développé par <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> pour prendre en charge l'impression vers des imprimantes locales et de réseau.</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/index.html.in.css-issues cups-2.4.1/doc/index.html.in
---- cups-2.4.1/doc/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Home - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Home</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Printers</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
- <p>The standards-based, open source printing system developed by <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/ja/index.html.in.css-issues cups-2.4.1/doc/ja/index.html.in
---- cups-2.4.1/doc/ja/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/ja/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>ホーム - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">ホーム</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">プリンター</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>CUPS @CUPS_VERSION@</h1>
- <p>CUPS は、macOS<sup>®</sup> およびその他の UNIX <SUP>®</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/pt_BR/index.html.in.css-issues cups-2.4.1/doc/pt_BR/index.html.in
---- cups-2.4.1/doc/pt_BR/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/pt_BR/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Início - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Início</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Impressoras</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>CUPS @CUPS_VERSION@</h1>
- <p>CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para Linux® e outros sistemas operacionais similares ao UNIX<sup>®</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
- </body>
- </html>
-diff -up cups-2.4.1/doc/ru/index.html.in.css-issues cups-2.4.1/doc/ru/index.html.in
---- cups-2.4.1/doc/ru/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/doc/ru/index.html.in 2022-03-08 13:55:16.075624812 +0100
-@@ -10,7 +10,7 @@
- <title>Home - CUPS @CUPS_VERSION@</title>
- </head>
- <body>
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a class="active" href="/">Начало</a></li>
-@@ -21,7 +21,7 @@
- <li><a href="/printers/">Принтеры</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
- <P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> для операционной системы Linux® и других UNIX<SUP>®</SUP>-подобных операционных систем. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</P>
-@@ -47,6 +47,6 @@
- </div>
- </div>
- </div>
-- <div class="footer"> Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All Rights Reserved.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/da/header.tmpl.in.css-issues cups-2.4.1/templates/da/header.tmpl.in
---- cups-2.4.1/templates/da/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/da/header.tmpl.in 2022-03-08 13:55:16.075624812 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Hjem</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Printere</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/da/trailer.tmpl.css-issues cups-2.4.1/templates/da/trailer.tmpl
---- cups-2.4.1/templates/da/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100
-+++ cups-2.4.1/templates/da/trailer.tmpl 2022-03-08 13:56:03.419892000 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
-+ <div class="cups-footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/de/header.tmpl.in.css-issues cups-2.4.1/templates/de/header.tmpl.in
---- cups-2.4.1/templates/de/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/de/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Startseite</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Drucker</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/de/trailer.tmpl.css-issues cups-2.4.1/templates/de/trailer.tmpl
---- cups-2.4.1/templates/de/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100
-+++ cups-2.4.1/templates/de/trailer.tmpl 2022-03-08 13:56:14.892956747 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/es/header.tmpl.in.css-issues cups-2.4.1/templates/es/header.tmpl.in
---- cups-2.4.1/templates/es/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/es/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Inicio</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Impresoras</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/es/trailer.tmpl.css-issues cups-2.4.1/templates/es/trailer.tmpl
---- cups-2.4.1/templates/es/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100
-+++ cups-2.4.1/templates/es/trailer.tmpl 2022-03-08 13:56:29.420038731 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
-+ <div class="cups-footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/fr/header.tmpl.in.css-issues cups-2.4.1/templates/fr/header.tmpl.in
---- cups-2.4.1/templates/fr/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/fr/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Home</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Imprimantes</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/fr/trailer.tmpl.css-issues cups-2.4.1/templates/fr/trailer.tmpl
---- cups-2.4.1/templates/fr/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100
-+++ cups-2.4.1/templates/fr/trailer.tmpl 2022-03-08 13:56:40.341100363 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. Tous droits réservés.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Tous droits réservés.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/header.tmpl.in.css-issues cups-2.4.1/templates/header.tmpl.in
---- cups-2.4.1/templates/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Home</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Printers</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/ja/header.tmpl.in.css-issues cups-2.4.1/templates/ja/header.tmpl.in
---- cups-2.4.1/templates/ja/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/ja/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100
-@@ -19,7 +19,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">ホーム</a></li>
-@@ -30,6 +30,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">プリンター</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/ja/trailer.tmpl.css-issues cups-2.4.1/templates/ja/trailer.tmpl
---- cups-2.4.1/templates/ja/trailer.tmpl.css-issues 2022-03-08 13:55:16.077624823 +0100
-+++ cups-2.4.1/templates/ja/trailer.tmpl 2022-03-08 13:56:55.101183659 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/pt_BR/header.tmpl.in.css-issues cups-2.4.1/templates/pt_BR/header.tmpl.in
---- cups-2.4.1/templates/pt_BR/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/pt_BR/header.tmpl.in 2022-03-08 13:55:16.077624823 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Início</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Impressoras</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/pt_BR/trailer.tmpl.css-issues cups-2.4.1/templates/pt_BR/trailer.tmpl
---- cups-2.4.1/templates/pt_BR/trailer.tmpl.css-issues 2022-03-08 13:55:16.077624823 +0100
-+++ cups-2.4.1/templates/pt_BR/trailer.tmpl 2022-03-08 13:57:11.349275354 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/ru/header.tmpl.in.css-issues cups-2.4.1/templates/ru/header.tmpl.in
---- cups-2.4.1/templates/ru/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100
-+++ cups-2.4.1/templates/ru/header.tmpl.in 2022-03-08 13:55:16.077624823 +0100
-@@ -27,7 +27,7 @@
- <title>{title} - CUPS @CUPS_VERSION@</title>
- </head>
- <body onload="check_cookies();">
-- <div class="header">
-+ <div class="cups-header">
- <ul>
- <li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
- <li><a href="/">Начало</a></li>
-@@ -38,6 +38,6 @@
- <li><a {SECTION=printers?class="active" :}href="/printers/">Принтеры</a></li>
- </ul>
- </div>
-- <div class="body">
-+ <div class="cups-body">
- <div class="row">
- <h1>{title}</h1>
-diff -up cups-2.4.1/templates/ru/trailer.tmpl.css-issues cups-2.4.1/templates/ru/trailer.tmpl
---- cups-2.4.1/templates/ru/trailer.tmpl.css-issues 2022-03-08 13:55:16.077624823 +0100
-+++ cups-2.4.1/templates/ru/trailer.tmpl 2022-03-08 13:57:25.262353870 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. Все права защищены.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Все права защищены.</div>
- </body>
- </html>
-diff -up cups-2.4.1/templates/trailer.tmpl.css-issues cups-2.4.1/templates/trailer.tmpl
---- cups-2.4.1/templates/trailer.tmpl.css-issues 2022-03-08 13:55:16.073624801 +0100
-+++ cups-2.4.1/templates/trailer.tmpl 2022-03-08 13:55:16.077624823 +0100
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
-+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
diff --git a/net-print/cups/files/0001-Footer-message-corrected.patch b/net-print/cups/files/0001-Footer-message-corrected.patch
deleted file mode 100644
index b2a2074c70d1..000000000000
--- a/net-print/cups/files/0001-Footer-message-corrected.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/templates/da/trailer.tmpl b/templates/da/trailer.tmpl
-index aede375..d448d7e 100644
---- a/templates/da/trailer.tmpl
-+++ b/templates/da/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS og CUPS-logoet er varemærker som tilhører <a href="http://www.apple.com">Apple Inc.</a> Ophavsret © 2007-2019 Apple Inc. Alle rettigheder forbeholdt.</div>
-+ <div class="footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
- </body>
- </html>
-diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl
-index c1f5d38..cf3caca 100644
---- a/templates/de/trailer.tmpl
-+++ b/templates/de/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS und das CUPS-Logo sind Warenzeichen der <a href="https://www.apple.com/">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. Alle Rechte vorbehalten.</div>
-+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
- </body>
- </html>
-diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl
-index c1cb58f..9b9047e 100644
---- a/templates/es/trailer.tmpl
-+++ b/templates/es/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor © 2007-2019 Apple Inc. Todos los derechos reservados.</div>
-+ <div class="footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
- </body>
- </html>
-diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl
-index 6e9b8b1..9628176 100644
---- a/templates/fr/trailer.tmpl
-+++ b/templates/fr/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS et le logo CUPS sont des marques déposées de <a href="http://www.apple.com">Apple Inc.</a> CUPS est sous copyright 2007-2019 Apple Inc. Tous droits réservés.</div>
-+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Tous droits réservés.</div>
- </body>
- </html>
-diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl
-index a4f86b1..240c56b 100644
---- a/templates/ja/trailer.tmpl
-+++ b/templates/ja/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. All rights reserved.</div>
-+ <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
-diff --git a/templates/pt_BR/trailer.tmpl b/templates/pt_BR/trailer.tmpl
-index 673a555..774bc1d 100644
---- a/templates/pt_BR/trailer.tmpl
-+++ b/templates/pt_BR/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS e sua logo são marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. Todos os direitos reservados.</div>
-+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
- </body>
- </html>
-diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl
-index 260d0e9..c6ec6e4 100644
---- a/templates/ru/trailer.tmpl
-+++ b/templates/ru/trailer.tmpl
-@@ -1,6 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками
--<A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.</div>
-+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Все права защищены.</div>
- </body>
- </html>
-diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl
-index a4f86b1..240c56b 100644
---- a/templates/trailer.tmpl
-+++ b/templates/trailer.tmpl
-@@ -1,5 +1,5 @@
- </div>
- </div>
-- <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. All rights reserved.</div>
-+ <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
- </body>
- </html>
diff --git a/net-print/cups/files/0001-cups-fix-uninit-value-jump.patch b/net-print/cups/files/0001-cups-fix-uninit-value-jump.patch
deleted file mode 100644
index 79e462e1547d..000000000000
--- a/net-print/cups/files/0001-cups-fix-uninit-value-jump.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/cups/ppd.c b/cups/ppd.c
-index 525df3592..54368ac4c 100644
---- a/cups/ppd.c
-+++ b/cups/ppd.c
-@@ -3430,12 +3430,12 @@ ppd_update_filters(ppd_file_t *ppd, /* I - PPD file */
- srctype[256],
- dstsuper[16], /* Destination MIME media type */
- dsttype[256],
-- program[1024], /* Command to run */
- *ptr, /* Pointer into command to run */
- buffer[1024], /* Re-written cupsFilter value */
- **filter; /* Current filter */
- int cost; /* Cost of filter */
-
-+ char program[1024] = { 0 }; /* Command to run */
-
- DEBUG_printf(("4ppd_update_filters(ppd=%p, cg=%p)", ppd, pg));
-
diff --git a/net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch b/net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
deleted file mode 100644
index 67e2edcfed67..000000000000
--- a/net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From bdb1ca45454d90410031c4c2054005a995f76180 Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Wed, 6 Apr 2022 15:04:45 +0200
-Subject: [PATCH] cups/tls-gnutls.c: Use always GNUTLS_SHUT_WR
-
-The current mode for `gnutls_bye()` in client use cases strictly
-follows TLS v1.2 standard, which in this particular part says:
-
-```
-Unless some other fatal alert has been transmitted, each party is
-required to send a close_notify alert before closing the write
-side of the connection. The other party MUST respond with a
-close_notify alert of its own and close down the connection immediately,
-discarding any pending writes. It is not required for the initiator
-of the close to wait for the responding close_notify alert before
-closing the read side of the connection.
-```
-
-and waits for the other side of TLS connection to confirm the close.
-
-Unfortunately it can undesired for reasons:
-- we support switching of TLS versions in CUPS, and this mode strictly
- follows TLS v1.2 - so for older version this behavior is not expected
- and can cause delays
-- even some TLS v1.2 implementations (like Windows Server 2016) don't
- comply TLS v1.2 behavior even if it says it does - in that case,
- encrypted printing takes 30s till HTTP timeout is reached, because the
- other side didn't send confirmation
-- AFAIU openssl's SSL_shutdown() doesn't make this TLS v1.2 difference,
- so we could end up with two TLS implementations in CUPS which will
- behave differently
-
-Since the standard defines that waiting for confirmation is not required
-and due the problems above, I would propose using GNUTLS_SHUT_WR mode
-regardless of HTTP mode.
----
- cups/tls-gnutls.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
-index c55995b2b..f87b4f4df 100644
---- a/cups/tls-gnutls.c
-+++ b/cups/tls-gnutls.c
-@@ -1667,7 +1667,7 @@ _httpTLSStop(http_t *http) /* I - Connection to server */
- int error; /* Error code */
-
-
-- error = gnutls_bye(http->tls, http->mode == _HTTP_MODE_CLIENT ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR);
-+ error = gnutls_bye(http->tls, GNUTLS_SHUT_WR);
- if (error != GNUTLS_E_SUCCESS)
- _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gnutls_strerror(errno), 0);
-
---
-2.35.1
-
diff --git a/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch b/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
deleted file mode 100644
index 2e8419e7675a..000000000000
--- a/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/scheduler/Makefile
-+++ a/scheduler/Makefile
-@@ -211,4 +211,5 @@
-- elif test "x$(XINETD)" != x; then \
-+ fi
-+ if test "x$(XINETD)" != x; then \
- echo Installing xinetd configuration file for cups-lpd...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
- $(INSTALL_DATA) cups-lpd.xinetd $(BUILDROOT)$(XINETD)/cups-lpd; \
diff --git a/net-print/cups/files/cups-2.0.2-rename-systemd-service-files.patch b/net-print/cups/files/cups-2.0.2-rename-systemd-service-files.patch
deleted file mode 100644
index 16f677ba7a37..000000000000
--- a/net-print/cups/files/cups-2.0.2-rename-systemd-service-files.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001
-From: Matthias Maier <tamiko@kyomu.43-1.org>
-Date: Wed, 19 Nov 2014 18:00:06 +0100
-Subject: [PATCH] change systemd service files to gentoo naming scheme
-
----
- scheduler/Makefile | 10 +++++-----
- scheduler/org.cups.cupsd.path.in | 2 +-
- scheduler/org.cups.cupsd.service.in | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/scheduler/Makefile b/scheduler/Makefile
-index 3e0884a..b354420 100644
---- a/scheduler/Makefile
-+++ b/scheduler/Makefile
-@@ -203,11 +203,11 @@ install-data:
- if test "x$(SYSTEMD_DIR)" != x; then \
- echo Installing systemd configuration files...; \
- $(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
-- $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
-- $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
-- $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
-- $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
-- $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
-+ $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
-+ $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
-+ $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
-+ $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
-+ $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \
- elif test "x$(XINETD)" != x; then \
- echo Installing xinetd configuration file for cups-lpd...; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
-diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
-index 0a27c76..7a04248 100644
---- a/scheduler/org.cups.cupsd.service.in
-+++ b/scheduler/org.cups.cupsd.service.in
-@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l
- Type=simple
-
- [Install]
--Also=org.cups.cupsd.socket org.cups.cupsd.path
-+Also=cups.socket cups.path
- WantedBy=printer.target
---
-2.0.4
-
diff --git a/net-print/cups/files/cups-2.3.3-no-libtool.patch b/net-print/cups/files/cups-2.3.3-no-libtool.patch
deleted file mode 100644
index cf8911294183..000000000000
--- a/net-print/cups/files/cups-2.3.3-no-libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This is not needed and causes problems with more strict
-implementations of libtool.
-
-With slibtool it fails.
-
---- a/backend/Makefile
-+++ b/backend/Makefile
-@@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC)
- echo Installing backends in $(SERVERBIN)/backend
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
- for file in $(RBACKENDS); do \
-- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
-+ $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
- done
- for file in $(UBACKENDS); do \
- $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-@@ -142,7 +142,7 @@ install-exec: $(INSTALLXPC)
- install-xpc: ipp
- echo Installing XPC backends in $(SERVERBIN)/apple
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
-- $(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple
-+ $(INSTALL_BIN) ipp $(SERVERBIN)/apple
- for file in $(IPPALIASES); do \
- $(RM) $(SERVERBIN)/apple/$$file; \
- $(LN) ipp $(SERVERBIN)/apple/$$file; \
diff --git a/net-print/cups/files/cups-2.4.1-resolve-uri.patch b/net-print/cups/files/cups-2.4.1-resolve-uri.patch
deleted file mode 100644
index e138e20dec14..000000000000
--- a/net-print/cups/files/cups-2.4.1-resolve-uri.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up cups-2.4.1/scheduler/ipp.c.resolve-uri cups-2.4.1/scheduler/ipp.c
---- cups-2.4.1/scheduler/ipp.c.resolve-uri 2022-03-04 08:13:13.712346134 +0100
-+++ cups-2.4.1/scheduler/ipp.c 2022-03-04 08:17:17.486819820 +0100
-@@ -5271,6 +5271,7 @@ create_local_bg_thread(
- userpass[256], /* User:pass */
- host[256], /* Hostname */
- resource[1024], /* Resource path */
-+ uri[1024], /* Resolved URI, if needed */
- line[1024]; /* Line from PPD */
- int port; /* Port number */
- http_encryption_t encryption; /* Type of encryption to use */
-@@ -5292,6 +5293,19 @@ create_local_bg_thread(
-
- cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Generating PPD file from \"%s\"...", printer->name, printer->device_uri);
-
-+ if (strstr(printer->device_uri, "._tcp"))
-+ {
-+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "%s: Resolving mDNS URI \"%s\".", printer->name, printer->device_uri);
-+
-+ if (!_httpResolveURI(printer->device_uri, uri, sizeof(uri), _HTTP_RESOLVE_DEFAULT, NULL, NULL))
-+ {
-+ cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Couldn't resolve mDNS URI \"%s\".", printer->name, printer->device_uri);
-+ return (NULL);
-+ }
-+
-+ 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)
- {
- cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Bad device URI \"%s\".", printer->name, printer->device_uri);
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/
@ 2023-01-07 17:35 Pacho Ramos
0 siblings, 0 replies; 15+ messages in thread
From: Pacho Ramos @ 2023-01-07 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 1602d101b991eb7f07e7ee84828ce5255bdda6d3
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 17:34:01 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 17:34:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1602d101
net-print/cups: Apply Fedora fixes for IPP and .local discovering
To make the printing and the detection far more reliable.
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
net-print/cups/cups-2.4.2-r7.ebuild | 325 +++++++++++++++++++++
.../cups/files/cups-2.4.2-scheduler-ipp.patch | 36 +++
net-print/cups/files/cups-resolve-local.patch | 97 ++++++
3 files changed, 458 insertions(+)
diff --git a/net-print/cups/cups-2.4.2-r7.ebuild b/net-print/cups/cups-2.4.2-r7.ebuild
new file mode 100644
index 000000000000..d1cee36bb98e
--- /dev/null
+++ b/net-print/cups/cups-2.4.2-r7.ebuild
@@ -0,0 +1,325 @@
+# 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/files/cups-2.4.2-scheduler-ipp.patch b/net-print/cups/files/cups-2.4.2-scheduler-ipp.patch
new file mode 100644
index 000000000000..54147c60de96
--- /dev/null
+++ b/net-print/cups/files/cups-2.4.2-scheduler-ipp.patch
@@ -0,0 +1,36 @@
+From 020609ad9eb84ab5a4c602ff604b2f208a6cdb8d Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+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
new file mode 100644
index 000000000000..bc6c96a98211
--- /dev/null
+++ b/net-print/cups/files/cups-resolve-local.patch
@@ -0,0 +1,97 @@
+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));
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-01-07 17:35 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-19 2:44 [gentoo-commits] repo/gentoo:master commit in: net-print/cups/, net-print/cups/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-01-07 17:35 Pacho Ramos
2022-07-11 3:10 Sam James
2022-05-22 12:35 Pacho Ramos
2021-01-16 11:53 Lars Wendler
2020-06-12 7:31 Sergei Trofimovich
2018-12-08 12:27 Lars Wendler
2018-06-11 13:26 Lars Wendler
2018-03-29 8:00 Lars Wendler
2018-03-28 7:42 Lars Wendler
2017-06-30 21:49 Lars Wendler
2017-01-18 1:39 Lars Wendler
2016-02-07 14:45 Lars Wendler
2016-02-06 1:34 Mike Frysinger
2016-01-12 15:50 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox