CVS commit: pkgsrc/net/ucspi-tools

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Nov 26 15:52:58 UTC 2020

Added Files:
        pkgsrc/net/ucspi-tools: DESCR Makefile PLIST distinfo
        pkgsrc/net/ucspi-tools/patches: patch-Makefile patch-tlsc.c

Log Message:
Initial import of ucspi-tools, a SOCKS proxy and TLS support for UCSPI.

This package contains additional tools for UCSPI chains. It brings
support for using SOCKS proxies with clients and TLS with servers
and clients.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-tools/DESCR \
    pkgsrc/net/ucspi-tools/Makefile pkgsrc/net/ucspi-tools/PLIST \
    pkgsrc/net/ucspi-tools/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-tools/patches/patch-Makefile \
    pkgsrc/net/ucspi-tools/patches/patch-tlsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/net/ucspi-tools/DESCR
diff -u /dev/null pkgsrc/net/ucspi-tools/DESCR:1.1
--- /dev/null   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/DESCR        Thu Nov 26 15:52:58 2020
@@ -0,0 +1,3 @@
+This package contains additional tools for UCSPI chains. It brings
+support for using SOCKS proxies with clients and TLS with servers
+and clients.
Index: pkgsrc/net/ucspi-tools/Makefile
diff -u /dev/null pkgsrc/net/ucspi-tools/Makefile:1.1
--- /dev/null   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/Makefile     Thu Nov 26 15:52:58 2020
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2020/11/26 15:52:58 schmonz Exp $
+
+DISTNAME=              ucspi-tools-1.6
+CATEGORIES=            net security
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=younix/}
+GITHUB_PROJECT=                ucspi
+GITHUB_TAG=            1aa21e6bd85ec45a6bce9b570548b6f4a5b1a9ed
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              https://github.com/younix/ucspi/
+COMMENT=               SOCKS proxy and TLS support for UCSPI
+LICENSE=               isc
+
+USE_TOOLS+=            gmake pkg-config
+
+WRKSRC=                        ${WRKDIR}/ucspi-${GITHUB_TAG}
+
+INSTALL_MAKE_FLAGS+=   MANDIR=${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}
+
+.include "../../security/libressl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/ucspi-tools/PLIST
diff -u /dev/null pkgsrc/net/ucspi-tools/PLIST:1.1
--- /dev/null   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/PLIST        Thu Nov 26 15:52:58 2020
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.1 2020/11/26 15:52:58 schmonz Exp $
+bin/httppc
+bin/sockc
+bin/tlsc
+bin/tlss
+man/man1/httppc.1
+man/man1/sockc.1
+man/man1/tlsc.1
+man/man1/tlss.1
Index: pkgsrc/net/ucspi-tools/distinfo
diff -u /dev/null pkgsrc/net/ucspi-tools/distinfo:1.1
--- /dev/null   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/distinfo     Thu Nov 26 15:52:58 2020
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2020/11/26 15:52:58 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) = 229b9bf944ce88432c63e202c7c5f5898dd13a72
+SHA1 (patch-tlsc.c) = 3ae01739e614b2b8008e7bc4d5b01130edec2ff9

Index: pkgsrc/net/ucspi-tools/patches/patch-Makefile
diff -u /dev/null pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.1
--- /dev/null   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-Makefile       Thu Nov 26 15:52:58 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2020/11/26 15:52:58 schmonz Exp $
+
+Make sure libressl headers get found.
+
+--- Makefile.orig      2016-09-21 22:05:29.000000000 +0000
++++ Makefile
+@@ -6,7 +6,8 @@ TARBALL := ${DISTNAME}.tar.gz
+ DEFINES += -D_XOPEN_SOURCE=700
+ DEFINES += -D_BSD_SOURCE
+ 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
Index: pkgsrc/net/ucspi-tools/patches/patch-tlsc.c
diff -u /dev/null pkgsrc/net/ucspi-tools/patches/patch-tlsc.c:1.1
--- /dev/null   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-tlsc.c Thu Nov 26 15:52:58 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-tlsc.c,v 1.1 2020/11/26 15:52:58 schmonz Exp $
+
+Avoid non-portable execvpe().
+
+--- tlsc.c.orig        2016-09-21 22:05:29.000000000 +0000
++++ tlsc.c
+@@ -252,8 +252,8 @@ main(int argc, char *argv[], char *envp[
+ 
+               if (close(pi[PIPE_WRITE]) < 0) err(EXIT_FAILURE, "close");
+               if (close(po_read) < 0) err(EXIT_FAILURE, "close");
+-              execvpe(prog, argv, environ);
+-              err(EXIT_FAILURE, "execvpe");
++              execvp(prog, argv);
++              err(EXIT_FAILURE, "execvp");
+       default: break; /* parent */
+       }
+