SOURCES (DEVEL): NetworkManager-pld.patch - updated for snap from ...

[megabajt]

Author: megabajt                     Date: Tue Dec 25 23:50:39 2007 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated for snap from rev 3190
- killed gcc warnings

---- Files affected:
SOURCES:
   NetworkManager-pld.patch (1.8.2.1 -> 1.8.2.2) 

---- Diffs:

================================================================
Index: SOURCES/NetworkManager-pld.patch
diff -u SOURCES/NetworkManager-pld.patch:1.8.2.1 SOURCES/NetworkManager-pld.patch:1.8.2.2
--- SOURCES/NetworkManager-pld.patch:1.8.2.1	Wed Nov 21 20:29:18 2007
+++ SOURCES/NetworkManager-pld.patch	Wed Dec 26 00:50:34 2007
@@ -1,11 +1,11 @@
 diff -urN NetworkManager-0.7rev3096/configure.in NetworkManager-0.7rev3096.new/configure.in
---- NetworkManager-0.7rev3096/configure.in	2007-11-20 11:07:00.000000000 +0100
-+++ NetworkManager-0.7rev3096.new/configure.in	2007-11-20 12:00:36.000000000 +0100
+--- NetworkManager-0.7rev3096/configure.in	2007-12-25 20:29:33.000000000 +0100
++++ NetworkManager-0.7rev3096.new/configure.in	2007-12-25 20:51:24.000000000 +0100
 @@ -57,7 +57,7 @@
  dnl
  AC_C_BIGENDIAN
  
--AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware or paldo]))
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware or paldo]))
 +AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo or pld]))
  if test "z$with_distro" = "z"; then
  	AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
@@ -54,8 +54,8 @@
  					$(GTHREAD_CFLAGS)				\
 diff -urN NetworkManager-0.7rev3096/src/backends/NetworkManagerPLD.c NetworkManager-0.7rev3096.new/src/backends/NetworkManagerPLD.c
 --- NetworkManager-0.7rev3096/src/backends/NetworkManagerPLD.c	1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.7rev3096.new/src/backends/NetworkManagerPLD.c	2007-11-21 19:53:52.000000000 +0100
-@@ -0,0 +1,576 @@
++++ NetworkManager-0.7rev3096.new/src/backends/NetworkManagerPLD.c	2007-12-25 21:14:00.000000000 +0100
+@@ -0,0 +1,579 @@
 +/* NetworkManager -- Network link manager
 + *
 + * Narayan Newton <narayan_newton at yahoo.com>
@@ -406,10 +406,11 @@
 +			}
 +			else
 +			{
++				guint32 addr = nm_ip4_config_get_address (sys_data->config);
++
 +				nm_warning ("Prefix for device '%s' was invalid (should be between 0 and 32). " 
 +						"Try to make default. ", nm_device_get_iface (dev));
 +
-+				guint32 addr = nm_ip4_config_get_address (sys_data->config);
 +
 +				if (((ntohl (addr) & 0xFF000000) >> 24) <= 127)
 +					nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000));
@@ -426,8 +427,10 @@
 +			error = TRUE;
 +			goto out;
 +		}
-+
-+		if (gateway_file = svNewFile (SYSCONFDIR"/sysconfig/network"))
++		
++		gateway_file = svNewFile (SYSCONFDIR"/sysconfig/network");
++		
++		if (gateway_file)
 +		{
 +			buf = svGetValue (gateway_file, "GATEWAYDEV");
 +			
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/NetworkManager-pld.patch?r1=1.8.2.1&r2=1.8.2.2&f=u