NetworkManager-pld.patch

   1 diff -urN NetworkManager-0.7.0/configure.in NetworkManager-0.7.0.new/configure.in
   2 --- NetworkManager-0.7.0/configure.in   2008-11-25 19:57:21.000000000 +0100
   3 +++ NetworkManager-0.7.0.new/configure.in       2008-11-27 16:12:36.000000000 +0100
   4 @@ -78,7 +78,7 @@
   5  dnl
   6  AC_C_BIGENDIAN
   7
   8 -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]))
   9 +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]))
  10  if test "z$with_distro" = "z"; then
  11         AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
  12         AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
  13 @@ -89,6 +89,7 @@
  14         AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
  15         AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
  16         AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
  17 +       AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
  18         if test "z$with_distro" = "z"; then
  19                 with_distro=`lsb_release -is`
  20         fi
  21 @@ -100,7 +101,7 @@
  22         exit 1
  23  else
  24         case $with_distro in
  25 -               redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;;
  26 +               redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pld) ;;
  27                 *)
  28                         echo "Your distribution (${with_distro}) is not yet supported!  (patches welcome)"
  29                         exit 1
  30 @@ -153,6 +154,11 @@
  31    AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva])
  32  fi
  33
  34 +AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
  35 +if test x"$with_distro" = xpld; then
  36 +  AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
  37 +fi
  38 +
  39  AC_MSG_CHECKING([Linux Wireless Extensions >= 18])
  40  AC_TRY_COMPILE([#ifndef __user
  41                  #define __user
  42 @@ -522,6 +528,8 @@
  43  initscript/paldo/NetworkManager
  44  initscript/Mandriva/Makefile
  45  initscript/Mandriva/networkmanager
  46 +initscript/PLD/Makefile
  47 +initscript/PLD/NetworkManager
  48  introspection/Makefile
  49  man/Makefile
  50  man/NetworkManager.8
  51 diff -urN NetworkManager-0.7.0/initscript/Makefile.am NetworkManager-0.7.0.new/initscript/Makefile.am
  52 --- NetworkManager-0.7.0/initscript/Makefile.am 2008-09-13 22:47:30.000000000 +0200
  53 +++ NetworkManager-0.7.0.new/initscript/Makefile.am     2008-11-27 16:00:28.000000000 +0100
  54 @@ -23,3 +23,6 @@
  55  if TARGET_MANDRIVA
  56  SUBDIRS += Mandriva
  57  endif
  58 +if TARGET_PLD
  59 +SUBDIRS += PLD
  60 +endif
  61 diff -urN NetworkManager-0.7.0/initscript/PLD/Makefile.am NetworkManager-0.7.0.new/initscript/PLD/Makefile.am
  62 --- NetworkManager-0.7.0/initscript/PLD/Makefile.am     1970-01-01 01:00:00.000000000 +0100
  63 +++ NetworkManager-0.7.0.new/initscript/PLD/Makefile.am 2008-11-27 16:00:28.000000000 +0100
  64 @@ -0,0 +1,6 @@
  65 +EXTRA_DIST = NetworkManager
  66 +DISTCLEANFILES = NetworkManager
  67 +
  68 +initddir = $(sysconfdir)/rc.d/init.d
  69 +initd_SCRIPTS = NetworkManager
  70 +
  71 diff -urN NetworkManager-0.7.0/initscript/PLD/NetworkManager.in NetworkManager-0.7.0.new/initscript/PLD/NetworkManager.in
  72 --- NetworkManager-0.7.0/initscript/PLD/NetworkManager.in       1970-01-01 01:00:00.000000000 +0100
  73 +++ NetworkManager-0.7.0.new/initscript/PLD/NetworkManager.in   2008-11-27 16:00:28.000000000 +0100
  74 @@ -0,0 +1,74 @@
  75 +#!/bin/sh
  76 +#
  77 +# NetworkManager       NetworkManager daemon
  78 +#
  79 +# chkconfig:           345 99 01
  80 +#
  81 +# description:         This is a daemon for automatically switching network \
  82 +#                      connections to the best available connection.
  83 +#
  84 +# processname:         NetworkManager
  85 +# pidfile:             /var/run/NetworkManager.pid
  86 +#
  87 +
  88 +# Source function library.
  89 +. /etc/rc.d/init.d/functions
  90 +
  91 +# Source networking configuration.
  92 +. /etc/sysconfig/network
  93 +
  94 +# Check that networking is up.
  95 +if is_yes "${NETWORKING}"; then
  96 +       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
  97 +               msg_network_down NetworkManager
  98 +               exit 1
  99 +       fi
 100 +else
 101 +       exit 0
 102 +fi
 103 +
 104 +start() {
 105 +       # Check if the service is already running?
 106 +       if [ ! -f /var/lock/subsys/NetworkManager ]; then
 107 +               msg_starting NetworkManager
 108 +               daemon NetworkManager --pid-file=/var/run/NetworkManager.pid
 109 +               RETVAL=$?
 110 +               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/NetworkManager
 111 +       else
 112 +               msg_already_running NetworkManager
 113 +       fi
 114 +}
 115 +stop() {
 116 +       if [ -f /var/lock/subsys/NetworkManager ]; then
 117 +               # Stop daemons.
 118 +               msg_stopping NetworkManager
 119 +               killproc NetworkManager
 120 +               rm -f /var/lock/subsys/NetworkManager
 121 +       else
 122 +               msg_not_running NetworkManager
 123 +       fi
 124 +}
 125 +
 126 +RETVAL=0
 127 +
 128 +case "$1" in
 129 +  start)
 130 +       start
 131 +       ;;
 132 +  stop)
 133 +       stop
 134 +       ;;
 135 +  restart)
 136 +       stop
 137 +       start
 138 +       ;;
 139 +  status)
 140 +       status NetworkManager
 141 +       RETVAL=$?
 142 +       ;;
 143 +  *)
 144 +       msg_usage "$0 {start|stop|restart|status}"
 145 +       exit 3
 146 +esac
 147 +
 148 +exit $RETVAL
 149 diff -urN NetworkManager-0.7.0/src/backends/NetworkManagerPLD.c NetworkManager-0.7.0.new/src/backends/NetworkManagerPLD.c
 150 --- NetworkManager-0.7.0/src/backends/NetworkManagerPLD.c       1970-01-01 01:00:00.000000000 +0100
 151 +++ NetworkManager-0.7.0.new/src/backends/NetworkManagerPLD.c   2008-11-27 16:00:28.000000000 +0100
 152 @@ -0,0 +1,62 @@
 153 +/* NetworkManager -- Network link manager
 154 + *
 155 + * Patryk Zawadzki <patrys@pld-linux.org>
 156 + *
 157 + * This program is free software; you can redistribute it and/or modify
 158 + * it under the terms of the GNU General Public License as published by
 159 + * the Free Software Foundation; either version 2 of the License, or
 160 + * (at your option) any later version.
 161 + *
 162 + * This program is distributed in the hope that it will be useful,
 163 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 164 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 165 + * GNU General Public License for more details.
 166 + *
 167 + * You should have received a copy of the GNU General Public License
 168 + * along with this program; if not, write to the Free Software
 169 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 170 + *
 171 + * (C) Copyright 2004 RedHat, Inc.
 172 + * (C) Copyright 2004 Narayan Newton
 173 + * (C) Copyright 2005 wrobell <wrobell@pld-linux.org>
 174 + * (C) Copyright 2007 Marcin Banasiak <megabajt@pld-linux.org>
 175 + * (C) Copyright 2005-2008 Patryk Zawadzki <patrys@pld-linux.org>
 176 + */
 177 +
 178 +#ifdef HAVE_CONFIG_H
 179 +#include <config.h>
 180 +#endif
 181 +
 182 +#include <stdio.h>
 183 +#include <string.h>
 184 +#include <stdlib.h>
 185 +
 186 +#include "NetworkManagerGeneric.h"
 187 +#include "NetworkManagerSystem.h"
 188 +#include "NetworkManagerUtils.h"
 189 +
 190 +/*
 191 + * nm_system_enable_loopback
 192 + *
 193 + * Bring up the loopback interface
 194 + *
 195 + */
 196 +void nm_system_enable_loopback (void)
 197 +{
 198 +       nm_generic_enable_loopback ();
 199 +}
 200 +
 201 +/*
 202 + * nm_system_update_dns
 203 + *
 204 + * Invalidate the nscd host cache, if it exists, since
 205 + * we changed resolv.conf.
 206 + *
 207 + */
 208 +void nm_system_update_dns (void)
 209 +{
 210 +       if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
 211 +               nm_spawn_process ("/etc/rc.d/init.d/nscd restart");
 212 +       }
 213 +}
 214 +
 215 diff -urN NetworkManager-0.7.1/src/backends/Makefile.am NetworkManager-0.7.1.new/src/backends/Makefile.am
 216 --- NetworkManager-0.7.1/src/backends/Makefile.am       2009-03-03 17:55:47.000000000 +0100
 217 +++ NetworkManager-0.7.1.new/src/backends/Makefile.am   2009-04-14 10:41:11.893584150 +0200
 218 @@ -49,6 +49,10 @@
 219  libnmbackend_la_SOURCES += NetworkManagerMandriva.c
 220  endif
 221
 222 +if TARGET_PLD
 223 +libnmbackend_la_SOURCES += NetworkManagerPLD.c
 224 +endif
 225 +
 226  libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS)
 227  libnmbackend_la_CPPFLAGS =     $(DBUS_CFLAGS)                          \
 228                                         $(GLIB_CFLAGS)                          \