Remove old
authorPatrick Lauer <patrick@gentoo.org>
Fri, 18 Jun 2010 07:20:43 +0000 (07:20 +0000)
committerPatrick Lauer <patrick@gentoo.org>
Fri, 18 Jun 2010 07:20:43 +0000 (07:20 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

net-analyzer/snort/ChangeLog
net-analyzer/snort/snort-2.8.4.1.ebuild [deleted file]
net-analyzer/snort/snort-2.8.5.2.ebuild [deleted file]
net-analyzer/snort/snort-2.8.5.3.ebuild [deleted file]
net-analyzer/zabbix/ChangeLog
net-analyzer/zabbix/zabbix-1.6.7.ebuild [deleted file]
net-analyzer/zabbix/zabbix-1.8.ebuild [deleted file]

index ff149f9b417b1669b60c9be855fbae3aed27898f..783f01c0c1bf2a66e69136e6dd66dd267dbd09ef 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/snort
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.163 2010/06/17 20:41:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.164 2010/06/18 07:20:43 patrick Exp $
+
+  18 Jun 2010; Patrick Lauer <patrick@gentoo.org> -snort-2.8.4.1.ebuild,
+  -snort-2.8.5.2.ebuild, -snort-2.8.5.3.ebuild:
+  Remove old
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> snort-2.8.4.1.ebuild,
   snort-2.8.5.1.ebuild, snort-2.8.5.2.ebuild, snort-2.8.5.3.ebuild,
diff --git a/net-analyzer/snort/snort-2.8.4.1.ebuild b/net-analyzer/snort/snort-2.8.4.1.ebuild
deleted file mode 100644 (file)
index f9ad356..0000000
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.4.1.ebuild,v 1.9 2010/06/17 20:41:53 patrick Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://www.snort.org/dl/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 -sparc x86"
-IUSE="static debug threads prelude memory-cleanup dynamicplugin decoder-preprocessor-rules ipv6 targetbased timestats ppm perfprofiling linux-smp-stats inline inline-init-failopen flexresp flexresp2 react aruba gre mpls postgres mysql odbc selinux"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="virtual/libpcap
-       >=dev-libs/libpcre-6.0
-       flexresp2? ( dev-libs/libdnet )
-       flexresp? ( ~net-libs/libnet-1.0.2a )
-       react? ( ~net-libs/libnet-1.0.2a )
-       postgres? ( dev-db/postgresql-base )
-       mysql? ( virtual/mysql )
-       odbc? ( dev-db/unixODBC )
-       prelude? ( >=dev-libs/libprelude-0.9.0 )
-       inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )"
-
-RDEPEND="${DEPEND}
-       dev-lang/perl
-       selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-       if use flexresp && use flexresp2 ; then
-               ewarn
-               ewarn
-               ewarn "You have both the 'flexresp' and 'flexresp2' USE"
-               ewarn "flags set. You can use 'flexresp' OR 'flexresp2'"
-               ewarn "but not both."
-               ewarn
-               ewarn "Defaulting to flexresp2..."
-               ewarn
-               ewarn
-               epause
-       fi
-
-       if use memory-cleanup && ! use dynamicplugin; then
-               ewarn
-               ewarn
-               ewarn "You have enabled 'memory-cleanup' but not 'dynamicplugin'."
-               ewarn "'memory-cleanup' requires 'dynamicplugin' to compile."
-               ewarn
-               ewarn "Enabling dynamicplugin..."
-               ewarn
-               ewarn
-               epause
-       fi
-
-       if use inline-init-failopen && ! use inline; then
-               ewarn
-               ewarn
-               ewarn "You have enabled 'inline-init-failopen' but not 'inline'."
-               ewarn "'inline-init-failopen' is an 'inline' only function."
-               ewarn
-               ewarn "Enabling inline mode..."
-               ewarn
-               ewarn
-               epause
-       fi
-
-       if use ipv6 && use prelude; then
-               ewarn
-               ewarn
-               ewarn "You have enabled 'prelude' and 'ipv6'."
-               ewarn "The Prelude output plugin does not support ipv6."
-               ewarn
-               ewarn "Disabling ipv6 support..."
-               ewarn
-               ewarn
-               epause
-       fi
-
-       # pre_inst() is a better place but we need it here for the
-       #'fowners' statements in src_install()
-       enewgroup snort
-       enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       #Dont monkey with the original source if you don't need to.
-       if use flexresp || use react || use inline || use inline-init-failopen; then
-               epatch "${FILESDIR}/${PN}-2.8.4-libnet.patch"
-       fi
-
-       #Added patch to print the value of PCAP_MEMORY
-       epatch "${FILESDIR}/pcap_memory.patch"
-
-       #Multilib fix for the sf_engine
-       sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-               "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-               || die "sed for sf_engine failed"
-
-       #Multilib fix for the curent set of dynamic-preprocessors
-       for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2; do
-               sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-                       "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-                       || die "sed for $i failed."
-       done
-
-       #This sed will prevent the example dynamic code from being compiled/installed
-       sed -i -e 's:$(EXAMPLES_DIR)::g' "${WORKDIR}/${P}/src/Makefile.am"
-
-       if use prelude ; then
-               sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-       fi
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-       local myconf
-
-       #Both shared and static are enable by defaut so we need to be specific
-       if use static; then
-               myconf="${myconf} --enable-static --disable-shared"
-       else
-               myconf="${myconf} --disable-static --enable-shared"
-       fi
-
-       #Added in ebuild version snort-2.8.3.1. Should be rechecked in updated versions.
-       #Use 'die' because ./configure will die any ways with the same error message...
-       if use ipv6 && use targetbased; then
-               die "Support for target-based and IPv6 cannot be enabled simultaneously in this version."
-       fi
-
-       #Sourcefire is often not clear about what is and is not enabled by default
-       #To avoid undesired results we should be very specific
-       #Also, See the next 'if' for "react"
-       if ! use react && use flexresp && ! use flexresp2; then
-               myconf="${myconf} --enable-flexresp --disable-flexresp2"
-       elif ! use react && ! use flexresp && use flexresp2; then
-               myconf="${myconf} --disable-flexresp --enable-flexresp2"
-       elif ! use react && use flexresp && use flexresp2; then
-               myconf="${myconf} --disable-flexresp --enable-flexresp2"
-       elif ! use react && ! use flexresp && ! use flexresp2; then
-               myconf="${myconf} --disable-flexresp --disable-flexresp2"
-       fi
-
-       #We need to do this becaue 'react' automaticly enables 'flexresp'
-       #but ./configure fails if both --enable-react and --enable-flexresp
-       #are used. Here is the error...
-       #ERROR!  --enable-react cannot be used with --enable-flexresp
-       #because it is AUTOMATICALLY enabled with --enable-flexresp
-       #Given that --enable-flexresp is enable we know that
-       #--disable-flexresp2 should be used
-       if use react; then
-               myconf="${myconf} --enable-react --disable-flexresp2"
-       fi
-
-       #USE flag memory-cleanup requires dynamicplugin
-       #Only 'dynamicplugin' is set here, 'memory-cleanup' is set below via econf.
-       if use memory-cleanup || use dynamicplugin; then
-               myconf="${myconf} --enable-dynamicplugin"
-       else
-               myconf="${myconf} --disable-dynamicplugin"
-       fi
-
-       # USE flages 'targetbased' and 'inline-init-failopen' require threads
-       #Only 'threads' is set here. 'targetbased' and 'inline-init-failopen' are set below via econf.
-       if use targetbased || use inline-init-failopen || use threads; then
-               myconf="${myconf} --enable-pthread"
-       else
-               myconf="${myconf} --disable-pthread"
-       fi
-
-       #Only needed if...
-       if use flexresp || use react || use inline; then
-               myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-       fi
-
-       #'inline-init-failopen' requires 'inline'
-       if use inline-init-failopen || use inline; then
-               myconf="${myconf} --enable-inline"
-       else
-               myconf="${myconf} --disable-inline"
-       fi
-
-       #'prelude' does not support 'ipv6'
-       if use ipv6 && use prelude; then
-               myconf="${myconf} --enable-prelude --disable-ipv6"
-       elif use ipv6 && ! use prelude; then
-               myconf="${myconf} --enable-ipv6"
-       elif use prelude && ! use ipv6; then
-               myconf="${myconf} --enable-prelude"
-       elif ! use prelude && ! use ipv6; then
-               myconf="${myconf} --disable-prelude --disable-ipv6"
-       fi
-
-#The --enable-<feature> options...
-#'static' 'threads' 'react' 'flexresp' 'flexresp2' 'inline' 'dynamicplugin'
-# are configured above due to dependancy/conflict issues.
-
-#All others are handled the standard ebuild way via econf
-
-       econf \
-               --without-oracle \
-               $(use_with postgres postgresql) \
-               $(use_with mysql) \
-               $(use_with odbc) \
-               --disable-ipfw \
-               --disable-profile \
-               --disable-ppm-test \
-               $(use_enable debug) \
-               $(use_enable memory-cleanup) \
-               $(use_enable decoder-preprocessor-rules) \
-               $(use_enable targetbased) \
-               $(use_enable timestats) \
-               $(use_enable ppm) \
-               $(use_enable perfprofiling) \
-               $(use_enable linux-smp-stats) \
-               $(use_enable inline-init-failopen) \
-               $(use_enable aruba) \
-               $(use_enable gre) \
-               $(use_enable mpls) \
-               ${myconf}
-
-       # limit to single as reported by jforman on irc
-       emake -j1 || die
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       keepdir /var/log/snort/
-       fowners snort:snort /var/log/snort
-
-       keepdir /var/run/snort/
-       fowners snort:snort /var/run/snort/
-
-       dodoc doc/*
-       dodoc ./RELEASE.NOTES
-       docinto schemas
-       dodoc schemas/*
-
-       insinto /etc/snort
-       doins etc/attribute_table.dtd \
-               etc/classification.config \
-               etc/gen-msg.map \
-               etc/reference.config \
-               etc/sid-msg.map \
-               etc/threshold.conf \
-               etc/unicode.map \
-               || die "Failed to add files in /etc/snort"
-
-       newins etc/snort.conf snort.conf.distrib
-
-       insinto /etc/snort/preproc_rules
-       doins preproc_rules/decoder.rules \
-               preproc_rules/preprocessor.rules \
-               || die "Failed to add files in /etc/snort/preproc_rules"
-
-       keepdir /etc/snort/rules/
-
-       fowners -R snort:snort /etc/snort/
-
-       newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-       newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-       # Make some changes to snort.conf.distrib
-
-       # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-       sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Set the correct rule location in the config
-       sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Set the correct preprocessor/decoder rule location in the config
-       sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Enable the preprocessor/decoder rules
-       sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Just some clean up of trailing /'s in the config
-       sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:snort_dynamicrules/$:snort_dynamicrules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Make it clear in the config where these are...
-       sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Disable all rule files by default.
-       #Users need to chose what they want enabled.
-       sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-       einfo
-       einfo "Snort is a libpcap based packet capture tool which can be used in"
-       einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-       einfo "Detection System Mode."
-       einfo
-       einfo "To learn more about these modes review the Snort User Manual at..."
-       einfo
-       einfo "http://www.snort.org/docs/"
-       einfo
-       einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-       einfo "information on configuring snort."
-       einfo
-       einfo "Joining the Snort Users and Snort Sigs mailing list is highly"
-       einfo "recommended for all users..."
-       einfo
-       einfo "http://www.snort.org/community/lists.html"
-       einfo
-       elog "Snort-2.8.4.1 Notes:"
-       elog
-       elog "The 'community-rules' USE flag has been removed."
-       elog
-       elog "We are no longer distributing rule files via the snort ebuild."
-       elog "There are a couple of reasons for this change..."
-       elog
-       elog "1. Rule files are not versioned making it impossible to use"
-       elog "   portage to update them properly."
-       elog "2. Although some of the rules are still useful, the"
-       elog "   Community Rules are quite old (RELEASED: 2007-04-27) and"
-       elog "   should only be used to supplement the VRT rule set."
-       elog "3. Sourcefire's VRT rule set requires users to register (for free)"
-       elog "   to download them."
-       elog "4. Certain versions of Snort require specific rule set versions"
-       elog "   for proper detection and to prevent Snort from breaking."
-       elog "  (See below.)"
-       elog
-       elog "To download rules for use with Snort please, see the following"
-       elog
-       elog "Sourcefire's VRT Rules and older Community Rules:"
-       elog "http://www.snort.org/pub-bin/downloads.cgi"
-       elog
-       elog "Emerging Threats Rules:"
-       elog "http://www.emergingthreats.net/"
-       elog
-       elog "A good place to put your downloaded rules would be..."
-       elog "/etc/snort/rules"
-       elog
-       elog "To manage updates to your rules please visit..."
-       elog
-       elog "http://oinkmaster.sourceforge.net/"
-       elog
-       elog "and then 'emerge oinkmaster'."
-       elog
-       elog "!!!IMPORTANT!!!"
-       elog "Users upgrading from versions prior to Snort-2.8.4 and are using"
-       elog "the dcerpc or dcerpc2 preprocessor in your snort.conf file"
-       elog "with the netbios rules should be aware of the following"
-       elog "announcements..."
-       elog
-       elog "http://vrt-sourcefire.blogspot.com/2009/04/snort-284-is-nigh.html"
-       elog "http://vrt-sourcefire.blogspot.com/2009/02/important-snort-rule-changes-and-new.html"
-       elog
-}
diff --git a/net-analyzer/snort/snort-2.8.5.2.ebuild b/net-analyzer/snort/snort-2.8.5.2.ebuild
deleted file mode 100644 (file)
index bd3692c..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.5.2.ebuild,v 1.3 2010/06/17 20:41:53 patrick Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://dl.snort.org/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql odbc postgres selinux"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="virtual/libpcap
-       >=dev-libs/libpcre-6.0
-       flexresp2? ( dev-libs/libdnet )
-       flexresp? ( ~net-libs/libnet-1.0.2a )
-       react? ( ~net-libs/libnet-1.0.2a )
-       postgres? ( dev-db/postgresql-base )
-       mysql? ( virtual/mysql )
-       odbc? ( dev-db/unixODBC )
-       prelude? ( >=dev-libs/libprelude-0.9.0 )
-       inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )"
-
-RDEPEND="${DEPEND}
-       dev-lang/perl
-       selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-       if use flexresp && use flexresp2; then
-               eerror
-               eerror "You have both the 'flexresp' and 'flexresp2' USE flags set."
-               eerror "You can use 'flexresp' OR 'flexresp2' but not both."
-               eerror "flexresp2 is recommended."
-               die
-       elif use flexresp && use react; then
-               eerror
-               eerror "You have both the 'react' and 'flexresp' USE flags set."
-               eerror "'react' is enabled automaticly when the 'flexresp'"
-               eerror "USE flag is set, but ./configure will fail if both are enabled."
-               eerror
-               eerror "This is an upstream issue and not a problem with this ebuild."
-               eerror
-               eerror "To enable both 'flexresp' and 'react' set USE="flexresp -react""
-               die
-       elif use flexresp2 && use react; then
-               eerror
-               eerror "You have both the 'react' and 'flexresp2' USE flags set."
-               eerror "You can use 'react' OR 'flexresp2' but not both."
-               die
-       elif use inline-init-failopen && ! use inline; then
-               eerror
-               eerror "You have enabled the 'inline-init-failopen' USE flag"
-               eerror "but not the 'inline' USE flag."
-               eerror "'inline-init-failopen' requires 'inline' be enabled."
-               die
-       elif use ipv6 && use prelude; then
-               eerror
-               eerror "You have both the 'prelude' and 'ipv6' USE flags set."
-               eerror "The Prelude output plugin does not currently support IPv6."
-               die
-       elif use reload-error-restart && ! use reload; then
-               eerror
-               eerror "You have enabled the 'reload-error-restart' USE flag"
-               eerror "but not the 'reload' USE flag."
-               eerror "'reload-error-restart' requires 'reload' be enabled."
-               die
-       fi
-
-       # pre_inst() is a better place to put this
-       # but we need it here for the 'fowners' statements in src_install()
-       enewgroup snort
-       enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-
-       unpack ${A}
-       cd "${S}"
-
-       # Fix to prevent the docs Makefile from being used.
-       # Fixes #297190.
-       einfo "Applying documentation fix."
-       sed -i -e 's:src doc etc:src etc:g' \
-               "${WORKDIR}/${P}/Makefile.am" || die "Doc fix Failed"
-
-       # Fix to allow parallel building.
-       # Thanks to Natanael Copa #291558
-       einfo "Applying parallel building fix."
-       sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
-                       src/dynamic-preprocessors/*/Makefile.am \
-                                       || die "parallel builds fix Failed"
-
-       #Replaces the libnet-1.0 patch for inline, flexresp, and react
-       if use flexresp || use react || use inline; then
-
-               einfo "Applying libnet-1.0 fix."
-               sed -i -e 's:libnet.h:libnet-1.0.h:g' \
-                       "${WORKDIR}/${P}/configure.in" \
-                       "${WORKDIR}/${P}/src/detection-plugins/sp_react.c" \
-                       "${WORKDIR}/${P}/src/detection-plugins/sp_respond.c" \
-                       "${WORKDIR}/${P}/src/inline.c" || die "sed for libnet-1.0.h failed"
-
-               sed -i -e 's:libnet-config:libnet-1.0-config:g' \
-                       "${WORKDIR}/${P}/configure.in" || die "sed for libnet-1.0-config failed"
-
-               sed -i -e 's:-lnet:-lnet-1.0:g' \
-                       "${WORKDIR}/${P}/configure.in" || die "sed for -lnet-1.0 failed"
-
-               sed -i -e 's:AC_CHECK_LIB(net:AC_CHECK_LIB(net-1.0:g' \
-                       "${WORKDIR}/${P}/configure.in" || die "sed for net-1.0 failed"
-
-       fi
-
-       #Multilib fix for the sf_engine
-       einfo "Applying multilib fix."
-       sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-               "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-               || die "sed for sf_engine failed"
-
-       #Multilib fix for the curent set of dynamic-preprocessors
-       for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2; do
-               sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-                       "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-                       || die "sed for $i failed."
-       done
-
-       #This sed will prevent the example dynamic code from being compiled/installed
-       einfo "Disabling sample code."
-       sed -i -e 's:$(EXAMPLES_DIR)::g' "${WORKDIR}/${P}/src/Makefile.am"
-
-       if use prelude; then
-               einfo "Applying prelude fix."
-               sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-       fi
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-
-       local myconf
-
-       #targetbased and inline-init-failopen automaticly enable pthread
-       if use threads || use targetbased || use inline-init-failopen; then
-               myconf="${myconf} --enable-pthread"
-       fi
-
-       #Tell flexresp, react, and inline where libipq is
-       if use flexresp || use react || use inline; then
-               myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-       fi
-
-       econf \
-               $(use_enable !static shared) \
-               $(use_enable static) \
-               $(use_enable dynamicplugin) \
-               $(use_enable ipv6) \
-               $(use_enable gre) \
-               $(use_enable mpls) \
-               $(use_enable targetbased) \
-               $(use_enable decoder-preprocessor-rules) \
-               $(use_enable ppm) \
-               $(use_enable timestats) \
-               $(use_enable perfprofiling) \
-               $(use_enable linux-smp-stats) \
-               $(use_enable inline) \
-               $(use_enable inline-init-failopen) \
-               $(use_enable prelude) \
-               $(use_enable debug) \
-               $(use_enable reload) \
-               $(use_enable reload-error-restart) \
-               $(use_enable flexresp) \
-               $(use_enable flexresp2) \
-               $(use_enable react) \
-               $(use_enable aruba) \
-               $(use_with mysql) \
-               $(use_with odbc) \
-               $(use_with postgres postgresql) \
-               --disable-ipfw \
-               --disable-profile \
-               --disable-ppm-test \
-               --without-oracle \
-               ${myconf}
-
-       emake || die "make failed"
-
-}
-
-src_install() {
-
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       keepdir /var/log/snort/
-       fowners snort:snort /var/log/snort
-
-       keepdir /var/run/snort/
-       fowners snort:snort /var/run/snort/
-
-       dodoc doc/*
-       dodoc ./RELEASE.NOTES
-       docinto schemas
-       dodoc schemas/*
-
-       insinto /etc/snort
-       doins etc/attribute_table.dtd \
-               etc/classification.config \
-               etc/gen-msg.map \
-               etc/reference.config \
-               etc/sid-msg.map \
-               etc/threshold.conf \
-               etc/unicode.map \
-               || die "Failed to add files in /etc/snort"
-
-       newins etc/snort.conf snort.conf.distrib
-
-       insinto /etc/snort/preproc_rules
-       doins preproc_rules/decoder.rules \
-               preproc_rules/preprocessor.rules \
-               || die "Failed to add files in /etc/snort/preproc_rules"
-
-       keepdir /etc/snort/rules/
-
-       keepdir /usr/$(get_libdir)/snort_dynamicrule
-
-       fowners -R snort:snort /etc/snort/
-
-       if use reload; then
-               newinitd "${FILESDIR}/snort.reload.rc1" snort \
-                       || die "Failed to add snort.reload.rc1"
-       else
-               newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-       fi
-
-       newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-       # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-       sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Set the correct rule location in the config
-       sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Set the correct preprocessor/decoder rule location in the config
-       sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Enable the preprocessor/decoder rules
-       sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Just some clean up of trailing /'s in the config
-       sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:snort_dynamicrule/$:snort_dynamicrule:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Make it clear in the config where these are...
-       sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Disable all rule files by default.
-       #Users need to choose what they want enabled.
-       sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-       einfo
-       einfo "Snort is a libpcap based packet capture tool which can be used in"
-       einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-       einfo "Detection/Prevention System Mode."
-       einfo
-       einfo "To learn more about these modes review the Snort User Manual at..."
-       einfo
-       einfo "http://www.snort.org/docs/"
-       einfo
-       einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-       einfo "information on configuring snort."
-       einfo
-       einfo "Joining the Snort-Users and Snort-Sigs mailing list is highly"
-       einfo "recommended for all users..."
-       einfo
-       einfo "http://www.snort.org/community/mailing-lists/"
-       einfo
-       einfo "To download rules for use with Snort please, see the following"
-       einfo
-       einfo "Sourcefire's VRT Rules and older Community Rules:"
-       einfo "http://www.snort.org/pub-bin/downloads.cgi"
-       einfo
-       einfo "Emerging Threats Rules:"
-       einfo "http://www.emergingthreats.net/"
-       einfo
-       einfo "To manage updates to your rules please visit..."
-       einfo
-       einfo "http://oinkmaster.sourceforge.net/"
-       einfo
-       einfo "and then 'emerge oinkmaster'."
-       elog
-       elog "Snort-2.8.5.2 Notes:"
-       elog
-       elog "Ebuild Notes"
-       elog "Fixes Bug #297190"
-       elog
-       elog "Snort Release Notes:"
-       elog "http://dl.snort.org/snort-current/release_notes_2852.txt"
-       elog
-       elog "Make sure to check snort.conf.distrib for new features/options."
-       elog
-}
diff --git a/net-analyzer/snort/snort-2.8.5.3.ebuild b/net-analyzer/snort/snort-2.8.5.3.ebuild
deleted file mode 100644 (file)
index 631b70e..0000000
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.8.5.3.ebuild,v 1.2 2010/06/17 20:41:53 patrick Exp $
-
-inherit eutils autotools multilib
-
-DESCRIPTION="The de facto standard for intrusion detection/prevention"
-HOMEPAGE="http://www.snort.org/"
-SRC_URI="http://dl.snort.org/snort-current/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static dynamicplugin ipv6 gre mpls targetbased decoder-preprocessor-rules ppm timestats perfprofiling linux-smp-stats inline inline-init-failopen prelude threads debug reload reload-error-restart flexresp flexresp2 react aruba mysql odbc postgres selinux"
-
-#flexresp, react, and inline _ONLY_ work with net-libs/libnet-1.0.2a
-DEPEND="virtual/libpcap
-       >=dev-libs/libpcre-6.0
-       flexresp2? ( dev-libs/libdnet )
-       flexresp? ( ~net-libs/libnet-1.0.2a )
-       react? ( ~net-libs/libnet-1.0.2a )
-       postgres? ( dev-db/postgresql-base )
-       mysql? ( virtual/mysql )
-       odbc? ( dev-db/unixODBC )
-       prelude? ( >=dev-libs/libprelude-0.9.0 )
-       inline? ( ~net-libs/libnet-1.0.2a net-firewall/iptables )"
-
-RDEPEND="${DEPEND}
-       dev-lang/perl
-       selinux? ( sec-policy/selinux-snort )"
-
-pkg_setup() {
-
-       if use flexresp && use flexresp2; then
-               eerror
-               eerror "You have both the 'flexresp' and 'flexresp2' USE flags set."
-               eerror "You can use 'flexresp' OR 'flexresp2' but not both."
-               eerror "flexresp2 is recommended."
-               die
-       elif use flexresp && use react; then
-               eerror
-               eerror "You have both the 'react' and 'flexresp' USE flags set."
-               eerror "'react' is enabled automaticly when the 'flexresp'"
-               eerror "USE flag is set, but ./configure will fail if both are enabled."
-               eerror
-               eerror "This is an upstream issue and not a problem with this ebuild."
-               eerror
-               eerror "To enable both 'flexresp' and 'react' set USE="flexresp -react""
-               die
-       elif use flexresp2 && use react; then
-               eerror
-               eerror "You have both the 'react' and 'flexresp2' USE flags set."
-               eerror "You can use 'react' OR 'flexresp2' but not both."
-               die
-       elif use inline-init-failopen && ! use inline; then
-               eerror
-               eerror "You have enabled the 'inline-init-failopen' USE flag"
-               eerror "but not the 'inline' USE flag."
-               eerror "'inline-init-failopen' requires 'inline' be enabled."
-               die
-       elif use reload-error-restart && ! use reload; then
-               eerror
-               eerror "You have enabled the 'reload-error-restart' USE flag"
-               eerror "but not the 'reload' USE flag."
-               eerror "'reload-error-restart' requires 'reload' be enabled."
-               die
-       fi
-
-       # pre_inst() is a better place to put this
-       # but we need it here for the 'fowners' statements in src_install()
-       enewgroup snort
-       enewuser snort -1 -1 /dev/null snort
-
-}
-
-src_unpack() {
-
-       unpack ${A}
-       cd "${S}"
-
-       # Fix to prevent the docs Makefile from being used.
-       # Fixes #297190.
-       einfo "Applying documentation fix."
-       sed -i -e 's:src doc etc:src etc:g' \
-               "${WORKDIR}/${P}/Makefile.am" || die "Doc fix Failed"
-
-       # Fix to allow parallel building.
-       # Thanks to Natanael Copa #291558
-       einfo "Applying parallel building fix."
-       sed -i -e 's/^all-local:.*/all-local: $(LTLIBRARIES)/' \
-                       src/dynamic-preprocessors/*/Makefile.am \
-                                       || die "parallel builds fix Failed"
-
-       #Replaces the libnet-1.0 patch for inline, flexresp, and react
-       if use flexresp || use react || use inline; then
-
-               einfo "Applying libnet-1.0 fix."
-               sed -i -e 's:libnet.h:libnet-1.0.h:g' \
-                       "${WORKDIR}/${P}/configure.in" \
-                       "${WORKDIR}/${P}/src/detection-plugins/sp_react.c" \
-                       "${WORKDIR}/${P}/src/detection-plugins/sp_respond.c" \
-                       "${WORKDIR}/${P}/src/inline.c" || die "sed for libnet-1.0.h failed"
-
-               sed -i -e 's:libnet-config:libnet-1.0-config:g' \
-                       "${WORKDIR}/${P}/configure.in" || die "sed for libnet-1.0-config failed"
-
-               sed -i -e 's:-lnet:-lnet-1.0:g' \
-                       "${WORKDIR}/${P}/configure.in" || die "sed for -lnet-1.0 failed"
-
-               sed -i -e 's:AC_CHECK_LIB(net:AC_CHECK_LIB(net-1.0:g' \
-                       "${WORKDIR}/${P}/configure.in" || die "sed for net-1.0 failed"
-
-       fi
-
-       #Multilib fix for the sf_engine
-       einfo "Applying multilib fix."
-       sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-               "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
-               || die "sed for sf_engine failed"
-
-       #Multilib fix for the curent set of dynamic-preprocessors
-       for i in ftptelnet smtp ssh dcerpc dns ssl dcerpc2; do
-               sed -i -e 's:${exec_prefix}/lib:${exec_prefix}/'$(get_libdir)':g' \
-                       "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
-                       || die "sed for $i failed."
-       done
-
-       #This sed will prevent the example dynamic code from being compiled/installed
-       einfo "Disabling sample code."
-       sed -i -e 's:$(EXAMPLES_DIR)::g' "${WORKDIR}/${P}/src/Makefile.am"
-
-       if use prelude; then
-               einfo "Applying prelude fix."
-               sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in
-       fi
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_compile() {
-
-       local myconf
-
-       #targetbased and inline-init-failopen automaticly enable pthread
-       if use threads || use targetbased || use inline-init-failopen; then
-               myconf="${myconf} --enable-pthread"
-       fi
-
-       #Tell flexresp, react, and inline where libipq is
-       if use flexresp || use react || use inline; then
-               myconf="${myconf} --with-libipq-includes=/usr/include/libipq"
-       fi
-
-       econf \
-               $(use_enable !static shared) \
-               $(use_enable static) \
-               $(use_enable dynamicplugin) \
-               $(use_enable ipv6) \
-               $(use_enable gre) \
-               $(use_enable mpls) \
-               $(use_enable targetbased) \
-               $(use_enable decoder-preprocessor-rules) \
-               $(use_enable ppm) \
-               $(use_enable timestats) \
-               $(use_enable perfprofiling) \
-               $(use_enable linux-smp-stats) \
-               $(use_enable inline) \
-               $(use_enable inline-init-failopen) \
-               $(use_enable prelude) \
-               $(use_enable debug) \
-               $(use_enable reload) \
-               $(use_enable reload-error-restart) \
-               $(use_enable flexresp) \
-               $(use_enable flexresp2) \
-               $(use_enable react) \
-               $(use_enable aruba) \
-               $(use_with mysql) \
-               $(use_with odbc) \
-               $(use_with postgres postgresql) \
-               --disable-ipfw \
-               --disable-profile \
-               --disable-ppm-test \
-               --without-oracle \
-               ${myconf}
-
-       emake || die "make failed"
-
-}
-
-src_install() {
-
-       emake DESTDIR="${D}" install || die "make install failed"
-
-       keepdir /var/log/snort/
-       fowners snort:snort /var/log/snort
-
-       keepdir /var/run/snort/
-       fowners snort:snort /var/run/snort/
-
-       dodoc doc/*
-       dodoc ./RELEASE.NOTES
-       docinto schemas
-       dodoc schemas/*
-
-       insinto /etc/snort
-       doins etc/attribute_table.dtd \
-               etc/classification.config \
-               etc/gen-msg.map \
-               etc/reference.config \
-               etc/sid-msg.map \
-               etc/threshold.conf \
-               etc/unicode.map \
-               || die "Failed to add files in /etc/snort"
-
-       newins etc/snort.conf snort.conf.distrib
-
-       insinto /etc/snort/preproc_rules
-       doins preproc_rules/decoder.rules \
-               preproc_rules/preprocessor.rules \
-               || die "Failed to add files in /etc/snort/preproc_rules"
-
-       keepdir /etc/snort/rules/
-
-       keepdir /usr/$(get_libdir)/snort_dynamicrule
-
-       fowners -R snort:snort /etc/snort/
-
-       if use reload; then
-               newinitd "${FILESDIR}/snort.reload.rc1" snort \
-                       || die "Failed to add snort.reload.rc1"
-       else
-               newinitd "${FILESDIR}/snort.rc9" snort || die "Failed to add snort.rc9"
-       fi
-
-       newconfd "${FILESDIR}/snort.confd" snort || die "Failed to add snort.confd"
-
-       # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
-       sed -i -e 's:/usr/local/lib:/usr/'$(get_libdir)':g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Set the correct rule location in the config
-       sed -i -e 's:RULE_PATH ../rules:RULE_PATH /etc/snort/rules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Set the correct preprocessor/decoder rule location in the config
-       sed -i -e 's:PREPROC_RULE_PATH ../preproc_rules:PREPROC_RULE_PATH /etc/snort/preproc_rules:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Enable the preprocessor/decoder rules
-       sed -i -e 's:^# include $PREPROC_RULE_PATH:include $PREPROC_RULE_PATH:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:^# dynamicdetection directory:dynamicdetection directory:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Just some clean up of trailing /'s in the config
-       sed -i -e 's:snort_dynamicpreprocessor/$:snort_dynamicpreprocessor:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:snort_dynamicrule/$:snort_dynamicrule:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Make it clear in the config where these are...
-       sed -i -e 's:^include classification.config:include /etc/snort/classification.config:g' \
-               "${D}etc/snort/snort.conf.distrib"
-       sed -i -e 's:^include reference.config:include /etc/snort/reference.config:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-       #Disable all rule files by default.
-       #Users need to choose what they want enabled.
-       sed -i -e 's:^include $RULE_PATH:# include $RULE_PATH:g' \
-               "${D}etc/snort/snort.conf.distrib"
-
-}
-
-pkg_postinst() {
-       einfo
-       einfo "Snort is a libpcap based packet capture tool which can be used in"
-       einfo "three modes Sniffer Mode, Packet Logger Mode, or Network Intrusion"
-       einfo "Detection/Prevention System Mode."
-       einfo
-       einfo "To learn more about these modes review the Snort User Manual at..."
-       einfo
-       einfo "http://www.snort.org/docs/"
-       einfo
-       einfo "See /usr/share/doc/${PF} and /etc/snort/snort.conf.distrib for"
-       einfo "information on configuring snort."
-       einfo
-       einfo "Joining the Snort-Users and Snort-Sigs mailing list is highly"
-       einfo "recommended for all users..."
-       einfo
-       einfo "http://www.snort.org/community/mailing-lists/"
-       einfo
-       einfo "To download rules for use with Snort please, see the following"
-       einfo
-       einfo "Sourcefire's VRT Rules and older Community Rules:"
-       einfo "http://www.snort.org/pub-bin/downloads.cgi"
-       einfo
-       einfo "Emerging Threats Rules:"
-       einfo "http://www.emergingthreats.net/"
-       einfo
-       einfo "To manage updates to your rules please visit..."
-       einfo
-       einfo "http://oinkmaster.sourceforge.net/"
-       einfo
-       einfo "and then 'emerge oinkmaster'."
-       elog
-       elog "Snort-2.8.5.3 Notes:"
-       elog
-       elog "Ebuild Notes"
-       elog "The USE flags 'prelude' and 'ipv6' now work when used together."
-       elog
-       elog "Snort Release Notes:"
-       elog "http://dl.snort.org/snort-current/release_notes_2853.txt"
-       elog
-       elog "Make sure to check snort.conf.distrib for new features/options."
-       elog
-}
index fc69c9eecdfecb3c2794958b0cf971bf2663875c..1ec649b6d716433a13bb342ff9e8ae37668e2f89 100644 (file)
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.29 2010/06/17 20:44:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.30 2010/06/18 07:15:56 patrick Exp $
+
+  18 Jun 2010; Patrick Lauer <patrick@gentoo.org> -zabbix-1.6.7.ebuild,
+  -zabbix-1.8.ebuild:
+  Remove old
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> zabbix-1.6.7.ebuild,
   zabbix-1.8.ebuild, zabbix-1.8-r1.ebuild, zabbix-1.8.1.ebuild,
diff --git a/net-analyzer/zabbix/zabbix-1.6.7.ebuild b/net-analyzer/zabbix/zabbix-1.6.7.ebuild
deleted file mode 100644 (file)
index a1aeea8..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.6.7.ebuild,v 1.2 2010/06/17 20:44:07 patrick Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres proxy server snmp +sqlite3 openipmi"
-DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( virtual/mysql )
-       sqlite3? ( =dev-db/sqlite-3* )
-       postgres? ( dev-db/postgresql-base )
-       jabber? ( dev-libs/iksemel )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )"
-RDEPEND="${RDEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping )
-       frontend? ( dev-lang/php )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-       if useq server || useq proxy ; then
-               local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-               declare -i dbnum=0
-               for dbtype in ${dbtypes}; do
-                       useq ${dbtype} && let dbnum++
-               done
-               if [ ${dbnum} -gt 1 ]; then
-                       eerror
-                       eerror "You can't use more than one database type in Zabbix."
-                       eerror "Select exactly one database type out of these: ${dbtypes}"
-                       eerror
-                       die "Multiple database types selected."
-               elif [ ${dbnum} -lt 1 ]; then
-                       eerror
-                       eerror "Select exactly one database type out of these: ${dbtypes}"
-                       eerror
-                       die "No database type selected."
-               fi
-               if useq oracle; then
-                       if [ -z "${ORACLE_HOME}" ]; then
-                               eerror
-                               eerror "The environment variable ORACLE_HOME must be set"
-                               eerror "and point to the correct location."
-                               eerror "It looks like you don't have Oracle installed."
-                               eerror
-                               die "Environment variable ORACLE_HOME is not set"
-                       fi
-                       if has_version 'dev-db/oracle-instantclient-basic'; then
-                               ewarn
-                               ewarn "Please ensure you have a full install of the Oracle client."
-                               ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                               ewarn
-                       fi
-               fi
-       fi
-
-       if useq frontend; then
-               webapp_pkg_setup
-               require_gd
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-       if useq server || useq proxy ; then
-               elog
-               elog "You need to configure your database for Zabbix."
-               elog
-               elog "Have a look at /usr/share/zabbix/database for"
-               elog "database creation and upgrades."
-               elog
-               elog "For more info read the Zabbix manual at"
-               elog "http://www.zabbix.com/documentation.php"
-               elog
-
-               zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if useq server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "Add these lines in the /etc/services :"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       # repeat fowners/fperms functionality from src_install()
-       # here to catch wrong permissions on existing files in
-       # the live filesystem (yeah, that sucks).
-       chown -R zabbix:zabbix \
-               "${ROOT}"/etc/zabbix \
-               "${ROOT}"/var/lib/zabbix \
-               "${ROOT}"/var/lib/zabbix/home \
-               "${ROOT}"/var/lib/zabbix/scripts \
-               "${ROOT}"/var/log/zabbix \
-               "${ROOT}"/var/run/zabbix
-       chmod 0750 \
-               "${ROOT}"/etc/zabbix \
-               "${ROOT}"/var/lib/zabbix \
-               "${ROOT}"/var/lib/zabbix/home \
-               "${ROOT}"/var/lib/zabbix/scripts \
-               "${ROOT}"/var/log/zabbix \
-               "${ROOT}"/var/run/zabbix
-
-       chmod 0640 \
-               "${ROOT}"/etc/zabbix/zabbix_*
-
-       if useq server || useq proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid root and executable"
-                               ewarn "by everyone. Run the following command to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ebeep 3
-                               epause 5
-                               ;;
-               esac
-       fi
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres pgsql) \
-               $(use_with oracle) \
-               $(use_with sqlite3) \
-               $(use_with jabber) \
-               $(use_with curl libcurl) \
-       $(use_with openipmi openipmi) \
-               || die "econf failed"
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-
-       if useq server; then
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/1.6.6"/zabbix_server.conf \
-                       "${FILESDIR}/1.6.6"/zabbix_trapper.conf
-               doinitd \
-                       "${FILESDIR}/1.6.6"/init.d/zabbix-server
-               dosbin \
-                       src/zabbix_server/zabbix_server
-               dodir \
-                       /usr/share/zabbix/database
-               insinto /usr/share/zabbix/database
-               doins -r \
-                       upgrades \
-                       create
-               fowners zabbix:zabbix \
-                       /etc/zabbix/zabbix_server.conf \
-                       /etc/zabbix/zabbix_trapper.conf
-               fperms 0640 \
-                       /etc/zabbix/zabbix_server.conf \
-                       /etc/zabbix/zabbix_trapper.conf
-       fi
-
-       if useq proxy; then
-               doinitd \
-                       "${FILESDIR}/1.6.6"/init.d/zabbix-proxy
-               dosbin \
-                       src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/1.6.6"/zabbix_proxy.conf
-               dodir \
-                       /usr/share/zabbix/database
-               insinto /usr/share/zabbix/database
-               doins -r \
-                       upgrades \
-                       create
-       fi
-
-       if useq agent; then
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/1.6.6"/zabbix_agent.conf \
-                       "${FILESDIR}/1.6.6"/zabbix_agentd.conf
-               doinitd \
-                       "${FILESDIR}/1.6.6"/init.d/zabbix-agentd
-               dosbin \
-                       src/zabbix_agent/zabbix_agent \
-                       src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog
-
-       if useq frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-}
diff --git a/net-analyzer/zabbix/zabbix-1.8.ebuild b/net-analyzer/zabbix/zabbix-1.8.ebuild
deleted file mode 100644 (file)
index 67f349f..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.ebuild,v 1.4 2010/06/17 20:44:07 patrick Exp $
-
-EAPI="2"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="http://dev.gentooexperimental.org/~dreeevil/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres proxy server snmp +sqlite3 openipmi"
-DEPEND="snmp? ( net-analyzer/net-snmp )
-       ldap? (
-               net-nds/openldap
-               =dev-libs/cyrus-sasl-2*
-               net-libs/gnutls
-       )
-       mysql? ( virtual/mysql )
-       sqlite3? ( =dev-db/sqlite-3* )
-       postgres? ( dev-db/postgresql-base )
-       jabber? ( dev-libs/iksemel )
-       curl? ( net-misc/curl )
-       openipmi? ( sys-libs/openipmi )"
-RDEPEND="${DEPEND}
-       proxy? ( net-analyzer/fping )
-       server? ( net-analyzer/fping
-               app-admin/webapp-config )
-       frontend? ( dev-lang/php[bcmath]
-               app-admin/webapp-config )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-       if useq server || useq proxy ; then
-               local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-               declare -i dbnum=0
-               for dbtype in ${dbtypes}; do
-                       useq ${dbtype} && let dbnum++
-               done
-               if [ ${dbnum} -gt 1 ]; then
-                       eerror
-                       eerror "You can't use more than one database type in Zabbix."
-                       eerror "Select exactly one database type out of these: ${dbtypes}"
-                       eerror
-                       die "Multiple database types selected."
-               elif [ ${dbnum} -lt 1 ]; then
-                       eerror
-                       eerror "Select exactly one database type out of these: ${dbtypes}"
-                       eerror
-                       die "No database type selected."
-               fi
-               if useq oracle; then
-                       if [ -z "${ORACLE_HOME}" ]; then
-                               eerror
-                               eerror "The environment variable ORACLE_HOME must be set"
-                               eerror "and point to the correct location."
-                               eerror "It looks like you don't have Oracle installed."
-                               eerror
-                               die "Environment variable ORACLE_HOME is not set"
-                       fi
-                       if has_version 'dev-db/oracle-instantclient-basic'; then
-                               ewarn
-                               ewarn "Please ensure you have a full install of the Oracle client."
-                               ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-                               ewarn
-                       fi
-               fi
-       fi
-
-       if useq frontend; then
-               webapp_pkg_setup
-               require_gd
-       fi
-
-       enewgroup zabbix
-       enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-       if useq server || useq proxy ; then
-               elog
-               elog "You need to configure your database for Zabbix."
-               elog
-               elog "Have a look at /usr/share/zabbix/database for"
-               elog "database creation and upgrades."
-               elog
-               elog "For more info read the Zabbix manual at"
-               elog "http://www.zabbix.com/documentation.php"
-               elog
-
-               zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-               if [ -n "${zabbix_homedir}" ] && \
-                  [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-                       ewarn
-                       ewarn "The user 'zabbix' should have his homedir changed"
-                       ewarn "to /var/lib/zabbix/home if you want to use"
-                       ewarn "custom alert scripts."
-                       ewarn
-                       ewarn "A real homedir might be needed for configfiles"
-                       ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-                       ewarn "using sendxmpp for Jabber alerts)."
-                       ewarn
-                       ewarn "To change the homedir use:"
-                       ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-                       ewarn
-               fi
-       fi
-
-       if useq server; then
-               elog
-               elog "For distributed monitoring you have to run:"
-               elog
-               elog "zabbix_server -n <nodeid>"
-               elog
-               elog "This will convert database data for use with Node ID"
-               elog "and also adds a local node."
-               elog
-       fi
-
-       elog "--"
-       elog
-       elog "Add these lines in the /etc/services :"
-       elog
-       elog "zabbix-agent     10050/tcp Zabbix Agent"
-       elog "zabbix-agent     10050/udp Zabbix Agent"
-       elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-       elog "zabbix-trapper   10051/udp Zabbix Trapper"
-       elog
-
-       # repeat fowners/fperms functionality from src_install()
-       # here to catch wrong permissions on existing files in
-       # the live filesystem (yeah, that sucks).
-       chown -R zabbix:zabbix \
-               "${ROOT}"/etc/zabbix \
-               "${ROOT}"/var/lib/zabbix \
-               "${ROOT}"/var/lib/zabbix/home \
-               "${ROOT}"/var/lib/zabbix/scripts \
-               "${ROOT}"/var/log/zabbix \
-               "${ROOT}"/var/run/zabbix
-       chmod 0750 \
-               "${ROOT}"/etc/zabbix \
-               "${ROOT}"/var/lib/zabbix \
-               "${ROOT}"/var/lib/zabbix/home \
-               "${ROOT}"/var/lib/zabbix/scripts \
-               "${ROOT}"/var/log/zabbix \
-               "${ROOT}"/var/run/zabbix
-
-       chmod 0640 \
-               "${ROOT}"/etc/zabbix/zabbix_*
-
-       if useq server || useq proxy ; then
-               # check for fping
-               fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-               case "${fping_perms}" in
-                       4[157][157][157])
-                               ;;
-                       *)
-                               ewarn
-                               ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-                               ewarn "you have to make /usr/sbin/fping setuid root and executable"
-                               ewarn "by everyone. Run the following command to fix it:"
-                               ewarn
-                               ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-                               ewarn
-                               ewarn "Please be aware that this might impose a security risk,"
-                               ewarn "depending on the code quality of fping."
-                               ewarn
-                               ebeep 3
-                               epause 5
-                               ;;
-               esac
-       fi
-}
-
-src_configure() {
-       econf \
-               $(use_enable server) \
-               $(use_enable proxy) \
-               $(use_enable agent) \
-               $(use_with ldap) \
-               $(use_with snmp net-snmp) \
-               $(use_with mysql) \
-               $(use_with postgres pgsql) \
-               $(use_with oracle) \
-               $(use_with sqlite3) \
-               $(use_with jabber) \
-               $(use_with curl libcurl) \
-       $(use_with openipmi openipmi) \
-               || die "econf failed"
-}
-
-src_install() {
-       dodir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-
-       keepdir \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-
-       if useq server; then
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/1.6.6"/zabbix_server.conf \
-                       "${FILESDIR}/1.6.6"/zabbix_trapper.conf
-               doinitd \
-                       "${FILESDIR}/1.6.6"/init.d/zabbix-server
-               dosbin \
-                       src/zabbix_server/zabbix_server
-               dodir \
-                       /usr/share/zabbix/database
-               insinto /usr/share/zabbix/database
-               doins -r \
-                       upgrades \
-                       create
-               fowners zabbix:zabbix \
-                       /etc/zabbix/zabbix_server.conf \
-                       /etc/zabbix/zabbix_trapper.conf
-               fperms 0640 \
-                       /etc/zabbix/zabbix_server.conf \
-                       /etc/zabbix/zabbix_trapper.conf
-       fi
-
-       if useq proxy; then
-               doinitd \
-                       "${FILESDIR}/1.6.6"/init.d/zabbix-proxy
-               dosbin \
-                       src/zabbix_proxy/zabbix_proxy
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/1.6.6"/zabbix_proxy.conf
-               dodir \
-                       /usr/share/zabbix/database
-               insinto /usr/share/zabbix/database
-               doins -r \
-                       upgrades \
-                       create
-       fi
-
-       if useq agent; then
-               insinto /etc/zabbix
-               doins \
-                       "${FILESDIR}/1.6.6"/zabbix_agent.conf \
-                       "${FILESDIR}/1.6.6"/zabbix_agentd.conf
-               doinitd \
-                       "${FILESDIR}/1.6.6"/init.d/zabbix-agentd
-               dosbin \
-                       src/zabbix_agent/zabbix_agent \
-                       src/zabbix_agent/zabbix_agentd
-               dobin \
-                       src/zabbix_sender/zabbix_sender \
-                       src/zabbix_get/zabbix_get
-               fowners zabbix:zabbix \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-               fperms 0640 \
-                       /etc/zabbix/zabbix_agent.conf \
-                       /etc/zabbix/zabbix_agentd.conf
-       fi
-
-       fowners zabbix:zabbix \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-       fperms 0750 \
-               /etc/zabbix \
-               /var/lib/zabbix \
-               /var/lib/zabbix/home \
-               /var/lib/zabbix/scripts \
-               /var/log/zabbix \
-               /var/run/zabbix
-
-       dodoc README INSTALL NEWS ChangeLog
-
-       if useq frontend; then
-               webapp_src_preinst
-               cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-               webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
-               webapp_configfile \
-                       "${MY_HTDOCSDIR}"/include/db.inc.php \
-                       "${MY_HTDOCSDIR}"/include/config.inc.php
-               webapp_src_install
-       fi
-}