initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,41 @@
|
||||
From 0d9e004d324cc030c173de04c40db51a0f22bb5c Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 15 Oct 2020 07:58:05 +0200
|
||||
Subject: [PATCH] Makefile: fix static linking with pcre
|
||||
|
||||
Static build with pcre is broken since version 1.19b and
|
||||
https://github.com/yrutschle/sslh/commit/cb90cc97ae64a445242e517847c6e44b7003eda4
|
||||
because -lpcre has been replaced by -lpcreposix which will result in
|
||||
the following static build failure:
|
||||
|
||||
/srv/storage/autobuild/run/instance-1/output-1/host/bin/mipsel-linux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -o echosrv echosrv.o probe.o common.o tls.o -lpcreposix -lconfig -lcap
|
||||
/srv/storage/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/8.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: /srv/storage/autobuild/run/instance-1/output-1/host/mipsel-buildroot-linux-uclibc/sysroot/usr/lib/libpcreposix.a(libpcreposix_la-pcreposix.o): in function `regfree':
|
||||
pcreposix.c:(.text+0x120): undefined reference to `pcre_free'
|
||||
|
||||
So append -lpcre after -lpcreposix
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/a601824fc0c205a6a940e0f9f079ce2c39840605
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/yrutschle/sslh/pull/280]
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 986cf1c..ecadc22 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -43,7 +43,7 @@ endif
|
||||
|
||||
ifneq ($(strip $(USELIBPCRE)),)
|
||||
CPPFLAGS+=-DLIBPCRE
|
||||
- LIBS:=$(LIBS) -lpcreposix
|
||||
+ LIBS:=$(LIBS) -lpcreposix -lpcre
|
||||
endif
|
||||
|
||||
ifneq ($(strip $(USELIBCONFIG)),)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_SSLH
|
||||
bool "sslh"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBCONFIG if BR2_PACKAGE_SYSTEMD
|
||||
help
|
||||
Applicative protocol multiplexer
|
||||
|
||||
http://www.rutschle.net/tech/sslh.shtml
|
||||
@@ -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 $?
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 sslh-v1.21c.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
@@ -0,0 +1,63 @@
|
||||
################################################################################
|
||||
#
|
||||
# sslh
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SSLH_VERSION = 1.21c
|
||||
SSLH_SOURCE = sslh-v$(SSLH_VERSION).tar.gz
|
||||
SSLH_SITE = http://www.rutschle.net/tech/sslh
|
||||
SSLH_LICENSE = GPL-2.0+
|
||||
SSLH_LICENSE_FILES = COPYING
|
||||
|
||||
SSLH_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBBSD),y)
|
||||
SSLH_DEPENDENCIES += libbsd
|
||||
SSLH_MAKE_OPTS += USELIBBSD=1
|
||||
else
|
||||
SSLH_MAKE_OPTS += USELIBBSD=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
SSLH_DEPENDENCIES += libcap
|
||||
SSLH_MAKE_OPTS += USELIBCAP=1
|
||||
else
|
||||
SSLH_MAKE_OPTS += USELIBCAP=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
|
||||
SSLH_DEPENDENCIES += libconfig
|
||||
SSLH_MAKE_OPTS += USELIBCONFIG=1
|
||||
else
|
||||
SSLH_MAKE_OPTS += USELIBCONFIG=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
SSLH_DEPENDENCIES += pcre
|
||||
SSLH_MAKE_OPTS += USELIBPCRE=1
|
||||
else
|
||||
SSLH_MAKE_OPTS += USELIBPCRE=
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
SSLH_DEPENDENCIES += systemd
|
||||
SSLH_MAKE_OPTS += USESYSTEMD=1
|
||||
else
|
||||
SSLH_MAKE_OPTS += USESYSTEMD=
|
||||
endif
|
||||
|
||||
define SSLH_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D)
|
||||
endef
|
||||
|
||||
define SSLH_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(SSLH_MAKE_OPTS) -C $(@D) \
|
||||
DESTDIR=$(TARGET_DIR) install
|
||||
endef
|
||||
|
||||
define SSLH_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 755 -D package/sslh/S35sslh $(TARGET_DIR)/etc/init.d/S35sslh
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user