r52445 - in /desktop/unstable/gnome-control-center/debian: changelog patches/git_allow_empty_ip4_gateway.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Tue May 30 20:52:38 2017
New Revision: 52445

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52445
Log:
* Add debian/patches/git_allow_empty_ip4_gateway.patch
  - Allow entering manual ipv4 configuration *without* a gateway.
    (Cherry-picked from upstream commit 898d0aa4e9780078ff3)
    Closes: #863595 (see also bgo: #708500)

Added:
    desktop/unstable/gnome-control-center/debian/patches/git_allow_empty_ip4_gateway.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=52445&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Tue May 30 20:52:38 2017
@@ -1,3 +1,12 @@
+gnome-control-center (1:3.22.2-3) unstable; urgency=medium
+
+  * Add debian/patches/git_allow_empty_ip4_gateway.patch
+    - Allow entering manual ipv4 configuration *without* a gateway.
+      (Cherry-picked from upstream commit 898d0aa4e9780078ff3)
+      Closes: #863595 (see also bgo: #708500)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 30 May 2017 22:29:04 +0200
+
 gnome-control-center (1:3.22.2-2) unstable; urgency=medium
 
   * Remove leftover Build-Depends on network-manager-dev, libnm-util-dev and

Added: desktop/unstable/gnome-control-center/debian/patches/git_allow_empty_ip4_gateway.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/git_allow_empty_ip4_gateway.patch?rev=52445&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/git_allow_empty_ip4_gateway.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/git_allow_empty_ip4_gateway.patch	[utf-8] Tue May 30 20:52:38 2017
@@ -0,0 +1,38 @@
+From 898d0aa4e9780078ff3f978a2e439e4a2b85e682 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Wed, 12 Oct 2016 13:27:43 +0200
+Subject: network: allow empty ip4 default gateway
+
+Null-checking the text_gateway makes no sense as it has already been
+dereferenced earlier. Instead check if it's the empty string and
+treat that as not-an-error. Also prevent the empty string from
+being set in default_gateway.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=708500
+---
+ panels/network/connection-editor/ce-page-ip4.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
+index 502408a..9450029 100644
+--- a/panels/network/connection-editor/ce-page-ip4.c
++++ b/panels/network/connection-editor/ce-page-ip4.c
+@@ -765,12 +765,13 @@ ui_to_setting (CEPageIP4 *page)
+                 }
+ 
+                 if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry)) &&
+-                    text_gateway && !nm_utils_ipaddr_valid (AF_INET, text_gateway)) {
++                    *text_gateway &&
++                    !nm_utils_ipaddr_valid (AF_INET, text_gateway)) {
+                         widget_set_error (g_object_get_data (G_OBJECT (row), "gateway"));
+                         ret = FALSE;
+                 } else {
+                          widget_unset_error (GTK_WIDGET (gateway_entry));
+-                         if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry))) {
++                         if (gtk_widget_is_visible (GTK_WIDGET (gateway_entry)) && *text_gateway) {
+                                  g_assert (default_gateway == NULL);
+                                  default_gateway = text_gateway;
+                          }
+-- 
+cgit v0.12
+

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=52445&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Tue May 30 20:52:38 2017
@@ -2,3 +2,4 @@
 06_handle_passwd_with_ldap.patch
 07_polkit_wheel_sudo_group.patch
 info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch
+git_allow_empty_ip4_gateway.patch