This patch bumps the sslh package to v1.10. This update brings the following changes:
* Improved IPv4/IPv6 interoperability * XMPP support Tested and working on ar71xx. Signed-off by: Jonathan McCrohan <jmccro...@gmail.com> diff --git a/net/sslh/Makefile b/net/sslh/Makefile index 3703f90..58e90c2 100644 --- a/net/sslh/Makefile +++ b/net/sslh/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sslh -PKG_VERSION:=1.9 -PKG_RELEASE:=2 +PKG_VERSION:=1.10 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://rutschle.net/tech/ -PKG_MD5SUM:=1c0193853ef35f80e3e4b1a744832cd1 +PKG_MD5SUM:=bc34e9a4770d634633e70589c72708cc include $(INCLUDE_DIR)/package.mk diff --git a/net/sslh/files/sslh.config b/net/sslh/files/sslh.config index e4a21d1..07ed02b 100644 --- a/net/sslh/files/sslh.config +++ b/net/sslh/files/sslh.config @@ -19,6 +19,9 @@ config 'sslh' 'default' # tinc defaults to 'localhost:655' # --tinc <tinchost>:<tincport> option 'tinc' '' + # xmpp defaults to 'localhost:5222' + # --xmpp <xmpphost>:<xmppport> + option 'xmpp' '' # timeout (for ssh, then ssl is assumed) defaults to 2 # -t option 'timeout' '' diff --git a/net/sslh/files/sslh.init b/net/sslh/files/sslh.init index b30f048..5ada97b 100644 --- a/net/sslh/files/sslh.init +++ b/net/sslh/files/sslh.init @@ -31,10 +31,13 @@ start_instance() { # E) tinc parameter config_get val "${section}" tinc [ -n "${val}" ] && append args "--tinc ${val}" - # F) timeout (before a connection is considered to be SSH) + # F) xmpp parameter + config_get val "${section}" xmpp + [ -n "${val}" ] && append args "--xmpp ${val}" + # G) timeout (before a connection is considered to be SSH) config_get val "${section}" timeout [ -n "${val}" ] && append args "-t ${val}" - # G) verbose parameter + # H) verbose parameter local verbosed config_get_bool verbosed "${section}" verbose 0 [ "${verbosed}" -ne 0 ] && append args "-v" diff --git a/net/sslh/patches/001-no_sslh_select.patch b/net/sslh/patches/001-no_sslh_select.patch index 9dd4ef6..a7ba881 100644 --- a/net/sslh/patches/001-no_sslh_select.patch +++ b/net/sslh/patches/001-no_sslh_select.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -27,16 +27,12 @@ +@@ -32,16 +32,12 @@ all: sslh $(MAN) echosrv $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -c $< @@ -9,21 +9,21 @@ sslh-fork: $(OBJS) sslh-fork.o Makefile common.h $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) - strip sslh-fork + #strip sslh-fork -sslh-select: $(OBJS) sslh-select.o Makefile common.h - $(CC) $(CFLAGS) -D'VERSION=$(VERSION)' -o sslh-select sslh-select.o $(OBJS) $(LIBS) -- strip sslh-select +- #strip sslh-select - + echosrv: $(OBJS) echosrv.o + $(CC) $(CFLAGS) -o echosrv echosrv.o common.o $(LIBS) - $(MAN): sslh.pod Makefile - pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip -9 - > $(MAN) -@@ -58,7 +54,7 @@ +@@ -65,7 +61,7 @@ uninstall: update-rc.d sslh remove clean: -- rm -f sslh-fork sslh-select $(MAN) *.o -+ rm -f sslh-fork $(MAN) *.o +- rm -f sslh-fork sslh-select echosrv $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info ++ rm -f sslh-fork echosrv $(MAN) *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info tags: ctags -T *.[ch] _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
