rpms/NetworkManager/F-8 disable-gkeyfile-plugin.patch, NONE, 1.1 optionally-wait-for-network.patch, NONE, 1.1 serial-debug.patch, NONE, 1.1 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.13, 1.14 NetworkManager.spec, 1.204, 1.205 sources, 1.98, 1.99 nm-applet-0.7.0-disable-stuff.patch, 1.5, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28968

Modified Files:
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec sources 
Added Files:
	disable-gkeyfile-plugin.patch 
	optionally-wait-for-network.patch serial-debug.patch 
Removed Files:
	nm-applet-0.7.0-disable-stuff.patch 
Log Message:
* Tue Apr 22 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.9.2.svn3590
- Don't select devices without a default gateway as the default route (rh #437338)
- Fill in broadcast address if not specified (rh #443474)
- Respect manual VPN IPv4 configuration options
- Show Connection Information for the device with the default route only

* Sun Apr 20 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3578
- Enable Add/Edit in connection editor
- Switch system settings service to read from /etc/sysconfig/network-scripts
- Add PPPoE support for DSL
- Make mobile broadband more robust
- Add support for WEP key indexes
- Notify user of VPN failures
- Fix loading of connection editor on KDE (rh #435344)
- Add dbus-glib-devel BuildRequires for NetworkManager-glib-devel (rh #442978)
- Honor DHCP rebinds
- Multiple active device support
- Allow use of interface-specific dhclient config files



disable-gkeyfile-plugin.patch:

--- NEW FILE disable-gkeyfile-plugin.patch ---
diff -up NetworkManager-0.7.0/system-settings/plugins/Makefile.am.disable-keyfile-plugin NetworkManager-0.7.0/system-settings/plugins/Makefile.am
--- NetworkManager-0.7.0/system-settings/plugins/Makefile.am.disable-keyfile-plugin	2008-04-24 09:50:04.000000000 -0400
+++ NetworkManager-0.7.0/system-settings/plugins/Makefile.am	2008-04-24 09:50:17.000000000 -0400
@@ -1,5 +1,5 @@
-SUBDIRS=keyfile
+SUBDIRS=
 
 if TARGET_REDHAT
 SUBDIRS+=ifcfg-fedora
 endif

optionally-wait-for-network.patch:

--- NEW FILE optionally-wait-for-network.patch ---
--- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-05 12:17:55.000000000 -0400
+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-16 13:10:41.000000000 -0400
@@ -34,6 +34,9 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+# Source network configuration
+. /etc/sysconfig/network
+
 # so we can rearrange this easily
 processname=NetworkManager
 servicename=NetworkManager
@@ -50,6 +53,14 @@
 	daemon --check $servicename $processname --pid-file=$pidfile
 	RETVAL=$?
 	echo
+	if [ -n "${NETWORKWAIT}" ]; then 
+		[ -z "${LINKDELAY}" ] && LINKDELAY=10
+		echo -n $"Waiting for network..."
+		nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30
+		[ "$?" = "0" ] && success "network startup" || failure "network startup"
+		echo
+		[ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY}
+	fi
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
 }
 

serial-debug.patch:

--- NEW FILE serial-debug.patch ---
diff -up NetworkManager-0.7.0/src/nm-serial-device.c.foo NetworkManager-0.7.0/src/nm-serial-device.c
--- NetworkManager-0.7.0/src/nm-serial-device.c.foo	2008-04-10 12:51:43.000000000 -0400
+++ NetworkManager-0.7.0/src/nm-serial-device.c	2008-04-10 12:51:49.000000000 -0400
@@ -19,7 +19,7 @@
 #include "nm-setting-ppp.h"
 #include "nm-utils.h"
 
-/* #define NM_DEBUG_SERIAL 1 */
+#define NM_DEBUG_SERIAL 1
 
 #define SERIAL_BUF_SIZE 2048
 

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	29 Feb 2008 19:39:15 -0000	1.13
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	24 Apr 2008 15:49:46 -0000	1.14
@@ -1,21 +1,6 @@
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
 --- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2007-11-13 09:53:39.000000000 -0500
 +++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-11-13 15:14:13.000000000 -0500
-@@ -18,10 +18,10 @@ dnl
- dnl This doesn't depend on gnome support, only on gnome-common, autogen already
- dnl uses gnome-autogen
- dnl
--GNOME_COMMON_INIT
--GNOME_DEBUG_CHECK
--GNOME_COMPILE_WARNINGS([maximum])
--GNOME_MAINTAINER_MODE_DEFINES
-+dnl GNOME_COMMON_INIT
-+dnl GNOME_DEBUG_CHECK
-+dnl GNOME_COMPILE_WARNINGS([maximum])
-+dnl GNOME_MAINTAINER_MODE_DEFINES
- 
- dnl
- dnl Required headers
 @@ -60,9 +60,6 @@ AC_C_BIGENDIAN
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -62,15 +47,14 @@
  noinst_LTLIBRARIES = libgconf-helpers.la
  
  libgconf_helpers_la_SOURCES =	\
-@@ -8,5 +12,8 @@ libgconf_helpers_la_SOURCES =	\
- 
- libgconf_helpers_la_CPPFLAGS = $(NMA_CFLAGS)
+@@ -13,5 +17,7 @@ libgconf_helpers_la_CPPFLAGS = \
  
--libgconf_helpers_la_LIBADD = $(NMA_LIBS)
-+libgconf_helpers_la_LIBADD = $(NMA_LIBS) \
+ libgconf_helpers_la_LIBADD = \
+ 	$(NMA_LIBS) \
+-	${top_builddir}/src/utils/libutils.la
++	${top_builddir}/src/utils/libutils.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
-+
  
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2007-11-13 15:41:01.000000000 -0500
@@ -116,12 +100,12 @@
  libwireless_security_la_SOURCES = \
  	wireless-security.h \
  	wireless-security.c \
-@@ -35,5 +39,7 @@ libwireless_security_la_CPPFLAGS = \
- 
+@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
  libwireless_security_la_LIBADD = \
  	$(NMA_LIBS) \
--	${top_builddir}/src/utils/libutils.la
-+	${top_builddir}/src/utils/libutils.la \
+ 	${top_builddir}/src/utils/libutils.la \
+-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
++	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- NetworkManager.spec	3 Mar 2008 01:34:10 -0000	1.204
+++ NetworkManager.spec	24 Apr 2008 15:49:46 -0000	1.205
@@ -7,9 +7,10 @@
 %define gtk2_version	2.12.0
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.0-0.15.pre8.git20071218
+%define ppp_version 2.2.4
 
-%define snapshot svn3370
-%define applet_snapshot svn571
+%define snapshot svn3590
+%define applet_snapshot svn694
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -23,11 +24,12 @@
 Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: nm-applet-0.7.0-disable-stuff.patch
+Patch2: disable-gkeyfile-plugin.patch
+Patch3: optionally-wait-for-network.patch
+Patch4: serial-debug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
-Requires: wireless-tools >= %{wireless_tools_version}
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
@@ -36,8 +38,13 @@
 Requires: wpa_supplicant >= 0.5.7-21
 Requires: libnl >= %{libnl_version}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
+Requires: ppp >= %{ppp_version}
 Obsoletes: dhcdbd
 
+# Due to VPN auth-dialog changes in applet r662
+Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549
+Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549
+
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
@@ -56,8 +63,8 @@
 BuildRequires: libnotify-devel >= 0.3
 BuildRequires: perl(XML::Parser)
 BuildRequires: automake autoconf intltool libtool
-BuildRequires: ppp >= 2.4.4
-BuildRequires: gnome-common
+# ppp package has devel headers for F8 and lower
+BuildRequires: ppp >= %{ppp_version}
 BuildRequires: nss-devel >= 3.11.7
 
 %description
@@ -120,6 +127,7 @@
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
 Requires: pkgconfig
+Requires: dbus-glib-devel >= %{dbus_glib_version}
 
 %description glib-devel
 This package contains the header and pkg-config files for development applications using
@@ -132,7 +140,9 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch2 -p1 -b .disable-stuff
+%patch2 -p1 -b .disable-gkeyfile-plugin
+%patch3 -p1 -b .wait-for-network
+%patch4 -p1 -b .serial-debug
 
 %build
 # Even though we don't require named, we still build with it
@@ -181,6 +191,8 @@
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
 
+install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -231,6 +243,7 @@
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %dir %{_sysconfdir}/NetworkManager/VPN
 %{_bindir}/nm-tool
+%{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
 %{_libdir}/libnm-util.so*
 %dir %{_libdir}/NetworkManager
@@ -252,6 +265,7 @@
 %{_bindir}/nm-connection-editor
 %{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
 %{_datadir}/nm-applet/
+%{_datadir}/icons/hicolor/16x16/apps/*.png
 %{_datadir}/icons/hicolor/22x22/apps/*.png
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
@@ -277,6 +291,25 @@
 
 
 %changelog
+* Tue Apr 22 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.9.2.svn3590
+- Don't select devices without a default gateway as the default route (rh #437338)
+- Fill in broadcast address if not specified (rh #443474)
+- Respect manual VPN IPv4 configuration options
+- Show Connection Information for the device with the default route only
+
+* Sun Apr 20 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3578
+- Enable Add/Edit in connection editor
+- Switch system settings service to read from /etc/sysconfig/network-scripts
+- Add PPPoE support for DSL
+- Make mobile broadband more robust
+- Add support for WEP key indexes
+- Notify user of VPN failures
+- Fix loading of connection editor on KDE (rh #435344)
+- Add dbus-glib-devel BuildRequires for NetworkManager-glib-devel (rh #442978)
+- Honor DHCP rebinds
+- Multiple active device support
+- Allow use of interface-specific dhclient config files
+
 * Sun Mar  2 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3370
 - Fix crash of nm-system-settings on malformed ifcfg files (rh #434919)
 - Require gnome-icon-theme to pick up lock.png (rh #435344)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- sources	3 Mar 2008 01:34:10 -0000	1.98
+++ sources	24 Apr 2008 15:49:46 -0000	1.99
@@ -1,2 +1,2 @@
-d23d10962547ac273926dfb5cc0615e0  NetworkManager-0.7.0.svn3370.tar.gz
-9dbb6db9709a8f094dbd5f5e27e15044  nm-applet-0.7.0.svn571.tar.gz
+10ae47ccd5efa8dc7ccce332e5204aaf  NetworkManager-0.7.0.svn3590.tar.gz
+c3f4eb2798b08c5a43fd95c7ea9ffe8c  nm-applet-0.7.0.svn694.tar.gz


--- nm-applet-0.7.0-disable-stuff.patch DELETED ---