Author: megabajt Date: Thu Nov 27 16:49:21 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
SOURCES:
NetworkManager-pld.patch (1.8 -> 1.9) , NetworkManager-system-settings.conf
(1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/NetworkManager-pld.patch
diff -u SOURCES/NetworkManager-pld.patch:1.8
SOURCES/NetworkManager-pld.patch:1.9
--- SOURCES/NetworkManager-pld.patch:1.8 Mon Oct 29 23:13:00 2007
+++ SOURCES/NetworkManager-pld.patch Thu Nov 27 17:49:15 2008
@@ -1,46 +1,173 @@
-diff -urN NetworkManager-0.6.5.orig/configure.in
NetworkManager-0.6.5/configure.in
---- NetworkManager-0.6.5.orig/configure.in 2007-07-23 19:44:13.000000000
+0200
-+++ NetworkManager-0.6.5/configure.in 2007-07-23 20:09:37.000000000 +0200
-@@ -72,7 +72,7 @@
+diff -urN NetworkManager-0.7.0/configure.in
NetworkManager-0.7.0.new/configure.in
+--- NetworkManager-0.7.0/configure.in 2008-11-25 19:57:21.000000000 +0100
++++ NetworkManager-0.7.0.new/configure.in 2008-11-27 16:12:36.000000000
+0100
+@@ -78,7 +78,7 @@
+ dnl
+ AC_C_BIGENDIAN
+
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux
distribution to target: One of redhat, suse, gentoo, debian, arch, slackware,
paldo or mandriva]))
++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux
distribution to target: One of redhat, suse, gentoo, debian, arch, slackware,
paldo, mandriva or pld]))
+ if test "z$with_distro" = "z"; then
+ AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
+ AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
+@@ -89,6 +89,7 @@
+ AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
+ AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
+ AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
++ AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
+ if test "z$with_distro" = "z"; then
+ with_distro=`lsb_release -is`
+ fi
+@@ -100,7 +101,7 @@
exit 1
else
case $with_distro in
-- redhat|suse|gentoo|debian|slackware|arch) ;;
-+ redhat|suse|gentoo|debian|slackware|arch|pld) ;;
+-
redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;;
++
redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pld) ;;
*)
echo "Your distribution (${with_distro}) is not yet
supported! (patches welcome)"
exit 1
-@@ -85,6 +85,7 @@
- AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
- AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
- AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
-+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
+@@ -153,6 +154,11 @@
+ AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva])
+ fi
- AC_MSG_CHECKING([for wireless-tools >= 28pre9])
- AC_TRY_COMPILE([#include <iwlib.h>],
-diff -urN NetworkManager-0.6.5.orig/src/backends/Makefile.am
NetworkManager-0.6.5/src/backends/Makefile.am
---- NetworkManager-0.6.5.orig/src/backends/Makefile.am 2007-07-23
19:44:13.000000000 +0200
-+++ NetworkManager-0.6.5/src/backends/Makefile.am 2007-07-23
20:12:37.000000000 +0200
-@@ -42,6 +42,12 @@
- libnmbackend_la_SOURCES += NetworkManagerArch.c
++AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
++if test x"$with_distro" = xpld; then
++ AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
++fi
++
+ AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
+ AC_TRY_COMPILE([#ifndef __user
+ #define __user
+@@ -522,6 +528,8 @@
+ initscript/paldo/NetworkManager
+ initscript/Mandriva/Makefile
+ initscript/Mandriva/networkmanager
++initscript/PLD/Makefile
++initscript/PLD/NetworkManager
+ introspection/Makefile
+ man/Makefile
+ man/NetworkManager.8
+diff -urN NetworkManager-0.7.0/initscript/Makefile.am
NetworkManager-0.7.0.new/initscript/Makefile.am
+--- NetworkManager-0.7.0/initscript/Makefile.am 2008-09-13
22:47:30.000000000 +0200
++++ NetworkManager-0.7.0.new/initscript/Makefile.am 2008-11-27
16:00:28.000000000 +0100
+@@ -23,3 +23,6 @@
+ if TARGET_MANDRIVA
+ SUBDIRS += Mandriva
+ endif
++if TARGET_PLD
++SUBDIRS += PLD
++endif
+diff -urN NetworkManager-0.7.0/initscript/PLD/Makefile.am
NetworkManager-0.7.0.new/initscript/PLD/Makefile.am
+--- NetworkManager-0.7.0/initscript/PLD/Makefile.am 1970-01-01
01:00:00.000000000 +0100
++++ NetworkManager-0.7.0.new/initscript/PLD/Makefile.am 2008-11-27
16:00:28.000000000 +0100
+@@ -0,0 +1,6 @@
++EXTRA_DIST = NetworkManager
++DISTCLEANFILES = NetworkManager
++
++initddir = $(sysconfdir)/rc.d/init.d
++initd_SCRIPTS = NetworkManager
++
+diff -urN NetworkManager-0.7.0/initscript/PLD/NetworkManager.in
NetworkManager-0.7.0.new/initscript/PLD/NetworkManager.in
+--- NetworkManager-0.7.0/initscript/PLD/NetworkManager.in 1970-01-01
01:00:00.000000000 +0100
++++ NetworkManager-0.7.0.new/initscript/PLD/NetworkManager.in 2008-11-27
16:00:28.000000000 +0100
+@@ -0,0 +1,74 @@
++#!/bin/sh
++#
++# NetworkManager NetworkManager daemon
++#
++# chkconfig: 345 99 01
++#
++# description: This is a daemon for automatically switching
network \
++# connections to the best available connection.
++#
++# processname: NetworkManager
++# pidfile: /var/run/NetworkManager.pid
++#
++
++# Source function library.
++. /etc/rc.d/init.d/functions
++
++# Source networking configuration.
++. /etc/sysconfig/network
++
++# Check that networking is up.
++if is_yes "${NETWORKING}"; then
++ if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
++ msg_network_down NetworkManager
++ exit 1
++ fi
++else
++ exit 0
++fi
++
++start() {
++ # Check if the service is already running?
++ if [ ! -f /var/lock/subsys/NetworkManager ]; then
++ msg_starting NetworkManager
++ daemon NetworkManager --pid-file=/var/run/NetworkManager.pid
++ RETVAL=$?
++ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/NetworkManager
++ else
++ msg_already_running NetworkManager
++ fi
++}
++stop() {
++ if [ -f /var/lock/subsys/NetworkManager ]; then
++ # Stop daemons.
++ msg_stopping NetworkManager
++ killproc NetworkManager
++ rm -f /var/lock/subsys/NetworkManager
++ else
++ msg_not_running NetworkManager
++ fi
++}
++
++RETVAL=0
++
++case "$1" in
++ start)
++ start
++ ;;
++ stop)
++ stop
++ ;;
++ restart)
++ stop
++ start
++ ;;
++ status)
++ status NetworkManager
++ RETVAL=$?
++ ;;
++ *)
++ msg_usage "$0 {start|stop|restart|status}"
++ exit 3
++esac
++
++exit $RETVAL
+diff -urN NetworkManager-0.7.0/src/backends/Makefile.am
NetworkManager-0.7.0.new/src/backends/Makefile.am
+--- NetworkManager-0.7.0/src/backends/Makefile.am 2008-09-13
22:47:21.000000000 +0200
++++ NetworkManager-0.7.0.new/src/backends/Makefile.am 2008-11-27
16:00:28.000000000 +0100
+@@ -49,6 +49,11 @@
+ libnmbackend_la_SOURCES += NetworkManagerMandriva.c
endif
+if TARGET_PLD
-+libnmbackend_la_SOURCES += NetworkManagerPLD.c \
-+ shvar.c \
-+ shvar.h
++libnmbackend_la_SOURCES += NetworkManagerPLD.c
+endif
+
- libnmbackend_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
++
+ libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS)
libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS)
\
-diff -urN NetworkManager-0.6.5.orig/src/backends/NetworkManagerPLD.c
NetworkManager-0.6.5/src/backends/NetworkManagerPLD.c
---- NetworkManager-0.6.5.orig/src/backends/NetworkManagerPLD.c 1970-01-01
01:00:00.000000000 +0100
-+++ NetworkManager-0.6.5/src/backends/NetworkManagerPLD.c 2007-10-29
23:09:06.000000000 +0100
-@@ -0,0 +1,694 @@
+diff -urN NetworkManager-0.7.0/src/backends/NetworkManagerPLD.c
NetworkManager-0.7.0.new/src/backends/NetworkManagerPLD.c
+--- NetworkManager-0.7.0/src/backends/NetworkManagerPLD.c 1970-01-01
01:00:00.000000000 +0100
++++ NetworkManager-0.7.0.new/src/backends/NetworkManagerPLD.c 2008-11-27
16:00:28.000000000 +0100
+@@ -0,0 +1,62 @@
+/* NetworkManager -- Network link manager
+ *
-+ * Narayan Newton <[EMAIL PROTECTED]>
++ * Patryk Zawadzki <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
@@ -59,389 +186,21 @@
+ * (C) Copyright 2004 RedHat, Inc.
+ * (C) Copyright 2004 Narayan Newton
+ * (C) Copyright 2005 wrobell <[EMAIL PROTECTED]>
-+ * (C) Copyright 2005 Patryk Zawadzki <[EMAIL PROTECTED]>
+ * (C) Copyright 2007 Marcin Banasiak <[EMAIL PROTECTED]>
++ * (C) Copyright 2005-2008 Patryk Zawadzki <[EMAIL PROTECTED]>
+ */
+
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+#include <stdio.h>
-+#include <sys/types.h>
-+#include <signal.h>
++#include <string.h>
++#include <stdlib.h>
++
++#include "NetworkManagerGeneric.h"
+#include "NetworkManagerSystem.h"
+#include "NetworkManagerUtils.h"
-+#include "nm-device.h"
-+#include "nm-device-802-3-ethernet.h"
-+#include "nm-device-802-11-wireless.h"
-+#include "nm-utils.h"
-+#include "shvar.h"
-+
-+/*
-+ * nm_system_init
-+ *
-+ * Initializes the distribution-specific system backend
-+ *
-+ */
-+void nm_system_init (void)
-+{
-+ /* Kill any dhclients lying around */
-+ nm_system_kill_all_dhcp_daemons();
-+}
-+
-+/*
-+ * nm_system_device_flush_routes
-+ *
-+ * Flush all routes associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_routes (NMDevice *dev)
-+{
-+ g_return_if_fail (dev != NULL);
-+
-+ /* Not really applicable for test devices */
-+ if (nm_device_is_test_device (dev))
-+ return;
-+
-+ nm_system_device_flush_routes_with_iface (nm_device_get_iface (dev));
-+}
-+
-+/*
-+ * nm_system_device_flush_routes_with_iface
-+ *
-+ * Flush all routes associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_routes_with_iface (const char *iface)
-+{
-+ char *buf;
-+
-+ g_return_if_fail (iface != NULL);
-+
-+ /* Remove routing table entries */
-+ buf = g_strdup_printf (IP_BINARY_PATH" route flush dev %s", iface);
-+ nm_spawn_process (buf);
-+ g_free (buf);
-+}
-+
-+/*
-+ * nm_system_device_flush_addresses
-+ *
-+ * Flush all network addresses associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_addresses (NMDevice *dev)
-+{
-+ g_return_if_fail (dev != NULL);
-+
-+ /* Not really applicable for test devices */
-+ if (nm_device_is_test_device (dev))
-+ return;
-+ nm_system_device_flush_addresses_with_iface (nm_device_get_iface (dev));
-+}
-+
-+/*
-+ * nm_system_device_flush_addresses_with_iface
-+ *
-+ * Flush all network addresses associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_addresses_with_iface (const char *iface)
-+{
-+ char *buf;
-+
-+ g_return_if_fail (iface != NULL);
-+
-+ /* Remove all IP addresses for a device */
-+ buf = g_strdup_printf (IP_BINARY_PATH" addr flush dev %s", iface);
-+ nm_spawn_process (buf);
-+ g_free (buf);
-+}
-+
-+typedef struct PLDSystemConfigData
-+{
-+ NMIP4Config *config;
-+ gboolean use_dhcp;
-+} PLDSystemConfigData;
-+
-+/*
-+ * set_ip4_config_from_resolv_conf
-+ *
-+ * Add nameservers and search names from a resolv.conf format file.
-+ *
-+ */
-+static void set_ip4_config_from_resolv_conf (const char *filename,
NMIP4Config *ip4_config)
-+{
-+ char *contents = NULL;
-+ char **split_contents = NULL;
-+ int i, len;
-+
-+ g_return_if_fail (filename != NULL);
-+ g_return_if_fail (ip4_config != NULL);
-+
-+ if (!g_file_get_contents (filename, &contents, NULL, NULL) || (contents
== NULL))
-+ return;
-+
-+ if (!(split_contents = g_strsplit (contents, "\n", 0)))
-+ goto out;
-+
-+ len = g_strv_length (split_contents);
-+ for (i = 0; i < len; i++)
-+ {
-+ char *line = split_contents[i];
-+
-+ /* Ignore comments */
-+ if (!line || (line[0] == ';') || (line[0] == '#'))
-+ continue;
-+
-+ line = g_strstrip (line);
-+ if ((strncmp (line, "search", 6) == 0) && (strlen (line) > 6))
-+ {
-+ char *searches = g_strdup (line + 7);
-+ char **split_searches = NULL;
-+
-+ if (!searches || !strlen (searches))
-+ continue;
-+
-+ /* Allow space-separated search domains */
-+ if ((split_searches = g_strsplit (searches, " ", 0)))
-+ {
-+ int m, srch_len;
-+
-+ srch_len = g_strv_length (split_searches);
-+ for (m = 0; m < srch_len; m++)
-+ {
-+ if (split_searches[m])
-+ nm_ip4_config_add_domain
(ip4_config, split_searches[m]);
-+ }
-+ g_strfreev (split_searches);
-+ }
-+ else
-+ {
-+ /* Only 1 item, add the whole line */
-+ nm_ip4_config_add_domain (ip4_config,
searches);
-+ }
-+
-+ g_free (searches);
-+ }
-+ else if ((strncmp (line, "nameserver", 10) == 0) && (strlen
(line) > 10))
-+ {
-+ guint32 addr = (guint32) (inet_addr (line + 11));
-+
-+ if (addr != (guint32) -1)
-+ nm_ip4_config_add_nameserver (ip4_config, addr);
-+ }
-+ }
-+
-+ g_strfreev (split_contents);
-+
-+out:
-+ g_free (contents);
-+}
-+
-+/*
-+ * nm_system_device_get_system_config
-+ *
-+ * Retrieve any relevant configuration info for a particular device
-+ * from the system network configuration information. Clear out existing
-+ * info before setting stuff too.
-+ *
-+ */
-+void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data)
-+{
-+ char *cfg_file_path = NULL;
-+ shvarFile *file, *gateway_file;
-+ char *buf = NULL;
-+ int i, ip[4], prefix;
-+ PLDSystemConfigData *sys_data = NULL;
-+ gboolean error = FALSE;
-+
-+ g_return_val_if_fail (dev != NULL, NULL);
-+
-+ /* PLD stores this information in
-+ * /etc/sysconfig/interfaces/ifcfg-* where * is the interface
-+ * name.
-+ */
-+
-+ sys_data = g_malloc0 (sizeof (PLDSystemConfigData));
-+ sys_data->use_dhcp = TRUE;
-+
-+ cfg_file_path = g_strdup_printf
(SYSCONFDIR"/sysconfig/interfaces/ifcfg-%s", nm_device_get_iface (dev));
-+ if (!cfg_file_path)
-+ return sys_data;
-+
-+ if (!(file = svNewFile (cfg_file_path)))
-+ {
-+ g_free (cfg_file_path);
-+ return sys_data;
-+ }
-+ g_free (cfg_file_path);
-+
-+ /* Make sure this config file is for this device */
-+ buf = svGetValue (file, "DEVICE");
-+ if (!buf || strcmp (buf, nm_device_get_iface (dev)))
-+ {
-+ free (buf);
-+ goto out;
-+ }
-+
-+ if ((buf = svGetValue (file, "BOOTPROTO")))
-+ {
-+ if (strcasecmp (buf, "dhcp"))
-+ sys_data->use_dhcp = FALSE;
-+ free (buf);
-+ }
-+
-+ sys_data->config = nm_ip4_config_new ();
-+
-+ if (!(sys_data->use_dhcp))
-+ {
-+ if ((buf = svGetValue (file, "IPADDR")))
-+ {
-+ sscanf (buf, "%d.%d.%d.%d/%d", &ip[0], &ip[1], &ip[2],
&ip[3], &prefix);
-+ sprintf (buf, "%d.%d.%d.%d", ip[0], ip[1], ip[2],
ip[3]);
-+ nm_ip4_config_set_address (sys_data->config, inet_addr
(buf));
-+
-+ if (prefix >= 0 && prefix <= 32)
-+ {
-+ for (i = 0; i <= 3; i++)
-+ {
-+ switch (prefix)
-+ {
-+ case 7:
-+ ip[i] = 254;
-+ break;
-+ case 6:
-+ ip[i] = 252;
-+ break;
-+ case 5:
-+ ip[i] = 248;
-+ break;
-+ case 4:
-+ ip[i] = 240;
-+ break;
-+ case 3:
-+ ip[i] = 224;
-+ break;
-+ case 2:
-+ ip[i] = 192;
-+ break;
-+ case 1:
-+ ip[i] = 128;
-+ break;
-+ default:
-+ if (prefix >= 8)
-+ {
-+ ip[i] = 255;
-+ }
-+ else
-+ {
-+ ip[i] = 0;
-+ }
-+ }
-+ prefix = prefix - 8;
-+ }
-+ sprintf (buf, "%d.%d.%d.%d", ip[0], ip[1],
ip[2], ip[3]);
-+ nm_ip4_config_set_netmask (sys_data->config,
inet_addr (buf));
-+ free (buf);
-+ }
-+ else
-+ {
-+ 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));
-+ else if (((ntohl (addr) & 0xFF000000) >> 24) <=
191)
-+ nm_ip4_config_set_netmask
(sys_data->config, htonl (0xFFFF0000));
-+ else
-+ nm_ip4_config_set_netmask
(sys_data->config, htonl (0xFFFFFF00));
-+ }
-+ }
-+ else
-+ {
-+ nm_warning ("Network configuration for device '%s' was
invalid (non-DHCP configuration, "
-+ "but no IP address specified.
Will use DHCP instead.", nm_device_get_iface (dev));
-+ error = TRUE;
-+ goto out;
-+ }
-+
-+ if (gateway_file = svNewFile (SYSCONFDIR"/sysconfig/network"))
-+ {
-+ buf = svGetValue (gateway_file, "GATEWAYDEV");
-+
-+ /* Make sure that GATEWAY is set for this device */
-+ if (!buf || strcmp (buf, nm_device_get_iface (dev)))
-+ {
-+ nm_warning ("Network configuration for device
'%s' was invalid (non-DHCP configuration, "
-+ "but no gateway specified -
GATEWAYDEV set for other device or unset). Will "
-+ "use DHCP instead.",
nm_device_get_iface (dev));
-+
-+ free (buf);
-+ svCloseFile (gateway_file);
-+ error = TRUE;
-+ goto out;
-+ }
-+
-+ if ((buf = svGetValue (gateway_file, "GATEWAY")))
-+ {
-+ nm_ip4_config_set_gateway (sys_data->config,
inet_addr (buf));
-+ free (buf);
-+ svCloseFile (gateway_file);
-+ }
-+ else
-+ {
-+ nm_warning ("Network configuration for device
'%s' was invalid (non-DHCP configuration, "
-+ "but no gateway specified.
Will use DHCP instead.", nm_device_get_iface (dev));
-+ svCloseFile (gateway_file);
-+ error = TRUE;
-+ goto out;
-+ }
-+ }
-+
-+ if ((buf = svGetValue (file, "BROADCAST")))
-+ {
-+ nm_ip4_config_set_broadcast (sys_data->config,
inet_addr (buf));
-+ free (buf);
-+ }
-+ else
-+ {
-+ guint32 broadcast = ((nm_ip4_config_get_address
(sys_data->config) & nm_ip4_config_get_netmask (sys_data->config))
-+ |
~nm_ip4_config_get_netmask (sys_data->config));
-+ nm_ip4_config_set_broadcast (sys_data->config,
broadcast);
-+ }
-+ }
-+
-+ /* If we're using Static IP, grab DNS servers from the config file */
-+ if (!sys_data->use_dhcp)
-+ {
-+ set_ip4_config_from_resolv_conf (SYSCONFDIR"/resolv.conf",
sys_data->config);
-+ }
-+
-+out:
-+ svCloseFile (file);
-+
-+ if (error)
-+ {
-+ sys_data->use_dhcp = TRUE;
-+ /* Clear out the config */
-+ nm_ip4_config_unref (sys_data->config);
-+ sys_data->config = NULL;
-+ }
-+
-+ return (void *)sys_data;
-+}
-+
-+/*
-+ * nm_system_device_has_active_routes
-+ *
-+ * Find out whether the specified device has any routes in the routing
-+ * table.
-+ *
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/NetworkManager-pld.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/NetworkManager-system-settings.conf?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
