public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2011-11-22 22:45 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2011-11-22 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ea6af351b84ad0ebfc7ed481d568e21219a4add6
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 22:44:32 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 22:44:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=ea6af351

icinga add

---
 net-analyzer/icinga/ChangeLog                      |   34 +++
 net-analyzer/icinga/Manifest                       |   11 +
 .../icinga/files/fix-prestripped-binaries.patch    |   23 ++
 net-analyzer/icinga/files/icinga-apache.conf       |   23 ++
 net-analyzer/icinga/files/icinga-conf.d            |    3 +
 net-analyzer/icinga/files/icinga-init.d-2          |   51 +++++
 net-analyzer/icinga/files/icinga-lighty.conf       |   24 ++
 net-analyzer/icinga/files/ido2db-conf.d            |    1 +
 net-analyzer/icinga/files/ido2db-init.d            |   35 +++
 net-analyzer/icinga/icinga-1.5.1-r3.ebuild         |  231 ++++++++++++++++++++
 net-analyzer/icinga/metadata.xml                   |   16 ++
 11 files changed, 452 insertions(+), 0 deletions(-)

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
new file mode 100644
index 0000000..11fd358
--- /dev/null
+++ b/net-analyzer/icinga/ChangeLog
@@ -0,0 +1,34 @@
+# ChangeLog for net-analyzer/icinga
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.5 2011/11/22 19:53:37 prometheanfire Exp $
+
+  22 Nov 2011; mthode <mthode@gentoo.org> -icinga-1.5.1-r2.ebuild:
+  removed icinga-1.5.1-r2.ebuild for init.d error (fix is in r3)
+
+*icinga-1.5.1-r3 (22 Nov 2011)
+
+  22 Nov 2011; mthode <mthode@gentoo.org> +icinga-1.5.1-r3.ebuild,
+  files/icinga-init.d-2:
+  changed default install from /var/icinga to /var/lib/icinga
+
+*icinga-1.5.1-r2 (21 Nov 2011)
+
+  21 Nov 2011; mthode <mthode@gentoo.org> +icinga-1.5.1-r2.ebuild,
+  +files/icinga-init.d-2:
+  Changed directory perms and file locations and initscript, see bug 391143 for
+  more info
+
+*icinga-1.5.1-r1 (15 Nov 2011)
+
+  15 Nov 2011; mthode <mthode@gentoo.org> +icinga-1.5.1-r1.ebuild,
+  +files/fix-prestripped-binaries.patch:
+  Revbump to fix prestripped-binaries
+
+*icinga-1.5.1 (15 Nov 2011)
+
+  15 Nov 2011; mthode <mthode@gentoo.org> +files/icinga-apache.conf,
+  +files/icinga-conf.d, +files/icinga-init.d, +files/icinga-lighty.conf,
+  +files/ido2db-conf.d, +icinga-1.5.1.ebuild, +files/ido2db-init.d,
+  +metadata.xml:
+  New ebuild for icinga. Writen by Prometheanfire. Fixes bug #271339.
+

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
new file mode 100644
index 0000000..daa0bbd
--- /dev/null
+++ b/net-analyzer/icinga/Manifest
@@ -0,0 +1,11 @@
+AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
+AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
+AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
+AUX icinga-init.d-2 1265 RMD160 253927cf7a49ab64a8be17973b000419a937b1a8 SHA1 b12975884c4c65523d10546fab1c3e13c6395334 SHA256 fb0b1ba20ab69f9fd17f06734f3bf0e6bb3b3f0ac0f8fa699d5514eb48d1a63c
+AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
+AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
+AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
+DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
+EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
+MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
+MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries.patch b/net-analyzer/icinga/files/fix-prestripped-binaries.patch
new file mode 100644
index 0000000..1ee52c5
--- /dev/null
+++ b/net-analyzer/icinga/files/fix-prestripped-binaries.patch
@@ -0,0 +1,23 @@
+diff -Naur icinga-1.5.1.orig//base/Makefile.in icinga-1.5.1/base/Makefile.in
+--- icinga-1.5.1.orig//base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga-1.5.1/base/Makefile.in	2011-11-14 19:45:36.000000000 -0500
+@@ -39,7 +39,7 @@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+ 
+ CGIURL=@cgiurl@
+ HTMURL=@htmurl@
+diff -Naur icinga-1.5.1.orig//cgi/Makefile.in icinga-1.5.1/cgi/Makefile.in
+--- icinga-1.5.1.orig//cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga-1.5.1/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
+@@ -20,7 +20,7 @@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+ 
+ CGIEXTRAS=@CGIEXTRAS@

diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf
new file mode 100644
index 0000000..50fb220
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-apache.conf
@@ -0,0 +1,23 @@
+<IfDefine ICINGA>
+	ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/
+	<Directory "/usr/lib/icinga/cgi-bin/">
+		AllowOverride AuthConfig
+		Options ExecCGI
+		Order allow,deny
+		Allow from all
+		AuthName "Icinga Access"
+		AuthType Basic
+		AuthUserFile /etc/icinga/htpasswd.users
+		Require valid-user
+	</Directory>
+	Alias /icinga /usr/share/icinga/htdocs
+	<Directory "/usr/share/icinga/htdocs">
+		AllowOverride AuthConfig
+		Order allow,deny
+		Allow from all
+		AuthName "Icinga Access"
+		AuthType Basic
+		AuthUserFile /etc/icinga/htpasswd.users
+		Require valid-user
+	</Directory>
+</IfDefine>

diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d
new file mode 100644
index 0000000..da5b324
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-conf.d
@@ -0,0 +1,3 @@
+# Distributed monitoring users will want to configure here the ip/hostname of the central server.
+# It will be used by submit_check_result_via_nsca.
+NAGIOS_NSCA_HOST="localhost"

diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
new file mode 100755
index 0000000..e7931d1
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+
+opts="${opts} reload checkconfig"
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	kill -HUP `cat /var/run/icinga/icinga.lock` &>/dev/null
+	eend $?
+}
+
+checkconfig() {
+	# Silent Check
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting icinga"
+	checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
+	checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
+	rm -f /var/lib/icinga/rw/icinga.cmd
+	start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping icinga"
+	start-stop-daemon --stop --pidfile /var/run/icinga/icinga.lock
+	rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
+	rm -r /tmp/icinga
+	eend $?
+}
+
+svc_restart() {
+	checkconfig || return 1
+	ebegin "Restarting icinga"
+	svc_stop
+	svc_start
+	eend $?
+}

diff --git a/net-analyzer/icinga/files/icinga-lighty.conf b/net-analyzer/icinga/files/icinga-lighty.conf
new file mode 100644
index 0000000..678f233
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-lighty.conf
@@ -0,0 +1,24 @@
+server.modules += ("mod_cgi")
+server.modules += ("mod_auth")
+server.modules += ("mod_alias")
+
+auth.require += ( "/icinga" =>
+	(
+		"method"  => "digest",
+		"realm"   => "icinga",
+		"require" => "valid-user"
+	)
+)
+
+$HTTP["url"] =~ "^/icinga/cgi-bin/" {
+	dir-listing.activate = "disable"
+	cgi.assign = (
+		".pl"  => "/usr/bin/perl",
+		".cgi" => ""
+	)
+}
+
+alias.url += (
+	"/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin",
+	"/icinga"         => "/usr/share/icinga/htdocs"
+)

diff --git a/net-analyzer/icinga/files/ido2db-conf.d b/net-analyzer/icinga/files/ido2db-conf.d
new file mode 100644
index 0000000..5429fa9
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-conf.d
@@ -0,0 +1 @@
+IDO2DBCFG="/etc/icinga/ido2db.cfg"

diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
new file mode 100644
index 0000000..75051ab
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -0,0 +1,35 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.1 2011/11/15 00:14:29 prometheanfire Exp $
+
+IDO2DBBIN="/usr/sbin/ido2db"
+SOCKET="/var/icinga/ido.sock"
+
+function check() {
+	if [ -S "${SOCKET}" ] ; then
+		ewarn "Strange, the socket file already exist in \"${SOCKET}\""
+		ewarn "it will be removed now and re-created by ido2db"
+		ewarn "BUT please make your checks."
+		rm -f "${SOCKET}"
+	fi
+}
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+start() {
+	check
+	ebegin "Starting ido2db"
+	start-stop-daemon --quiet --start --pidfile /var/icinga/ido2db.lock --startas ${IDO2DBBIN} -- -c ${IDO2DBCFG}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ido2db"
+	start-stop-daemon --quiet --stop --pidfile /var/icinga/ido2db.lock --name /usr/sbin/ido2db
+	eend $?
+}

diff --git a/net-analyzer/icinga/icinga-1.5.1-r3.ebuild b/net-analyzer/icinga/icinga-1.5.1-r3.ebuild
new file mode 100644
index 0000000..96d204b
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.5.1-r3.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.5.1-r3.ebuild,v 1.2 2011/11/22 21:06:50 prometheanfire Exp $
+
+EAPI=2
+
+inherit depend.apache eutils multilib toolchain-funcs
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2 api debug +idoutils lighttpd +mysql perl plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
+		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( net-analyzer/nagios-plugins )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add \"-D ICINGA\""
+				elog
+				elog "Icinga web service needs user	authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
+}
+
+src_configure() {
+	local myconf
+	local myconf2
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	$(use_enable debug DEBUG0)
+	$(use_enable debug DEBUG1)
+	$(use_enable debug DEBUG2)
+	$(use_enable debug DEBUG3)
+	$(use_enable debug DEBUG4)
+	$(use_enable debug DEBUG5)
+	--disable-statuswrl
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga"
+
+	myconf2="--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga"
+
+	if use plugins ; then
+		myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf2+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf2+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf2+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf2+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf} ${myconf2}
+	if use api ; then
+		cd module/icinga-api || die
+		econf ${myconf2}
+	fi
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	sed -i -e 's/^contactgroups$//g' Makefile || die
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
+	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+	if use api ; then
+		 emake DESTDIR="${D}" install-api || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+	fi
+
+	fowners -R root:root /usr/$(get_libdir)/icinga || die
+	cd "${D}" || die
+	find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+	find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+}
+
+pkg_postinst() {
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	elog "/var/icinga was moved to /var/lib/icinga"
+	elog "please move the file if this was an upgrade"
+}

diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
new file mode 100644
index 0000000..bc77e2a
--- /dev/null
+++ b/net-analyzer/icinga/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
+	<use>
+		<flag name="api">Adds support for the icinga API</flag>
+		<flag name="idoutils">Adds DB support</flag>
+		<flag name="lighttpd">Adds Lighttpd support</flag>
+		<flag name="plugins">Adds support for nagios plugins</flag>
+		<flag name="web">Adds generic web interface support</flag>
+	</use>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2011-11-25 17:59 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2011-11-25 17:59 UTC (permalink / raw
  To: gentoo-commits

commit:     8d8c214ffad54a3f780c1886613c5762aebd8e95
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 17:57:54 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 17:57:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8d8c214f

changed init (no need to check, does so auto) removed unneeded seds, no need for myconf2 because the api use flag is not used anymore

---
 net-analyzer/icinga/Manifest                 |    4 ++--
 net-analyzer/icinga/files/icinga-init.d-2    |    9 ---------
 net-analyzer/icinga/icinga-1.6.0_beta.ebuild |   23 +++++++++--------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 22007e1..da69afe 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,13 +1,13 @@
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
-AUX icinga-init.d-2 1265 RMD160 253927cf7a49ab64a8be17973b000419a937b1a8 SHA1 b12975884c4c65523d10546fab1c3e13c6395334 SHA256 fb0b1ba20ab69f9fd17f06734f3bf0e6bb3b3f0ac0f8fa699d5514eb48d1a63c
+AUX icinga-init.d-2 972 RMD160 4ca4966313542b7daf8e5e234fe09ee39055f275 SHA1 3c4073287261f1b7db5d8d658544e6b49c5f938a SHA256 affec920a70a5209c9c5f2208847844e409df11041cd8a2fd67d833ae14ececa
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
-EBUILD icinga-1.6.0_beta.ebuild 6909 RMD160 472c3d000dd18ad3eb81beedfc1b33a279520f4e SHA1 63568b272817c827f7385bf6f77473aca0802094 SHA256 088158a13f5772bea4bebaf05d1cfced7f277a16bb5b052b05ccc90a43c9bfc1
+EBUILD icinga-1.6.0_beta.ebuild 6706 RMD160 1be879859e6d00af4adcc1593e1fa044a4339f25 SHA1 1bd0ef938df310ff120ccf8f5f585452744867a4 SHA256 8438a0cfec694ca926e3a097611144333aed7d9252cae20f9f98ff23b81c5410
 MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
index e7931d1..062a33a 100755
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -16,16 +16,7 @@ reload()
 	eend $?
 }
 
-checkconfig() {
-	# Silent Check
-	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
-	# Now we know there's problem - run again and display errors
-	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
-	eend $? "Configuration Error. Please fix your configfile"
-}
-
 start() {
-	checkconfig || return 1
 	ebegin "Starting icinga"
 	checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
 	checkpath -f -o icinga:icinga /var/log/icinga/icinga.log

diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
index 28d26d8..3419911 100644
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
@@ -89,7 +89,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	local myconf2
 
 	myconf="$(use_enable perl embedded-perl)
 	$(use_with perl perlcache)
@@ -103,9 +102,8 @@ src_configure() {
 	$(use_enable debug DEBUG5)
 	--disable-statuswrl
 	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga"
-
-	myconf2="--bindir=/usr/sbin
+	--with-log-dir=/var/log/icinga
+	--bindir=/usr/sbin
 	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
 	--datarootdir=/usr/share/icinga/htdocs
 	--localstatedir=/var/lib/icinga
@@ -114,23 +112,23 @@ src_configure() {
 	--with-temp-dir=/tmp/icinga"
 
 	if use plugins ; then
-		myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
+		myconf+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
 	else
-		myconf2+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
+		myconf+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
 	fi
 
 	if use !apache2 && use !lighttpd ; then
-		myconf2+=" --with-command-group=icinga"
+		myconf+=" --with-command-group=icinga"
 	else
 		if use apache2 ; then
 			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf2+=" --with-command-group=apache"
+			myconf+=" --with-command-group=apache"
 		elif use lighttpd ; then
-			myconf2+=" --with-command-group=lighttpd"
+			myconf+=" --with-command-group=lighttpd"
 		fi
 	fi
 
-	econf ${myconf} ${myconf2}
+	econf ${myconf}
 }
 
 src_compile() {
@@ -154,12 +152,9 @@ src_install() {
 		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
 	fi
 
-	sed -i -e 's/^contactgroups$//g' Makefile || die
-
 	emake DESTDIR="${D}" install{,-config,-commandmode} || die
 
-#	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
-#	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+	sed -i -e 's/var\/lib\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
 
 	if use idoutils ; then
 		 emake DESTDIR="${D}" install-idoutils || die



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2011-12-04 19:20 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2011-12-04 19:20 UTC (permalink / raw
  To: gentoo-commits

commit:     1561b72ce361d2db9de3a44f3fc1ab2367179e13
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 19:20:09 2011 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 19:20:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=1561b72c

updated init scripts

---
 net-analyzer/icinga/Manifest              |    4 ++--
 net-analyzer/icinga/files/icinga-init.d-2 |    4 ++--
 net-analyzer/icinga/files/ido2db-init.d   |   13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index ac06641..4c0a6c6 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,10 +1,10 @@
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
-AUX icinga-init.d-2 972 RMD160 4ca4966313542b7daf8e5e234fe09ee39055f275 SHA1 3c4073287261f1b7db5d8d658544e6b49c5f938a SHA256 affec920a70a5209c9c5f2208847844e409df11041cd8a2fd67d833ae14ececa
+AUX icinga-init.d-2 999 RMD160 c217fe01d49a4e29b22fd1c2a9125918fd1ccc69 SHA1 f791fa9a1b70b4593afd84adaafeb6bcffcb7931 SHA256 f94dc546ca1a45f67b3d79aff39f937a5fb0b6ca19de3110f30e09d7a0c6bf08
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
-AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
+AUX ido2db-init.d 990 RMD160 505b54e4ca4cc7ce4771680837a937c0416d9394 SHA1 a2e733b5b4808e360736f82f47ba3cf88a40cc4c SHA256 9d460516288fb6a43907df8e51392f974ab3ab5c10d7d9ba2297fe7acb024186
 DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b

diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
index 062a33a..8f05cc7 100755
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 
-opts="${opts} reload checkconfig"
+extra_commands="${extra_commands} reload checkconfig"
 
 depend() {
 	need net
 	use dns logger firewall
-	after mysql postgresql
+	after mysql postgresql ido2db
 }
 
 reload()

diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
index 75051ab..8763731 100644
--- a/net-analyzer/icinga/files/ido2db-init.d
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -4,14 +4,15 @@
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.1 2011/11/15 00:14:29 prometheanfire Exp $
 
 IDO2DBBIN="/usr/sbin/ido2db"
-SOCKET="/var/icinga/ido.sock"
+IDO2DBSOCKET="/var/lib/icinga/ido.sock"
+IDO2DBLOCK="/var/lib/icinga/ido2db.lock"
 
 function check() {
-	if [ -S "${SOCKET}" ] ; then
-		ewarn "Strange, the socket file already exist in \"${SOCKET}\""
+	if [ -S "${IDO2DBSOCKET}" ] ; then
+		ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\""
 		ewarn "it will be removed now and re-created by ido2db"
 		ewarn "BUT please make your checks."
-		rm -f "${SOCKET}"
+		rm -f "${IDO2DBSOCKET}"
 	fi
 }
 
@@ -24,12 +25,12 @@ depend() {
 start() {
 	check
 	ebegin "Starting ido2db"
-	start-stop-daemon --quiet --start --pidfile /var/icinga/ido2db.lock --startas ${IDO2DBBIN} -- -c ${IDO2DBCFG}
+	start-stop-daemon --start --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN} -- -c ${IDO2DBCFG}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ido2db"
-	start-stop-daemon --quiet --stop --pidfile /var/icinga/ido2db.lock --name /usr/sbin/ido2db
+	start-stop-daemon --stop --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN}
 	eend $?
 }



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2012-01-12 17:11 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2012-01-12 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     785208c507fc8ed1d29c6a3d77c39c90ba4309af
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 17:10:54 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 17:10:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=785208c5

updated init so that reload would work

---
 net-analyzer/icinga/ChangeLog             |    5 ++++-
 net-analyzer/icinga/Manifest              |    4 ++--
 net-analyzer/icinga/files/icinga-init.d-2 |    8 ++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 11fd358..9a69915 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for net-analyzer/icinga
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.5 2011/11/22 19:53:37 prometheanfire Exp $
 
+  12 Jan 2012; mthode <mthode@gentoo.org> files/icinga-init.d-2:
+  fixed initscript reload reload
+
   22 Nov 2011; mthode <mthode@gentoo.org> -icinga-1.5.1-r2.ebuild:
   removed icinga-1.5.1-r2.ebuild for init.d error (fix is in r3)
 

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 4c0a6c6..a339146 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,7 +1,7 @@
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
-AUX icinga-init.d-2 999 RMD160 c217fe01d49a4e29b22fd1c2a9125918fd1ccc69 SHA1 f791fa9a1b70b4593afd84adaafeb6bcffcb7931 SHA256 f94dc546ca1a45f67b3d79aff39f937a5fb0b6ca19de3110f30e09d7a0c6bf08
+AUX icinga-init.d-2 1267 RMD160 843973fac0562c75c92362aa6f313ba617abe2fd SHA1 af23cfd4f3a911c648aa125bafb873707d4b34b8 SHA256 cfef566114fcfbd53dc3f43f7352b934d33c7a0d62f554dfb0eae352f6e09d01
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 990 RMD160 505b54e4ca4cc7ce4771680837a937c0416d9394 SHA1 a2e733b5b4808e360736f82f47ba3cf88a40cc4c SHA256 9d460516288fb6a43907df8e51392f974ab3ab5c10d7d9ba2297fe7acb024186
@@ -9,5 +9,5 @@ DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
 EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
 EBUILD icinga-1.6.1.ebuild 6963 RMD160 a18fc79282f187a14f7eb40caee44bbf7f02c601 SHA1 a9c071619cfb8e7990aa203881ccd4d3fb0d4f5e SHA256 35437f349927e334cab3a824072dd93edbf6721ebd48091d4c38c613e92d93d3
-MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
+MISC ChangeLog 1362 RMD160 ccdcbf450ebec3d8f4d9c094f3ca7f7ea97aa4cb SHA1 6dc9074a6656350d3e978b5527395d6208fa1e2f SHA256 48bb0a8b9ec3732dc21ea7478b4df6f4442db5a49771e2ea86f394c3ad38e4cd
 MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d

diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
index 8f05cc7..683e52c 100755
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -8,6 +8,14 @@ depend() {
 	after mysql postgresql ido2db
 }
 
+checkconfig() {
+	# Silent Check
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
 reload()
 {
 	checkconfig || return 1



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2012-05-14 18:01 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2012-05-14 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ae514a9a283fef959688aef5266cb6572e73f469
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 17:53:13 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 17:53:13 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=ae514a9a

first test commit of icinga 1.7.0_beta1

---
 net-analyzer/icinga/Manifest                  |   16 +--
 net-analyzer/icinga/files/icinga-init.d-2     |    4 +-
 net-analyzer/icinga/icinga-1.7.0_beta1.ebuild |  252 +++++++++++++++++++++++++
 net-analyzer/icinga/metadata.xml              |    1 +
 4 files changed, 259 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 2cb7446..a847ed8 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
 AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8fc60da8f4fb5a7d29a8be83948e11a8719e4 SHA256 d9014a1ce527282e5a404e602b3f08e0a4b842e02bd2fcdd8fffb8e67922557d
-AUX icinga-init.d-2 1267 RMD160 843973fac0562c75c92362aa6f313ba617abe2fd SHA1 af23cfd4f3a911c648aa125bafb873707d4b34b8 SHA256 cfef566114fcfbd53dc3f43f7352b934d33c7a0d62f554dfb0eae352f6e09d01
+AUX icinga-init.d-2 1265 RMD160 7c3716d06b4b0e781d59ae07a8117b14def94b21 SHA1 467a5f683eaa545cd0979fbf4cbafcc3890bcba4 SHA256 febeb6ef97d8f0aa5de24f8152939a3003d1f5f8933b5bf96b048d02c216db95
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 990 RMD160 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
+DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
 EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5
 EBUILD icinga-1.6.1-r2.ebuild 6961 RMD160 d75ffeb9562007091ac342e106e45154e10527b1 SHA1 2198bc9c8e17b3ff35a0503ecee059c13dec1b12 SHA256 097a3a082bdbb8f0264131445608130465ed7d2ecad1e35d4433022d12c22683
+EBUILD icinga-1.7.0_beta1.ebuild 7603 RMD160 9392855250076bf86b97db7d0e12059e119bec07 SHA1 b5b8079a650781a50be47921885f4e3a5347187f SHA256 52dbc68d937221093b0c9bd346f94748c8aab2128295b1a1b6e4212804ba1f93
 MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
-MISC metadata.xml 534 RMD160 238ecadc3b6e49610eae7971ad163051640fe964 SHA1 47d5abf8e73c8bfefd7c5436237a488b1156414d SHA256 243fb55b366f5eac56dd56e4f6efa5b22cec0bd9644669b5e10b5b71ca92ef07
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk9Z1N0ACgkQuUQtlDBCeQJowQCffi5itsEDdx+A/EVnm/jusT2Q
-fHoAn0ISQBZ10UFGcL/o+FqgnEPx62/5
-=XE/6
------END PGP SIGNATURE-----
+MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6

diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
index 683e52c..5ed3fb0 100755
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -29,13 +29,13 @@ start() {
 	checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
 	checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
 	rm -f /var/lib/icinga/rw/icinga.cmd
-	start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
+	start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.pid -- -d /etc/icinga/icinga.cfg
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping icinga"
-	start-stop-daemon --stop --pidfile /var/run/icinga/icinga.lock
+	start-stop-daemon --stop --pidfile /var/run/icinga/icinga.pid
 	rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
 	rm -r /tmp/icinga
 	eend $?

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
new file mode 100644
index 0000000..360d4fa
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r2.ebuild,v 1.3 2012/03/09 10:00:55 phajdan.jr Exp $
+
+EAPI=2
+
+inherit depend.apache eutils multilib toolchain-funcs
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://superb-dca2.dl.sourceforge.net/project/icinga/icinga/1.7.0beta/icinga-1.7.0beta1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+apache2 debug eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
+		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( net-analyzer/nagios-plugins )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	$(use_enable debug DEBUG0)
+	$(use_enable debug DEBUG1)
+	$(use_enable debug DEBUG2)
+	$(use_enable debug DEBUG3)
+	$(use_enable debug DEBUG4)
+	$(use_enable debug DEBUG5)
+	--disable-statuswrl
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		else
+			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
+			ewarn "out-of-the-box. Since you are not using one of them, you"
+			ewarn "have to configure your webserver accordingly yourself."
+		fi
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	fowners -R root:root /usr/$(get_libdir)/icinga || die
+	cd "${D}" || die
+	find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+	find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		elog
+		if use apache2 || use lighttpd ; then
+			elog "There are several possible solutions to accomplish this,"
+			elog "choose the one you are most comfortable with:"
+			elog
+			if use apache2 ; then
+				elog "	usermod -G icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}

diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index 65a79e7..476a6f0 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -7,6 +7,7 @@
 		<flag name="lighttpd">Adds Lighttpd support</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 		<flag name="web">Adds generic web interface support</flag>
+		<flag name="eventhandler">Adds support for running custom scripts whenever a host or service state change occurs</flag>
 	</use>
 	<maintainer>
 		<email>prometheanfire@gentoo.org</email>



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2012-05-14 18:19 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2012-05-14 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     d55049ef2aec33ab7b988136d89e65ede8582748
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:19:34 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:19:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=d55049ef

first attempt to fix the patch for 1.7

---
 .../files/fix-prestripped-binaries-1.7.0.patch     |   23 ++++++++++++++++++++
 net-analyzer/icinga/icinga-1.7.0_beta1.ebuild      |    2 +-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
new file mode 100644
index 0000000..3dc7978
--- /dev/null
+++ b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
@@ -0,0 +1,23 @@
+diff -Naur icinga-1.5.1.orig//base/Makefile.in icinga-1.5.1/base/Makefile.in
+--- icinga-1.5.1.orig//base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga-1.5.1/base/Makefile.in	2011-11-14 19:45:36.000000000 -0500
+@@ -41,7 +41,7 @@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+ 
+ CGIURL=@cgiurl@
+ HTMURL=@htmurl@
+diff -Naur icinga-1.5.1.orig//cgi/Makefile.in icinga-1.5.1/cgi/Makefile.in
+--- icinga-1.5.1.orig//cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga-1.5.1/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
+@@ -21,7 +21,7 @@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+ 
+ CGIEXTRAS=@CGIEXTRAS@

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
index 360d4fa..0c34605 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -37,7 +37,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2012-05-14 18:27 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2012-05-14 18:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2e463662d96d325ad2c9d87a139054f6688de538
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:27:25 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:27:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=2e463662

yep...

---
 net-analyzer/icinga/Manifest                       |    2 +-
 .../files/fix-prestripped-binaries-1.7.0.patch     |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 5c2c001..13ff175 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,4 +1,4 @@
-AUX fix-prestripped-binaries-1.7.0.patch 775 RMD160 296c6b7e05a18471fbc3ebb5feb028dadd26a068 SHA1 9173a24e36c1d1fa1a381410a9b6a426d887499b SHA256 3baec839badaf8bc1baf8ead781c39358777378c112926900a9b30b5358b1fdd
+AUX fix-prestripped-binaries-1.7.0.patch 724 RMD160 1cfb0b8de71baf93381c0bfb0fcf7813999122cf SHA1 cad257105d86f937a1876121578d2c96493b8604 SHA256 29e6bd3d5455d1e0c243c0c6aca2ed0688e424972498b264a3263ed5f37d6f3e
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db

diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
index 3dc7978..ecef041 100644
--- a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
+++ b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
@@ -1,6 +1,6 @@
-diff -Naur icinga-1.5.1.orig//base/Makefile.in icinga-1.5.1/base/Makefile.in
---- icinga-1.5.1.orig//base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
-+++ icinga-1.5.1/base/Makefile.in	2011-11-14 19:45:36.000000000 -0500
+diff -Naur icinga.orig/base/Makefile.in icinga/base/Makefile.in
+--- icinga.orig/base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga/base/Makefile.in		2011-11-14 19:45:36.000000000 -0500
 @@ -41,7 +41,7 @@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
@@ -10,9 +10,9 @@ diff -Naur icinga-1.5.1.orig//base/Makefile.in icinga-1.5.1/base/Makefile.in
  
  CGIURL=@cgiurl@
  HTMURL=@htmurl@
-diff -Naur icinga-1.5.1.orig//cgi/Makefile.in icinga-1.5.1/cgi/Makefile.in
---- icinga-1.5.1.orig//cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
-+++ icinga-1.5.1/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
+diff -Naur icinga.orig/cgi/Makefile.in icinga/cgi/Makefile.in
+--- icinga.orig/cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
 @@ -21,7 +21,7 @@
  INSTALL_OPTS=@INSTALL_OPTS@
  INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2012-05-14 18:34 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2012-05-14 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ff09f9f324836914ad1fdecb1c40f4de63e501bc
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:33:40 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:33:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=ff09f9f3

removed init.d-2 to fix shits

---
 net-analyzer/icinga/Manifest                  |    9 ++--
 net-analyzer/icinga/files/icinga-init.d       |   34 ++++++++--------
 net-analyzer/icinga/files/icinga-init.d-2     |   50 -------------------------
 net-analyzer/icinga/icinga-1.6.1-r1.ebuild    |    2 +-
 net-analyzer/icinga/icinga-1.6.1-r2.ebuild    |    2 +-
 net-analyzer/icinga/icinga-1.7.0_beta1.ebuild |    2 +-
 6 files changed, 24 insertions(+), 75 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 13ff175..1c98f0d 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -2,15 +2,14 @@ AUX fix-prestripped-binaries-1.7.0.patch 724 RMD160 1cfb0b8de71baf93381c0bfb0fcf
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
-AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8fc60da8f4fb5a7d29a8be83948e11a8719e4 SHA256 d9014a1ce527282e5a404e602b3f08e0a4b842e02bd2fcdd8fffb8e67922557d
-AUX icinga-init.d-2 1265 RMD160 7c3716d06b4b0e781d59ae07a8117b14def94b21 SHA1 467a5f683eaa545cd0979fbf4cbafcc3890bcba4 SHA256 febeb6ef97d8f0aa5de24f8152939a3003d1f5f8933b5bf96b048d02c216db95
+AUX icinga-init.d 1265 RMD160 7c3716d06b4b0e781d59ae07a8117b14def94b21 SHA1 467a5f683eaa545cd0979fbf4cbafcc3890bcba4 SHA256 febeb6ef97d8f0aa5de24f8152939a3003d1f5f8933b5bf96b048d02c216db95
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 990 RMD160 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
 DIST icinga-1.7.0beta1.tar.gz 12938996 RMD160 18d5b9c107a98400e9a564b34013b0159f987a9c SHA1 a468866974c86b2b04e3409961f58c7f20d2421d SHA256 5b218fdf83ce3f024def7d57413d0e2e597d82838d46d07ec811733088f185df
-EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5
-EBUILD icinga-1.6.1-r2.ebuild 6961 RMD160 d75ffeb9562007091ac342e106e45154e10527b1 SHA1 2198bc9c8e17b3ff35a0503ecee059c13dec1b12 SHA256 097a3a082bdbb8f0264131445608130465ed7d2ecad1e35d4433022d12c22683
-EBUILD icinga-1.7.0_beta1.ebuild 7609 RMD160 6bbb5906be9352be5457378053e117cd51393e83 SHA1 492fe1758009017947da0c608fa30a8923de6d58 SHA256 969ff30909f3f7aedaccfb96a7c0252d300ca567a0c7f465b26e69171a1efb1a
+EBUILD icinga-1.6.1-r1.ebuild 6964 RMD160 8a5d24a7c2720ea577e65b64d8a0ebbf487b168b SHA1 3e5897629ce6cff3e00bd56dc9064095a6c84f73 SHA256 186a9cf8cbadc791c7ba7dcf15d7d0a2ce05b4e85d17837cf1b993c3e89c2129
+EBUILD icinga-1.6.1-r2.ebuild 6959 RMD160 3e9b5f213127d33939bc6a947a9a57c679a27bc1 SHA1 e15ada15d39639b71769bf37e06219a0b637a52b SHA256 7af2304fd680787a0aa41c86dddca14e284d9e54837edd3034a72d26a4b22873
+EBUILD icinga-1.7.0_beta1.ebuild 7607 RMD160 963c5cdedb7f914bb56116c1a47d88cf3ee3f659 SHA1 65fdcce64ec3796baddb1c30028a57010b325021 SHA256 3e7f4f78d567a6431d476ec383b7e7b6e0fe1c52da949c337db9d40a61774917
 MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
 MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6

diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
old mode 100644
new mode 100755
index f734f71..5ed3fb0
--- a/net-analyzer/icinga/files/icinga-init.d
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -1,19 +1,11 @@
 #!/sbin/runscript
 
-opts="${opts} reload checkconfig"
+extra_commands="${extra_commands} reload checkconfig"
 
 depend() {
 	need net
 	use dns logger firewall
-	after mysql postgresql
-}
-
-reload()
-{
-	checkconfig || return 1
-	ebegin "Reloading configuration"
-	killall -HUP icinga &>/dev/null
-	eend $?
+	after mysql postgresql ido2db
 }
 
 checkconfig() {
@@ -24,20 +16,28 @@ checkconfig() {
 	eend $? "Configuration Error. Please fix your configfile"
 }
 
-start() {
+reload()
+{
 	checkconfig || return 1
+	ebegin "Reloading configuration"
+	kill -HUP `cat /var/run/icinga/icinga.lock` &>/dev/null
+	eend $?
+}
+
+start() {
 	ebegin "Starting icinga"
-	touch /var/icinga/icinga.log /var/icinga/status.sav
-	chown icinga:icinga /var/icinga/icinga.log /var/icinga/status.sav
-	rm -f /var/icinga/rw/icinga.cmd
-	start-stop-daemon --quiet --start --startas /usr/sbin/icinga -e HOME="/var/icinga/home" --pidfile /var/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
+	checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
+	checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
+	rm -f /var/lib/icinga/rw/icinga.cmd
+	start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.pid -- -d /etc/icinga/icinga.cfg
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping icinga"
-	start-stop-daemon --quiet --stop --pidfile /var/icinga/icinga.lock
-	rm -f /var/icinga/status.log /var/icinga/icinga.tmp /var/icinga/icinga.lock /var/icinga/rw/icinga.cmd
+	start-stop-daemon --stop --pidfile /var/run/icinga/icinga.pid
+	rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
+	rm -r /tmp/icinga
 	eend $?
 }
 

diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
deleted file mode 100755
index 5ed3fb0..0000000
--- a/net-analyzer/icinga/files/icinga-init.d-2
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-
-extra_commands="${extra_commands} reload checkconfig"
-
-depend() {
-	need net
-	use dns logger firewall
-	after mysql postgresql ido2db
-}
-
-checkconfig() {
-	# Silent Check
-	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
-	# Now we know there's problem - run again and display errors
-	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
-	eend $? "Configuration Error. Please fix your configfile"
-}
-
-reload()
-{
-	checkconfig || return 1
-	ebegin "Reloading configuration"
-	kill -HUP `cat /var/run/icinga/icinga.lock` &>/dev/null
-	eend $?
-}
-
-start() {
-	ebegin "Starting icinga"
-	checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
-	checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
-	rm -f /var/lib/icinga/rw/icinga.cmd
-	start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.pid -- -d /etc/icinga/icinga.cfg
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping icinga"
-	start-stop-daemon --stop --pidfile /var/run/icinga/icinga.pid
-	rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
-	rm -r /tmp/icinga
-	eend $?
-}
-
-svc_restart() {
-	checkconfig || return 1
-	ebegin "Restarting icinga"
-	svc_stop
-	svc_start
-	eend $?
-}

diff --git a/net-analyzer/icinga/icinga-1.6.1-r1.ebuild b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
index a8fced0..bab1cbe 100644
--- a/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
@@ -112,7 +112,7 @@ src_install() {
 		 emake DESTDIR="${D}" install-idoutils || die
 	fi
 
-	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
 	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
 	if use idoutils ; then
 		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die

diff --git a/net-analyzer/icinga/icinga-1.6.1-r2.ebuild b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
index 0029df7..5a1994f 100644
--- a/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
@@ -112,7 +112,7 @@ src_install() {
 		 emake DESTDIR="${D}" install-idoutils || die
 	fi
 
-	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
 	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
 	if use idoutils ; then
 		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
index 0c34605..15ef04a 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -128,7 +128,7 @@ src_install() {
 		emake DESTDIR="${D}" install-eventhandlers || die
 	fi
 
-	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
 	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
 	if use idoutils ; then
 		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die



^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
@ 2012-05-14 19:02 Matt Thode
  0 siblings, 0 replies; 9+ messages in thread
From: Matt Thode @ 2012-05-14 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     c01560f9dc5654b724c4b55089374ee86743067b
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 19:02:17 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 19:02:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=c01560f9

boooo

---
 net-analyzer/icinga/Manifest                       |    2 +-
 .../files/fix-prestripped-binaries-1.7.0.patch     |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 6ae12a7..89bf91e 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,4 +1,4 @@
-AUX fix-prestripped-binaries-1.7.0.patch 724 RMD160 1cfb0b8de71baf93381c0bfb0fcf7813999122cf SHA1 cad257105d86f937a1876121578d2c96493b8604 SHA256 29e6bd3d5455d1e0c243c0c6aca2ed0688e424972498b264a3263ed5f37d6f3e
+AUX fix-prestripped-binaries-1.7.0.patch 857 RMD160 c704cb3cd5fdcd1c04d9a39706d0e74ebcb4f560 SHA1 38516871288f77104c7057925f65ccd2414e2ed8 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db

diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
index ecef041..256cfc8 100644
--- a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
+++ b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
@@ -1,23 +1,23 @@
-diff -Naur icinga.orig/base/Makefile.in icinga/base/Makefile.in
---- icinga.orig/base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
-+++ icinga/base/Makefile.in		2011-11-14 19:45:36.000000000 -0500
-@@ -41,7 +41,7 @@
+diff -rupN icinga-1.7.0beta1-orig//base/Makefile.in icinga-1.7.0beta1//base/Makefile.in
+--- icinga-1.7.0beta1-orig//base/Makefile.in	2012-05-09 07:10:21.000000000 -0500
++++ icinga-1.7.0beta1//base/Makefile.in	2012-05-14 14:00:29.666346315 -0500
+@@ -41,7 +41,7 @@ HTMLDIR=@datarootdir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
 -STRIP=@STRIP@
 +STRIP=/bin/true
- 
+
  CGIURL=@cgiurl@
  HTMURL=@htmurl@
-diff -Naur icinga.orig/cgi/Makefile.in icinga/cgi/Makefile.in
---- icinga.orig/cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
-+++ icinga/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
-@@ -21,7 +21,7 @@
+diff -rupN icinga-1.7.0beta1-orig//cgi/Makefile.in icinga-1.7.0beta1//cgi/Makefile.in
+--- icinga-1.7.0beta1-orig//cgi/Makefile.in	2012-05-09 07:10:21.000000000 -0500
++++ icinga-1.7.0beta1//cgi/Makefile.in	2012-05-14 14:00:43.285346614 -0500
+@@ -21,7 +21,7 @@ INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
  INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
  COMMAND_OPTS=@COMMAND_OPTS@
 -STRIP=@STRIP@
 +STRIP=/bin/true
- 
+
  CGIEXTRAS=@CGIEXTRAS@



^ permalink raw reply related	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-05-14 19:02 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-14 18:34 [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/ Matt Thode
  -- strict thread matches above, loose matches on Subject: below --
2012-05-14 19:02 Matt Thode
2012-05-14 18:27 Matt Thode
2012-05-14 18:19 Matt Thode
2012-05-14 18:01 Matt Thode
2012-01-12 17:11 Matt Thode
2011-12-04 19:20 Matt Thode
2011-11-25 17:59 Matt Thode
2011-11-22 22:45 Matt Thode

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox