summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--networkmanager/.footprint.i68610
-rw-r--r--networkmanager/.footprint.x86_6410
-rw-r--r--networkmanager/.md5sum.i6862
-rw-r--r--networkmanager/.md5sum.x86_642
-rw-r--r--networkmanager/NuTyX.patch71
-rw-r--r--networkmanager/Pkgfile15
6 files changed, 87 insertions, 23 deletions
diff --git a/networkmanager/.footprint.i686 b/networkmanager/.footprint.i686
index ab10bc45c..61e1979c8 100644
--- a/networkmanager/.footprint.i686
+++ b/networkmanager/.footprint.i686
@@ -6,10 +6,10 @@ drwxr-xr-x root/root etc/NetworkManager/dispatcher.d/
drwxr-xr-x root/root etc/NetworkManager/system-connections/
drwxr-xr-x root/root etc/dbus-1/
drwxr-xr-x root/root etc/dbus-1/system.d/
--rw-r--r-- root/root etc/dbus-1/system.d/NetworkManager.conf
-rw-r--r-- root/root etc/dbus-1/system.d/nm-avahi-autoipd.conf
-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/
@@ -26,21 +26,25 @@ drwxr-xr-x root/root usr/include/NetworkManager/
-rw-r--r-- root/root usr/include/NetworkManager/nm-connection.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-8021x.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bluetooth.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bond.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-cdma.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-connection.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-gsm.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-infiniband.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-ip4-config.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-ip6-config.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-olpc-mesh.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-ppp.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-pppoe.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-serial.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-vlan.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-vpn.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wimax.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wired.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wireless-security.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wireless.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-utils-enum-types.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-utils.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-version.h
drwxr-xr-x root/root usr/include/libnm-glib/
@@ -50,12 +54,15 @@ drwxr-xr-x root/root usr/include/libnm-glib/
-rw-r--r-- root/root usr/include/libnm-glib/nm-client.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-bt.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-ethernet.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-device-infiniband.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-modem.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-device-olpc-mesh.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-wifi.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-wimax.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-dhcp4-config.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-dhcp6-config.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-glib-enum-types.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-ip4-config.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-ip6-config.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-object.h
@@ -64,6 +71,7 @@ drwxr-xr-x root/root usr/include/libnm-glib/
-rw-r--r-- root/root usr/include/libnm-glib/nm-secret-agent.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-types.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-connection.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-enum-types.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-plugin-ui-interface.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-plugin-utils.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-plugin.h
diff --git a/networkmanager/.footprint.x86_64 b/networkmanager/.footprint.x86_64
index ab10bc45c..61e1979c8 100644
--- a/networkmanager/.footprint.x86_64
+++ b/networkmanager/.footprint.x86_64
@@ -6,10 +6,10 @@ drwxr-xr-x root/root etc/NetworkManager/dispatcher.d/
drwxr-xr-x root/root etc/NetworkManager/system-connections/
drwxr-xr-x root/root etc/dbus-1/
drwxr-xr-x root/root etc/dbus-1/system.d/
--rw-r--r-- root/root etc/dbus-1/system.d/NetworkManager.conf
-rw-r--r-- root/root etc/dbus-1/system.d/nm-avahi-autoipd.conf
-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/
@@ -26,21 +26,25 @@ drwxr-xr-x root/root usr/include/NetworkManager/
-rw-r--r-- root/root usr/include/NetworkManager/nm-connection.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-8021x.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bluetooth.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-bond.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-cdma.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-connection.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-gsm.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-infiniband.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-ip4-config.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-ip6-config.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-olpc-mesh.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-ppp.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-pppoe.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-serial.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-vlan.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-vpn.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wimax.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wired.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wireless-security.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting-wireless.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-setting.h
+-rw-r--r-- root/root usr/include/NetworkManager/nm-utils-enum-types.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-utils.h
-rw-r--r-- root/root usr/include/NetworkManager/nm-version.h
drwxr-xr-x root/root usr/include/libnm-glib/
@@ -50,12 +54,15 @@ drwxr-xr-x root/root usr/include/libnm-glib/
-rw-r--r-- root/root usr/include/libnm-glib/nm-client.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-bt.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-ethernet.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-device-infiniband.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-modem.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-device-olpc-mesh.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-wifi.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device-wimax.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-device.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-dhcp4-config.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-dhcp6-config.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-glib-enum-types.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-ip4-config.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-ip6-config.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-object.h
@@ -64,6 +71,7 @@ drwxr-xr-x root/root usr/include/libnm-glib/
-rw-r--r-- root/root usr/include/libnm-glib/nm-secret-agent.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-types.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-connection.h
+-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-enum-types.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-plugin-ui-interface.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-plugin-utils.h
-rw-r--r-- root/root usr/include/libnm-glib/nm-vpn-plugin.h
diff --git a/networkmanager/.md5sum.i686 b/networkmanager/.md5sum.i686
index e87189ac0..5a1a54bc2 100644
--- a/networkmanager/.md5sum.i686
+++ b/networkmanager/.md5sum.i686
@@ -1,2 +1,2 @@
-d7dce01e97758253bc4ed81d7b86045f NetworkManager-0.9.2.0.tar.xz
+c3eaf1fc69a52849b63ede382c7ec975 NetworkManager-0.9.3.995.tar.xz
8c44f3ee42fff5fa1389548f5727d551 NuTyX.patch
diff --git a/networkmanager/.md5sum.x86_64 b/networkmanager/.md5sum.x86_64
index e87189ac0..5a1a54bc2 100644
--- a/networkmanager/.md5sum.x86_64
+++ b/networkmanager/.md5sum.x86_64
@@ -1,2 +1,2 @@
-d7dce01e97758253bc4ed81d7b86045f NetworkManager-0.9.2.0.tar.xz
+c3eaf1fc69a52849b63ede382c7ec975 NetworkManager-0.9.3.995.tar.xz
8c44f3ee42fff5fa1389548f5727d551 NuTyX.patch
diff --git a/networkmanager/NuTyX.patch b/networkmanager/NuTyX.patch
index c9758cf61..d7fee4c18 100644
--- a/networkmanager/NuTyX.patch
+++ b/networkmanager/NuTyX.patch
@@ -1,6 +1,6 @@
--- b/config.h.in 2011-05-07 13:34:44.000000000 +1000
+++ a/config.h.in 2011-05-07 13:34:44.000000000 +1000
-@@ -174,6 +174,9 @@
+@@ -177,6 +177,9 @@
/* Define if you have Gentoo */
#undef TARGET_GENTOO
@@ -33,12 +33,12 @@
exit 1
else
case $with_distro in
-- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
-+ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|nutyx) ;;
+- 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) ;;
*)
echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
exit 1
-@@ -200,6 +201,11 @@
+@@ -205,6 +206,11 @@
AC_DEFINE(TARGET_EXHERBO, 1, [Define if you have Exherbo])
fi
@@ -52,7 +52,7 @@
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
-@@ -61,6 +61,10 @@
+@@ -64,6 +64,10 @@
libnmbackend_la_SOURCES += NetworkManagerExherbo.c
endif
@@ -65,7 +65,7 @@
$(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,63 @@
+@@ -0,0 +1,107 @@
+/* NetworkManager -- Network link manager
+ *
+ * Jürg Billeter <juerg@paldo.org>
@@ -95,38 +95,81 @@
+#include <config.h>
+#endif
+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
++//#include <stdio.h>
++//#include <string.h>
++//#include <stdlib.h>
+
+#include "NetworkManagerGeneric.h"
-+#include "nm-system.h"
++//#include "nm-system.h"
+#include "NetworkManagerUtils.h"
+#include "nm-logging.h"
+
+/*
-+ * nm_system_enable_loopback
++ * nm_backend_enable_loopback
+ *
+ * Bring up the loopback interface
+ *
+ */
-+void nm_system_enable_loopback (void)
++void nm_backend_enable_loopback (void)
+{
+ nm_spawn_process ("/etc/rc.d/init.d/localnet restart");
+}
+
+/*
-+ * nm_system_update_dns
++ * nm_backend_update_dns
+ *
+ * Invalidate the nscd host cache, if it exists, since
+ * we changed resolv.conf.
+ *
+ */
-+void nm_system_update_dns (void)
++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");
+}
+
++/*
++ * 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;
++}
diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile
index bd28c73aa..067141abf 100644
--- a/networkmanager/Pkgfile
+++ b/networkmanager/Pkgfile
@@ -7,7 +7,7 @@
name=networkmanager
-version=0.9.2.0
+version=0.9.3.995
release=1
_name=NetworkManager
source=(http://ftp.gnome.org/pub/GNOME/sources/$_name/${version%.*.*}/$_name-$version.tar.xz
@@ -16,9 +16,13 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$_name/${version%.*.*}/$_name-$ve
build() {
cd ${_name}-$version
patch -p1 < ../NuTyX.patch
- aclocal
- autoconf
- automake
+# aclocal
+# autoconf
+# automake
+# autoreconf -if
+ gtkdocize
+ autopoint --force
+ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -32,7 +36,8 @@ build() {
--with-tests=yes \
--enable-polkit \
--enable-introspection=yes \
- --disable-wimax
+ --disable-wimax \
+ --disable-more-warnings
make
make DESTDIR=$PKG install