-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|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
-@@ -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
+diff -urN NetworkManager-0.8.2/initscript/Makefile.am NetworkManager-0.8.2.new//initscript/Makefile.am
+--- NetworkManager-0.8.2/initscript/Makefile.am 2010-10-19 01:44:05.000000000 +0200
++++ NetworkManager-0.8.2.new//initscript/Makefile.am 2010-11-04 23:09:47.487444761 +0100
+@@ -26,3 +26,6 @@
+ if TARGET_LINEXA
+ SUBDIRS += linexa
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 @@
+diff -urN NetworkManager-0.8.2/initscript/PLD/Makefile.am NetworkManager-0.8.2.new//initscript/PLD/Makefile.am
+--- NetworkManager-0.8.2/initscript/PLD/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ NetworkManager-0.8.2.new//initscript/PLD/Makefile.am 2010-11-04 21:54:27.000000000 +0100
+@@ -0,0 +1,5 @@
+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 @@
+diff -urN NetworkManager-0.8.2/initscript/PLD/NetworkManager.in NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in
+--- NetworkManager-0.8.2/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100
++++ NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in 2010-11-04 21:54:27.000000000 +0100
+@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# NetworkManager NetworkManager daemon
+ fi
+}
+
-+RETVAL=0
++upstart_controlled
+
++RETVAL=0
+case "$1" in
+ start)
+ start
+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
-+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
+diff -urN NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c
+--- NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100
++++ NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c 2010-11-04 21:54:27.000000000 +0100
@@ -0,0 +1,62 @@
+/* NetworkManager -- Network link manager
+ *
+#include <stdlib.h>
+
+#include "NetworkManagerGeneric.h"
-+#include "NetworkManagerSystem.h"
++#include "nm-system.h"
+#include "NetworkManagerUtils.h"
+
+/*
+void nm_system_update_dns (void)
+{
+ 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");
++ nm_spawn_process ("/usr/sbin/nscd -i hosts");
+ }
+}
+
+diff -urN NetworkManager-0.8.996/configure.ac NetworkManager-0.8.996.new//configure.ac
+--- NetworkManager-0.8.996/configure.ac 2011-03-10 07:44:53.000000000 +0000
++++ NetworkManager-0.8.996.new//configure.ac 2011-03-11 21:56:12.369999140 +0000
+@@ -95,7 +95,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, mandriva, pardus, linexa or exherbo]))
++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, pardus, linexa, exherbo 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")
+@@ -109,6 +109,7 @@
+ AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+ AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa")
+ AC_CHECK_FILE(/etc/exherbo-release,with_distro="exherbo")
++ AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
+ if test "z$with_distro" = "z"; then
+ with_distro=`lsb_release -is`
+ fi
+@@ -120,7 +121,7 @@
+ exit 1
+ else
+ case $with_distro in
+- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
++ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|pld) ;;
+ *)
+ echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
+ exit 1
+@@ -188,6 +189,11 @@
+ AC_DEFINE(TARGET_EXHERBO, 1, [Define if you have Exherbo])
+ 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
++
+ dnl
+ dnl Distribution version string
+ dnl
+@@ -617,6 +623,8 @@
+ initscript/paldo/NetworkManager
+ initscript/Mandriva/Makefile
+ initscript/Mandriva/networkmanager
++initscript/PLD/Makefile
++initscript/PLD/NetworkManager
+ initscript/linexa/Makefile
+ initscript/linexa/networkmanager
+ introspection/Makefile
+diff -urN NetworkManager-0.8.996/src/backends/Makefile.am NetworkManager-0.8.996.new//src/backends/Makefile.am
+--- NetworkManager-0.8.996/src/backends/Makefile.am 2011-01-02 23:18:57.000000000 +0000
++++ NetworkManager-0.8.996.new//src/backends/Makefile.am 2011-03-11 21:57:30.163333077 +0000
+@@ -61,6 +61,10 @@
+ libnmbackend_la_SOURCES += NetworkManagerExherbo.c
+ endif
+
++if TARGET_PLD
++libnmbackend_la_SOURCES += NetworkManagerPLD.c
++endif
++
+ libnmbackend_la_LIBADD += \
+ $(top_builddir)/src/logging/libnm-logging.la \
+ $(DBUS_LIBS) \
+diff -urN NetworkManager-0.8.996/src/settings/plugins/Makefile.am NetworkManager-0.8.996.new//src/settings/plugins/Makefile.am
+--- NetworkManager-0.8.996/src/settings/plugins/Makefile.am 2011-03-08 16:19:01.000000000 +0000
++++ NetworkManager-0.8.996.new//src/settings/plugins/Makefile.am 2011-03-11 21:59:26.183332964 +0000
+@@ -4,6 +4,10 @@
+ SUBDIRS+=ifcfg-rh
+ endif
+
++if TARGET_PLD
++SUBDIRS+=ifcfg-rh
++endif
++
+ if TARGET_SUSE
+ SUBDIRS+=ifcfg-suse
+ endif
projects / packages / NetworkManager.git / blobdiff