public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-admin/filebeat/files/, app-admin/filebeat/
@ 2016-10-24 11:26 Patrice Clement
  0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2016-10-24 11:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1ed462767bda5e7dcae6e78006cf150feca2d636
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 09:49:07 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 11:25:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed46276

app-admin/filebeat: new package.

Filebeat is part of the Beats family by Elasticsearch. It's a lightweight log
forwarder to Logstash & Elasticsearch.

We already have a binary version of the package in tree, but this non-binary
should eventually remove it.

Package-Manager: portage-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/2585
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-admin/filebeat/Manifest              |  1 +
 app-admin/filebeat/filebeat-1.3.1.ebuild | 46 +++++++++++++++++++++++++++++++
 app-admin/filebeat/files/filebeat.confd  | 12 ++++++++
 app-admin/filebeat/files/filebeat.initd  | 47 ++++++++++++++++++++++++++++++++
 app-admin/filebeat/metadata.xml          | 15 ++++++++++
 5 files changed, 121 insertions(+)

diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
new file mode 100644
index 00000000..d9e426f
--- /dev/null
+++ b/app-admin/filebeat/Manifest
@@ -0,0 +1 @@
+DIST filebeat-1.3.1.tar.gz 10225540 SHA256 1d8e41b42a0b2dd59403795ff07cbfd8a9a76477731c38122aa9242b47b054e0 SHA512 60f6d4ae93bb01e74311d7ccc3d367707f888f58898b89a0ea7512c96b6e1369edf7dc2afe3615df97e8c311629d9fc1e9fc2f1abe8edcbb5bc5bcf47c82107c WHIRLPOOL 608b825fa4dc99d792deb9d23672eea0e66318461adb944dc484d42edc3d3acb1cf1f65cd4024cf0437dd5e5ed088ff5b5aeec967f7efad03b82f259793410f0

diff --git a/app-admin/filebeat/filebeat-1.3.1.ebuild b/app-admin/filebeat/filebeat-1.3.1.ebuild
new file mode 100644
index 00000000..12dee30
--- /dev/null
+++ b/app-admin/filebeat/filebeat-1.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go"
+RDEPEND="!app-admin/filebeat-bin"
+
+ELASTIC="${WORKDIR}/src/github.com/elastic"
+BEATS="${ELASTIC}/beats"
+S="${BEATS}"
+
+src_unpack() {
+	mkdir -p "${ELASTIC}" || die
+	unpack ${P}.tar.gz
+	mv beats-${PV} "${BEATS}" || die
+}
+
+src_compile() {
+	cd ${BEATS}/filebeat || die
+	GOPATH="${WORKDIR}" emake
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/lib/${PN}
+
+	fperms 0750 /var/lib/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+
+	insinto /etc/${PN}
+	newins ${PN}/etc/${PN}.yml ${PN}.yml.example
+
+	dobin filebeat/filebeat
+}

diff --git a/app-admin/filebeat/files/filebeat.confd b/app-admin/filebeat/files/filebeat.confd
new file mode 100644
index 00000000..88b7408
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.confd
@@ -0,0 +1,12 @@
+# Run filebeat under this user/group
+#FILEBEAT_USER=""
+#FILEBEAT_GROUP=""
+
+# Configuration path
+#FILEBEAT_CONFIG=""
+
+# Path to state directory
+#FILEBEAT_STATEDIR=""
+
+# Additional arguments passed to filebeat
+#FILEBEAT_OPTS=""

diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
new file mode 100644
index 00000000..3eb2fca
--- /dev/null
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FILEBEAT_USER="${FILEBEAT_USER:-root}"
+FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
+FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
+FILEBEAT_STATEDIR="${FILEBEAT_STATEDIR:-/var/lib/filebeat}"
+FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
+
+command="/usr/bin/filebeat"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--user ${FILEBEAT_USER}:${FILEBEAT_GROUP} \
+	--chdir ${FILEBEAT_STATEDIR}"
+pidfile="/run/filebeat/filebeat.pid"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	if [[ ! -e ${FILEBEAT_CONFIG} ]]; then
+		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
+		return 1
+	fi
+	
+	ebegin "Checking your configuration"
+	${command} ${command_args} -configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_STATEDIR}"
+}
+
+stop() {
+	ebegin "Stopping filebeat"
+	start-stop-daemon --stop \
+		--pidfile=${pidfile} \
+		--retry=TERM/5/KILL/5
+}

diff --git a/app-admin/filebeat/metadata.xml b/app-admin/filebeat/metadata.xml
new file mode 100644
index 00000000..cd032aa
--- /dev/null
+++ b/app-admin/filebeat/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">elastic/beats</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/filebeat/files/, app-admin/filebeat/
@ 2017-01-21 13:36 Patrice Clement
  0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2017-01-21 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     6d08ccfa96f2373419a184fcaa899cfa24157243
Author:     Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Fri Jan 20 12:16:24 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 13:36:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d08ccfa

app-admin/filebeat: drop old.

Closes: https://github.com/gentoo/gentoo/pull/3561

 app-admin/filebeat/Manifest                |  2 -
 app-admin/filebeat/filebeat-1.3.1.ebuild   | 46 ---------------------
 app-admin/filebeat/filebeat-5.0.2.ebuild   | 65 ------------------------------
 app-admin/filebeat/filebeat-5.1.2.ebuild   |  4 +-
 app-admin/filebeat/files/filebeat.confd    |  7 +++-
 app-admin/filebeat/files/filebeat.confd-r1 | 15 -------
 app-admin/filebeat/files/filebeat.initd    | 15 ++++---
 app-admin/filebeat/files/filebeat.initd-r1 | 50 -----------------------
 8 files changed, 16 insertions(+), 188 deletions(-)

diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index c2718c7..c62fc44 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,3 +1 @@
-DIST filebeat-1.3.1.tar.gz 10225540 SHA256 1d8e41b42a0b2dd59403795ff07cbfd8a9a76477731c38122aa9242b47b054e0 SHA512 60f6d4ae93bb01e74311d7ccc3d367707f888f58898b89a0ea7512c96b6e1369edf7dc2afe3615df97e8c311629d9fc1e9fc2f1abe8edcbb5bc5bcf47c82107c WHIRLPOOL 608b825fa4dc99d792deb9d23672eea0e66318461adb944dc484d42edc3d3acb1cf1f65cd4024cf0437dd5e5ed088ff5b5aeec967f7efad03b82f259793410f0
-DIST filebeat-5.0.2.tar.gz 15774694 SHA256 feef1e53b978c12b3b3c552534fd666839df5d7d3b974e16636360ca6c4ab7c0 SHA512 2481ed584efda67051e59a27b45ba52039d960d6dc335d9225e2370bc71e5167f5e4e9e7cc0cb7e689c9a73d5edf27655c4764b0acb6f1422f18bfc10fc44fe9 WHIRLPOOL 82d79d09d4c138b40841227e7b4b137b262fb251ec83b736914bb4cda00837d8eedf7af01618d2a04c368cc50650121148cd507da38acce481a3f4dd93281ae8
 DIST filebeat-5.1.2.tar.gz 16512836 SHA256 7cd554f8be6b02290ebbc17c9820acde3dc59108672ced7a0cf5486faa3e23ce SHA512 f5ade54c3a2471680067fc5f6861ddcc052177c473f40d2135ba281e63172a4ba386368f77e5e4ba77b60c88ee20e5cd0095705aa3ed6e2588fda034de6b116f WHIRLPOOL 438119b4e5664ee0cff2a70b811ea4c247def4b15efdc1bcc243f157fe88669636c6465b93316adc2d774e5b4109856c54cc658bde2636393431b0f30a712f80

diff --git a/app-admin/filebeat/filebeat-1.3.1.ebuild b/app-admin/filebeat/filebeat-1.3.1.ebuild
deleted file mode 100644
index 12dee30..00000000
--- a/app-admin/filebeat/filebeat-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-lang/go"
-RDEPEND="!app-admin/filebeat-bin"
-
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
-
-src_unpack() {
-	mkdir -p "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
-}
-
-src_compile() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/lib/${PN}
-
-	fperms 0750 /var/lib/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	insinto /etc/${PN}
-	newins ${PN}/etc/${PN}.yml ${PN}.yml.example
-
-	dobin filebeat/filebeat
-}

diff --git a/app-admin/filebeat/filebeat-5.0.2.ebuild b/app-admin/filebeat/filebeat-5.0.2.ebuild
deleted file mode 100644
index 34c08b5..00000000
--- a/app-admin/filebeat/filebeat-5.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-lang/go"
-RDEPEND="!app-admin/filebeat-bin"
-
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
-
-src_unpack() {
-	mkdir -p "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
-}
-
-src_compile() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins ${PN}/{filebeat.yml,filebeat.full.yml}
-
-	insinto "/etc/${PN}"
-	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json}
-
-	exeinto "/usr/share/${PN}"
-	doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
-
-	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/5.0/upgrading.html"
-		elog ""
-		elog "The migration script:"
-		elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT%/}/usr/share/doc/${PF}/examples"
-}

diff --git a/app-admin/filebeat/filebeat-5.1.2.ebuild b/app-admin/filebeat/filebeat-5.1.2.ebuild
index 0a7c9f9..eafde7c 100644
--- a/app-admin/filebeat/filebeat-5.1.2.ebuild
+++ b/app-admin/filebeat/filebeat-5.1.2.ebuild
@@ -40,8 +40,8 @@ src_install() {
 
 	fperms 0750 /var/{lib,log}/${PN}
 
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
 
 	insinto "/usr/share/doc/${PF}/examples"
 	doins ${PN}/{filebeat.yml,filebeat.full.yml}

diff --git a/app-admin/filebeat/files/filebeat.confd b/app-admin/filebeat/files/filebeat.confd
index 88b7408..2fcf41a 100644
--- a/app-admin/filebeat/files/filebeat.confd
+++ b/app-admin/filebeat/files/filebeat.confd
@@ -5,8 +5,11 @@
 # Configuration path
 #FILEBEAT_CONFIG=""
 
-# Path to state directory
-#FILEBEAT_STATEDIR=""
+# Path to data directory
+#FILEBEAT_DATADIR=""
+
+# Path to log directory
+#FILEBEAT_LOGDIR=""
 
 # Additional arguments passed to filebeat
 #FILEBEAT_OPTS=""

diff --git a/app-admin/filebeat/files/filebeat.confd-r1 b/app-admin/filebeat/files/filebeat.confd-r1
deleted file mode 100644
index 2fcf41a..00000000
--- a/app-admin/filebeat/files/filebeat.confd-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-# Run filebeat under this user/group
-#FILEBEAT_USER=""
-#FILEBEAT_GROUP=""
-
-# Configuration path
-#FILEBEAT_CONFIG=""
-
-# Path to data directory
-#FILEBEAT_DATADIR=""
-
-# Path to log directory
-#FILEBEAT_LOGDIR=""
-
-# Additional arguments passed to filebeat
-#FILEBEAT_OPTS=""

diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
index 3eb2fca..da18022 100644
--- a/app-admin/filebeat/files/filebeat.initd
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -1,19 +1,21 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"
 FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
 FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
-FILEBEAT_STATEDIR="${FILEBEAT_STATEDIR:-/var/lib/filebeat}"
+FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}"
+FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}"
 FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
 
 command="/usr/bin/filebeat"
-command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS}"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \
+	-path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}"
 extra_commands="checkconfig"
 command_background="true"
 start_stop_daemon_args="--user ${FILEBEAT_USER}:${FILEBEAT_GROUP} \
-	--chdir ${FILEBEAT_STATEDIR}"
+	--chdir ${FILEBEAT_DATADIR}"
 pidfile="/run/filebeat/filebeat.pid"
 
 depend() {
@@ -26,7 +28,7 @@ checkconfig() {
 		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
 		return 1
 	fi
-	
+
 	ebegin "Checking your configuration"
 	${command} ${command_args} -configtest
 	eend $? "Configuration error. Please fix your configuration files."
@@ -36,7 +38,8 @@ start_pre() {
 	checkconfig || return 1
 
 	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_STATEDIR}"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}"
 }
 
 stop() {

diff --git a/app-admin/filebeat/files/filebeat.initd-r1 b/app-admin/filebeat/files/filebeat.initd-r1
deleted file mode 100644
index cec6142..00000000
--- a/app-admin/filebeat/files/filebeat.initd-r1
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-FILEBEAT_USER="${FILEBEAT_USER:-root}"
-FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
-FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
-FILEBEAT_DATADIR="${FILEBEAT_DATADIR:-/var/lib/filebeat}"
-FILEBEAT_LOGDIR="${FILEBEAT_LOGDIR:-/var/log/filebeat}"
-FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
-
-command="/usr/bin/filebeat"
-command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS} -path.config $(dirname $FILEBEAT_CONFIG) \
-	-path.data ${FILEBEAT_DATADIR} -path.home ${FILEBEAT_DATADIR} -path.logs ${FILEBEAT_LOGDIR}"
-extra_commands="checkconfig"
-command_background="true"
-start_stop_daemon_args="--user ${FILEBEAT_USER}:${FILEBEAT_GROUP} \
-	--chdir ${FILEBEAT_DATADIR}"
-pidfile="/run/filebeat/filebeat.pid"
-
-depend() {
-	use net
-	after elasticsearch
-}
-
-checkconfig() {
-	if [[ ! -e ${FILEBEAT_CONFIG} ]]; then
-		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
-		return 1
-	fi
-
-	ebegin "Checking your configuration"
-	${command} ${command_args} -configtest
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_DATADIR}"
-	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_LOGDIR}"
-}
-
-stop() {
-	ebegin "Stopping filebeat"
-	start-stop-daemon --stop \
-		--pidfile=${pidfile} \
-		--retry=TERM/5/KILL/5
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/filebeat/files/, app-admin/filebeat/
@ 2019-10-29  6:53 Joonas Niilola
  0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2019-10-29  6:53 UTC (permalink / raw
  To: gentoo-commits

commit:     ff85244f7e54995f63bdaf2ffd87d2a679501aff
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Oct 25 16:44:23 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 06:53:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff85244f

app-admin/filebeat: drop old

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13436
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-admin/filebeat/Manifest               |  5 ---
 app-admin/filebeat/filebeat-6.3.2.ebuild  | 66 ------------------------------
 app-admin/filebeat/filebeat-6.4.3.ebuild  | 66 ------------------------------
 app-admin/filebeat/filebeat-6.5.4.ebuild  | 66 ------------------------------
 app-admin/filebeat/filebeat-6.8.1.ebuild  | 67 -------------------------------
 app-admin/filebeat/filebeat-6.8.3.ebuild  | 67 -------------------------------
 app-admin/filebeat/files/filebeat.initd   |  2 +-
 app-admin/filebeat/files/filebeat.initd.1 |  2 +-
 8 files changed, 2 insertions(+), 339 deletions(-)

diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index bb36b2b1661..865b940ffaa 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,10 +1,5 @@
 DIST filebeat-5.6.13.tar.gz 18212575 BLAKE2B a0b8810523cecd1c6c87a69832c92b39fdc4cbe199eeae3c837f60b5057915e4d1ffb0fd371b3296cea398a11135b9d8da147451997514c85447722d086b8739 SHA512 fd572666858f1aeeede9e1b2074668d0bd691f58d51acd7955a3203b27d3ee850784a39e47941a570a833926a4109645eb98c24b49263276d1df475578c17efa
-DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
-DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2af1d371f88cd01144a648cd8d5488ca54447e925e9014790a836009d76be9eec9ef9b14a102287d3f4a71b852d20d SHA512 c28d9939c2082b586ddf744b4e18427096290987efd74f7ea03d2632a1cdcbc5dd2b043ee7ceeb0457098faeb52abbac57652077c518112fb65858954ee27f34
-DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
 DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
-DIST filebeat-6.8.1.tar.gz 35550017 BLAKE2B 0a1913adf2eda50884f33715a059fcc2028e31560afc5412e87d7fd3a6ed5cc504683ad3c5b28f18df24afd3e4c8d96c5b2a930411ae32d09d05c85cfdff0499 SHA512 5ff047e80099b09e25952ac7fc8ea0c6be25df2cd3b638c07c600e680fac32505c279a3a91ee2e61acf0f9535b4adb390a65f3a7dbc3599e74c6b02e0aa6ef71
-DIST filebeat-6.8.3.tar.gz 35551301 BLAKE2B ec33f0a5812e355bf2a9212daff999dfed869cd07b20ed9a8fa7c94c76e6fda291a137c5c601d9317ce3e1a34e06be241c1ce7c148f7b6e181903f88c6b1a410 SHA512 49cea2f95429feb311a15b9f247a0c627409edb1badd09d629d37a28994301e69526d5156bce72c9ed65079815f58bca41202862321edc46315e649395293632
 DIST filebeat-6.8.4.tar.gz 35552503 BLAKE2B 165edceffa71318d77363e4e8e737663eb45e5c3d20148dffd8111187eb3d07eb7998c068b3a3da315ff582f7687d75183ae9828f8b9c87d0c025d450936e00d SHA512 4739481a2ec0307804b797369050b81668f531793bdd1c72304b963e8ab4662b40820dfab211c7fdeeef5deb431f5a0e6ef2680841b4748d352ee8724b2bac42
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
 DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a

diff --git a/app-admin/filebeat/filebeat-6.3.2.ebuild b/app-admin/filebeat/filebeat-6.3.2.ebuild
deleted file mode 100644
index 1c9264bf6ec..00000000000
--- a/app-admin/filebeat/filebeat-6.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10.3"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-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() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	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/filebeat/filebeat-6.4.3.ebuild b/app-admin/filebeat/filebeat-6.4.3.ebuild
deleted file mode 100644
index 8a81429845c..00000000000
--- a/app-admin/filebeat/filebeat-6.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10.3"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-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() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	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/filebeat/filebeat-6.5.4.ebuild b/app-admin/filebeat/filebeat-6.5.4.ebuild
deleted file mode 100644
index 9c0c5d215f4..00000000000
--- a/app-admin/filebeat/filebeat-6.5.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11.2"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-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() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	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/filebeat/filebeat-6.8.1.ebuild b/app-admin/filebeat/filebeat-6.8.1.ebuild
deleted file mode 100644
index 36a7f617b67..00000000000
--- a/app-admin/filebeat/filebeat-6.8.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.5"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-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() {
-	GOPATH="${WORKDIR}" 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/filebeat/filebeat-6.8.3.ebuild b/app-admin/filebeat/filebeat-6.8.3.ebuild
deleted file mode 100644
index 0c71f0e0843..00000000000
--- a/app-admin/filebeat/filebeat-6.8.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-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() {
-	GOPATH="${WORKDIR}" 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/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
index 92b8369a41d..1d9a987c87b 100644
--- a/app-admin/filebeat/files/filebeat.initd
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"

diff --git a/app-admin/filebeat/files/filebeat.initd.1 b/app-admin/filebeat/files/filebeat.initd.1
index 2cb33ba8ebc..3bad7654d34 100644
--- a/app-admin/filebeat/files/filebeat.initd.1
+++ b/app-admin/filebeat/files/filebeat.initd.1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-29  6:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-29  6:53 [gentoo-commits] repo/gentoo:master commit in: app-admin/filebeat/files/, app-admin/filebeat/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2017-01-21 13:36 Patrice Clement
2016-10-24 11:26 Patrice Clement

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox