[pkgsrc/trunk]: pkgsrc/net/ucspi-tools Not sure this is right (can't test htt...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/30cbe42f3cb9
branches:  trunk
changeset: 442642:30cbe42f3cb9
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Nov 27 13:48:25 2020 +0000

description:
Not sure this is right (can't test httppc easily), but it's a lot less
wrong than before. Bump PKGREVISION.

diffstat:

 net/ucspi-tools/Makefile                 |   4 ++--
 net/ucspi-tools/distinfo                 |   7 +++----
 net/ucspi-tools/patches/patch-Makefile   |  20 +++++++++++---------
 net/ucspi-tools/patches/patch-fdprintf.c |  14 +++++++++-----
 net/ucspi-tools/patches/patch-httpc.c    |  14 --------------
 5 files changed, 25 insertions(+), 34 deletions(-)

diffs (125 lines):

diff -r 164d82e7a53e -r 30cbe42f3cb9 net/ucspi-tools/Makefile
--- a/net/ucspi-tools/Makefile  Fri Nov 27 13:11:13 2020 +0000
+++ b/net/ucspi-tools/Makefile  Fri Nov 27 13:48:25 2020 +0000
@@ -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
diff -r 164d82e7a53e -r 30cbe42f3cb9 net/ucspi-tools/distinfo
--- a/net/ucspi-tools/distinfo  Fri Nov 27 13:11:13 2020 +0000
+++ b/net/ucspi-tools/distinfo  Fri Nov 27 13:48:25 2020 +0000
@@ -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
diff -r 164d82e7a53e -r 30cbe42f3cb9 net/ucspi-tools/patches/patch-Makefile
--- a/net/ucspi-tools/patches/patch-Makefile    Fri Nov 27 13:11:13 2020 +0000
+++ b/net/ucspi-tools/patches/patch-Makefile    Fri Nov 27 13:48:25 2020 +0000
@@ -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 @@
  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
+ .SUFFIXES: .c .o
+ 
+-all: sockc tlsc tlss httppc httpc
++all: sockc tlsc tlss httppc
  
--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
+ # 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
diff -r 164d82e7a53e -r 30cbe42f3cb9 net/ucspi-tools/patches/patch-fdprintf.c
--- a/net/ucspi-tools/patches/patch-fdprintf.c  Fri Nov 27 13:11:13 2020 +0000
+++ b/net/ucspi-tools/patches/patch-fdprintf.c  Fri Nov 27 13:48:25 2020 +0000
@@ -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 <stdarg.h>
 +#include <stdio.h>
++#include <sys/errno.h>
++
++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;
 +}
diff -r 164d82e7a53e -r 30cbe42f3cb9 net/ucspi-tools/patches/patch-httpc.c
--- a/net/ucspi-tools/patches/patch-httpc.c     Fri Nov 27 13:11:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-httpc.c,v 1.1 2020/11/27 11:34:17 schmonz Exp $
-
-Use our dprintf() for portability.
-
---- httpc.c.orig       2016-09-21 22:05:29.000000000 +0000
-+++ httpc.c
-@@ -24,6 +24,7 @@
- #include <string.h>
- #include <unistd.h>
- 
-+#include "fdprintf.h"
- #include "http_parser.h"
- 
- #define READ_FD 6