From 074c766a561bf3f9c2d65df0e11e5770979ecea6 Mon Sep 17 00:00:00 2001 From: Tobias Scherbaum Date: Sun, 20 Jul 2008 16:09:31 +0000 Subject: Fix building with newer postgres-packages, #230167 Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64 --- net-analyzer/nagios-plugins/ChangeLog | 9 +- net-analyzer/nagios-plugins/Manifest | 5 +- .../nagios-plugins-1.4.12-pgsqlconfigure.patch | 69 +++++++++++ .../nagios-plugins-1.4.12-r100.ebuild | 125 -------------------- .../nagios-plugins-1.4.12-r101.ebuild | 129 +++++++++++++++++++++ 5 files changed, 209 insertions(+), 128 deletions(-) create mode 100644 net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch delete mode 100644 net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r100.ebuild create mode 100644 net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog index 0676b6b0fd98..b8e702619f7a 100644 --- a/net-analyzer/nagios-plugins/ChangeLog +++ b/net-analyzer/nagios-plugins/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/nagios-plugins # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.94 2008/07/02 15:03:00 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.95 2008/07/20 16:09:30 dertobi123 Exp $ + +*nagios-plugins-1.4.12-r101 (20 Jul 2008) + + 20 Jul 2008; Tobias Scherbaum + +files/nagios-plugins-1.4.12-pgsqlconfigure.patch, + -nagios-plugins-1.4.12-r100.ebuild, +nagios-plugins-1.4.12-r101.ebuild: + Fix building with newer postgres-packages, #230167 02 Jul 2008; Jeroen Roovers nagios-plugins-1.4.11-r102.ebuild: diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index 1e682d98d6bb..187a929f1a99 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -3,12 +3,13 @@ AUX nagios-plugins-1.4.10-check_http.patch 549 RMD160 e3b85a38d04b32e68b97bf5759 AUX nagios-plugins-1.4.10-contrib.patch 1610 RMD160 928e2ce0a8071b5fd93ca28722512d8996eaa027 SHA1 ff7105763268fc3cc48dced7c17df9ff0bb84899 SHA256 d7aa2d6e420438ae5e5e687bd61bd5ff1ca5aebb763e3b692238db23f24d7278 AUX nagios-plugins-1.4.10-noradius.patch 1029 RMD160 e1e449d93966d822eca21782968e24fce4547a95 SHA1 e5e6758790cc85db9f028cde3fb3d6611356167e SHA256 bff601e67a413abd84c2b430bfcf10395f68a83f98a628a398ee50f7cb406229 AUX nagios-plugins-1.4.11-autoconf-2.62.patch 558 RMD160 d9cbf67c2434ddc9971f95ccd7afd787f1e928b4 SHA1 67fcf7f4e9a72a743a37202e7475e47e13875483 SHA256 55656ea0a2e3daa60c906a099499fc1e7683720aa5f4adeebd149072dbe41dfe +AUX nagios-plugins-1.4.12-pgsqlconfigure.patch 2981 RMD160 6090168654e888ce9b5bb1c5c6b493f3a019472d SHA1 db41a7f6b57f1119045fb90707a7a8182225d9b8 SHA256 8e57962c484363fa790c6920f1f9fe11f273a061fcc59ac2cb9b1d57634a1455 DIST nagios-plugins-1.4.11.tar.gz 1734230 RMD160 4f33e796f8eac2d8d13cbecbcc1191857e1b5f15 SHA1 bc91a57ad6f5468b17f24429ba25225cfff45d59 SHA256 2cc1534a7f41da6cdb72d595c8643e62491fbab1bb768ab113eff20581ac05e5 DIST nagios-plugins-1.4.12.tar.gz 1831377 RMD160 ab54cddfc685f81812260dd221360e8149c8aa7e SHA1 bcf569a805f4b486296f5924db100cc760991389 SHA256 8f186bf05b0c66c38666affb3a15b860bd4b705962f1a46f785ef2c035b80662 EBUILD nagios-plugins-1.4.11-r1.ebuild 3700 RMD160 2d88641b4a8c3e4ff9c1a1e18e52d81a1e8c1e78 SHA1 47fcb8275a1066c6a7c28b89d338b935af2fb2d3 SHA256 b9270c09f097b88cecf661671e4e8f272201bd8b148950d8f2ed1ba6b0d30109 EBUILD nagios-plugins-1.4.11-r102.ebuild 3730 RMD160 32f2d0fd40d55dbcb753d1363003857c02ca51ae SHA1 d70494c7dcd33a14b82c27e954201fcf4a21f8b6 SHA256 bbee4d87eaac013bf329b0c4236ccdc419123f8e82a1ae57cb87db6ec8d193a4 EBUILD nagios-plugins-1.4.11.ebuild 3640 RMD160 11a70d7a45d583a3e7b39097bc08cb63ccea528c SHA1 ad72e7553f476d3476e95900e8df3c49dc0dde3f SHA256 ba656d2abcd9e141dcacea7cf359ac56aa35825551af02554eaa9174c99a1283 -EBUILD nagios-plugins-1.4.12-r100.ebuild 3689 RMD160 d2d578fcaf4e953aa8e4cf4cd705e16aadd3587f SHA1 6cfe8800eb94923e7a938688473667031c0be21b SHA256 cdefb7c386528fafcb2a6252804b04ca1d50036567d3419f746a3a0586e8d271 +EBUILD nagios-plugins-1.4.12-r101.ebuild 3769 RMD160 02ee5b7b43cb9870bccb7e249610a44355770af0 SHA1 615d5b99ada83500b1c066d66741b432228e6263 SHA256 c27c4e00123a2adb25d91daf4ff19bc49fc88a79a7d8085b822f49eedfca3a28 EBUILD nagios-plugins-1.4.12.ebuild 3650 RMD160 907380ea8b98ed870808a0673df53f8d1d395476 SHA1 1de8a69f532dc5e9bb740bfa253b5b6a726b56d3 SHA256 13322e3edd69ab93fdd802fbe380a3ba278edd10bdf81f84cde639b7126ffc58 -MISC ChangeLog 1799 RMD160 2a61b73f2788b9086512482754683806c6233c49 SHA1 bc9bfdf12e5860039aaf10ff8474ac28c8deaa6f SHA256 2eb9abb6864f8be6887bba49ea732b7d2bd41a98aadf8e22695f898b2672abbe +MISC ChangeLog 2086 RMD160 e831083a816dd83821ac19f7c1114bce3db16edc SHA1 308853c37842bae750f2869b69d04c80f2a4bab1 SHA256 88ee69e82024a74395658d0e72b3a373e8650de66e2d8faec615c1da6f0b0a52 MISC metadata.xml 374 RMD160 c261e08c2be47cbf618ed122151d25f96a176aa9 SHA1 88da42b8cc7c08339067720081f61c110e00acb5 SHA256 4babbe654b066c416bb453a8decbd1e8bdaf450226d9ed6d4380bf17e5761f59 diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch new file mode 100644 index 000000000000..e5e713db2128 --- /dev/null +++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.12-pgsqlconfigure.patch @@ -0,0 +1,69 @@ +diff -Naur nagios-plugins-1.4.12.orig/configure.in nagios-plugins-1.4.12/configure.in +--- nagios-plugins-1.4.12.orig/configure.in 2008-05-28 00:01:05.000000000 +0200 ++++ nagios-plugins-1.4.12/configure.in 2008-07-20 18:02:42.000000000 +0200 +@@ -182,27 +182,34 @@ + PGSQL=$withval,) + AC_CHECK_LIB(crypt,main) + if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then +- if test -n "$PGSQL"; then +- LDFLAGS="$LDFLAGS -L$PGSQL/lib" +- CPPFLAGS="$CPPFLAGS -I$PGSQL/include" ++ if test -x $with_pgsql/bin/pg_config ; then ++ np_pg_config="$with_pgsql/bin/pg_config" + fi +- AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) +- if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then +- AC_CHECK_HEADERS(pgsql/libpq-fe.h) +- AC_CHECK_HEADERS(postgresql/libpq-fe.h) +- AC_CHECK_HEADERS(libpq-fe.h) +- if [[ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]]; then +- PGLIBS="-L$PGSQL/lib -lpq -lcrypt" +- PGINCLUDE="-I$PGSQL/include" +- elif test "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then +- PGLIBS="-lpq -lcrypt" +- PGINCLUDE="-I/usr/include/pgsql" +- elif test "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then +- PGLIBS="-L$PGSQL/lib -lpq -lcrypt" +- PGINCLUDE="-I/usr/include/postgresql" +- elif test "$ac_cv_header_libpq_fe_h" = "yes"; then +- PGLIBS="-L$PGSQL/lib -lpq -lcrypt" +- PGINCLUDE="-I$PGSQL/include" ++ if test -z "$np_pg_config"; then ++ with_pgsql="no" ++ else ++ if test -n "$PGSQL"; then ++ LDFLAGS="$LDFLAGS -L`$np_pg_config --libdir`" ++ CPPFLAGS="$CPPFLAGS -I`$np_pg_config --includedir`" ++ fi ++ AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt) ++ if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then ++ AC_CHECK_HEADERS(pgsql/libpq-fe.h) ++ AC_CHECK_HEADERS(postgresql/libpq-fe.h) ++ AC_CHECK_HEADERS(libpq-fe.h) ++ if [[ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]]; then ++ PGLIBS="-L`$np_pg_config --libdir` -lpq -lcrypt" ++ PGINCLUDE="-I`$np_pg_config --includedir`" ++ elif test "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then ++ PGLIBS="-lpq -lcrypt" ++ PGINCLUDE="-I`$np_pg_config --includedir`" ++ elif test "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then ++ PGLIBS="-L`$np_pg_config --libdir` -lpq -lcrypt" ++ PGINCLUDE="-I`$np_pg_config --includedir`" ++ elif test "$ac_cv_header_libpq_fe_h" = "yes"; then ++ PGLIBS="-L`$np_pg_config --libdir` -lpq -lcrypt" ++ PGINCLUDE="-I`$np_pg_config --includedir`" ++ fi + fi + if test -z "$PGINCLUDE"; then + AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) +@@ -212,10 +219,6 @@ + AC_SUBST(PGINCLUDE) + EXTRAS="$EXTRAS check_pgsql" + fi +- else +- AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) +- AC_MSG_WARN([LIBS="$LIBS" CPPFLAGS="$CPPFLAGS"]) +- AC_MSG_WARN([install PostgreSQL libs to compile this plugin (see REQUIREMENTS).]) + fi + else + AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)]) diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r100.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r100.ebuild deleted file mode 100644 index b24e39a24f6c..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r100.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r100.ebuild,v 1.2 2008/05/31 08:22:02 dertobi123 Exp $ - -WANT_AUTOCONF="latest" -WANT_AUTOMAKE="latest" - -inherit eutils autotools - -DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping -nagios-ssh nagios-game ups ipv6 radius" - -DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) - mysql? ( virtual/mysql ) - postgres? ( >=virtual/postgresql-base-7.2 ) - ssl? ( >=dev-libs/openssl-0.9.6g ) - radius? ( >=net-dialup/radiusclient-0.3.2 )" - -RESTRICT="test" - -RDEPEND="${DEPEND} - >=dev-lang/perl-5.6.1-r7 - samba? ( >=net-fs/samba-2.2.5-r1 ) - snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 - >=net-analyzer/net-snmp-5.0.6 - ) - mysql? ( dev-perl/DBI - dev-perl/DBD-mysql ) - nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) - nagios-ntp? ( >=net-misc/ntp-4.1.1a ) - nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) - nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) - ups? ( >=sys-power/nut-1.4 ) - !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_unpack() { - unpack ${A} - cd "${S}" - - if ! use radius; then - EPATCH_OPTS="-p1 -d ${S}" epatch \ - "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch - fi - - epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch - - AT_M4DIR="m4 gl/m4" eautoreconf -} - -src_compile() { - - local conf - if use ssl; then - conf="${conf} --with-openssl=/usr" - else - conf="${conf} --without-openssl" - fi - - econf \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with ipv6) \ - ${conf} \ - --host=${CHOST} \ - --prefix=/usr \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --sysconfdir=/etc/nagios || die "econf failed" - - # fix problem with additional - - sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" - - emake || die "emake failed" -} - -src_install() { - mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg - chmod +x "${S}"/contrib/*.pl - - sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" - sed -i -e '30s/use lib utils.pm;/use utils;/' \ - "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" - - dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ - ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS - - emake DESTDIR="${D}" install || die "make install failed" - - if use mysql || use postgres; then - dodir /usr/$(get_libdir)/nagios/plugins - exeinto /usr/$(get_libdir)/nagios/plugins - doexe "${S}"/contrib/check_nagios_db.pl - fi - - mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib - - chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \ - || die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins" - - chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" - - chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ - || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" - -} - -pkg_postinst() { - einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." - einfo "Depending on what you want to monitor with nagios, some or all of these USE" - einfo "flags need to be set for nagios to function correctly." - echo - einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild new file mode 100644 index 000000000000..98d31d12d061 --- /dev/null +++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.12-r101.ebuild,v 1.1 2008/07/20 16:09:30 dertobi123 Exp $ + +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils autotools + +DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly" +HOMEPAGE="http://www.nagios.org/" +SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping +nagios-ssh nagios-game ups ipv6 radius" + +DEPEND="ldap? ( >=net-nds/openldap-2.0.25 ) + mysql? ( virtual/mysql ) + postgres? ( >=virtual/postgresql-base-7.2 ) + ssl? ( >=dev-libs/openssl-0.9.6g ) + radius? ( >=net-dialup/radiusclient-0.3.2 )" + +RESTRICT="test" + +RDEPEND="${DEPEND} + >=dev-lang/perl-5.6.1-r7 + samba? ( >=net-fs/samba-2.2.5-r1 ) + snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 + >=net-analyzer/net-snmp-5.0.6 + ) + mysql? ( dev-perl/DBI + dev-perl/DBD-mysql ) + nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) + nagios-ntp? ( >=net-misc/ntp-4.1.1a ) + nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) + nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) + ups? ( >=sys-power/nut-1.4 ) + !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )" + +pkg_setup() { + enewgroup nagios + enewuser nagios -1 /bin/bash /var/nagios/home nagios +} + +src_unpack() { + unpack ${A} + cd "${S}" + + if ! use radius; then + EPATCH_OPTS="-p1 -d ${S}" epatch \ + "${FILESDIR}"/nagios-plugins-1.4.10-noradius.patch + fi + + epatch "${FILESDIR}"/${PN}-1.4.10-contrib.patch + epatch "${FILESDIR}"/${P}-pgsqlconfigure.patch + + AT_M4DIR="m4 gl/m4" eautoreconf +} + +src_compile() { + + local conf + if use ssl; then + conf="${conf} --with-openssl=/usr" + else + conf="${conf} --without-openssl" + fi + + if use postgres; then + conf="${conf} --with-pgsql=/usr" + fi + + econf \ + $(use_with mysql) \ + $(use_with ipv6) \ + ${conf} \ + --host=${CHOST} \ + --prefix=/usr \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + --sysconfdir=/etc/nagios || die "econf failed" + + # fix problem with additional - + sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed" + + emake || die "emake failed" +} + +src_install() { + mv "${S}"/contrib/check_compaq_insight.pl "${S}"/contrib/check_compaq_insight.pl.msg + chmod +x "${S}"/contrib/*.pl + + sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' "${S}"/contrib/*.pl || die "sed failed" + sed -i -e '30s/use lib utils.pm;/use utils;/' \ + "${S}"/plugins-scripts/check_file_age.pl || die "sed failed" + + dodoc ACKNOWLEDGEMENTS AUTHORS BUGS CODING \ + ChangeLog FAQ NEWS README REQUIREMENTS SUPPORT THANKS + + emake DESTDIR="${D}" install || die "make install failed" + + if use mysql || use postgres; then + dodir /usr/$(get_libdir)/nagios/plugins + exeinto /usr/$(get_libdir)/nagios/plugins + doexe "${S}"/contrib/check_nagios_db.pl + fi + + mv "${S}"/contrib "${D}"/usr/$(get_libdir)/nagios/plugins/contrib + + chown -R root:nagios "${D}"/usr/$(get_libdir)/nagios/plugins \ + || die "Failed chown of ${D}usr/$(get_libdir)/nagios/plugins" + + chmod -R o-rwx "${D}"/usr/$(get_libdir)/nagios/plugins \ + || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins" + + chmod 04710 "${D}"/usr/$(get_libdir)/nagios/plugins/check_icmp \ + || die "Failed chmod of ${D}usr/$(get_libdir)/nagios/plugins/check_icmp" + +} + +pkg_postinst() { + einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor." + einfo "Depending on what you want to monitor with nagios, some or all of these USE" + einfo "flags need to be set for nagios to function correctly." + echo + einfo "contrib plugins are installed into /usr/$(get_libdir)/nagios/plugins/contrib" +} -- cgit v1.2.3-65-gdbad