diff options
Diffstat (limited to 'net-misc/networkmanager')
23 files changed, 30 insertions, 2556 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 95ad0d41344f..9d2cf350f5eb 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,32 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.113 2011/08/23 15:33:25 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.114 2011/08/23 23:17:09 nirbheek Exp $ + +*networkmanager-0.9.0 (23 Aug 2011) + + 23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + -networkmanager-0.8.1-r6.ebuild, + -files/networkmanager-0.8.1-CVE-2010-1172.patch, + -files/networkmanager-0.8.1-confchanges.patch, + -files/networkmanager-0.8.1-dhclient3-fix.patch, + -files/networkmanager-0.8.1-dhclient3.patch, + -files/networkmanager-0.8.1-dhcp-configure.patch, + -files/networkmanager-0.8.1-glib-2.25.12-workaround.patch, + -networkmanager-0.8.2-r1.ebuild, -networkmanager-0.8.2-r2.ebuild, + -networkmanager-0.8.2-r6.ebuild, -networkmanager-0.8.2-r10.ebuild, + -files/networkmanager-0.8.2-1.patch, + -files/networkmanager-0.8.2-accept-gw.patch, + -files/networkmanager-0.8.2-confchanges.patch, + -files/networkmanager-0.8.2-fix-dnsmasq-config.patch, + -files/networkmanager-0.8.2-fix-shutdown.patch, + -files/networkmanager-0.8.2-fix-tempfiles.patch, + -files/networkmanager-0.8.2-fix-tests.patch, + -files/networkmanager-0.8.2-fix-timestamp.patch, + -files/networkmanager-0.8.2-ifnet-smarter-write.patch, + -files/networkmanager-0.8.2-shared-connection.patch, + -networkmanager-0.9_rc3.ebuild, +networkmanager-0.9.0.ebuild: + Bump for the 0.9.0 release, go forth and test. Also, remove old ebuilds and + unused patches. 23 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> networkmanager-0.9_rc3.ebuild: diff --git a/net-misc/networkmanager/files/networkmanager-0.8.1-CVE-2010-1172.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-CVE-2010-1172.patch deleted file mode 100644 index 321be0e56f6f..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.1-CVE-2010-1172.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 92babdb658109cab5cdf9fc0280264ef0715f37d Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Wed, 11 Aug 2010 20:40:25 +0000 -Subject: core: work around dbus-glib property access bug (CVE-2010-1172) (rh #585394) - -More info: -https://bugzilla.redhat.com/show_bug.cgi?id=585394 -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-1172 - -dbus-glib was not properly enforcing the 'access' permissions on -object properties exported using its API. There were 2 specific bugs: - -1) dbus-glib did not enforce the introspection read/write property -permissions, so if the GObject property definition allowed write -access (which is sometimes desirable), D-Bus clients could modify -that value even if the introspection said it was read-only - -2) dbus-glib was not filtering out GObject properties that were -not listed in the introspection XML. Thus, if the GObject defined -more properties than were listed in the introspection XML (which is -also often useful, and NM uses this quite a bit) those properties -would also be exposed to D-Bus clients. - -To fix this completely, you need to: - -1) get dbus-glib master when the patch is commited, OR grab the -patch from https://bugzilla.redhat.com/show_bug.cgi?id=585394 and -build a new dbus-glib - -2) rebuild NetworkManager against the new dbus-glib ---- -diff --git a/configure.ac b/configure.ac -index e1b9347..3217734 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -203,6 +203,12 @@ dnl - AC_CHECK_LIB([dl], [dladdr], LIBDL="-ldl", LIBDL="") - AC_SUBST(LIBDL) - -+dnl -+dnl Checks for new dbus-glib property access function -+dnl -+AC_CHECK_LIB([dbus-glib-1], [dbus_glib_global_set_disable_legacy_property_access], ac_have_dg_prop="1", ac_have_dg_prop="0") -+AC_DEFINE_UNQUOTED(HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS, $ac_have_dg_prop, [Define if you have a dbus-glib with dbus_glib_global_set_disable_legacy_property_access()]) -+ - PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.75) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) -diff --git a/src/main.c b/src/main.c -index c2fb58b..aea2eef 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -19,10 +19,7 @@ - * Copyright (C) 2005 - 2008 Novell, Inc. - */ - --#ifdef HAVE_CONFIG_H --# include <config.h> --#endif -- -+#include <config.h> - #include <glib.h> - #include <dbus/dbus.h> - #include <dbus/dbus-glib-lowlevel.h> -@@ -627,6 +624,17 @@ main (int argc, char *argv[]) - g_thread_init (NULL); - dbus_g_thread_init (); - -+#ifndef HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS -+#error HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS not defined -+#endif -+ -+#if HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS -+ /* Ensure that non-exported properties don't leak out, and that the -+ * introspection 'access' permissions are respected. -+ */ -+ dbus_glib_global_set_disable_legacy_property_access (); -+#endif -+ - setup_signals (); - - nm_logging_start (become_daemon); -diff --git a/src/nm-wifi-ap.c b/src/nm-wifi-ap.c -index 8a7e4e8..7770b8b 100644 ---- a/src/nm-wifi-ap.c -+++ b/src/nm-wifi-ap.c -@@ -153,6 +153,8 @@ set_property (GObject *object, guint prop_id, - case PROP_STRENGTH: - nm_ap_set_strength (ap, g_value_get_char (value)); - break; -+ case PROP_HW_ADDRESS: -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -242,7 +244,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - NM_802_11_AP_FLAGS_NONE, - NM_802_11_AP_FLAGS_PRIVACY, - NM_802_11_AP_FLAGS_NONE, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_WPA_FLAGS, -@@ -252,7 +254,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - NM_802_11_AP_SEC_NONE, - all_sec_flags, - NM_802_11_AP_SEC_NONE, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_RSN_FLAGS, -@@ -262,7 +264,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - NM_802_11_AP_SEC_NONE, - all_sec_flags, - NM_802_11_AP_SEC_NONE, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_SSID, -@@ -270,7 +272,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - "SSID", - "SSID", - DBUS_TYPE_G_UCHAR_ARRAY, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_FREQUENCY, -@@ -278,7 +280,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - "Frequency", - "Frequency", - 0, 10000, 0, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_HW_ADDRESS, -@@ -286,7 +288,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - "MAC Address", - "Hardware MAC address", - NULL, -- G_PARAM_READABLE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_MODE, -@@ -294,7 +296,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - "Mode", - "Mode", - NM_802_11_MODE_ADHOC, NM_802_11_MODE_INFRA, NM_802_11_MODE_INFRA, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_MAX_BITRATE, -@@ -302,7 +304,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - "Max Bitrate", - "Max Bitrate", - 0, G_MAXUINT16, 0, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - g_object_class_install_property - (object_class, PROP_STRENGTH, -@@ -310,7 +312,7 @@ nm_ap_class_init (NMAccessPointClass *ap_class) - "Strength", - "Strength", - G_MININT8, G_MAXINT8, 0, -- G_PARAM_READWRITE)); -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - - /* Signals */ - signals[PROPERTIES_CHANGED] = --- diff --git a/net-misc/networkmanager/files/networkmanager-0.8.1-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-confchanges.patch deleted file mode 100644 index e714569b22d4..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.1-confchanges.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/NetworkManager.conf~ 2010-06-30 19:55:33.000000000 +0100 -+++ src/NetworkManager.conf 2010-07-28 10:11:06.648872144 +0100 -@@ -57,10 +57,19 @@ - <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"/> - </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.1-dhclient3-fix.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-dhclient3-fix.patch deleted file mode 100644 index b94eb7fd4102..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.1-dhclient3-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac~ 2010-08-23 16:18:33.000000000 +0100 -+++ configure.ac 2010-08-23 16:29:37.578000313 +0100 -@@ -381,6 +381,7 @@ - AC_MSG_WARN([Falling back to ISC dhclient, ${DHCLIENT_PATH}]) - fi - AC_SUBST(DHCLIENT_PATH) -+AC_SUBST(DHCLIENT_VERSION) - AC_SUBST(DHCPCD_PATH) - - # resolvconf support diff --git a/net-misc/networkmanager/files/networkmanager-0.8.1-dhclient3.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-dhclient3.patch deleted file mode 100644 index e00a37925b4c..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.1-dhclient3.patch +++ /dev/null @@ -1,129 +0,0 @@ -From d39fda772235d967266a25159b877596d636c048 Mon Sep 17 00:00:00 2001 -From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> -Date: Thu, 12 Aug 2010 22:52:20 +0000 -Subject: dhcp: don't fail with dhclient v3 - ---- -diff --git a/configure.ac b/configure.ac -index cfc2122..efdef27 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -319,21 +319,30 @@ AC_SUBST(PPPD_PLUGIN_DIR) - AC_ARG_WITH([dhclient], AS_HELP_STRING([--with-dhclient=yes|no|path], [Enable dhclient 4.x support])) - # If a full path is given, use that and do not test if it works or not. - case "${with_dhclient}" in -+ # NM only works with ISC dhclient - other derivatives don't have -+ # the same userland. dhclient 4.x is required for IPv6 support; -+ # with older versions NM won't be able to use DHCPv6. -+ - /*) - DHCLIENT_PATH="${with_dhclient}" -+ DHCLIENT_VERSION=4 -+ if test -x "${with_dhclient}"; then -+ case `"${with_dhclient}" --version 2>&1` in -+ "isc-dhclient-4"*) DHCLIENT_VERSION=4; break;; -+ "isc-dhclient-V3"*) DHCLIENT_VERSION=3; break;; -+ esac -+ fi - AC_MSG_NOTICE(using dhclient at ${DHCLIENT_PATH}) - ;; - no) AC_MSG_NOTICE(dhclient support disabled) - ;; - *) - AC_MSG_CHECKING(for dhclient) -- # NM only works with ISC dhclient - other derivatives don't have -- # the same userland. NM also requires dhclient 4.x since older -- # versions do not have IPv6 support. - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do - test -x "${path}/dhclient" || continue - case `"$path/dhclient" --version 2>&1` in -- "isc-dhclient-4"*) DHCLIENT_PATH="$path/dhclient"; break;; -+ "isc-dhclient-4"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=4; break;; -+ "isc-dhclient-V3"*) DHCLIENT_PATH="$path/dhclient"; DHCLIENT_VERSION=3; break;; - esac - done - if test -n "${DHCLIENT_PATH}"; then -@@ -554,6 +563,7 @@ echo - - if test -n "${DHCLIENT_PATH}"; then - echo ISC dhclient support: ${DHCLIENT_PATH} -+ echo ISC dhclient version: ${DHCLIENT_VERSION} - else - echo ISC dhclient support: no - fi -diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am -index f75e6b3..4c54087 100644 ---- a/src/dhcp-manager/Makefile.am -+++ b/src/dhcp-manager/Makefile.am -@@ -29,6 +29,7 @@ libdhcp_manager_la_CPPFLAGS = \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DLOCALSTATEDIR=\"$(localstatedir)\" \ - -DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \ -+ -DDHCLIENT_V$(DHCLIENT_VERSION) \ - -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" - - libdhcp_manager_la_LIBADD = \ -diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c -index cae7df2..13caa02 100644 ---- a/src/dhcp-manager/nm-dhcp-dhclient.c -+++ b/src/dhcp-manager/nm-dhcp-dhclient.c -@@ -45,7 +45,11 @@ G_DEFINE_TYPE (NMDHCPDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT) - #define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) - - #if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA) -+#if defined(DHCLIENT_V3) -+#define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" -+#else - #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhcp" -+#endif - #else - #define NM_DHCLIENT_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" - #endif -@@ -437,7 +441,11 @@ create_dhclient_config (const char *iface, - #if defined(TARGET_SUSE) - orig = g_strdup (SYSCONFDIR "/dhclient.conf"); - #elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) -+#if defined(DHCLIENT_V3) -+ orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); -+#else - orig = g_strdup (SYSCONFDIR "/dhcp/dhclient.conf"); -+#endif - #else - orig = g_strdup_printf (SYSCONFDIR "/dhclient-%s.conf", iface); - #endif -@@ -499,12 +507,20 @@ dhclient_start (NMDHCPClient *client, - guint log_domain; - - g_return_val_if_fail (priv->pid_file == NULL, -1); -- g_return_val_if_fail (ip_opt != NULL, -1); - - iface = nm_dhcp_client_get_iface (client); - uuid = nm_dhcp_client_get_uuid (client); - ipv6 = nm_dhcp_client_get_ipv6 (client); - -+#if defined(DHCLIENT_V3) -+ if (ipv6) { -+ nm_log_warn (log_domain, "(%s): ISC dhcp3 does not support IPv6", iface); -+ return -1; -+ } -+#else -+ g_return_val_if_fail (ip_opt != NULL, -1); -+#endif -+ - log_domain = ipv6 ? LOGD_DHCP6 : LOGD_DHCP4; - - priv->pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhclient%s-%s.pid", -@@ -536,10 +552,11 @@ dhclient_start (NMDHCPClient *client, - - g_ptr_array_add (argv, (gpointer) "-d"); - -+#if !defined(DHCLIENT_V3) - g_ptr_array_add (argv, (gpointer) ip_opt); -- - if (mode_opt) - g_ptr_array_add (argv, (gpointer) mode_opt); -+#endif - - g_ptr_array_add (argv, (gpointer) "-sf"); /* Set script file */ - g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH ); --- diff --git a/net-misc/networkmanager/files/networkmanager-0.8.1-dhcp-configure.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-dhcp-configure.patch deleted file mode 100644 index be5e58a32b25..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.1-dhcp-configure.patch +++ /dev/null @@ -1,64 +0,0 @@ -From c050e036c3d748970945195ed0fe6c914c439481 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Thu, 05 Aug 2010 20:25:42 +0000 -Subject: dhcp: make sure disabled DHCP clients aren't used (gentoo #330319) - -If the client was disabled with --with-dhclient=no or ---with-dhcpcd=no, then it's corresponding _PATH will be an empty -string. In that case we want to ignore that client completely -since it was disabled at build time. ---- -diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c -index bde874f..a1e3e5e 100644 ---- a/src/dhcp-manager/nm-dhcp-manager.c -+++ b/src/dhcp-manager/nm-dhcp-manager.c -@@ -265,8 +265,13 @@ get_client_type (const char *client, GError **error) - const char *dhclient_path = NULL; - const char *dhcpcd_path = NULL; - -- dhclient_path = nm_dhcp_dhclient_get_path (DHCLIENT_PATH); -- dhcpcd_path = nm_dhcp_dhcpcd_get_path (DHCPCD_PATH); -+ /* If a client was disabled at build-time, its *_PATH define will be -+ * an empty string. -+ */ -+ if (DHCLIENT_PATH && strlen (DHCLIENT_PATH)) -+ dhclient_path = nm_dhcp_dhclient_get_path (DHCLIENT_PATH); -+ if (DHCPCD_PATH && strlen (DHCPCD_PATH)) -+ dhcpcd_path = nm_dhcp_dhcpcd_get_path (DHCPCD_PATH); - - if (!client) { - if (dhclient_path) --- -From 91e90d9d5412223e0252ccff0e3732afae201af6 Mon Sep 17 00:00:00 2001 -From: Mike Auty <ikelos@gentoo.org> -Date: Thu, 05 Aug 2010 20:25:12 +0000 -Subject: build: fix dhcpcd client detection - ---- -diff --git a/configure.ac b/configure.ac -index 9c260fb..b1d16f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -344,10 +344,10 @@ case "${with_dhcpcd}" in - AC_MSG_CHECKING(for dhcpcd) - # We fully work with upstream dhcpcd-4 - for path in /sbin /usr/sbin /usr/pkg/sbin /usr/local/sbin; do -- test -x "${path}/dhclient" || continue -+ test -x "${path}/dhcpcd" || continue - case `"$path/dhcpcd" --version 2>/dev/null` in - "dhcpcd "[123]*);; -- "dhcpcd "*) DHCP_CLIENT_PATH="$path/dhcpcd"; break;; -+ "dhcpcd "*) DHCPCD_PATH="$path/dhcpcd"; break;; - esac - done - if test -n "${DHCPCD_PATH}"; then -@@ -364,7 +364,7 @@ if test -z "$DHCPCD_PATH" -a -z "$DHCLIENT_PATH"; then - # in most distros, so use it. - AC_MSG_WARN([Could not find a suitable DHCP client]) - DHCLIENT_PATH=/sbin/dhclient -- AC_MSG_WARN([Falling back to ISC dhclient, ${DHCP_CLIENT_PATH}]) -+ AC_MSG_WARN([Falling back to ISC dhclient, ${DHCLIENT_PATH}]) - fi - AC_SUBST(DHCLIENT_PATH) - AC_SUBST(DHCPCD_PATH) --- diff --git a/net-misc/networkmanager/files/networkmanager-0.8.1-glib-2.25.12-workaround.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-glib-2.25.12-workaround.patch deleted file mode 100644 index 822551dcbe06..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.1-glib-2.25.12-workaround.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 41804010d622dfb7c90c477076608790840149c7 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Tue, 10 Aug 2010 18:46:18 +0000 -Subject: build: fix compilation with glib >= 2.25.12 - -WOrk around glib API breakage. ---- -diff --git a/src/tests/test-policy-hosts.c b/src/tests/test-policy-hosts.c -index 682c996..e6775f3 100644 ---- a/src/tests/test-policy-hosts.c -+++ b/src/tests/test-policy-hosts.c -@@ -671,7 +671,11 @@ test_find_token (void) - } - } - -+#if GLIB_CHECK_VERSION(2,25,12) -+typedef GTestFixtureFunc TCFunc; -+#else - typedef void (*TCFunc)(void); -+#endif - - #define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL) - --- diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch deleted file mode 100644 index 1df40193debb..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-1.patch +++ /dev/null @@ -1,174 +0,0 @@ -From d60a988518cb0851488bc21732271a971877cdcd Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Thu, 18 Nov 2010 22:30:00 +0000 -Subject: dhcpcd: prevent dhcpcd from messing with routing (bgo #634983) - -Since NM is already handling that. ---- -diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c -index 378a97b..4fb703c 100644 ---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c -+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c -@@ -128,6 +128,8 @@ real_ip4_start (NMDHCPClient *client, - - g_ptr_array_add (argv, (gpointer) "-L"); /* Disable built-in IPv4LL since we use avahi-autoipd */ - -+ g_ptr_array_add (argv, (gpointer) "-G"); /* Let NM handle routing */ -+ - g_ptr_array_add (argv, (gpointer) "-c"); /* Set script file */ - g_ptr_array_add (argv, (gpointer) ACTION_SCRIPT_PATH ); - --- -cgit v0.8.3-6-g21f6 -From 83e02840b5ce1cf8c122cc70918ddd57396c91db Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Wed, 24 Nov 2010 04:17:21 +0000 -Subject: core: suppress error message when user settings service is not active - -Don't bother trying to initialize the user settings proxy when it -isn't even active. Would trigger a warning to syslog if PolicyKit -permissions changed via changes to /usr/share/polkit-1/actions/. ---- -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 48f2173..afcc6ad 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -1356,6 +1356,12 @@ user_proxy_init (NMManager *self) - g_return_if_fail (self != NULL); - g_return_if_fail (priv->user_proxy == NULL); - -+ /* Don't try to initialize the user settings proxy if the user -+ * settings service doesn't actually exist. -+ */ -+ if (!nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) -+ return; -+ - bus = nm_dbus_manager_get_connection (priv->dbus_mgr); - priv->user_proxy = dbus_g_proxy_new_for_name_owner (bus, - NM_DBUS_SERVICE_USER_SETTINGS, -@@ -3975,8 +3981,7 @@ nm_manager_start (NMManager *self) - * they will be queried when the user settings service shows up on the - * bus in nm_manager_name_owner_changed(). - */ -- if (nm_dbus_manager_name_has_owner (priv->dbus_mgr, NM_DBUS_SERVICE_USER_SETTINGS)) -- user_proxy_init (self); -+ user_proxy_init (self); - - nm_udev_manager_query_devices (priv->udev_mgr); - bluez_manager_resync_devices (self); --- -cgit v0.8.3-6-g21f6 -From 45ae52523158f4e7c0cc3fb5af56859c41512f66 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Wed, 24 Nov 2010 11:51:08 +0000 -Subject: dns: fix a crash due to uninitialized nis_domain (novell #655685) - -Reported and tested by Raymond Wooninck. Thanks! ---- -diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c -index 7a6fbbc..b0cdcc2 100644 ---- a/src/dns-manager/nm-dns-manager.c -+++ b/src/dns-manager/nm-dns-manager.c -@@ -583,6 +583,7 @@ update_dns (NMDnsManager *self, - rc.nameservers = g_ptr_array_new (); - rc.domain = NULL; - rc.searches = g_ptr_array_new (); -+ rc.nis_domain = NULL; - rc.nis_servers = g_ptr_array_new (); - - if (priv->ip4_vpn_config) --- -cgit v0.8.3-6-g21f6 -From 71fcccbacd51e939f168d44301393301e9dcb5fe Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Mon, 13 Dec 2010 19:55:02 +0000 -Subject: libnm-util: fix a memory leaks in nm_setting_to_string() - ---- -diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c -index 06994c7..190199c 100644 ---- a/libnm-util/nm-setting.c -+++ b/libnm-util/nm-setting.c -@@ -620,6 +620,8 @@ nm_setting_to_string (NMSetting *setting) - is_serializable = prop_spec->flags & NM_SETTING_PARAM_SERIALIZE; - is_default = g_param_value_defaults (prop_spec, &value); - -+ g_value_unset (&value); -+ - if (is_serializable || is_default) { - g_string_append (string, " ("); - --- -cgit v0.8.3-6-g21f6 -From 7c2ba8a4a55899e4f4bd5bd243e10ce8a0c0f13a Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Thu, 16 Dec 2010 12:49:28 +0000 -Subject: libnm-util: fix nm_utils_security_valid() checks for Ad-Hoc APs (rh #632123) - -Without the fix fake Ad-Hoc APs created by nm-applet's "Create New Wireless -Network..." don't pass the check and nm-applet can crash. ---- -diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c -index ce13da3..9c3662f 100644 ---- a/libnm-util/nm-utils.c -+++ b/libnm-util/nm-utils.c -@@ -1269,14 +1269,24 @@ nm_utils_security_valid (NMUtilsSecurityType type, - if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA)) - return FALSE; - if (have_ap) { -- /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */ -- if ((ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) { -- if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP) -+ /* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and -+ * they don't have any pairwise ciphers. */ -+ if (adhoc) { -+ if ( (ap_wpa & NM_802_11_AP_SEC_GROUP_TKIP) - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) - return TRUE; -- if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP) -+ if ( (ap_wpa & NM_802_11_AP_SEC_GROUP_CCMP) - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) - return TRUE; -+ } else { -+ if (ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) { -+ if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) -+ return TRUE; -+ if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_CCMP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) -+ return TRUE; -+ } - } - return FALSE; - } -@@ -1285,14 +1295,22 @@ nm_utils_security_valid (NMUtilsSecurityType type, - if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) - return FALSE; - if (have_ap) { -- /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */ -- if ((ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) { -- if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) -- && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) -+ /* Ad-Hoc WPA APs won't necessarily have the PSK flag set, and -+ * they don't have any pairwise ciphers, nor any RSA flags yet. */ -+ if (adhoc) { -+ if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP) - return TRUE; -- if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP) -- && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) -+ if (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP) - return TRUE; -+ } else { -+ if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) { -+ if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) -+ return TRUE; -+ if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP) -+ && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) -+ return TRUE; -+ } - } - return FALSE; - } --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch deleted file mode 100644 index b2911db71a9a..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-accept-gw.patch +++ /dev/null @@ -1,135 +0,0 @@ ---- NetworkManager_Patched/system-settings/plugins/ifnet/net_utils.c 2010-11-04 04:10:52.000000000 +0800 -+++ NetworkManager-0.8.2/system-settings/plugins/ifnet/net_utils.c 2010-11-23 15:11:08.024000011 +0800 -@@ -19,7 +19,6 @@ - * Copyright (C) 1999-2010 Gentoo Foundation, Inc. - */ - --#include <config.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -194,6 +193,32 @@ - return error_quark; - } - -+static char * -+find_default_gateway_str (char *str) -+{ -+ char *tmp; -+ -+ if ((tmp = strstr (str, "default via ")) != NULL) { -+ return tmp + strlen ("default via "); -+ } else if ((tmp = strstr (str, "default gw ")) != NULL) { -+ return tmp + strlen ("default gw "); -+ } -+ return NULL; -+} -+ -+static char * -+find_gateway_str (char *str) -+{ -+ char *tmp; -+ -+ if ((tmp = strstr (str, "via ")) != NULL) { -+ return tmp + strlen ("via "); -+ } else if ((tmp = strstr (str, "gw ")) != NULL) { -+ return tmp + strlen ("gw "); -+ } -+ return NULL; -+} -+ - gboolean - reload_parsers () - { -@@ -362,11 +387,10 @@ - if (!tmp) - return FALSE; - routes = g_strdup (tmp); -- tmp = strstr (routes, "default via "); -+ tmp = find_default_gateway_str (routes); - if (!tmp) { - goto error; - } -- tmp += strlen ("default via "); - g_strstrip (tmp); - if ((end = strstr (tmp, "\"")) != NULL) - *end = '\0'; -@@ -483,8 +507,13 @@ - - if (!gateway) - return 0; -- tmp = strstr (gateway, "via "); -- tmp = g_strdup (tmp + strlen ("via ")); -+ tmp = find_gateway_str(gateway); -+ if (!tmp) { -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, -+ "Couldn't obtain gateway in \"%s\"", gateway); -+ return 0; -+ } -+ tmp = g_strdup (tmp); - strip_string (tmp, ' '); - strip_string (tmp, '"'); - if ((split = strstr (tmp, "\"")) != NULL) -@@ -509,8 +538,13 @@ - - if (!next_hop) - return 0; -- tmp = strstr (next_hop, "via "); -- tmp = g_strdup (tmp + strlen ("via ")); -+ tmp = find_gateway_str(next_hop); -+ if (!tmp) { -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, -+ "Couldn't obtain next_hop in \"%s\"", next_hop); -+ return 0; -+ } -+ tmp = g_strdup (tmp); - strip_string (tmp, ' '); - strip_string (tmp, '"'); - g_strstrip (tmp); -@@ -671,8 +705,8 @@ - length = g_strv_length (ipset); - for (i = 0; i < length; i++) { - ip = ipset[i]; -- if (strstr (ip, "default via ") || strstr (ip, "::") -- || !strstr (ip, "via")) -+ if (find_default_gateway_str (ip) || strstr (ip, "::") -+ || !find_gateway_str (ip)) - continue; - ip = strip_string (ip, '"'); - iblock = create_ip4_block (ip); -@@ -712,9 +746,7 @@ - ip = strip_string (ip, '"'); - if (ip[0] == '\0') - continue; -- printf ("ip:%s\n", ip); -- if ((tmp_addr = strstr (ip, "default via ")) != NULL) { -- tmp_addr += strlen ("default via "); -+ if ((tmp_addr = find_default_gateway_str (ip)) != NULL) { - if (!is_ip6_address (tmp_addr)) - continue; - else { -@@ -855,7 +887,7 @@ - void - get_dhcp_hostname_and_client_id (char **hostname, char **client_id) - { -- gchar *dhcp_client = ifnet_get_global_setting ("main", "dhcp"); -+ gchar *dhcp_client = NULL; - const gchar *dhcpcd_conf = "/etc/dhcpcd.conf"; - const gchar *dhclient_conf = "/etc/dhcp/dhclient.conf"; - gchar *line = NULL, *tmp = NULL, *contents = NULL; -@@ -864,6 +896,7 @@ - - *hostname = NULL; - *client_id = NULL; -+ dhcp_client = ifnet_get_global_setting ("main", "dhcp"); - if (dhcp_client) { - if (!strcmp (dhcp_client, "dhclient")) - g_file_get_contents (dhclient_conf, &contents, NULL, -@@ -871,6 +904,7 @@ - else if (!strcmp (dhcp_client, "dhcpcd")) - g_file_get_contents (dhcpcd_conf, &contents, NULL, - NULL); -+ g_free (dhcp_client); - } else { - if (g_file_test (dhclient_conf, G_FILE_TEST_IS_REGULAR)) - g_file_get_contents (dhclient_conf, &contents, NULL, 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 a5acc38c0dfe..000000000000 --- 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-fix-dnsmasq-config.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch deleted file mode 100644 index 67afdd6961cd..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-dnsmasq-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b05b77fa2668df4a4d8830685b138b4c57b1e777 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Sat, 05 Mar 2011 05:52:44 +0000 -Subject: dnsmasq: send no config file instead of a bogus one (lp:725041) (debian #615082) - ---- -diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c -index 701c078..3ca4b21 100644 ---- a/src/dnsmasq-manager/nm-dnsmasq-manager.c -+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c -@@ -278,17 +278,10 @@ create_dm_cmd_line (const char *iface, - /* dnsmasq may read from it's default config file location, which if that - * location is a valid config file, it will combine with the options here - * and cause undesirable side-effects. Like sending bogus IP addresses -- * as the gateway or whatever. So give dnsmasq a bogus config file -- * location to avoid screwing up the configuration we're passing to it. -+ * as the gateway or whatever. So tell dnsmasq not to use any config file -+ * at all. - */ -- memset (buf, 0, sizeof (buf)); -- strcpy (buf, "/tmp/"); -- for (i = 5; i < 15; i++) -- buf[i] = (char) (g_random_int_range ((guint32) 'a', (guint32) 'z') & 0xFF); -- strcat (buf, ".conf"); -- - nm_cmd_line_add_string (cmd, "--conf-file"); -- nm_cmd_line_add_string (cmd, buf); - - nm_cmd_line_add_string (cmd, "--no-hosts"); - nm_cmd_line_add_string (cmd, "--keep-in-foreground"); --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch deleted file mode 100644 index 265c63766229..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-shutdown.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/nm-manager.c b/src/nm-manager.c -index afcc6ad..9bd5354 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4364,10 +4364,11 @@ dispose (GObject *object) - - /* Unregister property filter */ - bus = nm_dbus_manager_get_connection (priv->dbus_mgr); -- g_assert (bus); -- dbus_connection = dbus_g_connection_get_connection (bus); -- g_assert (dbus_connection); -- dbus_connection_remove_filter (dbus_connection, prop_filter, manager); -+ if (bus) { -+ dbus_connection = dbus_g_connection_get_connection (bus); -+ g_assert (dbus_connection); -+ dbus_connection_remove_filter (dbus_connection, prop_filter, manager); -+ } - g_object_unref (priv->dbus_mgr); - - if (priv->bluez_mgr) --- -cgit v0.8.3-6-g21f6 - -diff --git a/src/nm-policy.c b/src/nm-policy.c -index b5c2129..5355703 100644 ---- a/src/nm-policy.c -+++ b/src/nm-policy.c -@@ -1222,15 +1222,6 @@ nm_policy_destroy (NMPolicy *policy) - } - g_slist_free (policy->dev_signal_ids); - -- /* Rewrite /etc/hosts on exit to ensure we don't leave stale IP addresses -- * lying around. FIXME: this will take out a valid IP address of an -- * ethernet device we're leaving active (ie, a connection we can "assume" -- * when NM starts again). -- */ -- policy->default_device4 = NULL; -- policy->default_device6 = NULL; -- update_system_hostname (policy, NULL, NULL); -- - g_free (policy->orig_hostname); - g_free (policy->cur_hostname); - --- -cgit v0.8.3-6-g21f6 - diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tempfiles.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tempfiles.patch deleted file mode 100644 index 12621d2b23e4..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tempfiles.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 0376f6b1ceda64e279e64bfb37ab67f0c36478b6 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Wed, 10 Nov 2010 15:21:25 +0000 -Subject: keyfile: ignore temporary files (bgo #602868) - -Ignore temporary files created by vim editor and temporary files created -internally by g_file_set_contents() (mkstemp()) when writing connections. ---- -diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am -index c519adc..128775e 100644 ---- a/system-settings/plugins/keyfile/Makefile.am -+++ b/system-settings/plugins/keyfile/Makefile.am -@@ -16,6 +16,8 @@ libkeyfile_io_la_SOURCES = \ - writer.c \ - writer.h \ - errors.c \ -+ utils.c \ -+ utils.h \ - common.h - - libkeyfile_io_la_CPPFLAGS = \ -diff --git a/system-settings/plugins/keyfile/common.h b/system-settings/plugins/keyfile/common.h -index 7d94a70..6c8f9ce 100644 ---- a/system-settings/plugins/keyfile/common.h -+++ b/system-settings/plugins/keyfile/common.h -@@ -23,6 +23,9 @@ - - #include <glib.h> - -+#define SWP_TAG ".swp" -+#define SWPX_TAG ".swpx" -+ - #define KEYFILE_PLUGIN_NAME "keyfile" - #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2010 Red Hat, Inc. To report bugs please use the NetworkManager mailing list." - -diff --git a/system-settings/plugins/keyfile/plugin.c b/system-settings/plugins/keyfile/plugin.c -index f57a4b6..5a927ce 100644 ---- a/system-settings/plugins/keyfile/plugin.c -+++ b/system-settings/plugins/keyfile/plugin.c -@@ -39,6 +39,7 @@ - #include "nm-keyfile-connection.h" - #include "writer.h" - #include "common.h" -+#include "utils.h" - - #define CONF_FILE SYSCONFDIR "/NetworkManager/NetworkManager.conf" - #define OLD_CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf" -@@ -89,6 +90,9 @@ read_connections (NMSystemConfigInterface *config) - NMKeyfileConnection *connection; - char *full_path; - -+ if (utils_should_ignore_file (item)) -+ continue; -+ - full_path = g_build_filename (KEYFILE_DIR, item, NULL); - PLUGIN_PRINT (KEYFILE_PLUGIN_NAME, "parsing %s ... ", item); - connection = nm_keyfile_connection_new (full_path, &error); -@@ -192,6 +196,11 @@ dir_changed (GFileMonitor *monitor, - GError *error = NULL; - - name = g_file_get_path (file); -+ if (utils_should_ignore_file (name)) { -+ g_free (name); -+ return; -+ } -+ - connection = g_hash_table_lookup (priv->hash, name); - - switch (event_type) { -diff --git a/system-settings/plugins/keyfile/utils.c b/system-settings/plugins/keyfile/utils.c -new file mode 100644 -index 0000000..de64f79 ---- a/dev/null -+++ b/system-settings/plugins/keyfile/utils.c -@@ -0,0 +1,97 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* NetworkManager system settings service -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2010 Red Hat, Inc. -+ */ -+ -+#include <glib.h> -+#include <stdlib.h> -+#include <string.h> -+#include "utils.h" -+ -+ -+static const char temp_letters[] = -+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -+ -+/* -+ * Check '.[a-zA-Z0-9]{6}' file suffix used for temporary files by g_file_set_contents() (mkstemp()). -+ */ -+static gboolean -+check_mkstemp_suffix (const char *path) -+{ -+ const char *ptr; -+ -+ g_return_val_if_fail (path != NULL, FALSE); -+ -+ /* Matches *.[a-zA-Z0-9]{6} suffix of mkstemp()'s temporary files */ -+ ptr = strrchr (path, '.'); -+ if (ptr && (strspn (ptr + 1, temp_letters) == 6) && (! ptr[7])) -+ return TRUE; -+ return FALSE; -+} -+ -+static gboolean -+check_prefix (const char *base, const char *tag) -+{ -+ int len, tag_len; -+ -+ g_return_val_if_fail (base != NULL, TRUE); -+ g_return_val_if_fail (tag != NULL, TRUE); -+ -+ len = strlen (base); -+ tag_len = strlen (tag); -+ if ((len > tag_len) && !strncasecmp (base, tag, tag_len)) -+ return TRUE; -+ return FALSE; -+} -+ -+static gboolean -+check_suffix (const char *base, const char *tag) -+{ -+ int len, tag_len; -+ -+ g_return_val_if_fail (base != NULL, TRUE); -+ g_return_val_if_fail (tag != NULL, TRUE); -+ -+ len = strlen (base); -+ tag_len = strlen (tag); -+ if ((len > tag_len) && !strcasecmp (base + len - tag_len, tag)) -+ return TRUE; -+ return FALSE; -+} -+ -+gboolean -+utils_should_ignore_file (const char *filename) -+{ -+ char *base; -+ gboolean ignore = FALSE; -+ -+ g_return_val_if_fail (filename != NULL, TRUE); -+ -+ base = g_path_get_basename (filename); -+ g_return_val_if_fail (base != NULL, TRUE); -+ -+ /* Ignore files with certain patterns */ -+ if ( (check_prefix (base, ".") && check_suffix (base, SWP_TAG)) /* vim temporary files: .filename.swp */ -+ || (check_prefix (base, ".") && check_suffix (base, SWPX_TAG)) /* vim temporary files: .filename.swpx */ -+ || check_mkstemp_suffix (base)) /* temporary files created by mkstemp() */ -+ ignore = TRUE; -+ -+ g_free (base); -+ return ignore; -+} -+ -diff --git a/system-settings/plugins/keyfile/utils.h b/system-settings/plugins/keyfile/utils.h -new file mode 100644 -index 0000000..3c1a610 ---- a/dev/null -+++ b/system-settings/plugins/keyfile/utils.h -@@ -0,0 +1,30 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* NetworkManager system settings service -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2010 Red Hat, Inc. -+ */ -+ -+#ifndef _UTILS_H_ -+#define _UTILS_H_ -+ -+#include <glib.h> -+#include "common.h" -+ -+gboolean utils_should_ignore_file (const char *filename); -+ -+#endif /* _UTILS_H_ */ -+ --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch deleted file mode 100644 index dc3a99b11044..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-tests.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 803277ff3b91f721846c90c092bb6306f2073810 Mon Sep 17 00:00:00 2001 -From: Mu Qiao <qiaomuf@gentoo.org> -Date: Sun, 6 Feb 2011 22:23:58 +0000 -Subject: [PATCH] remove tests - Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> - ---- - configure.ac | 1 - - system-settings/plugins/ifnet/Makefile.am | 1 - - system-settings/plugins/ifnet/tests/Makefile.am | 14 -------------- - 3 files changed, 0 insertions(+), 16 deletions(-) - delete mode 100644 system-settings/plugins/ifnet/tests/Makefile.am - -diff --git a/configure.ac b/configure.ac -index 9cb0e9c..6c51a2a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -541,7 +541,6 @@ system-settings/plugins/Makefile - system-settings/plugins/ifupdown/Makefile - system-settings/plugins/ifupdown/tests/Makefile - system-settings/plugins/ifnet/Makefile --system-settings/plugins/ifnet/tests/Makefile - system-settings/plugins/ifcfg-rh/Makefile - system-settings/plugins/ifcfg-rh/tests/Makefile - system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile -diff --git a/system-settings/plugins/ifnet/Makefile.am b/system-settings/plugins/ifnet/Makefile.am -index f63f8ca..b09cc8f 100644 ---- a/system-settings/plugins/ifnet/Makefile.am -+++ b/system-settings/plugins/ifnet/Makefile.am -@@ -1,4 +1,3 @@ --SUBDIRS = . tests - INCLUDES = \ - -I$(top_srcdir)/src/system-settings \ - -I$(top_srcdir)/include \ -diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/system-settings/plugins/ifnet/tests/Makefile.am -deleted file mode 100644 -index ead3f1f..0000000 ---- a/system-settings/plugins/ifnet/tests/Makefile.am -+++ /dev/null -@@ -1,14 +0,0 @@ --INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\ -- -I$(top_srcdir)/libnm-glib \ -- -I$(top_srcdir)/libnm-util \ -- -I$(top_srcdir)/include \ -- -I$(top_srcdir)/src/system-settings --TESTS = check_ifnet --check_PROGRAMS = check_ifnet --check_ifnet_SOURCES = test_all.c --check_ifnet_LDFLAGS = -g --check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS) -g --check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\ -- $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\ -- $(CHECK_LIBS)\ -- $(GLIB_LIBS) --- -1.7.3.4 - diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch deleted file mode 100644 index 736a58c59dae..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-fix-timestamp.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 4b022ed32bb3d729fd21d2e33483fda03c6a6333 Mon Sep 17 00:00:00 2001 -From: Jiří Klimeš <jklimes@redhat.com> -Date: Tue, 23 Nov 2010 18:06:58 +0000 -Subject: core: correct TIMESTAMP type; fixes potential crash when time() is 32bit - -The Crash appeared on some platforms in glib while processing variable -arguments. ---- -diff --git a/src/system-settings/nm-default-wired-connection.c b/src/system-settings/nm-default-wired-connection.c -index 1cda3d9..0d19dea 100644 ---- a/src/system-settings/nm-default-wired-connection.c -+++ b/src/system-settings/nm-default-wired-connection.c -@@ -163,7 +163,7 @@ constructor (GType type, - NM_SETTING_CONNECTION_AUTOCONNECT, TRUE, - NM_SETTING_CONNECTION_UUID, uuid, - NM_SETTING_CONNECTION_READ_ONLY, priv->read_only, -- NM_SETTING_CONNECTION_TIMESTAMP, time (NULL), -+ NM_SETTING_CONNECTION_TIMESTAMP, (guint64) time (NULL), - NULL); - - g_free (id); --- -cgit v0.8.3-6-g21f6 diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch deleted file mode 100644 index ff4c1f253677..000000000000 --- a/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 776fafc133e18df48dc92a717c662e1b2858567e Mon Sep 17 00:00:00 2001 -From: Mu Qiao <qiaomuf@gentoo.org> -Date: Fri, 25 Feb 2011 16:25:07 +0000 -Subject: [PATCH 3/3] Won't write when nothing changed - Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> - Make log less excessive, accept non-alnum ssid (bug #356337) - -Signed-off-by: Mu Qiao <qiaomuf@gentoo.org> ---- - system-settings/plugins/ifnet/connection_parser.c | 33 +++++++++----------- - system-settings/plugins/ifnet/net_parser.c | 8 ++++- - system-settings/plugins/ifnet/plugin.c | 4 -- - system-settings/plugins/ifnet/wpa_parser.c | 7 +++- - 4 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c -index 9b5ddc1..4ac2173 100644 ---- a/system-settings/plugins/ifnet/connection_parser.c -+++ b/system-settings/plugins/ifnet/connection_parser.c -@@ -55,9 +55,16 @@ update_connection_id (NMConnection * connection, gchar * conn_name) - gchar *idstr = NULL; - gchar *uuid_base = NULL; - gchar *uuid = NULL; -+ int name_len; - NMSettingConnection *setting; - -- idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name); -+ name_len = strlen (conn_name); -+ if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) { -+ gchar * conn_name_printable = utils_hexstr2bin (conn_name + 2, name_len - 2); -+ idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name_printable); -+ g_free (conn_name_printable); -+ } else -+ idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name); - uuid_base = idstr; - uuid = nm_utils_uuid_generate_from_string (uuid_base); - setting = -@@ -627,23 +634,13 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error) - g_object_set (ip4_setting, - NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, - TRUE, NULL); -- if (nm_setting_ip4_config_add_address -- (ip4_setting, ip4_addr)) { -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, -- "new address: %d", iblock->ip); -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, -- "ipv4 addresses count: %d", -- nm_setting_ip4_config_get_num_addresses -- (ip4_setting)); -- } else { -- PLUGIN_WARN (IFNET_PLUGIN_NAME, -- "ignoring duplicate IP4 address"); -- } -+ if (!nm_setting_ip4_config_add_address (ip4_setting, ip4_addr)) -+ PLUGIN_WARN (IFNET_PLUGIN_NAME, -+ "ignoring duplicate IP4 address"); - nm_ip4_address_unref (ip4_addr); - current_iblock = iblock; - iblock = iblock->next; - destroy_ip_block (current_iblock); -- - } - g_object_set (ip4_setting, - NM_SETTING_IP4_CONFIG_METHOD, -@@ -2276,11 +2273,12 @@ write_wireless_setting (NMConnection * connection, - return FALSE; - } - -- /* If the SSID contains any non-printable characters, we need to use the -- * hex notation of the SSID instead. -+ /* If the SSID contains any non-alnum characters, we need to use -+ * the hex notation of the SSID instead. (Because openrc doesn't -+ * support these characters, see bug #356337) - */ - for (i = 0; i < ssid->len; i++) { -- if (!isprint (ssid->data[i])) { -+ if (!isalnum (ssid->data[i])) { - hex_ssid = TRUE; - break; - } -@@ -2487,7 +2485,6 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name, - ifnet_set_data (conn_name, "config", "dhcp"); - - /* DNS Servers */ -- ifnet_set_data (conn_name, "dns_servers", NULL); - num = nm_setting_ip4_config_get_num_dns (s_ip4); - if (num > 0) { - dns = g_string_new (NULL); -diff --git a/system-settings/plugins/ifnet/net_parser.c b/system-settings/plugins/ifnet/net_parser.c -index de2db8a..57f3688 100644 ---- a/system-settings/plugins/ifnet/net_parser.c -+++ b/system-settings/plugins/ifnet/net_parser.c -@@ -411,12 +411,16 @@ ifnet_set_data (gchar * conn_name, gchar * key, gchar * 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)) -+ if (new_value && !strcmp (orin_value, new_value)){ -+ g_free (new_value); - return; -+ } - g_hash_table_remove (conn, orin_key); - g_free (orin_key); - g_free (orin_value); -- } -+ /* old key/value doesn't exist but new value is NULL */ -+ } else if (!value) -+ return; - if (new_value) - g_hash_table_insert (conn, g_strdup (key), new_value); - net_parser_data_changed = TRUE; -diff --git a/system-settings/plugins/ifnet/plugin.c b/system-settings/plugins/ifnet/plugin.c -index 94f9e79..3952e91 100644 ---- a/system-settings/plugins/ifnet/plugin.c -+++ b/system-settings/plugins/ifnet/plugin.c -@@ -91,8 +91,6 @@ update_system_hostname (gpointer config) - { - SCPluginIfnetPrivate *priv = SC_PLUGIN_IFNET_GET_PRIVATE (config); - -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Updating hostname"); -- - if (priv->hostname) - g_free (priv->hostname); - priv->hostname = read_hostname (IFNET_SYSTEM_HOSTNAME_FILE); -@@ -184,8 +182,6 @@ monitor_file_changes (const char *filename, - info); - g_signal_connect (monitor, "changed", G_CALLBACK (file_changed), - info); -- PLUGIN_PRINT (IFNET_PLUGIN_NAME, "Monitoring %s", filename); -- - } else - PLUGIN_WARN (IFNET_PLUGIN_NAME, - "Monitoring %s failed, error: %s", filename, -diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/system-settings/plugins/ifnet/wpa_parser.c -index 42c52c3..338c338 100644 ---- a/system-settings/plugins/ifnet/wpa_parser.c -+++ b/system-settings/plugins/ifnet/wpa_parser.c -@@ -463,12 +463,15 @@ wpa_set_data (gchar * ssid, gchar * key, gchar * 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)) -+ if (new_value && !strcmp(orig_value, new_value)){ -+ g_free (new_value); - return; -+ } - g_hash_table_remove (security, orig_key); - g_free (orig_key); - g_free (orig_value); -- } -+ } else if (!value) -+ return; - - /* Add new key value */ - if (new_value) --- -1.7.3.4 - 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 3ce883aa7c1c..000000000000 --- 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/networkmanager-0.8.1-r6.ebuild b/net-misc/networkmanager/networkmanager-0.8.1-r6.ebuild deleted file mode 100644 index 246c6ccb3fcb..000000000000 --- a/net-misc/networkmanager/networkmanager-0.8.1-r6.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# 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.1-r6.ebuild,v 1.4 2011/06/09 01:41:03 sping Exp $ - -EAPI="2" - -inherit autotools eutils gnome.org linux-info - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -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/${PN}-ifnet-540e40f.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=dev-libs/libnl-1.1 - >=net-misc/modemmanager-0.2 - >=net-wireless/wpa_supplicant-0.5.10[dbus] - bluetooth? ( net-wireless/bluez ) - || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) - 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 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - >=net-dialup/ppp-2.4.5 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See http://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_setup() { - # FIXME. Required by -confchanges.patch, but the patch is invalid as - # ConsoleKit and PolicyKit is enough to get authorization. - enewgroup plugdev - - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See http://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -src_prepare() { - - # Gentoo system-plugin - epatch "${DISTDIR}/${PN}-ifnet-540e40f.patch" - - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${P}-confchanges.patch" - - # Fix problems with dhcpcd/dhclient (bug #330319) - epatch "${FILESDIR}/${P}-dhcp-configure.patch" - - # Backport some important patches - epatch "${FILESDIR}/${P}-CVE-2010-1172.patch" - epatch "${FILESDIR}/${P}-glib-2.25.12-workaround.patch" - epatch "${FILESDIR}/${P}-dhclient3.patch" - epatch "${FILESDIR}/${P}-dhclient3-fix.patch" - - eautoreconf -} - -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_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - else - ECONF="${ECONF} --with-dhclient --without-dhcpcd" - fi - else - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ - || die "newins failed" -} - -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 "" -} diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild deleted file mode 100644 index 27be77c2fafe..000000000000 --- a/net-misc/networkmanager/networkmanager-0.8.2-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# 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-r1.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ - -EAPI="2" - -inherit gnome.org linux-info - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -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}}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=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 ) - 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 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - >=net-dialup/ppp-2.4.5 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See http://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_setup() { - - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See http://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -src_prepare() { - # accept "gw" in /etc/conf.d/net (bug #339215) - epatch "${FILESDIR}/${P}-accept-gw.patch" -} - -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_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - else - ECONF="${ECONF} --with-dhclient --without-dhcpcd" - fi - else - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ - || die "newins failed" -} - -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 "" -} diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild deleted file mode 100644 index ecfefa8d9eb4..000000000000 --- a/net-misc/networkmanager/networkmanager-0.8.2-r10.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# 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-r10.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ - -EAPI="2" - -inherit autotools eutils gnome.org linux-info - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -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}}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=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 ) - 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 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - >=net-dialup/ppp-2.4.5 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See http://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_setup() { - # FIXME. Required by -confchanges.patch, but the patch is invalid as - # ConsoleKit and PolicyKit is enough to get authorization. - enewgroup plugdev - - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See http://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -src_prepare() { - # dbus policy patch - epatch "${FILESDIR}/${P}-confchanges.patch" - # accept "gw" in /etc/conf.d/net (bug #339215) - epatch "${FILESDIR}/${P}-accept-gw.patch" - # fix shared connection wrt bug #350476 - # fix parsing dhclient.conf wrt bug #352638 - epatch "${FILESDIR}/${P}-shared-connection.patch" - # Backports #1 - epatch "${FILESDIR}/${P}-1.patch" - # won't crash upon startup for 32bit machines wrt bug #353807 - epatch "${FILESDIR}/${P}-fix-timestamp.patch" - # fix tests wrt bug #353549 - epatch "${FILESDIR}/${P}-fix-tests.patch" - # fix temporary files creation bug #349003 - epatch "${FILESDIR}/${P}-fix-tempfiles.patch" - # won't write when nothing changed (bug #356339) - epatch "${FILESDIR}/${P}-ifnet-smarter-write.patch" - # don't pass trash arguments to dnsmasq. Fixes bug #357671 - epatch "${FILESDIR}/${P}-fix-dnsmasq-config.patch" - # fix some crashes at shutdown - epatch "${FILESDIR}/${P}-fix-shutdown.patch" - eautoreconf -} - -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_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - else - ECONF="${ECONF} --with-dhclient --without-dhcpcd" - fi - else - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ - || die "newins failed" -} - -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 "" -} diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild deleted file mode 100644 index a48a68fd2514..000000000000 --- a/net-misc/networkmanager/networkmanager-0.8.2-r2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# 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-r2.ebuild,v 1.3 2011/06/09 01:41:03 sping Exp $ - -EAPI="2" - -inherit eutils gnome.org linux-info - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -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}}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=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 ) - 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 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - >=net-dialup/ppp-2.4.5 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See http://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_setup() { - # FIXME. Required by -confchanges.patch, but the patch is invalid as - # ConsoleKit and PolicyKit is enough to get authorization. - enewgroup plugdev - - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See http://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -src_prepare() { - # dbus policy patch - epatch "${FILESDIR}/${P}-confchanges.patch" - # accept "gw" in /etc/conf.d/net (bug #339215) - epatch "${FILESDIR}/${P}-accept-gw.patch" - # Backports #1 - epatch "${FILESDIR}/${P}-1.patch" -} - -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_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - else - ECONF="${ECONF} --with-dhclient --without-dhcpcd" - fi - else - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ - || die "newins failed" -} - -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 "" -} diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild deleted file mode 100644 index 66b6a1c1de5d..000000000000 --- a/net-misc/networkmanager/networkmanager-0.8.2-r6.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# 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-r6.ebuild,v 1.2 2011/06/09 01:41:03 sping Exp $ - -EAPI="2" - -inherit autotools eutils gnome.org linux-info - -# NetworkManager likes itself with capital letters -MY_PN=${PN/networkmanager/NetworkManager} -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}}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=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 ) - 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 ) - resolvconf? ( net-dns/openresolv ) - connection-sharing? ( - net-dns/dnsmasq - net-firewall/iptables )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool - >=net-dialup/ppp-2.4.5 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -sysfs_deprecated_check() { - ebegin "Checking for SYSFS_DEPRECATED support" - - if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then - eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel" - eerror "or NetworkManager will not work correctly." - eerror "See http://bugs.gentoo.org/333639 for more info." - die "CONFIG_SYSFS_DEPRECATED_V2 support detected!" - fi - eend $? -} - -pkg_setup() { - # FIXME. Required by -confchanges.patch, but the patch is invalid as - # ConsoleKit and PolicyKit is enough to get authorization. - enewgroup plugdev - - if use kernel_linux; then - get_version - if linux_config_exists; then - sysfs_deprecated_check - else - ewarn "Was unable to determine your kernel .config" - ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly." - ewarn "See http://bugs.gentoo.org/333639 for more info." - fi - - fi -} - -src_prepare() { - # dbus policy patch - epatch "${FILESDIR}/${P}-confchanges.patch" - # accept "gw" in /etc/conf.d/net (bug #339215) - epatch "${FILESDIR}/${P}-accept-gw.patch" - # fix shared connection wrt bug #350476 - # fix parsing dhclient.conf wrt bug #352638 - epatch "${FILESDIR}/${P}-shared-connection.patch" - # Backports #1 - epatch "${FILESDIR}/${P}-1.patch" - # won't crash upon startup for 32bit machines wrt bug #353807 - epatch "${FILESDIR}/${P}-fix-timestamp.patch" - # fix tests wrt bug #353549 - epatch "${FILESDIR}/${P}-fix-tests.patch" - # fix temporary files creation bug #349003 - epatch "${FILESDIR}/${P}-fix-tempfiles.patch" - eautoreconf -} - -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_enable doc gtk-doc) - $(use_with doc docs) - $(use_with resolvconf)" - - # default is dhcpcd (if none or both are specified), ISC dchclient otherwise - if use dhclient ; then - if use dhcpcd ; then - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - else - ECONF="${ECONF} --with-dhclient --without-dhcpcd" - fi - else - ECONF="${ECONF} --with-dhcpcd --without-dhclient" - fi - - # default is NSS (if none or both are specified), GnuTLS otherwise - if use gnutls ; then - if use nss ; then - ECONF="${ECONF} --with-crypto=nss" - else - ECONF="${ECONF} --with-crypto=gnutls" - fi - else - ECONF="${ECONF} --with-crypto=nss" - fi - - econf ${ECONF} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - - # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts - keepdir /etc/NetworkManager/dispatcher.d - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - # Add keyfile plugin support - keepdir /etc/NetworkManager/system-connections - insinto /etc/NetworkManager - newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf \ - || die "newins failed" -} - -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 "" -} diff --git a/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild b/net-misc/networkmanager/networkmanager-0.9.0.ebuild index f7e6514cb896..e62b3b24feba 100644 --- a/net-misc/networkmanager/networkmanager-0.9_rc3.ebuild +++ b/net-misc/networkmanager/networkmanager-0.9.0.ebuild @@ -1,20 +1,14 @@ # 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.9_rc3.ebuild,v 1.3 2011/08/23 15:33:25 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.0.ebuild,v 1.1 2011/08/23 23:17:09 nirbheek Exp $ EAPI="4" -PATCHSET="${PN}-0.9-patches-0.1" GNOME_ORG_MODULE="NetworkManager" -GNOME_ORG_PVP="0.8" -REAL_PV="0.8.9997" inherit autotools eutils gnome.org linux-info systemd DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -# Replace our fake _rc version with the actual version -SRC_URI="${SRC_URI//${PV}/${REAL_PV}} - mirror://gentoo/${PATCHSET}.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -28,7 +22,7 @@ REQUIRED_USE=" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 -# make consolekit and/or polkit support optional ? +# TODO: Qt support? COMMON_DEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 @@ -63,8 +57,6 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 )" -# Replace our fake _rc version with the actual version -S="${WORKDIR}/${GNOME_ORG_MODULE}-${REAL_PV}" sysfs_deprecated_check() { ebegin "Checking for SYSFS_DEPRECATED support" @@ -93,12 +85,8 @@ pkg_pretend() { } src_prepare() { - # Add useful patches from upstream git (fixing crashes, SSID parsing bugs, - # and significant usability problems). - epatch "${WORKDIR}/${PATCHSET}/"*.patch - # Don't build tests - epatch "${FILESDIR}/${P}-fix-tests.patch" + epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch" eautoreconf default } |