Date: Sat, 27 Aug 2016 10:59:53 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: Matthias Andree <mandree@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r420956 - in head/security/openvpn: . files Message-ID: <4B0CDF959661883F3BF10966@atuin.in.mat.cc> In-Reply-To: <201608270117.u7R1HOAo089318@repo.freebsd.org> References: <201608270117.u7R1HOAo089318@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--==========96A3179D0201D9A78D8B========== Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline +--On 27 ao=C3=BBt 2016 01:17:24 +0000 Matthias Andree = <mandree@FreeBSD.org> wrote: | +PORTREVISION=3D 1 Why bump PORTREVISION ? The patch does not change any code. | CATEGORIES=3D security net | MASTER_SITES=3D http://swupdate.openvpn.net/community/releases/ \ | http://build.openvpn.net/downloads/releases/ |=20 | Modified: head/security/openvpn/files/extra-tunnelblick-openvpn_xorpatch | = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D | =3D=3D=3D=3D=3D --- = head/security/openvpn/files/extra-tunnelblick-openvpn_xorpatch | Sat Aug 27 00:34:00 2016 (r420955) +++ | head/security/openvpn/files/extra-tunnelblick-openvpn_xorpatch Sat Aug 27 | 01:17:24 2016 (r420956) @@ -11,10 +11,9 @@ detail on the following wiki | page: | https://tunnelblick.net/cOpenvpn_xorpatch.html | =20 | =20 | -diff -u -r src/openvpn/forward.c src/openvpn/forward.c | ---- src/openvpn/forward.c.orig 2016-08-23 16:16:28.000000000 +0200 | -+++ src/openvpn/forward.c 2016-08-25 14:52:22.543333000 +0200 | -@@ -674,7 +674,10 @@ | +--- src/openvpn/forward.c.orig 2016-08-23 14:16:28 UTC | ++++ src/openvpn/forward.c | +@@ -674,7 +674,10 @@ read_incoming_link (struct context *c) | =20 | status =3D link_socket_read (c->c2.link_socket, | &c->c2.buf, | @@ -26,7 +25,7 @@ diff -u -r src/openvpn/forward.c src/ope | =20 | if (socket_connection_reset (c->c2.link_socket, status)) | { | -@@ -1151,7 +1154,10 @@ | +@@ -1151,7 +1154,10 @@ process_outgoing_link (struct context *c | /* Send packet */ | size =3D link_socket_write (c->c2.link_socket, | &c->c2.to_link, | @@ -38,10 +37,9 @@ diff -u -r src/openvpn/forward.c src/ope | =20 | #ifdef ENABLE_SOCKS | /* Undo effect of prepend */ | -diff -u -r src/openvpn/options.c src/openvpn/options.c | ---- src/openvpn/options.c 2014-11-29 10:00:35.000000000 -0500 | -+++ src/openvpn/options.c 2015-04-09 12:56:32.000000000 -0400 | -@@ -785,6 +785,9 @@ | +--- src/openvpn/options.c.orig 2016-08-23 14:16:22 UTC | ++++ src/openvpn/options.c | +@@ -792,6 +792,9 @@ init_options (struct options *o, const b | o->max_routes =3D MAX_ROUTES_DEFAULT; | o->resolve_retry_seconds =3D RESOLV_RETRY_INFINITE; | o->proto_force =3D -1; | @@ -51,7 +49,7 @@ diff -u -r src/openvpn/options.c src/ope | #ifdef ENABLE_OCC | o->occ =3D true; | #endif | -@@ -903,6 +906,9 @@ | +@@ -907,6 +910,9 @@ setenv_connection_entry (struct env_set=20 | setenv_int_i (es, "local_port", e->local_port, i); | setenv_str_i (es, "remote", e->remote, i); | setenv_int_i (es, "remote_port", e->remote_port, i); | @@ -61,7 +59,7 @@ diff -u -r src/openvpn/options.c src/ope | =20 | #ifdef ENABLE_HTTP_PROXY | if (e->http_proxy_options) | -@@ -1348,6 +1354,9 @@ | +@@ -1366,6 +1372,9 @@ show_connection_entry (const struct conn | SHOW_INT (connect_retry_seconds); | SHOW_INT (connect_timeout); | SHOW_INT (connect_retry_max); | @@ -71,7 +69,7 @@ diff -u -r src/openvpn/options.c src/ope | =20 | #ifdef ENABLE_HTTP_PROXY | if (o->http_proxy_options) | -@@ -5049,6 +5058,46 @@ | +@@ -5131,6 +5140,46 @@ add_option (struct options *options, | options->proto_force =3D proto_force; | options->force_connection_list =3D true; | } | @@ -118,10 +116,9 @@ diff -u -r src/openvpn/options.c src/ope | #ifdef ENABLE_HTTP_PROXY | else if (streq (p[0], "http-proxy") && p[1]) | { | -diff -u -r src/openvpn/options.h src/openvpn/options.h | ---- src/openvpn/options.h 2014-11-29 10:00:35.000000000 -0500 | -+++ src/openvpn/options.h 2015-04-07 22:38:20.000000000 -0400 | -@@ -100,6 +100,9 @@ | +--- src/openvpn/options.h.orig 2016-08-23 14:16:22 UTC | ++++ src/openvpn/options.h | +@@ -100,6 +100,9 @@ struct connection_entry | int connect_retry_max; | int connect_timeout; | bool connect_timeout_defined; | @@ -131,10 +128,9 @@ diff -u -r src/openvpn/options.h src/ope | #ifdef ENABLE_HTTP_PROXY | struct http_proxy_options *http_proxy_options; | #endif =20 | -diff -u -r src/openvpn/socket.c src/openvpn/socket.c | ---- src/openvpn/socket.c 2014-11-29 10:00:35.000000000 -0500 | -+++ src/openvpn/socket.c 2015-04-09 08:48:01.000000000 -0400 | -@@ -52,6 +52,53 @@ | +--- src/openvpn/socket.c.orig 2016-08-23 14:16:22 UTC | ++++ src/openvpn/socket.c | +@@ -52,6 +52,53 @@ const int proto_overhead[] =3D { /* indexe | IPv6_TCP_HEADER_SIZE, | }; | =20 | @@ -188,10 +184,9 @@ diff -u -r src/openvpn/socket.c src/open | /* | * Convert sockflags/getaddr_flags into getaddr_flags | */ | -diff -u -r src/openvpn/socket.h src/openvpn/socket.h | ---- src/openvpn/socket.h.orig 2016-08-23 16:16:22.000000000 +0200 | -+++ src/openvpn/socket.h 2016-08-25 14:53:35.121689000 +0200 | -@@ -245,6 +245,10 @@ | +--- src/openvpn/socket.h.orig 2016-08-23 14:16:22 UTC | ++++ src/openvpn/socket.h | +@@ -245,6 +245,10 @@ struct link_socket | #endif | }; | =20 | @@ -202,7 +197,7 @@ diff -u -r src/openvpn/socket.h src/open | /* | * Some Posix/Win32 differences. | */ | -@@ -873,30 +877,56 @@ | +@@ -873,30 +877,56 @@ int link_socket_read_udp_posix (struct l | static inline int | link_socket_read (struct link_socket *sock, | struct buffer *buf, | @@ -263,7 +258,7 @@ diff -u -r src/openvpn/socket.h src/open | } | =20 | /* | -@@ -980,8 +1010,34 @@ | +@@ -980,8 +1010,34 @@ link_socket_write_udp (struct link_socke | static inline int | link_socket_write (struct link_socket *sock, | struct buffer *buf, |=20 |=20 --=20 Mathieu Arnold --==========96A3179D0201D9A78D8B========== Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQJ7BAEBCgBmBQJXwVaJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IjKwP+KeldKyTqu9Wry5UU7lfMz0a 9uxxrzWsZqfFUEvgeXQ2KO0e40U9+l1StdK470Is2+ZuCGLInBuWXL9ftYaacPLS Ew0p08KyPqgqFROUDk/x4QjVmUO64XCPJOk/TddYl4qM95N9ZymAHIAjjE7Tksn+ wv7HqFXBTn7anhyeWrfuINzBCWqx8vV1MV1gGGYOve3g45Hy6Na/s6kQV4p+BSdo qPM2c91Odh5Iy9iXGSc9vk177dMgSSJHveVtgiXm+j6h5nCEM4Gbxi6nvMIZ2nSB oEof3BXxJNWvpPwFGs5hAWIRmhURaHHC1X0rCQaGvUSb5GLNgjDruzGHBxA5xniH FLZnz22/tr3xFroHZaoM4fkWYFDiRA7BX5exWmimi1fu608C62x5zoXZSiKX6OEH Z7B61HTK8rynEY21zqlJf6095dr5mzIrQKZxoDU/IgraSev/RkHMFPk7YE6ddYxy 8n9NG4NXlUMXBdpKyr0QabIQ8oBckmfB+fiPCTxd5xU2st+zQJwiTlkWJpDGMDBR NGpgYyL+GZKMGQbrZSxGXHidNmt7o6mTTyMhSRz9uHE6DBIBxN5eCx/F8qG6uQEH bwDd89Jf+2VzNJcrErjZG+ntvmqNeoqPGXjj06KzoJmueQU5QcTELUtTTrPEDR/O pNnV72bMKmaDMSgubr0= =b+Mh -----END PGP SIGNATURE----- --==========96A3179D0201D9A78D8B==========--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4B0CDF959661883F3BF10966>