Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2013-05-13 15:10:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2013-05-02 11:27:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2013-05-13 15:10:27.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 10 14:17:50 UTC 2013 - wstephenson@suse.com + +- Readd nm-probe-radius-server-cert.patch, as it is not yet merged + upstream (bnc#574266, bnc#771185). + +------------------------------------------------------------------- New: ---- nm-probe-radius-server-cert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.NWsut4/_old 2013-05-13 15:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.NWsut4/_new 2013-05-13 15:10:30.000000000 +0200 @@ -41,6 +41,8 @@ Patch3: nm-don-t-consider-not-needed-secrets-for-has_system_secr.diff # PATCH-HACK-OPENSUSE nm-treat-not-saved-secrets-just-like-agent-owned-when-cl.diff lnussel@suse.com -- avoid polkit popups for 802.11x Patch4: nm-treat-not-saved-secrets-just-like-agent-owned-when-cl.diff +# PATCH-FIX-UPSTREAM nm-probe-radius-server-cert.patch bnc#574266 glin@suse.com -- Probe the RADIUS server certificate +Patch5: nm-probe-radius-server-cert.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -189,6 +191,7 @@ #patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build pppddir=`ls -1d /usr/%_lib/pppd/2*` ++++++ nm-don-t-consider-not-needed-secrets-for-has_system_secr.diff ++++++ --- /var/tmp/diff_new_pack.NWsut4/_old 2013-05-13 15:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.NWsut4/_new 2013-05-13 15:10:30.000000000 +0200 @@ -7,11 +7,11 @@ src/settings/nm-agent-manager.c | 56 +++++++++++++++++++++++++++++++++++--- 1 files changed, 51 insertions(+), 5 deletions(-) -diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c -index 5ccbdc6..f3519c3 100644 ---- a/src/settings/nm-agent-manager.c -+++ b/src/settings/nm-agent-manager.c -@@ -889,6 +889,11 @@ get_agent_modify_auth_cb (NMAuthChain *chain, +Index: NetworkManager-0.9.8.0/src/settings/nm-agent-manager.c +=================================================================== +--- NetworkManager-0.9.8.0.orig/src/settings/nm-agent-manager.c ++++ NetworkManager-0.9.8.0/src/settings/nm-agent-manager.c +@@ -847,6 +847,11 @@ get_agent_modify_auth_cb (NMAuthChain *c nm_auth_chain_unref (chain); } @@ -23,7 +23,7 @@ static void check_system_secrets_cb (NMSetting *setting, const char *key, -@@ -897,11 +902,17 @@ check_system_secrets_cb (NMSetting *setting, +@@ -855,11 +860,17 @@ check_system_secrets_cb (NMSetting *sett gpointer user_data) { NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -42,7 +42,7 @@ /* Clear out system-owned or always-ask secrets */ if (NM_IS_SETTING_VPN (setting) && !strcmp (key, NM_SETTING_VPN_SECRETS)) { GHashTableIter iter; -@@ -913,21 +924,44 @@ check_system_secrets_cb (NMSetting *setting, +@@ -871,21 +882,44 @@ check_system_secrets_cb (NMSetting *sett secret_flags = NM_SETTING_SECRET_FLAG_NONE; nm_setting_get_secret_flags (setting, secret_name, &secret_flags, NULL); if (secret_flags == NM_SETTING_SECRET_FLAG_NONE) @@ -90,7 +90,7 @@ return has_system; } -@@ -936,20 +970,32 @@ get_next_cb (Request *req) +@@ -894,20 +928,32 @@ get_next_cb (Request *req) { NMSettingConnection *s_con; const char *agent_dbus_owner, *perm; @@ -124,6 +124,3 @@ nm_log_dbg (LOGD_AGENTS, "(%p/%s) request has system secrets; checking agent %s for MODIFY", req, req->setting_name, agent_dbus_owner); --- -1.7.3.4 - ++++++ nm-probe-radius-server-cert.patch ++++++ ++++ 946 lines (skipped) ++++++ nm-treat-not-saved-secrets-just-like-agent-owned-when-cl.diff ++++++ --- /var/tmp/diff_new_pack.NWsut4/_old 2013-05-13 15:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.NWsut4/_new 2013-05-13 15:10:30.000000000 +0200 @@ -7,11 +7,11 @@ src/settings/nm-settings-connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c -index cdad832..4cd9395 100644 ---- a/src/settings/nm-settings-connection.c -+++ b/src/settings/nm-settings-connection.c -@@ -592,7 +592,7 @@ clear_nonagent_secrets (GHashTableIter *iter, +Index: NetworkManager-0.9.8.0/src/settings/nm-settings-connection.c +=================================================================== +--- NetworkManager-0.9.8.0.orig/src/settings/nm-settings-connection.c ++++ NetworkManager-0.9.8.0/src/settings/nm-settings-connection.c +@@ -592,7 +592,7 @@ clear_nonagent_secrets (GHashTableIter * NMSettingSecretFlags flags, gpointer user_data) { @@ -20,6 +20,3 @@ g_hash_table_iter_remove (iter); return TRUE; } --- -1.7.3.4 - ++++++ systemd-network-config.patch ++++++ --- /var/tmp/diff_new_pack.NWsut4/_old 2013-05-13 15:10:30.000000000 +0200 +++ /var/tmp/diff_new_pack.NWsut4/_new 2013-05-13 15:10:30.000000000 +0200 @@ -1,7 +1,7 @@ -Index: NetworkManager-0.9.7.995/data/NetworkManager.service.in +Index: NetworkManager-0.9.8.0/data/NetworkManager.service.in =================================================================== ---- NetworkManager-0.9.7.995.orig/data/NetworkManager.service.in -+++ NetworkManager-0.9.7.995/data/NetworkManager.service.in +--- NetworkManager-0.9.8.0.orig/data/NetworkManager.service.in ++++ NetworkManager-0.9.8.0/data/NetworkManager.service.in @@ -1,7 +1,7 @@ [Unit] Description=Network Manager @@ -19,10 +19,10 @@ Also=NetworkManager-wait-online.service +Alias=network.service -Index: NetworkManager-0.9.7.995/data/NetworkManager-wait-online.service.in +Index: NetworkManager-0.9.8.0/data/NetworkManager-wait-online.service.in =================================================================== ---- NetworkManager-0.9.7.995.orig/data/NetworkManager-wait-online.service.in -+++ NetworkManager-0.9.7.995/data/NetworkManager-wait-online.service.in +--- NetworkManager-0.9.8.0.orig/data/NetworkManager-wait-online.service.in ++++ NetworkManager-0.9.8.0/data/NetworkManager-wait-online.service.in @@ -7,7 +7,9 @@ Before=network.target [Service] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org