the recent pkg-config change in libressl to remove -lcrypto from
libssl.pc broke this; bonus fix while there

httpc.c:158:49: warning: data argument not used by format string 
[-Wformat-extra-args]
        dprintf(WRITE_FD, "Accept-Encoding: gzip\r\n", host);
                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~  ^

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ucspi-tools/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile    12 Jul 2019 20:48:51 -0000      1.9
+++ Makefile    9 Jun 2021 23:17:14 -0000
@@ -3,7 +3,7 @@
 COMMENT=       socks proxy and tls support for ucspi
 
 DISTNAME=      ucspi-tools-1.6
-REVISION=      0
+REVISION=      1
 CATEGORIES=    net
 
 GH_ACCOUNT=    younix
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile      9 Jun 2021 23:17:14 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -6,7 +6,7 @@ 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`
++LIBS_TLS ?= -ltls `pkg-config --libs libcrypto libssl`
+ LIBS_SSL = `pkg-config --libs libssl openssl`
+ 
+ .PHONY: all test clean install
Index: patches/patch-httpc_c
===================================================================
RCS file: patches/patch-httpc_c
diff -N patches/patch-httpc_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-httpc_c       9 Jun 2021 23:17:14 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: httpc.c
+--- httpc.c.orig
++++ httpc.c
+@@ -155,7 +155,7 @@ main(int argc, char *argv[])
+       dprintf(WRITE_FD, "GET %s HTTP/1.1\r\n", uri);
+       if (host != NULL)
+               dprintf(WRITE_FD, "Host: %s\r\n", host);
+-      dprintf(WRITE_FD, "Accept-Encoding: gzip\r\n", host);
++      dprintf(WRITE_FD, "Accept-Encoding: gzip\r\n");
+       dprintf(WRITE_FD, "Connection: close\r\n");
+       dprintf(WRITE_FD, "\r\n");
+ 

Reply via email to