sslh: new package
PATCH v2 1/1 sslh: new package
---
Changes v1 -> v2:
- rewrite patch (suggested by Thomas Petazzoni). sslh version is extracted from git, but this version is corrupted if we use git as VCS for buildroot. This new patch is a more flexible way to handle this : the version is now extracted from git only if the sslh directory is handled by git
- fix comment in Config.in file (suggested by Thomas Petazzoni)
- rewrite init script (suggested by Thomas Petazzoni)
- remove sslh.default file (suggested by Thomas Petazzoni)
- fix sslh.mk file (suggested by Thomas Petazzoni)
- indentation
- version now includes "v" prefix
- fix license
- use install target of upstream makefile
- register myself as developer for sslh in DEVELOPERS file
--- DEVELOPERS | 1 + package/Config.in | 1 + ...ion-while-building-sslh-in-a-larger-git-t.patch | 43 +++++++++++++++++++ package/sslh/Config.in | 14 +++++++ package/sslh/S35sslh | 48 ++++++++++++++++++++++ package/sslh/sslh.hash | 4 ++ package/sslh/sslh.mk | 28 +++++++++++++ 7 files changed, 139 insertions(+) create mode 100644 package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch create mode 100644 package/sslh/Config.in create mode 100644 package/sslh/S35sslh create mode 100644 package/sslh/sslh.hash create mode 100644 package/sslh/sslh.mk
DEVELOPERS +1 -0
@@ -381,6 +381,7 @@ F: package/ccrypt/ F: package/dos2unix/ F: package/ipmiutil/ F: package/python-daemon/ +F: package/sslh/ F: package/udpxy/ N: David Bender <[email protected]>
package/Config.in +1 -0
@@ -1634,6 +1634,7 @@ endif source "package/spice-protocol/Config.in" source "package/squid/Config.in" source "package/sshpass/Config.in" + source "package/sslh/Config.in" source "package/strongswan/Config.in" source "package/stunnel/Config.in" source "package/tcpdump/Config.in"
package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch new file +43 -0
43 lines not on this page · raw message
package/sslh/Config.in new file +14 -0
@@ -0,0 +1,14 @@ +config BR2_PACKAGE_SSLH + bool "sslh" + depends on BR2_INSTALL_LIBSTDCPP + # uses fork() + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBCONFIG + help + Applicative protocol multiplexer + + http://www.rutschle.net/tech/sslh.shtml + +comment "sslh needs a toolchain w/ C++" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPP
package/sslh/S35sslh new file +48 -0
48 lines not on this page · raw message
package/sslh/sslh.hash new file +4 -0
@@ -0,0 +1,4 @@ +# Locally calculated +md5 0e3568d5d234516c634d4df156473298 sslh-v1.18.tar.gz +sha1 b2e3a4314f62fc8200ecfbadefebe809a84d8099 sslh-v1.18.tar.gz +sha256 1601a5b377dcafc6b47d2fbb8d4d25cceb83053a4adcc5874d501a2d5a7745ad sslh-v1.18.tar.gz
package/sslh/sslh.mk new file +28 -0
@@ -0,0 +1,28 @@ +################################################################################ +# +# sslh +# +################################################################################ + +SSLH_VERSION = v1.18 +SSLH_SITE = http://www.rutschle.net/tech +SSLH_SOURCE = sslh-$(SSLH_VERSION).tar.gz +SSLH_LICENSE = GPLv2+ +SSLH_LICENSE_FILES = COPYING + +SSLH_DEPENDENCIES = libconfig + +define SSLH_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define SSLH_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) +endef + +define SSLH_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/sslh/S35sslh $(TARGET_DIR)/etc/init.d/S35sslh +endef + +$(eval $(generic-package)) +
Signature · 1 line
2.1.4
PATCH v2 1/1 sslh: new package
Hi David,
Quoted 185 lines · David Bachelart
Signed-off-by David Bachelart <[email protected]>---
Changes v1 -> v2:
- rewrite patch (suggested by Thomas Petazzoni). sslh version is extracted from git, but this version is corrupted if we use git as VCS for buildroot. This new patch is a more flexible way to handle this : the version is now extracted from git only if the sslh directory is handled by git
- fix comment in Config.in file (suggested by Thomas Petazzoni)
- rewrite init script (suggested by Thomas Petazzoni)
- remove sslh.default file (suggested by Thomas Petazzoni)
- fix sslh.mk file (suggested by Thomas Petazzoni)
- indentation
- version now includes "v" prefix
- fix license
- use install target of upstream makefile
- register myself as developer for sslh in DEVELOPERS file--- DEVELOPERS | 1 + package/Config.in | 1 + ...ion-while-building-sslh-in-a-larger-git-t.patch | 43 +++++++++++++++++++ package/sslh/Config.in | 14 +++++++ package/sslh/S35sslh | 48 ++++++++++++++++++++++ package/sslh/sslh.hash | 4 ++ package/sslh/sslh.mk | 28 +++++++++++++ 7 files changed, 139 insertions(+) create mode 100644 package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch create mode 100644 package/sslh/Config.in create mode 100644 package/sslh/S35sslh create mode 100644 package/sslh/sslh.hash create mode 100644 package/sslh/sslh.mkDEVELOPERS +1
-0@@ -381,6 +381,7 @@ F: package/ccrypt/ F: package/dos2unix/ F: package/ipmiutil/ F: package/python-daemon/ +F: package/sslh/ F: package/udpxy/ N: David Bender <[email protected]>package/Config.in +1
-0@@ -1634,6 +1634,7 @@ endif source "package/spice-protocol/Config.in" source "package/squid/Config.in" source "package/sshpass/Config.in" + source "package/sslh/Config.in" source "package/strongswan/Config.in" source "package/stunnel/Config.in" source "package/tcpdump/Config.in"package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch new file +43
-0@@ -0,0 +1,43 @@ +From 0c39699da9a3d6534b6d26e7c9686ee76d81b64a Mon Sep 17 00:00:00 2001 +From: David Bachelart <[email protected]> +Date: Thu, 26 Jan 2017 10:07:47 +0100 +Subject: [PATCH 1/1] secure version while building sslh in a larger git tree + +sslh uses host git to extract its own version number. In buildroot, this +is an issue since extracted information is conflicting with buildroot git +status if we use git as VCS for buildroot. + +Since these git calls are legitimate only if git is used for the sslh +subtree only, this patch adds a check : a .git directory has to exist at +the root of the project to enable git-extracted version string. + +Signed-off-by: David Bachelart <[email protected]> +--- + genver.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/genver.sh b/genver.sh +index 79fd0a0..051e57b 100755 +--- a/genver.sh ++++ b/genver.sh +@@ -7,7 +7,7 @@ else + QUIET=0 + fi + +-if ! `(git status | grep -q "On branch") 2> /dev/null`; then ++if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then + # If we don't have git, we can't work out what + # version this is. It must have been downloaded as a + # zip file. +@@ -25,7 +25,7 @@ if ! `(git status | grep -q "On branch") 2> /dev/null`; then + fi + fi + +-if head=`git rev-parse --verify HEAD 2>/dev/null`; then ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then + # generate the version info based on the tag + release=`(git describe --tags || git --describe || git describe --all --long) \ + 2>/dev/null | tr -d '\n'` +-- +2.1.4 +package/sslh/Config.in new file +14
-0@@ -0,0 +1,14 @@ +config BR2_PACKAGE_SSLH + bool "sslh" + depends on BR2_INSTALL_LIBSTDCPP + # uses fork() + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBCONFIG + help + Applicative protocol multiplexer + + http://www.rutschle.net/tech/sslh.shtml + +comment "sslh needs a toolchain w/ C++" + depends on BR2_USE_MMU + depends on !BR2_INSTALL_LIBSTDCPPpackage/sslh/S35sslh new file +48
-0@@ -0,0 +1,48 @@ +#!/bin/sh +# +# Starts the SSLH server +# + +# default setup : listen on port 8090 forward ssh traffic to +# localhost:22 and http traffic to localhost:80 +SSLH_ARGS="--listen 0.0.0.0:8090 --ssh 127.0.0.1:22 --http 127.0.0.1:80" + +# Allow a few customizations from a config file (overrides +# default setup) +test -r /etc/default/sslh && . /etc/default/sslh + +start() { + SSLH_ARGS="$SSLH_ARGS --user root" + echo -n "Starting sslh: " + start-stop-daemon -S -q -p /var/run/sslh.pid \ + --exec /usr/sbin/sslh -- $SSLH_ARGS + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +stop() { + printf "Stopping sslh: " + start-stop-daemon -K -q -p /var/run/sslh.pid + [ $? = 0 ] && echo "OK" || echo "FAIL" +} + +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $?package/sslh/sslh.hash new file +0
-0
package/sslh/sslh.hash line 4
Quoted 4 lines
package/sslh/sslh.hash new file +4
-0@@ -0,0 +1,4 @@ +# Locally calculated +md5 0e3568d5d234516c634d4df156473298 sslh-v1.18.tar.gz +sha1 b2e3a4314f62fc8200ecfbadefebe809a84d8099 sslh-v1.18.tar.gz +sha256 1601a5b377dcafc6b47d2fbb8d4d25cceb83053a4adcc5874d501a2d5a7745ad sslh-v1.18.tar.gz
why so many checksums? sha256 is sufficient
Yegor
Quoted 42 lines
package/sslh/sslh.mk new file +28
-1@@ -0,0 +1,28 @@ +################################################################################ +# +# sslh +# +################################################################################ + +SSLH_VERSION = v1.18 +SSLH_SITE = http://www.rutschle.net/tech +SSLH_SOURCE = sslh-$(SSLH_VERSION).tar.gz +SSLH_LICENSE = GPLv2+ +SSLH_LICENSE_FILES = COPYING + +SSLH_DEPENDENCIES = libconfig + +define SSLH_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) +endef + +define SSLH_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) +endef + +define SSLH_INSTALL_INIT_SYSV + $(INSTALL) -m 755 -D package/sslh/S35sslh $(TARGET_DIR)/etc/init.d/S35sslh +endef + +$(eval $(generic-package)) + --2.1.4
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
PATCH v2 1/1 sslh: new package
In reply to David BachelartHello,
Quoted 17 lines · David Bachelart
Signed-off-by David Bachelart <[email protected]>---
Changes v1 -> v2:
- rewrite patch (suggested by Thomas Petazzoni). sslh version is extracted from git, but this version is corrupted if we use git as VCS for buildroot. This new patch is a more flexible way to handle this : the version is now extracted from git only if the sslh directory is handled by git
- fix comment in Config.in file (suggested by Thomas Petazzoni)
- rewrite init script (suggested by Thomas Petazzoni)
- remove sslh.default file (suggested by Thomas Petazzoni)
- fix sslh.mk file (suggested by Thomas Petazzoni)
- indentation
- version now includes "v" prefix
- fix license
- use install target of upstream makefile
- register myself as developer for sslh in DEVELOPERS file
Quoted 14 lines
--- DEVELOPERS | 1 + package/Config.in | 1 + ...ion-while-building-sslh-in-a-larger-git-t.patch | 43 +++++++++++++++++++ package/sslh/Config.in | 14 +++++++ package/sslh/S35sslh | 48 ++++++++++++++++++++++ package/sslh/sslh.hash | 4 ++ package/sslh/sslh.mk | 28 +++++++++++++ 7 files changed, 139 insertions(+) create mode 100644 package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch create mode 100644 package/sslh/Config.in create mode 100644 package/sslh/S35sslh create mode 100644 package/sslh/sslh.hash create mode 100644 package/sslh/sslh.mk
I've applied to master, after doing the following changes:
[Thomas:
- fix download location
- remove <pkg>_SOURCE variable, it was the default value
- remove trailing space
- keep only sha256 hash.]
The biggest problem was the download location: it was just wrong, and it couldn't even download the tarball.
Thanks for your contribution!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 sslh: new package
In reply to David BachelartHello,
Quoted 17 lines · David Bachelart
Signed-off-by David Bachelart <[email protected]>---
Changes v1 -> v2:
- rewrite patch (suggested by Thomas Petazzoni). sslh version is extracted from git, but this version is corrupted if we use git as VCS for buildroot. This new patch is a more flexible way to handle this : the version is now extracted from git only if the sslh directory is handled by git
- fix comment in Config.in file (suggested by Thomas Petazzoni)
- rewrite init script (suggested by Thomas Petazzoni)
- remove sslh.default file (suggested by Thomas Petazzoni)
- fix sslh.mk file (suggested by Thomas Petazzoni)
- indentation
- version now includes "v" prefix
- fix license
- use install target of upstream makefile
- register myself as developer for sslh in DEVELOPERS file
Quoted 14 lines
--- DEVELOPERS | 1 + package/Config.in | 1 + ...ion-while-building-sslh-in-a-larger-git-t.patch | 43 +++++++++++++++++++ package/sslh/Config.in | 14 +++++++ package/sslh/S35sslh | 48 ++++++++++++++++++++++ package/sslh/sslh.hash | 4 ++ package/sslh/sslh.mk | 28 +++++++++++++ 7 files changed, 139 insertions(+) create mode 100644 package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch create mode 100644 package/sslh/Config.in create mode 100644 package/sslh/S35sslh create mode 100644 package/sslh/sslh.hash create mode 100644 package/sslh/sslh.mk
This package is causing some build failures:
http://autobuild.buildroot.net/?reason=sslh-v1.18
Could you investigate and provide a fix for this issue ?
Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/1 sslh: new package
Thomas, David, All,
On 2017-02-21 21:18 +0100, Thomas Petazzoni spake thusly:
Quoted 33 lines · David Bachelart
Quoted 17 lines
Signed-off-by David Bachelart <[email protected]>---
Changes v1 -> v2:
- rewrite patch (suggested by Thomas Petazzoni). sslh version is extracted from git, but this version is corrupted if we use git as VCS for buildroot. This new patch is a more flexible way to handle this : the version is now extracted from git only if the sslh directory is handled by git
- fix comment in Config.in file (suggested by Thomas Petazzoni)
- rewrite init script (suggested by Thomas Petazzoni)
- remove sslh.default file (suggested by Thomas Petazzoni)
- fix sslh.mk file (suggested by Thomas Petazzoni)
- indentation
- version now includes "v" prefix
- fix license
- use install target of upstream makefile
- register myself as developer for sslh in DEVELOPERS fileQuoted 14 lines
--- DEVELOPERS | 1 + package/Config.in | 1 + ...ion-while-building-sslh-in-a-larger-git-t.patch | 43 +++++++++++++++++++ package/sslh/Config.in | 14 +++++++ package/sslh/S35sslh | 48 ++++++++++++++++++++++ package/sslh/sslh.hash | 4 ++ package/sslh/sslh.mk | 28 +++++++++++++ 7 files changed, 139 insertions(+) create mode 100644 package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch create mode 100644 package/sslh/Config.in create mode 100644 package/sslh/S35sslh create mode 100644 package/sslh/sslh.hash create mode 100644 package/sslh/sslh.mk
Quoted 5 lines
This package is causing some build failures:
http://autobuild.buildroot.net/?reason=sslh-v1.18
Could you investigate and provide a fix for this issue ?
The issue is caused by a UTF-* non-breaj sapce U+c2a0 on line 28 of the script genver.sh. This should be replaced by an ASCII U+20 space.
It is usually invisible in most editors. I can see it because my vim has a plugin that highlights such troll characters.
Patch incoming...
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'