public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/
@ 2020-05-20  1:16 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2020-05-20  1:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f222e2771a3bd2a794bb5e9816e15b17464d14c1
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed May 20 01:08:29 2020 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed May 20 01:08:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f222e277

net-misc/exabgp: fix tmpfiles

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/exabgp/files/exabgp.tmpfiles | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-misc/exabgp/files/exabgp.tmpfiles b/net-misc/exabgp/files/exabgp.tmpfiles
index 7415d342e27..15836294400 100644
--- a/net-misc/exabgp/files/exabgp.tmpfiles
+++ b/net-misc/exabgp/files/exabgp.tmpfiles
@@ -1,3 +1,3 @@
-f	/run/exabgp		0755	exabgp	exabgp	-	-
-p	/run/exabgp.in	0600	exabgp	exabgp	-	-
-p	/run/exabgp.out 0600	exabgp	exabgp	-	-
+f	/run/exabgp			0755	exabgp	exabgp	-	-
+p	/run/exabgp//exabgp.in		0600	exabgp	exabgp	-	-
+p	/run/exabgp/exabgp.out		0600	exabgp	exabgp	-	-


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/
@ 2021-05-14 23:49 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2021-05-14 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     374b9fbaf268c9e47dd5c0c07dedb8d705c41318
Author:     Victor Payno <victor.payno <AT> sony <DOT> com>
AuthorDate: Fri May 14 22:52:28 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri May 14 23:49:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374b9fba

net-misc/exabgp: fix capsh usage

- --uid and --gid need numeric values

- using --gid or --groups results in "Failed to setgroups." if it is
  placed afgter --uid or --user. setgroups needs to happen before the
  user is changed to non-root.

Signed-off-by: Victor Payno <victor.payno <AT> sony.com>
Closes: https://github.com/gentoo/gentoo/pull/20811
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/exabgp/files/exabgp.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/exabgp/files/exabgp.initd b/net-misc/exabgp/files/exabgp.initd
index e220108d826..c3e3d93a494 100644
--- a/net-misc/exabgp/files/exabgp.initd
+++ b/net-misc/exabgp/files/exabgp.initd
@@ -7,8 +7,8 @@
 
 command="capsh"
 command_args="
-	--uid=${EXABGP_USER:-exabgp}
-	--gid=${EXABGP_GROUP:-exabgp}
+	--groups=${EXABGP_GROUP:=exabgp}
+	--user=${EXABGP_USER:-exabgp}
 	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
 	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
 command_background="yes"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/
@ 2021-05-15  1:38 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2021-05-15  1:38 UTC (permalink / raw
  To: gentoo-commits

commit:     0620655ffbcb29faa53cb9c50f5c0b072644e689
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Sat May 15 01:38:12 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat May 15 01:38:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0620655f

net-misc/exabgp: Fix up initd-r1 as well

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/exabgp/files/exabgp.initd-r1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
index ec2f01704b8..070a9bf0725 100644
--- a/net-misc/exabgp/files/exabgp.initd-r1
+++ b/net-misc/exabgp/files/exabgp.initd-r1
@@ -7,8 +7,8 @@
 
 command="capsh"
 command_args="
-	--uid=${EXABGP_USER:=exabgp}
-	--gid=${EXABGP_GROUP:=exabgp}
+	--groups=${EXABGP_GROUP:=exabgp}
+	--user=${EXABGP_USER:-exabgp}
 	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
 	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/
@ 2021-05-17 17:42 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2021-05-17 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     a44841f0657a55467c51c9b04143ca26eb33b3e5
Author:     Victor Payno <victor.payno <AT> sony <DOT> com>
AuthorDate: Sat May 15 19:26:20 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon May 17 17:42:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a44841f0

net-misc/exabgp: fix typo in --user assignment in initd scripts

Signed-off-by: Victor Payno <victor.payno <AT> sony.com>
Closes: https://github.com/gentoo/gentoo/pull/20853
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/exabgp/files/exabgp.initd    | 2 +-
 net-misc/exabgp/files/exabgp.initd-r1 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/exabgp/files/exabgp.initd b/net-misc/exabgp/files/exabgp.initd
index c3e3d93a494..c3bbcf1247e 100644
--- a/net-misc/exabgp/files/exabgp.initd
+++ b/net-misc/exabgp/files/exabgp.initd
@@ -8,7 +8,7 @@
 command="capsh"
 command_args="
 	--groups=${EXABGP_GROUP:=exabgp}
-	--user=${EXABGP_USER:-exabgp}
+	--user=${EXABGP_USER:=exabgp}
 	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
 	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
 command_background="yes"

diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
index 070a9bf0725..1d942d85025 100644
--- a/net-misc/exabgp/files/exabgp.initd-r1
+++ b/net-misc/exabgp/files/exabgp.initd-r1
@@ -8,7 +8,7 @@
 command="capsh"
 command_args="
 	--groups=${EXABGP_GROUP:=exabgp}
-	--user=${EXABGP_USER:-exabgp}
+	--user=${EXABGP_USER:=exabgp}
 	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
 	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/
@ 2022-07-18 17:33 Patrick McLean
  0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2022-07-18 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ffc4d5d79fd487c931b6a0982c4b59a282879088
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun 29 09:01:13 2022 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 17:33:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc4d5d7

net-misc/exabgp: remove unused file

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26134
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 net-misc/exabgp/files/exabgp.initd-r1 | 64 -----------------------------------
 1 file changed, 64 deletions(-)

diff --git a/net-misc/exabgp/files/exabgp.initd-r1 b/net-misc/exabgp/files/exabgp.initd-r1
deleted file mode 100644
index 1d942d850253..000000000000
--- a/net-misc/exabgp/files/exabgp.initd-r1
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# default arguments
-: "${EXABGP_ARGS:=--env=/etc/${RC_SVCNAME}/exabgp.env /etc/${RC_SVCNAME}/exabgp.conf}"
-
-command="capsh"
-command_args="
-	--groups=${EXABGP_GROUP:=exabgp}
-	--user=${EXABGP_USER:=exabgp}
-	--caps='cap_net_admin+epi cap_setuid+ep-i cap_setgid+ep-i'
-	-- -c \"/usr/bin/exabgp ${EXABGP_ARGS}\""
-
-supervisor=supervise-daemon
-
-: "${pidfile:=/run/exabgp/${RC_SVCNAME}-supervisor.pid}"
-: "${output_log:=/var/log/${RC_SVCNAME}/exabgp.log}"
-: "${error_log:=/var/log/${RC_SVCNAME}/exabgp.log}"
-
-extra_started_commands="routes sessions"
-extra_commands="checkconfig"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
-		/run/exabgp || return
-
-	checkpath -q -p -m 0600 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
-		/run/exabgp/${RC_SVCNAME}.{in,out} || return
-
-	checkpath -q -d -m 0755 -o "${EXABGP_USER}:${EXABGP_GROUP}" \
-		"/var/log/${RC_SVCNAME}" || return
-
-	checkconfig || return
-}
-
-stop_pre() {
-	# don't restart if the configuration is bad
-	if [ "${RC_CMD}" = restart ]; then
-		checkconfig || return
-	fi
-}
-
-checkconfig() {
-	ebegin "Checking configuration for ${RC_SVCNAME}"
-	exabgp -t ${EXABGP_ARGS}
-	eend ${?} "Invalid configuration"
-}
-
-sessions() {
-	ebegin "Querying sessions"
-	exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show neighbor summary
-	eend ${?} "exabgpcli failed"
-}
-
-routes() {
-	ebegin "Querying routes"
-	exabgpcli --env /etc/${RC_SVCNAME}/exabgp.env show adj-rib out
-	eend ${?} "exabgpcli failed"
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-07-18 17:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-14 23:49 [gentoo-commits] repo/gentoo:master commit in: net-misc/exabgp/files/ Patrick McLean
  -- strict thread matches above, loose matches on Subject: below --
2022-07-18 17:33 Patrick McLean
2021-05-17 17:42 Patrick McLean
2021-05-15  1:38 Patrick McLean
2020-05-20  1:16 Patrick McLean

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