Added patches to enable txqueuelen when making a persistent interface, #150791

(Portage version: 2.1.2_rc1-r4)

4 files changed, 94 insertions, 0 deletions

diff --git a/net-misc/openvpn/files/digest-openvpn-2.0.7-r1 b/net-misc/openvpn/files/digest-openvpn-2.0.7-r1
new file mode 100644
index 000000000000..c534cdba1b47
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.0.7-r1
@@ -0,0 +1,3 @@
+MD5 93528233f1f6d02fc18e2c00f82e0aca openvpn-2.0.7.tar.gz 665129
+RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 openvpn-2.0.7.tar.gz 665129
+SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e openvpn-2.0.7.tar.gz 665129
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r1 b/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r1
new file mode 100644
index 000000000000..03a90a8e78bc
--- /dev/null
+++ b/net-misc/openvpn/files/digest-openvpn-2.1_rc1-r1
@@ -0,0 +1,3 @@
+MD5 b0773149ef9d93a0075dfa42b87042a0 openvpn-2.1_rc1.tar.gz 796620
+RMD160 751d07c3b9b40cc3c9a1649ad8b10b9d889a5690 openvpn-2.1_rc1.tar.gz 796620
+SHA256 b5eb4f0d4eda58aaa8b60eb1b2f1d1a0d55ca22e9b098a2f65b6f44abc1c9e11 openvpn-2.1_rc1.tar.gz 796620
diff --git a/net-misc/openvpn/files/openvpn-2.0.7-persistent.patch b/net-misc/openvpn/files/openvpn-2.0.7-persistent.patch
new file mode 100644
index 000000000000..cddfcdbd33be
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.0.7-persistent.patch
@@ -0,0 +1,44 @@
+diff -u /tmp/openvpn-2.0.7/init.c openvpn-2.0.7/init.c
+--- openvpn-2.0.7/init.c	2006-11-08 13:33:02.043877584 +0000
++++ openvpn-2.0.7/init.c	2006-11-08 13:33:24.000000000 +0000
+@@ -347,7 +347,8 @@
+ 	msg (M_FATAL|M_OPTERR,
+ 	     "options --mktun or --rmtun should only be used together with --dev");
+       tuncfg (options->dev, options->dev_type, options->dev_node,
+-	      options->tun_ipv6, options->persist_mode);
++	      options->tun_ipv6, options->persist_mode,
++	      &options->tuntap_options);
+       return true;
+     }
+ #endif
+diff -u /tmp/openvpn-2.0.7/tun.c openvpn-2.0.7/tun.c
+--- openvpn-2.0.7/tun.c	2006-11-08 13:33:02.037878496 +0000
++++ openvpn-2.0.7/tun.c	2006-11-08 13:34:20.000000000 +0000
+@@ -1095,13 +1095,14 @@
+ #ifdef TUNSETPERSIST
+ 
+ void
+-tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode)
++tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options)
+ {
+   struct tuntap *tt;
+ 
+   ALLOC_OBJ (tt, struct tuntap);
+   clear_tuntap (tt);
+   tt->type = dev_type_enum (dev, dev_type);
++  tt->options = *options;
+   open_tun (dev, dev_type, dev_node, ipv6, tt);
+   if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0)
+     msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev);
+diff -u /tmp/openvpn-2.0.7/tun.h openvpn-2.0.7/tun.h
+--- openvpn-2.0.7/tun.h	2006-11-08 13:33:02.042877736 +0000
++++ openvpn-2.0.7/tun.h	2006-11-08 13:33:50.000000000 +0000
+@@ -194,7 +194,7 @@
+ int read_tun (struct tuntap* tt, uint8_t *buf, int len);
+ 
+ void tuncfg (const char *dev, const char *dev_type, const char *dev_node,
+-	     bool ipv6, int persist_mode);
++	     bool ipv6, int persist_mode, const struct tuntap_options *options);
+ 
+ const char *guess_tuntap_dev (const char *dev,
+ 			      const char *dev_type,
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc1-persistent.patch b/net-misc/openvpn/files/openvpn-2.1_rc1-persistent.patch
new file mode 100644
index 000000000000..2ffb4910089f
--- /dev/null
+++ b/net-misc/openvpn/files/openvpn-2.1_rc1-persistent.patch
@@ -0,0 +1,44 @@
+diff -u openvpn-2.1_rc1/init.c /tmp/openvpn-2.1_rc1/init.c
+--- openvpn-2.1_rc1/init.c	2006-10-15 23:30:20.000000000 +0100
++++ openvpn-2.1_rc1/init.c	2006-11-08 13:25:04.136530544 +0000
+@@ -425,7 +425,8 @@
+ 	msg (M_FATAL|M_OPTERR,
+ 	     "options --mktun or --rmtun should only be used together with --dev");
+       tuncfg (options->dev, options->dev_type, options->dev_node,
+-	      options->tun_ipv6, options->persist_mode);
++	      options->tun_ipv6, options->persist_mode,
++	      &options->tuntap_options);
+       if (options->persist_mode && options->lladdr)
+         set_lladdr(options->dev, options->lladdr, NULL);
+       return true;
+diff -u openvpn-2.1_rc1/tun.c /tmp/openvpn-2.1_rc1/tun.c
+--- openvpn-2.1_rc1/tun.c	2006-10-15 23:30:20.000000000 +0100
++++ openvpn-2.1_rc1/tun.c	2006-11-08 13:25:04.129531608 +0000
+@@ -1163,13 +1163,14 @@
+ #ifdef TUNSETPERSIST
+ 
+ void
+-tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode)
++tuncfg (const char *dev, const char *dev_type, const char *dev_node, bool ipv6, int persist_mode, const struct tuntap_options *options)
+ {
+   struct tuntap *tt;
+ 
+   ALLOC_OBJ (tt, struct tuntap);
+   clear_tuntap (tt);
+   tt->type = dev_type_enum (dev, dev_type);
++  tt->options = *options;
+   open_tun (dev, dev_type, dev_node, ipv6, tt);
+   if (ioctl (tt->fd, TUNSETPERSIST, persist_mode) < 0)
+     msg (M_ERR, "Cannot ioctl TUNSETPERSIST(%d) %s", persist_mode, dev);
+diff -u openvpn-2.1_rc1/tun.h /tmp/openvpn-2.1_rc1/tun.h
+--- openvpn-2.1_rc1/tun.h	2006-10-15 23:30:20.000000000 +0100
++++ openvpn-2.1_rc1/tun.h	2006-11-08 13:25:04.135530696 +0000
+@@ -204,7 +204,7 @@
+ int read_tun (struct tuntap* tt, uint8_t *buf, int len);
+ 
+ void tuncfg (const char *dev, const char *dev_type, const char *dev_node,
+-	     bool ipv6, int persist_mode);
++	     bool ipv6, int persist_mode, const struct tuntap_options *options);
+ 
+ const char *guess_tuntap_dev (const char *dev,
+ 			      const char *dev_type,