CVS commit: pkgsrc/security/tlswrapper

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jan  4 22:10:37 UTC 2022

Modified Files:
        pkgsrc/security/tlswrapper: Makefile distinfo
Added Files:
        pkgsrc/security/tlswrapper/patches: patch-Makefile
            patch-connectioninfo.c patch-iptostr.c patch-log.c
            patch-resolvehost.c patch-strtoip.c

Log Message:
Fix build on BSDs and Solarish.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/tlswrapper/Makefile \
    pkgsrc/security/tlswrapper/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/tlswrapper/patches/patch-Makefile \
    pkgsrc/security/tlswrapper/patches/patch-connectioninfo.c \
    pkgsrc/security/tlswrapper/patches/patch-iptostr.c \
    pkgsrc/security/tlswrapper/patches/patch-log.c \
    pkgsrc/security/tlswrapper/patches/patch-resolvehost.c \
    pkgsrc/security/tlswrapper/patches/patch-strtoip.c

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

Modified files:

Index: pkgsrc/security/tlswrapper/Makefile
diff -u pkgsrc/security/tlswrapper/Makefile:1.1 pkgsrc/security/tlswrapper/Makefile:1.2
--- pkgsrc/security/tlswrapper/Makefile:1.1     Tue Jan  4 21:39:03 2022
+++ pkgsrc/security/tlswrapper/Makefile Tue Jan  4 22:10:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2022/01/04 21:39:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2022/01/04 22:10:37 schmonz Exp $
 
 GITHUB_PROJECT=                tlswrapper
 GITHUB_TAG=            20220101
@@ -18,10 +18,9 @@ BUILD_DEFS+=         VARBASE TLSWRAPPER_CHROOT
 OWN_DIRS+=             ${TLSWRAPPER_CHROOT}
 MAKE_ENV+=             EMPTYDIR=${TLSWRAPPER_CHROOT:Q}
 
-INSTALLATION_DIRS=     bin man/man1
+LDFLAGS.SunOS+=                -lsocket
 
-post-extract:
-       ${RM} -f ${WRKSRC}/bearssl.sh
+INSTALLATION_DIRS=     bin man/man1
 
 do-install:
        cd ${WRKSRC};                                                   \
Index: pkgsrc/security/tlswrapper/distinfo
diff -u pkgsrc/security/tlswrapper/distinfo:1.1 pkgsrc/security/tlswrapper/distinfo:1.2
--- pkgsrc/security/tlswrapper/distinfo:1.1     Tue Jan  4 21:39:03 2022
+++ pkgsrc/security/tlswrapper/distinfo Tue Jan  4 22:10:37 2022
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.1 2022/01/04 21:39:03 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2022/01/04 22:10:37 schmonz Exp $
 
 BLAKE2s (tlswrapper-20220101.tar.gz) = aad0a74ffe7a494e037a7bce1f28ff643e545f9bd456d5298dbdd2c1dc41c83d
 SHA512 (tlswrapper-20220101.tar.gz) = df1c3505cb44468099c2ce439c1d75731a24722474e55fe7868f52d91d414adfa4fc3575826ac9a7c6fb6491752622985d87d691d44e847c8897148350b1acce
 Size (tlswrapper-20220101.tar.gz) = 239414 bytes
+SHA1 (patch-Makefile) = 72fb81a5224e3c363d7a61dec17ea61d7d99879b
+SHA1 (patch-connectioninfo.c) = 8b3617d4452236e8c0c907ee93bcf0ef71af6f06
+SHA1 (patch-iptostr.c) = d58d00510a6be9c4534f962211a86fa54cedd0ff
+SHA1 (patch-log.c) = 8a136e87339115ace38c1ceb16ff6dc3b40142e8
+SHA1 (patch-resolvehost.c) = 4ea8adf324405aeab7775b82beff6c285f2f8ab9
+SHA1 (patch-strtoip.c) = 9c742a3f58624a8a8a27bf2c3d97ca9a90e7bd88

Added files:

Index: pkgsrc/security/tlswrapper/patches/patch-Makefile
diff -u /dev/null pkgsrc/security/tlswrapper/patches/patch-Makefile:1.1
--- /dev/null   Tue Jan  4 22:10:37 2022
+++ pkgsrc/security/tlswrapper/patches/patch-Makefile   Tue Jan  4 22:10:37 2022
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2022/01/04 22:10:37 schmonz Exp $
+
+Do not consider building a local copy of BearSSL.
+
+--- Makefile.orig      2021-12-28 05:36:39.000000000 +0000
++++ Makefile
+@@ -227,9 +227,6 @@ tlswrapper-test: tlswrapper-test.o $(OBJ
+ 
+ 
+ bearssl:
+-      echo 'int main(){}' > try.c
+-      $(CC) $(CFLAGS) $(CPPFLAGS) -o try.o $(LDFLAGS) try.c || (sh bearssl.sh; cd bearssl; make; rm build/*.so; )
+-      rm -f try.o try.c
+       mkdir -p bearssl/inc
+ 
+ tlswrapper-tcp: tlswrapper
Index: pkgsrc/security/tlswrapper/patches/patch-connectioninfo.c
diff -u /dev/null pkgsrc/security/tlswrapper/patches/patch-connectioninfo.c:1.1
--- /dev/null   Tue Jan  4 22:10:37 2022
+++ pkgsrc/security/tlswrapper/patches/patch-connectioninfo.c   Tue Jan  4 22:10:37 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-connectioninfo.c,v 1.1 2022/01/04 22:10:37 schmonz Exp $
+
+Define struct sockaddr_in{,6}.
+
+--- connectioninfo.c.orig      2021-12-28 05:36:39.000000000 +0000
++++ connectioninfo.c
+@@ -10,6 +10,7 @@ Public domain.
+ #include <arpa/inet.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <netinet/in.h>
+ #include "strtoip.h"
+ #include "strtoport.h"
+ #include "porttostr.h"
Index: pkgsrc/security/tlswrapper/patches/patch-iptostr.c
diff -u /dev/null pkgsrc/security/tlswrapper/patches/patch-iptostr.c:1.1
--- /dev/null   Tue Jan  4 22:10:37 2022
+++ pkgsrc/security/tlswrapper/patches/patch-iptostr.c  Tue Jan  4 22:10:37 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-iptostr.c,v 1.1 2022/01/04 22:10:37 schmonz Exp $
+
+Define AF_INET{,6}.
+
+--- iptostr.c.orig     2021-12-28 05:36:39.000000000 +0000
++++ iptostr.c
+@@ -6,6 +6,7 @@ Public domain.
+ 
+ #include <arpa/inet.h>
+ #include <string.h>
++#include <sys/socket.h>
+ #include "iptostr.h"
+ 
+ /* convert IPv4 address */
Index: pkgsrc/security/tlswrapper/patches/patch-log.c
diff -u /dev/null pkgsrc/security/tlswrapper/patches/patch-log.c:1.1
--- /dev/null   Tue Jan  4 22:10:37 2022
+++ pkgsrc/security/tlswrapper/patches/patch-log.c      Tue Jan  4 22:10:37 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-log.c,v 1.1 2022/01/04 22:10:37 schmonz Exp $
+
+Define AF_INET{,6} and struct sockaddr_in{,6}.
+
+--- log.c.orig 2021-12-28 05:36:39.000000000 +0000
++++ log.c
+@@ -22,6 +22,8 @@ name .......... optional
+ #include <stdlib.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include "e.h"
+ #include "randommod.h"
+ #include "log.h"
Index: pkgsrc/security/tlswrapper/patches/patch-resolvehost.c
diff -u /dev/null pkgsrc/security/tlswrapper/patches/patch-resolvehost.c:1.1
--- /dev/null   Tue Jan  4 22:10:37 2022
+++ pkgsrc/security/tlswrapper/patches/patch-resolvehost.c      Tue Jan  4 22:10:37 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-resolvehost.c,v 1.1 2022/01/04 22:10:37 schmonz Exp $
+
+Define struct sockaddr_in{,6}.
+
+--- resolvehost.c.orig 2021-12-28 05:36:39.000000000 +0000
++++ resolvehost.c
+@@ -11,6 +11,7 @@ Public domain.
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <netdb.h>
++#include <netinet/in.h>
+ #include "e.h"
+ #include "blocking.h"
+ #include "log.h"
Index: pkgsrc/security/tlswrapper/patches/patch-strtoip.c
diff -u /dev/null pkgsrc/security/tlswrapper/patches/patch-strtoip.c:1.1
--- /dev/null   Tue Jan  4 22:10:37 2022
+++ pkgsrc/security/tlswrapper/patches/patch-strtoip.c  Tue Jan  4 22:10:37 2022
@@ -0,0 +1,13 @@
+$NetBSD: patch-strtoip.c,v 1.1 2022/01/04 22:10:37 schmonz Exp $
+
+Define AF_INET{,6}.
+
+--- strtoip.c.orig     2021-12-28 05:36:39.000000000 +0000
++++ strtoip.c
+@@ -1,5 +1,6 @@
+ #include <string.h>
+ #include <arpa/inet.h>
++#include <sys/socket.h>
+ #include "strtoip.h"
+ 
+ int strtoip4(unsigned char *ip, const char *x) {