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

- build: fix for new pppd (rh #548520)

Browse Source 
- core: add WWAN enable/disable functionality
- ifcfg-rh: IPv6 addressing and routes support (rh #523288)
- ifcfg-rh: ensure connection is updated when route/key files change
- applet: fix crash when active AP isn't found (rh #546901)
- editor: fix crash when editing connections (rh #549579)
This commit is contained in:
Daniel Williams 2010-01-07 07:13:20 +00:00
parent 2e0f497b0f
commit ac7dc195db
5 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -175,3 +175,5 @@ NetworkManager-0.7.997.tar.bz2
network-manager-applet-0.7.997.tar.bz2 network-manager-applet-0.7.997.tar.bz2
NetworkManager-0.7.997.git20091214.tar.bz2 NetworkManager-0.7.997.git20091214.tar.bz2
network-manager-applet-0.7.997.git20091214.tar.bz2 network-manager-applet-0.7.997.git20091214.tar.bz2
NetworkManager-0.7.998.git20100106.tar.bz2
network-manager-applet-0.7.998.git20100106.tar.bz2

31
NetworkManager.spec
View File

@ -7,16 +7,16 @@
%define glib2_version 2.16.0 %define glib2_version 2.16.0
%define wireless_tools_version 1:28-0pre9 %define wireless_tools_version 1:28-0pre9
%define libnl_version 1.1 %define libnl_version 1.1
%define ppp_version 2.2.4 %define ppp_version 2.4.5
%define snapshot .git20091214 %define snapshot .git20100106
%define applet_snapshot .git20091214 %define applet_snapshot .git20100106
Name: NetworkManager Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.7.997 Version: 0.7.998
Release: 2%{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/
@ -39,7 +39,7 @@ Requires: dhclient >= 12:4.1.0
Requires: wpa_supplicant >= 1:0.6.8-4 Requires: wpa_supplicant >= 1:0.6.8-4
Requires: libnl >= %{libnl_version} Requires: libnl >= %{libnl_version}
Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Requires: ppp >= %{ppp_version} Requires: ppp = %{ppp_version}
Requires: avahi-autoipd Requires: avahi-autoipd
Requires: dnsmasq Requires: dnsmasq
Requires: udev Requires: udev
@ -67,7 +67,8 @@ BuildRequires: libnl-devel >= %{libnl_version}
BuildRequires: libnotify-devel >= 0.4 BuildRequires: libnotify-devel >= 0.4
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
BuildRequires: automake autoconf intltool libtool BuildRequires: automake autoconf intltool libtool
BuildRequires: ppp-devel >= %{ppp_version} BuildRequires: ppp = %{ppp_version}
BuildRequires: ppp-devel = %{ppp_version}
BuildRequires: nss-devel >= 3.11.7 BuildRequires: nss-devel >= 3.11.7
BuildRequires: polkit-devel BuildRequires: polkit-devel
BuildRequires: dhclient BuildRequires: dhclient
@ -170,7 +171,9 @@ autoreconf -i
--enable-more-warnings=yes \ --enable-more-warnings=yes \
--with-docs=yes \ --with-docs=yes \
--with-system-ca-path=/etc/pki/tls/certs \ --with-system-ca-path=/etc/pki/tls/certs \
--with-tests=yes --with-tests=yes \
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
make %{?_smp_mflags} make %{?_smp_mflags}
# build the applet # build the applet
@ -209,7 +212,7 @@ popd
cat nm-applet.lang >> %{name}.lang cat nm-applet.lang >> %{name}.lang
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.la
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la
@ -306,7 +309,7 @@ fi
%{_datadir}/NetworkManager/gdb-cmd %{_datadir}/NetworkManager/gdb-cmd
%dir %{_sysconfdir}/NetworkManager/system-connections %dir %{_sysconfdir}/NetworkManager/system-connections
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_libdir}/pppd/2.4.4/nm-pppd-plugin.so %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
%{_datadir}/polkit-1/actions/*.policy %{_datadir}/polkit-1/actions/*.policy
%{udev_scriptdir}/rules.d/*.rules %{udev_scriptdir}/rules.d/*.rules
@ -360,6 +363,14 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%changelog %changelog
* Wed Jan 6 2010 Dan Williams <dcbw@redhat.com> - 0.7.998-1.git20100106
- build: fix for new pppd (rh #548520)
- core: add WWAN enable/disable functionality
- ifcfg-rh: IPv6 addressing and routes support (rh #523288)
- ifcfg-rh: ensure connection is updated when route/key files change
- applet: fix crash when active AP isn't found (rh #546901)
- editor: fix crash when editing connections (rh #549579)
* Mon Dec 14 2009 Dan Williams <dcbw@redhat.com> - 0.7.997-2.git20091214 * Mon Dec 14 2009 Dan Williams <dcbw@redhat.com> - 0.7.997-2.git20091214
- core: fix recognition of standalone 802.1x private keys - core: fix recognition of standalone 802.1x private keys
- applet: clean notification text to ensure it passes libnotify validation - applet: clean notification text to ensure it passes libnotify validation

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

@ -1,14 +1,14 @@
diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac 2009-07-28 13:11:39.261718877 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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.7.997 - NetworkManager >= 0.7.998
- libnm-glib >= 0.7.997 - libnm-glib >= 0.7.998
- libnm-util >= 0.7.997 - libnm-util >= 0.7.998
- libnm-glib-vpn >= 0.7.997 - libnm-glib-vpn >= 0.7.998
gtk+-2.0 >= 2.14 gtk+-2.0 >= 2.14
libglade-2.0 libglade-2.0
gmodule-export-2.0 gmodule-export-2.0
@ -23,9 +23,9 @@ diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/configure.ac.buil
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.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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.7.997/network-manager-applet-0.7.997/src/connection-ed
gladedir = $(datadir)/nm-applet gladedir = $(datadir)/nm-applet
glade_DATA = \ glade_DATA = \
diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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.7.997/network-manager-applet-0.7.997/src/gconf-helpers
+ -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.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \ @@ -6,6 +6,9 @@ INCLUDES = \
-DLOCALEDIR="\"$(datadir)/locale\"" \ -DLOCALEDIR="\"$(datadir)/locale\"" \
-I$(top_srcdir)/src/gconf-helpers/ \ -I$(top_srcdir)/src/gconf-helpers/ \
@ -94,9 +94,9 @@ diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/gnome-bluetoo
endif endif
EXTRA_DIST = network-manager-applet.c EXTRA_DIST = network-manager-applet.c
diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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
@ -119,9 +119,9 @@ diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/Makefile.am.b
gladedir = $(datadir)/nm-applet gladedir = $(datadir)/nm-applet
glade_DATA = applet.glade keyring.png glade_DATA = applet.glade keyring.png
diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
SUBDIRS=. tests SUBDIRS=. tests
@ -141,9 +141,9 @@ diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/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.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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 \
@ -153,9 +153,9 @@ diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/utils/tests/M
noinst_PROGRAMS = test-utils noinst_PROGRAMS = test-utils
diff -up NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in.foo NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in diff -up NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in.foo NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in
--- NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 --- NetworkManager-0.7.998/network-manager-applet-0.7.998/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700
+++ NetworkManager-0.7.997/network-manager-applet-0.7.997/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +++ NetworkManager-0.7.998/network-manager-applet-0.7.998/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 @@
2ad5369255534adb2315a44ef839e2b6 NetworkManager-0.7.997.git20091214.tar.bz2 2ec2743b8a68fb18f751e0aea0ca2b11 NetworkManager-0.7.998.git20100106.tar.bz2
c16a47cc1c76e45915e7d8e0580acee7 network-manager-applet-0.7.997.git20091214.tar.bz2 3c071bad92ca4d66d98e02c30419d99a network-manager-applet-0.7.998.git20100106.tar.bz2