svn commit: r546913 - in head/net/socat: . files

[Emanuel Haupt]

Author: ehaupt
Date: Sat Aug 29 13:49:17 2020
New Revision: 546913
URL: https://svnweb.freebsd.org/changeset/ports/546913

Log:
  Fix build with clang11
  
  Notified by:	pkg-fallout

Added:
  head/net/socat/files/patch-filan.c   (contents, props changed)
  head/net/socat/files/patch-procan.c   (contents, props changed)
  head/net/socat/files/patch-xio-tcpwrap.c   (contents, props changed)
Modified:
  head/net/socat/Makefile

Modified: head/net/socat/Makefile
==============================================================================
--- head/net/socat/Makefile	Sat Aug 29 13:47:15 2020	(r546912)
+++ head/net/socat/Makefile	Sat Aug 29 13:49:17 2020	(r546913)
@@ -3,6 +3,7 @@
 
 PORTNAME=	socat
 PORTVERSION=	1.7.3.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/ \
 		LOCAL/ehaupt

Added: head/net/socat/files/patch-filan.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/socat/files/patch-filan.c	Sat Aug 29 13:49:17 2020	(r546913)
@@ -0,0 +1,11 @@
+--- filan.c.orig	2020-01-01 13:02:06 UTC
++++ filan.c
+@@ -30,7 +30,7 @@ static int filan_streams_analyze(int fd, FILE *outfile
+ 
+ /* dirty workaround so we dont get an error on AIX when being linked with
+    libwrap */
+-int allow_severity, deny_severity;
++//int allow_severity, deny_severity;
+ 
+ /* global variables for configuring filan */
+ bool filan_followsymlinks;

Added: head/net/socat/files/patch-procan.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/socat/files/patch-procan.c	Sat Aug 29 13:49:17 2020	(r546913)
@@ -0,0 +1,11 @@
+--- procan.c.orig	2017-01-06 20:58:40 UTC
++++ procan.c
+@@ -21,7 +21,7 @@
+ 
+ /* dirty workaround so we dont get an error on AIX when getting linked with
+    libwrap */
+-int allow_severity, deny_severity;
++//int allow_severity, deny_severity;
+ 
+ 
+ int procan(FILE *outfile) {

Added: head/net/socat/files/patch-xio-tcpwrap.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/socat/files/patch-xio-tcpwrap.c	Sat Aug 29 13:49:17 2020	(r546913)
@@ -0,0 +1,11 @@
+--- xio-tcpwrap.c.orig	2017-01-06 20:58:40 UTC
++++ xio-tcpwrap.c
+@@ -27,7 +27,7 @@ const struct optdesc opt_tcpwrap_hosts_deny_table  = {
+ 
+ /* they are declared only externally with libwrap and would be unresolved
+    without these definitions */
+-int allow_severity=10, deny_severity=10;
++//int allow_severity=10, deny_severity=10;
+ 
+ /* returns 0 if option was found and could be applied
+    returns 1 if option was not found