- nm: fix another crash with OLPC mesh device recognition

- nm: manpage updates
- nm: autodetect netmask if DHCP server doesn't send one
- applet: fix stale mobile broadband devices shown in the menu
- applet: fix insensitive WiFi "Create..." button with open security (rh
    #541163)

.cvsignore

@@ -153,3 +153,24 @@ NetworkManager-0.7.0.100.git20090408.tar.bz2
 network-manager-applet-0.7.0.100.svn1260.tar.bz2
 NetworkManager-0.7.1.git20090414.tar.bz2
 network-manager-applet-0.7.1.tar.bz2
+NetworkManager-0.7.1.git20090617.tar.bz2
+network-manager-applet-0.7.1.git20090617.tar.bz2
+NetworkManager-0.7.1.git20090708.tar.bz2
+network-manager-applet-0.7.1.git20090708.tar.bz2
+NetworkManager-0.7.1.995.git20090928.tar.bz2
+network-manager-applet-0.7.1.995.git20090928.tar.bz2
+NetworkManager-0.7.1.996.git20091015.tar.bz2
+network-manager-applet-0.7.1.996.tar.bz2
+NetworkManager-0.7.1.997.tar.bz2
+network-manager-applet-0.7.1.997.tar.bz2
+NetworkManager-0.7.1.998.tar.bz2
+network-manager-applet-0.7.1.998.tar.bz2
+NetworkManager-0.7.2.tar.bz2
+network-manager-applet-0.7.2.tar.bz2
+NetworkManager-0.7.2.git20091223.tar.bz2
+network-manager-applet-0.7.2.git20091223.tar.bz2
+NetworkManager-0.7.2.995.git20100202.tar.bz2
+network-manager-applet-0.7.2.995.git20100202.tar.bz2
+NetworkManager-0.7.2.995.git20100225.tar.bz2
+NetworkManager-0.7.2.996.tar.bz2
+network-manager-applet-0.7.2.996.tar.bz2

Makefile

@@ -1,10 +1,10 @@
 # Makefile for source rpm: NetworkManager
-# $Id: Makefile,v 1.1 2004/09/09 02:38:39 cvsdist Exp $
+# $Id: Makefile,v 1.2 2007/10/15 18:34:58 notting Exp $
 NAME := NetworkManager
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

NetworkManager.spec

@@ -1,7 +1,5 @@
 %define udev_scriptdir /lib/udev
 
-ExcludeArch: s390 s390x
-
 %define dbus_version 1.1
 %define dbus_glib_version 0.73-6
 %define hal_version 0.5.0
@@ -11,14 +9,14 @@ ExcludeArch: s390 s390x
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20090414
+%define snapshot %{nil}
 %define applet_snapshot %{nil}
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.1
-Release: 2%{snapshot}%{?dist}
+Version: 0.7.2.996
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -35,14 +33,15 @@ Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute
-Requires: dhclient >= 3.0.2-12
-Requires: wpa_supplicant >= 0.5.7-21
+Requires: dhclient >= 12:4.1.0
+Requires: wpa_supplicant >= 1:0.6.8-4
 Requires: libnl >= %{libnl_version}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: ppp >= %{ppp_version}
 Requires: avahi-autoipd
 Requires: dnsmasq
 Requires: udev
+Requires: mobile-broadband-provider-info >= 0.20090602
 Obsoletes: dhcdbd
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
@@ -144,6 +143,7 @@ NetworkManager functionality from applications that use glib.
 
 # unpack the applet
 tar -xjf %{SOURCE1}
+
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
 
@@ -162,14 +162,14 @@ autoreconf -i
 	--enable-more-warnings=yes \
 	--with-docs=yes \
 	--with-system-ca-path=/etc/pki/tls/certs
-make
+make %{?_smp_mflags}
 
 # build the applet
 pushd network-manager-applet-%{version}
 	autoreconf -i
 	intltoolize --force
 	%configure --disable-static --enable-more-warnings=yes
-	make
+	make %{?_smp_mflags}
 popd
 
 %install
@@ -233,11 +233,31 @@ exit 0
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
 
+%pre gnome
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  fi
+fi
+
 %post gnome
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
+  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+fi
 
 %postun gnome
 touch --no-create %{_datadir}/icons/hicolor
@@ -269,6 +289,7 @@ fi
 %{_libdir}/NetworkManager/*.so*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
+%{_mandir}/man5/*
 %dir %{_localstatedir}/run/NetworkManager
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
@@ -276,10 +297,11 @@ fi
 %dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_datadir}/hal/fdi/information/10freedesktop/70-nm-olpc-mesh.fdi
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 %{_datadir}/PolicyKit/policy/*.policy
 %{udev_scriptdir}/nm-modem-probe
-%{udev_scriptdir}/rules.d/77-nm-probe-modem-capabilities.rules
+%{udev_scriptdir}/rules.d/*.rules
 
 %files devel
 %defattr(-,root,root,0755)
@@ -302,6 +324,7 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
+%{_sysconfdir}/gconf/schemas/nm-applet.schemas
 
 %files glib
 %defattr(-,root,root,0755)
@@ -326,6 +349,106 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Apr  5 2010 Dan Williams <dcbw@redhat.com> - 0.7.2.996-1
+- nm: fix another crash with OLPC mesh device recognition
+- nm: manpage updates
+- nm: autodetect netmask if DHCP server doesn't send one
+- applet: fix stale mobile broadband devices shown in the menu
+- applet: fix insensitive WiFi "Create..." button with open security (rh #541163)
+
+* Thu Feb 25 2010 Dan Williams <dcbw@redhat.com> - 0.7.2.995-2.git20100225
+- nm: fix OLPC mesh device recognition
+
+* Tue Feb  2 2010 Dan Williams <dcbw@redhat.com> - 0.7.2.995-1.git20100202
+- nm: add OLPC mesh device support
+- nm: handle /etc/hosts correctly when the hostname is already aliased
+- ifcfg-rh: ensure connection is updated when route/key files change
+
+* Wed Dec 23 2009 Dan Williams <dcbw@redhat.com> - 0.7.2-2.git20091223
+- nm: allow more connect time for 'hso' mobile broadband devices (rh #514827)
+- nm: fix reconnections on some Option 'hso' devices
+- nm: add support for more ZTE mobile broadband devices
+- ifcfg-rh: treat MODE=AUTO as infrastructure mode
+- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
+- ifcfg-rh: add support for reading and writing routes files (rh #507307)
+- applet: fix potential leakage of secrets onto the system bus (rh #546115) (CVE-2009-4145)
+- applet: fix possible connections to spoofed WPA Enterprise networks (rh #546793) (CVE-2009-4144)
+- applet: add "Disable Notifications" option
+- applet: fix blank notification with certain characters
+
+* Mon Nov 23 2009 Dan Williams <dcbw@redhat.com> - 0.7.2
+- nm: fix VPN crash with NULL secrets (rh #532084)
+- nm: validate pidfile and quit early if NM is already running (rh #517362)
+- nm: preserve WiFi and Networking Enabled states across reboot
+- nm: handle PEM certificates without an ending newline (rh #507315)
+- ifcfg-rh: handle never-default (rh #528281)
+- ifcfg-rh: ignore .rpmnew files (rh #509621)
+- applet: alert when private keys are not password protected
+- applet: fix system connection selection from the "Connect to hidden..." dialog
+- applet: don't die when auto connections can't be created (rh #532680)
+- applet: add GConf key to allow sysadmins to disable Ad-Hoc wifi network creation
+
+* Fri Oct 30 2009 Dan Williams <dcbw@redhat.com> - 0.7.1.998-1
+- nm: fix checking for TTLS phase2 secrets
+- nm: fix UUID validation regression (rh #530611)
+- ifcfg-rh: fix writing LEAP connections
+- applet: fix disabled Connect button for EAP-TLS (rh #469059)
+- applet: add a "My country is not listed" option to the mobile wizard (rh #530981)
+
+* Thu Oct 15 2009 Dan Williams <dcbw@redhat.com> - 0.7.1.997-1
+- nm: add support for PEAP-GTC (rh #451027)
+- nm: ensure VPN secrets aren't re-used when they shouldn't be
+- nm: fix race causing erroneous ethernet carrier change events
+- nm: fixes for ZTE, Onda, and Sierra modem detection and operation
+- nm: enhanced support for Ericsson 'mbm' modems
+- nm: enhanced support for AT&T Quicksilver and Option iCON 505
+- nm: work around PPP bug returning bogus nameservers
+- editor: fix editing system-wide VPN connections
+- applet: PEAP, TTLS, and wired 802.1x fixes
+- applet: install GConf schemas
+- applet: fix default focus for passphrase dialogs
+- applet: translation updates
+
+* Thu Jul  9 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-8.git20090708
+- applet: fix crash on error claiming D-Bus service (rh #519408)
+
+* Thu Jul  9 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-8.git20090708
+- applet: fix certificate validation in hidden wifi networks dialog (rh #508207)
+
+* Wed Jul  8 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-7.git20090708
+- nm: fixes for ZTE/Onda modem detection
+- nm: prevent re-opening serial port when the SIM has a PIN
+- applet: updated translations
+- editor: show list column headers
+
+* Thu Jun 25 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-6.git20090617
+- nm: fix serial port settings
+
+* Wed Jun 17 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-5.git20090617
+- nm: fix AT&T Quicksilver modem connections (rh #502002)
+- nm: fix support for s390 bus types (rh #496820)
+- nm: fix detection of some CMOtech modems
+- nm: handle unsolicited wifi scans better
+- nm: resolv.conf fixes when using DHCP and overriding search domains
+- nm: handle WEP and WPA passphrases (rh #441070)
+- nm: fix removal of old APs when none are scanned
+- nm: fix Huawei EC121 and EC168C detection and handling (rh #496426)
+- applet: save WEP and WPA passphrases instead of hashed keys (rh #441070)
+- applet: fix broken notification bubble actions
+- applet: default to WEP encryption for Ad-Hoc network creation
+- applet: fix crash when connection editor dialogs are canceled
+- applet: add a mobile broadband provider wizard
+
+* Tue May 19 2009 Karsten Hopp <karsten@redhat.com> 0.7.1-4.git20090414.1
+- drop ExcludeArch s390 s390x, we need at least the header files
+
+* Tue May 05 2009 Adam Jackson <ajax@redhat.com> 1:0.7.1-4.git20090414
+- nm-save-the-leases.patch: Use per-connection lease files, and don't delete
+  them on interface deactivate.
+
+* Thu Apr 16 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.1-3.git20090414
+- ifcfg-rh: fix problems noticing changes via inotify (rh #495884)
+
 * Tue Apr 14 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.1-2.git20090414
 - ifcfg-rh: enable write support for wired and wifi connections
 

branch

@@ -0,0 +1 @@
+F-11

nm-applet-internal-buildfixes.patch

@@ -1,22 +1,21 @@
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/configure.ac.buildfix NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/configure.ac
+--- NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/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
+ 		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.10
--		 NetworkManager >= 0.7.0
--		 libnm_glib >= 0.7.0
--		 libnm-util >= 0.7.0
--		 libnm_glib_vpn >= 0.7.0
- 		 gtk+-2.0 >= 2.10
+-		 NetworkManager >= 0.7.2
+-		 libnm_glib >= 0.7.2
+-		 libnm-util >= 0.7.2
+-		 libnm_glib_vpn >= 0.7.2
+ 		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
-@@ -2,6 +2,10 @@ NULL=
- 
+diff -up NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+@@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
 +INCLUDES = -I${top_srcdir}/../include \
@@ -38,9 +37,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/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 +57,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Mak
 +	-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.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/Makefile.am.buildfix NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/Makefile.am
+--- NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -83,9 +82,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.build
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/utils/Makefile.am
+--- NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/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 +102,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am
 +	-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.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am
---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.2.996/network-manager-applet-0.7.2.996/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  

sources

@@ -1,2 +1,2 @@
-d90a997e3e2051ce8866fe24f765141f  network-manager-applet-0.7.1.tar.bz2
-656728d3decf12e75814b0f4e252929e  NetworkManager-0.7.1.git20090414.tar.bz2
+4bd552f7845ecc39d2a39d8025837b72  NetworkManager-0.7.2.996.tar.bz2
+5012703b917c62d5859e5ec63f2a43cf  network-manager-applet-0.7.2.996.tar.bz2