/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.8.2-1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.3 - (show annotations) (download)
Tue Aug 23 23:17:09 2011 UTC (2 years, 8 months ago) by nirbheek
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +0 -0 lines
FILE REMOVED
Bump for the 0.9.0 release, go forth and test. Also, remove old ebuilds and unused patches.

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

1 From d60a988518cb0851488bc21732271a971877cdcd Mon Sep 17 00:00:00 2001
2 From: Dan Williams <dcbw@redhat.com>
3 Date: Thu, 18 Nov 2010 22:30:00 +0000
4 Subject: dhcpcd: prevent dhcpcd from messing with routing (bgo #634983)
5
6 Since NM is already handling that.
7 ---
8 diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
9 index 378a97b..4fb703c 100644
10 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
11 +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
12 @@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client,
13
14 g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */
15
16 + g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */
17 +
18 g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */
19 g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH );
20
21 --
22 cgit v0.8.3-6-g21f6
23 From 83e02840b5ce1cf8c122cc70918ddd57396c91db Mon Sep 17 00:00:00 2001
24 From: Dan Williams <dcbw@redhat.com>
25 Date: Wed, 24 Nov 2010 04:17:21 +0000
26 Subject: core: suppress error message when user settings service is not active
27
28 Don't bother trying to initialize the user settings proxy when it
29 isn't even active. Would trigger a warning to syslog if PolicyKit
30 permissions changed via changes to /usr/share/polkit-1/actions/.
31 ---
32 diff --git a/src/nm-manager.c b/src/nm-manager.c
33 index 48f2173..afcc6ad 100644
34 --- a/src/nm-manager.c
35 +++ b/src/nm-manager.c
36 @@ -1356,6 +1356,12 @@ user_proxy_init (NMManager *self)
37 g_return_if_fail (self != NULL);
38 g_return_if_fail (priv->user_proxy == NULL);
39
40 + /* Don't try to initialize the user settings proxy if the user
41 + * settings service doesn't actually exist.
42 + */
43 + if (!nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS))
44 + return;
45 +
46 bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
47 priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus,
48 NM_DBUS_SERVICE_USER_SETTINGS,
49 @@ -3975,8 +3981,7 @@ nm_manager_start (NMManager *self)
50 * they will be queried when the user settings service shows up on the
51 * bus in nm_manager_name_owner_changed().
52 */
53 - if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS))
54 - user_proxy_init (self);
55 + user_proxy_init (self);
56
57 nm_udev_manager_query_devices (priv->udev_mgr);
58 bluez_manager_resync_devices (self);
59 --
60 cgit v0.8.3-6-g21f6
61 From 45ae52523158f4e7c0cc3fb5af56859c41512f66 Mon Sep 17 00:00:00 2001
62 From: Jiří Klimeš <jklimes@redhat.com>
63 Date: Wed, 24 Nov 2010 11:51:08 +0000
64 Subject: dns: fix a crash due to uninitialized nis_domain (novell #655685)
65
66 Reported and tested by Raymond Wooninck. Thanks!
67 ---
68 diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
69 index 7a6fbbc..b0cdcc2 100644
70 --- a/src/dns-manager/nm-dns-manager.c
71 +++ b/src/dns-manager/nm-dns-manager.c
72 @@ -583,6 +583,7 @@ update_dns (NMDnsManager *self,
73 rc.nameservers = g_ptr_array_new ();
74 rc.domain = NULL;
75 rc.searches = g_ptr_array_new ();
76 + rc.nis_domain = NULL;
77 rc.nis_servers = g_ptr_array_new ();
78
79 if (priv->ip4_vpn_config)
80 --
81 cgit v0.8.3-6-g21f6
82 From 71fcccbacd51e939f168d44301393301e9dcb5fe Mon Sep 17 00:00:00 2001
83 From: Jiří Klimeš <jklimes@redhat.com>
84 Date: Mon, 13 Dec 2010 19:55:02 +0000
85 Subject: libnm-util: fix a memory leaks in nm_setting_to_string()
86
87 ---
88 diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
89 index 06994c7..190199c 100644
90 --- a/libnm-util/nm-setting.c
91 +++ b/libnm-util/nm-setting.c
92 @@ -620,6 +620,8 @@ nm_setting_to_string (NMSetting *setting)
93 is_serializable = prop_spec->flags & NM_SETTING_PARAM_SERIALIZE;
94 is_default = g_param_value_defaults (prop_spec, &value);
95
96 + g_value_unset (&value);
97 +
98 if (is_serializable || is_default) {
99 g_string_append (string, " (");
100
101 --
102 cgit v0.8.3-6-g21f6
103 From 7c2ba8a4a55899e4f4bd5bd243e10ce8a0c0f13a Mon Sep 17 00:00:00 2001
104 From: Jiří Klimeš <jklimes@redhat.com>
105 Date: Thu, 16 Dec 2010 12:49:28 +0000
106 Subject: libnm-util: fix nm_utils_security_valid() checks for Ad-Hoc APs (rh #632123)
107
108 Without the fix fake Ad-Hoc APs created by nm-applet's "Create New Wireless
109 Network..." don't pass the check and nm-applet can crash.
110 ---
111 diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
112 index ce13da3..9c3662f 100644
113 --- a/libnm-util/nm-utils.c
114 +++ b/libnm-util/nm-utils.c
115 @@ -1269,14 +1269,24 @@ nm_utils_security_valid (NMUtilsSecurityType type,
116 if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA))
117 return FALSE;
118 if (have_ap) {
119 - /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */
120 - if ((ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) {
121 - if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP)
122 + /* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and
123 + * they don't have any pairwise ciphers. */
124 + if (adhoc) {
125 + if ( (ap_wpa & NM_802_11_AP_SEC_GROUP_TKIP)
126 && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
127 return TRUE;
128 - if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP)
129 + if ( (ap_wpa & NM_802_11_AP_SEC_GROUP_CCMP)
130 && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
131 return TRUE;
132 + } else {
133 + if (ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) {
134 + if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP)
135 + && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
136 + return TRUE;
137 + if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP)
138 + && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
139 + return TRUE;
140 + }
141 }
142 return FALSE;
143 }
144 @@ -1285,14 +1295,22 @@ nm_utils_security_valid (NMUtilsSecurityType type,
145 if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN))
146 return FALSE;
147 if (have_ap) {
148 - /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */
149 - if ((ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) {
150 - if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP)
151 - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
152 + /* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and
153 + * they don't have any pairwise ciphers, nor any RSA flags yet. */
154 + if (adhoc) {
155 + if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)
156 return TRUE;
157 - if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP)
158 - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
159 + if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)
160 return TRUE;
161 + } else {
162 + if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) {
163 + if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP)
164 + && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))
165 + return TRUE;
166 + if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP)
167 + && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP))
168 + return TRUE;
169 + }
170 }
171 return FALSE;
172 }
173 --
174 cgit v0.8.3-6-g21f6

  ViewVC Help
Powered by ViewVC 1.1.20