diff options
author | 2010-10-19 07:40:27 +0000 | |
---|---|---|
committer | 2010-10-19 07:40:27 +0000 | |
commit | 798f2e54abf3f0813a8068047471c401f5f18b5c (patch) | |
tree | 8659bec8a42b986c139fd64a69d2fe79ca94a41d /net-misc/openvpn/files | |
parent | Respect LDFLAGS. Bug #331847 (diff) | |
download | gentoo-2-798f2e54abf3f0813a8068047471c401f5f18b5c.tar.gz gentoo-2-798f2e54abf3f0813a8068047471c401f5f18b5c.tar.bz2 gentoo-2-798f2e54abf3f0813a8068047471c401f5f18b5c.zip |
Clean up cruft from old versions.
(Portage version: 2.1.9.19/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/openvpn/files')
-rw-r--r-- | net-misc/openvpn/files/openvpn-2.0.9-pam.patch | 32 | ||||
-rw-r--r-- | net-misc/openvpn/files/openvpn-2.0.9-persistent.patch | 44 |
2 files changed, 0 insertions, 76 deletions
diff --git a/net-misc/openvpn/files/openvpn-2.0.9-pam.patch b/net-misc/openvpn/files/openvpn-2.0.9-pam.patch deleted file mode 100644 index 38be232b8dd3..000000000000 --- a/net-misc/openvpn/files/openvpn-2.0.9-pam.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru openvpn-2.0.9~/plugin/auth-pam/Makefile openvpn-2.0.9/plugin/auth-pam/Makefile ---- openvpn-2.0.9~/plugin/auth-pam/Makefile 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/plugin/auth-pam/Makefile 2008-05-13 23:21:46.000000000 +0200 -@@ -4,7 +4,7 @@ - - # If PAM modules are not linked against libpam.so, set DLOPEN_PAM to 1. This - # must be done on SUSE 9.1, at least. --DLOPEN_PAM=1 -+DLOPEN_PAM=0 - - ifeq ($(DLOPEN_PAM),1) - LIBPAM=-ldl -diff -ru openvpn-2.0.9~/plugin/auth-pam/pamdl.c openvpn-2.0.9/plugin/auth-pam/pamdl.c ---- openvpn-2.0.9~/plugin/auth-pam/pamdl.c 2008-05-13 23:21:30.000000000 +0200 -+++ openvpn-2.0.9/plugin/auth-pam/pamdl.c 2008-05-13 23:21:46.000000000 +0200 -@@ -10,7 +10,6 @@ - #include <stdio.h> - #include <dlfcn.h> - #include <security/pam_appl.h> --#include <security/_pam_macros.h> - - #include "pamdl.h" - -@@ -74,7 +73,7 @@ - return real_pam_set_item(pamh, item_type, item); - } - --int pam_get_item(const pam_handle_t *pamh, int item_type, const void **item) -+int pam_get_item(pam_handle_t *pamh, int item_type, const void **item) - { - int (*real_pam_get_item)(const pam_handle_t *, int, const void **); - RESOLVE_PAM_FUNCTION(pam_get_item, int, diff --git a/net-misc/openvpn/files/openvpn-2.0.9-persistent.patch b/net-misc/openvpn/files/openvpn-2.0.9-persistent.patch deleted file mode 100644 index e042124ea497..000000000000 --- a/net-misc/openvpn/files/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, |