From bef76b45f480aa41209efdec09fc6bb0bfde7cbe Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 30 Sep 2023 05:40:04 +0000 Subject: Great Tcpserver Unification. Prepare for 2.6.0.0. Signed-off-by: Laurent Bercot --- package/deps.mak | 24 ++++++------------------ package/info | 2 +- package/modes | 12 ++++-------- package/targets.mak | 8 ++------ 4 files changed, 13 insertions(+), 33 deletions(-) (limited to 'package') diff --git a/package/deps.mak b/package/deps.mak index 7c919da..6144259 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -13,13 +13,9 @@ src/conn-tools/s6-getservbyname.o src/conn-tools/s6-getservbyname.lo: src/conn-t src/conn-tools/s6-ident-client.o src/conn-tools/s6-ident-client.lo: src/conn-tools/s6-ident-client.c src/include/s6-networking/ident.h src/conn-tools/s6-tcpclient.o src/conn-tools/s6-tcpclient.lo: src/conn-tools/s6-tcpclient.c src/include/s6-networking/ident.h src/conn-tools/s6-tcpserver-access.o src/conn-tools/s6-tcpserver-access.lo: src/conn-tools/s6-tcpserver-access.c src/include/s6-networking/config.h src/include/s6-networking/ident.h +src/conn-tools/s6-tcpserver-socketbinder.o src/conn-tools/s6-tcpserver-socketbinder.lo: src/conn-tools/s6-tcpserver-socketbinder.c src/conn-tools/s6-tcpserver.o src/conn-tools/s6-tcpserver.lo: src/conn-tools/s6-tcpserver.c src/include/s6-networking/config.h -src/conn-tools/s6-tcpserver4-socketbinder.o src/conn-tools/s6-tcpserver4-socketbinder.lo: src/conn-tools/s6-tcpserver4-socketbinder.c -src/conn-tools/s6-tcpserver4.o src/conn-tools/s6-tcpserver4.lo: src/conn-tools/s6-tcpserver4.c src/include/s6-networking/config.h -src/conn-tools/s6-tcpserver4d.o src/conn-tools/s6-tcpserver4d.lo: src/conn-tools/s6-tcpserver4d.c -src/conn-tools/s6-tcpserver6-socketbinder.o src/conn-tools/s6-tcpserver6-socketbinder.lo: src/conn-tools/s6-tcpserver6-socketbinder.c -src/conn-tools/s6-tcpserver6.o src/conn-tools/s6-tcpserver6.lo: src/conn-tools/s6-tcpserver6.c src/include/s6-networking/config.h -src/conn-tools/s6-tcpserver6d.o src/conn-tools/s6-tcpserver6d.lo: src/conn-tools/s6-tcpserver6d.c +src/conn-tools/s6-tcpserverd.o src/conn-tools/s6-tcpserverd.lo: src/conn-tools/s6-tcpserverd.c src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_client.lo: src/libs6net/s6net_ident_client.c src/include/s6-networking/ident.h src/libs6net/s6net_ident_error.o src/libs6net/s6net_ident_error.lo: src/libs6net/s6net_ident_error.c src/include/s6-networking/ident.h src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_get.lo: src/libs6net/s6net_ident_reply_get.c src/include/s6-networking/ident.h @@ -124,18 +120,10 @@ s6-tcpserver: EXTRA_LIBS := -lskarnet s6-tcpserver: src/conn-tools/s6-tcpserver.o s6-tcpserver-access: EXTRA_LIBS := -ls6dns -ls6 -lskarnet ${SOCKET_LIB} ${SYSCLOCK_LIB} s6-tcpserver-access: src/conn-tools/s6-tcpserver-access.o ${LIBS6NET} -s6-tcpserver4: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} -s6-tcpserver4: src/conn-tools/s6-tcpserver4.o -s6-tcpserver4-socketbinder: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} -s6-tcpserver4-socketbinder: src/conn-tools/s6-tcpserver4-socketbinder.o -s6-tcpserver4d: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} -s6-tcpserver4d: src/conn-tools/s6-tcpserver4d.o -s6-tcpserver6: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} -s6-tcpserver6: src/conn-tools/s6-tcpserver6.o -s6-tcpserver6-socketbinder: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} -s6-tcpserver6-socketbinder: src/conn-tools/s6-tcpserver6-socketbinder.o -s6-tcpserver6d: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} -s6-tcpserver6d: src/conn-tools/s6-tcpserver6d.o +s6-tcpserver-socketbinder: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} +s6-tcpserver-socketbinder: src/conn-tools/s6-tcpserver-socketbinder.o +s6-tcpserverd: EXTRA_LIBS := -lskarnet ${SOCKET_LIB} +s6-tcpserverd: src/conn-tools/s6-tcpserverd.o ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) libs6net.a.xyzzy: src/libs6net/s6net_ident_client.o src/libs6net/s6net_ident_reply_get.o src/libs6net/s6net_ident_reply_parse.o src/libs6net/s6net_ident_error.o else diff --git a/package/info b/package/info index e693bf6..8a7dd83 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6-networking -version=2.5.1.4 +version=2.6.0.0 category=net package_macro_name=S6_NETWORKING diff --git a/package/modes b/package/modes index 2327ea2..f403d4a 100644 --- a/package/modes +++ b/package/modes @@ -1,13 +1,9 @@ s6-getservbyname 0755 s6-ident-client 0755 s6-tcpclient 0755 -s6-tcpserver4 0755 -s6-tcpserver4d 0755 -s6-tcpserver4-socketbinder 0755 -s6-tcpserver6 0755 -s6-tcpserver6d 0755 -s6-tcpserver6-socketbinder 0755 s6-tcpserver 0755 +s6-tcpserver-socketbinder 0755 +s6-tcpserverd 0755 s6-tcpserver-access 0755 s6-clockadd 0700 s6-clockview 0755 @@ -16,9 +12,9 @@ s6-taiclock 0755 s6-taiclockd 0755 s6-tlsclient 0755 s6-tlsc 0755 +s6-ucspitlsc 0755 s6-tlsc-io 0755 s6-tlsserver 0755 s6-tlsd 0755 -s6-tlsd-io 0755 -s6-ucspitlsc 0755 s6-ucspitlsd 0755 +s6-tlsd-io 0755 diff --git a/package/targets.mak b/package/targets.mak index ca34bdb..120f861 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -3,12 +3,8 @@ s6-getservbyname \ s6-ident-client \ s6-tcpclient \ s6-tcpserver \ -s6-tcpserver4 \ -s6-tcpserver4d \ -s6-tcpserver4-socketbinder \ -s6-tcpserver6 \ -s6-tcpserver6d \ -s6-tcpserver6-socketbinder \ +s6-tcpserver-socketbinder \ +s6-tcpserverd \ s6-tcpserver-access \ s6-clockadd \ s6-clockview \ -- cgit v1.2.3