Add missing 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)

.cvsignore

@@ -165,3 +165,11 @@ NetworkManager-0.7.996.git20090921.tar.bz2
 network-manager-applet-0.7.996.git20090921.tar.bz2
 NetworkManager-0.7.996.git20090928.tar.bz2
 network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2
+NetworkManager-0.7.996.git20091002.tar.bz2
+network-manager-applet-0.7.996.git20091002.tar.bz2
+NetworkManager-0.7.996.git20091021.tar.bz2
+network-manager-applet-0.7.996.git20091021.tar.bz2
+NetworkManager-0.7.996.git20091113.tar.bz2
+network-manager-applet-0.7.996.git20091113.tar.bz2
+NetworkManager-0.7.997.tar.bz2
+network-manager-applet-0.7.997.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

@@ -7,28 +7,31 @@
 %define glib2_version	2.16.0
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.1
-%define ppp_version 2.2.4
+%define ppp_version 2.4.5
 
-%define snapshot .git20090928
-%define applet_snapshot .git20090928-menu-rework
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.8.1
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.996
-Release: 3%{snapshot}%{?dist}
+Version: 0.8.1
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}%{snapshot}.tar.bz2
-Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2
-Source2: nm-system-settings.conf
+Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2
+Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
+Patch3: nm-applet-no-notifications.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-PreReq:   chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
@@ -37,12 +40,12 @@ 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: ppp = %{ppp_version}
 Requires: avahi-autoipd
 Requires: dnsmasq
 Requires: udev
 Requires: mobile-broadband-provider-info >= 0.20090602
-Requires: ModemManager >= 0.2-3.20090826
+Requires: ModemManager >= 0.3-3.git20100317
 Obsoletes: dhcdbd
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
@@ -65,15 +68,20 @@ BuildRequires: libnl-devel >= %{libnl_version}
 BuildRequires: libnotify-devel >= 0.4
 BuildRequires: perl(XML::Parser)
 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: polkit-devel
 BuildRequires: dhclient
 BuildRequires: gtk-doc
 BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
-BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
 BuildRequires: libgudev1-devel >= 143
+BuildRequires: desktop-file-utils
+# No bluetooth on s390
+%ifnarch s390 s390x
+BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1
+%endif
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -105,10 +113,10 @@ Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: libnotify >= 0.4.3
-PreReq:  gtk2 >= %{gtk2_version}
 Requires: gnome-keyring
 Requires: nss >= 3.11.7
 Requires: gnome-icon-theme
+Requires(post): gtk2 >= %{gtk2_version}
 
 %description gnome
 This package contains GNOME utilities and applications for use with
@@ -141,13 +149,14 @@ NetworkManager functionality from applications that use glib.
 
 
 %prep
-%setup -q
+%setup -q -n NetworkManager-%{realversion}
 
-# unpack the applet
+# unpack the applet and nmcli
 tar -xjf %{SOURCE1}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .no-notifications
 
 %build
 
@@ -159,19 +168,24 @@ autoreconf -i
 %configure \
 	--disable-static \
 	--with-distro=redhat \
-	--with-dhcp-client=dhclient \
+	--with-dhclient=yes \
+	--with-dhcpcd=no \
 	--with-crypto=nss \
 	--enable-more-warnings=yes \
 	--with-docs=yes \
-	--with-system-ca-path=/etc/pki/tls/certs
-make
+	--with-system-ca-path=/etc/pki/tls/certs \
+	--with-tests=yes \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+	--with-dist-version=%{version}-%{release}
+
+make %{?_smp_mflags}
 
 # build the applet
-pushd network-manager-applet-%{version}
+pushd network-manager-applet-%{realversion}
 	autoreconf -i
 	intltoolize --force
 	%configure --disable-static --enable-more-warnings=yes
-	make
+	make %{?_smp_mflags}
 popd
 
 %install
@@ -183,7 +197,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
-pushd network-manager-applet-%{version}
+pushd network-manager-applet-%{realversion}
   make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
@@ -195,12 +209,14 @@ popd
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 
+%{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
+
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
 
 %{__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}/gnome-bluetooth/plugins/*.la
 
@@ -210,6 +226,14 @@ install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 %{__cp} ORIG-docs/libnm-glib/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-glib/
 %{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
 
+# don't autostart in KDE on F13+ (#541353)
+%if 0%{?fedora} > 12
+echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%endif
+
+# validate the autostart .desktop file
+desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -233,19 +257,23 @@ fi
 /sbin/chkconfig --del NetworkManagerDispatcher
 exit 0
 
-%post   glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
+%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`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  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`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+  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
@@ -254,7 +282,9 @@ 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`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
+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,12 +299,14 @@ fi
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
+%{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
 %{_sbindir}/%{name}
+%{_bindir}/nmcli
 %dir %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/dispatcher.d
 %dir %{_sysconfdir}/%{name}/VPN
-%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
+%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
 %{_bindir}/nm-tool
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
@@ -283,14 +315,16 @@ fi
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/*.so*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
+%dir %{_localstatedir}/lib/NetworkManager
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
 %dir %{_sysconfdir}/NetworkManager/system-connections
 %{_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
 %{udev_scriptdir}/rules.d/*.rules
 
@@ -316,8 +350,10 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %dir %{_datadir}/gnome-vpn-properties
-%{_libdir}/gnome-bluetooth/plugins/*
 %{_sysconfdir}/gconf/schemas/nm-applet.schemas
+%ifnarch s390 s390x
+%{_libdir}/gnome-bluetooth/plugins/*
+%endif
 
 %files glib
 %defattr(-,root,root,0755)
@@ -342,6 +378,234 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %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
+- Rebuild against new gnome-bluetooth
+
+* Fri Jun 25 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.4
+- Update to 0.8.1 release candidate
+- core: fix WWAN hardware enable state tracking (rh #591622)
+- core: fix Red Hat initscript return value on double-start (rh #584321)
+- core: add multicast route entry for IPv4 link-local connections
+- core: fix connection sharing in cases where a dnsmasq config file exists
+- core: fix handling of Ad-Hoc wifi connections to indicate correct network
+- core: ensure VPN interface name is passed to dispatcher when VPN goes down
+- ifcfg-rh: fix handling of ASCII WEP keys
+- ifcfg-rh: fix double-quoting of some SSIDs (rh #606518)
+- applet: ensure deleted connections are actually forgotten (rh #618973)
+- applet: don't crash if the AP's BSSID isn't availabe (rh #603236)
+- editor: don't crash on PolicyKit events after windows are closed (rh #572466)
+
+* Wed May 26 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.3
+- core: fix nm-online crash (rh #593677)
+- core: fix failed suspend disables network (rh #589108)
+- core: print out missing firmware errors (rh #594578)
+- applet: fix device descriptions for some mobile broadband devices
+- keyfile: bluetooth fixes
+- applet: updated translations (rh #589230)
+
+* Wed May 19 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.2.git20100519
+- core: use GIO in local mode only (rh #588745)
+- core: updated translations (rh #589230)
+- core: be more lenient in IPv6 RDNSS server expiry (rh #590202)
+- core: fix headers to be C++ compatible (rh #592783)
+- applet: updated translations (rh #589230)
+- applet: lock connections with well-known SSIDs to their specific AP
+
+* 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
+- core: restore initial accept_ra value for IPv6 ignored connections (rh #588619)
+- bluetooth: fix bad timeout on PAN connections (rh #586961)
+- applet: updated translations
+
+* Wed May  4 2010 Dan Williams <dcbw@redhat.com> - 0.8-12.git20100504
+- core: treat missing IPv6 configuration as ignored (rh #588814)
+- core: don't flush IPv6 link-local routes (rh #587836)
+- cli: update output formatting
+
+* Mon May  3 2010 Dan Williams <dcbw@redhat.com> - 0.8-11.git20100503
+- core: allow IP configuration as long as one method completes (rh #567978)
+- core: don't prematurely remove IPv6 RDNSS nameservers (rh #588192)
+- core: ensure router advertisements are only used when needed (rh #588613)
+- editor: add IPv6 gateway editing capability
+
+* Sun May  2 2010 Dan Williams <dcbw@redhat.com> - 0.8-10.git20100502
+- core: IPv6 autoconf, DHCP, link-local, and manual mode fixes
+- editor: fix saving IPv6 address in user connections
+
+* Thu Apr 29 2010 Dan Williams <dcbw@redhat.com> - 0.8-9.git20100429
+- core: fix crash when IPv6 is enabled and interface is deactivated
+
+* Mon Apr 26 2010 Dan Williams <dcbw@redhat.com> - 0.8-8.git20100426
+- core: fix issues with IPv6 router advertisement mishandling (rh #530670)
+- core: many fixes for IPv6 RA and DHCP handling (rh #538499)
+- core: ignore WWAN ethernet devices until usable (rh #585214)
+- ifcfg-rh: fix handling of WEP passphrases (rh #581718)
+- applet: fix crashes (rh #582938) (rh #582428)
+- applet: fix crash with multiple concurrent authorization requests (rh #585405)
+- editor: allow disabling IPv4 on a per-connection basis
+- editor: add support for IPv6 DHCP-only configurations
+
+* Thu Apr 22 2010 Dan Williams <dcbw@redhat.com> - 0.8-7.git20100422
+- core: fix crash during install (rh #581794)
+- wifi: fix crash when supplicant segfaults after resume (rh #538717)
+- ifcfg-rh: fix MTU handling for wired connections (rh #569319)
+- applet: fix display of disabled mobile broadband devices
+
+* Thu Apr  8 2010 Dan Williams <dcbw@redhat.com> - 0.8-6.git20100408
+- core: fix automatic WiFi connections on resume (rh #578141)
+
+* Thu Apr  8 2010 Dan Williams <dcbw@redhat.com> - 0.8-5.git20100408
+- core: more flexible logging
+- core: fix crash with OLPC mesh devices after suspend
+- applet: updated translations
+- applet: show mobile broadband signal strength and technology in the icon
+- applet: fix continuous password requests for 802.1x connections (rh #576925)
+- applet: many updated translations
+
+* Thu Mar 25 2010 Dan Williams <dcbw@redhat.com> - 0.8-4.git20100325
+- core: fix modem enable/disable
+- core: fix modem default route handling
+
+* Tue Mar 23 2010 Dan Williams <dcbw@redhat.com> - 0.8-3.git20100323
+- core: don't exit early on non-fatal state file errors
+- core: fix Bluetooth connection issues (rh #572340)
+- applet: fix some translations (rh #576056)
+- applet: better feedback when wrong PIN/PUK is entered
+- applet: many updated translations
+- applet: PIN2 unlock not required for normal modem functionality
+- applet: fix wireless secrets dialog display
+
+* Wed Mar 17 2010 Dan Williams <dcbw@redhat.com> - 0.8-2.git20100317
+- man: many manpage updates
+- core: determine classful prefix if non is given via DHCP
+- core: ensure /etc/hosts is always up-to-date and correct (rh #569914)
+- core: support GSM network and roaming preferences
+- applet: startup speed enhancements
+- applet: better support for OTP/token-based WiFi connections (rh #526383)
+- applet: show GSM and CDMA registration status and signal strength when available
+- applet: fix zombie GSM and CDMA devices in the menu
+- applet: remove 4-character GSM PIN/PUK code limit
+- applet: fix insensitive WiFi Create... button (rh #541163)
+- applet: allow unlocking of mobile devices immediately when plugged in
+
+* Fri Feb 19 2010 Dan Williams <dcbw@redhat.com> - 0.8-1.git20100219
+- core: update to final 0.8 release
+- core: fix Bluetooth DUN connections when secrets are needed
+- ifcfg-rh: add helper for initscripts to determine ifcfg connection UUIDs
+- applet: fix Bluetooth connection secrets requests
+- applet: fix rare conflict with other gnome-bluetooth plugins
+
+* Thu Feb 11 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.4.git20100211
+- core: fix mobile broadband PIN handling (rh #543088) (rh #560742)
+- core: better handling of /etc/hosts if hostname was already added by the user
+- applet: crash less on D-Bus property errors (rh #557007)
+- applet: fix crash entering wired 802.1x connection details (rh #556763)
+
+* Tue Feb 09 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 0.8-0.3.git20100129
+- core: validate the autostart .desktop file
+- build: fix nmcli for the stricter ld (fixes FTBFS)
+- build: fix nm-connection-editor for the stricter ld (fixes FTBFS)
+- applet: don't autostart in KDE on F13+ (#541353)
+
+* Fri Jan 29 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.2.git20100129
+- core: add Bluetooth Dial-Up Networking (DUN) support (rh #136663)
+- core: start DHCPv6 on receipt of RA 'otherconf'/'managed' bits
+- nmcli: allow enable/disable of WiFi and WWAN
+
+* Fri Jan 22 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.1.git20100122
+- ifcfg-rh: read and write DHCPv6 enabled connections (rh #429710)
+- nmcli: update
+
+* Thu Jan 21 2010 Dan Williams <dcbw@redhat.com> - 0.7.999-2.git20100120
+- core: clean NSS up later to preserve errors from crypto_init()
+
+* Wed Jan 20 2010 Dan Williams <dcbw@redhat.com> - 0.7.999-1.git20100120
+- core: support for managed-mode DHCPv6 (rh #429710)
+- ifcfg-rh: gracefully handle missing PREFIX/NETMASK
+- cli: initial preview of command-line client
+- applet: add --help to explain what the applet is (rh #494641)
+
+* 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
+- core: fix recognition of standalone 802.1x private keys
+- applet: clean notification text to ensure it passes libnotify validation
+
+* Mon Dec  7 2009 Dan Williams <dcbw@redhat.com> - 0.7.997-1
+- core: remove haldaemon from initscript dependencies (rh #542078)
+- core: handle PEM certificates without an ending newline (rh #507315)
+- core: fix rfkill reporting for ipw2x00 devices
+- core: increase PPPoE timeout to 30 seconds
+- core: fix re-activating system connections with secrets
+- core: fix crash when deleting automatically created wired connections
+- core: ensure that a VPN's DNS servers are used when sharing the VPN connection
+- ifcfg-rh: support routes files (rh #507307)
+- ifcfg-rh: warn when device will be managed due to missing HWADDR (rh #545003)
+- ifcfg-rh: interpret DEFROUTE as never-default (rh #528281)
+- ifcfg-rh: handle MODE=Auto correctly
+- rpm: fix rpmlint errors
+- applet: don't crash on various D-Bus and other errors (rh #545011) (rh #542617)
+- editor: fix various PolicyKit-related crashes (rh #462944)
+- applet+editor: notify user that private keys must be protected
+
+* Fri Nov 13 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-7.git20091113
+- nm: better pidfile handing (rh #517362)
+- nm: save WiFi and Networking enabled/disabled states across reboot
+- nm: fix crash with missing VPN secrets (rh #532084)
+- applet: fix system connection usage from the "Connect to hidden..." dialog
+- applet: show Bluetooth connections when no other devices are available (rh #532049)
+- applet: don't die when autoconfigured connections can't be made (rh #532680)
+- applet: allow system administrators to disable the "Create new wireless network..." menu item
+- applet: fix missing username connecting to VPNs the second time
+- applet: really fix animation stuttering
+- editor: fix IP config widget tooltips
+- editor: allow unlisted countries in the mobile broadband wizard (rh #530981)
+- ifcfg-rh: ignore .rpmnew files (rh #509621)
+
+* Wed Nov 04 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-6.git20091021
+- nm: fix PPPoE connection authentication (rh #532862)
+
+* Wed Oct 21 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-5.git20091021
+- install: better fix for (rh #526519)
+- install: don't build Bluetooth bits on s390 (rh #529854)
+- nm: wired 802.1x connection activation fixes
+- nm: fix crash after modifying default wired connections like "Auto eth0"
+- nm: ensure VPN secrets are requested again after connection failure
+- nm: reset 'accept_ra' to previous value after deactivating IPv6 connections
+- nm: ensure random netlink events don't interfere with IPv6 connection activation
+- ifcfg-rh: fix writing out LEAP connections
+- ifcfg-rh: recognize 'static' as a valid BOOTPROTO (rh #528068)
+- applet: fix "could not find required resources" error (rh #529766)
+
+* Fri Oct  2 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-4.git20091002
+- install: fix -gnome package pre script failures (rh #526519)
+- nm: fix failures validating private keys when using the NSS crypto backend
+- applet: fix crashes when clicking on menu but not associated (rh #526535)
+- editor: fix crash editing wired 802.1x settings
+- editor: fix secrets retrieval when editing connections
+
 * Mon Sep 28 2009 Dan Williams <dcbw@redhat.com> - 0.7.996-3.git20090928
 - nm: fix connection takeover when carrier is not on
 - nm: handle certificate paths (CA chain PEM files are now fully usable)
@@ -528,7 +792,7 @@ fi
 - nm: Handle DHCP Classless Static Routes (RFC 3442)
 - nm: Fix Mobile Broadband and PPPoE to always use 'noauth'
 - nm: Better compatibility with older dual-SSID AP configurations (rh #445369)
-- nm: Mark nm-system-settings.conf as %config (rh #465633)
+- nm: Mark nm-system-settings.conf as config (rh #465633)
 - nm-tool: Show VPN connection information
 - ifcfg-rh: Silence message about ignoring loopback config (rh #484060)
 - ifcfg-rh: Fix issue with wrong gateway for system connections (rh #476089)
@@ -1041,12 +1305,12 @@ fi
 - Update to 0.6.5 final
 - Don't lose scanned security information
 
-* Mon Apr  9 2007 Dan Williams  <dcbw@redhat.com> - 1:0.6.5-0.7.svn2547
+* Mon Apr  9 2007 Dan Williams <dcbw@redhat.com> - 1:0.6.5-0.7.svn2547
 - Update from trunk
-    - Updated translations
-    - Cleaned-up VPN properties dialogs
-    - Fix 64-bit kernel leakage issues in WEXT
-    - Don't capture and redirect wpa_supplicant log output
+	* Updated translations
+	* Cleaned-up VPN properties dialogs
+	* Fix 64-bit kernel leakage issues in WEXT
+	* Don't capture and redirect wpa_supplicant log output
 
 * Wed Mar 28 2007 Matthew Barnes  <mbarnes@redhat.com> 1:0.6.5-0.6.svn2474
 - Close private D-Bus connections. (#232691)
@@ -1146,14 +1410,14 @@ fi
 
 * Thu Mar 30 2006 Dan Williams <dcbw@redhat.com> - 0.6.2-1
 - Update to 0.6.2:
-    * Fix various WPA-related bugs
-    * Clean up leaks
-    * Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
-        switches
-    * Allow applet to reconnect on dbus restarts
-    * Add "Dynamic WEP" support
-    * Allow hiding of password/key entry text
-    * More responsive connection switching
+	* Fix various WPA-related bugs
+	* Clean up leaks
+	* Increased DHCP timeout to account for slow DHCP servers, or STP-enabled
+		switches
+	* Allow applet to reconnect on dbus restarts
+	* Add "Dynamic WEP" support
+	* Allow hiding of password/key entry text
+	* More responsive connection switching
 
 * Tue Mar 14 2006 Peter Jones <pjones@redhat.com> - 0.6.0-3
 - Fix device bringup on resume

branch

@@ -0,0 +1 @@
+F-12

nm-applet-internal-buildfixes.patch

@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac	2009-07-28 13:11:39.261718877 -0400
+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.1/network-manager-applet-0.8.1/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -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)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.16
--		 NetworkManager >= 0.7.996
--		 libnm-glib >= 0.7.996
--		 libnm-util >= 0.7.996
--		 libnm-glib-vpn >= 0.7.996
+-		 NetworkManager >= 0.8.1
+-		 libnm-glib >= 0.8.1
+-		 libnm-util >= 0.8.1
+-		 libnm-glib-vpn >= 0.8.1
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
@@ -17,15 +17,15 @@ diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/configure.ac.buil
  PKG_CHECK_MODULES(GNOME_BLUETOOTH,
  		  gconf-2.0
 -		  gnome-bluetooth-1.0 >= 2.27.6
--		  libnm-util
--		  libnm-glib,
+-		  libnm-util >= 0.8.1
+-		  libnm-glib >= 0.8.1,
 +		  gnome-bluetooth-1.0 >= 2.27.6,
  		  have_gbt=yes, have_gbt=no)
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+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.1/network-manager-applet-0.8.1/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	2009-07-28 11:29:11.685841724 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -37,20 +37,20 @@ diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/connection-ed
  	$(NMA_CFLAGS) \
  	-DICONDIR=\""$(datadir)/icons"\" \
 @@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/wireless-security/libwireless-security.la \
  	${top_builddir}/src/utils/libutils.la \
  	${top_builddir}/src/marshallers/libmarshallers.la \
--	$(NMA_LIBS)
-+	$(NMA_LIBS) \
+ 	$(NMA_LIBS) \
+-	-lm
++	-lm \
 +	-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-vpn.la
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = \
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+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.1/network-manager-applet-0.8.1/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	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -68,35 +68,33 @@ diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gconf-helpers
 +	-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.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+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.1/network-manager-applet-0.8.1/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	2009-07-28 13:24:56.316719077 -0400
 @@ -6,6 +6,9 @@ INCLUDES = \
- 	-DLOCALEDIR="\"$(datadir)/locale\""	\
- 	-I$(top_srcdir)/src/gconf-helpers/ \
  	-I$(top_builddir) \
+ 	-I${top_builddir}/src/marshallers \
+ 	-I${top_srcdir}/src/utils \
 +	-I${top_srcdir}/../include \
 +	-I${top_srcdir}/../libnm-util \
 +	-I${top_srcdir}/../libnm-glib \
  	$(GNOME_BLUETOOTH_CFLAGS) \
+ 	$(DISABLE_DEPRECATED) \
  	$(WARN_CFLAGS)
+@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
  
-@@ -14,7 +17,11 @@ plugin_LTLIBRARIES = libnma.la
- 
- libnma_la_SOURCES = network-manager-applet.c
- libnma_la_LDFLAGS = -module -avoid-version
--libnma_la_LIBADD = $(top_builddir)/src/gconf-helpers/libgconf-helpers.la $(GNOME_BLUETOOTH_LIBS)
-+libnma_la_LIBADD = \
-+	$(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
+ libnma_la_LIBADD = \
+ 	$(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
+-	$(GNOME_BLUETOOTH_LIBS)
 +	$(GNOME_BLUETOOTH_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
  endif
  
- EXTRA_DIST = network-manager-applet.c
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+ EXTRA_DIST = $(BT_WIDGET_SOURCES)
+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.1/network-manager-applet-0.8.1/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	2009-07-28 11:29:11.686841642 -0400
 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
  
  bin_PROGRAMS = nm-applet
@@ -119,10 +117,12 @@ diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/Makefile.am.b
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
-@@ -1,3 +1,7 @@
+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.1/network-manager-applet-0.8.1/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	2009-07-28 11:29:11.686841642 -0400
+@@ -1,5 +1,9 @@
+ SUBDIRS=. tests
+ 
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
@@ -139,9 +139,21 @@ diff -up NetworkManager-0.7.996/network-manager-applet-0.7.996/src/utils/Makefil
 +	-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.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am
---- NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.996/network-manager-applet-0.7.996/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+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.1/network-manager-applet-0.8.1/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	2009-07-28 11:29:11.686841642 -0400
+@@ -1,4 +1,7 @@
+-INCLUDES = -I$(top_srcdir)/src/utils
++INCLUDES = -I$(top_srcdir)/src/utils \
++           -I${top_srcdir}/../include \
++           -I${top_srcdir}/../libnm-util \
++           -I${top_srcdir}/../libnm-glib
+ 
+ noinst_PROGRAMS = test-utils
+ 
+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.1/network-manager-applet-0.8.1/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	2009-07-28 11:29:11.687841490 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  

nm-applet-no-notifications.patch

@@ -0,0 +1,30 @@
+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.1/network-manager-applet-0.8.1/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	2009-10-21 17:39:42.734142996 -0700
+@@ -6,7 +6,7 @@
+       <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
+       <owner>nm-applet</owner>
+       <type>bool</type>
+-      <default>FALSE</default>
++      <default>TRUE</default>
+       <locale name="C">
+         <short>Disable connected notifications</short>
+         <long>
+@@ -20,7 +20,7 @@
+       <applyto>/apps/nm-applet/disable-disconnected-notifications</applyto>
+       <owner>nm-applet</owner>
+       <type>bool</type>
+-      <default>FALSE</default>
++      <default>TRUE</default>
+       <locale name="C">
+         <short>Disable disconnected notifications</short>
+         <long>
+@@ -34,7 +34,7 @@
+       <applyto>/apps/nm-applet/suppress-wireless-networks-available</applyto>
+       <owner>nm-applet</owner>
+       <type>bool</type>
+-      <default>FALSE</default>
++      <default>TRUE</default>
+       <locale name="C">
+         <short>Suppress networks available notifications</short>
+         <long>

sources

@@ -1,2 +1,2 @@
-e8d776c04616764042ba94f85d51dcaa  NetworkManager-0.7.996.git20090928.tar.bz2
-138060af68f9cdd057f83dcebfb71a50  network-manager-applet-0.7.996.git20090928-menu-rework.tar.bz2
+96e551149dda8f6e0a5621f77468ba79  NetworkManager-0.8.1.tar.bz2
+b709808c1a5cfe8236061b5da4907313  network-manager-applet-0.8.1.tar.bz2