Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id F32FC1A9217 for ; Fri, 27 Nov 2020 13:48:27 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3CFA584DAF; Fri, 27 Nov 2020 13:48:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7707584D32 for ; Fri, 27 Nov 2020 13:48:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id J6FnT_YNTywM for ; Fri, 27 Nov 2020 13:48:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9DFA284D1F for ; Fri, 27 Nov 2020 13:48:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 97697FA9D; Fri, 27 Nov 2020 13:48:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1606484905295120" MIME-Version: 1.0 Date: Fri, 27 Nov 2020 13:48:25 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/net/ucspi-tools To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20201127134825.97697FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1606484905295120 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Fri Nov 27 13:48:25 UTC 2020 Modified Files: pkgsrc/net/ucspi-tools: Makefile distinfo pkgsrc/net/ucspi-tools/patches: patch-Makefile patch-fdprintf.c Removed Files: pkgsrc/net/ucspi-tools/patches: patch-httpc.c Log Message: Not sure this is right (can't test httppc easily), but it's a lot less wrong than before. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ucspi-tools/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ucspi-tools/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ucspi-tools/patches/patch-Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c cvs rdiff -u -r1.1 -r0 pkgsrc/net/ucspi-tools/patches/patch-httpc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1606484905295120 Content-Disposition: inline Content-Length: 4537 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/ucspi-tools/Makefile diff -u pkgsrc/net/ucspi-tools/Makefile:1.4 pkgsrc/net/ucspi-tools/Makefile:1.5 --- pkgsrc/net/ucspi-tools/Makefile:1.4 Fri Nov 27 11:36:33 2020 +++ pkgsrc/net/ucspi-tools/Makefile Fri Nov 27 13:48:25 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2020/11/27 11:36:33 schmonz Exp $ +# $NetBSD: Makefile,v 1.5 2020/11/27 13:48:25 schmonz Exp $ DISTNAME= ucspi-tools-1.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_GITHUB:=younix/} GITHUB_PROJECT= ucspi Index: pkgsrc/net/ucspi-tools/distinfo diff -u pkgsrc/net/ucspi-tools/distinfo:1.2 pkgsrc/net/ucspi-tools/distinfo:1.3 --- pkgsrc/net/ucspi-tools/distinfo:1.2 Fri Nov 27 11:34:16 2020 +++ pkgsrc/net/ucspi-tools/distinfo Fri Nov 27 13:48:25 2020 @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.2 2020/11/27 11:34:16 schmonz Exp $ +$NetBSD: distinfo,v 1.3 2020/11/27 13:48:25 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) = fafc8e55a6f4a7fbe52ee027564b557c256777ec -SHA1 (patch-fdprintf.c) = 66a4912bd6224ada3f63c0f10297bcecec74d950 +SHA1 (patch-Makefile) = 934a3edd61edc23562172ea721e6eceba0a75d65 +SHA1 (patch-fdprintf.c) = 665c1c8c99a6dd31bc227aa1f9ab4abb75fb693d SHA1 (patch-fdprintf.h) = 68d57e66c0ce75bd0a9cdec9c5135474ff7b4cfe -SHA1 (patch-httpc.c) = 72bb2f8e3f287bacd280e890f01c8c73fca7b24e SHA1 (patch-httppc.c) = 4c2c36a8b7ad4755aba2be2aaea0c9e4c045aa45 SHA1 (patch-tlsc.c) = 3ae01739e614b2b8008e7bc4d5b01130edec2ff9 Index: pkgsrc/net/ucspi-tools/patches/patch-Makefile diff -u pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.2 pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.3 --- pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.2 Fri Nov 27 11:34:17 2020 +++ pkgsrc/net/ucspi-tools/patches/patch-Makefile Fri Nov 27 13:48:25 2020 @@ -1,11 +1,11 @@ -$NetBSD: patch-Makefile,v 1.2 2020/11/27 11:34:17 schmonz Exp $ +$NetBSD: patch-Makefile,v 1.3 2020/11/27 13:48:25 schmonz Exp $ Make sure openssl headers get found. Not all systems have dprintf(); use ours for portability. --- Makefile.orig 2016-09-21 22:05:29.000000000 +0000 +++ Makefile -@@ -5,8 +5,10 @@ TARBALL := ${DISTNAME}.tar.gz +@@ -5,14 +5,16 @@ TARBALL := ${DISTNAME}.tar.gz DEFINES += -D_XOPEN_SOURCE=700 DEFINES += -D_BSD_SOURCE @@ -17,14 +17,16 @@ Not all systems have dprintf(); use ours LIBS_SSL = `pkg-config --libs libssl openssl` .PHONY: all test clean install -@@ -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 + .SUFFIXES: .c .o + +-all: sockc tlsc tlss httppc httpc ++all: sockc tlsc tlss httppc + + # SOCKS 5 + sockc: sockc.o +@@ -28,8 +30,8 @@ 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 Index: pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c diff -u pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c:1.1 pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c:1.2 --- pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c:1.1 Fri Nov 27 11:34:17 2020 +++ pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c Fri Nov 27 13:48:25 2020 @@ -1,21 +1,25 @@ -$NetBSD: patch-fdprintf.c,v 1.1 2020/11/27 11:34:17 schmonz Exp $ +$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 10:59:35.151164978 +0000 +--- fdprintf.c.orig 2020-11-27 13:14:12.000000000 +0000 +++ fdprintf.c -@@ -0,0 +1,14 @@ +@@ -0,0 +1,18 @@ +#include +#include ++#include ++ ++static FILE *f; + +int fdprintf(int fd, const char *fmt, ...) { + va_list ap; -+ FILE *f = fdopen(fd, "w"); + int rc; + ++ f = fdopen(fd, "w"); ++ if (f == NULL) return -1; ++ + va_start(ap, fmt); + rc = vfprintf(f, fmt, ap); -+ fclose(f); + va_end(ap); + return rc; +} --_----------=_1606484905295120--