From bc80465ed6e0c697f8f3e43947cda7ba37680cf9 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sun, 18 Jun 2006 01:09:16 +0000 Subject: [PATCH] Disable xinetd by default thanks to robbat2 in bug 137130 Package-Manager: portage-2.1.1_pre1 --- net-print/cups/ChangeLog | 5 ++++- net-print/cups/Manifest | 16 ++++++++-------- net-print/cups/cups-1.2.1-r1.ebuild | 4 +++- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index c9a30752b797..a5fa75446c0c 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.179 2006/06/16 22:47:37 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.180 2006/06/18 01:09:16 genstef Exp $ + + 18 Jun 2006; Stefan Schweizer cups-1.2.1-r1.ebuild: + Disable xinetd by default thanks to robbat2 in bug 137130 16 Jun 2006; Jason Wever cups-1.2.1-r1.ebuild: Added ~sparc keyword wrt bug #136902. diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 05a4a3901370..38bf74a68c6f 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -68,14 +68,14 @@ EBUILD cups-1.1.23-r7.ebuild 4653 RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a48 MD5 09c9a9dc9a485404b7828210068bcf0f cups-1.1.23-r7.ebuild 4653 RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a489 cups-1.1.23-r7.ebuild 4653 SHA256 09cf15f1ea38a706c673454d6b932aff09d2af8c260b15fc303151f09735f7bc cups-1.1.23-r7.ebuild 4653 -EBUILD cups-1.2.1-r1.ebuild 4797 RMD160 12771d661ff9244b057df70b5e8756f4400e8489 SHA1 5a581b1a626715bbaddf7b63603eb0c4072b85d5 SHA256 024e952e5658379b5f46c76cb0cecdf63c8871f1d9dc5a0106f6991ec5303ce2 -MD5 c9db5484765475d7180451000780f246 cups-1.2.1-r1.ebuild 4797 -RMD160 12771d661ff9244b057df70b5e8756f4400e8489 cups-1.2.1-r1.ebuild 4797 -SHA256 024e952e5658379b5f46c76cb0cecdf63c8871f1d9dc5a0106f6991ec5303ce2 cups-1.2.1-r1.ebuild 4797 -MISC ChangeLog 24416 RMD160 fdbdbc4a95c22e0323575163eddadf65a622b9d3 SHA1 0f5ac654c9498db2b6389575348e66e86d0c88fb SHA256 7029bd277db9759251009303d983fb210f510e20efe4b6d8696dc77c1618d9ec -MD5 617c4ce2216936968793105441c293a5 ChangeLog 24416 -RMD160 fdbdbc4a95c22e0323575163eddadf65a622b9d3 ChangeLog 24416 -SHA256 7029bd277db9759251009303d983fb210f510e20efe4b6d8696dc77c1618d9ec ChangeLog 24416 +EBUILD cups-1.2.1-r1.ebuild 4915 RMD160 55705674137f5c50dd568b60315c998c8969d54c SHA1 dd403cdd5d4349b4751176210781986e985f3c4e SHA256 6766990f2ea22bdd27b419d7b017d75bfb1b43e4b1909fdc05ed30256397244f +MD5 777e6c4a56235d695c0a9ebdbb3fa45d cups-1.2.1-r1.ebuild 4915 +RMD160 55705674137f5c50dd568b60315c998c8969d54c cups-1.2.1-r1.ebuild 4915 +SHA256 6766990f2ea22bdd27b419d7b017d75bfb1b43e4b1909fdc05ed30256397244f cups-1.2.1-r1.ebuild 4915 +MISC ChangeLog 24554 RMD160 81fb507996012b808e0af6c24086eb9860badc74 SHA1 3e150032f0ac33c259b7e46f658bcc3c7161de81 SHA256 44a5f8b440ec31d1ecae7b837dd3a0604cc16002e20018e3ff066b477fb51062 +MD5 577807a1201eaa1ad91ac3c5c43c9b77 ChangeLog 24554 +RMD160 81fb507996012b808e0af6c24086eb9860badc74 ChangeLog 24554 +SHA256 44a5f8b440ec31d1ecae7b837dd3a0604cc16002e20018e3ff066b477fb51062 ChangeLog 24554 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 diff --git a/net-print/cups/cups-1.2.1-r1.ebuild b/net-print/cups/cups-1.2.1-r1.ebuild index 54f2b8e4a7b3..591adf96ab25 100644 --- a/net-print/cups/cups-1.2.1-r1.ebuild +++ b/net-print/cups/cups-1.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r1.ebuild,v 1.7 2006/06/16 22:47:37 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.1-r1.ebuild,v 1.8 2006/06/18 01:09:16 genstef Exp $ inherit eutils pam flag-o-matic multilib autotools @@ -114,6 +114,8 @@ src_install() { newinitd ${FILESDIR}/cupsd.rc6 cupsd sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd + grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \ + sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd # install pdftops filter exeinto /usr/libexec/cups/filter/ -- 2.26.2