diff options
4 files changed, 138 insertions, 13 deletions
diff --git a/net-analyzer/nagios-sap-ccms-plugin/ChangeLog b/net-analyzer/nagios-sap-ccms-plugin/ChangeLog index 85620a0d52bc..52ba1a00f315 100644 --- a/net-analyzer/nagios-sap-ccms-plugin/ChangeLog +++ b/net-analyzer/nagios-sap-ccms-plugin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-analyzer/nagios-sap-ccms-plugin -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-sap-ccms-plugin/ChangeLog,v 1.6 2009/03/07 14:34:57 maekke Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-sap-ccms-plugin/ChangeLog,v 1.7 2010/10/19 23:36:01 jer Exp $ + +*nagios-sap-ccms-plugin-0.8 (19 Oct 2010) + + 19 Oct 2010; Jeroen Roovers <jer@gentoo.org> + +nagios-sap-ccms-plugin-0.8.ebuild, + +files/nagios-sap-ccms-plugin-0.8-gentoo.patch: + Version bump by Elias Probst (bug #283557). Fix quoting issue. Use system + iniparser (bug #259717). Respect LDFLAGS (bug #337888), CC. 07 Mar 2009; Markus Meier <maekke@gentoo.org> nagios-sap-ccms-plugin-0.7.3-r1.ebuild: diff --git a/net-analyzer/nagios-sap-ccms-plugin/Manifest b/net-analyzer/nagios-sap-ccms-plugin/Manifest index 2fcfd476a21c..60f38a85147f 100644 --- a/net-analyzer/nagios-sap-ccms-plugin/Manifest +++ b/net-analyzer/nagios-sap-ccms-plugin/Manifest @@ -1,15 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX nagios-sap-ccms-plugin-0.8-gentoo.patch 1360 RMD160 0ec71d67b0188e3d44abe7634cea1cb6c8bb46eb SHA1 54cf6a7016fc3fff426e9d94b0186385739ba042 SHA256 e1f381bb08e4fc2d1394099622780eb8d28f7c9b771bdf61ec705158d6ae7849 DIST sap-ccms-plugin-0.7.3.tar.gz 2948020 RMD160 49f432c25a00ceb34acd62aceb8cdcf3daba63c6 SHA1 56a8a6c941f2e132e474e7ffdbd4455e623548cf SHA256 ce3831bc8156f5fafe8fb4366bd9d4b2df4c85d55c92d4b38c41f10f701206eb +DIST sap-ccms-plugin-0.8.tar.bz2 10143558 RMD160 bf17faee66b76a502609ea972d2adb6a6a649c5f SHA1 1a3d71af4e3a8a3ef6c1316b5f6c3bd2041b8a8a SHA256 6af24e4ac2f3dddc435394e49f491a32c1c1c447025479190e710f1132a708ee EBUILD nagios-sap-ccms-plugin-0.7.3-r1.ebuild 1325 RMD160 b61251e177cc5f3b8fad6ff91ba1ed69a27475a2 SHA1 62a79d7281235c423922dabfa62d55ff523520e8 SHA256 5ff2355bdab5382470d2886083121e3962e6a4605ec3dd0574ccbd3845668d7c EBUILD nagios-sap-ccms-plugin-0.7.3.ebuild 1262 RMD160 3d0413df33cf17f60620f57f23fd3444330566a5 SHA1 224fbd3117002c82588b03e16e5f8ce318525d8d SHA256 adc4f67f64fb19199b33f298affb9c6c1653019f0c769d4da3d652e8d9938b39 -MISC ChangeLog 1165 RMD160 d2349f7585dc9c1fb8d399113c33feb83e22036c SHA1 dd82e5b256bc88e3facdeac2606cf8f5cf179c1b SHA256 a841398e45d632a21eac0239701427c15ec4c09217718ae0798d5bc6f6c804f0 +EBUILD nagios-sap-ccms-plugin-0.8.ebuild 1552 RMD160 c7e36fd39d86b6c0c861ac0aaaea83579c07b616 SHA1 3652cf134c6e47567ee8f2eefc7e6e7f40f90fe2 SHA256 f44177dadf3124fbcd98d84bd996994687f17cdd8671cb89256184fd2870032e +MISC ChangeLog 1479 RMD160 e3298908a1fd46a1bd629f3163c8f61543021af5 SHA1 b75af5b33f41b82e9b053580d7cda89357afdeb3 SHA256 975b93e7562779d2de77957abc3456c3f69433f9c66e6104e2dd01bab9592aa6 MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkmyhhsACgkQkKaRLQcq0GIOJwCaA48NnR2fN5rMja1oSyarl3/B -4JUAoIdE76Ff1sakTJQDeRmv6HSuVSFf -=xx4e ------END PGP SIGNATURE----- diff --git a/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch b/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch new file mode 100644 index 000000000000..8ded76b3b7d1 --- /dev/null +++ b/net-analyzer/nagios-sap-ccms-plugin/files/nagios-sap-ccms-plugin-0.8-gentoo.patch @@ -0,0 +1,61 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,5 +1,5 @@ + +-VERSION=0.7.3 ++VERSION=0.8 + PLATFORM=$(shell uname -m) + + +@@ -33,12 +33,10 @@ + SUBDIRS = sap_moni + #C-Compiler + +-CC=gcc -DSAP_RFC_TIME +-X_CFLAGS = $(CFLAGS) ++X_CFLAGS = $(CFLAGS) $(LDFLAGS) -DSAP_RFC_TIME + SHARED_OBJECTS=libs/$(PLATFORM)/librfccm.so + + ifeq ($(patsubst i%86,x86,$(PLATFORM)), x86) +- CC=gcc -DSAP_RFC_TIME + SHARED_OBJECTS=libs/x86/librfccm.so + endif + +--- a/src/sap_moni/Makefile 2009-03-16 12:34:26.000000000 +0100 ++++ b/src/sap_moni/Makefile 2010-10-20 01:24:14.000000000 +0200 +@@ -1,23 +1,16 @@ +-PLATFORM=$(shell uname -m)
+-
+ #used files
+-SRC_INI = iniparser.c dictionary.c strlib.c
++SRC_INI = dictionary.c strlib.c
+ OBJ_INI = $(SRC_INI:.c=.o)
+ OBJ=ctype_b.o agnt_rfc.o agnt_mon.o $(OBJ_INI)
+
+ SHARED = sap_moni.so
+
+ #C-Compiler
+-CC=gcc -DSAP_RFC_TIME
+-X_CFLAGS=$(CFLAGS) -fPIC
+-
+-ifeq ($(PLATFORM),ppc64)
+- CC=gcc -m64 -DSAP_RFC_TIME
+-endif
++X_CFLAGS=$(CFLAGS) -fPIC -DSAP_RFC_TIME
+
+ #Rules
+ shared: $(OBJ)
+- $(CC) -shared $ $(X_CFLAGS) -o $(SHARED) $(OBJ) -ldl -lm
++ $(CC) -shared $ $(X_CFLAGS) $(LDFLAGS) -o $(SHARED) $(OBJ) -ldl -lm -liniparser
+
+
+ .SUFFIXES: .c .o
+@@ -26,7 +19,7 @@ +
+ #Dependencies
+ agnt_rfc.o: saprfc.h sapitab.h agnt_def.h
+-agnt_mon.o: agnt_def.h iniparser.h sapitab.h
++agnt_mon.o: agnt_def.h sapitab.h
+
+
+ #------
diff --git a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild new file mode 100644 index 000000000000..8492e0beba51 --- /dev/null +++ b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild,v 1.1 2010/10/19 23:36:01 jer Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +MY_P="sap-ccms-plugin-${PV}" + +DESCRIPTION="Nagios plugin that provides an interface to SAP CCMS +Infrastructure" +HOMEPAGE="http://sourceforge.net/projects/nagios-sap-ccms/" +SRC_URI="mirror://sourceforge/nagios-sap-ccms/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +DEPEND=" + net-analyzer/nagios-core + dev-libs/iniparser +" +RDEPEND=${DEPEND} + +S="${WORKDIR}/${PN/-plugin*}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + sed -i src/sap_moni/* \ + -e 's|#include "iniparser.h"|#include <iniparser.h>|g' \ + || die "sed sap_moni/" +} + +src_compile() { + emake -C src CC=$(tc-getCC) || die "emake failed" +} + +src_install() { + cd "${S}/src" + exeinto /usr/$(get_libdir)/nagios/plugins + + for file in {check_sap{,_cons,_instance,_instance_cons,_mult_no_thr,_multiple,_system,_system_cons},create_cfg,sap_change_thr} + do + doexe ${file} + done + + chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins || die "Failed Chown of ${D}usr/$(get_libdir)/nagios/plugins" + + dolib.so sap_moni.so + cd "${S}/config" + + dodir /etc/sapmon + insinto /etc/sapmon + doins "${S}"/config/* +} + +pkg_postinst() { + elog "Have a look at /etc/sapmon for configuring ${PN}" + elog "Further information can be found at" + elog "http://nagios-sap-ccms.sourceforge.net/" +} |