diff --git a/net/sslh/Makefile b/net/sslh/Makefile index 78dec9776179..97534a3902a7 100644 --- a/net/sslh/Makefile +++ b/net/sslh/Makefile @@ -1,54 +1,58 @@ PORTNAME= sslh -PORTVERSION= 1.22c +PORTVERSION= 2.1.2 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org COMMENT= SSL/SSH multiplexer WWW= https://www.rutschle.net/tech/sslh.shtml LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libconfig.so:devel/libconfig \ - libpcre2-8.so:devel/pcre2 + libpcre2-8.so:devel/pcre2 \ + libev.so:devel/libev USES= gmake USE_RC_SUBR= sslh USE_GITHUB= yes GH_ACCOUNT= yrutschle +GNU_CONFIGURE= yes + OPTIONS_DEFINE= EXAMPLES LIBWRAP OPTIONS_DEFAULT=LIBWRAP LIBWRAP_MAKE_ENV= USELIBWRAP=1 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib PLIST_FILES= sbin/sslh-fork \ sbin/sslh-select \ + sbin/sslh-ev \ "@sample etc/sslh.conf.sample" \ share/man/man8/sslh.8.gz PORTEXAMPLES= example.cfg test.cfg udp.cfg post-patch: @${REINPLACE_CMD} -Ee 's,/etc/init.d/(sslh),${PREFIX}/etc/rc.d/\1,g; \ s,/etc/default/(sslh),${PREFIX}/etc/\1.conf,g' \ ${WRKSRC}/sslh.pod do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${STAGEDIR}${PREFIX}/sbin ${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/sslh-ev ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/basic.cfg \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${STAGEDIR}${PREFIX}/share/man/man8 do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} \ ${STAGEDIR}${EXAMPLESDIR}/ .include diff --git a/net/sslh/distinfo b/net/sslh/distinfo index 3916f5c1905b..5de5c4801228 100644 --- a/net/sslh/distinfo +++ b/net/sslh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641747765 -SHA256 (yrutschle-sslh-v1.22c_GH0.tar.gz) = ec5f6998f90b2849d113f2617db7ceca5281fbe4ef55fcd185789d390c09eb04 -SIZE (yrutschle-sslh-v1.22c_GH0.tar.gz) = 146954 +TIMESTAMP = 1716822781 +SHA256 (yrutschle-sslh-v2.1.2_GH0.tar.gz) = 7ffafaffbc006bb9d9af4015a10f15982ed182ea2a454a917bdbeb5f04e27a90 +SIZE (yrutschle-sslh-v2.1.2_GH0.tar.gz) = 214091 diff --git a/net/sslh/files/sslh.in b/net/sslh/files/sslh.in index 7722da39b29a..9b7dcb5c7e55 100644 --- a/net/sslh/files/sslh.in +++ b/net/sslh/files/sslh.in @@ -1,56 +1,57 @@ #!/bin/sh # sslh startup script # PROVIDE: sslh # REQUIRE: LOGIN FILESYSTEMS ldconfig sshd # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service: # sslh_enable="YES" # # You can fine tune other variables too: -# sslh_mode="fork | select" +# sslh_mode="fork | select | ev" # fork: stable but slow performance -# select: new but high performance +# select: higher performance, few hundreds of connections +# ev: uses libev as a backend, thousands of connections # sslh_fib: routing table number sslh_precmd() { if command -v check_namevarlist > /dev/null 2>&1; then check_namevarlist fib && return 0 fi sysctl net.fibs > /dev/null 2>&1 || return 0 sslh_fib=${sslh_fib:-"NONE"} case "$sslh_fib" in [Nn][Oo][Nn][Ee]) ;; *) command="setfib -F ${sslh_fib} ${command}" ;; esac } . /etc/rc.subr name="sslh" rcvar=sslh_enable start_precmd="sslh_precmd" load_rc_config $name sslh_enable=${sslh_enable:-"NO"} sslh_mode=${sslh_mode:-"fork"} required_files="%%PREFIX%%/etc/${name}.conf" for value in listening openvpntarget sshtarget sshtimeout ssltarget \ tinctarget xmpptarget; do eval "[ -n \"\${sslh_${value}}\" ]" && \ warn "${name}_${value} no longer used: configuration file available" done command="%%PREFIX%%/sbin/${name}-${sslh_mode}" command_args="-F%%PREFIX%%/etc/${name}.conf" run_rc_command "$1"