* [gentoo-commits] proj/gnome:master commit in: gnome-extra/nm-applet/, net-misc/networkmanager/, net-misc/networkmanager/files/
@ 2011-03-10 15:41 Nirbheek Chauhan
0 siblings, 0 replies; only message in thread
From: Nirbheek Chauhan @ 2011-03-10 15:41 UTC (permalink / raw
To: gentoo-commits
commit: bf51082e98656ea4311f6ebb43c5860da22b2c14
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 14:04:12 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 14:04:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bf51082e
NetworkManager, applet: bump to latest, remove live versions
* People shouldn't be using the live versions
---
| 64 ---
...applet-9999.ebuild => nm-applet-0.8.996.ebuild} | 2 +-
.../files/networkmanager-0.8.2-confchanges.patch | 25 -
.../networkmanager-0.8.2-shared-connection.patch | 458 --------------------
.../files/networkmanager-fix-tests.patch | 18 +
.../networkmanager/files/nm-system-settings.conf | 6 +
net-misc/networkmanager/metadata.xml | 18 +-
...r-9999.ebuild => networkmanager-0.8.996.ebuild} | 113 ++---
8 files changed, 80 insertions(+), 624 deletions(-)
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild
deleted file mode 100644
index 3bf5ac8..0000000
--- a/gnome-extra/nm-applet/nm-applet-0.8.2-r300.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.2.ebuild,v 1.1 2010/11/10 13:05:32 dagger Exp $
-
-EAPI="2"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 eutils autotools
-
-MY_PN="${PN/nm-applet/network-manager-applet}"
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bluetooth"
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-# FIXME: bluetooth is automagic
-RDEPEND=">=dev-libs/glib-2.16
- >=dev-libs/dbus-glib-0.74
- >=sys-apps/dbus-1.2.6
- >=x11-libs/gtk+-2.18
- >=gnome-base/gconf-2.20
- >=gnome-extra/polkit-gnome-0.92
- >=x11-libs/libnotify-0.7.0
- >=gnome-base/libglade-2
- >=gnome-base/gnome-keyring-2.20
-
- >=dev-libs/libnl-1.1
- >=net-misc/networkmanager-${PV}
- >=net-wireless/wireless-tools-28_pre9
- >=net-wireless/wpa_supplicant-0.5.7
- || ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
- net-misc/mobile-broadband-provider-info
- bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-# USE_DESTDIR="1"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- gnome2_src_prepare
-
- G2CONF="${G2CONF}
- --disable-more-warnings
- --localstatedir=/var"
-
- # Taken from upstream trunk, won't be needed next release
- epatch "${FILESDIR}/${PN}-port-to-libnotify-0.7.patch"
- eautoreconf
-}
diff --git a/gnome-extra/nm-applet/nm-applet-9999.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.996.ebuild
similarity index 98%
rename from gnome-extra/nm-applet/nm-applet-9999.ebuild
rename to gnome-extra/nm-applet/nm-applet-0.8.996.ebuild
index 73de4c1..423aebd 100644
--- a/gnome-extra/nm-applet/nm-applet-9999.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.996.ebuild
@@ -53,7 +53,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
pkg_setup() {
G2CONF="${G2CONF}
- --without-gtk2
+ --with-gtkver=3
--disable-more-warnings
--localstatedir=/var"
}
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch
deleted file mode 100644
index a5acc38..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-confchanges.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/NetworkManager.conf~ 2010-11-03 13:04:05.000000000 +0000
-+++ src/NetworkManager.conf 2010-12-17 12:12:48.391177001 +0000
-@@ -57,6 +57,9 @@
- <allow send_destination="org.freedesktop.NetworkManager"
- send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
-
-+ <allow send_destination="org.freedesktop.NetworkManager"
-+ send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
-+
- <deny send_destination="org.freedesktop.NetworkManager"
- send_interface="org.freedesktop.NetworkManager"
- send_member="SetLogging"/>
-@@ -73,6 +76,12 @@
- send_interface="org.freedesktop.NetworkManager"
- send_member="wake"/>
- </policy>
-+ <policy group="plugdev">
-+ <allow send_destination="org.freedesktop.NetworkManager"/>
-+
-+ <deny send_destination="org.freedesktop.NetworkManager"
-+ send_interface="org.freedesktop.NetworkManager.PPP"/>
-+ </policy>
- <policy context="default">
- <deny own="org.freedesktop.NetworkManager"/>
- <deny own="org.freedesktop.NetworkManagerSystemSettings"/>
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
deleted file mode 100644
index 3ce883a..0000000
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-shared-connection.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-From d252fad6aa69aefa17b592111c2db23864f63907 Mon Sep 17 00:00:00 2001
-From: Mu Qiao <qiaomuf@gentoo.org>
-Date: Tue, 25 Jan 2011 10:31:53 +0000
-Subject: [PATCH] shared-connection
-
-Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
----
- system-settings/plugins/ifnet/connection_parser.c | 90 ++++++++++++++------
- system-settings/plugins/ifnet/net_parser.c | 55 +++++++-----
- system-settings/plugins/ifnet/net_parser.h | 4 +-
- system-settings/plugins/ifnet/net_utils.c | 6 +-
- .../plugins/ifnet/nm-ifnet-connection.c | 8 +-
- system-settings/plugins/ifnet/wpa_parser.c | 21 +++--
- 6 files changed, 122 insertions(+), 62 deletions(-)
-
-diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index f9fae51..9b5ddc1 100644
---- a/system-settings/plugins/ifnet/connection_parser.c
-+++ b/system-settings/plugins/ifnet/connection_parser.c
-@@ -557,7 +557,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
-
- NMSettingIP4Config *ip4_setting =
- NM_SETTING_IP4_CONFIG (nm_setting_ip4_config_new ());
-- gchar *value;
-+ gchar *value, *method = NULL;
- gboolean is_static_block = is_static_ip4 (conn_name);
- ip_block *iblock = NULL;
-
-@@ -569,13 +569,41 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- && strstr (value, "nogateway") ? TRUE : FALSE, NULL);
-
- if (!is_static_block) {
-- g_object_set (ip4_setting,
-- NM_SETTING_IP4_CONFIG_METHOD,
-- NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-- NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using DHCP for %s",
-- conn_name);
-- } else {
-+ method = ifnet_get_data (conn_name, "config");
-+ if (!method){
-+ g_set_error (error, ifnet_plugin_error_quark (), 0,
-+ "Unknown config for %s", conn_name);
-+ g_object_unref (ip4_setting);
-+ return;
-+ }
-+ if (!strcmp (method, "dhcp"))
-+ g_object_set (ip4_setting,
-+ NM_SETTING_IP4_CONFIG_METHOD,
-+ NM_SETTING_IP4_CONFIG_METHOD_AUTO,
-+ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+ else if (!strcmp (method, "autoip")){
-+ g_object_set (ip4_setting,
-+ NM_SETTING_IP4_CONFIG_METHOD,
-+ NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL,
-+ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+ nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
-+ return;
-+ } else if (!strcmp (method, "shared")){
-+ g_object_set (ip4_setting,
-+ NM_SETTING_IP4_CONFIG_METHOD,
-+ NM_SETTING_IP4_CONFIG_METHOD_SHARED,
-+ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, FALSE, NULL);
-+ nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
-+ return;
-+ } else {
-+ g_set_error (error, ifnet_plugin_error_quark (), 0,
-+ "Unknown config for %s", conn_name);
-+ g_object_unref (ip4_setting);
-+ return;
-+ }
-+ PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Using %s method for %s",
-+ method, conn_name);
-+ }else {
- iblock = convert_ip4_config_block (conn_name);
- if (!iblock) {
- g_set_error (error, ifnet_plugin_error_quark (), 0,
-@@ -625,7 +653,7 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- }
-
- /* add dhcp hostname and client id */
-- if (!is_static_block) {
-+ if (method && !strcmp (method, "dhcp")) {
- gchar *dhcp_hostname, *client_id;
-
- get_dhcp_hostname_and_client_id (&dhcp_hostname, &client_id);
-@@ -712,7 +740,6 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
- iblock = iblock->next;
- destroy_ip_block (current_iblock);
- }
--
- /* Finally add setting to connection */
- nm_connection_add_setting (connection, NM_SETTING (ip4_setting));
- }
-@@ -1243,10 +1270,10 @@ parse_wpa_psk (gchar * psk, GError ** error)
- * the passphrase contains spaces.
- */
-
-- p = psk;
-- if (p[0] == '"' && psk[strlen (psk) - 1] == '"')
-+ p = g_strdup (psk);
-+ if (p[0] == '"' && p[strlen (p) - 1] == '"')
- quoted = TRUE;
-- if (!quoted && (strlen (psk) == 64)) {
-+ if (!quoted && (strlen (p) == 64)) {
- /* Verify the hex PSK; 64 digits */
- if (!is_hex (p)) {
- g_set_error (error, ifnet_plugin_error_quark (),
-@@ -1254,7 +1281,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
- "Invalid WPA_PSK (contains non-hexadecimal characters)");
- goto out;
- }
-- hashed = g_strdup (psk);
-+ hashed = g_strdup (p);
- } else {
- strip_string (p, '"');
-
-@@ -1276,6 +1303,7 @@ parse_wpa_psk (gchar * psk, GError ** error)
- }
-
- out:
-+ g_free (p);
- return hashed;
- }
-
-@@ -2085,7 +2113,8 @@ write_wireless_security_setting (NMConnection * connection,
- } else if (!strcmp (key_mgmt, "wpa-eap")) {
- wpa_set_data (conn_name, "key_mgmt", "WPA-EAP");
- wpa = TRUE;
-- }
-+ } else
-+ PLUGIN_WARN (IFNET_PLUGIN_NAME, "Unknown key_mgmt: %s", key_mgmt);
-
- if (auth_alg) {
- if (!strcmp (auth_alg, "shared"))
-@@ -2180,8 +2209,11 @@ write_wireless_security_setting (NMConnection * connection,
- g_string_append (quoted, psk);
- g_string_append_c (quoted, '"');
- }
-- wpa_set_data (conn_name, "psk",
-- quoted ? quoted->str : (gchar *) psk);
-+ if (psk)
-+ wpa_set_data (conn_name, "psk",
-+ quoted ? quoted->str : (gchar *) psk);
-+ else
-+ PLUGIN_WARN (IFNET_PLUGIN_NAME, "Use WPA, but no psk received from NM");
- if (quoted)
- g_string_free (quoted, TRUE);
- } else
-@@ -2190,15 +2222,19 @@ write_wireless_security_setting (NMConnection * connection,
- return TRUE;
- }
-
--/* remove old ssid and add new one*/
-+/* Only remove old config when ssid is changed.
-+ * See bug #350476.
-+ * */
- static void
- update_wireless_ssid (NMConnection * connection, gchar * conn_name,
- gchar * ssid, gboolean hex)
- {
-- ifnet_delete_network (conn_name);
-- ifnet_add_connection (ssid, "wireless");
-+ if (strcmp (conn_name, ssid)){
-+ ifnet_delete_network (conn_name);
-+ wpa_delete_security (conn_name);
-+ }
-
-- wpa_delete_security (conn_name);
-+ ifnet_add_network (ssid, "wireless");
- wpa_add_security (ssid);
- }
-
-@@ -2443,7 +2479,11 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
- }
- ifnet_set_data (conn_name, "config", ips->str);
- g_string_free (ips, TRUE);
-- } else
-+ } else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_SHARED))
-+ ifnet_set_data (conn_name, "config", "shared");
-+ else if (!strcmp (value, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL))
-+ ifnet_set_data (conn_name, "config", "autoip");
-+ else
- ifnet_set_data (conn_name, "config", "dhcp");
-
- /* DNS Servers */
-@@ -2858,7 +2898,7 @@ get_wired_name ()
- for (; i < 256; i++) {
- gchar *conn_name = g_strdup_printf ("eth%d", i);
-
-- if (!ifnet_has_connection (conn_name)) {
-+ if (!ifnet_has_network (conn_name)) {
- return conn_name;
- } else
- g_free (conn_name);
-@@ -2875,7 +2915,7 @@ get_ppp_name ()
- for (; i < 256; i++) {
- gchar *conn_name = g_strdup_printf ("ppp%d", i);
-
-- if (!ifnet_has_connection (conn_name)) {
-+ if (!ifnet_has_network (conn_name)) {
- return conn_name;
- } else
- g_free (conn_name);
-@@ -2982,7 +3022,7 @@ ifnet_add_new_connection (NMConnection * connection,
- goto out;
- }
-
-- if (ifnet_add_connection (new_name, new_type))
-+ if (ifnet_add_network (new_name, new_type))
- success =
- ifnet_update_parsers_by_connection (connection, new_name,
- NULL, config_file,
-diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c
-index b4a381d..de2db8a 100644
---- a/system-settings/plugins/ifnet/net_parser.c
-+++ b/system-settings/plugins/ifnet/net_parser.c
-@@ -37,6 +37,9 @@ static GList *functions_list;
- /* Used to decide whether to write changes to file*/
- static gboolean net_parser_data_changed = FALSE;
-
-+static void
-+destroy_connection_config (GHashTable * conn);
-+
- static GHashTable *
- add_new_connection_config (const gchar * type, const gchar * name)
- {
-@@ -58,8 +61,10 @@ add_new_connection_config (const gchar * type, const gchar * name)
- }
-
- gboolean
--ifnet_add_connection (gchar * name, gchar * type)
-+ifnet_add_network (gchar * name, gchar * type)
- {
-+ if (ifnet_has_network (name))
-+ return TRUE;
- if (add_new_connection_config (type, name)) {
- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Adding network for %s", name);
- net_parser_data_changed = TRUE;
-@@ -69,11 +74,27 @@ ifnet_add_connection (gchar * name, gchar * type)
- }
-
- gboolean
--ifnet_has_connection (gchar * conn_name)
-+ifnet_has_network (gchar * conn_name)
- {
- return g_hash_table_lookup (conn_table, conn_name) != NULL;
- }
-
-+gboolean
-+ifnet_delete_network (gchar * conn_name)
-+{
-+ GHashTable *network = NULL;
-+
-+ g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE);
-+ PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name);
-+ network = g_hash_table_lookup (conn_table, conn_name);
-+ if (!network)
-+ return FALSE;
-+ g_hash_table_remove (conn_table, conn_name);
-+ destroy_connection_config (network);
-+ net_parser_data_changed = TRUE;
-+ return TRUE;
-+}
-+
- static GHashTable *
- get_connection_config (gchar * name)
- {
-@@ -377,21 +398,27 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * value)
- {
- gpointer orin_key = NULL, orin_value = NULL;
- GHashTable *conn = g_hash_table_lookup (conn_table, conn_name);
-+ gchar *new_value = NULL;
-
- if (!conn) {
- PLUGIN_WARN (IFNET_PLUGIN_NAME,
- "%s does not exsit!", conn_name);
- return;
- }
-+ if (value){
-+ new_value = g_strdup (value);
-+ strip_string (new_value, '"');
-+ }
- /* Remove existing key value pair */
- if (g_hash_table_lookup_extended (conn, key, &orin_key, &orin_value)) {
-+ if (new_value && !strcmp (orin_value, new_value))
-+ return;
- g_hash_table_remove (conn, orin_key);
- g_free (orin_key);
- g_free (orin_value);
- }
-- if (value)
-- g_hash_table_insert (conn, g_strdup (key),
-- strip_string (g_strdup (value), '"'));
-+ if (new_value)
-+ g_hash_table_insert (conn, g_strdup (key), new_value);
- net_parser_data_changed = TRUE;
- }
-
-@@ -467,7 +494,7 @@ ifnet_flush_to_file (gchar * config_file)
- gboolean result = FALSE;
-
- if (!net_parser_data_changed)
-- return FALSE;
-+ return TRUE;
- if (!conn_table || !global_settings_table)
- return FALSE;
-
-@@ -583,22 +610,6 @@ ifnet_flush_to_file (gchar * config_file)
- return result;
- }
-
--gboolean
--ifnet_delete_network (gchar * conn_name)
--{
-- GHashTable *network = NULL;
--
-- g_return_val_if_fail (conn_table != NULL && conn_name != NULL, FALSE);
-- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Deleting network for %s", conn_name);
-- network = g_hash_table_lookup (conn_table, conn_name);
-- if (!network)
-- return FALSE;
-- g_hash_table_remove (conn_table, conn_name);
-- destroy_connection_config (network);
-- net_parser_data_changed = TRUE;
-- return TRUE;
--}
--
- void
- ifnet_destroy (void)
- {
-diff --git a/system-settings/plugins/ifnet/net_parser.h b/system-settings/plugins/ifnet/net_parser.h
-index 73a44c8..b71a01f 100644
---- a/system-settings/plugins/ifnet/net_parser.h
-+++ b/system-settings/plugins/ifnet/net_parser.h
-@@ -36,11 +36,11 @@ GList *ifnet_get_connection_names (void);
- gchar *ifnet_get_data (gchar * conn_name, const gchar * key);
- gchar *ifnet_get_global_data (const gchar * key);
- gchar *ifnet_get_global_setting (gchar * group, gchar * key);
--gboolean ifnet_has_connection (gchar * conn_name);
-+gboolean ifnet_has_network (gchar * conn_name);
-
- /* Writer functions */
- gboolean ifnet_flush_to_file (gchar * config_file);
- void ifnet_set_data (gchar * conn_name, gchar * key, gchar * value);
--gboolean ifnet_add_connection (gchar * name, gchar * type);
-+gboolean ifnet_add_network (gchar * name, gchar * type);
- gboolean ifnet_delete_network (gchar * conn_name);
- #endif
-diff --git a/system-settings/plugins/ifnet/net_utils.c b/system-settings/plugins/ifnet/net_utils.c
-index 2dc253c..83b4325 100644
---- a/system-settings/plugins/ifnet/net_utils.c
-+++ b/system-settings/plugins/ifnet/net_utils.c
-@@ -278,6 +278,10 @@ is_static_ip4 (gchar * conn_name)
-
- if (!data)
- return FALSE;
-+ if (!strcmp (data, "shared"))
-+ return FALSE;
-+ if (!strcmp (data, "autoip"))
-+ return FALSE;
- dhcp6 = strstr (data, "dhcp6");
- if (dhcp6) {
- gchar *dhcp4;
-@@ -942,8 +946,8 @@ get_dhcp_hostname_and_client_id (char **hostname, char **client_id)
- else if ((tmp = strstr (line, "send host-name")) != NULL) {
- tmp += strlen ("send host-name");
- g_strstrip (tmp);
-- strip_string (tmp, '"');
- strip_string (tmp, ';');
-+ strip_string (tmp, '"');
- if (tmp[0] != '\0')
- *hostname = g_strdup (tmp);
- else
-diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.c b/system-settings/plugins/ifnet/nm-ifnet-connection.c
-index e47495c..ebe2581 100644
---- a/system-settings/plugins/ifnet/nm-ifnet-connection.c
-+++ b/system-settings/plugins/ifnet/nm-ifnet-connection.c
-@@ -71,12 +71,14 @@ nm_ifnet_connection_new (gchar * conn_name)
- {
- NMConnection *tmp;
- GObject *object;
-- GError **error = NULL;
-+ GError *error = NULL;
-
- g_return_val_if_fail (conn_name != NULL, NULL);
-- tmp = ifnet_update_connection_from_config_block (conn_name, error);
-- if (!tmp)
-+ tmp = ifnet_update_connection_from_config_block (conn_name, &error);
-+ if (!tmp){
-+ g_error_free (error);
- return NULL;
-+ }
- object = (GObject *) g_object_new (NM_TYPE_IFNET_CONNECTION,
- NM_IFNET_CONNECTION_CONN_NAME,
- conn_name, NULL);
-diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c
-index 5e94108..42c52c3 100644
---- a/system-settings/plugins/ifnet/wpa_parser.c
-+++ b/system-settings/plugins/ifnet/wpa_parser.c
-@@ -366,7 +366,7 @@ wpa_flush_to_file (gchar * config_file)
- gboolean result = FALSE;
-
- if (!wpa_parser_data_changed)
-- return FALSE;
-+ return TRUE;
- if (!wsec_table || !wsec_global_table)
- return FALSE;
-
-@@ -450,26 +450,29 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * value)
- {
- gpointer orig_key = NULL, orig_value = NULL;
- GHashTable *security = g_hash_table_lookup (wsec_table, ssid);
-+ gchar *new_value = NULL;
-
- g_return_if_fail (security != NULL);
-
-+ if (value){
-+ new_value = g_strdup(value);
-+ if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
-+ && !g_str_has_prefix (key, "wep_key"))
-+ strip_string (new_value, '"');
-+ }
- /* Remove old key value pairs */
- if (g_hash_table_lookup_extended
- (security, key, &orig_key, &orig_value)) {
-+ if (new_value && !strcmp(orig_value, new_value))
-+ return;
- g_hash_table_remove (security, orig_key);
- g_free (orig_key);
- g_free (orig_value);
- }
-
- /* Add new key value */
-- if (value) {
-- gchar *new_value = g_strdup (value);
--
-- if (strcmp (key, "ssid") != 0 && strcmp (key, "psk") != 0
-- && !g_str_has_prefix (key, "wep_key"))
-- strip_string (new_value, '"');
-+ if (new_value)
- g_hash_table_insert (security, g_strdup (key), new_value);
-- }
- wpa_parser_data_changed = TRUE;
- }
-
-@@ -483,7 +486,7 @@ gboolean
- wpa_add_security (gchar * ssid)
- {
- if (wpa_has_security (ssid))
-- return FALSE;
-+ return TRUE;
- else {
- GHashTable *security =
- g_hash_table_new (g_str_hash, g_str_equal);
---
-1.7.3.4
-
diff --git a/net-misc/networkmanager/files/networkmanager-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-fix-tests.patch
new file mode 100644
index 0000000..7bd8a2b
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-fix-tests.patch
@@ -0,0 +1,18 @@
+--- configure.ac
++++ configure.ac
+@@ -577,7 +577,6 @@
+ src/settings/plugins/ifupdown/Makefile
+ src/settings/plugins/ifupdown/tests/Makefile
+ src/settings/plugins/ifnet/Makefile
+-src/settings/plugins/ifnet/tests/Makefile
+ src/settings/plugins/ifcfg-rh/Makefile
+ src/settings/plugins/ifcfg-rh/tests/Makefile
+ src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
+--- src/settings/plugins/ifnet/Makefile.am
++++ src/settings/plugins/ifnet/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = . tests
++SUBDIRS = .
+ INCLUDES = \
+ -I$(top_srcdir)/src/settings \
+ -I$(top_srcdir)/include \
diff --git a/net-misc/networkmanager/files/nm-system-settings.conf b/net-misc/networkmanager/files/nm-system-settings.conf
new file mode 100644
index 0000000..4d14ee7
--- /dev/null
+++ b/net-misc/networkmanager/files/nm-system-settings.conf
@@ -0,0 +1,6 @@
+[main]
+plugins=ifnet,keyfile
+
+[ifnet]
+managed=true
+auto_refresh=false
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 1e6b51f..7d32aff 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -3,22 +3,24 @@
<pkgmetadata>
<herd>no-herd</herd>
<maintainer>
- <email>dagger@gentoo.org</email>
- <name>Robert Piasek</name>
+ <email>steev@gentoo.org</email>
+ <name>Stephen Klimaszewski</name>
+ </maintainer>
+ <maintainer>
+ <email>rbu@gentoo.org</email>
+ <name>Robert Buchholz</name>
</maintainer>
<maintainer>
- <email>nirbheek@gentoo.org</email>
- <name>Nirbheek Chauhan</name>
+ <email>dagger@gentoo.org</email>
+ <name>Robert Piasek</name>
</maintainer>
- <maintainer>
- <email>steev@gentoo.org</email>
- <name>Stephen Klimaszewski</name>
- </maintainer>
<use>
+ <flag name="ppp">Enable support for mobile broadband and PPPoE connections using <pkg>net-dialup/ppp</pkg>.</flag>
<flag name="dhclient">Use dhclient from <pkg>net-misc/dhcp</pkg> for getting ip.</flag>
<flag name="dhcpcd">Use <pkg>net-misc/dhcpcd</pkg> for getting ip.</flag>
<flag name="nss">Use <pkg>dev-libs/nss</pkg> for cryptography.</flag>
<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing DNS information</flag>
<flag name="connection-sharing">Use <pkg>net-dns/dnsmasq</pkg> and <pkg>net-firewall/iptables</pkg> for connection sharing </flag>
+ <flag name="wimax">Enable WiMAX support. Requires <pkg>net-wireless/wimax</pkg>.</flag>
</use>
</pkgmetadata>
diff --git a/net-misc/networkmanager/networkmanager-9999.ebuild b/net-misc/networkmanager/networkmanager-0.8.996.ebuild
similarity index 59%
rename from net-misc/networkmanager/networkmanager-9999.ebuild
rename to net-misc/networkmanager/networkmanager-0.8.996.ebuild
index 0cf3ed6..05d66af 100644
--- a/net-misc/networkmanager/networkmanager-9999.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.996.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r4.ebuild,v 1.1 2011/01/25 02:46:46 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.995.ebuild,v 1.1 2011/03/09 07:56:21 qiaomuf Exp $
-EAPI="2"
-GCONF_DEBUG="no"
+EAPI="4"
-inherit gnome2 linux-info
+inherit autotools eutils gnome.org linux-info
# NetworkManager likes itself with capital letters
MY_PN=${PN/networkmanager/NetworkManager}
@@ -13,49 +12,44 @@ MY_P=${MY_PN}-${PV}
DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}
+ http://dev.gentoo.org/~dagger/files/ifnet-0.9.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd +introspection kernel_linux
-resolvconf connection-sharing wimax +ppp"
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
- EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN}/${MY_PN}"
- KEYWORDS=""
-else
- SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
+IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection
+kernel_linux +ppp resolvconf connection-sharing wimax"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="
+ nss? ( !gnutls ) !nss? ( gnutls )
+ dhcpcd? ( !dhclient ) !dhcpcd? ( dhclient )"
# gobject-introspection-0.10.3 is needed due to gnome bug 642300
RDEPEND=">=sys-apps/dbus-1.2
>=dev-libs/dbus-glib-0.75
>=net-wireless/wireless-tools-28_pre9
>=sys-fs/udev-145[extras]
- >=dev-libs/glib-2.18
- >=sys-auth/polkit-0.92
+ >=dev-libs/glib-2.26
+ >=sys-auth/polkit-0.96
>=dev-libs/libnl-1.1
>=net-misc/modemmanager-0.4
- >=net-wireless/wpa_supplicant-0.5.10[dbus]
- bluetooth? ( net-wireless/bluez )
- || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+ >=net-wireless/wpa_supplicant-0.7.2[dbus]
+ bluetooth? ( >=net-wireless/bluez-4.82 )
avahi? ( net-dns/avahi[autoipd] )
gnutls? (
- nss? ( >=dev-libs/nss-3.11 )
- !nss? ( dev-libs/libgcrypt
- net-libs/gnutls ) )
- !gnutls? ( >=dev-libs/nss-3.11 )
- dhclient? (
- dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
- !dhcpcd? ( net-misc/dhcp ) )
- !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+ dev-libs/libgcrypt
+ net-libs/gnutls )
+ nss? ( >=dev-libs/nss-3.11 )
+ dhclient? ( net-misc/dhcp )
+ dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+ ppp? ( >=net-dialup/ppp-2.4.5 )
resolvconf? ( net-dns/openresolv )
connection-sharing? (
net-dns/dnsmasq
net-firewall/iptables )
- wimax? ( >=net-wireless/wimax-1.5.1 )
- ppp? ( >=net-dialup/ppp-2.4.5 )"
+ wimax? ( >=net-wireless/wimax-1.5.1 )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -77,7 +71,6 @@ sysfs_deprecated_check() {
}
pkg_setup() {
-
if use kernel_linux; then
get_version
if linux_config_exists; then
@@ -89,57 +82,43 @@ pkg_setup() {
fi
fi
+}
+
+src_prepare() {
+ # disable tests
+ epatch "${FILESDIR}/${PN}-fix-tests.patch"
- G2CONF="--disable-more-warnings
+ EPATCH_SOURCE="${WORKDIR}/ifnet-0.9" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
+ eautoreconf
+ default
+}
+
+src_configure() {
+ ECONF="--disable-more-warnings
--localstatedir=/var
--with-distro=gentoo
--with-dbus-sys-dir=/etc/dbus-1/system.d
--with-udev-dir=/etc/udev
--with-iptables=/sbin/iptables
- $(use_with doc docs)
- $(use_with resolvconf)
- $(use_enable introspection)
+ $(use_enable doc gtk-doc)
+ $(use_enable ppp)
$(use_enable wimax)
- $(use_enable ppp)"
-
- # default is dhcpcd (if none or both are specified), ISC dchclient otherwise
- if use dhclient ; then
- if use dhcpcd ; then
- G2CONF="${G2CONF} --with-dhcpcd --without-dhclient"
- else
- G2CONF="${G2CONF} --with-dhclient --without-dhcpcd"
- fi
- else
- G2CONF="${G2CONF} --with-dhcpcd --without-dhclient"
- fi
+ $(use_with dhclient)
+ $(use_with dhcpcd)
+ $(use_with doc docs)
+ $(use_with resolvconf)"
- # default is NSS (if none or both are specified), GnuTLS otherwise
- if use gnutls ; then
if use nss ; then
- G2CONF="${G2CONF} --with-crypto=nss"
+ ECONF="${ECONF} $(use_with nss crypto=nss)"
else
- G2CONF="${G2CONF} --with-crypto=gnutls"
+ ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
fi
- else
- G2CONF="${G2CONF} --with-crypto=nss"
- fi
-}
-
-src_prepare() {
- # dbus policy patch
- epatch "${FILESDIR}/${PN}-0.8.2-confchanges.patch"
- # fix shared connection wrt bug #350476
- # fix parsing dhclient.conf wrt bug #352638
- # FIXME: does not apply
- #epatch "${FILESDIR}/${PN}-0.8.2-shared-connection.patch"
-
- gnome2_src_prepare
+ econf ${ECONF}
}
src_install() {
- gnome2_src_install
-
+ default
# Need to keep the /var/run/NetworkManager directory
keepdir /var/run/NetworkManager
@@ -156,8 +135,6 @@ src_install() {
}
pkg_postinst() {
- gnome2_pkg_postinst
-
elog "You will need to reload DBus if this is your first time installing"
elog "NetworkManager, or if you're upgrading from 0.7 or older."
elog ""
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-10 15:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-10 15:41 [gentoo-commits] proj/gnome:master commit in: gnome-extra/nm-applet/, net-misc/networkmanager/, net-misc/networkmanager/files/ Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox