logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 80770716279ced2795dbdec6b92cc1a06be2ab61
parent 5a0f00b6c147fa44a4c2f2598a14154d8a5c155e
Author: Michael Forney <mforney@mforney.org>
Date:   Wed,  7 Nov 2018 13:58:29 -0800

Build nc from libressl

This way we don't have to maintain the nc linux port patch ourselves.
It also avoids a circular dependency between the libressl and openbsd
packages.

Diffstat:

Mpkg/libressl/gen.lua4++++
Mpkg/openbsd/gen.lua8--------
Apkg/openbsd/include/netinet/ip.h9+++++++++
Dpkg/openbsd/patch/0018-nc-Port-to-linux.patch111-------------------------------------------------------------------------------
Rpkg/openbsd/patch/0019-yacc-Remove-__unused.patch -> pkg/openbsd/patch/0018-yacc-Remove-__unused.patch0
Rpkg/openbsd/patch/0020-Add-standalone-freezero.patch -> pkg/openbsd/patch/0019-Add-standalone-freezero.patch0
Rpkg/openbsd/patch/0021-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch -> pkg/openbsd/patch/0020-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch0
Rpkg/openbsd/patch/0022-m4-Use-_Noreturn-instead-of-__dead.patch -> pkg/openbsd/patch/0021-m4-Use-_Noreturn-instead-of-__dead.patch0
Rpkg/openbsd/patch/0023-m4-Add-missing-includes.patch -> pkg/openbsd/patch/0022-m4-Add-missing-includes.patch0
Rpkg/openbsd/patch/0024-libutil-Add-missing-includes.patch -> pkg/openbsd/patch/0023-libutil-Add-missing-includes.patch0
10 files changed, 13 insertions(+), 119 deletions(-)

diff --git a/pkg/libressl/gen.lua b/pkg/libressl/gen.lua @@ -312,6 +312,10 @@ exe('openssl', [[apps/openssl/( file('bin/openssl', '755', '$outdir/openssl') man{'apps/openssl/openssl.1'} +exe('nc', [[apps/nc/(netcat.c atomicio.c socks.c) libtls.a.d]]) +file('bin/nc', '755', '$outdir/nc') +man{'apps/nc/nc.1'} + file('share/libressl/cert.pem', '644', '$srcdir/apps/openssl/cert.pem') fetch 'curl' diff --git a/pkg/openbsd/gen.lua b/pkg/openbsd/gen.lua @@ -56,14 +56,6 @@ exe('m4', [[ file('bin/m4', '755', '$outdir/m4') man{'usr.bin/m4/m4.1'} --- nc -exe('nc', [[ - usr.bin/nc/(netcat.c atomicio.c socks.c) - $builddir/pkg/libressl/libtls.a.d -]], {'pkg/libressl/headers'}) -file('bin/nc', '755', '$outdir/nc') -man{'usr.bin/nc/nc.1'} - -- patch exe('patch', 'usr.bin/patch/(patch.c pch.c inp.c util.c backupfile.c mkpath.c ed.c) libbsd.a') file('bin/patch', '755', '$outdir/patch') diff --git a/pkg/openbsd/include/netinet/ip.h b/pkg/openbsd/include/netinet/ip.h @@ -0,0 +1,9 @@ +#include_next <netinet/ip.h> +#define IPTOS_DSCP_CS0 0x00 +#define IPTOS_DSCP_CS1 0x20 +#define IPTOS_DSCP_CS2 0x40 +#define IPTOS_DSCP_CS3 0x60 +#define IPTOS_DSCP_CS4 0x80 +#define IPTOS_DSCP_CS5 0xa0 +#define IPTOS_DSCP_CS6 0xc0 +#define IPTOS_DSCP_CS7 0xe0 diff --git a/pkg/openbsd/patch/0018-nc-Port-to-linux.patch b/pkg/openbsd/patch/0018-nc-Port-to-linux.patch @@ -1,111 +0,0 @@ -From 0d05008cdf8188f66789de23e581d46608ad036b Mon Sep 17 00:00:00 2001 -From: Michael Forney <mforney@mforney.org> -Date: Fri, 16 Jun 2017 20:32:42 -0700 -Subject: [PATCH] nc: Port to linux - ---- - usr.bin/nc/netcat.c | 45 +++++++++++++++++++++++++++++++-------------- - 1 file changed, 31 insertions(+), 14 deletions(-) - -diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c -index 3798dc760f1..6cbf346ed10 100644 ---- a/usr.bin/nc/netcat.c -+++ b/usr.bin/nc/netcat.c -@@ -73,6 +73,31 @@ - #define TLS_CCERT (1 << 3) - #define TLS_MUSTSTAPLE (1 << 4) - -+#ifndef IPTOS_DSCP_CS0 -+# define IPTOS_DSCP_CS0 0x00 -+#endif -+#ifndef IPTOS_DSCP_CS1 -+# define IPTOS_DSCP_CS1 0x20 -+#endif -+#ifndef IPTOS_DSCP_CS2 -+# define IPTOS_DSCP_CS2 0x40 -+#endif -+#ifndef IPTOS_DSCP_CS3 -+# define IPTOS_DSCP_CS3 0x60 -+#endif -+#ifndef IPTOS_DSCP_CS4 -+# define IPTOS_DSCP_CS4 0x80 -+#endif -+#ifndef IPTOS_DSCP_CS5 -+# define IPTOS_DSCP_CS5 0xa0 -+#endif -+#ifndef IPTOS_DSCP_CS6 -+# define IPTOS_DSCP_CS6 0xc0 -+#endif -+#ifndef IPTOS_DSCP_CS7 -+# define IPTOS_DSCP_CS7 0xe0 -+#endif -+ - /* Command Line Options */ - int dflag; /* detached, no stdin */ - int Fflag; /* fdpass sock to stdout */ -@@ -95,7 +120,6 @@ int Iflag; /* TCP receive buffer size */ - int Oflag; /* TCP send buffer size */ - int Sflag; /* TCP MD5 signature option */ - int Tflag = -1; /* IP Type of Service */ --int rtableid = -1; - - int usetls; /* use TLS */ - char *Cflag; /* Public cert file */ -@@ -267,12 +291,6 @@ main(int argc, char *argv[]) - case 'u': - uflag = 1; - break; -- case 'V': -- rtableid = (int)strtonum(optarg, 0, -- RT_TABLEID_MAX, &errstr); -- if (errstr) -- errx(1, "rtable %s: %s", errstr, optarg); -- break; - case 'v': - vflag = 1; - break; -@@ -345,10 +363,6 @@ main(int argc, char *argv[]) - argc -= optind; - argv += optind; - -- if (rtableid >= 0) -- if (setrtable(rtableid) == -1) -- err(1, "setrtable"); -- - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { - host = argv[0]; -@@ -923,8 +937,12 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - if (sflag || pflag) { - struct addrinfo ahints, *ares; - -- /* try SO_BINDANY, but don't insist */ -+ /* try SO_BINDANY/IP_TRANSPARENT, but don't insist */ -+#if defined(SO_BINDANY) - setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on)); -+#elif defined(IP_TRANSPARENT) -+ setsockopt(s, SOL_IP, IP_TRANSPARENT, &on, sizeof(on)); -+#endif - memset(&ahints, 0, sizeof(struct addrinfo)); - ahints.ai_family = res->ai_family; - ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -@@ -1754,7 +1772,6 @@ help(void) - \t-t Answer TELNET negotiation\n\ - \t-U Use UNIX domain socket\n\ - \t-u UDP mode\n\ -- \t-V rtable Specify alternate routing table\n\ - \t-v Verbose\n\ - \t-W recvlimit Terminate after receiving a number of packets\n\ - \t-w timeout Timeout for connects and final net reads\n\ -@@ -1775,7 +1792,7 @@ usage(int ret) - "\t [-i interval] [-K keyfile] [-M ttl] [-m minttl] [-O length]\n" - "\t [-o staplefile] [-P proxy_username] [-p source_port] " - "[-R CAfile]\n" -- "\t [-s source] [-T keyword] [-V rtable] [-W recvlimit] " -+ "\t [-s source] [-T keyword] [-W recvlimit] " - "[-w timeout]\n" - "\t [-X proxy_protocol] [-x proxy_address[:port]] " - "[-Z peercertfile]\n" --- -2.19.0 - diff --git a/pkg/openbsd/patch/0019-yacc-Remove-__unused.patch b/pkg/openbsd/patch/0018-yacc-Remove-__unused.patch diff --git a/pkg/openbsd/patch/0020-Add-standalone-freezero.patch b/pkg/openbsd/patch/0019-Add-standalone-freezero.patch diff --git a/pkg/openbsd/patch/0021-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch b/pkg/openbsd/patch/0020-m4-Use-hand-written-lexer-to-avoid-cycle-in-bootstra.patch diff --git a/pkg/openbsd/patch/0022-m4-Use-_Noreturn-instead-of-__dead.patch b/pkg/openbsd/patch/0021-m4-Use-_Noreturn-instead-of-__dead.patch diff --git a/pkg/openbsd/patch/0023-m4-Add-missing-includes.patch b/pkg/openbsd/patch/0022-m4-Add-missing-includes.patch diff --git a/pkg/openbsd/patch/0024-libutil-Add-missing-includes.patch b/pkg/openbsd/patch/0023-libutil-Add-missing-includes.patch