slyfox 15/06/14 10:49:08 Modified: ChangeLog Added: cups-2.0.2-r2.ebuild Log: Backport busy CPU loop on a poll(), bug #549732 by Joakim Tjernlund and Shiba. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path 1.676 net-print/cups/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.676&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.676&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.675&r2=1.676 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v retrieving revision 1.675 retrieving revision 1.676 diff -u -r1.675 -r1.676 --- ChangeLog 14 Jun 2015 09:28:36 -0000 1.675 +++ ChangeLog 14 Jun 2015 10:49:08 -0000 1.676 @@ -1,6 +1,12 @@ # ChangeLog for net-print/cups # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.675 2015/06/14 09:28:36 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.676 2015/06/14 10:49:08 slyfox Exp $ + +*cups-2.0.2-r2 (14 Jun 2015) + + 14 Jun 2015; Sergei Trofimovich <sly...@gentoo.org> +cups-2.0.2-r2.ebuild, + +files/cups-2.0.2-poll-CPU-loop-STR-4605.patch: + Backport busy CPU loop on a poll(), bug #549732 by Joakim Tjernlund and Shiba. 14 Jun 2015; Sergei Trofimovich <sly...@gentoo.org> cups-2.0.2-r1.ebuild: Allow user patching, bug #549732 by Joakim Tjernlund. 1.1 net-print/cups/cups-2.0.2-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-2.0.2-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-2.0.2-r2.ebuild?rev=1.1&content-type=text/plain Index: cups-2.0.2-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.2-r2.ebuild,v 1.1 2015/06/14 10:49:08 slyfox Exp $ 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 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}/${PN}-2.0.2-systemd-socket.patch" "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" "${FILESDIR}/${PN}-2.0.2-poll-CPU-loop-STR-4605.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 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 }
