From 97967bbbae8f43c98315b079178f1717f130e302 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 19 May 2018 13:06:44 +0100 Subject: gentoo resync : 19.05.2018 --- net-analyzer/Manifest.gz | Bin 49637 -> 49634 bytes net-analyzer/wireshark/Manifest | 2 +- net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild | 248 ----------------- net-analyzer/wireshark/wireshark-2.6.0-r2.ebuild | 249 +++++++++++++++++ net-analyzer/zabbix/Manifest | 4 + net-analyzer/zabbix/zabbix-3.0.17.ebuild | 331 +++++++++++++++++++++++ net-analyzer/zabbix/zabbix-3.4.9.ebuild | 329 ++++++++++++++++++++++ 7 files changed, 914 insertions(+), 249 deletions(-) delete mode 100644 net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild create mode 100644 net-analyzer/wireshark/wireshark-2.6.0-r2.ebuild create mode 100644 net-analyzer/zabbix/zabbix-3.0.17.ebuild create mode 100644 net-analyzer/zabbix/zabbix-3.4.9.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 89e865503a93..41cce129ea45 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index b80c24563b19..6a4b6d9d7018 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -11,7 +11,7 @@ DIST wireshark-2.4.6.tar.xz 28851192 BLAKE2B 19a69d077b794ab07fbfb22b7cf9e61ff54 DIST wireshark-2.6.0.tar.xz 28314868 BLAKE2B 2121a667115474ac4b1fe05d50ffc02383bf7a8057ea072480455562c62a75d18f3c6b6886ca1e7345101d15057a67a250a3d2a2050777ff5bb1654279b1ac87 SHA512 a419ed32caeb9f25fc26e345c7baf7d847fee35730c64efad66870a786b26b9f8d5a8665b8b99be88f9cf504f6d9e640584d9849558ff09efc83400588dc6da8 EBUILD wireshark-2.4.5.ebuild 7380 BLAKE2B 0fd3f07582d42cf9651496978c983c9cfa54b2ee0df52151c04bcb7ffd7c886aecf233598226dc2427ec0fbf6fa7d5d4ca8bf92f361c853a10b72dd625fa72dd SHA512 558350df39da8b7419d63251544900f519d920e120ffa40cdfefc7b088731d2ac6755928758bd4c9379f49b1b00b93f4cda8713601e340647d955cc73e6e590c EBUILD wireshark-2.4.6.ebuild 7388 BLAKE2B 1d73922229e3216ee9aeb3f95f964da3aa6afea193e88209df3f91419ba99de6de201538750dd79c3421bd8cf12dcfd1b12022b0be97a21f3e743fea17f70107 SHA512 dc66e5dd25527f9fd7ec05f6d810b4d92f2c138e2337def5571e7a7bcaf6034099ad649869190aa366700e6223e9de09997fa36c6910f9dbbc5e0c736e26a92b -EBUILD wireshark-2.6.0-r1.ebuild 6721 BLAKE2B 438c1c8d3123ff197807d7f61470636e0d56040a795e36d52cefa2b328b865a785168f3aa01469f5addeabee707598ea3141b5409de40c3ab42f94184c1f9eda SHA512 8c7fcd91dd2ff4ceba0ea03db11f9ac1dbb4b2f4340bfab6362bc2967be3a7f38a7a064e0dabf5c0bfa40b67675133a23aa7ead86a4bd07a913fb1b02faa4358 +EBUILD wireshark-2.6.0-r2.ebuild 6753 BLAKE2B 1a67962d383ec161863f0289792121ac1a248aee550005005be2683728f9188cec95a484c25a8ae023f23dbd0850a6725c6f8a7b754d26e715f0356075da6c43 SHA512 271f9c37fc1c59063f1feecc8f5392303d01587833d9736e63146c037ad161cd875f9cd912bb93abf13fe3b72300c4826016cb21cbd4b3c704163c0c476e4b05 EBUILD wireshark-2.6.0.ebuild 6657 BLAKE2B b067e041801abaf66207c7841e41d7d359d3e8d5300be0bb78f484e75feae8889c50cd75d566e4c3e32e12728df261f44dccb6784ecab7da8ac67eb9fb1675b5 SHA512 d213869467b91e8b7d4bb176441d2905bb7de877ae88651b1e8f4f16cb54c86b0eb189efdf8b0387bfc694cf61c0f6978f655639d77ea469ce1788e6f94985c6 EBUILD wireshark-99999999.ebuild 6599 BLAKE2B 88bd901752d603d201d8f5cedaa986b70c19f934f3998003d8f14039eb9b86dfda8983a5a987f70efdb32fec3a2075e0059492d82b66f8ae9510a2475a434f43 SHA512 8b3d5fae3df5f2ca4cfcdd9fcfd110dbe88e7b9a283f2574242ccd7ef39aac44f3957d1488dc944166af7445aef6dff2d6f0c7371a5694a67ca877806371fc5f MISC metadata.xml 4787 BLAKE2B dcdb28c47094cfddc0effc4c16aa9132386f94d4d6e6cdb46f31a06ebb5dd7cd5c7bf967f50c6a002b7aeecddeb8aa8b86cb5961405a463c10389d6ec9b5cb7f SHA512 b683b159266bc37471ef26f6c0c4b2e94f72d2a77a2a7647e28b8b49e611973522af294c39050dbfa8aa5cca65bf2670f9d4c1e6a93d01b386e76f1ab75ff2e9 diff --git a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild deleted file mode 100644 index 23ffa310a9ed..000000000000 --- a/net-analyzer/wireshark/wireshark-2.6.0-r1.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils eutils fcaps flag-o-matic gnome2-utils ltprune multilib qmake-utils user xdg-utils - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" -IUSE=" - adns androiddump bcg729 +capinfos +caps +captype ciscodump +dftest doc - +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink - nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux - +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump - zlib -" - -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.14:2 - dev-libs/libgcrypt:0 - netlink? ( dev-libs/libnl:3 ) - adns? ( >=net-dns/c-ares-1.5 ) - bcg729? ( media-libs/bcg729 ) - caps? ( sys-libs/libcap ) - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - x11-misc/xdg-utils - ) - kerberos? ( virtual/krb5 ) - sshdump? ( >=net-libs/libssh-0.6 ) - ciscodump? ( >=net-libs/libssh-0.6 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - nghttp2? ( net-libs/nghttp2 ) - pcap? ( net-libs/libpcap ) - portaudio? ( media-libs/portaudio ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - >=media-libs/speex-1.2.0 - media-libs/speexdsp - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - dev-lang/perl - !" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /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 + + if use server || use 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 + ;; + esac + fi +} diff --git a/net-analyzer/zabbix/zabbix-3.4.9.ebuild b/net-analyzer/zabbix/zabbix-3.4.9.ebuild new file mode 100644 index 000000000000..94b8bc3cdfff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-3.4.9.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" +REQUIRED_USE="|| ( agent frontend proxy server ) + proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) + server? ( ^^ ( mysql oracle postgres odbc ) ) + static? ( !oracle !snmp )" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( >=virtual/mysql-5.0.3 ) + sqlite? ( >=dev-db/sqlite-3.3.5 ) + postgres? ( dev-db/postgresql:* ) + oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) + xmpp? ( dev-libs/iksemel ) + libxml2? ( dev-libs/libxml2 ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( virtual/jdk:* ) + odbc? ( dev-db/unixODBC ) + ssl? ( dev-libs/openssl:=[-bindist] )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( net-analyzer/fping[suid] ) + server? ( net-analyzer/fping[suid] + app-admin/webapp-config + dev-libs/libevent ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + ) + frontend? ( + >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + static? ( + ldap? ( + net-nds/openldap[static-libs] + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + ) + mysql? ( >=virtual/mysql-5.0.3[static-libs] ) + sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + curl? ( net-misc/curl[static-libs] ) + ssh? ( net-libs/libssh2[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + ) + virtual/pkgconfig" + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use 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 + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api +} + +src_prepare() { + default +} + +src_configure() { + econf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with xmpp jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + $(use_with libxml2) \ + $(use_with odbc unixodbc) \ + $(use_with ssl openssl) \ + || die "econf failed" +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + fi +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + if use server; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_server.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-server + dosbin src/zabbix_server/zabbix_server + fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-server.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fi + + if use proxy; then + doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy + dosbin src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_proxy.conf + dodir /usr/share/zabbix + /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ + systemd_dounit "${FILESDIR}/zabbix-proxy.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${FILESDIR}/3.0"/zabbix_agentd.conf + doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + systemd_dounit "${FILESDIR}/zabbix-agentd.service" + systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy + doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. " + elog + + zabbix_homedir=$(egethome zabbix) + 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 use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n " + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /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 + + if use server || use 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 + ;; + esac + fi +} -- cgit v1.2.3