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

- core: fix handling of IPv6 RA flags when router goes away (rh #588560)

Browse Source 
- bluetooth: fix crash configuring DUN connections from the wizard (rh
    #590666)
This commit is contained in:
Daniel Williams 2010-05-11 05:46:43 +00:00
parent 1818cd0761
commit abba078907
5 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -208,3 +208,5 @@ NetworkManager-0.8.git20100504.tar.bz2
network-manager-applet-0.8.git20100504.tar.bz2 network-manager-applet-0.8.git20100504.tar.bz2
NetworkManager-0.8.git20100509.tar.bz2 NetworkManager-0.8.git20100509.tar.bz2
network-manager-applet-0.8.git20100509.tar.bz2 network-manager-applet-0.8.git20100509.tar.bz2
NetworkManager-0.8.0.997.git20100510.tar.bz2
network-manager-applet-0.8.0.997.git20100510.tar.bz2

14
NetworkManager.spec
View File

@ -9,15 +9,15 @@
%define libnl_version 1.1 %define libnl_version 1.1
%define ppp_version 2.4.5 %define ppp_version 2.4.5
%define snapshot .git20100509 %define snapshot .git20100510
%define applet_snapshot .git20100509 %define applet_snapshot .git20100510
%define realversion 0.8 %define realversion 0.8.0.997
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.0 Version: 0.8.1
Release: 13%{snapshot}%{?dist} Release: 0.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/
@ -378,6 +378,10 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%changelog %changelog
* Mon May 10 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.1.git20100510
- core: fix handling of IPv6 RA flags when router goes away (rh #588560)
- bluetooth: fix crash configuring DUN connections from the wizard (rh #590666)
* Sun May 9 2010 Dan Williams <dcbw@redhat.com> - 0.8-13.git20100509 * Sun May 9 2010 Dan Williams <dcbw@redhat.com> - 0.8-13.git20100509
- core: restore initial accept_ra value for IPv6 ignored connections (rh #588619) - core: restore initial accept_ra value for IPv6 ignored connections (rh #588619)
- bluetooth: fix bad timeout on PAN connections (rh #586961) - bluetooth: fix bad timeout on PAN connections (rh #586961)

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

@ -1,6 +1,6 @@
diff -up NetworkManager-0.8/network-manager-applet-0.8/configure.ac.buildfix NetworkManager-0.8/network-manager-applet-0.8/configure.ac diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/configure.ac.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/configure.ac
--- NetworkManager-0.8/network-manager-applet-0.8/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/configure.ac 2009-07-28 13:11:39.261718877 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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
@ -23,9 +23,9 @@ diff -up NetworkManager-0.8/network-manager-applet-0.8/configure.ac.buildfix Net
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/network-manager-applet-0.8/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/connection-editor/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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/network-manager-applet-0.8/src/connection-editor/Mak
gladedir = $(datadir)/nm-applet gladedir = $(datadir)/nm-applet
glade_DATA = \ glade_DATA = \
diff -up NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/gconf-helpers/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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/network-manager-applet-0.8/src/gconf-helpers/Makefil
+ -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/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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 \
@ -91,10 +91,10 @@ diff -up NetworkManager-0.8/network-manager-applet-0.8/src/gnome-bluetooth/Makef
+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
endif endif
EXTRA_DIST = network-manager-applet.c EXTRA_DIST = $(BT_WIDGET_SOURCES)
diff -up NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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/network-manager-applet-0.8/src/Makefile.am.buildfix
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/network-manager-applet-0.8/src/utils/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/utils/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/utils/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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/network-manager-applet-0.8/src/utils/Makefile.am.bui
+ -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/network-manager-applet-0.8/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/utils/tests/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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/network-manager-applet-0.8/src/utils/tests/Makefile.
noinst_PROGRAMS = test-utils noinst_PROGRAMS = test-utils
diff -up NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/wireless-security/Makefile.am
--- NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8/network-manager-applet-0.8/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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/network-manager-applet-0.8/nm-applet.schemas.in.foo NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in diff -up NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/nm-applet.schemas.in.foo NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/nm-applet.schemas.in
--- NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 --- NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
+++ NetworkManager-0.8/network-manager-applet-0.8/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +++ NetworkManager-0.8.0.997/network-manager-applet-0.8.0.997/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>

4
sources
View File

@ -1,2 +1,2 @@
8c5bbaf0ebbad8f209d6566d829fdf36 NetworkManager-0.8.git20100509.tar.bz2 adef9250b39636e566a1cf49cb19d451 NetworkManager-0.8.0.997.git20100510.tar.bz2
1c3ecd6337742d25208bde65732d19e3 network-manager-applet-0.8.git20100509.tar.bz2 6ce1c414b871ca68a3e6dbd0149a3323 network-manager-applet-0.8.0.997.git20100510.tar.bz2