net-print/cups: Switch to using pidfile, bug 551544
authorAndreas K. Hüttel <dilfridge@gentoo.org>
Wed, 15 Feb 2017 00:42:23 +0000 (01:42 +0100)
committerAndreas K. Hüttel <dilfridge@gentoo.org>
Wed, 15 Feb 2017 00:42:44 +0000 (01:42 +0100)
Package-Manager: Portage-2.3.3, Repoman-2.3.1

net-print/cups/cups-2.2.2-r2.ebuild [new file with mode: 0644]
net-print/cups/cups-9999.ebuild
net-print/cups/files/cupsd.init.d-r3 [new file with mode: 0644]

diff --git a/net-print/cups/cups-2.2.2-r2.ebuild b/net-print/cups/cups-2.2.2-r2.ebuild
new file mode 100644 (file)
index 0000000..765945a
--- /dev/null
@@ -0,0 +1,353 @@
+# Copyright 1999-2017 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="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
+                       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() {
+       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
+}
index 0c97e45712812d78e380f70a66d67d8e96988fe4..765945a438d616c115e6224e2c91ac1a2b047548 100644 (file)
@@ -17,7 +17,7 @@ MY_PV=${MY_PV/_beta/b}
 
 if [[ ${PV} == *9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="http://www.cups.org/cups.git"
+       EGIT_REPO_URI="https://github.com/apple/cups.git"
        if [[ ${PV} != 9999 ]]; then
                EGIT_BRANCH=branch-${PV/.9999}
        fi
@@ -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).
@@ -255,7 +261,7 @@ multilib_src_install_all() {
        use zeroconf && neededservices+=" avahi-daemon"
        use dbus && neededservices+=" dbus"
        [[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-       cp "${FILESDIR}"/cupsd.init.d-r2 "${T}"/cupsd || die
+       cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
        sed -i \
                -e "s/@neededservices@/$neededservices/" \
                "${T}"/cupsd || die
@@ -318,30 +324,26 @@ pkg_postinst() {
        gnome2_icon_cache_update
        fdo-mime_desktop_database_update
 
-       # not slotted - at most one value
-       if ! [[ "${REPLACING_VERSIONS}" ]]; then
+       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
-       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
+               break
+       done
 }
 
 pkg_postrm() {
diff --git a/net-print/cups/files/cupsd.init.d-r3 b/net-print/cups/files/cupsd.init.d-r3
new file mode 100644 (file)
index 0000000..2037341
--- /dev/null
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# $Id$
+
+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
+}