diff options
Diffstat (limited to 'net-analyzer')
16 files changed, 569 insertions, 190 deletions
diff --git a/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild new file mode 100644 index 000000000000..c1aeb36b8be8 --- /dev/null +++ b/net-analyzer/icinga2/icinga2-2.4.1-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit cmake-utils depend.apache eutils systemd toolchain-funcs user + +DESCRIPTION="Distributed, general purpose, network monitoring engine" +HOMEPAGE="http://icinga.org/icinga2" +SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+mysql postgres classicui lto minimal nano-syntax +plugins studio +vim-syntax" + +DEPEND=" + dev-libs/openssl:0 + >=dev-libs/boost-1.41 + sys-devel/bison + >=sys-devel/flex-2.5.35 + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql:= )" + +RDEPEND=" + ${DEPEND} + plugins? ( || ( + net-analyzer/monitoring-plugins + net-analyzer/nagios-plugins + ) ) + classicui? ( net-analyzer/icinga[web] ) + studio? ( x11-libs/wxGTK:2.9 )" + +REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" + +want_apache2 + +pkg_setup() { + depend.apache_pkg_setup + enewgroup icinga + enewgroup icingacmd + enewgroup nagios # for plugins + enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" +} + +src_configure() { + sed -i 's/FLAGS\}\ \-g/FLAGS\}\ /g' CMakeLists.txt || die + local mycmakeargs=( + -DICINGA2_UNITY_BUILD=FALSE + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=None + -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_SYSCONFDIR=/etc + -DCMAKE_INSTALL_LOCALSTATEDIR=/var + -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 + -DICINGA2_USER=icinga + -DICINGA2_GROUP=icingacmd + -DICINGA2_COMMAND_USER=icinga + -DICINGA2_COMMAND_GROUP=icingacmd + -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes + ) + # default to off if minimal, allow the flags to be set otherwise + if use minimal; then + mycmakeargs+=( + -DICINGA2_WITH_MYSQL=OFF + -DICINGA2_WITH_PGSQL=OFF + ) + else + mycmakeargs+=( + -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) + -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) + ) + fi + # LTO + if use lto; then + mycmakeargs+=( + -DICINGA2_LTO_BUILD=ON + ) + else + mycmakeargs+=( + -DICINGA2_LTO_BUILD=OFF + ) + fi + # STUDIO + if use studio; then + mycmakeargs+=( + -DICINGA2_WITH_STUDIO=ON + ) + else + mycmakeargs+=( + -DICINGA2_WITH_STUDIO=OFF + ) + fi + + cmake-utils_src_configure +} + +src_install() { + BUILDDIR="${WORKDIR}"/icinga2-${PV}_build + cd "${BUILDDIR}" || die + + emake DESTDIR="${D}" install + + einstalldocs + + newinitd "${FILESDIR}"/icinga2.initd icinga2 + newconfd "${FILESDIR}"/icinga2.confd icinga2 + + if use mysql ; then + docinto schema + newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql + docinto schema/upgrade + dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* + elif use postgres ; then + docinto schema + newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql + docinto schema/upgrade + dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* + fi + + keepdir /etc/icinga2 + keepdir /var/lib/icinga2/api/zones + keepdir /var/lib/icinga2/api/repository + keepdir /var/lib/icinga2/api/log + keepdir /var/spool/icinga2/perfdata + + rm -r "${D}/var/run" || die "failed to remove /var/run" + rm -r "${D}/var/cache" || die "failed to remove /var/cache" + + fowners icinga:icinga /etc/icinga2 + fowners icinga:icinga /var/lib/icinga2 + fowners icinga:icinga /var/spool/icinga2 + fowners icinga:icinga /var/spool/icinga2/perfdata + fowners icinga:icingacmd /var/log/icinga2 + + fperms ug+rwX,o-rwx /etc/icinga2 + fperms ug+rwX,o-rwx /var/lib/icinga2 + fperms ug+rwX,o-rwx /var/spool/icinga2 + fperms ug+rwX,o-rwx /var/log/icinga2 + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax + fi + + if use nano-syntax; then + insinto /usr/share/nano + doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc + fi +} + +pkg_postinst() { + elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database" + elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909" +} diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild index 951133c19549..1fecb968696c 100644 --- a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild @@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.} # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="bzip2 doc elf ipv6 libressl mfd-rewrites minimal perl python rpm selinux ssl tcpd X zlib lm_sensors ucd-compat pci netlink mysql" COMMON_DEPEND=" diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild index 0022291860af..b5e98b2441f1 100644 --- a/net-analyzer/nmap/nmap-7.01.ebuild +++ b/net-analyzer/nmap/nmap-7.01.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) @@ -96,6 +96,11 @@ src_prepare() { -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ Makefile.in || die + sed -i \ + -e '/rm -f $@/d' \ + $(find . -name Makefile.in) \ + || die + # Fix desktop files wrt bug #432714 sed -i \ -e '/^Encoding/d' \ @@ -126,6 +131,15 @@ src_configure() { } src_compile() { + local directory + for directory in . libnetutil nsock/src \ + $(usex ncat ncat '') \ + $(usex nmap-update nmap-update '') \ + $(usex nping nping '') + do + emake -C "${directory}" makefile.dep + done + emake \ AR=$(tc-getAR) \ RANLIB=$(tc-getRANLIB) diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild index cde758c7b875..31d09a0f92aa 100644 --- a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild +++ b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P/_/-}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -141,6 +141,10 @@ src_compile() { use python && distutils-r1_src_compile } +src_test() { + default +} + src_install() { default diff --git a/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch new file mode 100644 index 000000000000..f3c2fd08da0f --- /dev/null +++ b/net-analyzer/sslsniff/files/sslsniff-0.8-error-redefinition.patch @@ -0,0 +1,50 @@ +--- SSLConnectionManager.cpp.orig 2014-09-01 23:09:35.916376510 +0200 ++++ SSLConnectionManager.cpp 2014-09-01 23:10:32.492515988 +0200 +@@ -95,13 +95,13 @@ + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } catch (FirefoxUpdateException &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } + } + +@@ -120,13 +120,13 @@ + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } catch (FirefoxUpdateException &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); +- Logger::logError(error); ++ std::string errorStr = errorStream.str(); ++ Logger::logError(errorStr); + } + } + +@@ -151,9 +151,9 @@ + } catch (SSLConnectionError &error) { + std::stringstream errorStream; + errorStream << "Got exception: " << error.what(); +- std::string error = errorStream.str(); ++ std::string errorStr = errorStream.str(); + +- Logger::logError(error); ++ Logger::logError(errorStr); + } + } + } diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild index 90d7c8a83fa6..998780d7849d 100644 --- a/net-analyzer/sslsniff/sslsniff-0.8-r1.ebuild +++ b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_DEPEND="2" inherit autotools eutils @@ -14,27 +13,31 @@ SRC_URI="http://thoughtcrime.org/software/sslsniff/${P}.tar.gz" LICENSE="GPL-3" # plus OpenSSL exception SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="dev-libs/boost:= - dev-libs/log4cpp - dev-libs/openssl" + dev-libs/log4cpp:= + dev-libs/openssl:0" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6-asneeded.patch +DOCS=( AUTHORS README ) + +# last two patches are taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756 +PATCHES=( + "${FILESDIR}"/${PN}-0.6-asneeded.patch + "${FILESDIR}"/${P}-error-redefinition.patch + "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch + "${FILESDIR}"/${P}-underlinking.patch +) - #stolen from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652756 - epatch \ - "${FILESDIR}"/${P}-fix-compatibility-with-boost-1.47-and-higher.patch \ - "${FILESDIR}"/${P}-underlinking.patch +src_prepare() { + epatch ${PATCHES[@]} + epatch_user eautoreconf } src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS README + default insinto /usr/share/sslsniff doins leafcert.pem IPSCACLASEA1.crt diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 63786c06d701..636568df8e39 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,4 +1,2 @@ -DIST vnstat-1.11.tar.gz 79075 SHA256 b71876d817bbb6a16d31b4236e22a2eb6c39666a7f7bfea581f5ff441cade026 SHA512 f16a0cc5065665c46de9781b6d92e96f0966520e5448fc529150ced886574fe07d0695df5051828b58183d06a707b7b2e94562b06db1898dacb858517a5485b1 WHIRLPOOL bc93704b8f9c39830f1ba8c2d39cc7ba7d0b317d35941547870bd5cf8c2f374050cdbae7c8ce444765cd5fb22c78d28e6099f32b06aee9d836451b399216e6ef -DIST vnstat-1.12.tar.gz 98435 SHA256 af1050d9c1b22d4b9742fe0d1818de9eb1037b8e7f9ba67b962e108d8527be69 SHA512 0d6b5f362bbcbb4a104f82b8e350f5d8b071e974a3fdfb100333c3d8e5a096a71a97360543d2594fd3f2108df8bb03ffffc4c52d396f28723005a5d1bf605eb1 WHIRLPOOL 590197dc62b077268e0814d7ce15f5f519d53328a68e57743c1a3375082410239d75e28674094dbb7d14b27d17769f7de6d0eccd716a05d50d86f5d06274c9a0 DIST vnstat-1.13.tar.gz 101568 SHA256 6f4e2599ebb195b25f499d3e2e865aa14da336dfc9cc03a79181aa71f7ed99cd SHA512 b9620349247db292b13cd06db1921b4e5921a473957ac387f6adfc21acdc441910f73b97dfa5f024d7ba7a6521d1d9d97e2b25337673f423bcdbd064207f01a4 WHIRLPOOL 6b9aeb96790eeef2b287cdffeb4d41b2db22803e7218dafb27944bb14acf255bf590dcb82220c72f388c8cc387045b87335a2e4973a07c5ef1e1c98c710e068d -DIST vnstat-1.14.tar.gz 103281 SHA256 f8462a47d85d0890493dc9eaeafbc725ae631aa5b103fb7f8af4ddb2314e8386 SHA512 a2aebcdd0c4aa4a821579b751af587af44a5c3f14864d3022a05f65c4df2b9ddece0ed414097346d95124a3ea5fb89ea26bf44c68d3c7ca7237573dd5f1e8239 WHIRLPOOL 1b8b6ac7eeaec936d7c8d17d6a384c13f8daa9ee8e451d94abffc1b373eb3b106ed2b4c95af9f833c4c6e732a4ebc0ccdb1544988da650012add99d7915fd068 +DIST vnstat-1.15.tar.gz 207712 SHA256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 SHA512 e6cf714c2c95ae7f82ec7852d23067da28f4fab83cf33726e4268a31f982ddf13c3bc30f17251a80f7c65d25f394cd05379a30e677687ce70f8c7b229ac0cb4e WHIRLPOOL 7cb68f5c054c96697e415f4d3c23074f36ba1b8fdd012abf732cb6e50eff0a4a862267ac252aace1d5d7fea38cd5f525113a9cdb7e27d9cd58fce373a68896c6 diff --git a/net-analyzer/vnstat/vnstat-1.11-r2.ebuild b/net-analyzer/vnstat/vnstat-1.11-r2.ebuild deleted file mode 100644 index 0b20d76df83d..000000000000 --- a/net-analyzer/vnstat/vnstat-1.11-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit toolchain-funcs user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="http://humdi.net/vnstat/" -SRC_URI="http://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86" -IUSE="gd" - -DEPEND=" - gd? ( media-libs/gd[png] )" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - -src_compile() { - sed -i 's:vnstat[.]log:vnstatd.log:' cfg/vnstat.conf || die - sed -i 's:vnstat[.]pid:vnstatd/vnstatd.pid:' cfg/vnstat.conf || die - - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" $(usex gd all '') -} - -src_install() { - use gd && dobin src/vnstati - dobin src/vnstat src/vnstatd - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - newconfd "${FILESDIR}"/vnstatd.confd vnstatd - newinitd "${FILESDIR}"/vnstatd.initd vnstatd - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - - use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - - newdoc examples/vnstat_ip-up ip-up.example - newdoc examples/vnstat_ip-down ip-down.example - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} - -pkg_postinst() { - # Workaround feature/bug #141619 - chown -R vnstat:vnstat "${ROOT}"/var/lib/vnstat - chown vnstat:vnstat "${ROOT}"/var/run/vnstatd - ewarn "vnStat db files owning user and group has been changed to \"vnstat\"." - - elog - elog "Repeat the following command for every interface you" - elog "wish to monitor (replace eth0):" - elog " vnstat -u -i eth0" - elog "and set correct permissions after that, e.g." - elog " chown -R vnstat:vnstat /var/lib/vnstat" - elog - elog "Note: if an interface transfers more than ~4GB in" - elog "the time between cron runs, you may miss traffic" - elog - elog "To update the interfaces database automatically with cron, uncomment" - elog "lines in /etc/cron.hourly/vnstat and set cron job to run it as" - elog "frequently as required. Alternatively you can use vnstatd. Init script" - elog "was installed into /etc/init.d/vnstatd for your convenience." -} diff --git a/net-analyzer/vnstat/vnstat-1.12.ebuild b/net-analyzer/vnstat/vnstat-1.12.ebuild deleted file mode 100644 index a35b06920ea2..000000000000 --- a/net-analyzer/vnstat/vnstat-1.12.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit toolchain-funcs user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="http://humdi.net/vnstat/" -SRC_URI="http://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="gd selinux" - -DEPEND=" - gd? ( media-libs/gd[png] ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - -src_prepare() { - tc-export CC -} - -src_compile() { - sed -i 's:vnstat[.]log:vnstatd.log:' cfg/vnstat.conf || die - sed -i 's:vnstat[.]pid:vnstatd/vnstatd.pid:' cfg/vnstat.conf || die - - emake CFLAGS="${CFLAGS}" $(usex gd all '') -} - -src_install() { - use gd && dobin src/vnstati - dobin src/vnstat src/vnstatd - - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - newconfd "${FILESDIR}"/vnstatd.confd vnstatd - newinitd "${FILESDIR}"/vnstatd.initd vnstatd - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - - use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} - -pkg_postinst() { - # Workaround feature/bug #141619 - chown -R vnstat:vnstat "${ROOT}"/var/lib/vnstat - chown vnstat:vnstat "${ROOT}"/var/run/vnstatd - ewarn "vnStat db files owning user and group has been changed to \"vnstat\"." - - elog - elog "Repeat the following command for every interface you" - elog "wish to monitor (replace eth0):" - elog " vnstat -u -i eth0" - elog "and set correct permissions after that, e.g." - elog " chown -R vnstat:vnstat /var/lib/vnstat" - elog - elog "Note: if an interface transfers more than ~4GB in" - elog "the time between cron runs, you may miss traffic" - elog - elog "To update the interfaces database automatically with cron, uncomment" - elog "lines in /etc/cron.hourly/vnstat and set cron job to run it as" - elog "frequently as required. Alternatively you can use vnstatd. Init script" - elog "was installed into /etc/init.d/vnstatd for your convenience." -} diff --git a/net-analyzer/vnstat/vnstat-1.14.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild index 53ea375992ae..140d8394138c 100644 --- a/net-analyzer/vnstat/vnstat-1.14.ebuild +++ b/net-analyzer/vnstat/vnstat-1.15.ebuild @@ -45,12 +45,12 @@ src_prepare() { } src_compile() { - emake CFLAGS="${CFLAGS}" $(usex gd all '') + emake ${PN} ${PN}d $(usex gd ${PN}i '') } src_install() { - use gd && dobin src/vnstati - dobin src/vnstat src/vnstatd + use gd && dobin vnstati + dobin vnstat vnstatd exeinto /etc/cron.hourly newexe "${FILESDIR}"/vnstat.cron vnstat diff --git a/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch new file mode 100644 index 000000000000..639e2993ff6d --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.0.0-androiddump-pcap.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -549,6 +549,7 @@ + wiretap/libwiretap.la \ + wsutil/libwsutil.la \ + @GLIB_LIBS@ \ ++ @PCAP_LIBS@ \ + @SOCKET_LIBS@ + + androiddump_CFLAGS = $(AM_CLEAN_CFLAGS) diff --git a/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch new file mode 100644 index 000000000000..1f80be9f4fa9 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-2.1.0-sse4_2.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1101,6 +1101,7 @@ + AC_SUBST(PIE_CFLAGS) + AC_SUBST(PIE_LDFLAGS) + ++AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[ + WS_CHECKED_CFLAGS_before_simd="$WS_CHECKED_CFLAGS" + AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C) + if test "x$can_add_to_cflags" = "xyes" +@@ -1132,6 +1133,9 @@ + ac_sse4_2_flag=-xarch=sse4_2 + fi + fi ++],[ ++AC_MSG_RESULT(no) ++]) + + # + # All AC_WIRESHARK_COMPILER_FLAGS_CHECK are done, do not call it again! diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 2707e563ea6a..9b808bbd2895 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -26,6 +26,7 @@ </longdescription> <use> <flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag> +<flag name='androiddump'>Install androiddump</flag> <flag name='crypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag> <flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag> <flag name='gtk3'>Build the wireshark executable with a GTK+ UI version 3.</flag> @@ -34,5 +35,6 @@ <flag name='qt4'>Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag> <flag name='sbc'>Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> <flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> +<flag name='tfshark'>Install tfshark</flag> </use> </pkgmetadata> diff --git a/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild new file mode 100644 index 000000000000..7d7f825b6ee3 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-2.0.0-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils fcaps flag-o-matic multilib qmake-utils qt4-r2 user + +DESCRIPTION="A network protocol analyzer formerly known as ethereal" +HOMEPAGE="http://www.wireshark.org/" +SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE=" + adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua + +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark + cpu_flags_x86_sse4_2 ssl zlib +" +REQUIRED_USE=" + ssl? ( crypt ) + ?? ( qt4 qt5 ) +" + +S=${WORKDIR}/${P/_/} + +GTK_COMMON_DEPEND=" + x11-libs/gdk-pixbuf + x11-libs/pango + x11-misc/xdg-utils +" +CDEPEND=" + >=dev-libs/glib-2.14:2 + netlink? ( dev-libs/libnl:3 ) + adns? ( >=net-dns/c-ares-1.5 ) + crypt? ( dev-libs/libgcrypt:0 ) + caps? ( sys-libs/libcap ) + geoip? ( dev-libs/geoip ) + gtk3? ( + ${GTK_COMMON_DEPEND} + x11-libs/gtk+:3 + ) + kerberos? ( virtual/krb5 ) + lua? ( >=dev-lang/lua-5.1:* ) + pcap? ( net-libs/libpcap ) + portaudio? ( media-libs/portaudio ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4[accessibility] + x11-misc/xdg-utils + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + x11-misc/xdg-utils + ) + sbc? ( media-libs/sbc ) + smi? ( net-libs/libsmi ) + 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 + !<virtual/perl-Pod-Simple-3.170 + !<perl-core/Pod-Simple-3.170 + doc? ( + app-doc/doxygen + app-text/asciidoc + dev-libs/libxml2 + dev-libs/libxslt + doc-pdf? ( dev-java/fop ) + www-client/lynx + ) + sys-devel/bison + sys-devel/flex + virtual/pkgconfig +" +RDEPEND=" + ${CDEPEND} + gtk3? ( virtual/freedesktop-icon-theme ) + qt4? ( virtual/freedesktop-icon-theme ) + qt5? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +pkg_setup() { + enewgroup wireshark +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ + "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ + "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ + "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ + "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \ + "${FILESDIR}"/${PN}-2.0.0-androiddump-pcap.patch + + epatch_user + + eautoreconf +} + +src_configure() { + local myconf + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + myconf+=( "--with-ssl" ) + ;; + esac + fi + + # Enable wireshark binary with any supported GUI toolkit (bug #473188) + if use gtk3 || use qt4 || use qt5; then + myconf+=( "--enable-wireshark" ) + else + myconf+=( "--disable-wireshark" ) + fi + + if ! use qt4 && ! use qt5; then + myconf+=( "--with-qt=no" ) + fi + + if use qt4; then + export QT_MIN_VERSION=4.6.0 + fi + + if use qt5; then + export QT_MIN_VERSION=5.3.0 + append-cxxflags -fPIC -DPIC + fi + + # Hack around inability to disable doxygen/fop doc generation + use doc || export ac_cv_prog_HAVE_DOXYGEN=false + use doc-pdf || export ac_cv_prog_HAVE_FOP=false + + # dumpcap requires libcap + # --disable-profile-build bugs #215806, #292991, #479602 + econf \ + $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ + $(use_enable androiddump) \ + $(use_enable ipv6) \ + $(use_enable tfshark) \ + $(use_with adns c-ares) \ + $(use_with caps libcap) \ + $(use_with crypt gcrypt) \ + $(use_with geoip) \ + $(use_with gtk3) \ + $(use_with kerberos krb5) \ + $(use_with lua) \ + $(use_with pcap dumpcap-group wireshark) \ + $(use_with pcap) \ + $(use_with portaudio) \ + $(usex qt4 --with-qt=4 '') \ + $(usex qt5 --with-qt=5 '') \ + $(usex qt4 MOC=$(qt4_get_bindir)/moc '') \ + $(usex qt4 RCC=$(qt4_get_bindir)/rcc '') \ + $(usex qt4 UIC=$(qt4_get_bindir)/uic '') \ + $(usex qt5 MOC=$(qt5_get_bindir)/moc '') \ + $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') \ + $(usex qt5 UIC=$(qt5_get_bindir)/uic '') \ + $(use_with sbc) \ + $(use_with smi libsmi) \ + $(use_with ssl gnutls) \ + $(use_with zlib) \ + $(usex netlink --with-libnl=3 --without-libnl) \ + $(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \ + --disable-profile-build \ + --disable-usr-local \ + --disable-warnings-as-errors \ + --sysconfdir="${EPREFIX}"/etc/wireshark \ + --without-adns \ + ${myconf[@]} +} + +src_compile() { + default + if use doc; then + use doc-pdf && addpredict "/root/.java" + emake -j1 -C docbook + fi +} + +src_install() { + default + + if use doc; then + dohtml -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}} + if use doc-pdf; then + insinto /usr/share/doc/${PF}/pdf/ + doins docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf + fi + fi + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \ + doc/{randpkt.txt,README*} + + # install headers + local wsheader + for wsheader in \ + color.h \ + config.h \ + epan/*.h \ + epan/crypt/*.h \ + epan/dfilter/*.h \ + epan/dissectors/*.h \ + epan/ftypes/*.h \ + epan/wmem/*.h \ + register.h \ + wiretap/*.h \ + ws_symbol_export.h \ + wsutil/*.h + do + insinto /usr/include/wireshark/$( dirname ${wsheader} ) + doins ${wsheader} + done + + #with the above this really shouldn't be needed, but things may be looking in wiretap/ instead of wireshark/wiretap/ + insinto /usr/include/wiretap + doins wiretap/wtap.h + + if use gtk3 || use qt4 || use qt5; then + local c d + for c in hi lo; do + for d in 16 32 48; do + insinto /usr/share/icons/${c}color/${d}x${d}/apps + newins image/${c}${d}-app-wireshark.png wireshark.png + done + done + for d in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes + newins image/WiresharkDoc-${d}.png application-vnd.tcpdump.pcap.png + done + fi + + if use gtk3; then + domenu wireshark.desktop + fi + + if use qt4 || use qt5; then + sed \ + -e '/Exec=/s|wireshark|&-qt|g' \ + -e 's|^Name.*=Wireshark|& (Qt)|g' \ + wireshark.desktop > wireshark-qt.desktop \ + || die + domenu wireshark-qt.desktop + fi + + prune_libtool_files +} + +pkg_postinst() { + # Add group for users allowed to sniff. + enewgroup wireshark + + if use pcap; then + fcaps -o 0 -g wireshark -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the wireshark group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-analyzer/wireshark/wireshark-2.0.0.ebuild b/net-analyzer/wireshark/wireshark-2.0.0.ebuild index cf834817b59d..f0bae7c6b839 100644 --- a/net-analyzer/wireshark/wireshark-2.0.0.ebuild +++ b/net-analyzer/wireshark/wireshark-2.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2" LICENSE="GPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE=" adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi cpu_flags_x86_sse4_2 ssl zlib @@ -51,6 +51,7 @@ CDEPEND=" qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild index 4a25e68d4edc..786f1b1f1169 100644 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ b/net-analyzer/wireshark/wireshark-99999999.ebuild @@ -13,8 +13,9 @@ LICENSE="GPL-2" SLOT="0/${PV}" KEYWORDS="" IUSE=" - adns +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap - portaudio +qt4 qt5 sbc selinux smi cpu_flags_x86_sse4_2 ssl zlib + adns androiddump +caps cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk3 + ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi ssl + tfshark zlib " REQUIRED_USE=" ssl? ( crypt ) @@ -49,6 +50,7 @@ CDEPEND=" qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils @@ -97,9 +99,9 @@ src_prepare() { epatch \ "${FILESDIR}"/${PN}-1.6.13-ldflags.patch \ "${FILESDIR}"/${PN}-1.11.0-oldlibs.patch \ - "${FILESDIR}"/${PN}-1.99.0.1975-sse4_2.patch \ "${FILESDIR}"/${PN}-99999999-pkgconfig.patch \ - "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch + "${FILESDIR}"/${PN}-1.99.8-qtchooser.patch \ + "${FILESDIR}"/${PN}-2.1.0-sse4_2.patch epatch_user @@ -151,7 +153,10 @@ src_configure() { # dumpcap requires libcap # --disable-profile-build bugs #215806, #292991, #479602 econf \ + $(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \ + $(use_enable androiddump) \ $(use_enable ipv6) \ + $(use_enable tfshark) \ $(use_with adns c-ares) \ $(use_with caps libcap) \ $(use_with crypt gcrypt) \ |