CVS commit: pkgsrc/net/ucspi-tools

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Nov 27 11:34:17 UTC 2020

Modified Files:
        pkgsrc/net/ucspi-tools: Makefile distinfo
        pkgsrc/net/ucspi-tools/patches: patch-Makefile
Added Files:
        pkgsrc/net/ucspi-tools/patches: patch-fdprintf.c patch-fdprintf.h
            patch-httpc.c patch-httppc.c

Log Message:
Provide a dprintf() implementation for portability, and use it
unconditionally. Ride recent bump.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/ucspi-tools/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ucspi-tools/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/ucspi-tools/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c \
    pkgsrc/net/ucspi-tools/patches/patch-fdprintf.h \
    pkgsrc/net/ucspi-tools/patches/patch-httpc.c \
    pkgsrc/net/ucspi-tools/patches/patch-httppc.c

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

Modified files:

Index: pkgsrc/net/ucspi-tools/Makefile
diff -u pkgsrc/net/ucspi-tools/Makefile:1.2 pkgsrc/net/ucspi-tools/Makefile:1.3
--- pkgsrc/net/ucspi-tools/Makefile:1.2 Fri Nov 27 10:25:40 2020
+++ pkgsrc/net/ucspi-tools/Makefile     Fri Nov 27 11:34:16 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2020/11/27 10:25:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/27 11:34:16 schmonz Exp $
 
 DISTNAME=              ucspi-tools-1.6
-PKGREVISION=           1
 CATEGORIES=            net security
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=younix/}
 GITHUB_PROJECT=                ucspi
@@ -13,6 +12,7 @@ COMMENT=              SOCKS proxy and TLS support fo
 LICENSE=               isc
 
 USE_TOOLS+=            gmake pkg-config
+MAKE_FILE=             GNUmakefile
 
 WRKSRC=                        ${WRKDIR}/ucspi-${GITHUB_TAG}
 

Index: pkgsrc/net/ucspi-tools/distinfo
diff -u pkgsrc/net/ucspi-tools/distinfo:1.1 pkgsrc/net/ucspi-tools/distinfo:1.2
--- pkgsrc/net/ucspi-tools/distinfo:1.1 Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/distinfo     Fri Nov 27 11:34:16 2020
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.1 2020/11/26 15:52:58 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2020/11/27 11:34:16 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-Makefile) = fafc8e55a6f4a7fbe52ee027564b557c256777ec
+SHA1 (patch-fdprintf.c) = 66a4912bd6224ada3f63c0f10297bcecec74d950
+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.1 pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.2
--- pkgsrc/net/ucspi-tools/patches/patch-Makefile:1.1   Thu Nov 26 15:52:58 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-Makefile       Fri Nov 27 11:34:17 2020
@@ -1,12 +1,15 @@
-$NetBSD: patch-Makefile,v 1.1 2020/11/26 15:52:58 schmonz Exp $
+$NetBSD: patch-Makefile,v 1.2 2020/11/27 11:34:17 schmonz Exp $
 
-Make sure libressl headers get found.
+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
-@@ -6,7 +6,8 @@ TARBALL := ${DISTNAME}.tar.gz
+@@ -5,8 +5,10 @@ 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)
@@ -14,3 +17,19 @@ Make sure libressl headers get found.
  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
+ 
+-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

Added files:

Index: pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c
diff -u /dev/null pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c:1.1
--- /dev/null   Fri Nov 27 11:34:17 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-fdprintf.c     Fri Nov 27 11:34:17 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-fdprintf.c,v 1.1 2020/11/27 11:34:17 schmonz Exp $
+
+Not all systems have dprintf().
+
+--- fdprintf.c.orig    2020-11-27 10:59:35.151164978 +0000
++++ fdprintf.c
+@@ -0,0 +1,14 @@
++#include <stdarg.h>
++#include <stdio.h>
++
++int fdprintf(int fd, const char *fmt, ...) {
++      va_list ap;
++      FILE *f = fdopen(fd, "w");
++      int rc;
++
++      va_start(ap, fmt);
++      rc = vfprintf(f, fmt, ap);
++      fclose(f);
++      va_end(ap);
++      return rc;
++}
Index: pkgsrc/net/ucspi-tools/patches/patch-fdprintf.h
diff -u /dev/null pkgsrc/net/ucspi-tools/patches/patch-fdprintf.h:1.1
--- /dev/null   Fri Nov 27 11:34:17 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-fdprintf.h     Fri Nov 27 11:34:17 2020
@@ -0,0 +1,13 @@
+$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
Index: pkgsrc/net/ucspi-tools/patches/patch-httpc.c
diff -u /dev/null pkgsrc/net/ucspi-tools/patches/patch-httpc.c:1.1
--- /dev/null   Fri Nov 27 11:34:17 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-httpc.c        Fri Nov 27 11:34:17 2020
@@ -0,0 +1,14 @@
+$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
Index: pkgsrc/net/ucspi-tools/patches/patch-httppc.c
diff -u /dev/null pkgsrc/net/ucspi-tools/patches/patch-httppc.c:1.1
--- /dev/null   Fri Nov 27 11:34:17 2020
+++ pkgsrc/net/ucspi-tools/patches/patch-httppc.c       Fri Nov 27 11:34:17 2020
@@ -0,0 +1,14 @@
+$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 <string.h>
+ #include <unistd.h>
+ 
++#include "fdprintf.h"
+ #include "http_parser.h"
+ 
+ #define READ_FD 6