net-misc/felix: Version bump to 2.5.1

Install initscripts

Gentoo-Bug: 631066
Package-Manager: Portage-2.3.8, Repoman-2.3.3

3 files changed, 85 insertions, 8 deletions

diff --git a/net-misc/felix/Manifest b/net-misc/felix/Manifest
index 6f98bc2ff8a0..eab2334ce4c4 100644
--- a/net-misc/felix/Manifest
+++ b/net-misc/felix/Manifest
@@ -1,4 +1,5 @@
 DIST felix-2.5.0.tar.gz 331171 SHA256 4594486a7e9a3666b7047526a4d88a6170eac49a778dd9e197d775edf501a489 SHA512 cc9aa285aaa2bc1345b66842cd3072614ab3f0b4d852d08010424c87a34614874d0d81075c71e46ec1c5527b1f5d7db3b95a2db84858c39e8ae43276004a9f2c WHIRLPOOL 1900c53cc38f269ee0e4115803d1b82cfa13c02c65bab5c48f1f06681b9990dc4b15a3c8541bd1381fa77cfefb911d210b4a4937c04bb2313340844b3b785821
+DIST felix-2.5.1.tar.gz 331705 SHA256 56ba778f446e3e37e599446ba6d48eb21cae86057162dbefa87d0cd491e36408 SHA512 60bea2115164b0c75b08ee5011e6754a5173c5e360215b71483fac2f26f1a57223df6ccfcd226e542335be5aec886d9e4f379353f3d57f11f9ec0098b98b393c WHIRLPOOL fd245efada4aef28a885fd91c0ad5efda92684ac81c4e3122d2eb1bf777cdb255744e1748b593594976a05811ea58e1b9ed5a43df7fedf73413d3cef18d09f9d
 DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 SHA256 d80f6864af88af9a4f726d3a0ccaea30a3dd2a7c0ea3a79ab92a9987598bd9f0 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32 WHIRLPOOL 787aad3e28076b51c4904b3aaf8f01a69ce69988dc3e518c97b1a79ec8496f88b4e25ec25e89ae290935c748b3f8033f98906627ebfe2e0f6c9e489f5bffd7d6
 DIST github.com-coreos-etcd-d267ca9c184e953554257d0acdd1dc9c47d38229.tar.gz 2527242 SHA256 e457ef786235222bacb0fe2b8ccb1548d4969bb01a15c82512ea587ca38fb901 SHA512 ace63a7e909629993d1b5038460848cecc1aecb024bcb6f35738f3ad36933e564da80f7faafb9b0d6a3e9149e37d34b86913219ce068b17a8adc643aa3099d86 WHIRLPOOL 83d08ebcb058e62b73783a481e42a830c8a0fe56b14bfb2931c23943cc1caa7789dd36b2f655f9bcbbaa09d8f7c5fe81555eaf56cf3b54e7670a6f8562e8dfd6
 DIST github.com-coreos-go-systemd-2688e91251d9d8e404e86dd8f096e23b2f086958.tar.gz 28165 SHA256 fa2e609e33b7d797d64874e93c0a09a1a16b33c9dd0744fa534025a216fe8301 SHA512 29d6ee973c1752a661ee78869ff26873c2ae6684ea77612c2516b0ccfc9dd00ead885a6b87c1fb9be2ac74ae3381be1893cdb143b6fa18a19b6450f8733fe549 WHIRLPOOL 7773686904348a494664b1707a80be7d1994a343959f4e84859d2703d61574ce2d21c3c29a3b8a4193b4591eb80431efa7d0544ed70c28e4802775d92229828e
@@ -22,6 +23,7 @@ DIST github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.t
 DIST github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz 59937 SHA256 db66b04139d6629f5974735bd207a789e31a3e7af2810585c11ac4ce678217ef SHA512 7b8e91a7c094421fb0ff69f1f5f755b2551c04c2b39b298f4479e4c24101f75248a1dfec900f56fbf29ab2d0f35e13f5556bac94b5dd506d40fbbd1bd035b755 WHIRLPOOL 566af5526b6c7d109d8e411b36b49576ae001a28de768021532388bf145d7f09b7bd36443d80242488ac516035a57627bf317a85266a0a296126b1860f103977
 DIST github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz 11278 SHA256 26989379d6b8473e43a6bb4c27166a6203af361a3e86f80a047b55e6f3bcea1b SHA512 6baea01bd8d789dbbdd7fdaed28d3d9ac9f571d92e58b46c3e8896d5e9471ab36cd1925652372dd3e33db7436912deb686542bd1636b0017151cae22382d0c9e WHIRLPOOL 2e633dd9411d36208adb6fabbfa867d170d9afeb3932f43c40508aa83aee18e4251615ff8dbe5bda2aca954b262989671fb0aaa4415a9d738535b06e88638546
 DIST github.com-projectcalico-libcalico-go-fc4a3648215b9beda5d08e26d76e91f12fb45079.tar.gz 198156 SHA256 aef65d677af4e43978632d468ecd8e8ef94d361ce0a9d97c22243506df7641ac SHA512 0cab2d2d14205b184dba501fd171897117f0dbc2cb42ab121e789c20d46c3e2e6c71fcea4162646432726379322d332a841866101cf32ae51e698fdd92b54c1f WHIRLPOOL 3af6328987620c389edb0590478f5258813910ecc6ba21b42962c03ee57cd7886fdb851ea597b91b915b9c812e223c247998fb5b706555aba54f9373d109d47b
+DIST github.com-projectcalico-typha-71413e6c4e8f903f899429329cf3e38e17633ba5.tar.gz 227211 SHA256 a3a355390d9ed53b08d892823f506e423fc94451fc8215630147730fc8479974 SHA512 100d53dc3164008d6f5e701193ea1860a266e2321da585bff2a083a7853224ce866ff5cd1a64be0fd6530101bf0cc6c98fa366df331336023c4fc6f140649e6f WHIRLPOOL c55f11e51608599e3fbe65e7edfc3ad4fecd77f0bdf1d8a7434cdd8868d3e27fd81c0f8216ba3caa023b1656d79ba1245fcbee48d8750d475ab748222c4fffc3
 DIST github.com-projectcalico-typha-ec14f2716227ed72aff32691071f4b450367930a.tar.gz 226544 SHA256 fcdfc19b6ce4bbc4a5f1e180c40e51f6478de35e7a1383a64a5bac5f00f7a4a6 SHA512 1ce6b08af7e6cb40b41f719798716f21b90c6718d1789cb504e201de90d2b8124e674ab6ea3b2e274b5111bef534252419d4d208d651693c69b35b6256974ce7 WHIRLPOOL f2fb9319480b497fe24993de269f9efa902d26cc6bde89da0332f743843c3d767636c726cef753302391629a3569d383e2eb07420cfb7a3a2af9d78439fee83a
 DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 SHA256 8f8f18491440aaa688801c4e4a6117453fc8621a1ac4fdf253c1e464fb8b078d SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7 WHIRLPOOL d0722b8af87aafb041266be213e4ac1bfefe30df5736fe846b5cc0737d0461fc7e9fe4aa544f36d3e9ae18edeb5e76b075ee029062bbaaa2667e0fb3466dc365
 DIST github.com-prometheus-client_model-6f3806018612930941127f2a7c6c453ba2c527d2.tar.gz 54707 SHA256 0fb341020432aff4c4f66189c979e83bcbd394a9b897b40b154ab95419fdf520 SHA512 5991a5cdb1f1a5f6d67d325e4db37cb8b6994909bbebefdd454a4e42b08271a40b163b56191b45b8c27e5c3e6cfe430354ee13bb38643041e4a17792d59d96bf WHIRLPOOL ce8a454860f1105068cf8dce5cca9ebeeb2d9a0a12bfcd5b0ee93e6fe27b8d65891a0a42cf8917b4196492edf57cc620f6324dc7d51604648e871eaff1e3a885
diff --git a/net-misc/felix/felix-2.5.1.ebuild b/net-misc/felix/felix-2.5.1.ebuild
new file mode 100644
index 000000000000..970b4349f1b8
--- /dev/null
+++ b/net-misc/felix/felix-2.5.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+	"github.com/gavv/monotime 47d58efa69556a936a3c15eb2ed42706d968ab01"
+	"github.com/go-ini/ini 20b96f641a5ea98f2f8619ff4f3e061cff4833bd"
+	"github.com/gogo/protobuf 100ba4e885062801d56799d78530b73b178a78f3"
+	"github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14"
+	"github.com/mipearson/rfw 6f0a6f3266ba1058df9ef0c94cda1cecd2e62852"
+	"github.com/projectcalico/libcalico-go fc4a3648215b9beda5d08e26d76e91f12fb45079"
+	"github.com/coreos/etcd d267ca9c184e953554257d0acdd1dc9c47d38229"
+	"github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+	"github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+	"github.com/projectcalico/typha 71413e6c4e8f903f899429329cf3e38e17633ba5"
+	"github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
+	"github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+	"github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+	"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+	"github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+	"github.com/coreos/go-systemd 2688e91251d9d8e404e86dd8f096e23b2f086958"
+	"github.com/golang/protobuf 8616e8ee5e20a1704615e6c8d7afcdac06087a67"
+	"github.com/prometheus/client_model 6f3806018612930941127f2a7c6c453ba2c527d2"
+	"github.com/prometheus/common 61f87aac8082fa8c3c5655c7608d7478d46ac2ad"
+	"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+	"github.com/prometheus/procfs e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
+	"github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+	"github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
+	"github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+	"github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
+	"github.com/vishvananda/netns 86bef332bfc3b59b7624a600bd53009ce91a9829"
+	"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+	"golang.org/x/net 3da985ce5951d99de868be4385f21ea6c2b22f24 github.com/golang/net"
+	"golang.org/x/sys 43e60d72a8e2bd92ee98319ba9a384a0e9837c08 github.com/golang/sys"
+	"gopkg.in/go-playground/validator.v8 5f1438d3fca68893a817e4a66806cea46a9e4ebf github.com/go-playground/validator"
+	"gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
+	"k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery"
+	"k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go")
+
+inherit golang-vcs-snapshot systemd user
+
+FELIX_COMMIT="53553b4f7ff80d193e8550ee3b31704da5349d42"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Calico's per-host agent, responsible for programming routes and security policy"
+EGO_PN="github.com/projectcalico/felix"
+HOMEPAGE="https://github.com/projectcalico/felix"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-libs/protobuf-3
+	dev-go/gogo-protobuf"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	protoc --gogofaster_out=. proto/*.proto || die
+	GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o bin/calico-felix -ldflags \
+		"-X github.com/projectcalico/felix/buildinfo.GitVersion=${PV} \
+		-X github.com/projectcalico/felix/buildinfo.BuildDate=$(date -u +'%FT%T%z') \
+		-X github.com/projectcalico/felix/buildinfo.GitRevision=${FELIX_COMMIT}" "github.com/projectcalico/felix" || die
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "bin/calico-${PN}"
+	dodoc README.md
+	insinto /etc/logrotate.d
+	doins debian/calico-felix.logrotate
+	insinto /etc/felix
+	doins etc/felix.cfg.example
+	newinitd "${FILESDIR}"/felix.initd felix
+	newconfd "${FILESDIR}"/felix.confd felix
+}
diff --git a/net-misc/felix/files/felix.initd b/net-misc/felix/files/felix.initd
index cc746c50be44..92adbb10f489 100644
--- a/net-misc/felix/files/felix.initd
+++ b/net-misc/felix/files/felix.initd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Calico Felix host agent"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
 user=${user:-root}
 group=${group:-root}
 
@@ -11,14 +11,9 @@ command="/usr/bin/calico-felix"
 command_args="${command_args}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
 
 depend() {
 	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
 }