ports/183700: net/sslh update to 1.15
Olivier Cochard-Labbe
olivier at cochard.me
Tue Nov 5 22:20:02 UTC 2013
>Number: 183700
>Category: ports
>Synopsis: net/sslh update to 1.15
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 05 22:20:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Olivier Cochard-Labbe
>Release: 10.0
>Organization:
>Environment:
FreeBSD orange.bsdrp.net 10.0-BETA2 FreeBSD 10.0-BETA2 #0 r257208M: Sun Oct 27 21:28:39 CET 2013 root at orange.bsdrp.net:/usr/obj/usr/local/BSDRP/BSDRP/FreeBSD/src/sys/PROD amd64
>Description:
Update net/sslh:
- upgrade to 1.15
- rc script modified for configuration file usage (with a warning if old variable detected)
- stagging support
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: net/sslh/Makefile
===================================================================
--- net/sslh/Makefile (revision 332918)
+++ net/sslh/Makefile (working copy)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= sslh
-PORTVERSION= 1.13
-PORTREVISION= 1
+PORTVERSION= 1.15
CATEGORIES= net
MASTER_SITES= http://www.rutschle.net/tech/
@@ -10,12 +9,10 @@
MAINTAINER= olivier at cochard.me
COMMENT= A ssl/ssh multiplexer
-LICENSE= GPLv2
+LICENSE= GPLv2
-DISTFILES= ${PORTNAME}-${PORTVERSION}b.tar.gz
+LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig
-LIB_DEPENDS= config:${PORTSDIR}/devel/libconfig
-
USES= gmake perl5
USE_PERL5= build
@@ -23,31 +20,32 @@
OPTIONS_DEFAULT= MANPAGES EXAMPLES
CFLAGS+= -I${LOCALBASE}/include
-MAKE_ENV+= LIBS="-L${LOCALBASE}/lib"
+LDFLAGS+= -L${LOCALBASE}/lib
-NO_STAGE= yes
+PLIST_FILES= sbin/sslh-fork \
+ sbin/sslh-select \
+ etc/sslh.conf.sample
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMANPAGES}
-MAN8= sslh.8
+PLIST_FILES+= man/man8/sslh.8.gz
.endif
USE_RC_SUBR= sslh
PORTEXAMPLES= example.cfg
-MANCOMPRESSED= yes
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${PREFIX}/sbin
- @${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${PREFIX}/sbin
- #@${MKDIR} ${VARDIR}/run/${PORTNAME}
- #@${CHOWN} -R nobody:nobody ${VARDIR}/run/${PORTNAME}
+ @${INSTALL_PROGRAM} ${WRKSRC}/sslh-fork ${STAGEDIR}${PREFIX}/sbin
+ @${INSTALL_PROGRAM} ${WRKSRC}/sslh-select ${STAGEDIR}${PREFIX}/sbin
.if ${PORT_OPTIONS:MMANPAGES}
- @${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${MANPREFIX}/man/man8
+ @${INSTALL_MAN} ${WRKSRC}/sslh.8.gz ${STAGEDIR}${MANPREFIX}/man/man8
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/basic.cfg ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
.endif
.include <bsd.port.mk>
Index: net/sslh/distinfo
===================================================================
--- net/sslh/distinfo (revision 332918)
+++ net/sslh/distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.13b.tar.gz) = e6493b53767b542652e99e64a1bceeded1d01a5e7a083fde9d67e7550f9c0eec
-SIZE (sslh-1.13b.tar.gz) = 30986
+SHA256 (sslh-1.15.tar.gz) = fc854cc5d95be2c50293e655b7427032ece74ebef1f7f0119c0fc3e207109ccd
+SIZE (sslh-1.15.tar.gz) = 33241
Index: net/sslh/files/patch-Makefile
===================================================================
--- net/sslh/files/patch-Makefile (revision 332918)
+++ net/sslh/files/patch-Makefile (working copy)
@@ -1,24 +0,0 @@
---- ./Makefile.orig 2012-06-03 02:10:16.959537483 +0200
-+++ ./Makefile 2012-06-03 02:10:20.312769958 +0200
-@@ -4,7 +4,7 @@
- USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files)
- USELIBWRAP= # Use libwrap?
- COV_TEST= # Perform test coverage?
--PREFIX=/usr/local
-+PREFIX ?=/usr/local
-
- MAN=sslh.8.gz # man page name
-
-@@ -15,10 +15,9 @@
- CFLAGS_COV=-fprofile-arcs -ftest-coverage
- endif
-
--CC = gcc
--CFLAGS=-Wall -g $(CFLAGS_COV)
-+CC ?= gcc
-+CFLAGS ?=-Wall -g $(CFLAGS_COV)
-
--LIBS=
- OBJS=common.o sslh-main.o probe.o
-
- ifneq ($(strip $(USELIBWRAP)),)
Index: net/sslh/files/sslh.in
===================================================================
--- net/sslh/files/sslh.in (revision 332918)
+++ net/sslh/files/sslh.in (working copy)
@@ -7,7 +7,6 @@
# PROVIDE: sslh
# REQUIRE: login
# KEYWORD: shutdown
-
#
# Add the following to /etc/rc.conf[.local] to enable this service
#
@@ -14,16 +13,11 @@
# sslh_enable="YES"
#
# You can fine tune others variables too:
+# You can fine tune others variables too:
# sslh_mode="fork | select"
# fork: stable but slow performance
# select: new but high performance
-# sslh_pidfile="/var/run/sslh.pid"
-# sslh_ssltarget="localhost:443"
-# sslh_sshtarget="localhost:22"
-# sslh_sshtimeout="2"
-# sslh_listening="0.0.0.0:8443"
-# sslh_uid="nobody"
-# sslh_flags
+# sslh_fib: Routing table number
sslh_precmd() {
if command -v check_namevarlist > /dev/null 2>&1; then
@@ -47,30 +41,17 @@
rcvar=sslh_enable
start_precmd="sslh_precmd"
-stop_postcmd="sslh_postcmd"
load_rc_config $name
-
sslh_enable=${sslh_enable:-"NO"}
sslh_mode=${sslh_mode:-"fork"}
-sslh_listening=${sslh_listening:-"0.0.0.0:443"}
-sslh_sshtarget=${sslh_sshtarget:-"localhost:22"}
-sslh_ssltarget=${sslh_ssltarget:-"localhost:8443"}
-sslh_sshtimeout=${sslh_sshtimeout:-"2"}
-sslh_openvpntarget=${sslh_openvpntarget:-"localhost:1193"}
-sslh_xmpptarget=${sslh_xmpptarget:-"localhost:5222"}
-sslh_tinctarget=${sslh_tinctarget:-"localhost:655"}
-pidfile=${sslh_pidfile:-"/var/run/sslh.pid"}
+required_files="%%PREFIX%%/etc/${name}.conf"
+for value in listening sshtarget ssltarget sshtimeout openvpntarget xmpptarget tinctarget;do
+ eval "[ -n \"\${sslh_${value}}\" ]" && warn "${name}_${value} no more used: Configuration file available"
+done
+
command="%%PREFIX%%/sbin/${name}-${sslh_mode}"
-command_args="-t ${sslh_sshtimeout} -p ${sslh_listening} \
- --ssh ${sslh_sshtarget} --ssl ${sslh_ssltarget} -P ${pidfile} \
- --user nobody --openvpn ${sslh_openvpntarget} \
- --xmpp ${sslh_xmpptarget} --tinc ${sslh_tinctarget}"
+command_args="-F %%PREFIX%%/etc/${name}.conf"
-sslh_postcmd()
-{
- rm -f ${pidfile}
-}
-
run_rc_command "$1"
Index: net/sslh/pkg-descr
===================================================================
--- net/sslh/pkg-descr (revision 332918)
+++ net/sslh/pkg-descr (working copy)
@@ -2,4 +2,4 @@
This makes it possible to connect to any of these servers on port 443 while
still serving HTTPS on that port.
-WWW: http://www.rutschle.net/tech/sslh.shtml
+WWW: http://www.rutschle.net/tech/sslh.shtml
Index: net/sslh/pkg-plist
===================================================================
--- net/sslh/pkg-plist (revision 332918)
+++ net/sslh/pkg-plist (working copy)
@@ -1,2 +0,0 @@
-sbin/sslh-fork
-sbin/sslh-select
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list