diff options
author | Robert Piasek <dagger@gentoo.org> | 2010-08-17 12:33:00 +0100 |
---|---|---|
committer | Robert Piasek <dagger@gentoo.org> | 2010-08-17 12:33:00 +0100 |
commit | 549a7717e0c37ac157a52bbb2bc25b257c846c46 (patch) | |
tree | 7972acd1fc8de5ee75b1b96fab06fa3c1ccc1182 | |
parent | Update libical dependency. (diff) | |
download | dagger-549a7717e0c37ac157a52bbb2bc25b257c846c46.tar.gz dagger-549a7717e0c37ac157a52bbb2bc25b257c846c46.tar.bz2 dagger-549a7717e0c37ac157a52bbb2bc25b257c846c46.zip |
Version bump. Backported some patches.
-rw-r--r-- | net-misc/networkmanager/ChangeLog | 14 | ||||
-rw-r--r-- | net-misc/networkmanager/Manifest | 19 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch | 42 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch | 76 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8.1-CVE-2010-1172.patch | 177 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8.1-confchanges.patch (renamed from net-misc/networkmanager/files/networkmanager-0.8-confchanges.patch) | 19 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8.1-dhcp-configure.patch | 64 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8.1-glib-2.25.12-workaround.patch | 24 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.8-r102.ebuild | 134 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.8-r104.ebuild | 134 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.8.1-r2.ebuild (renamed from net-misc/networkmanager/networkmanager-0.8-r100.ebuild) | 34 |
11 files changed, 314 insertions, 423 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index ee027be..19abb59 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -2,6 +2,20 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.47 2009/06/10 22:03:19 dagger Exp $ +*networkmanager-0.8.1-r2 (17 Aug 2010) + + 17 Aug 2010; Robert Piasek <dagger@gentoo.org> + -networkmanager-0.8-r100.ebuild, -networkmanager-0.8-r102.ebuild, + -networkmanager-0.8-r104.ebuild, +networkmanager-0.8.1-r2.ebuild, + +files/networkmanager-0.8.1-CVE-2010-1172.patch, + +files/networkmanager-0.8.1-confchanges.patch, + +files/networkmanager-0.8.1-dhcp-configure.patch, + +files/networkmanager-0.8.1-glib-2.25.12-workaround.patch, + -files/networkmanager-0.8-confchanges.patch, + -files/networkmanager-0.8-nscd-clear-cache.patch, + -files/networkmanager-0.8-read-hostname.patch: + Version bump. Backported some important patches. + *networkmanager-0.8-r104 (30 Jun 2010) 30 Jun 2010; Robert Piasek <dagger@gentoo.org> diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 1e72d82..190aa0c 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,13 +1,10 @@ -AUX networkmanager-0.8-confchanges.patch 1063 RMD160 25a0d45410fa5590098386556e9947dd15507eda SHA1 ba6eaa63188f97f93bbbb327676d8104bbf7e8c8 SHA256 9fcbe0b9ab4cc38c9057a0dde2f5153efc12515ed4d28920a455dad7fc2b1e09 -AUX networkmanager-0.8-nscd-clear-cache.patch 1214 RMD160 2381f455593202a740e634601c0ba8245ecb8fac SHA1 b4a0cec446b6f8fa81c06d5992db61b296f17057 SHA256 2d981bafa96607acb06740d78b8e33afdc675c52b0cf3ce5b098c67566362c99 -AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65d30a94d91ab9a04 SHA1 f7d57c686e9bd1f1ac58e67efcd8255c0fc9a5c5 SHA256 5ee07a0fb949c7ce299f0d2459c4f9840ace765308cd1a208d89eecec51a63fe +AUX networkmanager-0.8.1-CVE-2010-1172.patch 6034 RMD160 358efedb9265524ee19153599eeb2ef1b51ccff8 SHA1 c3d2318e2eb0c13a2099e91e7a837e8bbcff0e7d SHA256 dfcf6727842250b858968ba6be49a5d6c77d3761cbd30a5cdb82fa3765ed52ed +AUX networkmanager-0.8.1-confchanges.patch 1145 RMD160 c540696830e311cc9941e55650f7214063f841b9 SHA1 e675fbbf24e5cbf3a2fb53fec3d25db46596a0b4 SHA256 29bdc1ba93aa57450602af49225ede0c535c2cbf5f18777e9eb64d5b09d4d5a3 +AUX networkmanager-0.8.1-dhcp-configure.patch 2447 RMD160 1c222ce867a7f92167b2ffcbc401f8ea83b24193 SHA1 f17b676ad65788b5b665c16b29d01a88e3cdd041 SHA256 7bda5db2d937b2562c98435620774bba487bf8b53da5c035422b2bc2ed21a400 +AUX networkmanager-0.8.1-glib-2.25.12-workaround.patch 663 RMD160 b4397b17a6148244dedd341b35185c07ca267f06 SHA1 926acbd76076750ab4ec48ac34fe73679693a4ca SHA256 a00523ad7d6bdced76be82b980788af4c313fc59aff8b9d258343e17ad6bf969 AUX nm-system-settings.conf 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f -DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05 -DIST systemsettings.patch 200974 RMD160 4117558ecfeadb9f90a8c373b7c830709e93ffd0 SHA1 11d588c679e8023cbe1faea1b3a02c82274b7ceb SHA256 1a82be455b2bbc646f49b884e8bb66bf7830b32a7a53b6eb84d759bab4b0b929 -DIST systemsettings3.patch 257594 RMD160 7d48aee550327e087ccd1fd107284b6340075b35 SHA1 09e6664314d7d134454e82d90a82e5853eb44887 SHA256 eace49bfaa61eb34de9d238da132ca6dbd0c14fc1d6fb135658921088107390d -DIST systemsettings4.patch 259626 RMD160 3165b12f4e8497f02001d03c805d207323c7e2f1 SHA1 32ab99e5e67f7e0578b36b68613201982d985d49 SHA256 07c6fc868a0efe641071ade681e3ff81ca6bf34e57c6a5806d22bf5c68efed1d -EBUILD networkmanager-0.8-r100.ebuild 3859 RMD160 3d96abb136d4e14d4e194b2b225115df740e63e2 SHA1 b30d251190c0213b205e6bd27bdebd67e171dc81 SHA256 0b9352cc7dfa134bb162fa11c0739e223d332bfdbbd6ad6ad10a9eff3c6a4007 -EBUILD networkmanager-0.8-r102.ebuild 3861 RMD160 d137946fb1f078fbf8e2919aad1c4b2f173b0311 SHA1 bc133ae919e17fbc490bd2dc75afd8a37a21d7c8 SHA256 e67f4af5a7ea99c637d74306cd12e7cce0387ea35f739dd4c6bf0cd888033b57 -EBUILD networkmanager-0.8-r104.ebuild 3861 RMD160 27bd563f553db07d63dc0ef8edd5c17e8aafbdb4 SHA1 46d04b196b1e8680a4ae79f767be311691fabef7 SHA256 d768c9e34407412d019c87840f61fc4fd5d21aa57c4b6f64a1ba6a7731fca491 -MISC ChangeLog 11848 RMD160 709f4f5cc62203d76d3adf7fbcc1852b8c5a1ff2 SHA1 97d51cb382d0dbfc06da8562bf68b9add3776915 SHA256 74505f15207222bb9b0c2579e4b988c38cde6af51edd7c7810ee44adb1c34651 +DIST NetworkManager-0.8.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa +DIST networkmanager-ifnet-962f678.patch 263188 RMD160 9266867ae2791a53c570a3b38efe997b57d4fefe SHA1 7bee053de3452f1ddda896327b1e33cdcf2a988b SHA256 4a0f5959ac5769e522dbbb444a7f439489a2a2c3a3153aff0d40a45f916612ef +EBUILD networkmanager-0.8.1-r2.ebuild 3651 RMD160 2dcedf17f1b1e68daaff13131e5b0334120c5a78 SHA1 cfbdcea87256ebd6375490fa70b2d37c719624df SHA256 97b053bb5baf92442008e422a9414e5f4f2456b11ee3572e4cabee39ba450bc5 +MISC ChangeLog 12486 RMD160 984598624e5f07cc4d4945137dc5b61000b6d82d SHA1 681ea157a451d18a1e33b63b735940d2b9c1994a SHA256 d235c3bbe4a758080dbecb6f7bc9deb970663305d8507238a7a2f328809ee7cc MISC metadata.xml 969 RMD160 c16683ef7fed4b5603029ae39f5872032ec37554 SHA1 813e0b48a78ce50d5257030507d22fd0e9452161 SHA256 e4375eae4ff0d47386780e4d29575e6581f7c9b89168372bb1bb7713a452c02f diff --git a/net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch b/net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch deleted file mode 100644 index e92c883..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8-nscd-clear-cache.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 327e00f06358ef388f4fad5abcb016daa0ec3452 Mon Sep 17 00:00:00 2001 -From: Robert Piasek <dagger@gentoo.org> -Date: Mon, 22 Feb 2010 10:34:23 +0000 -Subject: [PATCH] fix: use nscd -i to clear cache - - -Signed-off-by: Robert Piasek <dagger@gentoo.org> ---- - src/backends/NetworkManagerGentoo.c | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c -index 7fa1207..aa4b40c 100644 ---- a/src/backends/NetworkManagerGentoo.c -+++ b/src/backends/NetworkManagerGentoo.c -@@ -34,6 +34,7 @@ - #include "NetworkManagerGeneric.h" - #include "NetworkManagerSystem.h" - #include "NetworkManagerUtils.h" -+#include "nm-utils.h" - - /* - * nm_system_enable_loopback -@@ -57,11 +58,9 @@ void nm_system_enable_loopback (void) - */ - void nm_system_update_dns (void) - { -- #ifdef NM_NO_NAMED -- if (nm_spawn_process ("/etc/init.d/nscd status") == 0) -- nm_spawn_process ("/etc/init.d/nscd restart"); -- #else -- nm_spawn_process("/usr/bin/killall -q nscd"); -- #endif -+ if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { -+ nm_info ("Clearing nscd hosts cache."); -+ nm_spawn_process ("/usr/sbin/nscd -i hosts"); -+ } - } - --- -1.7.0 - diff --git a/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch b/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch deleted file mode 100644 index ac59fe2..0000000 --- a/net-misc/networkmanager/files/networkmanager-0.8-read-hostname.patch +++ /dev/null @@ -1,76 +0,0 @@ -When reading hostname from NM keyfile, if no hostname is set, read from the -system file at /etc/conf.d/hostname to set hostname. This patch is not meant to -be ever upstreamed. Proper fix is to write a gentoo-specific ifcfg plugin. - -To change hostname, touch nm-system-settings.conf, which will reload the keyfile -and cause /etc/conf.d/hostname to be reloaded. - -This horrible hack fixes http://bugs.gentoo.org/176873 - -Author: Nirbheek Chauhan <nirbheek@gentoo.org> -Reviewed-by: Arun Raghavan <ford_prefect@gentoo.org> - ---- ---- system-settings/plugins/keyfile/plugin.c -+++ system-settings/plugins/keyfile/plugin.c -@@ -43,6 +43,9 @@ - #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2008 Red Hat, Inc. To report bugs please use the NetworkManager mailing list." - - #define CONF_FILE SYSCONFDIR "/NetworkManager/nm-system-settings.conf" -+#ifdef TARGET_GENTOO -+#define HOSTNAME_FILE SYSCONFDIR "/conf.d/hostname" -+#endif - - static char *plugin_get_hostname (SCPluginKeyfile *plugin); - static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class); -@@ -381,6 +384,12 @@ - GKeyFile *key_file; - char *hostname = NULL; - GError *error = NULL; -+#ifdef TARGET_GENTOO -+ char *contents = NULL; -+ char **lines = NULL, **line; -+ GError *contents_err = NULL; -+ gsize contents_len = 0; -+#endif - - key_file = g_key_file_new (); - if (g_key_file_load_from_file (key_file, CONF_FILE, G_KEY_FILE_NONE, &error)) -@@ -392,7 +401,37 @@ - - g_key_file_free (key_file); - -+ if (hostname) -+ goto out; -+#ifdef TARGET_GENTOO -+ /* If hostname is unset in keyfile, read system file to get hostname */ -+ if (!g_file_get_contents (HOSTNAME_FILE, &contents, -+ &contents_len, &contents_err)) -+ goto out; -+ -+ lines = g_strsplit_set (contents, "\n\r", 0); -+ if (!lines) -+ goto out; -+ -+ for (line = lines; *line; line++) { -+ if (!g_str_has_prefix (*line, "hostname=")) -+ continue; -+ hostname = g_strsplit_set (g_strsplit_set (*line, "=", 0)[1], "#", 0)[0]; -+ g_strstrip (hostname); -+ if (!hostname) -+ goto out; -+ /* Remove quotes surrounding hostname */ -+ if (hostname[0] == '"' && hostname[strlen(hostname)-1] == '"') -+ contents = g_strndup(&hostname[1], strlen(hostname)-2); -+ /* Un-escape before using to imitate librc behaviour */ -+ hostname = g_strcompress (contents); -+ } -+ -+out: -+ g_error_free(contents_err); -+ - return hostname; -+#endif - } - - static gboolean 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 new file mode 100644 index 0000000..321be0e --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.8.1-CVE-2010-1172.patch @@ -0,0 +1,177 @@ +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-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8.1-confchanges.patch index 039a074..e714569 100644 --- a/net-misc/networkmanager/files/networkmanager-0.8-confchanges.patch +++ b/net-misc/networkmanager/files/networkmanager-0.8.1-confchanges.patch @@ -1,19 +1,22 @@ -diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN NetworkManager-0.8.orig/src/NetworkManager.conf NetworkManager-0.8/src/NetworkManager.conf ---- NetworkManager-0.8.orig/src/NetworkManager.conf 2010-02-18 10:47:45.000000000 -0500 -+++ NetworkManager-0.8/src/NetworkManager.conf 2010-03-30 11:27:27.751522916 -0400 -@@ -56,6 +56,15 @@ - +--- 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"/> -+ </policy> ++ + <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> <policy context="default"> <deny own="org.freedesktop.NetworkManager"/> + <deny own="org.freedesktop.NetworkManagerSystemSettings"/> 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 new file mode 100644 index 0000000..be5e58a --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.8.1-dhcp-configure.patch @@ -0,0 +1,64 @@ +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 new file mode 100644 index 0000000..822551d --- /dev/null +++ b/net-misc/networkmanager/files/networkmanager-0.8.1-glib-2.25.12-workaround.patch @@ -0,0 +1,24 @@ +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/networkmanager-0.8-r102.ebuild b/net-misc/networkmanager/networkmanager-0.8-r102.ebuild deleted file mode 100644 index d47579f..0000000 --- a/net-misc/networkmanager/networkmanager-0.8-r102.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.2 2010/04/13 18:13:22 armin76 Exp $ - -EAPI="2" - -inherit gnome.org eutils autotools - -# 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://patches.piasek.co.uk/systemsettings3.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=dev-libs/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-3.0.0 ) ) - !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 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.8-confchanges.patch" - - # Hack keyfile plugin to read hostname file, fixes bug 176873 - epatch "${FILESDIR}/${P}-read-hostname.patch" - - # Clear NSCD cache rather then kill daemon bug 301720 - epatch "${FILESDIR}/${P}-nscd-clear-cache.patch" - - # Gentoo system-plugin - epatch "${DISTDIR}/systemsettings3.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-dhcp-client=dhcpcd" - else - ECONF="${ECONF} --with-dhcp-client=dhclient" - fi - else - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - 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" nm-system-settings.conf \ - || die "newins failed" -} - -pkg_postinst() { - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." - elog "" - elog "To save system-wide settings as a user, that user needs to have the" - elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' -} diff --git a/net-misc/networkmanager/networkmanager-0.8-r104.ebuild b/net-misc/networkmanager/networkmanager-0.8-r104.ebuild deleted file mode 100644 index 0363767..0000000 --- a/net-misc/networkmanager/networkmanager-0.8-r104.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.2 2010/04/13 18:13:22 armin76 Exp $ - -EAPI="2" - -inherit gnome.org eutils autotools - -# 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://patches.piasek.co.uk/systemsettings4.patch" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-sharing" - -RDEPEND=">=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.75 - >=net-wireless/wireless-tools-28_pre9 - >=sys-fs/udev-145[extras] - >=dev-libs/glib-2.18 - >=sys-auth/polkit-0.92 - >=dev-libs/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-3.0.0 ) ) - !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 - doc? ( >=dev-util/gtk-doc-1.8 )" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.8-confchanges.patch" - - # Hack keyfile plugin to read hostname file, fixes bug 176873 - epatch "${FILESDIR}/${P}-read-hostname.patch" - - # Clear NSCD cache rather then kill daemon bug 301720 - epatch "${FILESDIR}/${P}-nscd-clear-cache.patch" - - # Gentoo system-plugin - epatch "${DISTDIR}/systemsettings4.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-dhcp-client=dhcpcd" - else - ECONF="${ECONF} --with-dhcp-client=dhclient" - fi - else - ECONF="${ECONF} --with-dhcp-client=dhcpcd" - 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" nm-system-settings.conf \ - || die "newins failed" -} - -pkg_postinst() { - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." - elog "" - elog "To save system-wide settings as a user, that user needs to have the" - elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' -} diff --git a/net-misc/networkmanager/networkmanager-0.8-r100.ebuild b/net-misc/networkmanager/networkmanager-0.8.1-r2.ebuild index 15246d0..662e6c0 100644 --- a/net-misc/networkmanager/networkmanager-0.8-r100.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.2 2010/04/13 18:13:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.1-r1.ebuild,v 1.1 2010/08/04 12:05:53 dagger Exp $ EAPI="2" @@ -13,7 +13,7 @@ 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://patches.piasek.co.uk/systemsettings.patch" + http://dev.gentoo.org/~dagger/files/${PN}-ifnet-962f678.patch" LICENSE="GPL-2" SLOT="0" @@ -39,7 +39,7 @@ RDEPEND=">=sys-apps/dbus-1.2 !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - !dhcpcd? ( >=net-misc/dhcp-3.0.0 ) ) + !dhcpcd? ( >=net-misc/dhcp-4.0.0 ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( @@ -56,16 +56,17 @@ S=${WORKDIR}/${MY_P} src_prepare() { # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.8-confchanges.patch" + epatch "${FILESDIR}/${P}-confchanges.patch" - # Hack keyfile plugin to read hostname file, fixes bug 176873 - epatch "${FILESDIR}/${P}-read-hostname.patch" - - # Clear NSCD cache rather then kill daemon bug 301720 - epatch "${FILESDIR}/${P}-nscd-clear-cache.patch" + # Fix problems with dhcpcd/dhclient (bug #330319) + epatch "${FILESDIR}/${P}-dhcp-configure.patch" # Gentoo system-plugin - epatch "${DISTDIR}/systemsettings.patch" + epatch "${DISTDIR}/${PN}-ifnet.patch" + + # Backport some important patches + epatch "${FILESDIR}/${P}-CVE-2010-1172.patch" + epatch "${FILESDIR}/${P}-glib-2.25.12-workaround.patch" eautoreconf } @@ -84,12 +85,12 @@ src_configure() { # default is dhcpcd (if none or both are specified), ISC dchclient otherwise if use dhclient ; then if use dhcpcd ; then - ECONF="${ECONF} --with-dhcp-client=dhcpcd" + ECONF="${ECONF} --with-dhcpcd" else - ECONF="${ECONF} --with-dhcp-client=dhclient" + ECONF="${ECONF} --with-dhclient" fi else - ECONF="${ECONF} --with-dhcp-client=dhcpcd" + ECONF="${ECONF} --with-dhcpcd" fi # default is NSS (if none or both are specified), GnuTLS otherwise @@ -125,10 +126,7 @@ src_install() { } pkg_postinst() { - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." + 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 "" - elog "To save system-wide settings as a user, that user needs to have the" - elog "right policykit privileges. You can add them by running:" - elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"' } |