SOURCES (DEVEL): NetworkManager-pld.patch - updated for 0.7.0
megabajt
megabajt at pld-linux.org
Thu Nov 27 16:17:30 CET 2008
Author: megabajt Date: Thu Nov 27 15:17:30 2008 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated for 0.7.0
---- Files affected:
SOURCES:
NetworkManager-pld.patch (1.8.2.3 -> 1.8.2.4)
---- Diffs:
================================================================
Index: SOURCES/NetworkManager-pld.patch
diff -u SOURCES/NetworkManager-pld.patch:1.8.2.3 SOURCES/NetworkManager-pld.patch:1.8.2.4
--- SOURCES/NetworkManager-pld.patch:1.8.2.3 Tue Apr 22 23:59:44 2008
+++ SOURCES/NetworkManager-pld.patch Thu Nov 27 16:17:24 2008
@@ -1,23 +1,7 @@
-diff -urN NetworkManager-0.7rev3096/src/backends/Makefile.am NetworkManager-0.7rev3096.new/src/backends/Makefile.am
---- NetworkManager-0.7rev3096/src/backends/Makefile.am 2007-11-20 11:06:21.000000000 +0100
-+++ NetworkManager-0.7rev3096.new/src/backends/Makefile.am 2007-11-20 11:31:15.000000000 +0100
-@@ -53,6 +53,13 @@
- libnmbackend_la_LIBADD += -lfwnetconfig -lfwutil
- endif
-
-+if TARGET_PLD
-+libnmbackend_la_SOURCES += NetworkManagerPLD.c \
-+ shvar.c \
-+ shvar.h
-+endif
-+
-+
- libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS)
- libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \
- $(GTHREAD_CFLAGS) \
---- NetworkManager-0.7rev3588/configure.in.orig 2008-04-22 22:56:49.000000000 +0200
-+++ NetworkManager-0.7rev3588/configure.in 2008-04-22 23:04:19.847378098 +0200
-@@ -76,7 +76,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
@@ -26,7 +10,7 @@
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")
-@@ -87,6 +87,7 @@
+@@ -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")
@@ -34,7 +18,7 @@
if test "z$with_distro" = "z"; then
with_distro=`lsb_release -is`
fi
-@@ -98,7 +99,7 @@
+@@ -100,7 +101,7 @@
exit 1
else
case $with_distro in
@@ -43,20 +27,147 @@
*)
echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
exit 1
-@@ -114,6 +115,7 @@
- AM_CONDITIONAL(TARGET_PALDO, test x"$with_distro" = xpaldo)
- AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
- AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
+@@ -153,6 +154,11 @@
+ AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva])
+ fi
+
+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 test x"$with_distro" = xgentoo -o x"$with_distro" = xmandriva ; then
- AC_ARG_WITH([mdns_provider],
---- NetworkManager-0.7rev3096/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.7rev3588/src/backends/NetworkManagerPLD.c 2008-04-22 23:49:54.422378684 +0200
-@@ -0,0 +1,267 @@
++if TARGET_PLD
++libnmbackend_la_SOURCES += NetworkManagerPLD.c
++endif
++
++
+ libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS)
+ libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
+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 <narayan_newton at yahoo.com>
++ * Patryk Zawadzki <patrys at pld-linux.org>
+ *
+ * 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
@@ -75,8 +186,8 @@
+ * (C) Copyright 2004 RedHat, Inc.
+ * (C) Copyright 2004 Narayan Newton
+ * (C) Copyright 2005 wrobell <wrobell at pld-linux.org>
-+ * (C) Copyright 2005 Patryk Zawadzki <patrys at pld-linux.org>
+ * (C) Copyright 2007 Marcin Banasiak <megabajt at pld-linux.org>
++ * (C) Copyright 2005-2008 Patryk Zawadzki <patrys at pld-linux.org>
+ */
+
+#ifdef HAVE_CONFIG_H
@@ -84,120 +195,12 @@
+#endif
+
+#include <stdio.h>
-+#include <sys/types.h>
-+#include <signal.h>
-+#include <arpa/inet.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)
-+{
-+ nm_generic_init ();
-+}
-+
-+
-+/*
-+ * nm_system_device_flush_ip4_routes
-+ *
-+ * Flush all routes associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_ip4_routes (NMDevice *dev)
-+{
-+ nm_generic_device_flush_ip4_routes (dev);
-+}
-+
-+
-+/*
-+ * nm_system_device_flush_ip4_routes_with_iface
-+ *
-+ * Flush all routes associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_ip4_routes_with_iface (const char *iface)
-+{
-+ nm_generic_device_flush_ip4_routes_with_iface (iface);
-+}
-+
-+
-+/*
-+ * nm_system_device_replace_default_route
-+ *
-+ * Add default route to the given device
-+ *
-+ */
-+void
-+nm_system_device_replace_default_route (const char *iface,
-+ guint32 gw,
-+ guint32 mss)
-+{
-+ nm_generic_device_replace_default_route (iface, gw, mss);
-+}
-+
-+
-+/*
-+ * nm_system_device_add_route_via_device_with_iface
-+ *
-+ * Add route to the given device
-+ *
-+ */
-+void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route)
-+{
-+ nm_generic_device_add_route_via_device_with_iface (iface, route);
-+}
-+
-+
-+/*
-+ * nm_system_device_has_active_routes
-+ *
-+ * Find out whether the specified device has any routes in the routing
-+ * table.
-+ *
-+ */
-+gboolean nm_system_device_has_active_routes (NMDevice *dev)
-+{
-+ return FALSE;
-+}
-+
-+
-+/*
-+ * nm_system_device_flush_ip4_addresses
-+ *
-+ * Flush all network addresses associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_ip4_addresses (NMDevice *dev)
-+{
-+ nm_generic_device_flush_ip4_addresses (dev);
-+}
-+
-+
-+/*
-+ * nm_system_device_flush_ip4_addresses_with_iface
-+ *
-+ * Flush all network addresses associated with a network device
-+ *
-+ */
-+void nm_system_device_flush_ip4_addresses_with_iface (const char *iface)
-+{
-+ nm_generic_device_flush_ip4_addresses_with_iface (iface);
-+}
-+
+
+/*
+ * nm_system_enable_loopback
@@ -210,44 +213,6 @@
+ nm_generic_enable_loopback ();
+}
+
-+
-+/*
-+ * nm_system_flush_loopback_routes
-+ *
-+ * Flush all routes associated with the loopback device, because it
-+ * sometimes gets the first route for ZeroConf/Link-Local traffic.
-+ *
-+ */
-+void nm_system_flush_loopback_routes (void)
-+{
-+ nm_generic_flush_loopback_routes ();
-+}
-+
-+
-+/*
-+ * nm_system_flush_arp_cache
-+ *
-+ * Flush all entries in the arp cache.
-+ *
-+ */
-+void nm_system_flush_arp_cache (void)
-+{
-+ nm_generic_flush_arp_cache ();
-+}
-+
-+
-+/*
-+ * nm_system_kill_all_dhcp_daemons
-+ *
-+ * Kill all DHCP daemons currently running, done at startup.
-+ *
-+ */
-+void nm_system_kill_all_dhcp_daemons (void)
-+{
-+ nm_spawn_process ("/bin/killall -q dhclient");
-+}
-+
-+
+/*
+ * nm_system_update_dns
+ *
@@ -257,67 +222,8 @@
+ */
+void nm_system_update_dns (void)
+{
-+ /* Not implemented */
-+}
-+
-+
-+/*
-+ * nm_system_restart_mdns_responder
-+ *
-+ * Restart the multicast DNS responder so that it knows about new
-+ * network interfaces and IP addresses.
-+ *
-+ */
-+void nm_system_restart_mdns_responder (void)
-+{
-+ /* Not implemented */
++ if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
++ nm_spawn_process ("/etc/rc.d/init.d/nscd restart");
++ }
+}
+
-+
-+typedef struct PLDSystemConfigData
-+{
-+ NMIP4Config * config;
-+ gboolean use_dhcp;
-+ gboolean system_disabled;
-+} PLDSystemConfigData;
-+
-+
-+/*
-+ * nm_system_activate_nis
-+ *
-+ * set up the nis domain and write a yp.conf
-+ *
-+ */
-+void nm_system_activate_nis (NMIP4Config *config)
-+{
-+}
-+
-+/*
-+ * nm_system_shutdown_nis
-+ *
-+ * shutdown ypbind
-+ *
-+ */
-+void nm_system_shutdown_nis (void)
-+{
-+}
-+
-+/*
-+ * nm_system_set_hostname
-+ *
-+ * set the hostname
-+ *
-+ */
-+void nm_system_set_hostname (NMIP4Config *config)
-+{
-+}
-+
-+/*
-+ * nm_system_should_modify_resolv_conf
-+ *
-+ * Can NM update resolv.conf, or is it locked down?
-+ */
-+gboolean nm_system_should_modify_resolv_conf (void)
-+{
-+ return TRUE;
-+}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/NetworkManager-pld.patch?r1=1.8.2.3&r2=1.8.2.4&f=u
More information about the pld-cvs-commit
mailing list