summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-01-11 17:36:19 +0100
committerDavid Seifert <soap@gentoo.org>2017-01-15 10:48:09 +0100
commit1ce841ff7dbb245a581c6cfcc699d33defa16c2c (patch)
treebc6e930d50053dd8a44a5c09d46897fcd1d05546 /net-misc
parentnet-analyzer/linkchecker: remove unused patches (diff)
downloadgentoo-1ce841ff7dbb245a581c6cfcc699d33defa16c2c.tar.gz
gentoo-1ce841ff7dbb245a581c6cfcc699d33defa16c2c.tar.bz2
gentoo-1ce841ff7dbb245a581c6cfcc699d33defa16c2c.zip
net-misc/openvpn: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3434
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/openvpn/files/openvpn-2.4_rc1-arm-inotify-only-in-server-mode.patch30
-rw-r--r--net-misc/openvpn/files/openvpn-2.4_rc1-fix-async-push.patch32
2 files changed, 0 insertions, 62 deletions
diff --git a/net-misc/openvpn/files/openvpn-2.4_rc1-arm-inotify-only-in-server-mode.patch b/net-misc/openvpn/files/openvpn-2.4_rc1-arm-inotify-only-in-server-mode.patch
deleted file mode 100644
index 94d80b616efb..000000000000
--- a/net-misc/openvpn/files/openvpn-2.4_rc1-arm-inotify-only-in-server-mode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 7084a3993fa35c6fb71abe8aac7b30f442205e2a
-Author: Lev Stipakov <lstipakov@gmail.com>
-Date: Wed Dec 7 01:45:51 2016 +0200
-
- Arm inotify only in server mode
-
- Async-push is a server side feature and inotify_fd is
- initialized in server mode.
-
- Trac: #786
- Signed-off-by: Lev Stipakov <lstipakov@gmail.com>
- Acked-by: David Sommerseth <davids@openvpn.net>
- Message-Id: <1481067951-28917-1-git-send-email-lstipakov@gmail.com>
- URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13415.html
- Signed-off-by: David Sommerseth <davids@openvpn.net>
-
-diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
-index b50a2e0..4502e10 100644
---- a/src/openvpn/forward.c
-+++ b/src/openvpn/forward.c
-@@ -1578,7 +1578,8 @@ io_wait_dowork (struct context *c, const unsigned int flags)
-
- #ifdef ENABLE_ASYNC_PUSH
- /* arm inotify watcher */
-- event_ctl (c->c2.event_set, c->c2.inotify_fd, EVENT_READ, (void*)&file_shift);
-+ if (c->options.mode == MODE_SERVER)
-+ event_ctl (c->c2.event_set, c->c2.inotify_fd, EVENT_READ, (void*)&file_shift);
- #endif
-
- /*
diff --git a/net-misc/openvpn/files/openvpn-2.4_rc1-fix-async-push.patch b/net-misc/openvpn/files/openvpn-2.4_rc1-fix-async-push.patch
deleted file mode 100644
index 93b9045a8aa6..000000000000
--- a/net-misc/openvpn/files/openvpn-2.4_rc1-fix-async-push.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit e62eccf025aa60ec268787d2aa4a46310ed1cd60
-Author: David Sommerseth <davids@openvpn.net>
-Date: Tue Dec 6 23:10:51 2016 +0100
-
- Fix wrong configure.ac parsing of --enable-async-push
-
- AC_ARG_ENABLE() was used wrong, which led enable_async_push to
- always be set, regardless if --enable-async-push or --disable-async-push
- was used.
-
- Also spotted the exact same patch when writing this commit message as
- GitHub PR#70.
-
- Trac: #786
- Signed-off-by: David Sommerseth <davids@openvpn.net>
- Acked-by: Lev Stipakov <lstipakov@gmail.com>
- Message-Id: <1481062251-18349-1-git-send-email-davids@openvpn.net>
- URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13411.html
-
-diff --git a/configure.ac b/configure.ac
-index f4073d0..27bdcc3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -267,7 +267,7 @@ AC_ARG_ENABLE(
- AC_ARG_ENABLE(
- [async-push],
- [AS_HELP_STRING([--enable-async-push], [enable async-push support @<:@default=no@:>@])],
-- [enable_async_push="yes"],
-+ ,
- [enable_async_push="no"]
- )
-