* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2015-12-15 3:56 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2015-12-15 3:56 UTC (permalink / raw
To: gentoo-commits
commit: 6a58b258d4077ae3f17fd08b7f867f8e308b6ada
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:47:48 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 03:48:05 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a58b258
net-misc/sslh: fix parallel build failure w/version.h usage
net-misc/sslh/files/sslh-1.17-version-deps.patch | 13 +++++++++++++
net-misc/sslh/sslh-1.17.ebuild | 6 +++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/net-misc/sslh/files/sslh-1.17-version-deps.patch b/net-misc/sslh/files/sslh-1.17-version-deps.patch
new file mode 100644
index 0000000..c05b87a
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.17-version-deps.patch
@@ -0,0 +1,13 @@
+make sure the files using version.h depend on it being generated first
+
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@
+
+ all: sslh $(MAN) echosrv
+
+-.c.o: *.h
++.c.o: *.h version.h
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+ version.h:
diff --git a/net-misc/sslh/sslh-1.17.ebuild b/net-misc/sslh/sslh-1.17.ebuild
index b6a3380..8f458c2 100644
--- a/net-misc/sslh/sslh-1.17.ebuild
+++ b/net-misc/sslh/sslh-1.17.ebuild
@@ -5,7 +5,7 @@
EAPI=5
MY_P="${PN}-v${PV}"
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
@@ -25,6 +25,10 @@ RESTRICT="test"
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-version-deps.patch
+}
+
src_compile() {
emake \
CC="$(tc-getCC)" \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2016-07-13 16:59 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2016-07-13 16:59 UTC (permalink / raw
To: gentoo-commits
commit: f51fc3240bc6f1f37736ece7f8ecfc5a242e7712
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Fri Jun 24 22:24:34 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 16:58:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51fc324
net-misc/sslh: revision bump adding systemd support
This new revision builds the systemd generator and installs the systemd service.
It also renames OPTIONS to DAEMON_OPTS in the sslh conf.d file for compatibility
with the systemd service which sources it.
Gentoo-bug: 563600
.../sslh/files/sslh-1.18-systemd-generator.patch | 26 ++++++++++
net-misc/sslh/files/sslh-1.18-version-deps.patch | 13 +++++
net-misc/sslh/files/sslh.conf.d-2 | 4 +-
net-misc/sslh/files/sslh.init.d-2 | 2 +-
net-misc/sslh/sslh-1.18-r1.ebuild | 60 ++++++++++++++++++++++
5 files changed, 102 insertions(+), 3 deletions(-)
diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
new file mode 100644
index 0000000..476de2a
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
@@ -0,0 +1,26 @@
+https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98
+--- a/Makefile
++++ b/Makefile
+@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV)
+ LIBS=
+ OBJS=common.o sslh-main.o probe.o tls.o
+
++CONDITIONAL_TARGETS=
++
+ ifneq ($(strip $(USELIBWRAP)),)
+ LIBS:=$(LIBS) -lwrap
+ CPPFLAGS+=-DLIBWRAP
+@@ -54,10 +56,11 @@ endif
+ ifneq ($(strip $(USESYSTEMD)),)
+ LIBS:=$(LIBS) -lsystemd
+ CPPFLAGS+=-DSYSTEMD
++ CONDITIONAL_TARGETS+=systemd-sslh-generator
+ endif
+
+
+-all: sslh $(MAN) echosrv
++all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
+
+ .c.o: *.h
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch
new file mode 100644
index 0000000..aa02871
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.18-version-deps.patch
@@ -0,0 +1,13 @@
+make sure the files using version.h depend on it being generated first
+
+--- a/Makefile
++++ b/Makefile
+@@ -78,7 +78,7 @@
+ systemd-sslh-generator: systemd-sslh-generator.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig
+
+-echosrv: $(OBJS) echosrv.o
++echosrv: version.h $(OBJS) echosrv.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o $(LIBS)
+
+ $(MAN): sslh.pod Makefile
diff --git a/net-misc/sslh/files/sslh.conf.d-2 b/net-misc/sslh/files/sslh.conf.d-2
index 719be7b..73d08d5 100644
--- a/net-misc/sslh/files/sslh.conf.d-2
+++ b/net-misc/sslh/files/sslh.conf.d-2
@@ -1,8 +1,8 @@
# /etc/conf.d/sslh
# Options to sslh itself. See the sslh(1) man page.
-#OPTIONS=""
+#DAEMON_OPTS=""
# Multiplexing example
# Port 44 can be used for ssh, http, and https. Drop privileges after starting.
-#OPTIONS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443 --user nobody"
+#DAEMON_OPTS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443 --user nobody"
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
index 0351f7c..b75e96f 100644
--- a/net-misc/sslh/files/sslh.init.d-2
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -8,7 +8,7 @@ start() {
start-stop-daemon --start \
--pidfile /var/run/${SVCNAME}.pid \
--exec /usr/sbin/sslh -- \
- ${OPTIONS} \
+ ${DAEMON_OPTS} \
--pidfile /var/run/${SVCNAME}.pid
eend $?
}
diff --git a/net-misc/sslh/sslh-1.18-r1.ebuild b/net-misc/sslh/sslh-1.18-r1.ebuild
new file mode 100644
index 0000000..1059a96
--- /dev/null
+++ b/net-misc/sslh/sslh-1.18-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P="${PN}-v${PV}"
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
+SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
+IUSE="caps systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ dev-libs/libconfig"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.17-version-deps.patch"
+ "${FILESDIR}/${PN}-1.18-version-deps.patch"
+ "${FILESDIR}/${PN}-1.18-systemd-generator.patch"
+)
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ USELIBCAP=$(usev caps) \
+ USELIBWRAP=$(usev tcpd) \
+ USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+ dosbin sslh-{fork,select}
+ dosym sslh-fork /usr/sbin/sslh
+ doman sslh.8.gz
+ dodoc ChangeLog README.md
+
+ newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+ newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+ if use systemd; then
+ # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+ sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+ systemd_newunit scripts/systemd.sslh.service sslh.service
+ exeinto /usr/lib/systemd/system-generators/
+ doexe systemd-sslh-generator
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2016-09-22 16:31 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2016-09-22 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 430ffc3b9d61a40ff807dfd534f4333aeae8198c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 16:30:45 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 16:31:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430ffc3b
net-misc/sslh: new patch to solve Makefile dependencies issue
Gentoo-bug: 594586
Package-Manager: portage-2.3.1
net-misc/sslh/files/sslh-1.17-version-deps.patch | 13 -------------
net-misc/sslh/files/sslh-1.18-version-deps.patch | 18 ++++++++++--------
net-misc/sslh/sslh-1.18-r1.ebuild | 1 -
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/net-misc/sslh/files/sslh-1.17-version-deps.patch b/net-misc/sslh/files/sslh-1.17-version-deps.patch
deleted file mode 100644
index c05b87a..00000000
--- a/net-misc/sslh/files/sslh-1.17-version-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make sure the files using version.h depend on it being generated first
-
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@
-
- all: sslh $(MAN) echosrv
-
--.c.o: *.h
-+.c.o: *.h version.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
- version.h:
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch
index aa02871..c6108ff 100644
--- a/net-misc/sslh/files/sslh-1.18-version-deps.patch
+++ b/net-misc/sslh/files/sslh-1.18-version-deps.patch
@@ -1,13 +1,15 @@
-make sure the files using version.h depend on it being generated first
+Make sure the files using version.h depend on it being generated first.
+
+Gentoo-bug: 594586
--- a/Makefile
+++ b/Makefile
-@@ -78,7 +78,7 @@
- systemd-sslh-generator: systemd-sslh-generator.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig
+@@ -59,7 +59,7 @@
+
+ all: sslh $(MAN) echosrv
--echosrv: $(OBJS) echosrv.o
-+echosrv: version.h $(OBJS) echosrv.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o $(LIBS)
+-.c.o: *.h
++%.o: %.c *.h version.h
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
- $(MAN): sslh.pod Makefile
+ version.h:
diff --git a/net-misc/sslh/sslh-1.18-r1.ebuild b/net-misc/sslh/sslh-1.18-r1.ebuild
index 9010070..15c62e0 100644
--- a/net-misc/sslh/sslh-1.18-r1.ebuild
+++ b/net-misc/sslh/sslh-1.18-r1.ebuild
@@ -28,7 +28,6 @@ RESTRICT="test"
S=${WORKDIR}/${MY_P}
PATCHES=(
- "${FILESDIR}/${PN}-1.17-version-deps.patch"
"${FILESDIR}/${PN}-1.18-version-deps.patch"
"${FILESDIR}/${PN}-1.18-systemd-generator.patch"
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2018-01-22 1:26 Mike Frysinger
0 siblings, 0 replies; 7+ messages in thread
From: Mike Frysinger @ 2018-01-22 1:26 UTC (permalink / raw
To: gentoo-commits
commit: 0b18aaa8782f3f5fdf89051e73be94b1b32c9487
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 01:24:13 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 01:24:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b18aaa8
net-misc/sslh: version bump to 1.19
net-misc/sslh/Manifest | 1 +
net-misc/sslh/files/sslh.init.d-3 | 8 ++++++++
net-misc/sslh/{sslh-9999.ebuild => sslh-1.19.ebuild} | 17 ++++++++++++-----
net-misc/sslh/sslh-9999.ebuild | 17 ++++++++++++-----
4 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 93816ec23f4..fa1700a73f3 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1 +1,2 @@
DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
+DIST sslh-v1.19.tar.gz 57352 BLAKE2B 004084ac726c2b0a12add00da017934aa46420370bdf0e56c19443aff0a25f232324f0140cae7a09b15e885d73fae498b8c51b4c7a3f4da219bddf4abb99b412 SHA512 851a9e89098baeeb8279298b1a04527fde80e5efb4bb64006e165479ff2d7ba24b5621a99754ff906fca8c167fc1fd0bcd4b80860c999f5b9cafa408769aa18c
diff --git a/net-misc/sslh/files/sslh.init.d-3 b/net-misc/sslh/files/sslh.init.d-3
new file mode 100755
index 00000000000..7f9d61795b7
--- /dev/null
+++ b/net-misc/sslh/files/sslh.init.d-3
@@ -0,0 +1,8 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Port multiplexer for ssh/ssl/etc..."
+command="sslh"
+pidfile="/run/${SVCNAME}.pid"
+command_args="${DAEMON_OPTS} --pidfile ${pidfile}"
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-1.19.ebuild
similarity index 86%
copy from net-misc/sslh/sslh-9999.ebuild
copy to net-misc/sslh/sslh-1.19.ebuild
index 8f3831fefa9..3c1ac5f9f7f 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-1.19.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
inherit flag-o-matic systemd toolchain-funcs
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
inherit git-r3
else
- KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
+ KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
MY_P="${PN}-v${PV}"
SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
@@ -31,6 +31,14 @@ DEPEND="${RDEPEND}
RESTRICT="test"
+src_prepare() {
+ default
+ sed -i \
+ -e '/MAN/s:| gzip -9 - >:>:' \
+ -e '/MAN=sslh.8.gz/s:.gz::' \
+ Makefile || die
+}
+
src_compile() {
# On older versions of GCC, the default gnu89 variant
# will reject within-for-loop initializers, bug #595426
@@ -51,12 +59,11 @@ src_install() {
dosbin sslh-{fork,select}
dosym sslh-fork /usr/sbin/sslh
- gunzip ${PN}.8.gz
doman ${PN}.8
dodoc ChangeLog README.md
- newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+ newinitd "${FILESDIR}"/sslh.init.d-3 sslh
newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
if use systemd; then
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 8f3831fefa9..3c1ac5f9f7f 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
inherit flag-o-matic systemd toolchain-funcs
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
inherit git-r3
else
- KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
+ KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
MY_P="${PN}-v${PV}"
SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
S=${WORKDIR}/${MY_P}
@@ -31,6 +31,14 @@ DEPEND="${RDEPEND}
RESTRICT="test"
+src_prepare() {
+ default
+ sed -i \
+ -e '/MAN/s:| gzip -9 - >:>:' \
+ -e '/MAN=sslh.8.gz/s:.gz::' \
+ Makefile || die
+}
+
src_compile() {
# On older versions of GCC, the default gnu89 variant
# will reject within-for-loop initializers, bug #595426
@@ -51,12 +59,11 @@ src_install() {
dosbin sslh-{fork,select}
dosym sslh-fork /usr/sbin/sslh
- gunzip ${PN}.8.gz
doman ${PN}.8
dodoc ChangeLog README.md
- newinitd "${FILESDIR}"/sslh.init.d-2 sslh
+ newinitd "${FILESDIR}"/sslh.init.d-3 sslh
newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
if use systemd; then
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2018-11-17 2:07 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2018-11-17 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 1e4544ef2186690c5418d2eb158670a35f5e751c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 17 02:06:35 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 17 02:07:32 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4544ef
net-misc/sslh: remove 1.18-r2
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
net-misc/sslh/Manifest | 1 -
.../sslh/files/sslh-1.18-systemd-generator.patch | 26 ---------
net-misc/sslh/files/sslh-1.18-version-deps.patch | 15 -----
net-misc/sslh/files/sslh.init.d-2 | 20 -------
net-misc/sslh/sslh-1.18-r2.ebuild | 68 ----------------------
5 files changed, 130 deletions(-)
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index cd307555d73..3d060fb02b2 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,2 +1 @@
-DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
deleted file mode 100644
index 476de2a4c1e..00000000000
--- a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98
---- a/Makefile
-+++ b/Makefile
-@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV)
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
-
-+CONDITIONAL_TARGETS=
-+
- ifneq ($(strip $(USELIBWRAP)),)
- LIBS:=$(LIBS) -lwrap
- CPPFLAGS+=-DLIBWRAP
-@@ -54,10 +56,11 @@ endif
- ifneq ($(strip $(USESYSTEMD)),)
- LIBS:=$(LIBS) -lsystemd
- CPPFLAGS+=-DSYSTEMD
-+ CONDITIONAL_TARGETS+=systemd-sslh-generator
- endif
-
-
--all: sslh $(MAN) echosrv
-+all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
-
- .c.o: *.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch
deleted file mode 100644
index c6108ffb1e9..00000000000
--- a/net-misc/sslh/files/sslh-1.18-version-deps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure the files using version.h depend on it being generated first.
-
-Gentoo-bug: 594586
-
---- a/Makefile
-+++ b/Makefile
-@@ -59,7 +59,7 @@
-
- all: sslh $(MAN) echosrv
-
--.c.o: *.h
-+%.o: %.c *.h version.h
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-
- version.h:
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
deleted file mode 100644
index 7e4b2cb578a..00000000000
--- a/net-misc/sslh/files/sslh.init.d-2
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start \
- --pidfile /var/run/${SVCNAME}.pid \
- --exec /usr/sbin/sslh -- \
- ${DAEMON_OPTS} \
- --pidfile /var/run/${SVCNAME}.pid
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --quiet --retry 20 \
- --pidfile /var/run/${SVCNAME}.pid
- eend $?
-}
diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild
deleted file mode 100644
index afc382f87c0..00000000000
--- a/net-misc/sslh/sslh-1.18-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-v${PV}"
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
-SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86"
-IUSE="caps systemd tcpd"
-
-RDEPEND="caps? ( sys-libs/libcap )
- systemd? ( sys-apps/systemd:= )
- tcpd? ( sys-apps/tcp-wrappers )
- >=dev-libs/libconfig-1.5"
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.18-version-deps.patch"
- "${FILESDIR}/${PN}-1.18-systemd-generator.patch"
-)
-
-src_compile() {
- # On older versions of GCC, the default gnu89 variant
- # will reject within-for-loop initializers, bug #595426
- # Furthermore, we need to use the gnu variant (gnu99) instead
- # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
- # to be defined.
- append-cflags -std=gnu99
-
- emake \
- CC="$(tc-getCC)" \
- USELIBCAP=$(usev caps) \
- USELIBWRAP=$(usev tcpd) \
- USESYSTEMD=$(usev systemd)
-}
-
-src_install() {
- dosbin sslh-{fork,select}
- dosym sslh-fork /usr/sbin/sslh
-
- gunzip ${PN}.8.gz
- doman ${PN}.8
-
- dodoc ChangeLog README.md
-
- newinitd "${FILESDIR}"/sslh.init.d-2 sslh
- newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
-
- if use systemd; then
- # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
- sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
- systemd_newunit scripts/systemd.sslh.service sslh.service
- exeinto /usr/lib/systemd/system-generators/
- doexe systemd-sslh-generator
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2021-08-16 3:40 Craig Andrews
0 siblings, 0 replies; 7+ messages in thread
From: Craig Andrews @ 2021-08-16 3:40 UTC (permalink / raw
To: gentoo-commits
commit: 8361d101844ec8f2587f43590d7ca7c569e728e3
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 03:39:37 2021 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 03:40:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8361d101
net-misc/sslh: libconfig 1.7.3 compatibility
Closes: https://bugs.gentoo.org/808525
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
.../sslh/files/sslh-1.21c-libconfig-1.7.3.patch | 92 ++++++++++++++++++++++
net-misc/sslh/sslh-1.21c-r3.ebuild | 77 ++++++++++++++++++
2 files changed, 169 insertions(+)
diff --git a/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch b/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch
new file mode 100644
index 00000000000..ea2a625a185
--- /dev/null
+++ b/net-misc/sslh/files/sslh-1.21c-libconfig-1.7.3.patch
@@ -0,0 +1,92 @@
+From 24e7f46a431b59043bf534eb7cdab76c4ffd595a Mon Sep 17 00:00:00 2001
+From: yrutschle <git1@rutschle.net>
+Date: Wed, 23 Jun 2021 11:48:59 +0200
+Subject: [PATCH] fix for libconfig 1.7.3 (#292)
+
+---
+ sslh-conf.c | 50 +++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 88 insertions(+), 16 deletions(-)
+
+diff --git a/sslh-conf.c b/sslh-conf.c
+index 5f55656..530ef6b 100644
+--- a/sslh-conf.c
++++ b/sslh-conf.c
+@@ -126,6 +126,14 @@ typedef int config_t;
+ return 0; \
+ }
+
++enum {
++ CONFIG_TYPE_INT,
++ CONFIG_TYPE_BOOL,
++ CONFIG_TYPE_INT64,
++ CONFIG_TYPE_FLOAT,
++ CONFIG_TYPE_STRING
++};
++
+ make_config_setting_lookup(bool);
+ make_config_setting_lookup(int);
+ make_config_setting_lookup(int64);
+@@ -134,10 +142,14 @@ make_config_setting_lookup(string);
+
+ make_config_setting_get(bool, int);
+ make_config_setting_get(int, int);
+-make_config_setting_get(int64, int);
++make_config_setting_get(int64, long long int);
+ make_config_setting_get(float, double);
+ make_config_setting_get(string, char*);
+
++config_setting_t* config_root_setting(config_t* c) {
++ return NULL;
++}
++
+ config_setting_t* config_lookup(config_t* c, const char* b) {
+ return NULL;
+ }
+@@ -146,10 +158,38 @@ void config_init(config_t* c) {
+ return;
+ }
+
++char* config_setting_name(config_setting_t* c) {
++ return NULL;
++}
++
++int config_setting_is_list(config_setting_t* c) {
++ return 0;
++}
++
++int config_setting_is_array(config_setting_t* c) {
++ return 0;
++}
++
++int config_setting_is_scalar(config_setting_t* c) {
++ return 0;
++}
++
++int config_setting_index(const config_setting_t *setting) {
++ return 0;
++}
++
+ config_setting_t* config_setting_lookup(config_setting_t* a, char* b) {
+ return NULL;
+ }
+
++int config_setting_remove(config_setting_t* cfg, char* name) {
++ return 0;
++}
++
++int config_setting_type(config_setting_t* s) {
++ return -1;
++}
++
+ int config_setting_length(config_setting_t* a) {
+ return 0;
+ }
+@@ -1792,7 +1832,7 @@ int sslhcfg_cl_parse(int argc, char* argv[], struct sslhcfg_item* cfg)
+ }
+ }
+
+- s = config_lookup(&c, "/");
++ s = config_root_setting(&c);
+
+ res = read_block(s, cfg, table_sslhcfg, &errmsg);
+ if (!res) {
diff --git a/net-misc/sslh/sslh-1.21c-r3.ebuild b/net-misc/sslh/sslh-1.21c-r3.ebuild
new file mode 100644
index 00000000000..e062ddf36ca
--- /dev/null
+++ b/net-misc/sslh/sslh-1.21c-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
+HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html"
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86"
+ SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S=${WORKDIR}/${P}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps pcre systemd tcpd"
+
+RDEPEND="caps? ( sys-libs/libcap )
+ pcre? ( dev-libs/libpcre:= )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ >=dev-libs/libconfig-1.5:="
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+PATCHES=(
+ "${FILESDIR}/${P}-libconfig-1.7.3.patch"
+)
+RESTRICT="test"
+
+src_prepare() {
+ default
+ sed -i \
+ -e '/MAN/s:| gzip -9 - >:>:' \
+ -e '/MAN=sslh.8.gz/s:.gz::' \
+ Makefile || die
+}
+
+src_compile() {
+ # On older versions of GCC, the default gnu89 variant
+ # will reject within-for-loop initializers, bug #595426
+ # Furthermore, we need to use the gnu variant (gnu99) instead
+ # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
+ # to be defined.
+ append-cflags -std=gnu99
+
+ emake \
+ CC="$(tc-getCC)" \
+ USELIBPCRE=$(usev pcre) \
+ USELIBCAP=$(usev caps) \
+ USELIBWRAP=$(usev tcpd) \
+ USESYSTEMD=$(usev systemd)
+}
+
+src_install() {
+ dosbin sslh-{fork,select}
+ dosym sslh-fork /usr/sbin/sslh
+
+ doman ${PN}.8
+
+ dodoc ChangeLog README.md
+
+ newinitd "${FILESDIR}"/sslh.init.d-3 sslh
+ newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
+
+ if use systemd; then
+ # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
+ sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
+ systemd_newunit scripts/systemd.sslh.service sslh.service
+ exeinto /usr/lib/systemd/system-generators/
+ doexe systemd-sslh-generator
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/
@ 2024-05-17 19:27 Craig Andrews
0 siblings, 0 replies; 7+ messages in thread
From: Craig Andrews @ 2024-05-17 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 2069b41a2cd93fde9598508690671175b38e1cd0
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 19:25:19 2024 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri May 17 19:27:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2069b41a
net-misc/sslh: fix systemd service installation
https://bugs.gentoo.org/932015
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
net-misc/sslh/files/sslh.service | 28 ++++++++++++++++++++++++++++
net-misc/sslh/sslh-2.1.2.ebuild | 3 +--
net-misc/sslh/sslh-9999.ebuild | 3 +--
3 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/net-misc/sslh/files/sslh.service b/net-misc/sslh/files/sslh.service
new file mode 100644
index 000000000000..9d58362220f0
--- /dev/null
+++ b/net-misc/sslh/files/sslh.service
@@ -0,0 +1,28 @@
+# /etc/systemd/system/sslh.service
+[Unit]
+Description=SSL/SSH multiplexer (fork mode) for %I
+After=network.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/sslh
+ExecStart=/usr/sbin/sslh -f $DAEMON_OPTS
+KillMode=process
+#Hardening
+PrivateTmp=true
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+SecureBits=noroot-locked
+ProtectSystem=strict
+ProtectHome=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+MountFlags=private
+NoNewPrivileges=true
+PrivateDevices=true
+RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+MemoryDenyWriteExecute=true
+DynamicUser=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/sslh/sslh-2.1.2.ebuild b/net-misc/sslh/sslh-2.1.2.ebuild
index 1a3dc9b9f8e3..efb4eb40c48d 100644
--- a/net-misc/sslh/sslh-2.1.2.ebuild
+++ b/net-misc/sslh/sslh-2.1.2.ebuild
@@ -76,8 +76,7 @@ src_install() {
if use systemd; then
# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
- sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
- systemd_newunit scripts/systemd.sslh.service sslh.service
+ systemd_newunit "${FILESDIR}/sslh.service" sslh.service
exeinto /usr/lib/systemd/system-generators/
doexe systemd-sslh-generator
fi
diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild
index 1a3dc9b9f8e3..efb4eb40c48d 100644
--- a/net-misc/sslh/sslh-9999.ebuild
+++ b/net-misc/sslh/sslh-9999.ebuild
@@ -76,8 +76,7 @@ src_install() {
if use systemd; then
# Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
- sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
- systemd_newunit scripts/systemd.sslh.service sslh.service
+ systemd_newunit "${FILESDIR}/sslh.service" sslh.service
exeinto /usr/lib/systemd/system-generators/
doexe systemd-sslh-generator
fi
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-05-17 19:27 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-22 16:31 [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/, net-misc/sslh/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2024-05-17 19:27 Craig Andrews
2021-08-16 3:40 Craig Andrews
2018-11-17 2:07 Michael Palimaka
2018-01-22 1:26 Mike Frysinger
2016-07-13 16:59 Michael Palimaka
2015-12-15 3:56 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox