Magellan Linux

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

    Annotation of /trunk/networkmanager/patches/networkmanager-0.9.6.0-magellan.patch

    Parent Directory Parent Directory | Revision Log Revision Log

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