From 1395c7d10655b13566013e28fb3c2be419c94942 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Sun, 5 Apr 2009 12:41:16 +0000 Subject: [PATCH] - Update to 0.7.1-rc4 - nm: use PolicyKit for system connection secrets retrieval - nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections - editor: use PolicyKit to get system connection secrets --- .cvsignore | 2 ++ NetworkManager.spec | 17 ++++++---- nm-applet-internal-buildfixes.patch | 48 ++++++++++++++--------------- sources | 4 +-- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6bb7d6b..50a37ff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -147,3 +147,5 @@ NetworkManager-0.7.0.99.git20090324.tar.bz2 network-manager-applet-0.7.0.99.svn1233.tar.bz2 NetworkManager-0.7.0.99.git20090326.tar.bz2 network-manager-applet-0.7.0.99.svn1235.tar.bz2 +NetworkManager-0.7.0.100.tar.bz2 +network-manager-applet-0.7.0.100.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index 5a098a2..b127811 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -11,14 +11,14 @@ ExcludeArch: s390 s390x %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090326 -%define applet_snapshot .svn1235 +%define snapshot %{nil} +%define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0.99 -Release: 5%{snapshot}%{?dist} +Version: 0.7.0.100 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -34,7 +34,7 @@ PreReq: chkconfig Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: hal >= %{hal_version} -Requires: iproute openssl +Requires: iproute Requires: dhclient >= 3.0.2-12 Requires: wpa_supplicant >= 0.5.7-21 Requires: libnl >= %{libnl_version} @@ -56,7 +56,6 @@ BuildRequires: wireless-tools-devel >= %{wireless_tools_version} BuildRequires: hal-devel >= %{hal_version} BuildRequires: glib2-devel gtk2-devel BuildRequires: libglade2-devel -BuildRequires: openssl-devel BuildRequires: GConf2-devel BuildRequires: gnome-keyring-devel BuildRequires: gettext-devel @@ -325,6 +324,12 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Sun Apr 5 2009 Dan Williams - 1:0.7.0.100-1 +- Update to 0.7.1-rc4 +- nm: use PolicyKit for system connection secrets retrieval +- nm: correctly interpret errors returned from chmod(2) when saving keyfile system connections +- editor: use PolicyKit to get system connection secrets + * Thu Mar 26 2009 Dan Williams - 1:0.7.0.99-5 - nm: fix crashes with out-of-tree modules that provide no driver link (rh #492246) - nm: fix USB modem probing on recent udev versions diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 89b3d5f..2799eef 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac ---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac +--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400 ++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/configure.ac 2009-04-05 08:31:12.000000000 -0400 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 @@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.bu gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400 ++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -23,12 +23,12 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection- + -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-glib + - nm_connection_editor_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -64,7 +68,10 @@ nm_connection_editor_LDADD = \ - ${top_builddir}/src/wireless-security/libwireless-security.la \ + nm_connection_editor_CPPFLAGS = \ + $(NMA_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ +@@ -70,7 +74,10 @@ nm_connection_editor_LDADD = \ ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/marshallers/libmarshallers.la \ $(NMA_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) \ @@ -38,9 +38,9 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection- if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500 ++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -58,9 +58,9 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpe + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am ---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am +--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 ++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am ---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am +--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 ++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -103,9 +103,9 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makef + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400 ++++ NetworkManager-0.7.0.100/network-manager-applet-0.7.0.100/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -116,7 +116,7 @@ diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-se libwireless_security_la_SOURCES = \ wireless-security.h \ wireless-security.c \ -@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \ +@@ -38,5 +42,7 @@ libwireless_security_la_CPPFLAGS = \ libwireless_security_la_LIBADD = \ $(NMA_LIBS) \ ${top_builddir}/src/utils/libutils.la \ diff --git a/sources b/sources index 50f2f5f..fd1b1fe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -11a6eb949e99c1911d3e96ae81c1cb5c NetworkManager-0.7.0.99.git20090326.tar.bz2 -8fef9799299d24177f91223c15429c4b network-manager-applet-0.7.0.99.svn1235.tar.bz2 +cc75c0b8b83793050e28ebe39d2c5f57 NetworkManager-0.7.0.100.tar.bz2 +4a332aecf58eefcee33abd39b5038e9e network-manager-applet-0.7.0.100.tar.bz2