rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- core: read nm-system-settings.conf before NetworkManager.conf (rh

Browse Source 
#606160)
- core: fix editing system DSL connections when using keyfile plugin
- core: work around inconsistent proprietary driver associated AP reporting
- core: ensure empty VPN secrets are not used (rh #587784)
- core: don't request WiFi scans when connection is locked to a specific
    BSSID
- cli: show IPv6 settings and configuration
- applet: updated translations
- editor: fix a PolicyKit-related crash editing connections (rh #603566)
- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
- editor: fix listing connections on PPC64 (rh #608663)
- editor: ensure editor windows are destroyed when closed (rh #572466)
This commit is contained in:
Daniel Williams 2010-07-22 15:06:54 +00:00
parent 61e98e4461
commit 5c4507f6fe
5 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
nm-system-settings.conf → NetworkManager.conf
View File

22
NetworkManager.spec
View File

@ -11,20 +11,20 @@
%define snapshot %{nil} %define snapshot %{nil}
%define applet_snapshot %{nil} %define applet_snapshot %{nil}
%define realversion 0.8.0.999 %define realversion 0.8.1
Name: NetworkManager Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.8.1 Version: 0.8.1
Release: 0.5%{snapshot}%{?dist} Release: 1%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{realversion}%{snapshot}.tar.bz2 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2 Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2
Source2: nm-system-settings.conf Source2: NetworkManager.conf
Patch1: nm-applet-internal-buildfixes.patch Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch Patch2: explain-dns1-dns2.patch
Patch3: nm-applet-no-notifications.patch Patch3: nm-applet-no-notifications.patch
@ -77,7 +77,6 @@ BuildRequires: gtk-doc
BuildRequires: libudev-devel BuildRequires: libudev-devel
BuildRequires: libuuid-devel BuildRequires: libuuid-devel
BuildRequires: libgudev1-devel >= 143 BuildRequires: libgudev1-devel >= 143
BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
# No bluetooth on s390 # No bluetooth on s390
%ifnarch s390 s390x %ifnarch s390 s390x
@ -307,7 +306,7 @@ fi
%dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/
%dir %{_sysconfdir}/%{name}/dispatcher.d %dir %{_sysconfdir}/%{name}/dispatcher.d
%dir %{_sysconfdir}/%{name}/VPN %dir %{_sysconfdir}/%{name}/VPN
%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf %config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
%{_bindir}/nm-tool %{_bindir}/nm-tool
%{_bindir}/nm-online %{_bindir}/nm-online
%{_libexecdir}/nm-dhcp-client.action %{_libexecdir}/nm-dhcp-client.action
@ -379,6 +378,19 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%changelog %changelog
* Thu Jul 22 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-1
- core: read nm-system-settings.conf before NetworkManager.conf (rh #606160)
- core: fix editing system DSL connections when using keyfile plugin
- core: work around inconsistent proprietary driver associated AP reporting
- core: ensure empty VPN secrets are not used (rh #587784)
- core: don't request WiFi scans when connection is locked to a specific BSSID
- cli: show IPv6 settings and configuration
- applet: updated translations
- editor: fix a PolicyKit-related crash editing connections (rh #603566)
- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
- editor: fix listing connections on PPC64 (rh #608663)
- editor: ensure editor windows are destroyed when closed (rh #572466)
* Thu Jul 1 2010 Matthias Clasen <mclasen@redhatcom> - 0.8.1-0.5 * Thu Jul 1 2010 Matthias Clasen <mclasen@redhatcom> - 0.8.1-0.5
- Rebuild against new gnome-bluetooth - Rebuild against new gnome-bluetooth

60
nm-applet-internal-buildfixes.patch
View File

@ -1,14 +1,14 @@
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac 2009-07-28 13:11:39.261718877 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac 2009-07-28 13:11:39.261718877 -0400
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA, PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74 [dbus-glib-1 >= 0.74
glib-2.0 >= 2.16 glib-2.0 >= 2.16
- NetworkManager >= 0.8 - NetworkManager >= 0.8.1
- libnm-glib >= 0.8 - libnm-glib >= 0.8.1
- libnm-util >= 0.8 - libnm-util >= 0.8.1
- libnm-glib-vpn >= 0.8 - libnm-glib-vpn >= 0.8.1
gtk+-2.0 >= 2.14 gtk+-2.0 >= 2.14
libglade-2.0 libglade-2.0
gmodule-export-2.0 gmodule-export-2.0
@ -17,15 +17,15 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac.
PKG_CHECK_MODULES(GNOME_BLUETOOTH, PKG_CHECK_MODULES(GNOME_BLUETOOTH,
gconf-2.0 gconf-2.0
- gnome-bluetooth-1.0 >= 2.27.6 - gnome-bluetooth-1.0 >= 2.27.6
- libnm-util >= 0.8 - libnm-util >= 0.8.1
- libnm-glib >= 0.8, - libnm-glib >= 0.8.1,
+ gnome-bluetooth-1.0 >= 2.27.6, + gnome-bluetooth-1.0 >= 2.27.6,
have_gbt=yes, have_gbt=no) have_gbt=yes, have_gbt=no)
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
bin_PROGRAMS = nm-connection-editor bin_PROGRAMS = nm-connection-editor
@ -48,9 +48,9 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connectio
gladedir = $(datadir)/nm-applet gladedir = $(datadir)/nm-applet
glade_DATA = \ glade_DATA = \
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+INCLUDES = -I${top_srcdir}/../include \ +INCLUDES = -I${top_srcdir}/../include \
+ -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-util \
@ -68,9 +68,9 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-hel
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \ @@ -6,6 +6,9 @@ INCLUDES = \
-I$(top_builddir) \ -I$(top_builddir) \
-I${top_builddir}/src/marshallers \ -I${top_builddir}/src/marshallers \
@ -92,9 +92,9 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-blu
endif endif
EXTRA_DIST = $(BT_WIDGET_SOURCES) EXTRA_DIST = $(BT_WIDGET_SOURCES)
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
bin_PROGRAMS = nm-applet bin_PROGRAMS = nm-applet
@ -117,9 +117,9 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.
gladedir = $(datadir)/nm-applet gladedir = $(datadir)/nm-applet
glade_DATA = applet.glade keyring.png glade_DATA = applet.glade keyring.png
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
SUBDIRS=. tests SUBDIRS=. tests
@ -139,9 +139,9 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Mak
+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
+ +
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/src/utils -INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \ +INCLUDES = -I$(top_srcdir)/src/utils \
@ -151,9 +151,9 @@ diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tes
noinst_PROGRAMS = test-utils noinst_PROGRAMS = test-utils
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
noinst_LTLIBRARIES = libwireless-security.la noinst_LTLIBRARIES = libwireless-security.la

6
nm-applet-no-notifications.patch
View File

@ -1,6 +1,6 @@
diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in.foo NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in
--- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 --- NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +++ NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<applyto>/apps/nm-applet/disable-connected-notifications</applyto> <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
<owner>nm-applet</owner> <owner>nm-applet</owner>

2
sources
View File

@ -1,2 +0,0 @@
e7196ecc0e5c15b2da1d79504b776cfa NetworkManager-0.8.0.999.tar.bz2
584190b8aecb985d89878c7703110f73 network-manager-applet-0.8.0.999.tar.bz2