[Pkg-utopia-commits] r2426 - in /packages/experimental/networkmanager/debian: changelog control libnm-glib0.symbols patches/03-run-resolvconf.patch patches/series
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Tue Sep 30 17:21:44 UTC 2008
Author: smcv
Date: Tue Sep 30 17:21:44 2008
New Revision: 2426
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2426
Log:
* Newer tarball
* debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf
Added:
packages/experimental/networkmanager/debian/patches/03-run-resolvconf.patch
Modified:
packages/experimental/networkmanager/debian/changelog
packages/experimental/networkmanager/debian/control
packages/experimental/networkmanager/debian/libnm-glib0.symbols
packages/experimental/networkmanager/debian/patches/series
Modified: packages/experimental/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/changelog?rev=2426&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/changelog (original)
+++ packages/experimental/networkmanager/debian/changelog Tue Sep 30 17:21:44 2008
@@ -1,4 +1,4 @@
-network-manager (0.7.0~svn4004-1) UNRELEASED; urgency=low
+network-manager (0.7.0~svn4035-1) UNRELEASED; urgency=low
* SVN snapshot of the upcoming 0.7 release.
@@ -27,7 +27,11 @@
* debian/*.install: Updated
* debian/*.symbols: Added
- -- Michael Biebl <biebl at debian.org> Fri, 22 Aug 2008 21:53:54 +0200
+ [ Simon McVittie ]
+ * Newer tarball
+ * debian/patches/03-run-resolvconf.patch: Use (and depend on) resolvconf
+
+ -- Simon McVittie <smcv at debian.org> Thu, 04 Sep 2008 19:29:36 +0100
network-manager (0.6.6-1) unstable; urgency=low
Modified: packages/experimental/networkmanager/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/control?rev=2426&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/control (original)
+++ packages/experimental/networkmanager/debian/control Tue Sep 30 17:21:44 2008
@@ -14,7 +14,7 @@
Package: network-manager
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), wpasupplicant (>= 0.6.2-1), dbus (>= 1.1.2), hal (>= 0.5.7.1), ifupdown, adduser, resolvconf
Recommends: network-manager-gnome | network-manager-kde, policykit
Conflicts: network-manager-gnome (<< 0.6.5-1)
Suggests: avahi-autoipd
Modified: packages/experimental/networkmanager/debian/libnm-glib0.symbols
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/libnm-glib0.symbols?rev=2426&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/libnm-glib0.symbols (original)
+++ packages/experimental/networkmanager/debian/libnm-glib0.symbols Tue Sep 30 17:21:44 2008
@@ -80,7 +80,6 @@
nm_dhcp4_config_new at Base 0.7.0~svn3907
nm_exported_connection_delete at Base 0.7.0~svn3712
nm_exported_connection_get_connection at Base 0.7.0~svn3712
- nm_exported_connection_get_id at Base 0.7.0~svn3712
nm_exported_connection_get_type at Base 0.7.0~svn3712
nm_exported_connection_new at Base 0.7.0~svn3712
nm_exported_connection_register_object at Base 0.7.0~svn3712
Added: packages/experimental/networkmanager/debian/patches/03-run-resolvconf.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/03-run-resolvconf.patch?rev=2426&op=file
==============================================================================
--- packages/experimental/networkmanager/debian/patches/03-run-resolvconf.patch (added)
+++ packages/experimental/networkmanager/debian/patches/03-run-resolvconf.patch Tue Sep 30 17:21:44 2008
@@ -1,0 +1,138 @@
+Index: src/named-manager/nm-named-manager.c
+===================================================================
+--- NetworkManager/src/named-manager/nm-named-manager.c (revision 4035)
++++ NetworkManager/src/named-manager/nm-named-manager.c (working copy)
+@@ -189,6 +178,133 @@
+ return TRUE;
+ }
+
++#elif defined(TARGET_DEBIAN)
++
++static void
++resolvconf_child_setup (gpointer user_data G_GNUC_UNUSED)
++{
++ pid_t pid = getpid ();
++ setpgid (pid, pid);
++}
++
++static gint
++run_resolvconf (GError **error)
++{
++ char *argv[4];
++ gint stdin_fd;
++
++ argv[0] = "/sbin/resolvconf";
++ argv[1] = "-a";
++ argv[2] = "NetworkManager";
++ argv[3] = NULL;
++
++ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, resolvconf_child_setup,
++ NULL, NULL, &stdin_fd, NULL, NULL, error))
++ return -1;
++
++ return stdin_fd;
++}
++
++static gboolean
++update_resolv_conf (const char *iface,
++ const char *domain,
++ char **searches,
++ char **nameservers,
++ GError **error)
++{
++ gint fd;
++ char *domain_str = NULL;
++ char *searches_str = NULL;
++ char *nameservers_str = NULL;
++ FILE *f;
++
++ fd = run_resolvconf (error);
++ if (fd < 0)
++ return FALSE;
++
++ if ((f = fdopen (fd, "w")) == NULL) {
++ g_set_error (error,
++ NM_NAMED_MANAGER_ERROR,
++ NM_NAMED_MANAGER_ERROR_SYSTEM,
++ "Could not fdopen pipe to resolvconf: %s\n",
++ g_strerror (errno));
++ return FALSE;
++ }
++
++ if (fprintf (f, "%s","# generated by NetworkManager, do not edit!\n\n") < 0) {
++ g_set_error (error,
++ NM_NAMED_MANAGER_ERROR,
++ NM_NAMED_MANAGER_ERROR_SYSTEM,
++ "Could not write to resolvconf: %s\n",
++ g_strerror (errno));
++ fclose (f);
++ return FALSE;
++ }
++
++ if (domain)
++ domain_str = g_strconcat ("domain ", domain, "\n\n", NULL);
++
++ if (searches) {
++ char *tmp_str;
++
++ tmp_str = g_strjoinv (" ", searches);
++ searches_str = g_strconcat ("search ", tmp_str, "\n\n", NULL);
++ g_free (tmp_str);
++ }
++
++ if (nameservers) {
++ GString *str;
++ int num;
++ int i;
++
++ str = g_string_new ("");
++ num = g_strv_length (nameservers);
++
++ for (i = 0; i < num; i++) {
++ if (i == 3) {
++ g_string_append (str, "\n# ");
++ g_string_append (str, _("NOTE: the glibc resolver does not support more than 3 nameservers."));
++ g_string_append (str, "\n# ");
++ g_string_append (str, _("The nameservers listed below may not be recognized."));
++ g_string_append_c (str, '\n');
++ }
++
++ g_string_append (str, "nameserver ");
++ g_string_append (str, nameservers[i]);
++ g_string_append_c (str, '\n');
++ }
++
++ nameservers_str = g_string_free (str, FALSE);
++ }
++
++ if (fprintf (f, "%s%s%s\n",
++ domain_str ? domain_str : "",
++ searches_str ? searches_str : "",
++ nameservers_str ? nameservers_str : "") < 0) {
++ g_set_error (error,
++ NM_NAMED_MANAGER_ERROR,
++ NM_NAMED_MANAGER_ERROR_SYSTEM,
++ "Could not write to resolvconf: %s\n",
++ g_strerror (errno));
++ }
++
++ g_free (domain_str);
++ g_free (searches_str);
++ g_free (nameservers_str);
++
++ if (fclose (f) < 0) {
++ if (*error == NULL) {
++ g_set_error (error,
++ NM_NAMED_MANAGER_ERROR,
++ NM_NAMED_MANAGER_ERROR_SYSTEM,
++ "Could not close pipe to resolvconf: %s\n",
++ g_strerror (errno));
++ }
++ }
++
++ return *error ? FALSE : TRUE;
++}
++
+ #else
+ /**********************************/
+ /* Generic */
Modified: packages/experimental/networkmanager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/networkmanager/debian/patches/series?rev=2426&op=diff
==============================================================================
--- packages/experimental/networkmanager/debian/patches/series (original)
+++ packages/experimental/networkmanager/debian/patches/series Tue Sep 30 17:21:44 2008
@@ -1,1 +1,2 @@
02-dbus_access_network_manager.patch
+03-run-resolvconf.patch
More information about the Pkg-utopia-commits
mailing list