summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-11-10 18:48:18 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-11-10 18:48:18 +0000
commit17562fe0dcf00f8df8fa8a5d4ddc794b26a87a70 (patch)
tree8837171b2ef7b308442b6990d77d51c29ccda977 /net-misc/networkmanager-openvpn
parentpunt old wrt #340329 (diff)
downloadgentoo-2-17562fe0dcf00f8df8fa8a5d4ddc794b26a87a70.tar.gz
gentoo-2-17562fe0dcf00f8df8fa8a5d4ddc794b26a87a70.tar.bz2
gentoo-2-17562fe0dcf00f8df8fa8a5d4ddc794b26a87a70.zip
punt old wrt #340329
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/networkmanager-openvpn')
-rw-r--r--net-misc/networkmanager-openvpn/Manifest8
-rw-r--r--net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch17
-rw-r--r--net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch119
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild62
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild55
-rw-r--r--net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild49
6 files changed, 0 insertions, 310 deletions
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index a2faf51683a9..41287b3b43b0 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,14 +1,6 @@
-AUX networkmanager-openvpn-0.3.2_p20070621-service-name.patch 612 RMD160 43736ae448fceebf03511b5c9c94c7ea898d8538 SHA1 b91e195d70383036fb79c59ff99f4fe7fbd2861a SHA256 dd615118e9a2fea251a759a6e49cbaf8da611598e18fd9ab3144f374474252b3
-AUX networkmanager-openvpn-0.7.1-glibc2.10.fix.patch 3585 RMD160 510a11d6642f95c2aae2f96deaea60a0325863ad SHA1 3a35211f309c8ece2565dc106d73041e47e98395 SHA256 5bee6702d64b4d881b2eac720a82bde799b41d2e034840fa5d77943df5b57e4a
-DIST NetworkManager-openvpn-0.3.2_p20070621.tar.gz 467416 RMD160 8077b3b629e1c003d5ea78ad7c3aa17d4d6a1f15 SHA1 0c9d1ee1db9608ff2fcfc3ae2e1ce3847deb7789 SHA256 e6552cd2180698e304f4a3e0f5db0d945f896931433febac3d88e6e8be2dd22c
-DIST NetworkManager-openvpn-0.7.1.tar.bz2 381840 RMD160 fc0e8d82d9cc20b4c326685f3b1c817c814b99a4 SHA1 73c4e37b0d130b6c08ff814bde2fa63f7cc63c0a SHA256 7c6a7b9b8c6ccf3e2fbf2431b9fb2035f99e1d78065f3344f667e2f108f38d5b
-DIST NetworkManager-openvpn-0.7.2.tar.bz2 398612 RMD160 3aaca391876860c09dee5c0c23d15f025a980502 SHA1 95fd8e3625bbd69293db721539a66c10140cecdb SHA256 cce2deb114f55559f6c2f2fd5ddb3b12a4812549a5354ea92c65c42d8e67a47f
DIST NetworkManager-openvpn-0.8.1.tar.bz2 406698 RMD160 f2ef27fd724d039ca0ee6db69aa41c08192da59f SHA1 5369a5d2c5effd29991aab182ea1c792e4623cdc SHA256 7deac7c07da82292722f74135462e36a964ace7faf43e9a6d367dcefea721ecc
DIST NetworkManager-openvpn-0.8.2.tar.bz2 404472 RMD160 da62be9dbbe5781920d2e0a2e990e783d6ea45e5 SHA1 3618555e141b9b770f8e7eeda7d6ef8315244645 SHA256 21d540b7e7cd88cff3173bb3574a88d4dd76da564fccc58dc436a68476d6d6fe
DIST NetworkManager-openvpn-0.8.tar.bz2 400780 RMD160 801e63f12d2128438313c8b2f945eeae571b247e SHA1 f7bab5b53e332186b3e898200c07a8107381f982 SHA256 8fd6f25093ade66a98ce1327f24ef953351aabf02870c5dcf12500a6b7f08d43
-EBUILD networkmanager-openvpn-0.3.2_p20070621.ebuild 1643 RMD160 9e052e7242b196ef1ca59d53ce6d0e94926b07cd SHA1 d2fb7746f4dde6c38430256ca5e600141ce6ab5a SHA256 7007c4c8186937fabd850ffc98f2c28b102aaa9bdcaa4fa0cb46f6712f057240
-EBUILD networkmanager-openvpn-0.7.1-r1.ebuild 1312 RMD160 ddce877c25b652819327405ec930fbf31ff9bfd3 SHA1 73eaa7f827ba89be16f0f5116a8729591b1daca7 SHA256 f108f887c2b2a75b67e80a65897306a3eaeb5157303242a25f05b8e000d7b1fd
-EBUILD networkmanager-openvpn-0.7.2.ebuild 1221 RMD160 6a897482da104f5b3d730fe7673ffd20b204357d SHA1 800587321a30174af39bf95fc1e7685bf0737985 SHA256 470a48bd7f00d08090b88fb29f5455d43a5dbe3939bd637d1b5d820653d0c8f9
EBUILD networkmanager-openvpn-0.8.1.ebuild 1226 RMD160 20d245d9a2096497c800fad17bf39037941c30e6 SHA1 9c621f91ae1e4709cc9cf1f3ebf402a0f3d60d7a SHA256 0e92657db50c287b0bfe7690e49df0916712e26bbd79575c01c7b2f6747b6cf8
EBUILD networkmanager-openvpn-0.8.2.ebuild 1226 RMD160 c9c739eea7ffee38e506fa70127497d97dfffc56 SHA1 0b040d1e0135df29520c5092d5868a343ca5e6be SHA256 561dbde869cedb283b97364f17ffe4c255651a3bfab8d9463869d61ef7937087
EBUILD networkmanager-openvpn-0.8.ebuild 1224 RMD160 d3c1b204820efdbd21d8c3e46e301113d82fee0c SHA1 f2ea4236f2b8c05cbd8e96ffc6cc0b074c19e139 SHA256 bbea92555a3b4c298dc3219182d8ea664eabf8decc59cf57eedeae31eb2f3f68
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch
deleted file mode 100644
index 1c127ed70ed0..000000000000
--- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.3.2_p20070621-service-name.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes bug http://bugzilla.gnome.org/show_bug.cgi?id=447577
-
-Index: openvpn/nm-openvpn-service.name.in
-===================================================================
---- openvpn/nm-openvpn-service.name.in (revision 2653)
-+++ openvpn/nm-openvpn-service.name.in (working copy)
-@@ -1,8 +1,8 @@
- [VPN Connection]
- name=openvpn
- service=org.freedesktop.NetworkManager.openvpn
--program=@bindir@/nm-openvpn-service
-+program=@BINDIR@/nm-openvpn-service
-
- [GNOME]
--auth-dialog=@libexecdir@/nm-openvpn-auth-dialog
-+auth-dialog=@LIBEXECDIR@/nm-openvpn-auth-dialog
- properties=@prefix@/${LIB}/libnm-openvpn-properties
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch
deleted file mode 100644
index f630476a1648..000000000000
--- a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-0.7.1-glibc2.10.fix.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 27192957d887915a23f186a34c3bb85af3faba3a Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Tue, 14 Jul 2009 10:51:33 +0000
-Subject: don't use sscanf
-
-besides the fact that for some reason sscanf wasn't working, it's evil
-and confusing, and we don't even need to use it. Also add the ability
-to set OPENVPN_DEBUG to get more info out of openvpn.
----
-diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
-index 346df20..6cde642 100644
---- a/src/nm-openvpn-service.c
-+++ b/src/nm-openvpn-service.c
-@@ -287,6 +287,35 @@ ovpn_quote_string (const char *unquoted)
- return quoted;
- }
-
-+/* sscanf is evil, and since we can't use glib regexp stuff since it's still
-+ * too new for some distros, do a simple match here.
-+ */
-+static char *
-+get_detail (const char *input, const char *prefix)
-+{
-+ char *ret = NULL;
-+ guint32 i = 0;
-+ const char *p, *start;
-+
-+ g_return_val_if_fail (prefix != NULL, NULL);
-+
-+ if (!g_str_has_prefix (input, prefix))
-+ return NULL;
-+
-+ /* Grab characters until the next ' */
-+ p = start = input + strlen (prefix);
-+ while (*p) {
-+ if (*p == '\'') {
-+ ret = g_malloc0 (i + 1);
-+ strncpy (ret, start, i);
-+ break;
-+ }
-+ p++, i++;
-+ }
-+
-+ return ret;
-+}
-+
- static gboolean
- handle_management_socket (NMVPNPlugin *plugin,
- GIOChannel *source,
-@@ -295,7 +324,7 @@ handle_management_socket (NMVPNPlugin *plugin,
- {
- NMOpenvpnPluginIOData *io_data = NM_OPENVPN_PLUGIN_GET_PRIVATE (plugin)->io_data;
- gboolean again = TRUE;
-- char *str = NULL, *auth, *buf;
-+ char *str = NULL, *auth = NULL, *buf;
- gsize written;
-
- if (!(condition & G_IO_IN))
-@@ -307,7 +336,8 @@ handle_management_socket (NMVPNPlugin *plugin,
- if (strlen (str) < 1)
- goto out;
-
-- if (sscanf (str, ">PASSWORD:Need '%a[^']'", &auth) > 0) {
-+ auth = get_detail (str, ">PASSWORD:Need '");
-+ if (auth) {
- if (strcmp (auth, "Auth") == 0) {
- if (io_data->username != NULL && io_data->password != NULL) {
- char *quser, *qpass;
-@@ -351,8 +381,11 @@ handle_management_socket (NMVPNPlugin *plugin,
- *out_failure = NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED;
- again = FALSE;
- }
-- free (auth);
-- } else if (sscanf (str, ">PASSWORD:Verification Failed: '%a[^']'", &auth) > 0) {
-+ g_free (auth);
-+ }
-+
-+ auth = get_detail (str, ">PASSWORD:Verification Failed: '");
-+ if (auth) {
- if (!strcmp (auth, "Auth"))
- nm_warning ("Password verification failed");
- else if (!strcmp (auth, "Private Key"))
-@@ -360,7 +393,7 @@ handle_management_socket (NMVPNPlugin *plugin,
- else
- nm_warning ("Unknown verification failed: %s", auth);
-
-- free (auth);
-+ g_free (auth);
-
- if (out_failure)
- *out_failure = NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED;
-@@ -688,6 +721,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
- add_openvpn_arg (args, "--auth");
- add_openvpn_arg (args, auth);
- }
-+ add_openvpn_arg (args, "--auth-nocache");
-
- /* TA */
- tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA);
-@@ -700,9 +734,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
- add_openvpn_arg (args, tmp);
- }
-
-- /* Syslog */
-- add_openvpn_arg (args, "--syslog");
-- add_openvpn_arg (args, "nm-openvpn");
-+ if (getenv ("OPENVPN_DEBUG")) {
-+ add_openvpn_arg (args, "--verb");
-+ add_openvpn_arg (args, "10");
-+ } else {
-+ /* Syslog */
-+ add_openvpn_arg (args, "--syslog");
-+ add_openvpn_arg (args, "nm-openvpn");
-+ }
-
- /* Punch script security in the face; this option was added to OpenVPN 2.1-rc9
- * and defaults to disallowing any scripts, a behavior change from previous
---
-cgit v0.8.2
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
deleted file mode 100644
index 6867a705c8a2..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.3.2_p20070621.ebuild,v 1.4 2009/04/22 14:22:08 rbu Exp $
-
-inherit gnome2 eutils autotools
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-#SRC_URI="http://dev.gentoo.org/~rbu/distfiles/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="crypt doc gnome"
-
-RDEPEND=">=sys-apps/dbus-0.35.2
- >=sys-apps/hal-0.5
- sys-apps/iproute2
- >=net-misc/dhcdbd-1.4
- >=net-wireless/wireless-tools-28_pre9
- >=dev-libs/glib-2.8
- =net-misc/networkmanager-0.6*
- gnome? ( >=x11-libs/gtk+-2.8
- >=gnome-base/libglade-2
- >=gnome-base/gnome-keyring-0.4
- >=gnome-base/gnome-panel-2
- >=gnome-base/gconf-2
- >=gnome-base/libgnomeui-2 )
- !gnome? ( >=gnome-base/libglade-2
- >=gnome-base/gnome-keyring-0.4
- >=gnome-base/gconf-2 )
- >=net-misc/openvpn-2.0.5
- crypt? ( dev-libs/libgcrypt )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-util/intltool"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
- `use_with crypt gcrypt` \
- `use_with gnome` \
- --disable-more-warnings \
- --with-dbus-sys=/etc/dbus-1/system.d \
- --enable-notification-icon"
-
-src_unpack () {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-service-name.patch"
- intltoolize --copy --automake --force || die "intltoolize failed"
- eautoreconf
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild
deleted file mode 100644
index 309acbead37b..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.1-r1.ebuild,v 1.1 2009/08/24 14:11:40 dagger Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-openvpn/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
- =net-misc/networkmanager-${MYPV_MINOR}*
- >=net-misc/openvpn-2.1_rc9
- gnome? (
- >=gnome-base/gconf-2.20
- >=gnome-base/gnome-keyring-2.20
- >=gnome-base/libglade-2
- >=gnome-base/libgnomeui-2.20
- >=x11-libs/gtk+-2.10
- )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-
- # fixes bug #282428
- epatch "${FILESDIR}"/${P}-glibc2.10.fix.patch
-}
-
-src_configure() {
- ECONF="--disable-more-warnings \
- $(use_with gnome)"
-
- econf ${ECONF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild
deleted file mode 100644
index dc2e9b8e6136..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.7.2.ebuild,v 1.1 2009/12/02 11:46:15 dagger Exp $
-
-EAPI=2
-inherit eutils versionator
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="NetworkManager OpenVPN plugin."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="mirror://gnome/sources/NetworkManager-openvpn/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="gnome"
-
-RDEPEND="
- =net-misc/networkmanager-${MYPV_MINOR}*
- >=net-misc/openvpn-2.1_rc9
- gnome? (
- >=gnome-base/gconf-2.20
- >=gnome-base/gnome-keyring-2.20
- >=gnome-base/libglade-2
- >=gnome-base/libgnomeui-2.20
- >=x11-libs/gtk+-2.10
- )"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- ECONF="--disable-more-warnings \
- $(use_with gnome)"
-
- econf ${ECONF}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}