Annotation of /trunk/networkmanager/patches/networkmanager-0.8.5.91-magellan.patch
Parent Directory | Revision Log
Revision 1434 -
(hide annotations)
(download)
Thu Jul 21 23:55:50 2011 UTC (13 years, 2 months ago) by niro
File size: 31814 byte(s)
Thu Jul 21 23:55:50 2011 UTC (13 years, 2 months ago) by niro
File size: 31814 byte(s)
re-diffed patches against 0.8.5.91
1 | niro | 1434 | diff -Naur NetworkManager-0.8.5.91/config.h.in NetworkManager-0.8.5.91-magellan/config.h.in |
2 | --- NetworkManager-0.8.5.91/config.h.in 2011-07-19 23:48:19.000000000 +0200 | ||
3 | +++ NetworkManager-0.8.5.91-magellan/config.h.in 2011-07-22 03:34:32.000000000 +0200 | ||
4 | @@ -161,6 +161,9 @@ | ||
5 | /* Define if you have linexa */ | ||
6 | #undef TARGET_LINEXA | ||
7 | |||
8 | +/* Define if you have Magellan */ | ||
9 | +#undef TARGET_MAGELLAN | ||
10 | + | ||
11 | /* Define if you have Mandriva */ | ||
12 | #undef TARGET_MANDRIVA | ||
13 | |||
14 | diff -Naur NetworkManager-0.8.5.91/configure.ac NetworkManager-0.8.5.91-magellan/configure.ac | ||
15 | --- NetworkManager-0.8.5.91/configure.ac 2011-07-19 23:47:36.000000000 +0200 | ||
16 | +++ NetworkManager-0.8.5.91-magellan/configure.ac 2011-07-22 03:37:27.000000000 +0200 | ||
17 | @@ -104,12 +104,13 @@ | ||
18 | dnl | ||
19 | AC_C_BIGENDIAN | ||
20 | |||
21 | -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])) | ||
22 | +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, magellan, debian, arch, slackware, paldo, mandriva, pardus, linexa or exherbo])) | ||
23 | if test "z$with_distro" = "z"; then | ||
24 | AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") | ||
25 | AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") | ||
26 | AC_CHECK_FILE(/etc/fedora-release,with_distro="redhat") | ||
27 | AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo") | ||
28 | + AC_CHECK_FILE(/etc/mageversion,with_distro="magellan") | ||
29 | AC_CHECK_FILE(/etc/debian_version,with_distro="debian") | ||
30 | AC_CHECK_FILE(/etc/arch-release,with_distro="arch") | ||
31 | AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") | ||
32 | @@ -129,7 +130,7 @@ | ||
33 | exit 1 | ||
34 | else | ||
35 | case $with_distro in | ||
36 | - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;; | ||
37 | + redhat|suse|gentoo|magellan|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;; | ||
38 | *) | ||
39 | echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" | ||
40 | exit 1 | ||
41 | @@ -152,6 +153,11 @@ | ||
42 | AC_DEFINE(TARGET_GENTOO, 1, [Define if you have Gentoo]) | ||
43 | fi | ||
44 | |||
45 | +AM_CONDITIONAL(TARGET_MAGELLAN, test x"$with_distro" = xmagellan) | ||
46 | +if test x"$with_distro" = xmagellan; then | ||
47 | + AC_DEFINE(TARGET_MAGELLAN, 1, [Define if you have Magellan]) | ||
48 | +fi | ||
49 | + | ||
50 | AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) | ||
51 | if test x"$with_distro" = xdebian; then | ||
52 | AC_DEFINE(TARGET_DEBIAN, 1, [Define if you have Debian]) | ||
53 | @@ -587,6 +593,8 @@ | ||
54 | initscript/RedHat/NetworkManager | ||
55 | initscript/Gentoo/Makefile | ||
56 | initscript/Gentoo/NetworkManager | ||
57 | +initscript/Magellan/Makefile | ||
58 | +initscript/Magellan/NetworkManager | ||
59 | initscript/Debian/Makefile | ||
60 | initscript/Debian/NetworkManager | ||
61 | initscript/Slackware/Makefile | ||
62 | diff -Naur NetworkManager-0.8.5.91/initscript/Magellan/Makefile.am NetworkManager-0.8.5.91-magellan/initscript/Magellan/Makefile.am | ||
63 | --- NetworkManager-0.8.5.91/initscript/Magellan/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | ||
64 | +++ NetworkManager-0.8.5.91-magellan/initscript/Magellan/Makefile.am 2011-07-22 03:38:17.000000000 +0200 | ||
65 | @@ -0,0 +1,2 @@ | ||
66 | +initddir = $(sysconfdir)/rc.d/init.d | ||
67 | +initd_SCRIPTS = NetworkManager | ||
68 | diff -Naur NetworkManager-0.8.5.91/initscript/Magellan/Makefile.in NetworkManager-0.8.5.91-magellan/initscript/Magellan/Makefile.in | ||
69 | --- NetworkManager-0.8.5.91/initscript/Magellan/Makefile.in 1970-01-01 01:00:00.000000000 +0100 | ||
70 | +++ NetworkManager-0.8.5.91-magellan/initscript/Magellan/Makefile.in 2011-07-22 03:39:02.000000000 +0200 | ||
71 | @@ -0,0 +1,500 @@ | ||
72 | +# Makefile.in generated by automake 1.11.1 from Makefile.am. | ||
73 | +# @configure_input@ | ||
74 | + | ||
75 | +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, | ||
76 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | ||
77 | +# Inc. | ||
78 | +# This Makefile.in is free software; the Free Software Foundation | ||
79 | +# gives unlimited permission to copy and/or distribute it, | ||
80 | +# with or without modifications, as long as this notice is preserved. | ||
81 | + | ||
82 | +# This program is distributed in the hope that it will be useful, | ||
83 | +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without | ||
84 | +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A | ||
85 | +# PARTICULAR PURPOSE. | ||
86 | + | ||
87 | +@SET_MAKE@ | ||
88 | + | ||
89 | +VPATH = @srcdir@ | ||
90 | +pkgdatadir = $(datadir)/@PACKAGE@ | ||
91 | +pkgincludedir = $(includedir)/@PACKAGE@ | ||
92 | +pkglibdir = $(libdir)/@PACKAGE@ | ||
93 | +pkglibexecdir = $(libexecdir)/@PACKAGE@ | ||
94 | +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd | ||
95 | +install_sh_DATA = $(install_sh) -c -m 644 | ||
96 | +install_sh_PROGRAM = $(install_sh) -c | ||
97 | +install_sh_SCRIPT = $(install_sh) -c | ||
98 | +INSTALL_HEADER = $(INSTALL_DATA) | ||
99 | +transform = $(program_transform_name) | ||
100 | +NORMAL_INSTALL = : | ||
101 | +PRE_INSTALL = : | ||
102 | +POST_INSTALL = : | ||
103 | +NORMAL_UNINSTALL = : | ||
104 | +PRE_UNINSTALL = : | ||
105 | +POST_UNINSTALL = : | ||
106 | +build_triplet = @build@ | ||
107 | +host_triplet = @host@ | ||
108 | +subdir = initscript/Magellan | ||
109 | +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | ||
110 | + $(srcdir)/NetworkManager.in | ||
111 | +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
112 | +am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ | ||
113 | + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ | ||
114 | + $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ | ||
115 | + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ | ||
116 | + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ | ||
117 | + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac | ||
118 | +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | ||
119 | + $(ACLOCAL_M4) | ||
120 | +mkinstalldirs = $(install_sh) -d | ||
121 | +CONFIG_HEADER = $(top_builddir)/config.h | ||
122 | +CONFIG_CLEAN_FILES = NetworkManager | ||
123 | +CONFIG_CLEAN_VPATH_FILES = | ||
124 | +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; | ||
125 | +am__vpath_adj = case $$p in \ | ||
126 | + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ | ||
127 | + *) f=$$p;; \ | ||
128 | + esac; | ||
129 | +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; | ||
130 | +am__install_max = 40 | ||
131 | +am__nobase_strip_setup = \ | ||
132 | + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` | ||
133 | +am__nobase_strip = \ | ||
134 | + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" | ||
135 | +am__nobase_list = $(am__nobase_strip_setup); \ | ||
136 | + for p in $$list; do echo "$$p $$p"; done | \ | ||
137 | + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ | ||
138 | + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ | ||
139 | + if (++n[$$2] == $(am__install_max)) \ | ||
140 | + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ | ||
141 | + END { for (dir in files) print dir, files[dir] }' | ||
142 | +am__base_list = \ | ||
143 | + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ | ||
144 | + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | ||
145 | +am__installdirs = "$(DESTDIR)$(initddir)" | ||
146 | +SCRIPTS = $(initd_SCRIPTS) | ||
147 | +AM_V_GEN = $(am__v_GEN_$(V)) | ||
148 | +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||
149 | +am__v_GEN_0 = @echo " GEN " $@; | ||
150 | +AM_V_at = $(am__v_at_$(V)) | ||
151 | +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) | ||
152 | +am__v_at_0 = @ | ||
153 | +SOURCES = | ||
154 | +DIST_SOURCES = | ||
155 | +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
156 | +ACLOCAL = @ACLOCAL@ | ||
157 | +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ | ||
158 | +ALL_LINGUAS = @ALL_LINGUAS@ | ||
159 | +AMTAR = @AMTAR@ | ||
160 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
161 | +AR = @AR@ | ||
162 | +AUTOCONF = @AUTOCONF@ | ||
163 | +AUTOHEADER = @AUTOHEADER@ | ||
164 | +AUTOMAKE = @AUTOMAKE@ | ||
165 | +AWK = @AWK@ | ||
166 | +CATALOGS = @CATALOGS@ | ||
167 | +CATOBJEXT = @CATOBJEXT@ | ||
168 | +CC = @CC@ | ||
169 | +CCDEPMODE = @CCDEPMODE@ | ||
170 | +CFLAGS = @CFLAGS@ | ||
171 | +CPP = @CPP@ | ||
172 | +CPPFLAGS = @CPPFLAGS@ | ||
173 | +CYGPATH_W = @CYGPATH_W@ | ||
174 | +DATADIRNAME = @DATADIRNAME@ | ||
175 | +DBUS_CFLAGS = @DBUS_CFLAGS@ | ||
176 | +DBUS_LIBS = @DBUS_LIBS@ | ||
177 | +DBUS_SYS_DIR = @DBUS_SYS_DIR@ | ||
178 | +DEFS = @DEFS@ | ||
179 | +DEPDIR = @DEPDIR@ | ||
180 | +DHCLIENT_PATH = @DHCLIENT_PATH@ | ||
181 | +DHCLIENT_VERSION = @DHCLIENT_VERSION@ | ||
182 | +DHCPCD_PATH = @DHCPCD_PATH@ | ||
183 | +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ | ||
184 | +DSYMUTIL = @DSYMUTIL@ | ||
185 | +DUMPBIN = @DUMPBIN@ | ||
186 | +ECHO_C = @ECHO_C@ | ||
187 | +ECHO_N = @ECHO_N@ | ||
188 | +ECHO_T = @ECHO_T@ | ||
189 | +EGREP = @EGREP@ | ||
190 | +EXEEXT = @EXEEXT@ | ||
191 | +FGREP = @FGREP@ | ||
192 | +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ | ||
193 | +GIO_CFLAGS = @GIO_CFLAGS@ | ||
194 | +GIO_LIBS = @GIO_LIBS@ | ||
195 | +GLIB_CFLAGS = @GLIB_CFLAGS@ | ||
196 | +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ | ||
197 | +GLIB_LIBS = @GLIB_LIBS@ | ||
198 | +GMODULE_CFLAGS = @GMODULE_CFLAGS@ | ||
199 | +GMODULE_LIBS = @GMODULE_LIBS@ | ||
200 | +GMOFILES = @GMOFILES@ | ||
201 | +GMSGFMT = @GMSGFMT@ | ||
202 | +GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ | ||
203 | +GNUTLS_LIBS = @GNUTLS_LIBS@ | ||
204 | +GREP = @GREP@ | ||
205 | +GTKDOC_CHECK = @GTKDOC_CHECK@ | ||
206 | +GTKDOC_MKPDF = @GTKDOC_MKPDF@ | ||
207 | +GTKDOC_REBASE = @GTKDOC_REBASE@ | ||
208 | +GUDEV_CFLAGS = @GUDEV_CFLAGS@ | ||
209 | +GUDEV_LIBS = @GUDEV_LIBS@ | ||
210 | +HTML_DIR = @HTML_DIR@ | ||
211 | +INSTALL = @INSTALL@ | ||
212 | +INSTALL_DATA = @INSTALL_DATA@ | ||
213 | +INSTALL_PROGRAM = @INSTALL_PROGRAM@ | ||
214 | +INSTALL_SCRIPT = @INSTALL_SCRIPT@ | ||
215 | +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ | ||
216 | +INSTOBJEXT = @INSTOBJEXT@ | ||
217 | +INTLLIBS = @INTLLIBS@ | ||
218 | +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ | ||
219 | +INTLTOOL_MERGE = @INTLTOOL_MERGE@ | ||
220 | +INTLTOOL_PERL = @INTLTOOL_PERL@ | ||
221 | +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ | ||
222 | +IPTABLES_PATH = @IPTABLES_PATH@ | ||
223 | +KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ | ||
224 | +LD = @LD@ | ||
225 | +LDFLAGS = @LDFLAGS@ | ||
226 | +LIBDL = @LIBDL@ | ||
227 | +LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ | ||
228 | +LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ | ||
229 | +LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ | ||
230 | +LIBM = @LIBM@ | ||
231 | +LIBNL_CFLAGS = @LIBNL_CFLAGS@ | ||
232 | +LIBNL_LIBS = @LIBNL_LIBS@ | ||
233 | +LIBOBJS = @LIBOBJS@ | ||
234 | +LIBS = @LIBS@ | ||
235 | +LIBTOOL = @LIBTOOL@ | ||
236 | +LIPO = @LIPO@ | ||
237 | +LN_S = @LN_S@ | ||
238 | +LTLIBOBJS = @LTLIBOBJS@ | ||
239 | +MAINT = @MAINT@ | ||
240 | +MAKEINFO = @MAKEINFO@ | ||
241 | +MKDIR_P = @MKDIR_P@ | ||
242 | +MKINSTALLDIRS = @MKINSTALLDIRS@ | ||
243 | +MSGFMT = @MSGFMT@ | ||
244 | +MSGFMT_OPTS = @MSGFMT_OPTS@ | ||
245 | +MSGMERGE = @MSGMERGE@ | ||
246 | +NM = @NM@ | ||
247 | +NMEDIT = @NMEDIT@ | ||
248 | +NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ | ||
249 | +NM_MICRO_VERSION = @NM_MICRO_VERSION@ | ||
250 | +NM_MINOR_VERSION = @NM_MINOR_VERSION@ | ||
251 | +NM_VERSION = @NM_VERSION@ | ||
252 | +NSS_CFLAGS = @NSS_CFLAGS@ | ||
253 | +NSS_LIBS = @NSS_LIBS@ | ||
254 | +OBJDUMP = @OBJDUMP@ | ||
255 | +OBJEXT = @OBJEXT@ | ||
256 | +OTOOL = @OTOOL@ | ||
257 | +OTOOL64 = @OTOOL64@ | ||
258 | +PACKAGE = @PACKAGE@ | ||
259 | +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ | ||
260 | +PACKAGE_NAME = @PACKAGE_NAME@ | ||
261 | +PACKAGE_STRING = @PACKAGE_STRING@ | ||
262 | +PACKAGE_TARNAME = @PACKAGE_TARNAME@ | ||
263 | +PACKAGE_URL = @PACKAGE_URL@ | ||
264 | +PACKAGE_VERSION = @PACKAGE_VERSION@ | ||
265 | +PATH_SEPARATOR = @PATH_SEPARATOR@ | ||
266 | +PKGCONFIG_PATH = @PKGCONFIG_PATH@ | ||
267 | +PKG_CONFIG = @PKG_CONFIG@ | ||
268 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
269 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
270 | +POFILES = @POFILES@ | ||
271 | +POLKIT_CFLAGS = @POLKIT_CFLAGS@ | ||
272 | +POLKIT_LIBS = @POLKIT_LIBS@ | ||
273 | +POSUB = @POSUB@ | ||
274 | +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ | ||
275 | +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ | ||
276 | +PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@ | ||
277 | +RANLIB = @RANLIB@ | ||
278 | +RESOLVCONF_PATH = @RESOLVCONF_PATH@ | ||
279 | +SED = @SED@ | ||
280 | +SET_MAKE = @SET_MAKE@ | ||
281 | +SHELL = @SHELL@ | ||
282 | +STRIP = @STRIP@ | ||
283 | +SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ | ||
284 | +UDEV_BASE_DIR = @UDEV_BASE_DIR@ | ||
285 | +USE_NLS = @USE_NLS@ | ||
286 | +UUID_CFLAGS = @UUID_CFLAGS@ | ||
287 | +UUID_LIBS = @UUID_LIBS@ | ||
288 | +VERSION = @VERSION@ | ||
289 | +XGETTEXT = @XGETTEXT@ | ||
290 | +abs_builddir = @abs_builddir@ | ||
291 | +abs_srcdir = @abs_srcdir@ | ||
292 | +abs_top_builddir = @abs_top_builddir@ | ||
293 | +abs_top_srcdir = @abs_top_srcdir@ | ||
294 | +ac_ct_CC = @ac_ct_CC@ | ||
295 | +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ | ||
296 | +am__include = @am__include@ | ||
297 | +am__leading_dot = @am__leading_dot@ | ||
298 | +am__quote = @am__quote@ | ||
299 | +am__tar = @am__tar@ | ||
300 | +am__untar = @am__untar@ | ||
301 | +bindir = @bindir@ | ||
302 | +build = @build@ | ||
303 | +build_alias = @build_alias@ | ||
304 | +build_cpu = @build_cpu@ | ||
305 | +build_os = @build_os@ | ||
306 | +build_vendor = @build_vendor@ | ||
307 | +builddir = @builddir@ | ||
308 | +datadir = @datadir@ | ||
309 | +datarootdir = @datarootdir@ | ||
310 | +docdir = @docdir@ | ||
311 | +dvidir = @dvidir@ | ||
312 | +exec_prefix = @exec_prefix@ | ||
313 | +host = @host@ | ||
314 | +host_alias = @host_alias@ | ||
315 | +host_cpu = @host_cpu@ | ||
316 | +host_os = @host_os@ | ||
317 | +host_vendor = @host_vendor@ | ||
318 | +htmldir = @htmldir@ | ||
319 | +includedir = @includedir@ | ||
320 | +infodir = @infodir@ | ||
321 | +install_sh = @install_sh@ | ||
322 | +libdir = @libdir@ | ||
323 | +libexecdir = @libexecdir@ | ||
324 | +localedir = @localedir@ | ||
325 | +localstatedir = @localstatedir@ | ||
326 | +mandir = @mandir@ | ||
327 | +mkdir_p = @mkdir_p@ | ||
328 | +oldincludedir = @oldincludedir@ | ||
329 | +pdfdir = @pdfdir@ | ||
330 | +prefix = @prefix@ | ||
331 | +program_transform_name = @program_transform_name@ | ||
332 | +psdir = @psdir@ | ||
333 | +sbindir = @sbindir@ | ||
334 | +sharedstatedir = @sharedstatedir@ | ||
335 | +srcdir = @srcdir@ | ||
336 | +sysconfdir = @sysconfdir@ | ||
337 | +systemdsystemunitdir = @systemdsystemunitdir@ | ||
338 | +target_alias = @target_alias@ | ||
339 | +top_build_prefix = @top_build_prefix@ | ||
340 | +top_builddir = @top_builddir@ | ||
341 | +top_srcdir = @top_srcdir@ | ||
342 | +initddir = $(sysconfdir)/rc.d/init.d | ||
343 | +initd_SCRIPTS = NetworkManager | ||
344 | +all: all-am | ||
345 | + | ||
346 | +.SUFFIXES: | ||
347 | +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | ||
348 | + @for dep in $?; do \ | ||
349 | + case '$(am__configure_deps)' in \ | ||
350 | + *$$dep*) \ | ||
351 | + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ | ||
352 | + && { if test -f $@; then exit 0; else break; fi; }; \ | ||
353 | + exit 1;; \ | ||
354 | + esac; \ | ||
355 | + done; \ | ||
356 | + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu initscript/Magellan/Makefile'; \ | ||
357 | + $(am__cd) $(top_srcdir) && \ | ||
358 | + $(AUTOMAKE) --gnu initscript/Magellan/Makefile | ||
359 | +.PRECIOUS: Makefile | ||
360 | +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status | ||
361 | + @case '$?' in \ | ||
362 | + *config.status*) \ | ||
363 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ | ||
364 | + *) \ | ||
365 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ | ||
366 | + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ | ||
367 | + esac; | ||
368 | + | ||
369 | +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | ||
370 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
371 | + | ||
372 | +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | ||
373 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
374 | +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | ||
375 | + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | ||
376 | +$(am__aclocal_m4_deps): | ||
377 | +NetworkManager: $(top_builddir)/config.status $(srcdir)/NetworkManager.in | ||
378 | + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ | ||
379 | +install-initdSCRIPTS: $(initd_SCRIPTS) | ||
380 | + @$(NORMAL_INSTALL) | ||
381 | + test -z "$(initddir)" || $(MKDIR_P) "$(DESTDIR)$(initddir)" | ||
382 | + @list='$(initd_SCRIPTS)'; test -n "$(initddir)" || list=; \ | ||
383 | + for p in $$list; do \ | ||
384 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ | ||
385 | + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ | ||
386 | + done | \ | ||
387 | + sed -e 'p;s,.*/,,;n' \ | ||
388 | + -e 'h;s|.*|.|' \ | ||
389 | + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ | ||
390 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ | ||
391 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ | ||
392 | + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ | ||
393 | + if (++n[d] == $(am__install_max)) { \ | ||
394 | + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ | ||
395 | + else { print "f", d "/" $$4, $$1 } } \ | ||
396 | + END { for (d in files) print "f", d, files[d] }' | \ | ||
397 | + while read type dir files; do \ | ||
398 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ | ||
399 | + test -z "$$files" || { \ | ||
400 | + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(initddir)$$dir'"; \ | ||
401 | + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(initddir)$$dir" || exit $$?; \ | ||
402 | + } \ | ||
403 | + ; done | ||
404 | + | ||
405 | +uninstall-initdSCRIPTS: | ||
406 | + @$(NORMAL_UNINSTALL) | ||
407 | + @list='$(initd_SCRIPTS)'; test -n "$(initddir)" || exit 0; \ | ||
408 | + files=`for p in $$list; do echo "$$p"; done | \ | ||
409 | + sed -e 's,.*/,,;$(transform)'`; \ | ||
410 | + test -n "$$list" || exit 0; \ | ||
411 | + echo " ( cd '$(DESTDIR)$(initddir)' && rm -f" $$files ")"; \ | ||
412 | + cd "$(DESTDIR)$(initddir)" && rm -f $$files | ||
413 | + | ||
414 | +mostlyclean-libtool: | ||
415 | + -rm -f *.lo | ||
416 | + | ||
417 | +clean-libtool: | ||
418 | + -rm -rf .libs _libs | ||
419 | +tags: TAGS | ||
420 | +TAGS: | ||
421 | + | ||
422 | +ctags: CTAGS | ||
423 | +CTAGS: | ||
424 | + | ||
425 | + | ||
426 | +distdir: $(DISTFILES) | ||
427 | + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
428 | + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ | ||
429 | + list='$(DISTFILES)'; \ | ||
430 | + dist_files=`for file in $$list; do echo $$file; done | \ | ||
431 | + sed -e "s|^$$srcdirstrip/||;t" \ | ||
432 | + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ | ||
433 | + case $$dist_files in \ | ||
434 | + */*) $(MKDIR_P) `echo "$$dist_files" | \ | ||
435 | + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ | ||
436 | + sort -u` ;; \ | ||
437 | + esac; \ | ||
438 | + for file in $$dist_files; do \ | ||
439 | + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ | ||
440 | + if test -d $$d/$$file; then \ | ||
441 | + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ | ||
442 | + if test -d "$(distdir)/$$file"; then \ | ||
443 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
444 | + fi; \ | ||
445 | + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ | ||
446 | + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ | ||
447 | + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ | ||
448 | + fi; \ | ||
449 | + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ | ||
450 | + else \ | ||
451 | + test -f "$(distdir)/$$file" \ | ||
452 | + || cp -p $$d/$$file "$(distdir)/$$file" \ | ||
453 | + || exit 1; \ | ||
454 | + fi; \ | ||
455 | + done | ||
456 | +check-am: all-am | ||
457 | +check: check-am | ||
458 | +all-am: Makefile $(SCRIPTS) | ||
459 | +installdirs: | ||
460 | + for dir in "$(DESTDIR)$(initddir)"; do \ | ||
461 | + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ | ||
462 | + done | ||
463 | +install: install-am | ||
464 | +install-exec: install-exec-am | ||
465 | +install-data: install-data-am | ||
466 | +uninstall: uninstall-am | ||
467 | + | ||
468 | +install-am: all-am | ||
469 | + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am | ||
470 | + | ||
471 | +installcheck: installcheck-am | ||
472 | +install-strip: | ||
473 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ | ||
474 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ | ||
475 | + `test -z '$(STRIP)' || \ | ||
476 | + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install | ||
477 | +mostlyclean-generic: | ||
478 | + | ||
479 | +clean-generic: | ||
480 | + | ||
481 | +distclean-generic: | ||
482 | + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) | ||
483 | + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) | ||
484 | + | ||
485 | +maintainer-clean-generic: | ||
486 | + @echo "This command is intended for maintainers to use" | ||
487 | + @echo "it deletes files that may require special tools to rebuild." | ||
488 | +clean: clean-am | ||
489 | + | ||
490 | +clean-am: clean-generic clean-libtool mostlyclean-am | ||
491 | + | ||
492 | +distclean: distclean-am | ||
493 | + -rm -f Makefile | ||
494 | +distclean-am: clean-am distclean-generic | ||
495 | + | ||
496 | +dvi: dvi-am | ||
497 | + | ||
498 | +dvi-am: | ||
499 | + | ||
500 | +html: html-am | ||
501 | + | ||
502 | +html-am: | ||
503 | + | ||
504 | +info: info-am | ||
505 | + | ||
506 | +info-am: | ||
507 | + | ||
508 | +install-data-am: install-initdSCRIPTS | ||
509 | + | ||
510 | +install-dvi: install-dvi-am | ||
511 | + | ||
512 | +install-dvi-am: | ||
513 | + | ||
514 | +install-exec-am: | ||
515 | + | ||
516 | +install-html: install-html-am | ||
517 | + | ||
518 | +install-html-am: | ||
519 | + | ||
520 | +install-info: install-info-am | ||
521 | + | ||
522 | +install-info-am: | ||
523 | + | ||
524 | +install-man: | ||
525 | + | ||
526 | +install-pdf: install-pdf-am | ||
527 | + | ||
528 | +install-pdf-am: | ||
529 | + | ||
530 | +install-ps: install-ps-am | ||
531 | + | ||
532 | +install-ps-am: | ||
533 | + | ||
534 | +installcheck-am: | ||
535 | + | ||
536 | +maintainer-clean: maintainer-clean-am | ||
537 | + -rm -f Makefile | ||
538 | +maintainer-clean-am: distclean-am maintainer-clean-generic | ||
539 | + | ||
540 | +mostlyclean: mostlyclean-am | ||
541 | + | ||
542 | +mostlyclean-am: mostlyclean-generic mostlyclean-libtool | ||
543 | + | ||
544 | +pdf: pdf-am | ||
545 | + | ||
546 | +pdf-am: | ||
547 | + | ||
548 | +ps: ps-am | ||
549 | + | ||
550 | +ps-am: | ||
551 | + | ||
552 | +uninstall-am: uninstall-initdSCRIPTS | ||
553 | + | ||
554 | +.MAKE: install-am install-strip | ||
555 | + | ||
556 | +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ | ||
557 | + distclean distclean-generic distclean-libtool distdir dvi \ | ||
558 | + dvi-am html html-am info info-am install install-am \ | ||
559 | + install-data install-data-am install-dvi install-dvi-am \ | ||
560 | + install-exec install-exec-am install-html install-html-am \ | ||
561 | + install-info install-info-am install-initdSCRIPTS install-man \ | ||
562 | + install-pdf install-pdf-am install-ps install-ps-am \ | ||
563 | + install-strip installcheck installcheck-am installdirs \ | ||
564 | + maintainer-clean maintainer-clean-generic mostlyclean \ | ||
565 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | ||
566 | + uninstall uninstall-am uninstall-initdSCRIPTS | ||
567 | + | ||
568 | + | ||
569 | +# Tell versions [3.59,3.63) of GNU make to not export all variables. | ||
570 | +# Otherwise a system limit (for SysV at least) may be exceeded. | ||
571 | +.NOEXPORT: | ||
572 | diff -Naur NetworkManager-0.8.5.91/initscript/Magellan/NetworkManager.in NetworkManager-0.8.5.91-magellan/initscript/Magellan/NetworkManager.in | ||
573 | --- NetworkManager-0.8.5.91/initscript/Magellan/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100 | ||
574 | +++ NetworkManager-0.8.5.91-magellan/initscript/Magellan/NetworkManager.in 2011-07-22 03:40:07.000000000 +0200 | ||
575 | @@ -0,0 +1,50 @@ | ||
576 | +#!/bin/bash | ||
577 | +# $Header: /root/magellan-cvs/src/networkmanager/networkmanager.rc,v 1.1 2010-02-13 11:25:26 niro Exp $ | ||
578 | + | ||
579 | +#%rlevels: 3:s 4:s 5:s 0:k 1:k 2:k 6:k | ||
580 | +#%start: 30 | ||
581 | +#%stop: 20 | ||
582 | + | ||
583 | +#deps | ||
584 | +#%needs: | ||
585 | +#%before: | ||
586 | +#%after: | ||
587 | + | ||
588 | +source /etc/conf.d/rc | ||
589 | +source $rc_functions | ||
590 | + | ||
591 | +case "$1" in | ||
592 | + start) | ||
593 | + rc_print "Starting NetworkManager ..." | ||
594 | + start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \ | ||
595 | + --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid | ||
596 | + evaluate_retval | ||
597 | + | ||
598 | + update_svcstatus $1 | ||
599 | + splash svc_started "$(basename $0)" 0 | ||
600 | + ;; | ||
601 | + | ||
602 | + stop) | ||
603 | + rc_print "Stopping NetworkManager ..." | ||
604 | + start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid | ||
605 | + evaluate_retval | ||
606 | + | ||
607 | + update_svcstatus $1 | ||
608 | + splash svc_stopped "$(basename $0)" 0 | ||
609 | + ;; | ||
610 | + | ||
611 | + restart) | ||
612 | + $0 stop | ||
613 | + sleep 1 | ||
614 | + $0 start | ||
615 | + ;; | ||
616 | + | ||
617 | + status) | ||
618 | + statusproc /usr/sbin/NetworkManager | ||
619 | + ;; | ||
620 | + | ||
621 | + *) | ||
622 | + rc_echo "Usage: $0 {start|stop|restart|status}" | ||
623 | + exit 1 | ||
624 | + ;; | ||
625 | +esac | ||
626 | diff -Naur NetworkManager-0.8.5.91/initscript/Makefile.am NetworkManager-0.8.5.91-magellan/initscript/Makefile.am | ||
627 | --- NetworkManager-0.8.5.91/initscript/Makefile.am 2011-04-22 17:23:47.000000000 +0200 | ||
628 | +++ NetworkManager-0.8.5.91-magellan/initscript/Makefile.am 2011-07-22 03:41:08.000000000 +0200 | ||
629 | @@ -5,6 +5,9 @@ | ||
630 | if TARGET_GENTOO | ||
631 | SUBDIRS += Gentoo | ||
632 | endif | ||
633 | +if TARGET_MAGELLAN | ||
634 | +SUBDIRS += Magellan | ||
635 | +endif | ||
636 | if TARGET_DEBIAN | ||
637 | SUBDIRS += Debian | ||
638 | endif | ||
639 | diff -Naur NetworkManager-0.8.5.91/initscript/Makefile.in NetworkManager-0.8.5.91-magellan/initscript/Makefile.in | ||
640 | --- NetworkManager-0.8.5.91/initscript/Makefile.in 2011-07-19 23:47:51.000000000 +0200 | ||
641 | +++ NetworkManager-0.8.5.91-magellan/initscript/Makefile.in 2011-07-22 03:42:00.000000000 +0200 | ||
642 | @@ -42,6 +42,7 @@ | ||
643 | @TARGET_PALDO_TRUE@am__append_7 = paldo | ||
644 | @TARGET_MANDRIVA_TRUE@am__append_8 = Mandriva | ||
645 | @TARGET_LINEXA_TRUE@am__append_9 = linexa | ||
646 | +@TARGET_MAGELLAN_TRUE@am__append_10 = Magellan | ||
647 | subdir = initscript | ||
648 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
649 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
650 | @@ -79,7 +80,7 @@ | ||
651 | distdir | ||
652 | ETAGS = etags | ||
653 | CTAGS = ctags | ||
654 | -DIST_SUBDIRS = RedHat Gentoo Debian Slackware SUSE Arch paldo Mandriva \ | ||
655 | +DIST_SUBDIRS = RedHat Gentoo Magellan Debian Slackware SUSE Arch paldo Mandriva \ | ||
656 | linexa | ||
657 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||
658 | am__relativize = \ | ||
659 | diff -Naur NetworkManager-0.8.5.91/src/backends/Makefile.am NetworkManager-0.8.5.91-magellan/src/backends/Makefile.am | ||
660 | --- NetworkManager-0.8.5.91/src/backends/Makefile.am 2011-06-02 22:11:05.000000000 +0200 | ||
661 | +++ NetworkManager-0.8.5.91-magellan/src/backends/Makefile.am 2011-07-22 03:42:40.000000000 +0200 | ||
662 | @@ -24,6 +24,10 @@ | ||
663 | libnmbackend_la_SOURCES += NetworkManagerGentoo.c | ||
664 | endif | ||
665 | |||
666 | +if TARGET_MAGELLAN | ||
667 | +libnmbackend_la_SOURCES += NetworkManagerMagellan.c | ||
668 | +endif | ||
669 | + | ||
670 | if TARGET_DEBIAN | ||
671 | libnmbackend_la_SOURCES += NetworkManagerDebian.c | ||
672 | endif | ||
673 | diff -Naur NetworkManager-0.8.5.91/src/backends/Makefile.in NetworkManager-0.8.5.91-magellan/src/backends/Makefile.in | ||
674 | --- NetworkManager-0.8.5.91/src/backends/Makefile.in 2011-07-19 23:47:55.000000000 +0200 | ||
675 | +++ NetworkManager-0.8.5.91-magellan/src/backends/Makefile.in 2011-07-22 03:48:13.000000000 +0200 | ||
676 | @@ -47,6 +47,7 @@ | ||
677 | @TARGET_PARDUS_TRUE@am__append_11 = NetworkManagerPardus.c | ||
678 | @TARGET_LINEXA_TRUE@am__append_12 = NetworkManagerLinexa.c | ||
679 | @TARGET_EXHERBO_TRUE@am__append_13 = NetworkManagerExherbo.c | ||
680 | +@TARGET_MAGELLAN_TRUE@am__append_14 = NetworkManagerMagellan.c | ||
681 | subdir = src/backends | ||
682 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||
683 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||
684 | @@ -75,7 +76,7 @@ | ||
685 | NetworkManagerArch.c NetworkManagerPaldo.c \ | ||
686 | NetworkManagerFrugalware.c NetworkManagerMandriva.c \ | ||
687 | NetworkManagerPardus.c NetworkManagerLinexa.c \ | ||
688 | - NetworkManagerExherbo.c | ||
689 | + NetworkManagerExherbo.c NetworkManagerMagellan.c | ||
690 | @TARGET_REDHAT_TRUE@am__objects_1 = \ | ||
691 | @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo | ||
692 | @TARGET_SUSE_TRUE@am__objects_2 = \ | ||
693 | @@ -97,11 +98,14 @@ | ||
694 | @TARGET_LINEXA_TRUE@ libnmbackend_la-NetworkManagerLinexa.lo | ||
695 | @TARGET_EXHERBO_TRUE@am__objects_12 = \ | ||
696 | @TARGET_EXHERBO_TRUE@ libnmbackend_la-NetworkManagerExherbo.lo | ||
697 | +@TARGET_MAGELLAN_TRUE@am__objects_13 = \ | ||
698 | +@TARGET_MAGELLAN_TRUE@ libnmbackend_la-NetworkManagerMagellan.lo | ||
699 | am_libnmbackend_la_OBJECTS = libnmbackend_la-NetworkManagerGeneric.lo \ | ||
700 | $(am__objects_1) $(am__objects_2) $(am__objects_3) \ | ||
701 | $(am__objects_4) $(am__objects_5) $(am__objects_6) \ | ||
702 | $(am__objects_7) $(am__objects_8) $(am__objects_9) \ | ||
703 | - $(am__objects_10) $(am__objects_11) $(am__objects_12) | ||
704 | + $(am__objects_10) $(am__objects_11) $(am__objects_12) \ | ||
705 | + $(am__objects_13) | ||
706 | libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS) | ||
707 | AM_V_lt = $(am__v_lt_$(V)) | ||
708 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||
709 | @@ -336,7 +340,7 @@ | ||
710 | $(am__append_3) $(am__append_4) $(am__append_5) \ | ||
711 | $(am__append_6) $(am__append_7) $(am__append_8) \ | ||
712 | $(am__append_10) $(am__append_11) $(am__append_12) \ | ||
713 | - $(am__append_13) | ||
714 | + $(am__append_13) $(am__append_14) | ||
715 | libnmbackend_la_LIBADD = $(am__append_9) \ | ||
716 | $(top_builddir)/src/logging/libnm-logging.la $(LIBNL_LIBS) \ | ||
717 | $(DBUS_LIBS) $(GLIB_LIBS) | ||
718 | @@ -407,6 +411,7 @@ | ||
719 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo@am__quote@ | ||
720 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo@am__quote@ | ||
721 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo@am__quote@ | ||
722 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo@am__quote@ | ||
723 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Plo@am__quote@ | ||
724 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo@am__quote@ | ||
725 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo@am__quote@ | ||
726 | @@ -474,6 +479,14 @@ | ||
727 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
728 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerGentoo.lo `test -f 'NetworkManagerGentoo.c' || echo '$(srcdir)/'`NetworkManagerGentoo.c | ||
729 | |||
730 | +libnmbackend_la-NetworkManagerMagellan.lo: NetworkManagerMagellan.c | ||
731 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerMagellan.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Tpo -c -o libnmbackend_la-NetworkManagerMagellan.lo `test -f 'NetworkManagerMagellan.c' || echo '$(srcdir)/'`NetworkManagerMagellan.c | ||
732 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo | ||
733 | +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | ||
734 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='NetworkManagerMagellan.c' object='libnmbackend_la-NetworkManagerMagellan.lo' libtool=yes @AMDEPBACKSLASH@ | ||
735 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | ||
736 | +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerMagellan.lo `test -f 'NetworkManagerMagellan.c' || echo '$(srcdir)/'`NetworkManagerMagellan.c | ||
737 | + | ||
738 | libnmbackend_la-NetworkManagerDebian.lo: NetworkManagerDebian.c | ||
739 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerDebian.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo -c -o libnmbackend_la-NetworkManagerDebian.lo `test -f 'NetworkManagerDebian.c' || echo '$(srcdir)/'`NetworkManagerDebian.c | ||
740 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Plo | ||
741 | diff -Naur NetworkManager-0.8.5.91/src/backends/NetworkManagerMagellan.c NetworkManager-0.8.5.91-magellan/src/backends/NetworkManagerMagellan.c | ||
742 | --- NetworkManager-0.8.5.91/src/backends/NetworkManagerMagellan.c 1970-01-01 01:00:00.000000000 +0100 | ||
743 | +++ NetworkManager-0.8.5.91-magellan/src/backends/NetworkManagerMagellan.c 2011-07-22 03:53:03.000000000 +0200 | ||
744 | @@ -0,0 +1,90 @@ | ||
745 | +/* NetworkManager -- Network link manager | ||
746 | + * | ||
747 | + * Backend implementation for the Magellan Linux distribution http://www.magellan-linux.de | ||
748 | + * | ||
749 | + * Niels Rogalla <niro@magellan-linux.de> | ||
750 | + * | ||
751 | + * Heavily based on NetworkManagerGentoo.c by Robert Paskowitz | ||
752 | + * | ||
753 | + * Dan Williams <dcbw@redhat.com> | ||
754 | + * Dan Willemsen <dan@willemsen.us> | ||
755 | + * Robert Paskowitz | ||
756 | + * | ||
757 | + * This program is free software; you can redistribute it and/or modify | ||
758 | + * it under the terms of the GNU General Public License as published by | ||
759 | + * the Free Software Foundation; either version 2 of the License, or | ||
760 | + * (at your option) any later version. | ||
761 | + * | ||
762 | + * This program is distributed in the hope that it will be useful, | ||
763 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
764 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
765 | + * GNU General Public License for more details. | ||
766 | + * | ||
767 | + * You should have received a copy of the GNU General Public License along | ||
768 | + * with this program; if not, write to the Free Software Foundation, Inc., | ||
769 | + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
770 | + * | ||
771 | + * (C) Copyright 2004 Red Hat, Inc. | ||
772 | + * (C) Copyright 2004 Dan Willemsen | ||
773 | + * (C) Copyright 2004 Robert Paskowitz | ||
774 | + */ | ||
775 | + | ||
776 | +#ifdef HAVE_CONFIG_H | ||
777 | +#include <config.h> | ||
778 | +#endif | ||
779 | + | ||
780 | +#include <stdio.h> | ||
781 | +#include <string.h> | ||
782 | +#include <stdlib.h> | ||
783 | +#include <gio/gio.h> | ||
784 | + | ||
785 | +#include "NetworkManagerGeneric.h" | ||
786 | +#include "nm-system.h" | ||
787 | +#include "NetworkManagerUtils.h" | ||
788 | +#include "nm-logging.h" | ||
789 | + | ||
790 | +#define BUFFER_SIZE 512 | ||
791 | + | ||
792 | +static void sysvinit_start_lo_if_necessary() | ||
793 | +{ | ||
794 | + /* No need to run net.lo if it is already running */ | ||
795 | + if (nm_spawn_process ("/etc/rc.d/init.d/localnet status") != 0) | ||
796 | + nm_spawn_process ("/etc/rc.d/init.d/localnet start"); | ||
797 | +} | ||
798 | + | ||
799 | +/* | ||
800 | + * nm_system_enable_loopback | ||
801 | + * | ||
802 | + * Bring up the loopback interface | ||
803 | + * | ||
804 | + */ | ||
805 | +void nm_system_enable_loopback (void) | ||
806 | +{ | ||
807 | + gchar *comm; | ||
808 | + | ||
809 | + if (g_strstr_len (comm, -1, "systemd")) { | ||
810 | + /* We use the generic loopback enabler if using systemd. */ | ||
811 | + nm_log_info (LOGD_CORE, "NetworkManager is running with systemd..."); | ||
812 | + nm_generic_enable_loopback (); | ||
813 | + } else { | ||
814 | + /* SySVInit otherwise. */ | ||
815 | + nm_log_info (LOGD_CORE, "NetworkManager is running with SySVInit..."); | ||
816 | + sysvinit_start_lo_if_necessary(); | ||
817 | + } | ||
818 | +} | ||
819 | + | ||
820 | +/* | ||
821 | + * nm_system_update_dns | ||
822 | + * | ||
823 | + * Make glibc/nscd aware of any changes to the resolv.conf file by | ||
824 | + * restarting nscd. Only restart if already running. | ||
825 | + * | ||
826 | + */ | ||
827 | +void nm_system_update_dns (void) | ||
828 | +{ | ||
829 | + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { | ||
830 | + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); | ||
831 | + nm_spawn_process ("/usr/sbin/nscd -i hosts"); | ||
832 | + } | ||
833 | +} | ||
834 | + | ||
835 | diff -Naur NetworkManager-0.8.5.91/src/dhcp-manager/nm-dhcp-dhclient.c NetworkManager-0.8.5.91-magellan/src/dhcp-manager/nm-dhcp-dhclient.c | ||
836 | --- NetworkManager-0.8.5.91/src/dhcp-manager/nm-dhcp-dhclient.c 2011-07-19 23:40:28.000000000 +0200 | ||
837 | +++ NetworkManager-0.8.5.91-magellan/src/dhcp-manager/nm-dhcp-dhclient.c 2011-07-22 03:56:22.000000000 +0200 | ||
838 | @@ -357,7 +357,7 @@ | ||
839 | |||
840 | #if defined(TARGET_SUSE) | ||
841 | orig = g_strdup (SYSCONFDIR "/dhclient.conf"); | ||
842 | -#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) | ||
843 | +#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN) | ||
844 | #if defined(DHCLIENT_V3) | ||
845 | orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf"); | ||
846 | #else | ||
847 | @@ -372,7 +372,7 @@ | ||
848 | return FALSE; | ||
849 | } | ||
850 | |||
851 | -#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO) | ||
852 | +#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO) && !defined(TARGET_MAGELLAN) | ||
853 | /* Try /etc/dhcp/ too (rh #607759) */ | ||
854 | if (!g_file_test (orig, G_FILE_TEST_EXISTS)) { | ||
855 | g_free (orig); |