From 1aa90804fca6e3fc60d96d38ab995cfbe52b55f1 Mon Sep 17 00:00:00 2001 From: schmonz Date: Mon, 12 Jul 2021 21:32:49 +0000 Subject: [PATCH] Update to 1.7. From the changelog: - test: remove findport dependency - fix error message - sockc: clean up: remove unused macro, reformat usage - socks: clean up: reformat usage, add statics, spelling - tlss: Fix wrong synopsis. Spotted by Stanley Lieber. - tlss: Add option for certificate revocation lists. - tlss: Refactor error handling. - tls{s,c}: Refactor error handling. Update copyright date. - tlsc: improve manpage - README: Add description for httppc - tests: Improve OpenSSL config for tests - http_parser: Simplify lenght dependend string compare - tests: Add files for certificate revocation list testing - Makefile: Remove useless variable - httpc: Improve error handing - gitignore: add some non-tracking files - Refactor makefiles - httpc: fix spacing - http: add comment and spacing - tlsc.1: discribe -k and cleanup - remove unused printf parameter - add ftp client - remove double include - simplify envionment settings - fix spacing - simplify envitonment settings - fix copyright comments - simplify make - simplify creation of tar balls - add http server - update gitignore - simplify makefile - update gitignore - remove debug code - Use LDLIBS for linked libraries - Cleanup https - Merge pull request #8 from jspricke/ldlibs - remove useless make rules - test: run with ksh and avoid ENOENT - https: add content-length - add comment - https: handel Host: header - https: default connection is closed - https: simplify response code - test: use default ksh shell --- net/ucspi-tools/Makefile | 12 +++---- net/ucspi-tools/distinfo | 18 +++++----- net/ucspi-tools/patches/patch-Makefile | 46 +++--------------------- net/ucspi-tools/patches/patch-config.mk | 12 ------- net/ucspi-tools/patches/patch-fdprintf.c | 25 ------------- net/ucspi-tools/patches/patch-fdprintf.h | 13 ------- net/ucspi-tools/patches/patch-httppc.c | 14 -------- net/ucspi-tools/patches/patch-https.c | 17 +++++++++ net/ucspi-tools/patches/patch-tests.mk | 15 ++++++++ 9 files changed, 51 insertions(+), 121 deletions(-) delete mode 100644 net/ucspi-tools/patches/patch-config.mk delete mode 100644 net/ucspi-tools/patches/patch-fdprintf.c delete mode 100644 net/ucspi-tools/patches/patch-fdprintf.h delete mode 100644 net/ucspi-tools/patches/patch-httppc.c create mode 100644 net/ucspi-tools/patches/patch-https.c create mode 100644 net/ucspi-tools/patches/patch-tests.mk diff --git a/net/ucspi-tools/Makefile b/net/ucspi-tools/Makefile index 27f4025cb095..bbd3e87e01b3 100644 --- a/net/ucspi-tools/Makefile +++ b/net/ucspi-tools/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2020/11/30 12:41:41 nia Exp $ +# $NetBSD: Makefile,v 1.7 2021/07/12 21:32:49 schmonz Exp $ -DISTNAME= ucspi-tools-1.6 -PKGREVISION= 2 +DISTNAME= ucspi-tools-1.7 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_GITHUB:=younix/} GITHUB_PROJECT= ucspi -GITHUB_TAG= 1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed +GITHUB_TAG= 329110310c71a08a942b4a36613b6db090df65f4 MAINTAINER= schmonz@NetBSD.org HOMEPAGE= https://github.com/younix/ucspi/ @@ -18,9 +17,10 @@ CFLAGS.NetBSD+= -D_NETBSD_SOURCE USE_TOOLS+= gmake pkg-config MAKE_FILE= GNUmakefile -WRKSRC= ${WRKDIR}/ucspi-${GITHUB_TAG} - INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR} +TEST_DEPENDS+= oksh-[0-9]*:../../shells/oksh +TEST_TARGET= test + .include "../../security/libretls/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/ucspi-tools/distinfo b/net/ucspi-tools/distinfo index 0c46d01239a2..55e4fa72eda7 100644 --- a/net/ucspi-tools/distinfo +++ b/net/ucspi-tools/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.4 2020/11/30 12:41:41 nia Exp $ +$NetBSD: distinfo,v 1.5 2021/07/12 21:32:49 schmonz Exp $ -SHA1 (ucspi-tools-1.6-1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed.tar.gz) = 9c090e9105e9211e89b033b11a804999c1de06c1 -RMD160 (ucspi-tools-1.6-1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed.tar.gz) = 634ff34878c201bb9d8d72dca5ff544c717beb83 -SHA512 (ucspi-tools-1.6-1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed.tar.gz) = f9d241dc63b2c8aa3f1b51a8c9f85c9408e6f888e1d02a7504c8654eb8fa2161842319683325c0a0f74c4ca0247584dd293aa07ffbcb1e4b81c02c63058c6dec -Size (ucspi-tools-1.6-1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed.tar.gz) = 21718 bytes -SHA1 (patch-Makefile) = 03cb1edea0b8fa182833b3c411c35f3ecc74e74b -SHA1 (patch-config.mk) = d846758b9e3449b469c1b8a110bd9650ccda8321 -SHA1 (patch-fdprintf.c) = 665c1c8c99a6dd31bc227aa1f9ab4abb75fb693d -SHA1 (patch-fdprintf.h) = 68d57e66c0ce75bd0a9cdec9c5135474ff7b4cfe -SHA1 (patch-httppc.c) = 4c2c36a8b7ad4755aba2be2aaea0c9e4c045aa45 +SHA1 (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = 5e7c0c4eeacb5e3c3519676b7fd3026066528186 +RMD160 (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = bcf81a2685756e1f5e1ae1aa607c5413dc30f694 +SHA512 (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = 233464655db10580e61b094c619bb5d24ac325729c5a1f68773dfe1be862e760a1f8cd1b64171d9f419db56d56b9e2ac8597508f352ebc8cab928a2916f3fdce +Size (ucspi-tools-1.7-329110310c71a08a942b4a36613b6db090df65f4.tar.gz) = 24083 bytes +SHA1 (patch-Makefile) = 2ac060090aac2052a963f9726663b40aee369823 +SHA1 (patch-https.c) = 463319786e06e987262b0d3a3e6d7112ff115276 +SHA1 (patch-tests.mk) = 4d8444121da5c07527ed1939d86e2303cc99e49d SHA1 (patch-tlsc.c) = 3ae01739e614b2b8008e7bc4d5b01130edec2ff9 diff --git a/net/ucspi-tools/patches/patch-Makefile b/net/ucspi-tools/patches/patch-Makefile index d84cc4294c40..f020bcdfe384 100644 --- a/net/ucspi-tools/patches/patch-Makefile +++ b/net/ucspi-tools/patches/patch-Makefile @@ -1,51 +1,15 @@ -$NetBSD: patch-Makefile,v 1.4 2020/11/30 12:41:41 nia Exp $ +$NetBSD: patch-Makefile,v 1.5 2021/07/12 21:32:49 schmonz Exp $ Make sure openssl headers get found. -Use LDFLAGS so pkgsrc library paths are picked up. -Not all systems have dprintf(); use ours for portability. ---- Makefile.orig 2016-09-21 22:05:29.000000000 +0000 +--- Makefile.orig 2021-07-03 15:04:54.000000000 +0000 +++ Makefile -@@ -5,14 +5,16 @@ TARBALL := ${DISTNAME}.tar.gz +@@ -3,7 +3,7 @@ include config.mk + DISTNAME := ucspi-tools-${VERSION} + TARBALL := ${DISTNAME}.tar.gz - DEFINES += -D_XOPEN_SOURCE=700 - DEFINES += -D_BSD_SOURCE -+DEFINES += -Ddprintf=fdprintf - CFLAGS_SSL=`pkg-config --cflags libssl` -LIBS_TLS ?= -ltls `pkg-config --libs libssl` -+CFLAGS += $(CFLAGS_SSL) +LIBS_TLS ?= -ltls `pkg-config --libs libssl openssl` - LIBS_SSL = `pkg-config --libs libssl openssl` .PHONY: all test clean install .SUFFIXES: .c .o - --all: sockc tlsc tlss httppc httpc -+all: sockc tlsc tlss httppc - - # SOCKS 5 - sockc: sockc.o -@@ -28,18 +30,18 @@ http_parser.o: http_parser.h - httpc: httpc.o http_parser.o - $(CC) -o $@ httpc.o http_parser.o - --httppc: httppc.o http_parser.o -- $(CC) -o $@ httppc.o http_parser.o -+httppc: httppc.o http_parser.o fdprintf.o -+ $(CC) -o $@ httppc.o http_parser.o fdprintf.o - - # SSL/TLS - tlsc: tlsc.o -- $(CC) -o tlsc tlsc.o $(LIBS_TLS) $(LIBS_BSD) -+ $(CC) $(LDFLAGS) -o tlsc tlsc.o $(LIBS_TLS) $(LIBS_BSD) - - tlss: tlss.o -- $(CC) -o tlss tlss.o $(LIBS_TLS) $(LIBS_BSD) -+ $(CC) $(LDFLAGS) -o tlss tlss.o $(LIBS_TLS) $(LIBS_BSD) - - sslc: sslc.o -- $(CC) -o sslc sslc.o $(LIBS_SSL) $(LIBS_BSD) -+ $(CC) $(LDFLAGS) -o sslc sslc.o $(LIBS_SSL) $(LIBS_BSD) - - sslc.o: sslc.c - $(CC) $(CFLAGS) $(DEFINES) `pkg-config --cflags libssl` -o $@ -c sslc.c diff --git a/net/ucspi-tools/patches/patch-config.mk b/net/ucspi-tools/patches/patch-config.mk deleted file mode 100644 index fabc3c6f20a4..000000000000 --- a/net/ucspi-tools/patches/patch-config.mk +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-config.mk,v 1.1 2020/11/30 12:41:41 nia Exp $ - -Honor CFLAGS from pkgsrc. - ---- config.mk.orig 2016-09-21 22:05:29.000000000 +0000 -+++ config.mk -@@ -8,4 +8,4 @@ VERSION = 1.5 - - # compiler - CC = cc --CFLAGS = -std=c99 -pedantic -Wall -Wextra -g -+CFLAGS += -std=c99 -pedantic -Wall -Wextra diff --git a/net/ucspi-tools/patches/patch-fdprintf.c b/net/ucspi-tools/patches/patch-fdprintf.c deleted file mode 100644 index 61234e12f3c3..000000000000 --- a/net/ucspi-tools/patches/patch-fdprintf.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-fdprintf.c,v 1.2 2020/11/27 13:48:25 schmonz Exp $ - -Not all systems have dprintf(). - ---- fdprintf.c.orig 2020-11-27 13:14:12.000000000 +0000 -+++ fdprintf.c -@@ -0,0 +1,18 @@ -+#include -+#include -+#include -+ -+static FILE *f; -+ -+int fdprintf(int fd, const char *fmt, ...) { -+ va_list ap; -+ int rc; -+ -+ f = fdopen(fd, "w"); -+ if (f == NULL) return -1; -+ -+ va_start(ap, fmt); -+ rc = vfprintf(f, fmt, ap); -+ va_end(ap); -+ return rc; -+} diff --git a/net/ucspi-tools/patches/patch-fdprintf.h b/net/ucspi-tools/patches/patch-fdprintf.h deleted file mode 100644 index 0bae819ec407..000000000000 --- a/net/ucspi-tools/patches/patch-fdprintf.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-fdprintf.h,v 1.1 2020/11/27 11:34:17 schmonz Exp $ - -Not all systems have dprintf(). - ---- fdprintf.h.orig 2020-11-27 11:04:59.176728537 +0000 -+++ fdprintf.h -@@ -0,0 +1,6 @@ -+#ifndef FDPRINTF_H -+#define FDPRINTF_H -+ -+int fdprintf(int, const char *, ...); -+ -+#endif diff --git a/net/ucspi-tools/patches/patch-httppc.c b/net/ucspi-tools/patches/patch-httppc.c deleted file mode 100644 index 567732ae77b3..000000000000 --- a/net/ucspi-tools/patches/patch-httppc.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-httppc.c,v 1.1 2020/11/27 11:34:17 schmonz Exp $ - -Use our dprintf() for portability. - ---- httppc.c.orig 2016-09-21 22:05:29.000000000 +0000 -+++ httppc.c -@@ -21,6 +21,7 @@ - #include - #include - -+#include "fdprintf.h" - #include "http_parser.h" - - #define READ_FD 6 diff --git a/net/ucspi-tools/patches/patch-https.c b/net/ucspi-tools/patches/patch-https.c new file mode 100644 index 000000000000..bdbaff5595c5 --- /dev/null +++ b/net/ucspi-tools/patches/patch-https.c @@ -0,0 +1,17 @@ +$NetBSD: patch-https.c,v 1.1 2021/07/12 21:32:49 schmonz Exp $ + +Provide a fallback definition on at least macOS Big Sur. + +--- https.c.orig 2021-07-03 15:04:54.000000000 +0000 ++++ https.c +@@ -32,6 +32,10 @@ + exit(EXIT_SUCCESS); \ + } while (0) + ++#if !defined(HOST_NAME_MAX) ++#define HOST_NAME_MAX sysconf(_SC_HOST_NAME_MAX) ++#endif ++ + int + main(void) + { diff --git a/net/ucspi-tools/patches/patch-tests.mk b/net/ucspi-tools/patches/patch-tests.mk new file mode 100644 index 000000000000..e99b0f214641 --- /dev/null +++ b/net/ucspi-tools/patches/patch-tests.mk @@ -0,0 +1,15 @@ +$NetBSD: patch-tests.mk,v 1.1 2021/07/12 21:32:49 schmonz Exp $ + +Explicitly run tests under OpenBSD ksh. + +--- tests.mk.orig 2021-07-03 15:04:54.000000000 +0000 ++++ tests.mk +@@ -3,7 +3,7 @@ + KEYLEN=4096 + + test: tcps tcpc tlss tlsc server.crt client.crt ca.crt +- ./test.sh ++ oksh ./test.sh + + # create server key ############################################################ + client.key: