From 14c7f959af79188300f9314b2506b6ec5969287d Mon Sep 17 00:00:00 2001 From: piernov Date: Wed, 8 Aug 2012 12:17:55 +0200 Subject: networkmanager 0.9.6.0-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- networkmanager/.footprint.i686 | 7 +-- networkmanager/.footprint.x86_64 | 7 +-- networkmanager/.md5sum.i686 | 2 +- networkmanager/.md5sum.x86_64 | 2 +- networkmanager/NuTyX.patch | 133 ++++++++++++--------------------------- networkmanager/Pkgfile | 2 +- 6 files changed, 49 insertions(+), 104 deletions(-) diff --git a/networkmanager/.footprint.i686 b/networkmanager/.footprint.i686 index 21fc4d49e..93b815620 100644 --- a/networkmanager/.footprint.i686 +++ b/networkmanager/.footprint.i686 @@ -10,10 +10,6 @@ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/nm-dhcp-client.conf -rw-r--r-- root/root etc/dbus-1/system.d/nm-dispatcher.conf -rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf -drwxr-xr-x root/root lib/ -drwxr-xr-x root/root lib/udev/ -drwxr-xr-x root/root lib/udev/rules.d/ --rw-r--r-- root/root lib/udev/rules.d/77-nm-olpc-mesh.rules drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nm-online @@ -109,6 +105,9 @@ drwxr-xr-x root/root usr/lib/systemd/ drwxr-xr-x root/root usr/lib/systemd/system/ -rw-r--r-- root/root usr/lib/systemd/system/NetworkManager-wait-online.service -rw-r--r-- root/root usr/lib/systemd/system/NetworkManager.service +drwxr-xr-x root/root usr/lib/udev/ +drwxr-xr-x root/root usr/lib/udev/rules.d/ +-rw-r--r-- root/root usr/lib/udev/rules.d/77-nm-olpc-mesh.rules drwxr-xr-x root/root usr/libexec/ -rwxr-xr-x root/root usr/libexec/nm-avahi-autoipd.action -rwxr-xr-x root/root usr/libexec/nm-crash-logger diff --git a/networkmanager/.footprint.x86_64 b/networkmanager/.footprint.x86_64 index 21fc4d49e..93b815620 100644 --- a/networkmanager/.footprint.x86_64 +++ b/networkmanager/.footprint.x86_64 @@ -10,10 +10,6 @@ drwxr-xr-x root/root etc/dbus-1/system.d/ -rw-r--r-- root/root etc/dbus-1/system.d/nm-dhcp-client.conf -rw-r--r-- root/root etc/dbus-1/system.d/nm-dispatcher.conf -rw-r--r-- root/root etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf -drwxr-xr-x root/root lib/ -drwxr-xr-x root/root lib/udev/ -drwxr-xr-x root/root lib/udev/rules.d/ --rw-r--r-- root/root lib/udev/rules.d/77-nm-olpc-mesh.rules drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nm-online @@ -109,6 +105,9 @@ drwxr-xr-x root/root usr/lib/systemd/ drwxr-xr-x root/root usr/lib/systemd/system/ -rw-r--r-- root/root usr/lib/systemd/system/NetworkManager-wait-online.service -rw-r--r-- root/root usr/lib/systemd/system/NetworkManager.service +drwxr-xr-x root/root usr/lib/udev/ +drwxr-xr-x root/root usr/lib/udev/rules.d/ +-rw-r--r-- root/root usr/lib/udev/rules.d/77-nm-olpc-mesh.rules drwxr-xr-x root/root usr/libexec/ -rwxr-xr-x root/root usr/libexec/nm-avahi-autoipd.action -rwxr-xr-x root/root usr/libexec/nm-crash-logger diff --git a/networkmanager/.md5sum.i686 b/networkmanager/.md5sum.i686 index 05186719a..928e8a3af 100644 --- a/networkmanager/.md5sum.i686 +++ b/networkmanager/.md5sum.i686 @@ -1,2 +1,2 @@ -69507b5b2af1ad9b383a524d7cdb6c53 NetworkManager-0.9.5.95.tar.xz +85f9ed7fe08533a33c5117488f81e7ac NetworkManager-0.9.6.0.tar.xz 3e3ade1a28def9838b19605b85acf9bf NuTyX.patch diff --git a/networkmanager/.md5sum.x86_64 b/networkmanager/.md5sum.x86_64 index 05186719a..928e8a3af 100644 --- a/networkmanager/.md5sum.x86_64 +++ b/networkmanager/.md5sum.x86_64 @@ -1,2 +1,2 @@ -69507b5b2af1ad9b383a524d7cdb6c53 NetworkManager-0.9.5.95.tar.xz +85f9ed7fe08533a33c5117488f81e7ac NetworkManager-0.9.6.0.tar.xz 3e3ade1a28def9838b19605b85acf9bf NuTyX.patch diff --git a/networkmanager/NuTyX.patch b/networkmanager/NuTyX.patch index a50b51e2b..ef705e242 100644 --- a/networkmanager/NuTyX.patch +++ b/networkmanager/NuTyX.patch @@ -1,45 +1,47 @@ ---- b/config.h.in 2011-05-07 13:34:44.000000000 +1000 -+++ a/config.h.in 2011-05-07 13:34:44.000000000 +1000 -@@ -180,6 +180,9 @@ - /* Define if you have Gentoo */ - #undef TARGET_GENTOO +diff -u -r -N a/config.h.in b/config.h.in +--- a/config.h.in 2012-08-07 18:07:02.000000000 +0200 ++++ b/config.h.in 2012-08-08 02:26:19.950000001 +0200 +@@ -189,6 +189,9 @@ + /* Define if you have Mandriva */ + #undef TARGET_MANDRIVA +/* Define if you have NuTyX */ +#undef TARGET_NUTYX + - /* Define if you have linexa */ - #undef TARGET_LINEXA + /* Define if you have Paldo */ + #undef TARGET_PALDO ---- b/configure.ac 2011-05-07 13:34:44.000000000 +1000 -+++ a/configure.ac 2011-05-07 13:34:44.000000000 +1000 +diff -u -r -N a/configure.ac b/configure.ac +--- a/configure.ac 2012-08-07 18:06:40.000000000 +0200 ++++ b/configure.ac 2012-08-08 02:28:15.728000001 +0200 @@ -107,7 +107,7 @@ 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 or exherbo])) -+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 nutyx])) +-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 nutyx])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") -@@ -121,6 +121,7 @@ - AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus") +@@ -122,6 +122,7 @@ AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa") AC_CHECK_FILE(/etc/exherbo-release,with_distro="exherbo") + AC_CHECK_FILE(/etc/lfs-release,with_distro="lfs") + AC_CHECK_FILE(/etc/nutyx-version,with_distro="nutyx") if test "z$with_distro" = "z"; then with_distro=`lsb_release -is` fi -@@ -132,7 +133,7 @@ +@@ -133,7 +134,7 @@ exit 1 else case $with_distro in -- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic) ;; -+ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|generic|nutyx) ;; +- 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|nutyx|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]) +@@ -211,6 +212,11 @@ + AC_DEFINE(TARGET_LFS, 1, [Define if you have Linux From Scratch]) fi +AM_CONDITIONAL(TARGET_NUTYX, test x"$with_distro" = xnutyx) @@ -50,10 +52,11 @@ dnl dnl Distribution version string dnl ---- b/src/backends/Makefile.am 2011-05-07 13:34:44.000000000 +1000 -+++ a/src/backends/Makefile.am 2011-05-07 13:34:44.000000000 +1000 -@@ -64,6 +64,10 @@ - libnmbackend_la_SOURCES += NetworkManagerExherbo.c +diff -u -r -N a/src/backends/Makefile.am b/src/backends/Makefile.am +--- a/src/backends/Makefile.am 2012-08-02 22:41:52.000000000 +0200 ++++ b/src/backends/Makefile.am 2012-08-08 02:28:44.369000001 +0200 +@@ -68,6 +68,10 @@ + libnmbackend_la_SOURCES += NetworkManagerLFS.c endif +if TARGET_NUTYX @@ -63,14 +66,17 @@ libnmbackend_la_LIBADD += \ $(top_builddir)/src/logging/libnm-logging.la \ $(LIBNL_LIBS) \ ---- b/src/backends/NetworkManagerNuTyX.c 1970-01-01 10:00:00.000000000 +1000 -+++ a/src/backends/NetworkManagerNuTyX.c 2011-05-07 13:34:44.000000000 +1000 -@@ -0,0 +1,107 @@ +diff -u -r -N a/src/backends/NetworkManagerNuTyX.c b/src/backends/NetworkManagerNuTyX.c +--- a/src/backends/NetworkManagerNuTyX.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/src/backends/NetworkManagerNuTyX.c 2012-08-08 02:31:21.876000001 +0200 +@@ -0,0 +1,50 @@ +/* NetworkManager -- Network link manager + * -+ * Jürg Billeter ++ * Backend implementation for NuTyX, imported from Linux From Scratch http://www.linuxfromscratch.org/ ++ * ++ * Wayne Blaszczyk ++ * Armin K. + * -+ * Adapted for NuTyX by piernov + * Heavily based on NetworkManagerRedhat.c by Dan Williams + * + * This program is free software; you can redistribute it and/or modify @@ -87,89 +93,30 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * -+ * (C) Copyright 2004 Red Hat, Inc. -+ * (C) Copyright 2006 Jürg Billeter ++ * (C) Copyright 2004 Tom Parker ++ * (C) Copyright 2004 Matthew Garrett ++ * (C) Copyright 2004 - 2012 Red Hat, Inc. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + -+//#include -+//#include -+//#include -+ +#include "NetworkManagerGeneric.h" -+//#include "nm-system.h" +#include "NetworkManagerUtils.h" -+#include "nm-logging.h" + -+/* -+ * nm_backend_enable_loopback -+ * -+ * Bring up the loopback interface -+ * -+ */ +void nm_backend_enable_loopback (void) +{ -+ nm_spawn_process ("/etc/rc.d/init.d/localnet restart"); ++ 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("/var/run/nscd/nscd.pid", G_FILE_TEST_EXISTS)) -+ nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); -+ nm_spawn_process ("/usr/sbin/nscd -i hosts"); ++ if (g_file_test("/var/run/nscd/nscd.pid", G_FILE_TEST_EXISTS)) ++ nm_spawn_process ("/usr/sbin/nscd -i hosts"); +} + -+/* -+ * nm_backend_ipv6_use_tempaddr -+ * -+ * Get net.ipv6.conf.default.use_tempaddr value from /etc/sysctl.conf or -+ * /lib/sysctl.d/sysctl.conf -+ * -+ */ +int nm_backend_ipv6_use_tempaddr (void) +{ -+ char *contents = NULL; -+ gsize len = 0; -+ const char *group_name = "[forged_group]\n"; -+ char *sysctl_data = NULL; -+ GKeyFile *keyfile; -+ GError *error = NULL; -+ int tmp, ret = -1; -+ -+ /* Read file contents to a string. */ -+ if (!g_file_get_contents ("/etc/sysctl.conf", &contents, &len, NULL)) -+ if (!g_file_get_contents ("/lib/sysctl.d/sysctl.conf", &contents, &len, NULL)) -+ return -1; -+ -+ /* Prepend a group so that we can use GKeyFile parser. */ -+ sysctl_data = g_strdup_printf ("%s%s", group_name, contents); -+ -+ keyfile = g_key_file_new (); -+ if (keyfile == NULL) -+ goto done; -+ -+ if (!g_key_file_load_from_data (keyfile, sysctl_data, len + strlen (group_name), G_KEY_FILE_NONE, NULL)) -+ goto done; -+ -+ tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error); -+ if (error == NULL) -+ ret = tmp; -+ -+done: -+ g_free (contents); -+ g_free (sysctl_data); -+ g_clear_error (&error); -+ g_key_file_free (keyfile); -+ -+ return ret; ++ return nm_generic_ipv6_use_tempaddr (); +} diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile index 8f48ef81d..470c4bdc4 100644 --- a/networkmanager/Pkgfile +++ b/networkmanager/Pkgfile @@ -7,7 +7,7 @@ name=networkmanager -version=0.9.5.95 +version=0.9.6.0 release=1 _name=NetworkManager source=(http://ftp.gnome.org/pub/GNOME/sources/$_name/${version%.*.*}/$_name-$version.tar.xz -- cgit v1.2.3-70-g09d2