diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2014-11-20 12:53:26 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2014-11-20 12:53:26 +0000 |
| commit | df218f5b6906318df643619a6380325a94378e8a (patch) | |
| tree | c6232769766ecc7e72720f050399b35d5fee34d9 /net-print/cups | |
| parent | Co-maintain this (to reflect reallity as we are maintaining it to ensure it's... (diff) | |
| download | gentoo-2-df218f5b6906318df643619a6380325a94378e8a.tar.gz gentoo-2-df218f5b6906318df643619a6380325a94378e8a.tar.bz2 gentoo-2-df218f5b6906318df643619a6380325a94378e8a.zip | |
fix xinetd configuration wrt bug #529916
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-2.0.1-r1.ebuild | 3 | ||||
| -rw-r--r-- | net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch | 12 |
3 files changed, 19 insertions, 2 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index ab3b2ca13534..a9a8b4762f66 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.651 2014/11/19 23:05:43 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.652 2014/11/20 12:53:26 tamiko Exp $ + + 20 Nov 2014; Matthias Maier <tamiko@gentoo.org> + +files/cups-2.0.1-xinetd-installation-fix.patch, cups-2.0.1-r1.ebuild: + fix xinetd configuration wrt bug #529916 *cups-2.0.1-r1 (19 Nov 2014) diff --git a/net-print/cups/cups-2.0.1-r1.ebuild b/net-print/cups/cups-2.0.1-r1.ebuild index 3e5a87ce4fdb..cc68764d38d2 100644 --- a/net-print/cups/cups-2.0.1-r1.ebuild +++ b/net-print/cups/cups-2.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1-r1.ebuild,v 1.1 2014/11/19 23:05:43 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1-r1.ebuild,v 1.2 2014/11/20 12:53:26 tamiko Exp $ EAPI=5 @@ -99,6 +99,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.4.4-nostrip.patch" "${FILESDIR}/${P}-rename-systemd-service-files.patch" "${FILESDIR}/${P}-fix-compilation.patch" + "${FILESDIR}/${P}-xinetd-installation-fix.patch" ) MULTILIB_CHOST_TOOLS=( 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 new file mode 100644 index 000000000000..3cd73304cbd1 --- /dev/null +++ b/net-print/cups/files/cups-2.0.1-xinetd-installation-fix.patch @@ -0,0 +1,12 @@ +--- a/scheduler/Makefile ++++ a/scheduler/Makefile +@@ -208,7 +208,8 @@ + $(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 \ ++ 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; \ |