mirror/openwrt-packages
1
0
Fork 0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-16 12:23:59 +02:00
Code Releases Activity

sslh: update to v1.22c

Browse Source 
Change notes:
	Updated Makefile package version and hash.
	Added libpcre2 dependency
	Removed USELIBPCRE make flag (no longer optional within sslh)
	Updated patch 001 to work with new sslh Makefile

Signed-off-by: Martin Moreno <fett3270@yahoo.com>
(cherry picked from commit 9b90bb37ee)
This commit is contained in:
Martin Moreno 2022-03-28 23:51:38 -07:00 committed by Josef Schlehofer
parent 1eb7076056
commit cd36b6eb8b
No known key found for this signature in database
GPG Key ID: B950216FE4329F4C
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/sslh/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sslh PKG_NAME:=sslh
PKG_VERSION:=v1.21c PKG_VERSION:=v1.22c
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/ PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/
PKG_HASH:=3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706 PKG_HASH:=8e3742d14edf4119350cfdc7bb96b89134d9218eb6d2a6e1f70891ca18a649b1
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com> PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
@ -26,7 +26,7 @@ define Package/sslh
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Routing and Redirection SUBMENU:=Routing and Redirection
TITLE:=SSL/SSH multiplexer TITLE:=SSL/SSH multiplexer
DEPENDS:=+libconfig +libcap +USE_UCLIBC:libpcre +USE_MUSL:libpcre DEPENDS:=+libconfig +libcap +libpcre2
URL:=https://rutschle.net/tech/sslh/README.html URL:=https://rutschle.net/tech/sslh/README.html
endef endef
@ -36,8 +36,7 @@ define Package/sslh/conffiles
endef endef
MAKE_FLAGS += \ MAKE_FLAGS += \
USELIBCAP=1 \ USELIBCAP=1
$(if $(CONFIG_USE_GLIBC),USELIBPCRE=,USELIBPCRE=1)
define Package/sslh/install define Package/sslh/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin

12
net/sslh/patches/001-no_sslh_select.patch
View File

@ -1,27 +1,27 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -76,7 +76,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_T @@ -70,7 +70,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_T
version.h: version.h:
./genver.sh >version.h ./genver.sh >version.h
-sslh: sslh-fork sslh-select -sslh: sslh-fork sslh-select
+sslh: sslh-fork +sslh: sslh-fork
$(OBJS): version.h $(OBJS): version.h common.h collection.h sslh-conf.h gap.h
@@ -87,10 +87,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o @@ -81,10 +81,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o
$(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS)
#strip sslh-fork #strip sslh-fork
-sslh-select: version.h $(OBJS) sslh-select.o Makefile common.h -sslh-select: version.h $(OBJS) sslh-select.o Makefile
- $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS) - $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-select sslh-select.o $(OBJS) $(LIBS)
- #strip sslh-select - #strip sslh-select
- -
systemd-sslh-generator: systemd-sslh-generator.o systemd-sslh-generator: systemd-sslh-generator.o
$(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig $(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig
@@ -127,7 +123,7 @@ distclean: clean @@ -133,7 +129,7 @@ distclean: clean
rm -f tags sslh-conf.c sslh-conf.h cscope.* rm -f tags sslh-conf.[ch] echosrv-conf.[ch] cscope.*
clean: clean:
- rm -f sslh-fork sslh-select echosrv version.h $(MAN) systemd-sslh-generator *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info - rm -f sslh-fork sslh-select echosrv version.h $(MAN) systemd-sslh-generator *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info