kc3-lang/libressl/patches/netcat.c.patch

• Show log

  Commit

• Hash : 26b40cb7
  Author :
  Date : 2017-12-05T15:22:15
  

  netcat.c.patch: eliminate syntax error from patch
  
  If the target system does not define IPV6_TCLASS, this part of
  the patch handles that with an ENOPROTOOPT error rather than
  failing to compile.
  
  Unfortunately it's missing a trailing semicolon leading to
  a compilation error.
  
  Add the missing semicolon to fix the problem.
  
  Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
  

Download

• patches/netcat.c.patch

• --- apps/nc/netcat.c.orig	Mon Jul 17 06:06:51 2017
  +++ apps/nc/netcat.c	Mon Jul 17 06:11:24 2017
  @@ -66,7 +66,9 @@
   #define POLL_NETIN	2
   #define POLL_STDOUT	3
   #define BUFSIZE		16384
  +#ifndef DEFAULT_CA_FILE
   #define DEFAULT_CA_FILE	"/etc/ssl/cert.pem"
  +#endif
   
   #define TLS_ALL	(1 << 1)
   #define TLS_NOVERIFY	(1 << 2)
  @@ -95,9 +97,13 @@
   int	Dflag;					/* sodebug */
   int	Iflag;					/* TCP receive buffer size */
   int	Oflag;					/* TCP send buffer size */
  +#ifdef TCP_MD5SIG
   int	Sflag;					/* TCP MD5 signature option */
  +#endif
   int	Tflag = -1;				/* IP Type of Service */
  +#ifdef SO_RTABLE
   int	rtableid = -1;
  +#endif
   
   int	usetls;					/* use TLS */
   char    *Cflag;					/* Public cert file */
  @@ -266,12 +272,14 @@
   		case 'u':
   			uflag = 1;
   			break;
  +#ifdef SO_RTABLE
   		case 'V':
   			rtableid = (int)strtonum(optarg, 0,
   			    RT_TABLEID_MAX, &errstr);
   			if (errstr)
   				errx(1, "rtable %s: %s", errstr, optarg);
   			break;
  +#endif
   		case 'v':
   			vflag = 1;
   			break;
  @@ -318,9 +326,11 @@
   		case 'o':
   			oflag = optarg;
   			break;
  +#ifdef TCP_MD5SIG
   		case 'S':
   			Sflag = 1;
   			break;
  +#endif
   		case 'T':
   			errstr = NULL;
   			errno = 0;
  @@ -344,9 +354,11 @@
   	argc -= optind;
   	argv += optind;
   
  +#ifdef SO_RTABLE
   	if (rtableid >= 0)
   		if (setrtable(rtableid) == -1)
   			err(1, "setrtable");
  +#endif
   
   	if (family == AF_UNIX) {
   		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
  @@ -892,7 +904,10 @@
   remote_connect(const char *host, const char *port, struct addrinfo hints)
   {
   	struct addrinfo *res, *res0;
  -	int s = -1, error, on = 1, save_errno;
  +	int s = -1, error, save_errno;
  +#ifdef SO_BINDANY
  +	int on = 1;
  +#endif
   
   	if ((error = getaddrinfo(host, port, &hints, &res0)))
   		errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
  @@ -907,8 +922,10 @@
   		if (sflag || pflag) {
   			struct addrinfo ahints, *ares;
   
  +#ifdef SO_BINDANY
   			/* try SO_BINDANY, but don't insist */
   			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
  +#endif
   			memset(&ahints, 0, sizeof(struct addrinfo));
   			ahints.ai_family = res->ai_family;
   			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
  @@ -979,7 +996,10 @@
   local_listen(char *host, char *port, struct addrinfo hints)
   {
   	struct addrinfo *res, *res0;
  -	int s = -1, ret, x = 1, save_errno;
  +	int s = -1, save_errno;
  +#ifdef SO_REUSEPORT
  +	int ret, x = 1;
  +#endif
   	int error;
   
   	/* Allow nodename to be null. */
  @@ -1000,9 +1020,11 @@
   		    res->ai_protocol)) < 0)
   			continue;
   
  +#ifdef SO_REUSEPORT
   		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
   		if (ret == -1)
   			err(1, NULL);
  +#endif
   
   		set_common_sockopts(s, res->ai_family);
   
  @@ -1458,11 +1480,13 @@
   {
   	int x = 1;
   
  +#ifdef TCP_MD5SIG
   	if (Sflag) {
   		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
   			&x, sizeof(x)) == -1)
   			err(1, NULL);
   	}
  +#endif
   	if (Dflag) {
   		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
   			&x, sizeof(x)) == -1)
  @@ -1473,9 +1497,16 @@
   		    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
   			err(1, "set IP ToS");
   
  +#ifdef IPV6_TCLASS
   		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
   		    IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
   			err(1, "set IPv6 traffic class");
  +#else
  +		else if (af == AF_INET6) {
  +			errno = ENOPROTOOPT;
  +			err(1, "set IPv6 traffic class not supported");
  +		}
  +#endif
   	}
   	if (Iflag) {
   		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
  @@ -1499,13 +1530,17 @@
   	}
   
   	if (minttl != -1) {
  +#ifdef IP_MINTTL
   		if (af == AF_INET && setsockopt(s, IPPROTO_IP,
   		    IP_MINTTL, &minttl, sizeof(minttl)))
   			err(1, "set IP min TTL");
  +#endif
   
  -		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
  +#ifdef IPV6_MINHOPCOUNT
  +		if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
   		    IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)))
   			err(1, "set IPv6 min hop count");
  +#endif
   	}
   }
   
  @@ -1714,14 +1749,22 @@
   	\t-P proxyuser\tUsername for proxy authentication\n\
   	\t-p port\t	Specify local port for remote connects\n\
   	\t-R CAfile	CA bundle\n\
  -	\t-r		Randomize remote ports\n\
  -	\t-S		Enable the TCP MD5 signature option\n\
  +	\t-r		Randomize remote ports\n"
  +#ifdef TCP_MD5SIG
  +	"\
  +	\t-S		Enable the TCP MD5 signature option\n"
  +#endif
  +	"\
   	\t-s source	Local source address\n\
   	\t-T keyword	TOS value or TLS options\n\
   	\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-u		UDP mode\n"
  +#ifdef SO_RTABLE
  +	"\
  +	\t-V rtable	Specify alternate routing table\n"
  +#endif
  +	"\
   	\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\
  

Download