diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/02-dbus_access_network_manager.patch | 18 | ||||
| -rw-r--r-- | debian/patches/04-ltversioning.patch | 78 | ||||
| -rw-r--r-- | debian/patches/05-dhclient_lease_files.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 5 |
5 files changed, 19 insertions, 105 deletions
diff --git a/debian/changelog b/debian/changelog index f4037ed3..07bf17f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ network-manager (0.7.0.97-1) UNRELEASED; urgency=low * New upstream release. + - Update 02-dbus_access_network_manager.patch for the latest upstream + changes which fixes non-deterministic allow/deny for D-Bus messages with + no interface. (Closes: #510729) + - Disable 03-F3507g.patch for now, patch no longer applies and should be + replaced by ModemManager anyway. + - Remove 04-ltversioning.patch, merged upstream. + - Remove 05-dhclient_lease_files.patch, merged upstream. * Merge experimental branch into unstable. Remaining changes: - Remove 07-domain_search.patch, merged upstream. - Remove 08-hal_deprecated_keys.patch, fixed upstream. diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch index ad1ed08f..a96c6c0b 100644 --- a/debian/patches/02-dbus_access_network_manager.patch +++ b/debian/patches/02-dbus_access_network_manager.patch @@ -1,10 +1,10 @@ -Index: NetworkManager/src/NetworkManager.conf +Index: network-manager-0.7.0.97/src/NetworkManager.conf =================================================================== ---- NetworkManager.orig/src/NetworkManager.conf 2008-06-11 12:28:11.000000000 +0200 -+++ NetworkManager/src/NetworkManager.conf 2008-06-11 12:32:33.000000000 +0200 -@@ -11,6 +11,14 @@ - <allow send_destination="org.freedesktop.NetworkManager.PPP"/> - <allow send_interface="org.freedesktop.NetworkManager.PPP"/> +--- network-manager-0.7.0.97.orig/src/NetworkManager.conf 2009-02-17 16:45:44.000000000 +0100 ++++ network-manager-0.7.0.97/src/NetworkManager.conf 2009-02-22 03:20:14.000000000 +0100 +@@ -9,6 +9,16 @@ + <allow send_destination="org.freedesktop.NetworkManager" + send_interface="org.freedesktop.NetworkManager.PPP"/> </policy> + <policy user="haldaemon"> + <allow send_destination="org.freedesktop.NetworkManager"/> @@ -12,8 +12,10 @@ Index: NetworkManager/src/NetworkManager.conf + </policy> + <policy group="netdev"> + <allow send_destination="org.freedesktop.NetworkManager"/> -+ <allow send_interface="org.freedesktop.NetworkManager"/> ++ ++ <deny send_destination="org.freedesktop.NetworkManager" ++ send_interface="org.freedesktop.NetworkManager.PPP"/> + </policy> <policy at_console="true"> <allow send_destination="org.freedesktop.NetworkManager"/> - <allow send_interface="org.freedesktop.NetworkManager"/> + diff --git a/debian/patches/04-ltversioning.patch b/debian/patches/04-ltversioning.patch deleted file mode 100644 index e88f8750..00000000 --- a/debian/patches/04-ltversioning.patch +++ /dev/null @@ -1,78 +0,0 @@ -Index: network-manager-0.7.0/libnm-glib/Makefile.am -=================================================================== ---- network-manager-0.7.0.orig/libnm-glib/Makefile.am 2008-12-06 00:35:11.000000000 +0100 -+++ network-manager-0.7.0/libnm-glib/Makefile.am 2008-12-06 00:35:23.000000000 +0100 -@@ -91,7 +91,8 @@ - $(GCONF_LIBS) \ - $(GNOME_KEYRING_LIBS) - --libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver -+libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \ -+ -version-info "1:0:1" - - noinst_PROGRAMS = libnm-glib-test - -@@ -103,7 +104,8 @@ - libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c - libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) - libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) --libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver -+libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \ -+ -version-info "0:0:0" - - - nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml -Index: network-manager-0.7.0/libnm-glib/Makefile.in -=================================================================== ---- network-manager-0.7.0.orig/libnm-glib/Makefile.in 2008-12-06 00:35:14.000000000 +0100 -+++ network-manager-0.7.0/libnm-glib/Makefile.in 2008-12-06 00:36:06.000000000 +0100 -@@ -405,14 +405,18 @@ - $(GCONF_LIBS) \ - $(GNOME_KEYRING_LIBS) - --libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver -+libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib.ver \ -+ -version-info "1:0:1" -+ - libnm_glib_test_SOURCES = libnm-glib-test.c - libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) - libnm_glib_test_LDADD = libnm_glib.la $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) - libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c nm-vpn-plugin-ui-interface.c - libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS) - libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS) --libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver -+libnm_glib_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm_glib_vpn.ver \ -+ -version-info "0:0:0" -+ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc - DISTCLEANFILES = libnm_glib.pc libnm_glib.pc -Index: network-manager-0.7.0/libnm-util/Makefile.am -=================================================================== ---- network-manager-0.7.0.orig/libnm-util/Makefile.am 2008-12-06 00:34:59.000000000 +0100 -+++ network-manager-0.7.0/libnm-util/Makefile.am 2008-12-06 00:35:23.000000000 +0100 -@@ -52,7 +52,8 @@ - - libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) - --libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver -+libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \ -+ -version-info "1:0:0" - - if WITH_GNUTLS - libnm_util_la_SOURCES += crypto_gnutls.c -Index: network-manager-0.7.0/libnm-util/Makefile.in -=================================================================== ---- network-manager-0.7.0.orig/libnm-util/Makefile.in 2008-12-06 00:35:02.000000000 +0100 -+++ network-manager-0.7.0/libnm-util/Makefile.in 2008-12-06 00:35:39.000000000 +0100 -@@ -367,7 +367,9 @@ - $(libnm_util_include_HEADERS) $(am__append_1) $(am__append_4) - libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \ - $(am__append_3) $(am__append_6) --libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver -+libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \ -+ -version-info "1:0:0" -+ - libnm_util_includedir = $(includedir)/NetworkManager - test_crypto_SOURCES = test-crypto.c crypto.c $(am__append_7) \ - $(am__append_10) diff --git a/debian/patches/05-dhclient_lease_files.patch b/debian/patches/05-dhclient_lease_files.patch deleted file mode 100644 index 8f0597f3..00000000 --- a/debian/patches/05-dhclient_lease_files.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c -=================================================================== ---- network-manager-0.7.0.orig/src/dhcp-manager/nm-dhcp-dhclient.c 2008-12-06 01:09:52.000000000 +0100 -+++ network-manager-0.7.0/src/dhcp-manager/nm-dhcp-dhclient.c 2008-12-06 01:10:29.000000000 +0100 -@@ -36,7 +36,11 @@ - #define NM_DHCP_MANAGER_PID_FILENAME "dhclient" - #define NM_DHCP_MANAGER_PID_FILE_EXT "pid" - -+#if defined (TARGET_DEBIAN) -+#define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhcp3" -+#else - #define NM_DHCP_MANAGER_LEASE_DIR LOCALSTATEDIR "/lib/dhclient" -+#endif - #define NM_DHCP_MANAGER_LEASE_FILENAME "dhclient" - #define NM_DHCP_MANAGER_LEASE_FILE_EXT "lease" - diff --git a/debian/patches/series b/debian/patches/series index c38d933a..3ad97cdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 02-dbus_access_network_manager.patch -03-F3507g.patch -04-ltversioning.patch -05-dhclient_lease_files.patch +#03-F3507g.patch +#20-manual_means_always_online.patch |