Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/networkmanager/patches/networkmanager-0.9.4.0-magellan-2.patch

    Annotation of /trunk/networkmanager/patches/networkmanager-0.9.4.0-magellan-2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1755 - (hide annotations) (download)
    Wed Apr 25 22:35:02 2012 UTC (12 years, 1 month ago) by niro
    File size: 11480 byte(s) 
    -fixed patch
    1 niro 1755 diff -Naur NetworkManager-0.9.4.0/config.h.in NetworkManager-0.9.4.0-magellan/config.h.in
    2     --- NetworkManager-0.9.4.0/config.h.in 2012-04-26 01:28:13.456982523 +0200
    3     +++ NetworkManager-0.9.4.0-magellan/config.h.in 2012-03-23 21:11:38.000000000 +0100
    4     @@ -183,9 +183,6 @@
    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.9.4.0/configure.ac NetworkManager-0.9.4.0-magellan/configure.ac
    15     --- NetworkManager-0.9.4.0/configure.ac 2012-04-26 01:28:13.456982523 +0200
    16     +++ NetworkManager-0.9.4.0-magellan/configure.ac 2012-03-23 21:11:15.000000000 +0100
    17     @@ -107,13 +107,12 @@
    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, magellan, 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, 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     @@ -133,7 +132,7 @@
    33     exit 1
    34     else
    35     case $with_distro in
    36     - redhat|suse|gentoo|magellan|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;;
    37     + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;;
    38     *)
    39     echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
    40     exit 1
    41     @@ -161,11 +160,6 @@
    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     diff -Naur NetworkManager-0.9.4.0/src/backends/Makefile.am NetworkManager-0.9.4.0-magellan/src/backends/Makefile.am
    54     --- NetworkManager-0.9.4.0/src/backends/Makefile.am 2012-04-26 01:28:13.456982523 +0200
    55     +++ NetworkManager-0.9.4.0-magellan/src/backends/Makefile.am 2012-02-27 16:57:16.000000000 +0100
    56     @@ -27,10 +27,6 @@
    57     libnmbackend_la_SOURCES += NetworkManagerGentoo.c
    58     endif
    59    
    60     -if TARGET_MAGELLAN
    61     -libnmbackend_la_SOURCES += NetworkManagerMagellan.c
    62     -endif
    63     -
    64     if TARGET_DEBIAN
    65     libnmbackend_la_SOURCES += NetworkManagerDebian.c
    66     endif
    67     diff -Naur NetworkManager-0.9.4.0/src/backends/Makefile.in NetworkManager-0.9.4.0-magellan/src/backends/Makefile.in
    68     --- NetworkManager-0.9.4.0/src/backends/Makefile.in 2012-04-26 01:28:13.457982523 +0200
    69     +++ NetworkManager-0.9.4.0-magellan/src/backends/Makefile.in 2012-03-23 21:11:29.000000000 +0100
    70     @@ -47,7 +47,6 @@
    71     @TARGET_PARDUS_TRUE@am__append_11 = NetworkManagerPardus.c
    72     @TARGET_LINEXA_TRUE@am__append_12 = NetworkManagerLinexa.c
    73     @TARGET_EXHERBO_TRUE@am__append_13 = NetworkManagerExherbo.c
    74     -@TARGET_MAGELLAN_TRUE@am__append_14 = NetworkManagerMagellan.c
    75     subdir = src/backends
    76     DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    77     ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    78     @@ -81,7 +80,7 @@
    79     NetworkManagerArch.c NetworkManagerPaldo.c \
    80     NetworkManagerFrugalware.c NetworkManagerMandriva.c \
    81     NetworkManagerPardus.c NetworkManagerLinexa.c \
    82     - NetworkManagerExherbo.c NetworkManagerMagellan.c
    83     + NetworkManagerExherbo.c
    84     @TARGET_REDHAT_TRUE@am__objects_1 = \
    85     @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo
    86     @TARGET_SUSE_TRUE@am__objects_2 = \
    87     @@ -103,14 +102,11 @@
    88     @TARGET_LINEXA_TRUE@ libnmbackend_la-NetworkManagerLinexa.lo
    89     @TARGET_EXHERBO_TRUE@am__objects_12 = \
    90     @TARGET_EXHERBO_TRUE@ libnmbackend_la-NetworkManagerExherbo.lo
    91     -@TARGET_MAGELLAN_TRUE@am__objects_13 = \
    92     -@TARGET_MAGELLAN_TRUE@ libnmbackend_la-NetworkManagerMagellan.lo
    93     am_libnmbackend_la_OBJECTS = libnmbackend_la-NetworkManagerGeneric.lo \
    94     $(am__objects_1) $(am__objects_2) $(am__objects_3) \
    95     $(am__objects_4) $(am__objects_5) $(am__objects_6) \
    96     $(am__objects_7) $(am__objects_8) $(am__objects_9) \
    97     - $(am__objects_10) $(am__objects_11) $(am__objects_12) \
    98     - $(am__objects_13)
    99     + $(am__objects_10) $(am__objects_11) $(am__objects_12)
    100     libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS)
    101     AM_V_lt = $(am__v_lt_$(V))
    102     am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
    103     @@ -385,7 +381,7 @@
    104     $(am__append_2) $(am__append_3) $(am__append_4) \
    105     $(am__append_5) $(am__append_6) $(am__append_7) \
    106     $(am__append_8) $(am__append_10) $(am__append_11) \
    107     - $(am__append_12) $(am__append_13) $(am__append_14)
    108     + $(am__append_12) $(am__append_13)
    109     libnmbackend_la_LIBADD = $(am__append_9) \
    110     $(top_builddir)/src/logging/libnm-logging.la $(LIBNL_LIBS) \
    111     $(DBUS_LIBS) $(GLIB_LIBS)
    112     @@ -456,7 +452,6 @@
    113     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo@am__quote@
    114     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGeneric.Plo@am__quote@
    115     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerGentoo.Plo@am__quote@
    116     -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo@am__quote@
    117     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerLinexa.Plo@am__quote@
    118     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerMandriva.Plo@am__quote@
    119     @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerPaldo.Plo@am__quote@
    120     @@ -524,14 +519,6 @@
    121     @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    122     @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
    123    
    124     -libnmbackend_la-NetworkManagerMagellan.lo: NetworkManagerMagellan.c
    125     -@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
    126     -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerMagellan.Plo
    127     -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
    128     -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='NetworkManagerMagellan.c' object='libnmbackend_la-NetworkManagerMagellan.lo' libtool=yes @AMDEPBACKSLASH@
    129     -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    130     -@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
    131     -
    132     libnmbackend_la-NetworkManagerDebian.lo: NetworkManagerDebian.c
    133     @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
    134     @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerDebian.Plo
    135     diff -Naur NetworkManager-0.9.4.0/src/backends/NetworkManagerMagellan.c NetworkManager-0.9.4.0-magellan/src/backends/NetworkManagerMagellan.c
    136     --- NetworkManager-0.9.4.0/src/backends/NetworkManagerMagellan.c 2012-04-26 01:31:47.318982524 +0200
    137     +++ NetworkManager-0.9.4.0-magellan/src/backends/NetworkManagerMagellan.c 1970-01-01 01:00:00.000000000 +0100
    138     @@ -1,50 +0,0 @@
    139     -/* NetworkManager -- Network link manager
    140     - *
    141     - * Backend implementation for the Magellan Linux distribution http://www.magellan-linux.de
    142     - *
    143     - * Niels Rogalla <niro@magellan-linux.de>
    144     - * Dan Williams <dcbw@redhat.com>
    145     - *
    146     - * This program is free software; you can redistribute it and/or modify
    147     - * it under the terms of the GNU General Public License as published by
    148     - * the Free Software Foundation; either version 2 of the License, or
    149     - * (at your option) any later version.
    150     - *
    151     - * This program is distributed in the hope that it will be useful,
    152     - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    153     - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    154     - * GNU General Public License for more details.
    155     - *
    156     - * You should have received a copy of the GNU General Public License along
    157     - * with this program; if not, write to the Free Software Foundation, Inc.,
    158     - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
    159     - *
    160     - * (C) Copyright 2004 - 2012 Red Hat, Inc.
    161     - */
    162     -
    163     -#ifdef HAVE_CONFIG_H
    164     -#include <config.h>
    165     -#endif
    166     -
    167     -#include "NetworkManagerGeneric.h"
    168     -#include "NetworkManagerUtils.h"
    169     -
    170     -void nm_backend_enable_loopback (void)
    171     -{
    172     - nm_generic_enable_loopback ();
    173     -}
    174     -
    175     -void nm_backend_update_dns (void)
    176     -{
    177     - /* Invalidate the nscd host cache since we changed resolv.conf */
    178     - if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) {
    179     - nm_spawn_process ("/etc/init.d/nscd condrestart");
    180     - nm_spawn_process ("/usr/sbin/nscd -i hosts");
    181     - }
    182     -}
    183     -
    184     -int nm_backend_ipv6_use_tempaddr (void)
    185     -{
    186     - return nm_generic_ipv6_use_tempaddr ();
    187     -}
    188     -
    189     diff -Naur NetworkManager-0.9.4.0/src/dhcp-manager/nm-dhcp-dhclient.c NetworkManager-0.9.4.0-magellan/src/dhcp-manager/nm-dhcp-dhclient.c
    190     --- NetworkManager-0.9.4.0/src/dhcp-manager/nm-dhcp-dhclient.c 2012-04-26 01:28:13.457982523 +0200
    191     +++ NetworkManager-0.9.4.0-magellan/src/dhcp-manager/nm-dhcp-dhclient.c 2012-02-08 17:44:52.000000000 +0100
    192     @@ -357,7 +357,7 @@
    193    
    194     #if defined(TARGET_SUSE)
    195     orig = g_strdup (SYSCONFDIR "/dhclient.conf");
    196     -#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO) || defined(TARGET_MAGELLAN)
    197     +#elif defined(TARGET_DEBIAN) || defined(TARGET_GENTOO)
    198     #if defined(DHCLIENT_V3)
    199     orig = g_strdup (SYSCONFDIR "/dhcp3/dhclient.conf");
    200     #else
    201     @@ -372,7 +372,7 @@
    202     return NULL;
    203     }
    204    
    205     -#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO) && !defined(TARGET_MAGELLAN)
    206     +#if !defined(TARGET_SUSE) && !defined(TARGET_DEBIAN) && !defined(TARGET_GENTOO)
    207     /* Try /etc/dhcp/ too (rh #607759) */
    208     if (!g_file_test (orig, G_FILE_TEST_EXISTS)) {
    209     g_free (orig);