summaryrefslogtreecommitdiff
path: root/app-admin
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-11 19:55:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-11 19:55:43 +0100
commit185fa19bbf68a4d4dca534d2b46729207a177f16 (patch)
treea8a537b82fda83a0799c2ca9887f212558363aa7 /app-admin
parentc8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff)
gentoo resync : 11.05.2021
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/Manifest.gzbin32716 -> 32714 bytes
-rw-r--r--app-admin/conky/Manifest6
-rw-r--r--app-admin/conky/conky-1.12.1-r1.ebuild2
-rw-r--r--app-admin/conky/conky-1.12.2.ebuild191
-rw-r--r--app-admin/conky/metadata.xml1
-rw-r--r--app-admin/dio/Manifest2
-rw-r--r--app-admin/dio/dio-1.5.2-r2.ebuild (renamed from app-admin/dio/dio-1.5.2-r1.ebuild)16
-rw-r--r--app-admin/entr/Manifest2
-rw-r--r--app-admin/entr/entr-4.9.ebuild31
-rw-r--r--app-admin/filebeat/Manifest4
-rw-r--r--app-admin/filebeat/filebeat-7.12.1.ebuild1076
-rw-r--r--app-admin/github-backup-utils/Manifest2
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild56
-rw-r--r--app-admin/gnome-abrt/Manifest2
-rw-r--r--app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild4
-rw-r--r--app-admin/hcloud/Manifest4
-rw-r--r--app-admin/hcloud/hcloud-1.20.0.ebuild34
-rw-r--r--app-admin/hcloud/hcloud-1.22.1.ebuild2
-rw-r--r--app-admin/logstash-bin/Manifest3
-rw-r--r--app-admin/logstash-bin/logstash-bin-7.12.1.ebuild88
-rw-r--r--app-admin/passwordsafe/Manifest2
-rw-r--r--app-admin/passwordsafe/passwordsafe-1.13.0.ebuild2
-rw-r--r--app-admin/socklog/Manifest3
-rw-r--r--app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch18
-rw-r--r--app-admin/socklog/socklog-2.1.0.ebuild18
-rw-r--r--app-admin/sudo/Manifest2
-rw-r--r--app-admin/sudo/sudo-1.9.7_rc1.ebuild254
-rw-r--r--app-admin/syslog-ng/Manifest10
-rw-r--r--app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch320
-rw-r--r--app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch63
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild170
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.29.1.ebuild171
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.31.2.ebuild (renamed from app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild)3
33 files changed, 1765 insertions, 797 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 231e43df8197..8a71e9f7fb48 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
Binary files differ
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 057e33fa9cdb..15792bb09c57 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,7 +3,9 @@ AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a
AUX conky-1.12.1-network-speed.patch 1439 BLAKE2B f736c986528f9a205d325170b7f1c83653304249be7a2742dbb9d50ca4b58a02fe59796c4c3a39001716ce0c44ed107f51c2db8933bc644472b2f45d607c88af SHA512 f1768dbda3698699bfd7473fed7dbe7ab57e53dc7b3599edcbad0105d140673b1111752eaeb7e83b3e42c7684316a788ac3b1f27c6c71b8f7560a02f1ecec8bc
DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a
+DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f SHA512 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4
-EBUILD conky-1.12.1-r1.ebuild 4805 BLAKE2B 12cfdc1dda0d7c07be89885575e6dc4420974e6064dc261e6bc5931702b86eda1643a59ad28380c233d29c401ce61b808f1dafe7c3c70f133c7f258d16610aa8 SHA512 fb146d44e6b4797cda838806aa2b2d53eb680dbbd8299b6c8fa661cb86266708f230bfc244de9f3a43df6b351c38d4db7df6f4e06f8534e45c527d12912ed578
+EBUILD conky-1.12.1-r1.ebuild 4802 BLAKE2B f15f66a276caabc5d1f9358dff5920b5742ffa8777e857ae86b838e214b9f133f98662ce3f21aa4e2705a6baa680ea1c2fb1723e47364bb20dc98927f8dd878b SHA512 774267e9f7e4cb5c233a4135aa19f4d4c6e8d13af6c024b19cc44defbacc04c465192a731a4601cfbeef3780a9f6437e4fa453e2a56081e5d565945445067142
EBUILD conky-1.12.1.ebuild 4765 BLAKE2B 43356e0443e15efa136e42c7851ba1cbd658515669992ac8552f285a9e727edd4a7b26c74749fb9e33b5c9f874676ed14a9bfdeac573f20601ee206faeb61043 SHA512 128ec3bab07555b6552c288d28ab2f02b84dafb24c568b7e3bdc7d8e176d1417831be7d25cbf64239dd71034ee13e4a38839af4779ef890d81f523856233b6f4
-MISC metadata.xml 2395 BLAKE2B 1bfdb9319bfa35d0e29edca04bf9f8fe7acba3d6cb9910fba7f632ff35a642cbdfd34cf0e18047eaa851808551f0c91614cbf814609de0c4b6d5cf656909d264 SHA512 4471b583a8fda5692eb18412ab579c1bcc37aff56009fa024ca257862df8ba93f788d3f001d7b9b74307e327f9deac27a2674f6ef48f8273940c2ea88d575813
+EBUILD conky-1.12.2.ebuild 4780 BLAKE2B c4e2002bc91c9c2985b35ac5c8e07655bece79908cbc10df1e677bf54b9a36d4696e5539049c520304fe4afcb36c14d5479623dac214f595046bf2ca8c5e33c1 SHA512 5a0005dded098a051c8c6c3eba6a0125e59da7750f2cdf6733687c205d6d0ff965af2abfe8e8f67d513b01eadb65e623d1ae6d017379d206c4e4305d7695b212
+MISC metadata.xml 2468 BLAKE2B d768a7d6cdd62ef5b008e3b62f42347e0e6f25c324f930815697ea73ec0bcfd59ac80bc53d0fe81300ee09af5d3c1602694796f1358434729ac034710441fd48 SHA512 48e4f757be562fbaa51da578f1ee609d0a978387235ca3c56fd984d83bd654774d016315ec6afd5ffd3b8c5941e81e128f699c084f7c40acd026ee2deb1be527
diff --git a/app-admin/conky/conky-1.12.1-r1.ebuild b/app-admin/conky/conky-1.12.1-r1.ebuild
index d07d5d164cff..2876405f75a4 100644
--- a/app-admin/conky/conky-1.12.1-r1.ebuild
+++ b/app-admin/conky/conky-1.12.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ppc ppc64 ~sparc x86"
IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
diff --git a/app-admin/conky/conky-1.12.2.ebuild b/app-admin/conky/conky-1.12.2.ebuild
new file mode 100644
index 000000000000..0662352e88d3
--- /dev/null
+++ b/app-admin/conky/conky-1.12.2.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib
+ intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc
+ mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd
+ thinkpad truetype vim-syntax weather-metar webserver wifi X xinerama
+ xmms2"
+
+COMMON_DEPEND="
+ cmus? ( media-sound/cmus )
+ curl? ( net-misc/curl )
+ ical? ( dev-libs/libical:= )
+ iconv? ( virtual/libiconv )
+ imlib? ( media-libs/imlib2[X] )
+ irc? ( net-libs/libircclient )
+ lua-cairo? ( x11-libs/cairo[X] )
+ lua-imlib? ( media-libs/imlib2[X] )
+ lua-rsvg? ( gnome-base/librsvg )
+ mysql? ( dev-db/mysql-connector-c )
+ ncurses? ( sys-libs/ncurses:= )
+ nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+ systemd? ( sys-apps/systemd )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+ wifi? ( net-wireless/wireless-tools )
+ weather-metar? ( net-misc/curl )
+ webserver? ( net-libs/libmicrohttpd )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ )
+ xinerama? ( x11-libs/libXinerama )
+ xmms2? ( media-sound/xmms2 )
+ ${LUA_DEPS}
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ apcupsd? ( sys-power/apcupsd )
+ hddtemp? ( app-admin/hddtemp )
+ moc? ( media-sound/moc )
+ nano-syntax? ( app-editors/nano )
+ vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ doc? ( app-text/docbook2X dev-libs/libxslt )
+"
+
+REQUIRED_USE="
+ imlib? ( X )
+ lua-cairo? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( X bundled-toluapp )
+ nvidia? ( X )
+ truetype? ( X )
+ xinerama? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+ use ipv6 && linux-info_pkg_setup
+
+ lua-single_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ xdg_environment_reset
+
+ sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+ cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs
+
+ if use X; then
+ mycmakeargs=(
+ -DBUILD_ARGB=yes
+ -DBUILD_X11=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DOWN_WINDOW=yes
+ )
+ else
+ mycmakeargs=(
+ -DBUILD_X11=no
+ )
+ fi
+
+ mycmakeargs+=(
+ -DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
+ -DBUILD_CMUS=$(usex cmus)
+ -DBUILD_CURL=$(usex curl)
+ -DBUILD_DOCS=$(usex doc)
+ -DBUILD_HDDTEMP=$(usex hddtemp)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_I18N=yes
+ -DBUILD_IBM=$(usex thinkpad)
+ -DBUILD_ICAL=$(usex ical)
+ -DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+ -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_IPV6=$(usex ipv6)
+ -DBUILD_IRC=$(usex irc)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
+ -DBUILD_MATH=$(usex math)
+ -DBUILD_MOC=$(usex moc)
+ -DBUILD_MPD=$(usex mpd)
+ -DBUILD_MYSQL=$(usex mysql)
+ -DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_OLD_CONFIG=yes
+ -DBUILD_PORT_MONITORS=$(usex portmon)
+ -DBUILD_PULSEAUDIO=$(usex pulseaudio)
+ -DBUILD_RSS=$(usex rss)
+ -DBUILD_WEATHER_METAR=$(usex weather-metar)
+ -DBUILD_WLAN=$(usex wifi)
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_XINERAMA=$(usex xinerama)
+ -DBUILD_XMMS2=$(usex xmms2)
+ -DDOC_PATH=/usr/share/doc/${PF}
+ -DMAINTAINER_MODE=no
+ -DRELEASE=yes
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins "${S}"/extras/vim/syntax/conkyrc.vim
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano/
+ doins "${S}"/extras/nano/conky.nanorc
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ xdg_pkg_postinst
+}
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 1fe89fc39f12..a810ad77d47a 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -19,6 +19,7 @@
<flag name="bundled-toluapp">Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags</flag>
<flag name="cmus">Enable monitoring of music played by <pkg>media-sound/cmus</pkg></flag>
<flag name="ical">Enable support for events from iCalendar (RFC 5545) files using <pkg>dev-libs/libical</pkg></flag>
+ <flag name="intel-backlight">Enable support for Intel backlight</flag>
<flag name="iostats">Enable support for per-task I/O statistics</flag>
<flag name="irc">Enable support for displaying everything from an irc channel using <pkg>net-libs/libircclient</pkg></flag>
<flag name="lua-cairo">Enable if you want Lua Cairo bindings</flag>
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index 94ba281f2ae0..dab4a8dc35ae 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
-EBUILD dio-1.5.2-r1.ebuild 864 BLAKE2B 21d4534ca92e2eae1234efc1136be510f092ebf93f034f9e50035fee7fa9b0fef7756f255571c52c9f340304c9da58e55ac36c21ba9b8ef51727768e974dc014 SHA512 2bba0907947285946c1e3c07a98de3ef20012c29200bc5c40f6a48a78f0ae94508cb1e9018392f28b3dd39e7480f075b100db3bf0e1cadc4f99819526aa51be1
+EBUILD dio-1.5.2-r2.ebuild 864 BLAKE2B ca35e651f5d28151450bd2f05518778479f269bbb1dbe7efc1981fd8e48fa3ac18d84cd555a053bc071b867ac4a09a2d718b97e4d2011c5e43d1c401d32cd392 SHA512 ab5413733f0139e45dc66b09ca701d01003a32318625b9055d53d53c533e93bad593976bc6ec86315a01756bede635b73513455389e79122c992545de91c3c95
MISC metadata.xml 793 BLAKE2B cc48bcda030360c69a517a4c76e91dca8adc6d5228d6982c21cd4a07afc474a4ef03daedd773f9a22564eccfadd5fcc6eb528cc2631358b5ca602144f2bf8559 SHA512 9875ed341acd30db1009dc29da6d024b433a77a8212690911286798aeabb4206d3af91452976931bacd3db81159a393efdbd95058fa6d740b22d6ad1a81f2c82
diff --git a/app-admin/dio/dio-1.5.2-r1.ebuild b/app-admin/dio/dio-1.5.2-r2.ebuild
index 1ede22cf23f0..3b303b3961b6 100644
--- a/app-admin/dio/dio-1.5.2-r1.ebuild
+++ b/app-admin/dio/dio-1.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,26 +8,24 @@ inherit toolchain-funcs
DESCRIPTION="A device I/O monitoring tool"
HOMEPAGE="https://github.com/donaldmcintosh/dio"
SRC_URI="https://github.com/donaldmcintosh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
-KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
+KEYWORDS="amd64 x86"
RDEPEND="sys-libs/ncurses:0="
DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/src"
+BDEPEND="virtual/pkgconfig"
DOCS=( "README" "../README.md" )
HTML_DOCS=( "../site/www.diodio.org/." )
src_prepare() {
- # Include the 'tinfo' lib, if sys-libs/ncurses is compiled with USE="tinfo"
- if has_version -d 'sys-libs/ncurses[tinfo]'; then
- sed -e 's/lcurses/& -ltinfo/' -i Makefile || die
- fi
-
default
+
+ # Include the 'tinfo' lib, if sys-libs/ncurses is compiled with USE="tinfo"
+ sed -e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):" -i Makefile || die
}
src_compile() {
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index d4ac6bce234f..ad413eaf50ac 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,5 +1,7 @@
DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
DIST entr-4.8.tar.gz 25408 BLAKE2B 82367e2d7c933d881ed35147656f9b3c521103a636eecc603ed7d3e17eb59929e872ecb865f8d733f867383a3e1021fd3564f8e5fd27d094dfac9789d6651251 SHA512 fc99a257fe9a30a9b08f0b6283f9ee3b65c38362744842dd976a4ac7749df7f6ff630235443af17f664f9cbf2a197dbb8c1114fe491e675921745294b4fa4d8f
+DIST entr-4.9.tar.gz 25501 BLAKE2B 2d4690636585ee64c7273402c2a87516614d8b08547606198947677a26c8966b3f8784da880e1fc4608df7170801e4f21a33717d13c3bf7ad169f909e41d867b SHA512 b05595be5ae1c6fbd39ea886331b9b77563460d03eae8889c7ad0cc156a44c6f50477dc3448eefe715e124a79ab08b9baf7c53a9059dcf137e5782bf7b499751
EBUILD entr-4.6.ebuild 586 BLAKE2B 342fd92b72d67e5f97bc39cdeb24f2454370dbe7c56bde889b3271b2a1829c7d917a046282543dbef589b86a0f33601faef9adc688fbdfe8d7d2c52d4ad6cfb0 SHA512 25958a209870781211efe04357b4cffcfa728e543820d3342c2471d3d2c58876b5e18a47d48d8b7cde96a19898d55f5a493b70d1df2d0db35baf3fdfe97e5cf4
EBUILD entr-4.8.ebuild 586 BLAKE2B 342fd92b72d67e5f97bc39cdeb24f2454370dbe7c56bde889b3271b2a1829c7d917a046282543dbef589b86a0f33601faef9adc688fbdfe8d7d2c52d4ad6cfb0 SHA512 25958a209870781211efe04357b4cffcfa728e543820d3342c2471d3d2c58876b5e18a47d48d8b7cde96a19898d55f5a493b70d1df2d0db35baf3fdfe97e5cf4
+EBUILD entr-4.9.ebuild 590 BLAKE2B 10bd6604fc9be627bd3e5b779a35b2d4048f014f84274c9107672fdf9d9db1770639eef33773eac72bfd73b3eac34d8d92092803c318767aa8c9f9bc4077149a SHA512 8006118f9c58f97f26108a1e9d322f60c5dcc65656780d5e99d6b97efcf37e2fe30b71ea3864f6bb754ca463ecd10b9d22745f8ceb3a634a8b48a8dde26e68bc
MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.9.ebuild b/app-admin/entr/entr-4.9.ebuild
new file mode 100644
index 000000000000..e8a126ca365b
--- /dev/null
+++ b/app-admin/entr/entr-4.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+ sh configure || die
+ sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_compile() {
+ export CC=$(tc-getCC)
+ default
+}
+
+src_test() {
+ export CC=$(tc-getCC)
+ default
+}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 3e866b666ed3..6812268ac6f2 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -34,6 +34,7 @@ DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.z
DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
DIST filebeat-7.10.2.tar.gz 87244727 BLAKE2B 77e5967d4ee6b5390ebe19c3c9de9e5cbf6b8d5ffd1c81e2e72a8c3ae6e1aad146f0b5496816785893a51ea77b1ec3fbd050d9f2b54fd2c95ad2228d5a5b5e04 SHA512 eba0cda8521068f4d15dfb39808695a8de47a568e4d11949746a8f698aaff6825848d5e524bd16b0e555786e277512014dfe33d4daee8c3acef9a9867653c1c3
DIST filebeat-7.12.0.tar.gz 94231781 BLAKE2B 3e90888bbf204c8e96066f894ba211feb893d89915dbad9ab023dd7a12551c3f1f839b1d266170637646b1cdfbed3652abae09e5b97babb68efa429fc7b3a682 SHA512 46049bf6e98bc7f29bd312f39afa185fcaec9d11bd7349ab58b2a21095dda25c0dafabaaefe618a47e084191ed8c1a24bc7e7ead32628c15934f8aeffe2e3c81
+DIST filebeat-7.12.1.tar.gz 94237879 BLAKE2B 7f7c1ed0ded8bc52b1830d3448d910bae5b2e775a9b1264271a8e3420fa95d0e4c1e7ee3545d198583af2b90b390f3f8bca0c871ca2ecdd077fcbe284648ba42 SHA512 3e2c49ddab59461f82abc5e3ea0f12941f2ed73a6f23c2f062ec88c85d577ce2b5efb234a110e62e9949490bec4f355f3118508572b93883adc7122d76d33cb1
DIST filebeat-7.9.3.tar.gz 82872010 BLAKE2B e437905a13e556e1bec9b59a8837eb4649f063e4ddb9815a3e18efdc291758e39b5abc0465295f8526f042aecdfc2b8e49ebb6980aeb8b3b13be9d4431863401 SHA512 35c2c8038f0f540e467feef341f3248eadda5e5b1a80c247bcd54c073153a7839f797be327b65c4eee255f4d656e36c57d112b7ff0e637342ccc13f4f59366d7
DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
@@ -315,6 +316,8 @@ DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233
DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip 111274 BLAKE2B f7d8f3c732b9349dc7c324b107764ef1aaa6fbad9668dc1d5b85edf914bfcd76795b7860436761a8a5aa9dc2d6df3a3ceb2653f33b643a02577e736e5afcac27 SHA512 cbe1480fd09a7c14eb5c977ca85f3268da634861075847ffe86bdd1338d1d3b87c3441e9ed00b02400179f2651016cc3b6d9d3396c1c980a47137752dbfa7543
DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.0.mod 175 BLAKE2B c9861c8c57b45cf8f62ce5f238c6f1c56ef12a165df01af9f00d03866f52cbc0604015bf49ce2cee558f0a2c206d264e1606cc82892befbbbe0786c5dc6712c1 SHA512 a6b71a6c74d5b3b5bbd2ba0b899084bd3848d22ac31267b86a0129a98d61fbaf273a0d51b486b784960e7026912775f02fe265b46328c73a55d13bcc4800cc14
DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.0.zip 115566 BLAKE2B 9f5db34d8ad7d2992cecc64b4888bf25094c1734cd5c65adcd9229ed01d452ca0482ff333242ab115ca366ef11ce8aad6d916fc481b2858012671eb31e3afde4 SHA512 1beec1202f58ba4bcd744b351173bc94d9863f4402b2185234e722a1aa5ddc8b7b357e8ea98b9962078ffd1cabd86ea12d3819cda6a932998a01eab05306c971
+DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.mod 175 BLAKE2B c9861c8c57b45cf8f62ce5f238c6f1c56ef12a165df01af9f00d03866f52cbc0604015bf49ce2cee558f0a2c206d264e1606cc82892befbbbe0786c5dc6712c1 SHA512 a6b71a6c74d5b3b5bbd2ba0b899084bd3848d22ac31267b86a0129a98d61fbaf273a0d51b486b784960e7026912775f02fe265b46328c73a55d13bcc4800cc14
+DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.14.1.zip 115821 BLAKE2B c3980759bc2fd41d2639c31163de98c85afb1c6469e0cd5edf7bfac3085b7ab13b395f411e0894f99c489cd5c28a567165d887f5838cabee6b9f9d367fcae9da SHA512 2e9688cd053157c6824e76747d8513bc9d8cab9a565580e780cf55d73b0f6b85be86f23921bd5c1691ff8aa7572475f6515b4f39e0be989277bf4c70fd77d6a2
DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip 393905 BLAKE2B 91e13d3eaa5fbae1d48d5e02a64fcf2c12237eedb2f5a171795ddee5c1830b2e3006576d37f58468bcbae3fe65ee7a37b1ee8a4c1f78869d5d0b1f9c877e3fc5 SHA512 599747a3a5deac56741c09bd0655c7dea2a3e6e25c1c2d5a851472a6b5cec4bc599d9ed873d6f71fc27a1956ebbf9c30c84ab0d11954d3e02de7352839d2d2eb
DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20210120173147-5c8cb347d877.mod 1502 BLAKE2B 4f8b3f4403e79cab17ac0de1e8514ac3854cd5b964751b8f3eb19d6fd6623d603e79d1c4e73b2f678ec9e3f3973c44b80a795bfbcea967fccf78e88b652a1653 SHA512 a38dce9a939a1545354ba356e822515c28c39a29ec6be1d3198811303a71298273856ac0898951efd088e8e6fff9371b4ac596b73238b506d753017f6a62e6c8
@@ -1182,5 +1185,6 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
EBUILD filebeat-7.10.2.ebuild 56909 BLAKE2B 595e7681a5f2ad3e93220e36a93e67b567d512af7c33e8a725a5aec9f6c1c91d031ba8a758a0a8ece56a8405df881a8542c18547ede3cb2ab090dfaf003767e7 SHA512 b170ab66646578d55e94ad2832ca10b4cf52c2e449b4a552c254292be2ac94d4ec5aa35c8146d1c8c8249cedd3ba6dde083803146a5057ed25a14d2a3761d0d4
EBUILD filebeat-7.12.0.ebuild 56889 BLAKE2B 0a544cd15867f9df0f4951df20d88a16aa695dfe84f1b6b22687712a2d9a6268ff6b1db67b631b0d75d0a628ce509b6f5b2495bc848f63095bdc99265fefff5c SHA512 7dead5a00d0ec225f58b278d44db1d874d36e90611ce2105ed7da79f89dfe0662dd985f6a60b4dad718f79ddb79ce4dc6b70b2fd81c753bb90591a22b882f748
+EBUILD filebeat-7.12.1.ebuild 56889 BLAKE2B 385ef4017cafe2dbd8b16172f2dd8cabdb6940d0706678f2caed89532030f01210663fd84fb0e8960b5502c5f6d783617e9b323367d9a2edb98972e5a2ada599 SHA512 3e159c707c8e4e69e7889fad39159bdfd57e026092cd81be6289d21d7d586e99620038f1023d9903292a0ecd7d439abe4b6d68df14c3c8506b99462fe1e548f0
EBUILD filebeat-7.9.3.ebuild 55140 BLAKE2B b5cf3c10c29f84b63bc35f85eb78871b7fdb18db5048f6aa4f8421f09b50479eb4da290716110de4f2e8b6abae5b1cb1702a032505a95f93bcb0332170ace241 SHA512 694ac3ace92424e7bd1153270d88a9bd204c605d9608e430c101beffa973a1ef2c476f0c2ed0666024ab8040cd99dda15b2a7c092f4a75f888b24232225cec3b
MISC metadata.xml 491 BLAKE2B 5653f51e27a38d7a2726ebcbd0d7b6f622e836efdcf5651e87707d9d63e75535e4550c47a53530409bdcbdca37b9885cc7bb8e731e053a9f9ab60d89e16c2cab SHA512 a6b752a75acbdfd9c1a98d7b2abd2eb6026962d6697b536c6452c750ce4014378c7fda650f5049dd1a6d34796f1997678b0c4509d89a0bde55157b22c80fcd82
diff --git a/app-admin/filebeat/filebeat-7.12.1.ebuild b/app-admin/filebeat/filebeat-7.12.1.ebuild
new file mode 100644
index 000000000000..a23e00f32a7c
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.12.1.ebuild
@@ -0,0 +1,1076 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+ "4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
+ "4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
+ "4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
+ "4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
+ "bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+ "cloud.google.com/go v0.26.0/go.mod"
+ "cloud.google.com/go v0.34.0/go.mod"
+ "cloud.google.com/go v0.38.0/go.mod"
+ "cloud.google.com/go v0.44.1/go.mod"
+ "cloud.google.com/go v0.44.2/go.mod"
+ "cloud.google.com/go v0.45.1/go.mod"
+ "cloud.google.com/go v0.46.3/go.mod"
+ "cloud.google.com/go v0.51.0"
+ "cloud.google.com/go v0.51.0/go.mod"
+ "cloud.google.com/go/bigquery v1.0.1"
+ "cloud.google.com/go/bigquery v1.0.1/go.mod"
+ "cloud.google.com/go/datastore v1.0.0"
+ "cloud.google.com/go/datastore v1.0.0/go.mod"
+ "cloud.google.com/go/pubsub v1.0.1"
+ "cloud.google.com/go/pubsub v1.0.1/go.mod"
+ "cloud.google.com/go/storage v1.0.0"
+ "cloud.google.com/go/storage v1.0.0/go.mod"
+ "code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
+ "code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
+ "code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
+ "code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
+ "code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+ "code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+ "code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
+ "code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod"
+ "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+ "github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
+ "github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+ "github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
+ "github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
+ "github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
+ "github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
+ "github.com/Azure/azure-pipeline-go v0.2.1"
+ "github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+ "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
+ "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+ "github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
+ "github.com/Azure/azure-storage-blob-go v0.8.0"
+ "github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+ "github.com/Azure/go-amqp v0.12.6"
+ "github.com/Azure/go-amqp v0.12.6/go.mod"
+ "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+ "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+ "github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+ "github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+ "github.com/Azure/go-autorest/autorest v0.9.6"
+ "github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+ "github.com/Azure/go-autorest/autorest/adal v0.8.2"
+ "github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+ "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+ "github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+ "github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+ "github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/date v0.2.0"
+ "github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+ "github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/to v0.3.0"
+ "github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+ "github.com/Azure/go-autorest/autorest/validation v0.2.0"
+ "github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
+ "github.com/Azure/go-autorest/logger v0.1.0"
+ "github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+ "github.com/Azure/go-autorest/tracing v0.5.0"
+ "github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+ "github.com/BurntSushi/toml v0.3.1"
+ "github.com/BurntSushi/toml v0.3.1/go.mod"
+ "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+ "github.com/DataDog/zstd v1.4.1"
+ "github.com/DataDog/zstd v1.4.1/go.mod"
+ "github.com/Masterminds/semver v1.4.2"
+ "github.com/Masterminds/semver v1.4.2/go.mod"
+ "github.com/Microsoft/hcsshim v0.8.7"
+ "github.com/Microsoft/hcsshim v0.8.7/go.mod"
+ "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+ "github.com/OneOfOne/xxhash v1.2.2"
+ "github.com/OneOfOne/xxhash v1.2.2/go.mod"
+ "github.com/PuerkitoBio/purell v1.0.0/go.mod"
+ "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+ "github.com/Shopify/toxiproxy v2.1.4+incompatible"
+ "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+ "github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
+ "github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
+ "github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
+ "github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
+ "github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
+ "github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
+ "github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
+ "github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
+ "github.com/akavel/rsrc v0.8.0"
+ "github.com/akavel/rsrc v0.8.0/go.mod"
+ "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+ "github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+ "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+ "github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+ "github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
+ "github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
+ "github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
+ "github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
+ "github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+ "github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d"
+ "github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d/go.mod"
+ "github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77"
+ "github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+ "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+ "github.com/armon/go-radix v1.0.0"
+ "github.com/armon/go-radix v1.0.0/go.mod"
+ "github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+ "github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+ "github.com/aws/aws-lambda-go v1.6.0"
+ "github.com/aws/aws-lambda-go v1.6.0/go.mod"
+ "github.com/aws/aws-sdk-go-v2 v0.9.0"
+ "github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
+ "github.com/awslabs/goformation/v3 v3.1.0/go.mod"
+ "github.com/awslabs/goformation/v4 v4.1.0"
+ "github.com/awslabs/goformation/v4 v4.1.0/go.mod"
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+ "github.com/beorn7/perks v1.0.0/go.mod"
+ "github.com/beorn7/perks v1.0.1"
+ "github.com/beorn7/perks v1.0.1/go.mod"
+ "github.com/bi-zone/go-winio v0.4.15"
+ "github.com/bi-zone/go-winio v0.4.15/go.mod"
+ "github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa"
+ "github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa/go.mod"
+ "github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
+ "github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
+ "github.com/blang/semver v3.1.0+incompatible/go.mod"
+ "github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
+ "github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
+ "github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
+ "github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
+ "github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
+ "github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
+ "github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+ "github.com/cespare/xxhash v1.1.0"
+ "github.com/cespare/xxhash v1.1.0/go.mod"
+ "github.com/cespare/xxhash/v2 v2.1.1"
+ "github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+ "github.com/chzyer/logex v1.1.10/go.mod"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+ "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+ "github.com/client9/misspell v0.3.4/go.mod"
+ "github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
+ "github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+ "github.com/cloudfoundry/noaa v2.1.0+incompatible"
+ "github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod"
+ "github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
+ "github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+ "github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+ "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+ "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+ "github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+ "github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+ "github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+ "github.com/containerd/containerd v1.3.3"
+ "github.com/containerd/containerd v1.3.3/go.mod"
+ "github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+ "github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+ "github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+ "github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+ "github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
+ "github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
+ "github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+ "github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+ "github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+ "github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+ "github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+ "github.com/coreos/go-semver v0.2.0/go.mod"
+ "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+ "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+ "github.com/coreos/go-systemd/v22 v22.0.0"
+ "github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+ "github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
+ "github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+ "github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+ "github.com/creack/pty v1.1.9/go.mod"
+ "github.com/cucumber/godog v0.8.1"
+ "github.com/cucumber/godog v0.8.1/go.mod"
+ "github.com/cyphar/filepath-securejoin v0.2.2"
+ "github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+ "github.com/davecgh/go-spew v1.1.0/go.mod"
+ "github.com/davecgh/go-spew v1.1.1"
+ "github.com/davecgh/go-spew v1.1.1/go.mod"
+ "github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
+ "github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
+ "github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+ "github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
+ "github.com/devigned/tab v0.1.1/go.mod"
+ "github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
+ "github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
+ "github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b"
+ "github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b/go.mod"
+ "github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de"
+ "github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod"
+ "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+ "github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
+ "github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
+ "github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+ "github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+ "github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
+ "github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
+ "github.com/dimchansky/utfbom v1.1.0"
+ "github.com/dimchansky/utfbom v1.1.0/go.mod"
+ "github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
+ "github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
+ "github.com/docker/distribution v2.7.1+incompatible"
+ "github.com/docker/distribution v2.7.1+incompatible/go.mod"
+ "github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
+ "github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
+ "github.com/docker/go-connections v0.4.0"
+ "github.com/docker/go-connections v0.4.0/go.mod"
+ "github.com/docker/go-metrics v0.0.1"
+ "github.com/docker/go-metrics v0.0.1/go.mod"
+ "github.com/docker/go-units v0.3.3/go.mod"
+ "github.com/docker/go-units v0.4.0"
+ "github.com/docker/go-units v0.4.0/go.mod"
+ "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+ "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+ "github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+ "github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
+ "github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
+ "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+ "github.com/dustin/go-humanize v1.0.0"
+ "github.com/dustin/go-humanize v1.0.0/go.mod"
+ "github.com/eapache/go-resiliency v1.2.0"
+ "github.com/eapache/go-resiliency v1.2.0/go.mod"
+ "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
+ "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+ "github.com/eapache/queue v1.1.0"
+ "github.com/eapache/queue v1.1.0/go.mod"
+ "github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
+ "github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
+ "github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
+ "github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
+ "github.com/elastic/ecs v1.8.0"
+ "github.com/elastic/ecs v1.8.0/go.mod"
+ "github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a"
+ "github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a/go.mod"
+ "github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
+ "github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
+ "github.com/elastic/go-concert v0.1.0"
+ "github.com/elastic/go-concert v0.1.0/go.mod"
+ "github.com/elastic/go-libaudit/v2 v2.2.0"
+ "github.com/elastic/go-libaudit/v2 v2.2.0/go.mod"
+ "github.com/elastic/go-licenser v0.3.1"
+ "github.com/elastic/go-licenser v0.3.1/go.mod"
+ "github.com/elastic/go-lookslike v0.3.0"
+ "github.com/elastic/go-lookslike v0.3.0/go.mod"
+ "github.com/elastic/go-lumber v0.1.0"
+ "github.com/elastic/go-lumber v0.1.0/go.mod"
+ "github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
+ "github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
+ "github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
+ "github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
+ "github.com/elastic/go-seccomp-bpf v1.1.0"
+ "github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
+ "github.com/elastic/go-structform v0.0.7"
+ "github.com/elastic/go-structform v0.0.7/go.mod"
+ "github.com/elastic/go-sysinfo v1.1.1/go.mod"
+ "github.com/elastic/go-sysinfo v1.6.0"
+ "github.com/elastic/go-sysinfo v1.6.0/go.mod"
+ "github.com/elastic/go-txfile v0.0.7"
+ "github.com/elastic/go-txfile v0.0.7/go.mod"
+ "github.com/elastic/go-ucfg v0.7.0/go.mod"
+ "github.com/elastic/go-ucfg v0.8.3"
+ "github.com/elastic/go-ucfg v0.8.3/go.mod"
+ "github.com/elastic/go-windows v1.0.0/go.mod"
+ "github.com/elastic/go-windows v1.0.1"
+ "github.com/elastic/go-windows v1.0.1/go.mod"
+ "github.com/elastic/gosigar v0.14.1"
+ "github.com/elastic/gosigar v0.14.1/go.mod"
+ "github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877"
+ "github.com/elastic/sarama v1.19.1-0.20210120173147-5c8cb347d877/go.mod"
+ "github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+ "github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+ "github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+ "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+ "github.com/evanphx/json-patch v4.9.0+incompatible"
+ "github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+ "github.com/fatih/color v1.9.0"
+ "github.com/fatih/color v1.9.0/go.mod"
+ "github.com/fortytw2/leaktest v1.3.0"
+ "github.com/fortytw2/leaktest v1.3.0/go.mod"
+ "github.com/frankban/quicktest v1.10.2"
+ "github.com/frankban/quicktest v1.10.2/go.mod"
+ "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+ "github.com/ghodss/yaml v1.0.0/go.mod"
+ "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+ "github.com/go-kit/kit v0.8.0/go.mod"
+ "github.com/go-kit/kit v0.9.0"
+ "github.com/go-kit/kit v0.9.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.3.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.4.0"
+ "github.com/go-logfmt/logfmt v0.4.0/go.mod"
+ "github.com/go-logr/logr v0.1.0/go.mod"
+ "github.com/go-logr/logr v0.2.0"
+ "github.com/go-logr/logr v0.2.0/go.mod"
+ "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+ "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+ "github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
+ "github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
+ "github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+ "github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+ "github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+ "github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+ "github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
+ "github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
+ "github.com/go-sql-driver/mysql v1.4.0/go.mod"
+ "github.com/go-sql-driver/mysql v1.4.1"
+ "github.com/go-sql-driver/mysql v1.4.1/go.mod"
+ "github.com/go-stack/stack v1.8.0"
+ "github.com/go-stack/stack v1.8.0/go.mod"
+ "github.com/go-test/deep v1.0.7"
+ "github.com/go-test/deep v1.0.7/go.mod"
+ "github.com/gobuffalo/here v0.6.0"
+ "github.com/gobuffalo/here v0.6.0/go.mod"
+ "github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
+ "github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
+ "github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
+ "github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+ "github.com/godbus/dbus/v5 v5.0.3"
+ "github.com/godbus/dbus/v5 v5.0.3/go.mod"
+ "github.com/godror/godror v0.10.4"
+ "github.com/godror/godror v0.10.4/go.mod"
+ "github.com/gofrs/flock v0.7.1/go.mod"
+ "github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
+ "github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
+ "github.com/gofrs/uuid v3.3.0+incompatible"
+ "github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+ "github.com/gogo/protobuf v1.1.1/go.mod"
+ "github.com/gogo/protobuf v1.2.1/go.mod"
+ "github.com/gogo/protobuf v1.3.1"
+ "github.com/gogo/protobuf v1.3.1/go.mod"
+ "github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+ "github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+ "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+ "github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+ "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+ "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+ "github.com/golang/mock v1.1.1/go.mod"
+ "github.com/golang/mock v1.2.0/go.mod"
+ "github.com/golang/mock v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.2.0/go.mod"
+ "github.com/golang/protobuf v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.3.2/go.mod"
+ "github.com/golang/protobuf v1.3.3/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+ "github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+ "github.com/golang/protobuf v1.4.0/go.mod"
+ "github.com/golang/protobuf v1.4.1/go.mod"
+ "github.com/golang/protobuf v1.4.2"
+ "github.com/golang/protobuf v1.4.2/go.mod"
+ "github.com/golang/snappy v0.0.1"
+ "github.com/golang/snappy v0.0.1/go.mod"
+ "github.com/gomodule/redigo v1.8.3"
+ "github.com/gomodule/redigo v1.8.3/go.mod"
+ "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+ "github.com/google/btree v1.0.0/go.mod"
+ "github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
+ "github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
+ "github.com/google/go-cmp v0.2.0/go.mod"
+ "github.com/google/go-cmp v0.3.0/go.mod"
+ "github.com/google/go-cmp v0.3.1/go.mod"
+ "github.com/google/go-cmp v0.4.0/go.mod"
+ "github.com/google/go-cmp v0.5.2"
+ "github.com/google/go-cmp v0.5.2/go.mod"
+ "github.com/google/gofuzz v1.0.0/go.mod"
+ "github.com/google/gofuzz v1.1.0"
+ "github.com/google/gofuzz v1.1.0/go.mod"
+ "github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0"
+ "github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod"
+ "github.com/google/martian v2.1.0+incompatible"
+ "github.com/google/martian v2.1.0+incompatible/go.mod"
+ "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+ "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+ "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+ "github.com/google/renameio v0.1.0/go.mod"
+ "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+ "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+ "github.com/google/uuid v1.1.1/go.mod"
+ "github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
+ "github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.5"
+ "github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+ "github.com/googleapis/gnostic v0.4.1"
+ "github.com/googleapis/gnostic v0.4.1/go.mod"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+ "github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75"
+ "github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod"
+ "github.com/gorilla/mux v1.7.2"
+ "github.com/gorilla/mux v1.7.2/go.mod"
+ "github.com/gorilla/websocket v1.4.1"
+ "github.com/gorilla/websocket v1.4.1/go.mod"
+ "github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+ "github.com/grpc-ecosystem/grpc-gateway v1.13.0"
+ "github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+ "github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5"
+ "github.com/h2non/filetype v1.1.1-0.20201130172452-f60988ab73d5/go.mod"
+ "github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+ "github.com/hashicorp/errwrap v1.0.0"
+ "github.com/hashicorp/errwrap v1.0.0/go.mod"
+ "github.com/hashicorp/go-cleanhttp v0.5.1"
+ "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+ "github.com/hashicorp/go-hclog v0.9.2"
+ "github.com/hashicorp/go-hclog v0.9.2/go.mod"
+ "github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+ "github.com/hashicorp/go-multierror v1.1.0"
+ "github.com/hashicorp/go-multierror v1.1.0/go.mod"
+ "github.com/hashicorp/go-retryablehttp v0.6.6"
+ "github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+ "github.com/hashicorp/go-rootcerts v1.0.2"
+ "github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.2"
+ "github.com/hashicorp/go-uuid v1.0.2/go.mod"
+ "github.com/hashicorp/go-version v1.0.0"
+ "github.com/hashicorp/go-version v1.0.0/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.0/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.1/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
+ "github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
+ "github.com/hashicorp/hcl v1.0.0/go.mod"
+ "github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6"
+ "github.com/hashicorp/nomad/api v0.0.0-20200303134319-e31695b5bbe6/go.mod"
+ "github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95"
+ "github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod"
+ "github.com/hpcloud/tail v1.0.0"
+ "github.com/hpcloud/tail v1.0.0/go.mod"
+ "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+ "github.com/imdario/mergo v0.3.5/go.mod"
+ "github.com/imdario/mergo v0.3.6"
+ "github.com/imdario/mergo v0.3.6/go.mod"
+ "github.com/inconshreveable/mousetrap v1.0.0"
+ "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+ "github.com/jarcoal/httpmock v1.0.4"
+ "github.com/jarcoal/httpmock v1.0.4/go.mod"
+ "github.com/jcmturner/gofork v1.0.0"
+ "github.com/jcmturner/gofork v1.0.0/go.mod"
+ "github.com/jessevdk/go-flags v1.4.0/go.mod"
+ "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+ "github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+ "github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
+ "github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
+ "github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
+ "github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
+ "github.com/joho/godotenv v1.3.0"
+ "github.com/joho/godotenv v1.3.0/go.mod"
+ "github.com/jonboulle/clockwork v0.1.0/go.mod"
+ "github.com/jonboulle/clockwork v0.2.2"
+ "github.com/jonboulle/clockwork v0.2.2/go.mod"
+ "github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd"
+ "github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd/go.mod"
+ "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+ "github.com/jpillora/backoff v1.0.0"
+ "github.com/jpillora/backoff v1.0.0/go.mod"
+ "github.com/json-iterator/go v1.1.6/go.mod"
+ "github.com/json-iterator/go v1.1.7/go.mod"
+ "github.com/json-iterator/go v1.1.10"
+ "github.com/json-iterator/go v1.1.10/go.mod"
+ "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+ "github.com/jstemmer/go-junit-report v0.9.1"
+ "github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+ "github.com/jtolds/gls v4.20.0+incompatible"
+ "github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+ "github.com/julienschmidt/httprouter v1.2.0/go.mod"
+ "github.com/karrick/godirwalk v1.15.6"
+ "github.com/karrick/godirwalk v1.15.6/go.mod"
+ "github.com/kisielk/errcheck v1.1.0/go.mod"
+ "github.com/kisielk/errcheck v1.2.0/go.mod"
+ "github.com/kisielk/gotool v1.0.0/go.mod"
+ "github.com/klauspost/compress v1.11.0"
+ "github.com/klauspost/compress v1.11.0/go.mod"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+ "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
+ "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+ "github.com/kr/pretty v0.1.0/go.mod"
+ "github.com/kr/pretty v0.2.0/go.mod"
+ "github.com/kr/pretty v0.2.1"
+ "github.com/kr/pretty v0.2.1/go.mod"
+ "github.com/kr/pty v1.1.1/go.mod"
+ "github.com/kr/text v0.1.0/go.mod"
+ "github.com/kr/text v0.2.0"
+ "github.com/kr/text v0.2.0/go.mod"
+ "github.com/lib/pq v1.0.0/go.mod"
+ "github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
+ "github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
+ "github.com/magefile/mage v1.9.0/go.mod"
+ "github.com/magefile/mage v1.11.0"
+ "github.com/magefile/mage v1.11.0/go.mod"
+ "github.com/magiconair/properties v1.8.0/go.mod"
+ "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+ "github.com/mailru/easyjson v0.7.1"
+ "github.com/mailru/easyjson v0.7.1/go.mod"
+ "github.com/markbates/pkger v0.17.0"
+ "github.com/markbates/pkger v0.17.0/go.mod"
+ "github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+ "github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+ "github.com/mattn/go-colorable v0.1.4/go.mod"
+ "github.com/mattn/go-colorable v0.1.6"
+ "github.com/mattn/go-colorable v0.1.6/go.mod"
+ "github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+ "github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
+ "github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
+ "github.com/mattn/go-isatty v0.0.8/go.mod"
+ "github.com/mattn/go-isatty v0.0.11/go.mod"
+ "github.com/mattn/go-isatty v0.0.12"
+ "github.com/mattn/go-isatty v0.0.12/go.mod"
+ "github.com/mattn/go-sqlite3 v1.9.0"
+ "github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+ "github.com/miekg/dns v1.1.15"
+ "github.com/miekg/dns v1.1.15/go.mod"
+ "github.com/mitchellh/go-homedir v1.1.0"
+ "github.com/mitchellh/go-homedir v1.1.0/go.mod"
+ "github.com/mitchellh/go-testing-interface v1.0.0"
+ "github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+ "github.com/mitchellh/gox v1.0.1"
+ "github.com/mitchellh/gox v1.0.1/go.mod"
+ "github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
+ "github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
+ "github.com/mitchellh/iochan v1.0.0"
+ "github.com/mitchellh/iochan v1.0.0/go.mod"
+ "github.com/mitchellh/mapstructure v1.1.2"
+ "github.com/mitchellh/mapstructure v1.1.2/go.mod"
+ "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+ "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+ "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+ "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+ "github.com/modern-go/reflect2 v1.0.1"
+ "github.com/modern-go/reflect2 v1.0.1/go.mod"
+ "github.com/morikuni/aec v1.0.0"
+ "github.com/morikuni/aec v1.0.0/go.mod"
+ "github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+ "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+ "github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+ "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+ "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+ "github.com/oklog/ulid v1.3.1"
+ "github.com/oklog/ulid v1.3.1/go.mod"
+ "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+ "github.com/onsi/ginkgo v1.5.0/go.mod"
+ "github.com/onsi/ginkgo v1.6.0/go.mod"
+ "github.com/onsi/ginkgo v1.10.1/go.mod"
+ "github.com/onsi/ginkgo v1.11.0"
+ "github.com/onsi/ginkgo v1.11.0/go.mod"
+ "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+ "github.com/onsi/gomega v1.2.0/go.mod"
+ "github.com/onsi/gomega v1.4.3/go.mod"
+ "github.com/onsi/gomega v1.7.0"
+ "github.com/onsi/gomega v1.7.0/go.mod"
+ "github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+ "github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+ "github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
+ "github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
+ "github.com/opencontainers/image-spec v1.0.1/go.mod"
+ "github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
+ "github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
+ "github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+ "github.com/opencontainers/runc v1.0.0-rc9"
+ "github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+ "github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+ "github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+ "github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+ "github.com/otiai10/copy v1.2.0"
+ "github.com/otiai10/copy v1.2.0/go.mod"
+ "github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod"
+ "github.com/otiai10/curr v1.0.0"
+ "github.com/otiai10/curr v1.0.0/go.mod"
+ "github.com/otiai10/mint v1.3.0/go.mod"
+ "github.com/otiai10/mint v1.3.1"
+ "github.com/otiai10/mint v1.3.1/go.mod"
+ "github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+ "github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+ "github.com/pelletier/go-toml v1.2.0/go.mod"
+ "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+ "github.com/pierrec/lz4 v2.5.2+incompatible"
+ "github.com/pierrec/lz4 v2.5.2+incompatible/go.mod"
+ "github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0"
+ "github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0/go.mod"
+ "github.com/pkg/errors v0.8.0/go.mod"
+ "github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod"
+ "github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+ "github.com/pkg/errors v0.8.1/go.mod"
+ "github.com/pkg/errors v0.9.1"
+ "github.com/pkg/errors v0.9.1/go.mod"
+ "github.com/pmezard/go-difflib v1.0.0"
+ "github.com/pmezard/go-difflib v1.0.0/go.mod"
+ "github.com/poy/eachers v0.0.0-20181020210610-23942921fe77"
+ "github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+ "github.com/prometheus/client_golang v0.9.1/go.mod"
+ "github.com/prometheus/client_golang v1.0.0/go.mod"
+ "github.com/prometheus/client_golang v1.1.0/go.mod"
+ "github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
+ "github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+ "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+ "github.com/prometheus/common v0.4.1/go.mod"
+ "github.com/prometheus/common v0.6.0/go.mod"
+ "github.com/prometheus/common v0.7.0"
+ "github.com/prometheus/common v0.7.0/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
+ "github.com/prometheus/procfs v0.0.2/go.mod"
+ "github.com/prometheus/procfs v0.0.3/go.mod"
+ "github.com/prometheus/procfs v0.0.5/go.mod"
+ "github.com/prometheus/procfs v0.0.11"
+ "github.com/prometheus/procfs v0.0.11/go.mod"
+ "github.com/prometheus/prometheus v2.5.0+incompatible"
+ "github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
+ "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0"
+ "github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod"
+ "github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+ "github.com/rogpeppe/go-internal v1.3.0/go.mod"
+ "github.com/russross/blackfriday v1.5.2/go.mod"
+ "github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
+ "github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
+ "github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
+ "github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
+ "github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
+ "github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
+ "github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
+ "github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
+ "github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+ "github.com/santhosh-tekuri/jsonschema v1.2.4"
+ "github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+ "github.com/satori/go.uuid v1.2.0"
+ "github.com/satori/go.uuid v1.2.0/go.mod"
+ "github.com/sergi/go-diff v1.0.0/go.mod"
+ "github.com/sergi/go-diff v1.1.0"
+ "github.com/sergi/go-diff v1.1.0/go.mod"
+ "github.com/shirou/gopsutil v3.20.12+incompatible"
+ "github.com/shirou/gopsutil v3.20.12+incompatible/go.mod"
+ "github.com/shopspring/decimal v1.2.0"
+ "github.com/shopspring/decimal v1.2.0/go.mod"
+ "github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+ "github.com/sirupsen/logrus v1.2.0/go.mod"
+ "github.com/sirupsen/logrus v1.4.1/go.mod"
+ "github.com/sirupsen/logrus v1.4.2"
+ "github.com/sirupsen/logrus v1.4.2/go.mod"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+ "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+ "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+ "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+ "github.com/spaolacci/murmur3 v1.1.0"
+ "github.com/spaolacci/murmur3 v1.1.0/go.mod"
+ "github.com/spf13/afero v1.1.2/go.mod"
+ "github.com/spf13/afero v1.2.2/go.mod"
+ "github.com/spf13/cast v1.3.0/go.mod"
+ "github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+ "github.com/spf13/cobra v0.0.5"
+ "github.com/spf13/cobra v0.0.5/go.mod"
+ "github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+ "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+ "github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+ "github.com/spf13/pflag v1.0.3/go.mod"
+ "github.com/spf13/pflag v1.0.5"
+ "github.com/spf13/pflag v1.0.5/go.mod"
+ "github.com/spf13/viper v1.3.2/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.1/go.mod"
+ "github.com/stretchr/objx v0.2.0"
+ "github.com/stretchr/objx v0.2.0/go.mod"
+ "github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod"
+ "github.com/stretchr/testify v1.2.2/go.mod"
+ "github.com/stretchr/testify v1.3.0/go.mod"
+ "github.com/stretchr/testify v1.4.0/go.mod"
+ "github.com/stretchr/testify v1.5.0/go.mod"
+ "github.com/stretchr/testify v1.5.1/go.mod"
+ "github.com/stretchr/testify v1.6.1"
+ "github.com/stretchr/testify v1.6.1/go.mod"
+ "github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+ "github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
+ "github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
+ "github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786"
+ "github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod"
+ "github.com/ugorji/go v1.1.8"
+ "github.com/ugorji/go v1.1.8/go.mod"
+ "github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+ "github.com/ugorji/go/codec v1.1.8"
+ "github.com/ugorji/go/codec v1.1.8/go.mod"
+ "github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+ "github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+ "github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
+ "github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
+ "github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+ "github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230"
+ "github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
+ "github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
+ "github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+ "github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+ "github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
+ "github.com/vbatts/tar-split v0.11.1/go.mod"
+ "github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
+ "github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
+ "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+ "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+ "github.com/xdg/stringprep v1.0.0"
+ "github.com/xdg/stringprep v1.0.0/go.mod"
+ "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+ "github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
+ "github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod"
+ "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+ "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+ "github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+ "github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
+ "github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
+ "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+ "github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
+ "github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+ "go.elastic.co/apm v1.7.2/go.mod"
+ "go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b"
+ "go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b/go.mod"
+ "go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+ "go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+ "go.elastic.co/apm/module/apmhttp v1.7.2"
+ "go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+ "go.elastic.co/ecszap v0.3.0"
+ "go.elastic.co/ecszap v0.3.0/go.mod"
+ "go.elastic.co/fastjson v1.0.0/go.mod"
+ "go.elastic.co/fastjson v1.1.0"
+ "go.elastic.co/fastjson v1.1.0/go.mod"
+ "go.elastic.co/go-licence-detector v0.4.0"
+ "go.elastic.co/go-licence-detector v0.4.0/go.mod"
+ "go.etcd.io/bbolt v1.3.4"
+ "go.etcd.io/bbolt v1.3.4/go.mod"
+ "go.opencensus.io v0.21.0/go.mod"
+ "go.opencensus.io v0.22.0/go.mod"
+ "go.opencensus.io v0.22.2"
+ "go.opencensus.io v0.22.2/go.mod"
+ "go.uber.org/atomic v1.5.0"
+ "go.uber.org/atomic v1.5.0/go.mod"
+ "go.uber.org/goleak v1.0.0"
+ "go.uber.org/goleak v1.0.0/go.mod"
+ "go.uber.org/multierr v1.3.0"
+ "go.uber.org/multierr v1.3.0/go.mod"
+ "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+ "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+ "go.uber.org/zap v1.14.0"
+ "go.uber.org/zap v1.14.0/go.mod"
+ "golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+ "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+ "golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+ "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+ "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+ "golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+ "golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+ "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+ "golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+ "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+ "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+ "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+ "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+ "golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
+ "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+ "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+ "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+ "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+ "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+ "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+ "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+ "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+ "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+ "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+ "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+ "golang.org/x/lint v0.0.0-20200130185559-910be7a94367"
+ "golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+ "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+ "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+ "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+ "golang.org/x/mod v0.1.0/go.mod"
+ "golang.org/x/mod v0.3.0"
+ "golang.org/x/mod v0.3.0/go.mod"
+ "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+ "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+ "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+ "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+ "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+ "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+ "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+ "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+ "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+ "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+ "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+ "golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+ "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+ "golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+ "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+ "golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+ "golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+ "golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
+ "golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+ "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+ "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+ "golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+ "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+ "golang.org/x/net v0.0.0-20200904194848-62affa334b73"
+ "golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+ "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+ "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+ "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+ "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+ "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+ "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+ "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+ "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+ "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+ "golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod"
+ "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+ "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+ "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+ "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+ "golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+ "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+ "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+ "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+ "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+ "golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
+ "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+ "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+ "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+ "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+ "golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+ "golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod"
+ "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+ "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+ "golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+ "golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+ "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+ "golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+ "golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
+ "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+ "golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+ "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+ "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+ "golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+ "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+ "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+ "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+ "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+ "golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+ "golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+ "golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634"
+ "golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+ "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/text v0.3.3"
+ "golang.org/x/text v0.3.3/go.mod"
+ "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+ "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+ "golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+ "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+ "golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0"
+ "golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod"
+ "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+ "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+ "golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+ "google.golang.org/api v0.4.0/go.mod"
+ "google.golang.org/api v0.7.0/go.mod"
+ "google.golang.org/api v0.8.0/go.mod"
+ "google.golang.org/api v0.9.0/go.mod"
+ "google.golang.org/api v0.15.0"
+ "google.golang.org/api v0.15.0/go.mod"
+ "google.golang.org/appengine v1.1.0/go.mod"
+ "google.golang.org/appengine v1.2.0/go.mod"
+ "google.golang.org/appengine v1.4.0/go.mod"
+ "google.golang.org/appengine v1.5.0/go.mod"
+ "google.golang.org/appengine v1.6.1/go.mod"
+ "google.golang.org/appengine v1.6.5"
+ "google.golang.org/appengine v1.6.5/go.mod"
+ "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+ "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+ "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+ "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+ "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+ "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+ "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+ "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+ "google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
+ "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+ "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
+ "google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+ "google.golang.org/grpc v1.19.0/go.mod"
+ "google.golang.org/grpc v1.20.1/go.mod"
+ "google.golang.org/grpc v1.21.1/go.mod"
+ "google.golang.org/grpc v1.23.0/go.mod"
+ "google.golang.org/grpc v1.24.0/go.mod"
+ "google.golang.org/grpc v1.25.1/go.mod"
+ "google.golang.org/grpc v1.26.0/go.mod"
+ "google.golang.org/grpc v1.27.0/go.mod"
+ "google.golang.org/grpc v1.27.1/go.mod"
+ "google.golang.org/grpc v1.29.1"
+ "google.golang.org/grpc v1.29.1/go.mod"
+ "google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+ "google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+ "google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+ "google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+ "google.golang.org/protobuf v1.21.0/go.mod"
+ "google.golang.org/protobuf v1.22.0/go.mod"
+ "google.golang.org/protobuf v1.23.0/go.mod"
+ "google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+ "google.golang.org/protobuf v1.24.0"
+ "google.golang.org/protobuf v1.24.0/go.mod"
+ "gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+ "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b"
+ "gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
+ "gopkg.in/errgo.v2 v2.1.0/go.mod"
+ "gopkg.in/fsnotify.v1 v1.4.7"
+ "gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+ "gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+ "gopkg.in/inf.v0 v0.9.1"
+ "gopkg.in/inf.v0 v0.9.1/go.mod"
+ "gopkg.in/jcmturner/aescts.v1 v1.0.1"
+ "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
+ "gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
+ "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
+ "gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+ "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+ "gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+ "gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
+ "gopkg.in/jcmturner/rpc.v1 v1.1.0"
+ "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
+ "gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
+ "gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
+ "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+ "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.1/go.mod"
+ "gopkg.in/yaml.v2 v2.2.2/go.mod"
+ "gopkg.in/yaml.v2 v2.2.3/go.mod"
+ "gopkg.in/yaml.v2 v2.2.4/go.mod"
+ "gopkg.in/yaml.v2 v2.2.7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.8/go.mod"
+ "gopkg.in/yaml.v2 v2.3.0"
+ "gopkg.in/yaml.v2 v2.3.0/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+ "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+ "gotest.tools v2.2.0+incompatible"
+ "gotest.tools v2.2.0+incompatible/go.mod"
+ "gotest.tools/gotestsum v0.6.0"
+ "gotest.tools/gotestsum v0.6.0/go.mod"
+ "gotest.tools/v3 v3.0.3"
+ "gotest.tools/v3 v3.0.3/go.mod"
+ "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+ "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+ "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+ "honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+ "honnef.co/go/tools v0.0.1-2019.2.3"
+ "honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+ "howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+ "howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+ "k8s.io/api v0.19.4"
+ "k8s.io/api v0.19.4/go.mod"
+ "k8s.io/apimachinery v0.19.4"
+ "k8s.io/apimachinery v0.19.4/go.mod"
+ "k8s.io/client-go v0.19.4"
+ "k8s.io/client-go v0.19.4/go.mod"
+ "k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+ "k8s.io/klog/v2 v2.0.0/go.mod"
+ "k8s.io/klog/v2 v2.2.0"
+ "k8s.io/klog/v2 v2.2.0/go.mod"
+ "k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6"
+ "k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+ "k8s.io/kubernetes v1.13.0/go.mod"
+ "k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
+ "k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+ "rsc.io/binaryregexp v0.2.0/go.mod"
+ "sigs.k8s.io/structured-merge-diff/v4 v4.0.1"
+ "sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
+ "sigs.k8s.io/yaml v1.1.0/go.mod"
+ "sigs.k8s.io/yaml v1.2.0"
+ "sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/beats-${PV}"
+
+src_prepare() {
+ default
+
+ # avoid Elastic license
+ rm -r x-pack || die
+
+ # use ${PV} instead of git commit id
+ sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+ emake -C "${S}/filebeat"
+}
+
+src_install() {
+ keepdir /etc/${PN}
+ keepdir /var/{lib,log}/${PN}
+
+ fperms 0750 /var/{lib,log}/${PN}
+
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+ docinto examples
+ dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+ dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ elog "Please read the migration guide at:"
+ elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+ elog ""
+ fi
+
+ elog "Example configurations:"
+ elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index df1969a85a93..5105c19e3282 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,3 +1,5 @@
DIST github-backup-utils-2.22.0.tar.gz 102576 BLAKE2B ce9007c8a5d2843ccc2b3d11b03c13840b89d6ae7906d63420cc0e18191766c92c91e1072723439610ae8bdfdd0174601d1e3b7211cd6a1c9a748f9f793ff760 SHA512 e77b4afc6f90b16caf61dc4313787dab0751590b4819dca2d7e21acd0ca774d19ea359171b76f2892ca0fb4f86fd4240e77b00e107de79d496fea429fb12cee8
+DIST github-backup-utils-3.0.0.tar.gz 104088 BLAKE2B f01229e6b152231eb832dec8bef41bb158cc200bbdd3c59c1abab299c572902efe6d27d093491bd8b0bf8f3e834d2938eb0127d5f28700ba75dcbdbcc8a21bb8 SHA512 e86420ef9d86d44560e27e00361ff1bb8ba7c15fb116ad9981e3196bc4c7c25bcff9a9f7dc8dae9bbbb9b2f3380b434199dbbe1ef7db5b1ba04ec1233aec320d
EBUILD github-backup-utils-2.22.0.ebuild 1124 BLAKE2B 0130f16c1e0175c743f4588485315e3080d073f5ae2c77a489191b51bd2c340ed070208ccebd4fd81b48e384ba4aa0d96ac8b7addc44ba3150749c280fc67809 SHA512 26355f99664a67b005a5063d1c51dbb52890cee9353bf9ee0e9d081cf4431d2815b4866d74a0366770c7341062cb2e9bd00b8dae0311d3e70aea0e32f17697b4
+EBUILD github-backup-utils-3.0.0.ebuild 1126 BLAKE2B 40314bede883af05f54cf146541594e7bb484fe17c63f7df17f61b1c934b84b7b7f4ef9de0673586c729fa019939725c85ea4b30e32d60d08e14b51cfde29e8b SHA512 7518f4fc52ba40b49848d66d95cbcd16796045b1ba8becd76c1e0f8617295142dbae32ef8f60dd8a4a3b6d952788f20f7be40b1c599c798829e7df86f0945c4b
MISC metadata.xml 342 BLAKE2B 9f590d0c03e75e395500a57d1b99020742fb9fc04835b6fca8a896435dec7ba274204df2c5356ec1ef101f721a4bafdb848299c57b209c8d9aa41efdeb674e8f SHA512 5a9f0cb678377962ec6e4cf33ed40423e568f15cb71dfe5dd87e427a21584043e5698bbb2baa5b77907bf8f15c9ad8cfa8b05b4fdcdf2c8876ceb968afcb2d07
diff --git a/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild
new file mode 100644
index 000000000000..d50a44c1f6fb
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-3.0.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Python3 support: https://github.com/github/backup-utils/pull/627
+PYTHON_COMPAT=(python3_{7,8,9})
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moreutils parallel is now used for speedups in main code:
+# https://github.com/github/backup-utils/pull/635
+RDEPEND="net-misc/rsync
+ sys-apps/moreutils"
+
+# tests invoke parallel & rsync
+DEPEND="test? (
+ ${RDEPEND}
+ dev-util/checkbashisms
+ ${PYTHON_DEPS}
+)"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+ :;
+}
+
+src_install() {
+ dobin bin/*
+ insinto usr/share/${PN}
+ doins share/${PN}/version
+
+ exeinto usr/share/${PN}
+ doexe share/${PN}/bm.sh
+ doexe share/${PN}/ghe-*
+
+ insinto etc/${PN}
+ newins backup.config-example backup.config
+
+ dodoc -r docs/*
+}
+
+src_test() {
+ emake test
+}
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index 84d7e5fc54ce..6e95b71fdabd 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,3 +1,3 @@
DIST gnome-abrt-1.3.6.tar.gz 112255 BLAKE2B d0e87ef5543e84c246f9e98aac8f92984af9e8220357359ffa76f91e00bb35ccb9b60a00c8e0b00d3464ecfc9ddffaeb61fb15b57480066d957a2af44b49c3be SHA512 7bd15c9956d2e4bafce7d1ef73e930f679119fe8ccebda8a27171a5b3b1dfa90255c572e3a0c70606fe389d50079870399b89f61f683896d4ca6380a7d3f7cc2
-EBUILD gnome-abrt-1.3.6.ebuild 1158 BLAKE2B cad8b6ffd29eee5d8383512f316688cb6890e5d74c91413c7d44c076704e2422e5e7564e518f13577b48eb62a5b32c9f01df1c3fc3fc59e1d09ed729c6507aed SHA512 d035095657ef1449c146e87ef7b56836f180b2a4ecd33352343858a9d4cfa56fe91cec0254edc033d79998a4c78c37adadbc5930a76605cb92ebc6b7efbe199c
+EBUILD gnome-abrt-1.3.6.ebuild 1161 BLAKE2B 2a8a3a444f592bed4ed15a2f2503814f4017d36de6dc9be0f16a9eb15f02507e86fc3727f654e1c7062321ee5b0695e6cd6b431ca9abfc47f608f902e24568b7 SHA512 ebf07063571c949d8ab39bd16dc742424e2239f856f9141ce29bc7ac94ee7552ecba8c7b7f467d6426be608091ef7a8fd0647ea243eeeb825d3aa76eb7fd42ea
MISC metadata.xml 333 BLAKE2B 1207865e26d4788f381ecb07b1c2d83cfa845ff4e3ccd6476d7c319ae14fcbce62ac5a0c868f60eba27a7451b577a33427b44ea2784bd63e5670f7d0971a47de SHA512 242ba1baed89b8710643a23de1ae61848cb3565696e11b1347696cdc16f14616827582031c7e94a2bf7614051af0f9f388cf4d5596373e50abf52ad393ba8c73
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
index b9ff00b24a57..d06fd2d8b609 100644
--- a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
+++ b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
>=x11-libs/gtk+-3.10.0:3
- >=dev-libs/libreport-2.0.20[python,${PYTHON_USEDEP}]
+ >=dev-libs/libreport-2.0.20:0=[python,${PYTHON_USEDEP}]
>=app-admin/abrt-2.10.10-r1
>=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
>=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 74c6a5269d5e..bb90f030c79e 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,3 @@
-DIST hcloud-1.20.0.tar.xz 790040 BLAKE2B ba0d62c8e817daadaa9eb891adb3f655a9ae33b05617449e26b09a3ba6b99a6b6f61df1cf29138a008a7ee58e45efdfe07c408af89efb1c2bd870d7340976bb8 SHA512 5dbb9060595e836ccde99984783954e894f74c098f911ae8c4cc1944d444fd28b6f722bb711d9b1ae245ddf3af8cca1939585ed778c8026fbf8c4201c2d15469
DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
-EBUILD hcloud-1.20.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
-EBUILD hcloud-1.22.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
+EBUILD hcloud-1.22.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.20.0.ebuild b/app-admin/hcloud/hcloud-1.20.0.ebuild
deleted file mode 100644
index 8d044f742d31..000000000000
--- a/app-admin/hcloud/hcloud-1.20.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A command-line interface for Hetzner Cloud"
-HOMEPAGE="https://github.com/hetznercloud/cli"
-SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-src_compile() {
- go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
-}
-
-src_test() {
- # For upstream a simple test is run 'hcloud version'
- ./hcloud version
- if [[ $? -ne 0 ]]
- then
- die "Test failed"
- fi
-}
-
-src_install() {
- dobin ${PN}
-}
diff --git a/app-admin/hcloud/hcloud-1.22.1.ebuild b/app-admin/hcloud/hcloud-1.22.1.ebuild
index 77d54006fe99..358299f65bac 100644
--- a/app-admin/hcloud/hcloud-1.22.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.22.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
DEPEND="dev-lang/go:="
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index ab0da1875f04..f09fdbb49630 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -6,10 +6,13 @@ AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa88
DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01
DIST logstash-7.10.2-linux-x86_64.tar.gz 351170815 BLAKE2B 536a33de4be4bd1b6dfccf7d4cedc064b0f0b9c0569545d195244cf14f38d9c83159439d7710a76fdc4e4394b5f7d5a1919460c1c03186b4fc7f054744a46016 SHA512 34099b34a05c6b85b1b355310bd190b606aa0bcce1cad07bf5fd98959e54f61860bdd697cca8f3cdab2d2b815bbc2a788d2e14dcac4b3d85a0d5bafd72d2b170
DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195
+DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834
DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2
DIST logstash-oss-7.10.2-linux-x86_64.tar.gz 350992238 BLAKE2B f31207af62b6ff36af4be6fae9c6ede18a481317d28ba2ee6469cd095acba9b41ad4d7598756a51a078bf3d4269ae2f11750e4117842e496811a79825f284aef SHA512 5425483a7d3ec5ba186574940031a529efa683f452f5e3e38ffd9bd07771beabdd5c54a8147ed42fe761b700ea5c294018f1efb22fa6fdcf23189f2aea314b5b
DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60
+DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4
EBUILD logstash-bin-6.8.15.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
EBUILD logstash-bin-7.10.2.ebuild 2504 BLAKE2B 9e4e24079755eb80b22734c42fa02545dd31d781399dedb61d03ed6ab29635b5c2890f99c391bd7d9521cd7845bcc51518d0af5c53c186e6e476a7599949f89b SHA512 e40cbc468ea8039f2e196c1f29117c5685e2d21bc85e90518b1361584025e40b927833a0c95492cb9ed32862b374463ddf332ba3bd960a928802d8ca1e4f2e16
EBUILD logstash-bin-7.12.0.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
+EBUILD logstash-bin-7.12.1.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
MISC metadata.xml 692 BLAKE2B 4dce636bac8df4bdc8761c340b230db0371df1b127e17de8f9d55225fec2ccea4f59876e88b651427c11047eb24c6993391a2f25a3ac1ec39032d50226e9c99b SHA512 6a22c84fcb90fcb8334a1bd26e240e97d7c06d17251a9f973d780c28b836eba45cde5fc35a46e2cd82bf30f04116c825ec831344fd286f9e84cc430d032f3757
diff --git a/app-admin/logstash-bin/logstash-bin-7.12.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.12.1.ebuild
new file mode 100644
index 000000000000..aea75866ef6f
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.12.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+ !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+ acct-user/logstash
+ virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ local d
+ for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
+ i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
+ ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
+ x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
+ rm -r vendor/jruby/lib/jni/$d || die
+ done
+
+ # remove bundled java
+ rm -r jdk || die
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+ rm -v config/{pipelines.yml,startup.options} || die
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ doins "${FILESDIR}/pipelines.yml"
+ rm -rv config data || die
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+ insinto /usr/share/eselect/modules
+ doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+ ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+ ewarn "Install the plugins via eselect module that will automatically re-install"
+ ewarn "all self installed plugins after Logstash upgrades."
+ elog
+ elog "Installing plugins:"
+ elog "eselect logstash-plugin install logstash-output-gelf"
+ elog
+
+ elog "Reinstalling self installed plugins (installed via eselect module):"
+ eselect logstash-plugin reinstall
+
+ elog
+ elog "Sample configuration:"
+ elog "${EROOT}/usr/share/${MY_PN}"
+ elog
+ elog "The default pipeline configuration expects the configuration(s) to be found in:"
+ elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 975861beb7b1..ef74d502a0bb 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -2,5 +2,5 @@ AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da5
DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8
EBUILD passwordsafe-1.12.0-r1.ebuild 1892 BLAKE2B 2943644c3546e9d31c29bda97d0292d31db902074452c025df2eaaf0f0128524974e8b933d018b84a66c1b6b5f39f4dac8be29d966870d1f497d17d661867115 SHA512 f6b29dc2a68f06ef500b8fcb2a8b5e14bdd89e93d074703c695c93749d9af283a118879c250b65e88b90d3b272d30e6f35d5323951449af67302d6242da84e02
-EBUILD passwordsafe-1.13.0.ebuild 1888 BLAKE2B 8e10bb42fb03ef98e3d946d2498b1265d142852c75f36ea1d3bce634991a618159edf9fba455cb56e730f8c28369f175108d731986c3e4e3a6bd158ee39c0e75 SHA512 712f86d94751e859a14281a5b3741e175c7f9a1002938ad31a374687a16463006c482d56f2096241f164f2954d556a63cf2a67fc78d865f6e98be9938de9e349
+EBUILD passwordsafe-1.13.0.ebuild 1887 BLAKE2B dcfb7d0f84ae7817dd33233cd06df44f255c2590e617fc7d951042ee11c672622fd7f4ebcff80a9391e6f5e29aa1ad7c59d5488491a89a5246dfb2982722a1e3 SHA512 a6e31b0aa014f55fb6a269eeafb0b3bc9e449e8666cd30b4cd844a6f560c93ca631ce5c9c77307bbe6f20f5dd6b8d5111b03d9696d42b8e24b30ba74c700086d
MISC metadata.xml 713 BLAKE2B 7f98705703812e2a7148f5943d8b0c8e7a2f51f2bced2d27badbad478f87411c5dc3d7b37a1dffc7d21cabafa4b61650ca745b8d0bcdfafc7f15c46d363540da SHA512 31cacdb2b25093ee853a43200c498177d207027302a6542dfa095377e1f6834d1c40c28088241939ebe3022f122c0125a94e248f135c084a4a234b2510741148
diff --git a/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild
index a57321cf3d62..68384c419018 100644
--- a/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.13.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="qr test +xml yubikey"
RESTRICT="!test? ( test )"
diff --git a/app-admin/socklog/Manifest b/app-admin/socklog/Manifest
index f5e5126547c3..484776f53d25 100644
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@@ -1,4 +1,5 @@
AUX socklog-2.1.0-headers.patch 925 BLAKE2B f1f283e27a1e4e260e5c9313304090a9b62d8f0f4854be19e1fcfcb8af764346c650cb28e610779020ff7183d16d32a0e61745addcdcec52031057398b8d3d94 SHA512 d522a421a592813992646d9d2679b26c7c70a87645e06705ba212b26decd6f7dd969b4a35f54732b0b383783956c1b9ab2fc3cd402f6f5ff1a941ef1863c1419
+AUX socklog-2.1.0-respect-ar-ranlib.patch 372 BLAKE2B 44d1c60100a6cc1a044cc7ab440ecb4d66f9bae8d0dae18a1e0e7b60848736439e9acf56dec6644e612ae7515749ca5b74b44a3dd86bdb33e12ff0dc50c41141 SHA512 862178c36bb87367436b59851bea30351c15cbef8c2a4d26b8a3d9cbb522eee3a4589add0b476d53f07869d0c7b833b6255727eda7430e02c9a37a7160167986
DIST socklog-2.1.0.tar.gz 56942 BLAKE2B 4f88044bb075dc8e503956f0ddf50fd4e748bf090e62acd34701e716d1dd34a639590b319b4377de06d3b0305d865652abd303210745e355ae67f5dff41cb895 SHA512 920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7
-EBUILD socklog-2.1.0.ebuild 887 BLAKE2B aedc1324c4e6f4d668d209bfaeb06f78cf9fe1559b94ca9a00a7455444a9ca40b0726b906496d33ad007dcb5580bba8b251997bf3a321c46bff1d97c829b6f27 SHA512 eea0c954eaaf06931a9e237f2997abc2748e37f52b9afa2362b13b3ec282c1432261c3838c22741b0902dc524667e10a39c63497b30cf29406cae3407405980b
+EBUILD socklog-2.1.0.ebuild 968 BLAKE2B 746e36953d4a23ab2c1611c047ced05d503a2e7af12b7720d8b4bfa688ddc5e28ad078a791295b59db8f3dc7a210fff3bc4b3050a8f0bd2ce72863ff5bb88fe3 SHA512 d3a71cb40d570ffe4c992a2fd17716d2e658483447f5d17d5fe7234bb1163314a47377aeab023aa8a77ec8dfbd4bf570df30ce642ae27bf7cc2d193b8e165692
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch b/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch
new file mode 100644
index 000000000000..6aacbd9b80dd
--- /dev/null
+++ b/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch
@@ -0,0 +1,18 @@
+--- a/print-ar.sh
++++ b/print-ar.sh
+@@ -1,7 +1,7 @@
+ cat warn-auto.sh
+ echo 'main="$1"; shift'
+ echo 'rm -f "$main"'
+-echo 'ar cr "$main" ${1+"$@"}'
++echo '${AR} cr "$main" ${1+"$@"}'
+ case "`cat systype`" in
+ sunos-5.*) ;;
+ unix_sv*) ;;
+@@ -10,5 +10,5 @@
+ dgux-*) ;;
+ hp-ux-*) ;;
+ sco*) ;;
+- *) echo 'ranlib "$main"' ;;
++ *) echo '${RANLIB} "$main"' ;;
+ esac
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index 1e48d5125737..367d62460e7e 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -1,13 +1,14 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Small secure replacement for syslogd with automatic log rotation"
HOMEPAGE="http://smarden.org/socklog/"
SRC_URI="http://smarden.org/socklog/${P}.tar.gz"
+S="${WORKDIR}/admin/${P}/src"
LICENSE="BSD"
SLOT="0"
@@ -16,15 +17,16 @@ IUSE="static"
RDEPEND=">=sys-process/runit-1.4.0"
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-headers.patch
+ "${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch
+)
-S=${WORKDIR}/admin/${P}/src
-
-src_prepare() {
- default
+src_configure() {
use static && append-ldflags -static
echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die
echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
+ tc-export AR RANLIB
}
src_install() {
@@ -33,6 +35,8 @@ src_install() {
cd .. || die
dodoc package/CHANGES
- dohtml doc/*.html
+ docinto html
+ dodoc doc/*.html
+
doman man/*
}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a9f19510a281..b05dd76b22b3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,7 +1,9 @@
AUX sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch 1929 BLAKE2B 404bd5c03b81a9bfbc3796c706fa93a64b4649c651c7859175137e1abb7f9da34f43d7f6e1ca8bca10c567114a30383571771c6390de9975a6bf55d98b0caa7a SHA512 34dd6880a90740eefd3a1bb543b3121047ea6ab8837a127c55cff92ffb7bf9225d0c6adfd88adf299458fdafaaea5351a52f14a9487c04df41aa218c6eeb6e7a
DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
+DIST sudo-1.9.7rc1.tar.gz 4195574 BLAKE2B 0760443877921faee83bc9561070659eefe02f966b17eb67719b4298417b147787296387e9868050b70ea95ff20b9f8ae986476fe347d27af0b01df11b82bead SHA512 6b73f0bb495e7e6217faaf18cd47c7753a17e4a6470bdb2cd2d2b0f3eda8cc5adde58a61faad6b4f0228617a6e586edd1c8350b15b3c15f98ed78311e0fb6f45
EBUILD sudo-1.9.5_p2-r1.ebuild 6964 BLAKE2B aadec2121ad557984b5b4e506b627dc334bc204d63525dee5dc3ee5f5e31ade83c88f55a00eccf3118faae8883e0a4b9d7d34a6822395a7cf92150c18c84909c SHA512 0173c240c2865d2298fe01a408c54587414932be1640da655abc7704f8094109a509b278d8c5d24250277872eb14d7684e2a8bab56b4b02fc8add23451722ec2
EBUILD sudo-1.9.6_p1-r1.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
+EBUILD sudo-1.9.7_rc1.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
EBUILD sudo-9999.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761
diff --git a/app-admin/sudo/sudo-1.9.7_rc1.ebuild b/app-admin/sudo/sudo-1.9.7_rc1.ebuild
new file mode 100644
index 000000000000..4d5f317bd544
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.7_rc1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam multilib libtool systemd tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == "9999" ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+ uri_prefix=
+ case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+ esac
+
+ SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+ if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+ fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+ sys-libs/zlib:=
+ gcrypt? ( dev-libs/libgcrypt:= )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ sasl? (
+ dev-libs/cyrus-sasl
+ net-nds/openldap[sasl]
+ )
+ )
+ pam? ( sys-libs/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ssl? ( dev-libs/openssl:0= )
+ sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+ ${DEPEND}
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
+ sendmail? ( virtual/mta )
+"
+BDEPEND="
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ ?? ( pam skey )
+ ?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_secure_path() {
+ # first extract the default ROOTPATH from build env
+ SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+ echo "${ROOTPATH}")
+ case "${SECURE_PATH}" in
+ */usr/sbin*) ;;
+ *) SECURE_PATH=$(unset PATH;
+ . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+ ;;
+ esac
+ if [[ -z ${SECURE_PATH} ]] ; then
+ ewarn " Failed to detect SECURE_PATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:${thisp}
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${SECURE_PATH} ; do
+ for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+ newpath+=:${thisp}
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+ local SECURE_PATH
+ set_secure_path
+ tc-export PKG_CONFIG #767712
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ # requires some python eclass
+ --disable-python
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable sasl)
+ $(use_enable ssl openssl)
+ $(use_with ldap)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with pam)
+ $(use_with pam pam-login)
+ $(use_with secure-path secure-path "${SECURE_PATH}")
+ $(use_with selinux)
+ $(use_with sendmail)
+ $(use_with skey)
+ $(use_with sssd)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ if use sasl ; then
+ cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+ # SASL directives: use_sasl, sasl_mech, sasl_auth_id
+ # sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+ EOF
+ fi
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ if use pam; then
+ pamd_mimic system-auth sudo auth account session
+ pamd_mimic system-auth sudo-i auth account session
+ fi
+
+ keepdir /var/db/sudo/lectured
+ fperms 0700 /var/db/sudo/lectured
+ fperms 0711 /var/db/sudo #652958
+
+ # Don't install into /run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${ED}"/run || die
+
+ find "${ED}" -type f -name "*.la" -delete || die #697812
+}
+
+pkg_postinst() {
+ tmpfiles_process sudo.conf
+
+ #652958
+ local sudo_db="${EROOT}/var/db/sudo"
+ if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+ chmod 711 "${sudo_db}" || die
+ fi
+
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index aad4044f9137..3a9860506378 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,6 +1,4 @@
AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
-AUX patches/syslog-ng-fno-common.patch 8521 BLAKE2B 6dc0654aefed1c480507269766f18eb9c1c88e8d9a5fe3c5394c108ea750aafe33858bc3c99957e3989b121a39345b6feffc80c588551145720573d5991fcae9 SHA512 c011f0973c8e3c3220bf9e7dc68176b6b4ec36d7e3030680a42862d31d951c499c81b5bd438622c9f7d41af61c2e24750d38b1c869e3e240e7c22ff8cd5d1f2f
-AUX patches/syslog-ng-glib-2.64-support.patch 2751 BLAKE2B bf80fb569292f4a467b3fcc39776943e847d1900bda7e80d7f279259a8f82b9b4c9f85d06bca5629c69a0ca0aedfe955017718d96094e48603a387f73af82476 SHA512 1eead04652764352f9ef0064ecec4b408b4fe8f9cf94c2e9f1a985b6383de0e1098df9bf2dcd352aeb17dd6dae2cda8313a1bfc0a70b2cf56bf8f323bbe1f169
AUX syslog-ng-3.28.1-net-snmp.patch 292 BLAKE2B 7833709af12ab6531596bdb3b2c327fd2df3a5da3e3b00a597926f5bc5a1053dd2f37dbf0e89784946e169b9d3408c26da84b5355a309b76e424fc48f07ae4b6 SHA512 3b4b62b6e10fcca501891ce878202f1171c8f6bbd69098215015d1a9a1c571e11aa2d8d83d35145f0b5da9c6231952758b60a7116160d64d995d5b2b870b1904
AUX syslog-ng-3.30.1-esmtp-pkgconfig.patch 777 BLAKE2B b9994f5381e2bc53174b5758aeb00def4cc2c26e6e6148223f6cf98337ab707b1025e410c9bde90907b55fc1dc4db343bbf6f6e6df7d151b7108fef801995be5 SHA512 dbc0333c26be61b4d57db79d37529b896f90cf03af46f5df93bf96bfe5966a9781317dac4509906469a5b5d90273623379afbc5480168a99b6b5cd6dc27fdbc9
AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
@@ -9,13 +7,9 @@ AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530
AUX syslog-ng.logrotate.hardened.in 1662 BLAKE2B 488ab7e26b081267bdeecd91013ce5118e79dca89567789be9b85f8712a0f8f11005c2459eb334ab5bdfab08c780063e7025a242330367f710717a79352e0d96 SHA512 1c19837570da6c77d49252303abe0ac91280c500bd82c1eab45c4c1534b83d758782dd576b12006bdd738508892d4b898ba29c0969aba536b333ab9b99e6bd83
AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8c1ae60726b312ea845f3f0b20e436a4e11a377b9faecb1fa3f0febc008ae262e56018775b82d923ba5f2340 SHA512 4e59f8537579caa249ebe12c53946266633972ac6805b7ccd684a5749deeb897783a4e74570ceec15311edb3531aa4278bba468058227ab4c664a697cc604376
AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
-DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7 SHA512 2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a
-DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb
-DIST syslog-ng-3.29.1.tar.gz 5111614 BLAKE2B 1dba62290d6354d0cda7d43783327a19f69e05963c6d2e75f42c61c30984d49d28f1c6474e68ccdd806f38022bf6799e69e12f2444da391b2bccb736ca597c72 SHA512 c8ec6527cab9e46effe23aaa1306b5bde1e13c3e62a092a62af630a744cc41e81d861e6e2ebfbaad8a9199d3b75ba4ac5fb4b4215d03f80a41f57a2e7a074a49
DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
-EBUILD syslog-ng-3.26.1-r1.ebuild 4850 BLAKE2B 582ee36edfa4813345b5084652db3e2e61e0fbf8e58dd362714b23be6e284c0064be29c93ef50d7e8f62d472831c71b3a90ee2f361e986685c9b1dbfdb3d3b68 SHA512 1d9acc712b93cabc46f5ae1a716b64749cee6b37b33d24c3299554e76faeecf5dbd442924bbc5cf93997770828d01ac6c697a2cad33bb70bb896b729ef1fd275
-EBUILD syslog-ng-3.28.1-r2.ebuild 4845 BLAKE2B 3a644b90bc4aa739233304147293b0443934011e368b10b558571977c619a1a2438f48299993bbba323bd2fa425ee990b9e6b1f693986d0f68df4ec50a6e72fe SHA512 8f990c10d4fe5503e264d3462ba40047c0ec3fd8bcad26c38a83f26bbd89172338c603a573386c4c8f052d4bf98596d482c29044151116d60329ccd8a493721b
-EBUILD syslog-ng-3.29.1.ebuild 4845 BLAKE2B 3a644b90bc4aa739233304147293b0443934011e368b10b558571977c619a1a2438f48299993bbba323bd2fa425ee990b9e6b1f693986d0f68df4ec50a6e72fe SHA512 8f990c10d4fe5503e264d3462ba40047c0ec3fd8bcad26c38a83f26bbd89172338c603a573386c4c8f052d4bf98596d482c29044151116d60329ccd8a493721b
+DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
EBUILD syslog-ng-3.30.1-r1.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff
EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2
+EBUILD syslog-ng-3.31.2.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff
MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
deleted file mode 100644
index abec9213cd18..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9b4183fc..1f8f16c13 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -331,8 +331,7 @@ endif()
- add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -j $$(nproc) --output-on-failure)
-
- set(IMPORTANT_WARNINGS
-- -Wshadow
-- -fcommon)
-+ -Wshadow)
-
- set(ACCEPTABLE_WARNINGS
- -Wno-stack-protector
-diff --git a/Makefile.am b/Makefile.am
-index 8b24eeaed..86c090638 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -54,8 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I$(top_builddir)/lib
-
- # Important warnings
- AM_CFLAGS = \
-- -Wshadow \
-- -fcommon
-+ -Wshadow
-
- # Acceptable warnings
- AM_CFLAGS += \
-diff --git a/lib/logmsg/tests/test_log_message.c b/lib/logmsg/tests/test_log_message.c
-index 245568ce5..e51d78b94 100644
---- a/lib/logmsg/tests/test_log_message.c
-+++ b/lib/logmsg/tests/test_log_message.c
-@@ -32,6 +32,8 @@
- #include <stdlib.h>
- #include <glib/gprintf.h>
-
-+MsgFormatOptions parse_options;
-+
- typedef struct _LogMessageTestParams
- {
- LogMessage *message;
-@@ -151,7 +153,7 @@ void
- setup(void)
- {
- app_startup();
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(&parse_options);
- }
-
- void
-diff --git a/libtest/cr_template.c b/libtest/cr_template.c
-index 35e47aa3f..4f0913368 100644
---- a/libtest/cr_template.c
-+++ b/libtest/cr_template.c
-@@ -34,10 +34,12 @@
-
- #include "msg_parse_lib.h"
-
-+static MsgFormatOptions parse_options;
-+
- void
- init_template_tests(void)
- {
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(&parse_options);
- }
-
- void
-diff --git a/libtest/msg_parse_lib.c b/libtest/msg_parse_lib.c
-index ae0d1654b..b3c7cb652 100644
---- a/libtest/msg_parse_lib.c
-+++ b/libtest/msg_parse_lib.c
-@@ -27,15 +27,13 @@
-
- #include <criterion/criterion.h>
-
--MsgFormatOptions parse_options;
--
- void
--init_and_load_syslogformat_module(void)
-+init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options)
- {
- configuration = cfg_new_snippet();
- cfg_load_module(configuration, "syslogformat");
-- msg_format_options_defaults(&parse_options);
-- msg_format_options_init(&parse_options, configuration);
-+ msg_format_options_defaults(parse_options);
-+ msg_format_options_init(parse_options, configuration);
- }
-
- void
-diff --git a/libtest/msg_parse_lib.h b/libtest/msg_parse_lib.h
-index d86f178c2..5a9b4277b 100644
---- a/libtest/msg_parse_lib.h
-+++ b/libtest/msg_parse_lib.h
-@@ -30,9 +30,7 @@
- #include "cfg.h"
- #include "logmsg/logmsg.h"
-
--extern MsgFormatOptions parse_options;
--
--void init_and_load_syslogformat_module(void);
-+void init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options);
- void deinit_syslogformat_module(void);
-
- void assert_log_messages_equal(LogMessage *log_message_a, LogMessage *log_message_b);
-diff --git a/libtest/proto_lib.c b/libtest/proto_lib.c
-index b69195865..105e390b9 100644
---- a/libtest/proto_lib.c
-+++ b/libtest/proto_lib.c
-@@ -23,7 +23,7 @@
- */
-
- #include "proto_lib.h"
--#include "msg_parse_lib.h"
-+#include "cfg.h"
-
- #include <string.h>
- #include <criterion/criterion.h>
-@@ -164,7 +164,8 @@ assert_proto_server_fetch_ignored_eof(LogProtoServer *proto)
- void
- init_proto_tests(void)
- {
-- init_and_load_syslogformat_module();
-+ configuration = cfg_new_snippet();
-+ cfg_load_module(configuration, "syslogformat");
- log_proto_server_options_defaults(&proto_server_options);
- }
-
-@@ -172,5 +173,7 @@ void
- deinit_proto_tests(void)
- {
- log_proto_server_options_destroy(&proto_server_options);
-- deinit_syslogformat_module();
-+
-+ if (configuration)
-+ cfg_free(configuration);
- }
-diff --git a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
-index 79a4b97ad..d4d0d45a9 100644
---- a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
-+++ b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
-@@ -31,6 +31,8 @@
-
- #include <criterion/criterion.h>
-
-+MsgFormatOptions parse_options;
-+
- static LogMessage *
- kmsg_parse_message(const gchar *raw_message_str)
- {
-diff --git a/modules/python/tests/test_python_logmsg.c b/modules/python/tests/test_python_logmsg.c
-index 9a0343b07..51651ee9d 100644
---- a/modules/python/tests/test_python_logmsg.c
-+++ b/modules/python/tests/test_python_logmsg.c
-@@ -30,6 +30,8 @@
- static PyObject *_python_main;
- static PyObject *_python_main_dict;
-
-+MsgFormatOptions parse_options;
-+
- static void
- _py_init_interpreter(void)
- {
-@@ -95,7 +97,7 @@ void setup(void)
- {
- app_startup();
-
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(&parse_options);
-
- _py_init_interpreter();
- _init_python_main();
-diff --git a/modules/stardate/tests/test_stardate.c b/modules/stardate/tests/test_stardate.c
-index e48cfb6cd..7d55fc1d0 100644
---- a/modules/stardate/tests/test_stardate.c
-+++ b/modules/stardate/tests/test_stardate.c
-@@ -33,6 +33,8 @@
-
- #include "msg_parse_lib.h"
-
-+MsgFormatOptions parse_options;
-+
- void
- stardate_assert(const gchar *msg_str, const int precision, const gchar *expected)
- {
-@@ -58,6 +60,7 @@ void
- setup(void)
- {
- app_startup();
-+ init_parse_options_and_load_syslogformat(&parse_options);
- init_template_tests();
- cfg_load_module(configuration, "stardate");
- }
-@@ -66,6 +69,7 @@ void
- teardown(void)
- {
- deinit_template_tests();
-+ deinit_syslogformat_module();
- app_shutdown();
- }
-
-diff --git a/persist-tool/add.h b/persist-tool/add.h
-index 981e0cc61..2d3524cb0 100644
---- a/persist-tool/add.h
-+++ b/persist-tool/add.h
-@@ -32,8 +32,8 @@
- #include "cfg.h"
- #include "persist-tool.h"
-
--gchar *persist_state_dir;
--gchar *persist_state_name;
-+extern gchar *persist_state_dir;
-+extern gchar *persist_state_name;
-
- gint add_main(int argc, char *argv[]);
-
-diff --git a/persist-tool/generate.h b/persist-tool/generate.h
-index 237a8ae24..34f7dfec9 100644
---- a/persist-tool/generate.h
-+++ b/persist-tool/generate.h
-@@ -32,8 +32,8 @@
- #include "persist-state.h"
- #include "cfg.h"
-
--gboolean force_generate;
--gchar *generate_output_dir;
-+extern gboolean force_generate;
-+extern gchar *generate_output_dir;
-
- gint generate_main(int argc, char *argv[]);
-
-diff --git a/persist-tool/persist-tool.c b/persist-tool/persist-tool.c
-index fd96c856d..4e4adc88f 100644
---- a/persist-tool/persist-tool.c
-+++ b/persist-tool/persist-tool.c
-@@ -135,11 +135,17 @@ void persist_tool_free(PersistTool *self)
- g_free(self);
- }
-
-+gchar *persist_state_dir;
-+gchar *persist_state_name;
-+gboolean force_generate;
-+gchar *generate_output_dir;
-+
- static GOptionEntry dump_options[] =
- {
- { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL }
- };
-
-+
- static GOptionEntry add_options[] =
- {
- { "output-dir", 'o', 0, G_OPTION_ARG_STRING, &persist_state_dir, "The directory where persist file is located.", "<directory>" },
-diff --git a/tests/unit/test_clone_logmsg.c b/tests/unit/test_clone_logmsg.c
-index 57c0b181f..7b738b1e5 100644
---- a/tests/unit/test_clone_logmsg.c
-+++ b/tests/unit/test_clone_logmsg.c
-@@ -38,6 +38,8 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+MsgFormatOptions parse_options;
-+
- void
- assert_new_log_message_attributes(LogMessage *log_message)
- {
-@@ -69,7 +71,7 @@ void
- setup(void)
- {
- app_startup();
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(&parse_options);
- }
-
- void
-diff --git a/tests/unit/test_matcher.c b/tests/unit/test_matcher.c
-index a92c8e458..d43755bea 100644
---- a/tests/unit/test_matcher.c
-+++ b/tests/unit/test_matcher.c
-@@ -31,6 +31,8 @@
- #include <stdlib.h>
- #include <string.h>
-
-+MsgFormatOptions parse_options;
-+
- static LogMessage *
- _create_log_message(const gchar *log)
- {
-@@ -128,7 +130,7 @@ void
- setup(void)
- {
- app_startup();
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(&parse_options);
- }
-
- void
-diff --git a/tests/unit/test_msgparse.c b/tests/unit/test_msgparse.c
-index 6b9e1045f..0ed91f638 100644
---- a/tests/unit/test_msgparse.c
-+++ b/tests/unit/test_msgparse.c
-@@ -49,6 +49,8 @@ struct sdata_pair
- struct sdata_pair ignore_sdata_pairs[] = { { NULL, NULL } };
- struct sdata_pair empty_sdata_pairs[] = { { NULL, NULL } };
-
-+MsgFormatOptions parse_options;
-+
- static unsigned long
- _absolute_value(signed long diff)
- {
-@@ -130,7 +132,7 @@ setup(void)
- app_startup();
- setenv("TZ", "MET-1METDST", TRUE);
- tzset();
-- init_and_load_syslogformat_module();
-+ init_parse_options_and_load_syslogformat(&parse_options);
- /* Fri Feb 8 09:37:49 CET 2019 */
- fake_time(1549615069);
- }
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
deleted file mode 100644
index fdd98624a6ea..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/lib/compat/glib.c b/lib/compat/glib.c
-index 8b6e52447..5b8ed8891 100644
---- a/lib/compat/glib.c
-+++ b/lib/compat/glib.c
-@@ -315,3 +315,18 @@ slng_g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value)
- return exists;
- }
- #endif
-+
-+
-+#if !GLIB_CHECK_VERSION(2, 64, 0)
-+gunichar
-+g_utf8_get_char_validated_fixed(const gchar *p, gssize max_len)
-+{
-+ // https://github.com/GNOME/glib/commit/1963821a57584b4674c20895e8a5adccd2d9effd
-+
-+#undef g_utf8_get_char_validated
-+ if (*p == '\0' && max_len > 0)
-+ return (gunichar)-2;
-+
-+ return g_utf8_get_char_validated(p, max_len);
-+}
-+#endif
-diff --git a/lib/compat/glib.h b/lib/compat/glib.h
-index a9782ed2d..0fbdbd12d 100644
---- a/lib/compat/glib.h
-+++ b/lib/compat/glib.h
-@@ -109,4 +109,9 @@ gchar *g_base64_encode_fixed(const guchar *data, gsize len);
- gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value);
- #endif
-
-+#if !GLIB_CHECK_VERSION(2, 64, 0)
-+#define g_utf8_get_char_validated g_utf8_get_char_validated_fixed
-+gunichar g_utf8_get_char_validated_fixed (const gchar *p, gssize max_len);
-+#endif
-+
- #endif
-diff --git a/modules/cef/tests/test-format-cef-extension.c b/modules/cef/tests/test-format-cef-extension.c
-index d7f6ee3c1..f4233f96f 100644
---- a/modules/cef/tests/test-format-cef-extension.c
-+++ b/modules/cef/tests/test-format-cef-extension.c
-@@ -104,7 +104,7 @@ Test(format_cef, test_null_in_value)
-
- configuration->template_options.on_error = ON_ERROR_DROP_MESSAGE | ON_ERROR_SILENT;
- log_msg_set_value_by_name(msg, ".cef.k", "a\0b", 3);
-- assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\u0000b", msg);
-+ assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\x00b", msg);
- log_msg_unref(msg);
- }
-
-diff --git a/modules/json/tests/test_format_json.c b/modules/json/tests/test_format_json.c
-index 92c61e9f1..1224ddb33 100644
---- a/modules/json/tests/test_format_json.c
-+++ b/modules/json/tests/test_format_json.c
-@@ -55,7 +55,7 @@ Test(format_json, test_format_json)
- assert_template_format("$(format-json MSG=$escaping)",
- "{\"MSG\":\"binary stuff follows \\\"\\\\xad árvíztűrőtükörfúrógép\"}");
- assert_template_format("$(format-json MSG=$escaping2)", "{\"MSG\":\"\\\\xc3\"}");
-- assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\u0000stuff\"}");
-+ assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\\\x00stuff\"}");
- assert_template_format_with_context("$(format-json MSG=$MSG)",
- "{\"MSG\":\"árvíztűrőtükörfúrógép\"}{\"MSG\":\"árvíztűrőtükörfúrógép\"}");
- assert_template_format("$(format-json --scope rfc3164)",
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
deleted file mode 100644
index c720da246944..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.10.1:2
- >=dev-libs/ivykis-0.42.4
- >=dev-libs/libpcre-6.1:=
- !dev-libs/eventlog
- amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
- caps? ( sys-libs/libcap )
- dbi? ( >=dev-db/libdbi-0.9.0 )
- geoip2? ( dev-libs/libmaxminddb:= )
- http? ( net-misc/curl )
- json? ( >=dev-libs/json-c-0.9:= )
- kafka? ( >=dev-libs/librdkafka-1.0.0:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
- python? ( ${PYTHON_DEPS} )
- redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( net-libs/libesmtp )
- snmp? ( net-analyzer/net-snmp )
- spoof-source? ( net-libs/libnet:1.1= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}
- test? ( dev-libs/criterion )"
-BDEPEND="
- sys-devel/flex
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
- contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
- "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-PATCHES=( "${FILESDIR}/patches/syslog-ng-glib-2.64-support.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- local f
-
- use python && python_fix_shebang .
-
- # remove bundled libs
- rm -r lib/ivykis || die
-
- # drop scl modules requiring json
- if use !json; then
- sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
- fi
-
- # drop scl modules requiring http
- if use !http; then
- sed -i -r '/slack|telegram/d' scl/Makefile.am || die
- fi
-
- # use gentoo default path
- if use systemd; then
- sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
- -i contrib/systemd/syslog-ng@default || die
- fi
-
- for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
- sed \
- -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
- "/etc/init.d/syslog-ng reload")#g" \
- "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
- done
-
- for f in syslog-ng.conf.gentoo.hardened.in \
- syslog-ng.conf.gentoo.in; do
- sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
- done
-
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --disable-docs
- --disable-java
- --disable-java-modules
- --disable-riemann
- --enable-manpages
- --localstatedir=/var/lib/syslog-ng
- --sysconfdir=/etc/syslog-ng
- --with-embedded-crypto
- --with-ivykis=system
- --with-module-dir=/usr/$(get_libdir)/syslog-ng
- --with-pidfile-dir=/var/run
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- $(use_enable amqp)
- $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
- $(use_enable caps linux-caps)
- $(use_enable dbi sql)
- $(use_enable geoip2)
- $(use_enable http)
- $(use_enable ipv6)
- $(use_enable json)
- $(use_enable kafka)
- $(use_enable mongodb)
- $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
- $(use_enable pacct)
- $(use_enable python)
- $(use_enable redis)
- $(use_enable smtp)
- $(use_enable snmp snmp-dest)
- $(use_enable spoof-source)
- $(use_enable systemd)
- $(use_enable tcpd tcp-wrapper)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- # Install default configuration
- insinto /etc/default
- doins contrib/systemd/syslog-ng@default
-
- insinto /etc/syslog-ng
- newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-
- insinto /etc/logrotate.d
- newins "${T}/syslog-ng.logrotate" syslog-ng
-
- newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
- newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
- keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
- find "${D}" -name '*.la' -delete || die
-
- use python && python_optimize
-}
-
-pkg_postinst() {
- # bug #355257
- if ! has_version app-admin/logrotate ; then
- elog "It is highly recommended that app-admin/logrotate be emerged to"
- elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
- elog "for logrotate to use."
- fi
-
- if use systemd; then
- ewarn "The service file for systemd has changed to support multiple instances."
- ewarn "To start the default instance issue:"
- ewarn "# systemctl start syslog-ng@default"
- fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
deleted file mode 100644
index 80e2a64e5b52..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.10.1:2
- >=dev-libs/ivykis-0.42.4
- >=dev-libs/libpcre-6.1:=
- !dev-libs/eventlog
- amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
- caps? ( sys-libs/libcap )
- dbi? ( >=dev-db/libdbi-0.9.0 )
- geoip2? ( dev-libs/libmaxminddb:= )
- http? ( net-misc/curl )
- json? ( >=dev-libs/json-c-0.9:= )
- kafka? ( >=dev-libs/librdkafka-1.0.0:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
- python? ( ${PYTHON_DEPS} )
- redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( net-libs/libesmtp )
- snmp? ( net-analyzer/net-snmp:0= )
- spoof-source? ( net-libs/libnet:1.1= )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
- dev-libs/openssl:0="
-DEPEND="${RDEPEND}
- test? ( dev-libs/criterion )"
-BDEPEND="
- sys-devel/flex
- virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
- contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
- "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-PATCHES=(
- "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- local f
-
- use python && python_fix_shebang .
-
- # remove bundled libs
- rm -r lib/ivykis || die
-
- # drop scl modules requiring json
- if use !json; then
- sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
- fi
-
- # drop scl modules requiring http
- if use !http; then
- sed -i -r '/slack|telegram/d' scl/Makefile.am || die
- fi
-
- # use gentoo default path
- if use systemd; then
- sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
- -i contrib/systemd/syslog-ng@default || die
- fi
-
- for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
- sed \
- -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
- "/etc/init.d/syslog-ng reload")#g" \
- "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
- done
-
- for f in syslog-ng.conf.gentoo.hardened.in \
- syslog-ng.conf.gentoo.in; do
- sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
- done
-
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- --disable-docs
- --disable-java
- --disable-java-modules
- --disable-riemann
- --enable-manpages
- --localstatedir=/var/lib/syslog-ng
- --sysconfdir=/etc/syslog-ng
- --with-embedded-crypto
- --with-ivykis=system
- --with-module-dir=/usr/$(get_libdir)/syslog-ng
- --with-pidfile-dir=/var/run
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
- $(use_enable amqp)
- $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
- $(use_enable caps linux-caps)
- $(use_enable dbi sql)
- $(use_enable geoip2)
- $(use_enable http)
- $(use_enable ipv6)
- $(use_enable json)
- $(use_enable kafka)
- $(use_enable mongodb)
- $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
- $(use_enable pacct)
- $(use_enable python)
- $(use_enable redis)
- $(use_enable smtp)
- $(use_enable snmp afsnmp)
- $(use_enable spoof-source)
- $(use_enable systemd)
- $(use_enable tcpd tcp-wrapper)
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
-
- # Install default configuration
- insinto /etc/default
- doins contrib/systemd/syslog-ng@default
-
- insinto /etc/syslog-ng
- newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-
- insinto /etc/logrotate.d
- newins "${T}/syslog-ng.logrotate" syslog-ng
-
- newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
- newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
- keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
- find "${D}" -name '*.la' -delete || die
-
- use python && python_optimize
-}
-
-pkg_postinst() {
- # bug #355257
- if ! has_version app-admin/logrotate ; then
- elog "It is highly recommended that app-admin/logrotate be emerged to"
- elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
- elog "for logrotate to use."
- fi
-
- if use systemd; then
- ewarn "The service file for systemd has changed to support multiple instances."
- ewarn "To start the default instance issue:"
- ewarn "# systemctl start syslog-ng@default"
- fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
index 80e2a64e5b52..2c85e035f7e0 100644
--- a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
python? ( ${PYTHON_DEPS} )
redis? ( >=dev-libs/hiredis-0.11.0:= )
- smtp? ( net-libs/libesmtp )
+ smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= )
snmp? ( net-analyzer/net-snmp:0= )
spoof-source? ( net-libs/libnet:1.1= )
systemd? ( sys-apps/systemd:= )
@@ -50,6 +50,7 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
PATCHES=(
"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+ "${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch
)
pkg_setup() {