diff options
Diffstat (limited to 'debian')
11 files changed, 30 insertions, 64 deletions
diff --git a/debian/changelog b/debian/changelog index 9f00d57a..047bf35d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ network-manager (1.0.8-1) UNRELEASED; urgency=medium * New upstream release. - MTU indicated by a VPN gateway is now properly applied. (Closes: #794237) + * Rebase patches. -- Michael Biebl <biebl@debian.org> Tue, 24 Nov 2015 00:06:51 +0100 diff --git a/debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch b/debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch index 546d20e1..0071c65a 100644 --- a/debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch +++ b/debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch @@ -20,7 +20,7 @@ for network.target. 1 file changed, 2 deletions(-) diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index b2e61ff..1883b40 100644 +index 980573d..9312122 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -1,7 +1,5 @@ diff --git a/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch b/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch index 4a1591ce..f78ae632 100644 --- a/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch +++ b/debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch @@ -19,7 +19,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=746039 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am -index 3f628be..ddaafee 100644 +index 4ab4106..bbe6b32 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,10 +18,6 @@ endif diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch index 4379a993..a41474ee 100644 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch @@ -10,7 +10,7 @@ to be autostarted by a client request. 2 files changed, 8 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am -index 64ff337..3f628be 100644 +index ce059fc..4ab4106 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -19,13 +19,6 @@ endif @@ -28,10 +28,10 @@ index 64ff337..3f628be 100644 install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 1883b40..5282e5b 100644 +index 9312122..aae09ba 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in -@@ -11,6 +11,5 @@ KillMode=process +@@ -12,6 +12,5 @@ KillMode=process [Install] WantedBy=multi-user.target diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch index 1b57943b..8f6b1aa2 100644 --- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch @@ -18,7 +18,7 @@ Closes: #742933 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 74dacb6..cf4ec63 100644 +index 9c461ab..847ddc3 100644 --- a/configure.ac +++ b/configure.ac @@ -384,8 +384,9 @@ fi @@ -33,10 +33,10 @@ index 74dacb6..cf4ec63 100644 *) AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd]) diff --git a/src/Makefile.am b/src/Makefile.am -index 7339058..7614cad 100644 +index e8279e7..ecde266 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -421,6 +421,7 @@ AM_CPPFLAGS += \ +@@ -423,6 +423,7 @@ AM_CPPFLAGS += \ $(LIBNDP_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ @@ -44,7 +44,7 @@ index 7339058..7614cad 100644 $(SYSTEMD_DHCP_CFLAGS) \ \ -DBINDIR=\"$(bindir)\" \ -@@ -459,6 +460,7 @@ libNetworkManager_la_LIBADD = \ +@@ -461,6 +462,7 @@ libNetworkManager_la_LIBADD = \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 7059973a..d7dcfb27 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 120 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 34ec081..976b57f 100644 +index cc52ea7..f81c269 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -75,7 +75,7 @@ index 34ec081..976b57f 100644 if (new_state == NM_STATE_CONNECTED_SITE) { nm_connectivity_check_async (priv->connectivity, checked_connectivity, -@@ -4160,6 +4192,65 @@ impl_manager_check_connectivity (NMManager *manager, +@@ -4179,6 +4211,65 @@ impl_manager_check_connectivity (NMManager *manager, } static void @@ -141,7 +141,7 @@ index 34ec081..976b57f 100644 start_factory (NMDeviceFactory *factory, gpointer user_data) { nm_device_factory_start (factory); -@@ -4213,6 +4304,9 @@ nm_manager_start (NMManager *self) +@@ -4232,6 +4323,9 @@ nm_manager_start (NMManager *self) priv->devices_inited = TRUE; check_if_startup_complete (self); @@ -151,7 +151,7 @@ index 34ec081..976b57f 100644 } void -@@ -4920,6 +5014,22 @@ nm_manager_init (NMManager *manager) +@@ -4939,6 +5033,22 @@ nm_manager_init (NMManager *manager) KERNEL_FIRMWARE_DIR); } @@ -174,7 +174,7 @@ index 34ec081..976b57f 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, manager); -@@ -5128,6 +5238,16 @@ dispose (GObject *object) +@@ -5156,6 +5266,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } @@ -188,6 +188,6 @@ index 34ec081..976b57f 100644 + g_clear_object (&priv->ifstate_monitor); + } + - nm_device_factory_manager_for_each_factory (_deinit_device_factory, manager); - - if (priv->timestamp_update_id) { + if (priv->rfkill_mgr) { + g_signal_handlers_disconnect_by_func (priv->rfkill_mgr, rfkill_manager_rfkill_changed_cb, manager); + g_clear_object (&priv->rfkill_mgr); diff --git a/debian/patches/Use-symlinks-for-nmtui.patch b/debian/patches/Use-symlinks-for-nmtui.patch index b472b65f..1614d9de 100644 --- a/debian/patches/Use-symlinks-for-nmtui.patch +++ b/debian/patches/Use-symlinks-for-nmtui.patch @@ -9,10 +9,10 @@ Make /usr/bin/nmtui-* symbolic links to /usr/bin/nmtui. 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am -index ad9335d..09f2700 100644 +index f6d93be..5108cc4 100644 --- a/clients/tui/Makefile.am +++ b/clients/tui/Makefile.am -@@ -24,7 +24,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname +@@ -25,7 +25,7 @@ links = nmtui-edit nmtui-connect nmtui-hostname install-exec-hook: for link in $(links); do \ @@ -22,7 +22,7 @@ index ad9335d..09f2700 100644 uninstall-hook: diff --git a/configure.ac b/configure.ac -index cf4ec63..bb1ff6c 100644 +index 847ddc3..49fdc2d 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,8 @@ AM_PROG_CC_C_O diff --git a/debian/patches/config-bugfix-parse-commandline-options-into-correct.patch b/debian/patches/config-bugfix-parse-commandline-options-into-correct.patch deleted file mode 100644 index f9ecf21f..00000000 --- a/debian/patches/config-bugfix-parse-commandline-options-into-correct.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: =?utf-8?q?Ulrich_=C3=96lmann?= <u.oelmann@pengutronix.de> -Date: Thu, 27 Aug 2015 22:18:55 +0200 -Subject: config: bugfix: parse commandline options into correct object -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Config related commandline options should be parsed into a function argument but -were instead parsed into an object with local scope. As a result none of them -had any impact. - -Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> - -Fixes: b4ad7434a87c165a77b615accbe1868a9df9221b - -https://mail.gnome.org/archives/networkmanager-list/2015-August/msg00033.html - -(cherry-picked from commit 8a22a98157f7f6773f3d1f295419569c6c880a47) ---- - src/main.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index 495262e..a9bc479 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -246,7 +246,6 @@ do_early_setup (int *argc, char **argv[], NMConfigCmdLineOptions *config_cli) - {NULL} - }; - -- config_cli = nm_config_cmd_line_options_new (); - if (!nm_main_utils_early_setup ("NetworkManager", - argc, - argv, diff --git a/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch b/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch index 13a8d9f5..117c45a2 100644 --- a/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch +++ b/debian/patches/crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch @@ -18,7 +18,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730294 5 files changed, 112 insertions(+), 162 deletions(-) diff --git a/configure.ac b/configure.ac -index bb1ff6c..d46f1b8 100644 +index 49fdc2d..aa83a7c 100644 --- a/configure.ac +++ b/configure.ac @@ -566,18 +566,11 @@ if test x"$ac_crypto" = xnss; then @@ -46,10 +46,10 @@ index bb1ff6c..d46f1b8 100644 AC_MSG_ERROR([Please choose either 'nss' or 'gnutls' for certificate and crypto operations]) fi diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am -index 8fab84b..73c5eac 100644 +index d76a48d..5bbd012 100644 --- a/libnm-core/Makefile.am +++ b/libnm-core/Makefile.am -@@ -33,9 +33,9 @@ libnm_core_la_LIBADD = \ +@@ -34,9 +34,9 @@ libnm_core_la_LIBADD = \ $(UUID_LIBS) if WITH_GNUTLS @@ -270,10 +270,10 @@ index 96dddb9..01291f0 100644 return TRUE; } diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am -index fbf8c0b..f508494 100644 +index f83780d..cc0e672 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am -@@ -13,7 +13,7 @@ AM_CPPFLAGS = \ +@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ $(UUID_CFLAGS) if WITH_GNUTLS @@ -282,7 +282,7 @@ index fbf8c0b..f508494 100644 endif if WITH_NSS -@@ -119,7 +119,7 @@ libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ +@@ -121,7 +121,7 @@ libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ if WITH_GNUTLS libnm_util_la_SOURCES += crypto_gnutls.c @@ -291,7 +291,7 @@ index fbf8c0b..f508494 100644 endif if WITH_NSS -@@ -143,7 +143,7 @@ libtest_crypto_la_LIBADD = \ +@@ -145,7 +145,7 @@ libtest_crypto_la_LIBADD = \ if WITH_GNUTLS libtest_crypto_la_SOURCES += crypto_gnutls.c diff --git a/debian/patches/fix-arping-path.patch b/debian/patches/fix-arping-path.patch index 6b6e1bce..286943a7 100644 --- a/debian/patches/fix-arping-path.patch +++ b/debian/patches/fix-arping-path.patch @@ -15,10 +15,10 @@ Closes: #755039 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 5889582..4754e10 100644 +index 9b69d5a..48caf04 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -5693,7 +5693,7 @@ send_arps (NMDevice *self, const char *mode_arg) +@@ -5748,7 +5748,7 @@ send_arps (NMDevice *self, const char *mode_arg) if (num == 0) return; diff --git a/debian/patches/series b/debian/patches/series index 5d205987..df1d3cc3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,3 @@ Don-t-make-NetworkManager-D-Bus-activatable.patch Don-t-block-network.target-on-NetworkManager-wait-on.patch Fix-iscsiadm-path.patch crypto-only-use-gnutls-crypto-API-remove-libgcrypt-d.patch -config-bugfix-parse-commandline-options-into-correct.patch |