* [gentoo-commits] repo/gentoo:master commit in: net-misc/spiped/, net-misc/spiped/files/
@ 2017-09-16 10:58 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2017-09-16 10:58 UTC (permalink / raw
To: gentoo-commits
commit: ae1766daedf1ac9b767fc682495a9e2ce123e800
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 10:55:34 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 10:57:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae1766da
net-misc/spiped: update initd script and avoid privilege escalation.
Gentoo-Bug: https://bugs.gentoo.org/631022
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-misc/spiped/files/spiped.initd | 39 ++++++++++-------------------
net-misc/spiped/spiped-1.6.0-r1.ebuild | 45 ++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 26 deletions(-)
diff --git a/net-misc/spiped/files/spiped.initd b/net-misc/spiped/files/spiped.initd
index 0f33ccfa9cd..ccc95ac80ad 100644
--- a/net-misc/spiped/files/spiped.initd
+++ b/net-misc/spiped/files/spiped.initd
@@ -1,13 +1,19 @@
#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-KEYFILE=${KEYFILE:="/etc/spiped/keyfile"}
-SPIPED_USER=${SPIPED_USER:="nobody"}
-PIDFILE="/run/spiped/spiped.pid"
+: ${KEYFILE:="/etc/spiped/keyfile"}
+: ${SPIPED_USER:="nobody"}
-command="spiped"
-command_args="${OPTS} -s [${SRCHOST}]:${SRCPORT} -t ${TARGETHOST}:${TARGETPORT} -k ${KEYFILE} -p ${PIDFILE}"
+command="/usr/sbin/spiped"
+command_args="${OPTS}
+ -s [${SRCHOST}]:${SRCPORT}
+ -t ${TARGETHOST}:${TARGETPORT}
+ -k ${KEYFILE}
+ -F"
+command_background="true"
+command_user="${SPIPED_USER}"
+pidfile="/run/${RC_SVCNAME}.pid"
depend() {
use net
@@ -21,25 +27,6 @@ checkconfig() {
fi
}
-start() {
+start_pre() {
checkconfig || return 1
-
- ebegin "Starting ${SVCNAME}"
- checkpath -d -o "${SPIPED_USER}" -m750 "$(dirname "${PIDFILE}")"
-
- start-stop-daemon --start \
- --user ${SPIPED_USER} \
- --pidfile ${PIDFILE} \
- --exec $command -- $command_args
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
-
- start-stop-daemon --stop \
- --pidfile ${PIDFILE}
-
- eend $?
}
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
new file mode 100644
index 00000000000..ed4c445cb51
--- /dev/null
+++ b/net-misc/spiped/spiped-1.6.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="secure pipe daemon"
+HOMEPAGE="http://www.tarsnap.com/spiped.html"
+SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+MY_PN="${PN/d/}"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+
+# Blocker added due to #548126
+RDEPEND="
+ ${DEPEND}
+ !net-mail/qlogtools"
+
+src_install() {
+ dobin "${MY_PN}/${MY_PN}"
+ dosbin "${PN}/${PN}"
+
+ doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ dodir "etc/${PN}"
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to configure spiped via its"
+ elog "configuration file located in /etc/conf.d/."
+ elog
+ elog "Please have a look at this file prior to starting up spiped!"
+ elog
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/spiped/, net-misc/spiped/files/
@ 2022-08-30 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-08-30 13:23 UTC (permalink / raw
To: gentoo-commits
commit: bff405b7df492a2e5b4e22e87f4ebec5588e1df5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 08:58:24 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 13:20:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff405b7
net-misc/spiped: drop 1.6.0-r1, 1.6.1, EAPI-6--
Closes: https://bugs.gentoo.org/867205
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/spiped/Manifest | 2 -
.../files/spiped-1.6.0-ldflags-support.patch | 22 ---------
net-misc/spiped/spiped-1.6.0-r1.ebuild | 53 ----------------------
net-misc/spiped/spiped-1.6.1.ebuild | 52 ---------------------
4 files changed, 129 deletions(-)
diff --git a/net-misc/spiped/Manifest b/net-misc/spiped/Manifest
index f45facce2784..3d0735c745f5 100644
--- a/net-misc/spiped/Manifest
+++ b/net-misc/spiped/Manifest
@@ -1,3 +1 @@
-DIST spiped-1.6.0.tgz 94431 BLAKE2B e994115d5080e4f41d57d3ef88223c7dca373320266a3fe4f0420fb7aef6ecf329fad5a409ec31f53caaeb22d86d0c3a48060758ceee28d011676a12124fc057 SHA512 9bca8e7da31b86f956a653279f9346d8270a7e28a07d30b4a7104b21fbfbd1a81410e6a7dc0827127331a8f10226d5b8d2ddaacb94c9f76ecc6d15d728ead27a
-DIST spiped-1.6.1.tgz 115055 BLAKE2B d9ee65c10b183cc8d5451adeb65a728052378811e71ee40d7e6f121c00b6003d4b21cc9402b424aac15d115cdbdc158207ef3e6c60b93fab2a4ba63257fd2f1d SHA512 ec69cb49a19e4e5705526ec74ee683ac3923412bc5ca3a45fc8268699367421cd37354ccc03c18c2d48f06cdb8a4c4bce3ef3b60934997c6770547e02e6f66ae
DIST spiped-1.6.2.tgz 142332 BLAKE2B ce9fe45223eec8bbb741eb3106b17a395347de2766c289def9897321cce9907e104b55752ff3b2c9c7deafd178aaeef1e8fa8afe82c2d25582004c8c92982df6 SHA512 d16262a3e8be876ca1ef1aac8bb38fae91f523a9af0d488eb0dfa23e0b9db795d2a021e55f31095d92f5b94e4516e30ea23f537c3b14a2f1b9871297e26cda76
diff --git a/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch b/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch
deleted file mode 100644
index e7502d539c94..000000000000
--- a/net-misc/spiped/files/spiped-1.6.0-ldflags-support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/spiped/Makefile 2020-06-11 10:21:27.592104792 -0000
-+++ b/spiped/Makefile 2020-06-11 10:21:55.028522571 -0000
-@@ -27,7 +27,7 @@
- rm -f ${PROG} ${SRCS:.c=.o}
-
- ${PROG}:${SRCS:.c=.o}
-- ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX}
-+ ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS}
-
- main.o: main.c ../libcperciva/util/asprintf.h ../libcperciva/util/daemonize.h ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../lib/util/graceful_shutdown.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h dispatch.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h
- ${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -I.. ${IDIRS} -c main.c -o main.o
---- a/spipe/Makefile 2020-06-11 10:21:19.025515816 -0000
-+++ b/spipe/Makefile 2020-06-11 10:22:17.924981556 -0000
-@@ -27,7 +27,7 @@
- rm -f ${PROG} ${SRCS:.c=.o}
-
- ${PROG}:${SRCS:.c=.o}
-- ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX}
-+ ${CC} -o ${PROG} ${SRCS:.c=.o} ${LDADD_EXTRA} ${LDADD_REQ} ${LDADD_POSIX} ${LDFLAGS}
-
- main.o: main.c ../libcperciva/events/events.h ../libcperciva/util/getopt.h ../libcperciva/util/parsenum.h ../libcperciva/util/sock.h ../libcperciva/util/warnp.h ../proto/proto_conn.h ../proto/proto_crypt.h ../libcperciva/crypto/crypto_dh.h pushbits.h
- ${CC} ${CFLAGS} ${CFLAGS_POSIX} -D_POSIX_C_SOURCE=200809L -DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" -I.. ${IDIRS} -c main.c -o main.o
diff --git a/net-misc/spiped/spiped-1.6.0-r1.ebuild b/net-misc/spiped/spiped-1.6.0-r1.ebuild
deleted file mode 100644
index ea13d092d4c8..000000000000
--- a/net-misc/spiped/spiped-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MY_PN="${PN/d/}"
-
-DEPEND="
- dev-libs/openssl:0="
-
-# Blocker added due to #548126
-RDEPEND="
- ${DEPEND}
- !net-mail/qlogtools"
-
-PATCHES=(
- "${FILESDIR}/${P}-ldflags-support.patch"
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin "${MY_PN}/${MY_PN}"
- dosbin "${PN}/${PN}"
-
- doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir "etc/${PN}"
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
diff --git a/net-misc/spiped/spiped-1.6.1.ebuild b/net-misc/spiped/spiped-1.6.1.ebuild
deleted file mode 100644
index c317aff96986..000000000000
--- a/net-misc/spiped/spiped-1.6.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="secure pipe daemon"
-HOMEPAGE="http://www.tarsnap.com/spiped.html"
-SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/d/}"
-
-DEPEND="
- dev-libs/openssl:0="
-
-# Blocker added due to #548126
-RDEPEND="
- ${DEPEND}
- !net-mail/qlogtools"
-
-# Some tests fail.
-RESTRICT="test"
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin "${MY_PN}/${MY_PN}"
- dosbin "${PN}/${PN}"
-
- doman "${MY_PN}/${MY_PN}.1" "${PN}/${PN}.1"
-
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
- dodir "etc/${PN}"
-}
-
-pkg_postinst() {
- elog
- elog "You will need to configure spiped via its"
- elog "configuration file located in /etc/conf.d/."
- elog
- elog "Please have a look at this file prior to starting up spiped!"
- elog
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-30 13:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-16 10:58 [gentoo-commits] repo/gentoo:master commit in: net-misc/spiped/, net-misc/spiped/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2022-08-30 13:23 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox