diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-03 10:11:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-03 10:11:11 +0000 |
| commit | 9f750544a956d862d37472e9b8f406d613cc381a (patch) | |
| tree | 857b032d5e0323d5a22af96468963b8f43d29aff /main/openvpn/openvpn-2.0.9-persistent.patch | |
| parent | 49900c76bb6afaddf29553c0e8b9b7b4708a2122 (diff) | |
| download | aports-9f750544a956d862d37472e9b8f406d613cc381a.tar.bz2 aports-9f750544a956d862d37472e9b8f406d613cc381a.tar.xz | |
main/openvpn: upgrade to 2.1.1 (moved from testing)
Diffstat (limited to 'main/openvpn/openvpn-2.0.9-persistent.patch')
| -rw-r--r-- | main/openvpn/openvpn-2.0.9-persistent.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/main/openvpn/openvpn-2.0.9-persistent.patch b/main/openvpn/openvpn-2.0.9-persistent.patch deleted file mode 100644 index e042124ea4..0000000000 --- a/main/openvpn/openvpn-2.0.9-persistent.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ru openvpn-2.0.9~/init.c openvpn-2.0.9/init.c ---- openvpn-2.0.9~/init.c 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/init.c 2008-05-13 23:22:51.000000000 +0200 -@@ -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 -ru openvpn-2.0.9~/tun.c openvpn-2.0.9/tun.c ---- openvpn-2.0.9~/tun.c 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/tun.c 2008-05-13 23:22:51.000000000 +0200 -@@ -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 -ru openvpn-2.0.9~/tun.h openvpn-2.0.9/tun.h ---- openvpn-2.0.9~/tun.h 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/tun.h 2008-05-13 23:22:51.000000000 +0200 -@@ -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, |