head	1.6;
access;
symbols
	pkgsrc-2026Q1:1.6.0.8
	pkgsrc-2026Q1-base:1.6
	pkgsrc-2025Q4:1.6.0.6
	pkgsrc-2025Q4-base:1.6
	pkgsrc-2025Q3:1.6.0.4
	pkgsrc-2025Q3-base:1.6
	pkgsrc-2025Q2:1.6.0.2
	pkgsrc-2025Q2-base:1.6
	pkgsrc-2025Q1:1.5.0.30
	pkgsrc-2025Q1-base:1.5
	pkgsrc-2024Q4:1.5.0.28
	pkgsrc-2024Q4-base:1.5
	pkgsrc-2024Q3:1.5.0.26
	pkgsrc-2024Q3-base:1.5
	pkgsrc-2024Q2:1.5.0.24
	pkgsrc-2024Q2-base:1.5
	pkgsrc-2024Q1:1.5.0.22
	pkgsrc-2024Q1-base:1.5
	pkgsrc-2023Q4:1.5.0.20
	pkgsrc-2023Q4-base:1.5
	pkgsrc-2023Q3:1.5.0.18
	pkgsrc-2023Q3-base:1.5
	pkgsrc-2023Q2:1.5.0.16
	pkgsrc-2023Q2-base:1.5
	pkgsrc-2023Q1:1.5.0.14
	pkgsrc-2023Q1-base:1.5
	pkgsrc-2022Q4:1.5.0.12
	pkgsrc-2022Q4-base:1.5
	pkgsrc-2022Q3:1.5.0.10
	pkgsrc-2022Q3-base:1.5
	pkgsrc-2022Q2:1.5.0.8
	pkgsrc-2022Q2-base:1.5
	pkgsrc-2022Q1:1.5.0.6
	pkgsrc-2022Q1-base:1.5
	pkgsrc-2021Q4:1.5.0.4
	pkgsrc-2021Q4-base:1.5
	pkgsrc-2021Q3:1.5.0.2
	pkgsrc-2021Q3-base:1.5
	pkgsrc-2021Q2:1.4.0.6
	pkgsrc-2021Q2-base:1.4
	pkgsrc-2021Q1:1.4.0.4
	pkgsrc-2021Q1-base:1.4
	pkgsrc-2020Q4:1.4.0.2
	pkgsrc-2020Q4-base:1.4;
locks; strict;
comment	@# @;


1.6
date	2025.06.27.17.25.00;	author schmonz;	state Exp;
branches;
next	1.5;
commitid	l9dJG42uqAmomy0G;

1.5
date	2021.07.12.21.32.49;	author schmonz;	state Exp;
branches;
next	1.4;
commitid	tQIhPRN9qFS8dK0D;

1.4
date	2020.11.30.12.41.41;	author nia;	state Exp;
branches;
next	1.3;
commitid	q4Ib0zVes7A1tUxC;

1.3
date	2020.11.27.13.48.25;	author schmonz;	state Exp;
branches;
next	1.2;
commitid	J9Ekf991kCtcWwxC;

1.2
date	2020.11.27.11.34.17;	author schmonz;	state Exp;
branches;
next	1.1;
commitid	rDlwWHGQad0ccwxC;

1.1
date	2020.11.26.15.52.58;	author schmonz;	state Exp;
branches;
next	;
commitid	ynqwCNb7U1kNEpxC;


desc
@@


1.6
log
@ucspi-tools: update a few commits to fix SmartOS. Bump PKGREVISION.

(Still packages on NetBSD and macOS.)

Changes:

- Change MAX_PATH to pathconf("/", _PC_PATH_MAX)
  for systems without MAX_PATH in their libc.
- remove useless environment code
- implementation of dprintf(3) for libc's that missing it
- move dprintf into an own file for httpc and httppc
- Makefile: Compile tcps and tcpc
- test.sh: Rewrite to be more clear on what it found
- test: Remove env.txt between tests
- test: Add test to make sure certs for tests are set up
- Fix number of expected tests.
- remove unused variable
- print program path on execvp error
@
text
@$NetBSD: patch-Makefile,v 1.5 2021/07/12 21:32:49 schmonz Exp $

Make sure openssl headers get found.

--- Makefile.orig	2023-09-20 18:48:11.000000000 +0000
+++ Makefile
@@@@ -3,7 +3,7 @@@@ include config.mk
 DISTNAME := ucspi-tools-${VERSION}
 TARBALL := ${DISTNAME}.tar.gz
 
-LIBS_TLS ?= -ltls `pkg-config --libs libssl`
+LIBS_TLS ?= -ltls `pkg-config --libs libssl openssl`
 
 .PHONY: all test clean install
 .SUFFIXES: .c .o
@@@@ -50,10 +50,10 @@@@ clean:
 install: all
 	mkdir -p ${BINDIR}
 	mkdir -p ${MAN1DIR}
-	install -m 775 sockc ${BINDIR}
-	install -m 775 tlsc ${BINDIR}
-	install -m 775 tlss ${BINDIR}
-	install -m 775 httppc ${BINDIR}
+	${BSD_INSTALL_PROGRAM} sockc ${BINDIR}
+	${BSD_INSTALL_PROGRAM} tlsc ${BINDIR}
+	${BSD_INSTALL_PROGRAM} tlss ${BINDIR}
+	${BSD_INSTALL_PROGRAM} httppc ${BINDIR}
 	install -m 444 sockc.1 ${MAN1DIR}
 	install -m 444 tlsc.1 ${MAN1DIR}
 	install -m 444 tlss.1 ${MAN1DIR}
@


1.5
log
@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
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.4 2020/11/30 12:41:41 nia Exp $
d5 1
a5 1
--- Makefile.orig	2021-07-03 15:04:54.000000000 +0000
d16 15
@


1.4
log
@ucspi: Fix build on NetBSD.

- Don't override CFLAGS from pkgsrc, don't build with -g.
- Make sure strlcpy gets defined, use _NETBSD_SOURCE.
- Honor LDFLAGS so pkgsrc library paths are found.
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.3 2020/11/27 13:48:25 schmonz Exp $
a3 2
Use LDFLAGS so pkgsrc library paths are picked up.
Not all systems have dprintf(); use ours for portability.
d5 1
a5 1
--- Makefile.orig	2016-09-21 22:05:29.000000000 +0000
d7 3
a9 1
@@@@ -5,14 +5,16 @@@@ TARBALL := ${DISTNAME}.tar.gz
a10 4
 DEFINES += -D_XOPEN_SOURCE=700
 DEFINES += -D_BSD_SOURCE
+DEFINES += -Ddprintf=fdprintf
 CFLAGS_SSL=`pkg-config --cflags libssl`
a11 1
+CFLAGS += $(CFLAGS_SSL)
a12 1
 LIBS_SSL = `pkg-config --libs libssl openssl`
a15 30
 
-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
@


1.3
log
@Not sure this is right (can't test httppc easily), but it's a lot less
wrong than before. Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.2 2020/11/27 11:34:17 schmonz Exp $
d4 1
d28 1
a28 1
@@@@ -28,8 +30,8 @@@@ http_parser.o: http_parser.h
d39 13
@


1.2
log
@Provide a dprintf() implementation for portability, and use it
unconditionally. Ride recent bump.
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.1 2020/11/26 15:52:58 schmonz Exp $
d8 1
a8 1
@@@@ -5,8 +5,10 @@@@ TARBALL := ${DISTNAME}.tar.gz
d20 10
a29 8
@@@@ -25,11 +27,11 @@@@ socks: socks.o
 httpc.o: http_parser.h
 http_parser.o: http_parser.h
 
-httpc: httpc.o http_parser.o
-	$(CC) -o $@@ httpc.o http_parser.o
+httpc: httpc.o http_parser.o fdprintf.o
+	$(CC) -o $@@ httpc.o http_parser.o fdprintf.o
@


1.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 1
Make sure libressl headers get found.
d8 2
a9 1
@@@@ -6,7 +6,8 @@@@ TARBALL := ${DISTNAME}.tar.gz
d12 1
d20 16
@