+++ /dev/null
-diff -urN NetworkManager-0.9.4.0/configure.ac NetworkManager-0.9.4.0.new/configure.ac
---- NetworkManager-0.9.4.0/configure.ac 2012-03-23 21:11:15.000000000 +0100
-+++ NetworkManager-0.9.4.0.new/configure.ac 2012-03-24 11:29:26.057723008 +0100
-@@ -107,9 +107,10 @@
- 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, exherbo or lfs]))
-+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, lfs or pld]))
- if test "z$with_distro" = "z"; then
- AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
-+ AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
- AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
- AC_CHECK_FILE(/etc/fedora-release,with_distro="redhat")
- AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
-@@ -133,7 +134,7 @@
- exit 1
- else
- case $with_distro in
-- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs|generic) ;;
-+ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|lfs|pld|generic) ;;
- *)
- echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
- exit 1
-@@ -205,6 +206,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
-@@ -790,6 +796,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.9.4.0/initscript/Makefile.am NetworkManager-0.9.4.0.new/initscript/Makefile.am
---- NetworkManager-0.9.4.0/initscript/Makefile.am 2011-04-19 07:06:22.000000000 +0200
-+++ NetworkManager-0.9.4.0.new/initscript/Makefile.am 2012-03-24 11:25:37.842292690 +0100
-@@ -26,3 +26,6 @@
- if TARGET_LINEXA
- SUBDIRS += linexa
- endif
-+if TARGET_PLD
-+SUBDIRS += PLD
-+endif
-diff -urN NetworkManager-0.9.4.0/initscript/PLD/Makefile.am NetworkManager-0.9.4.0.new/initscript/PLD/Makefile.am
---- NetworkManager-0.9.4.0/initscript/PLD/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.9.4.0.new/initscript/PLD/Makefile.am 2012-03-24 11:25:37.845626005 +0100
-@@ -0,0 +1,5 @@
-+EXTRA_DIST = NetworkManager
-+DISTCLEANFILES = NetworkManager
-+
-+initddir = $(sysconfdir)/rc.d/init.d
-+initd_SCRIPTS = NetworkManager
-diff -urN NetworkManager-0.9.4.0/initscript/PLD/NetworkManager.in NetworkManager-0.9.4.0.new/initscript/PLD/NetworkManager.in
---- NetworkManager-0.9.4.0/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.9.4.0.new/initscript/PLD/NetworkManager.in 2012-03-24 11:25:37.845626005 +0100
-@@ -0,0 +1,75 @@
-+#!/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
-+
-+upstart_controlled
-+
-+# 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.9.4.0/src/backends/Makefile.am NetworkManager-0.9.4.0.new/src/backends/Makefile.am
---- NetworkManager-0.9.4.0/src/backends/Makefile.am 2012-02-27 16:57:16.000000000 +0100
-+++ NetworkManager-0.9.4.0.new/src/backends/Makefile.am 2012-03-24 11:30:34.634018164 +0100
-@@ -64,6 +64,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 \
- $(LIBNL_LIBS) \
-diff -urN NetworkManager-0.9.4.0/src/backends/NetworkManagerPLD.c NetworkManager-0.9.4.0.new/src/backends/NetworkManagerPLD.c
---- NetworkManager-0.9.4.0/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100
-+++ NetworkManager-0.9.4.0.new/src/backends/NetworkManagerPLD.c 2012-03-24 11:46:34.925482485 +0100
-@@ -0,0 +1,68 @@
-+/* NetworkManager -- Network link manager
-+ *
-+ * Patryk Zawadzki <patrys@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
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ * (C) Copyright 2004 RedHat, Inc.
-+ * (C) Copyright 2004 Narayan Newton
-+ * (C) Copyright 2005 wrobell <wrobell@pld-linux.org>
-+ * (C) Copyright 2007, 2012 Marcin Banasiak <megabajt@pld-linux.org>
-+ * (C) Copyright 2005-2008 Patryk Zawadzki <patrys@pld-linux.org>
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include "NetworkManagerGeneric.h"
-+#include "NetworkManagerUtils.h"
-+
-+/*
-+ * nm_backend_enable_loopback
-+ *
-+ * Bring up the loopback interface
-+ *
-+ */
-+void nm_backend_enable_loopback (void)
-+{
-+ nm_generic_enable_loopback ();
-+}
-+
-+/*
-+ * nm_backend_update_dns
-+ *
-+ * Invalidate the nscd host cache, if it exists, since
-+ * we changed resolv.conf.
-+ *
-+ */
-+void nm_backend_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 ("/usr/sbin/nscd -i hosts");
-+ }
-+}
-+
-+/*
-+ * nm_backend_ipv6_use_tempaddr
-+ *
-+ * Get net.ipv6.conf.default.use_tempaddr from /etc/sysctl.conf or
-+ * /lib/sysctl.d/sysctl.conf
-+ *
-+ */
-+int nm_backend_ipv6_use_tempaddr (void)
-+{
-+ return nm_generic_ipv6_use_tempaddr ();
-+}
-diff -urN NetworkManager-0.9.4.0/src/settings/plugins/Makefile.am NetworkManager-0.9.4.0.new/src/settings/plugins/Makefile.am
---- NetworkManager-0.9.4.0/src/settings/plugins/Makefile.am 2012-02-08 17:44:53.000000000 +0100
-+++ NetworkManager-0.9.4.0.new/src/settings/plugins/Makefile.am 2012-03-24 11:25:37.845626005 +0100
-@@ -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