about summary refs log tree commit diff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02-dbus_access_network_manager.patch61
-rw-r--r--debian/patches/04-ltversioning.patch78
-rw-r--r--debian/patches/05-dhclient_lease_files.patch16
-rw-r--r--debian/patches/20-manual_means_always_online.patch36
-rw-r--r--debian/patches/series5
5 files changed, 87 insertions, 109 deletions
diff --git a/debian/patches/02-dbus_access_network_manager.patch b/debian/patches/02-dbus_access_network_manager.patch
index ad1ed08f..8c90bfd7 100644
--- a/debian/patches/02-dbus_access_network_manager.patch
+++ b/debian/patches/02-dbus_access_network_manager.patch
@@ -1,19 +1,56 @@
-Index: NetworkManager/src/NetworkManager.conf
+Index: NetworkManager-0.7.2/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"/>
+--- NetworkManager-0.7.2.orig/src/NetworkManager.conf	2009-11-23 20:17:47.000000000 +0100
++++ NetworkManager-0.7.2/src/NetworkManager.conf	2009-11-24 00:38:15.416687481 +0100
+@@ -9,6 +9,51 @@
+                 <allow send_destination="org.freedesktop.NetworkManager"
+                        send_interface="org.freedesktop.NetworkManager.PPP"/>
          </policy>
-+        <policy user="haldaemon">
-+                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
-+        </policy>
 +        <policy group="netdev">
 +                <allow send_destination="org.freedesktop.NetworkManager"/>
-+                <allow send_interface="org.freedesktop.NetworkManager"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.DBus.Introspectable"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.DBus.Properties"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Cdma"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Gsm"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.Device"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.IP4Config"/>
++
++		<allow send_destination="org.freedesktop.NetworkManager"
++		       send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
 +        </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/20-manual_means_always_online.patch b/debian/patches/20-manual_means_always_online.patch
new file mode 100644
index 00000000..4da87b8e
--- /dev/null
+++ b/debian/patches/20-manual_means_always_online.patch
@@ -0,0 +1,36 @@
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerDbus.c bzr.debian.0.9.5.new/src/NetworkManagerDbus.c
+--- bzr.debian.0.9.5/src/NetworkManagerDbus.c	2007-06-25 17:38:42.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerDbus.c	2007-06-25 17:38:42.000000000 +0200
+@@ -302,6 +302,9 @@
+ 	if (data->asleep == TRUE)
+ 		return NM_STATE_ASLEEP;
+ 
++	if (data->always_online == TRUE)
++	  return NM_STATE_CONNECTED;
++
+ 	act_dev = nm_get_active_device (data);
+ 	if (!act_dev && !data->modem_active)
+ 		return NM_STATE_DISCONNECTED;
+diff -Nur bzr.debian.0.9.5/src/NetworkManagerMain.h bzr.debian.0.9.5.new/src/NetworkManagerMain.h
+--- bzr.debian.0.9.5/src/NetworkManagerMain.h	2007-06-25 17:18:17.000000000 +0200
++++ bzr.debian.0.9.5.new/src/NetworkManagerMain.h	2007-06-25 17:38:42.000000000 +0200
+@@ -86,6 +86,7 @@
+ 	gboolean				modem_active;
+ 	gboolean				asleep;
+ 	gboolean				disconnected;
++	gboolean                                always_online;
+ 
+ 	GSList *				dialup_list;
+ 	GMutex *				dialup_list_mutex;
+diff -Nur bzr.debian.0.9.5/src/nm-device.c bzr.debian.0.9.5.new/src/nm-device.c
+--- bzr.debian.0.9.5/src/nm-device.c	2007-06-25 17:38:42.000000000 +0200
++++ bzr.debian.0.9.5.new/src/nm-device.c	2007-06-25 17:38:42.000000000 +0200
+@@ -195,6 +195,8 @@
+ 	/* Allow distributions to flag devices as disabled */
+ 	if (nm_system_device_get_disabled (dev))
+ 	{
++		/* In this case, we assume we're always online */
++		app_data->always_online = TRUE;
+ 		g_object_unref (G_OBJECT (dev));
+ 		return NULL;
+ 	}
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
generated by cgit-pink 1.3.0-6-gf8a5 (git 2.35.1) at 2026-09-06 21:02:59 +0000