From 9a80f06b35ea11edf502bbc37692a6a158894da5 Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Sun, 22 Apr 2007 10:27:49 +0000 Subject: [PATCH] Use do{conf,init}d, bug #174266. Package-Manager: portage-2.1.2.2 --- net-analyzer/fail2ban/ChangeLog | 5 ++++- net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild | 8 +++----- net-analyzer/nagios-core/ChangeLog | 8 +++++++- .../nagios-core/nagios-core-1.4.1-r1.ebuild | 9 +++------ net-analyzer/nagios-core/nagios-core-1.4.1.ebuild | 11 ++++------- .../nagios-core/nagios-core-2.3.1-r1.ebuild | 9 +++------ net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild | 9 +++------ net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild | 9 +++------ net-analyzer/nagios-core/nagios-core-2.8.ebuild | 9 +++------ net-analyzer/traffic-vis/ChangeLog | 6 +++++- .../traffic-vis/traffic-vis-0.35-r1.ebuild | 8 +++----- net-analyzer/traffic-vis/traffic-vis-0.35.ebuild | 14 ++++++-------- 12 files changed, 47 insertions(+), 58 deletions(-) diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog index 564a3f5a76d4..060ac6380d11 100644 --- a/net-analyzer/fail2ban/ChangeLog +++ b/net-analyzer/fail2ban/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/fail2ban # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.25 2007/04/04 21:29:58 falco Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.26 2007/04/22 10:27:49 pva Exp $ + + 22 Apr 2007; fail2ban-0.6.2-r1.ebuild: + Use do{conf,init}d, bug #174266. *fail2ban-0.7.8 (04 Apr 2007) diff --git a/net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild index eab210a1ca64..0fff645e2f73 100644 --- a/net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild +++ b/net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild,v 1.2 2007/03/10 19:28:24 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.6.2-r1.ebuild,v 1.3 2007/04/22 10:27:49 pva Exp $ DESCRIPTION="Bans IP that make too many password failures" HOMEPAGE="http://fail2ban.sourceforge.net/" @@ -21,10 +21,8 @@ src_install() { insinto /etc newins config/fail2ban.conf.iptables fail2ban.conf # Install initd scripts - exeinto /etc/init.d - newexe config/gentoo-initd fail2ban - insinto /etc/conf.d - newins config/gentoo-confd fail2ban + newinitd config/gentoo-initd fail2ban + newconfd config/gentoo-confd fail2ban # Doc doman man/*.[0-9] dodoc CHANGELOG README TODO diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog index cbd1d2db9a7e..2237565ce98d 100644 --- a/net-analyzer/nagios-core/ChangeLog +++ b/net-analyzer/nagios-core/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/nagios-core # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.95 2007/03/12 00:28:47 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.96 2007/04/22 10:19:51 pva Exp $ + + 22 Apr 2007; nagios-core-1.4.1.ebuild, + nagios-core-1.4.1-r1.ebuild, nagios-core-2.3.1-r1.ebuild, + nagios-core-2.4-r1.ebuild, nagios-core-2.5-r1.ebuild, + nagios-core-2.8.ebuild: + Use do{conf,init}d, bug #174266. *nagios-core-2.8 (12 Mar 2007) diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild index 0d20f59fb2e1..b79130c63650 100644 --- a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $ inherit eutils apache-module toolchain-funcs @@ -165,11 +165,8 @@ src_install() { insinto /usr/share/doc/${PF}/contrib doins -r contrib/database contrib/eventhandlers - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios + doinitd ${FILESDIR}/nagios + newconfd ${FILESDIR}/conf.d nagios chmod 644 ${S}/contrib/*.cgi into /usr/nagios diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild index ae63c907d7ac..fbb624838397 100644 --- a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.6 2006/11/23 19:50:31 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.7 2007/04/22 10:19:51 pva Exp $ inherit eutils apache-module toolchain-funcs @@ -165,11 +165,8 @@ src_install() { insinto /usr/share/doc/${PF}/contrib doins -r contrib/database contrib/eventhandlers - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios + doinitd ${FILESDIR}/nagios + newconfd ${FILESDIR}/conf.d nagios chmod 644 ${S}/contrib/*.cgi into /usr/nagios diff --git a/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild index 14e05979f531..833456dbfb40 100644 --- a/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $ inherit eutils apache-module toolchain-funcs gnuconfig @@ -131,11 +131,8 @@ src_install() { insinto /usr/share/doc/${PF}/contrib doins -r contrib/eventhandlers - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios + doinitd ${FILESDIR}/nagios + newconfd ${FILESDIR}/conf.d nagios chmod 644 ${S}/contrib/*.cgi into /usr/nagios diff --git a/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild index 864d3d90609f..88187c7af9e2 100644 --- a/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $ inherit eutils apache-module toolchain-funcs gnuconfig @@ -131,11 +131,8 @@ src_install() { insinto /usr/share/doc/${PF}/contrib doins -r contrib/eventhandlers - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios + doinitd ${FILESDIR}/nagios + newconfd ${FILESDIR}/conf.d nagios chmod 644 ${S}/contrib/*.cgi into /usr/nagios diff --git a/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild index c661902ca565..1024097f854f 100644 --- a/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild +++ b/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild,v 1.1 2007/02/03 07:04:42 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $ inherit eutils apache-module toolchain-funcs gnuconfig @@ -131,11 +131,8 @@ src_install() { insinto /usr/share/doc/${PF}/contrib doins -r contrib/eventhandlers - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios + doinitd ${FILESDIR}/nagios + newconfd ${FILESDIR}/conf.d nagios chmod 644 ${S}/contrib/*.cgi into /usr/nagios diff --git a/net-analyzer/nagios-core/nagios-core-2.8.ebuild b/net-analyzer/nagios-core/nagios-core-2.8.ebuild index 9ec087a8b9cf..1d7f69d35cdd 100644 --- a/net-analyzer/nagios-core/nagios-core-2.8.ebuild +++ b/net-analyzer/nagios-core/nagios-core-2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.8.ebuild,v 1.1 2007/03/12 00:28:47 mjolnir Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.8.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $ inherit eutils apache-module toolchain-funcs gnuconfig @@ -131,11 +131,8 @@ src_install() { insinto /usr/share/doc/${PF}/contrib doins -r contrib/eventhandlers - exeinto /etc/init.d - doexe ${FILESDIR}/nagios - - insinto /etc/conf.d - newins ${FILESDIR}/conf.d nagios + doinitd ${FILESDIR}/nagios + newconfd ${FILESDIR}/conf.d nagios chmod 644 ${S}/contrib/*.cgi into /usr/nagios diff --git a/net-analyzer/traffic-vis/ChangeLog b/net-analyzer/traffic-vis/ChangeLog index cafc7804d4e4..f923d1cce019 100644 --- a/net-analyzer/traffic-vis/ChangeLog +++ b/net-analyzer/traffic-vis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/traffic-vis # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.14 2007/03/20 20:24:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.15 2007/04/22 10:24:42 pva Exp $ + + 22 Apr 2007; traffic-vis-0.35.ebuild, + traffic-vis-0.35-r1.ebuild: + Use do{conf,init}d, bug #174266. 20 Mar 2007; Raúl Porcel traffic-vis-0.35-r1.ebuild: x86 stable diff --git a/net-analyzer/traffic-vis/traffic-vis-0.35-r1.ebuild b/net-analyzer/traffic-vis/traffic-vis-0.35-r1.ebuild index 0e7111150aca..c017e39fc3ca 100644 --- a/net-analyzer/traffic-vis/traffic-vis-0.35-r1.ebuild +++ b/net-analyzer/traffic-vis/traffic-vis-0.35-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35-r1.ebuild,v 1.2 2007/03/20 20:24:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35-r1.ebuild,v 1.3 2007/04/22 10:24:42 pva Exp $ inherit eutils @@ -50,10 +50,8 @@ src_install() { doman ${mybin}.8 done - exeinto /etc/init.d - newexe "${FILESDIR}"/traffic-vis.init.d traffic-vis - insinto /etc/conf.d - newins "${FILESDIR}"/traffic-vis.conf.d traffic-vis + newinitd "${FILESDIR}"/traffic-vis.init.d traffic-vis + newconfd "${FILESDIR}"/traffic-vis.conf.d traffic-vis dodoc TODO README BUGS CHANGELOG } diff --git a/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild b/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild index 8af280852f3f..dba1280636ab 100644 --- a/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild +++ b/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild,v 1.12 2006/02/17 16:29:26 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild,v 1.13 2007/04/22 10:24:42 pva Exp $ inherit eutils @@ -23,8 +23,8 @@ DEPEND="virtual/libc src_unpack() { unpack ${A} ; cd ${S} - epatch ${FILESDIR}/${P}-gentoo.patch - epatch ${FILESDIR}/${P}-libpcap-header-fix.patch + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-libpcap-header-fix.patch } src_compile() { @@ -47,10 +47,8 @@ src_install() { doman ${mybin}.8 done - exeinto /etc/init.d - newexe ${FILESDIR}/traffic-vis.init.d traffic-vis - insinto /etc/conf.d - newins ${FILESDIR}/traffic-vis.conf.d traffic-vis + newinitd "${FILESDIR}"/traffic-vis.init.d traffic-vis + newconfd "${FILESDIR}"/traffic-vis.conf.d traffic-vis dodoc TODO README COPYING BUGS CHANGELOG } -- 2.26.2