Index: net/ocserv/Makefile =================================================================== --- net/ocserv/Makefile +++ net/ocserv/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= ocserv -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.1.2 CATEGORIES= net net-vpn security MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= otis@FreeBSD.org COMMENT= Server implementing the AnyConnect SSL VPN protocol LICENSE= GPLv2+ Index: net/ocserv/distinfo =================================================================== --- net/ocserv/distinfo +++ net/ocserv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602242932 -SHA256 (ocserv-1.1.1.tar.xz) = 9c7aaf46e53e28cfa7be329b18f3951e7e851153ff6a27e946496fd4e8e5765a -SIZE (ocserv-1.1.1.tar.xz) = 818988 +TIMESTAMP = 1611572802 +SHA256 (ocserv-1.1.2.tar.xz) = 889ccdbe8e67d3bc2bc8713b7fbb5bd4e79228abc6054e88858cb4ad6d0245dd +SIZE (ocserv-1.1.2.tar.xz) = 824924 Index: net/ocserv/files/patch-doc_sample.config =================================================================== --- net/ocserv/files/patch-doc_sample.config +++ net/ocserv/files/patch-doc_sample.config @@ -1,4 +1,4 @@ ---- doc/sample.config.orig 2020-09-20 19:49:01 UTC +--- doc/sample.config.orig 2020-12-03 22:31:10 UTC +++ doc/sample.config @@ -19,7 +19,7 @@ # This enabled PAM authentication of the user. The gid-min option is used @@ -9,7 +9,7 @@ # The plain option requires specifying a password file which contains # entries of the following format. # "username:groupname1,groupname2:encoded-password" -@@ -110,8 +110,8 @@ udp-port = 443 +@@ -96,8 +96,8 @@ udp-port = 443 # The user the worker processes will be run as. This should be a dedicated # unprivileged user (e.g., 'ocserv') and no other services should run as this # user. @@ -20,7 +20,7 @@ # socket file used for IPC with occtl. You only need to set that, # if you use more than a single servers. -@@ -180,15 +180,9 @@ ca-cert = ../tests/certs/ca.pem +@@ -166,15 +166,9 @@ ca-cert = ../tests/certs/ca.pem ### failures during the reloading time. @@ -39,7 +39,7 @@ # A banner to be displayed on clients after connection #banner = "Welcome" -@@ -553,15 +547,15 @@ no-route = 192.168.5.0/255.255.255.0 +@@ -543,15 +537,15 @@ no-route = 192.168.5.0/255.255.255.0 # Note the that following two firewalling options currently are available # in Linux systems with iptables software. @@ -58,7 +58,7 @@ # access specific ports in the network. This option can be set globally # or in the per-user configuration. #restrict-user-to-ports = "tcp(443), tcp(80), udp(443), sctp(99), tcp(583), icmp(), icmpv6()" -@@ -609,13 +603,13 @@ no-route = 192.168.5.0/255.255.255.0 +@@ -599,13 +593,13 @@ no-route = 192.168.5.0/255.255.255.0 # hostname to override any proposed by the user. Note also, that, any # routes, no-routes, DNS or NBNS servers present will overwrite the global ones. Index: net/ocserv/files/patch-src_main-ban.c =================================================================== --- /dev/null +++ net/ocserv/files/patch-src_main-ban.c @@ -0,0 +1,20 @@ +--- src/main-ban.c.orig 2021-01-25 11:18:01 UTC ++++ src/main-ban.c +@@ -403,8 +403,8 @@ static bool test_local_ipv6(struct sockaddr_in6 * remo + unsigned index = 0; + + for (index = 0; index < 4; index ++) { +- uint32_t l = local->sin6_addr.s6_addr32[index] & network->sin6_addr.s6_addr32[index]; +- uint32_t r = remote->sin6_addr.s6_addr32[index] & network->sin6_addr.s6_addr32[index]; ++ uint32_t l = local->sin6_addr.__u6_addr.__u6_addr32[index] & network->sin6_addr.__u6_addr.__u6_addr32[index]; ++ uint32_t r = remote->sin6_addr.__u6_addr.__u6_addr32[index] & network->sin6_addr.__u6_addr.__u6_addr32[index]; + if (l != r) + return false; + } +@@ -443,4 +443,4 @@ void if_address_cleanup(main_server_st * s) + + s->if_addresses = NULL; + s->if_addresses_count = 0; +-} +\ No newline at end of file ++} Index: net/ocserv/files/patch-src_occtl_occtl.c =================================================================== --- net/ocserv/files/patch-src_occtl_occtl.c +++ net/ocserv/files/patch-src_occtl_occtl.c @@ -1,6 +1,6 @@ ---- src/occtl/occtl.c.orig 2018-01-14 16:25:24 UTC +--- src/occtl/occtl.c.orig 2020-08-06 18:51:31 UTC +++ src/occtl/occtl.c -@@ -249,7 +249,7 @@ static int handle_help_cmd(CONN_TYPE * conn, const cha +@@ -264,7 +264,7 @@ static int handle_help_cmd(CONN_TYPE * conn, const cha static int handle_reset_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params) { rl_reset_terminal(NULL);