diff options
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/systemd-basic-missing_syscall-fix-syscall-numbers-for-x32.patch | 124 |
3 files changed, 12 insertions, 137 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index f8bc3398..a639e11a 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -8,13 +8,13 @@ online state to CONNECTED. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 --- - src/nm-manager.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/core/nm-manager.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 46f81c7..3465be4 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c +diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c +index 5a6e05a..4c56b77 100644 +--- a/src/core/nm-manager.c ++++ b/src/core/nm-manager.c @@ -52,6 +52,8 @@ #define DEVICE_STATE_PRUNE_RATELIMIT_MAX 100u @@ -24,7 +24,7 @@ index 46f81c7..3465be4 100644 /*****************************************************************************/ typedef struct { -@@ -186,6 +188,10 @@ typedef struct { +@@ -187,6 +189,10 @@ typedef struct { GFileMonitor *fw_monitor; guint fw_changed_id; @@ -35,7 +35,7 @@ index 46f81c7..3465be4 100644 guint timestamp_update_id; guint devices_inited_id; -@@ -1433,6 +1439,27 @@ find_best_device_state(NMManager *manager) +@@ -1463,6 +1469,27 @@ find_best_device_state(NMManager *manager) return best_state; } @@ -63,7 +63,7 @@ index 46f81c7..3465be4 100644 static void nm_manager_update_metered(NMManager *self) { -@@ -1479,6 +1506,9 @@ nm_manager_update_state(NMManager *self) +@@ -1509,6 +1536,9 @@ nm_manager_update_state(NMManager *self) else new_state = find_best_device_state(self); @@ -73,7 +73,7 @@ index 46f81c7..3465be4 100644 if (new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; } -@@ -6587,6 +6617,62 @@ impl_manager_set_logging(NMDBusObject * obj, +@@ -6603,6 +6633,62 @@ impl_manager_set_logging(NMDBusObject * obj, g_dbus_method_invocation_return_value(invocation, NULL); } @@ -136,7 +136,7 @@ index 46f81c7..3465be4 100644 static void impl_manager_get_logging(NMDBusObject * obj, const NMDBusInterfaceInfoExtended *interface_info, -@@ -6916,6 +7002,9 @@ nm_manager_start(NMManager *self, GError **error) +@@ -6932,6 +7018,9 @@ nm_manager_start(NMManager *self, GError **error) nm_clear_g_source(&priv->devices_inited_id); priv->devices_inited_id = g_idle_add_full(G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); @@ -146,7 +146,7 @@ index 46f81c7..3465be4 100644 return TRUE; } -@@ -7795,6 +7884,22 @@ nm_manager_init(NMManager *self) +@@ -7826,6 +7915,22 @@ nm_manager_init(NMManager *self) _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 46f81c7..3465be4 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds(300, -@@ -8078,6 +8183,16 @@ dispose(GObject *object) +@@ -8111,6 +8216,16 @@ dispose(GObject *object) g_clear_object(&priv->fw_monitor); } diff --git a/debian/patches/series b/debian/patches/series index b718f8ef..a2d7e06d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ Force-online-state-with-unmanaged-devices.patch -systemd-basic-missing_syscall-fix-syscall-numbers-for-x32.patch diff --git a/debian/patches/systemd-basic-missing_syscall-fix-syscall-numbers-for-x32.patch b/debian/patches/systemd-basic-missing_syscall-fix-syscall-numbers-for-x32.patch deleted file mode 100644 index 75b2fd2b..00000000 --- a/debian/patches/systemd-basic-missing_syscall-fix-syscall-numbers-for-x32.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: mirabilos <tg@debian.org> -Date: Fri, 9 Oct 2020 15:58:48 +0200 -Subject: fixup syscall numbers for x32 vs. amd64 - ---- - shared/systemd/src/basic/missing_syscall.h | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/shared/systemd/src/basic/missing_syscall.h b/shared/systemd/src/basic/missing_syscall.h -index d11a77d..82daa68 100644 ---- a/shared/systemd/src/basic/missing_syscall.h -+++ b/shared/systemd/src/basic/missing_syscall.h -@@ -15,6 +15,12 @@ - #include <asm/sgidefs.h> - #endif - -+#if defined(__x86_64__) && defined(__ILP32__) -+#define systemd_SC_arch_bias(x) ((x) | /* __X32_SYSCALL_BIT */ 0x40000000) -+#else -+#define systemd_SC_arch_bias(x) (x) -+#endif -+ - #include "missing_keyctl.h" - #include "missing_stat.h" - -@@ -36,7 +42,7 @@ static inline int missing_pivot_root(const char *new_root, const char *put_old) - /* ======================================================================= */ - - #if defined __x86_64__ --# define systemd_NR_memfd_create 319 -+# define systemd_NR_memfd_create systemd_SC_arch_bias(319) - #elif defined __arm__ - # define systemd_NR_memfd_create 385 - #elif defined __aarch64__ -@@ -93,7 +99,7 @@ static inline int missing_memfd_create(const char *name, unsigned int flags) { - /* ======================================================================= */ - - #if defined __x86_64__ --# define systemd_NR_getrandom 318 -+# define systemd_NR_getrandom systemd_SC_arch_bias(318) - #elif defined(__i386__) - # define systemd_NR_getrandom 355 - #elif defined(__arm__) -@@ -169,7 +175,7 @@ static inline pid_t missing_gettid(void) { - /* ======================================================================= */ - - #if defined(__x86_64__) --# define systemd_NR_name_to_handle_at 303 -+# define systemd_NR_name_to_handle_at systemd_SC_arch_bias(303) - #elif defined(__i386__) - # define systemd_NR_name_to_handle_at 341 - #elif defined(__arm__) -@@ -226,7 +232,7 @@ static inline int missing_name_to_handle_at(int fd, const char *name, struct fil - #elif defined __arm__ - # define systemd_NR_setns 375 - #elif defined(__x86_64__) --# define systemd_NR_setns 308 -+# define systemd_NR_setns systemd_SC_arch_bias(308) - #elif defined(__i386__) - # define systemd_NR_setns 346 - #elif defined(__powerpc__) -@@ -279,7 +285,7 @@ static inline pid_t raw_getpid(void) { - /* ======================================================================= */ - - #if defined __x86_64__ --# define systemd_NR_renameat2 316 -+# define systemd_NR_renameat2 systemd_SC_arch_bias(316) - #elif defined __arm__ - # define systemd_NR_renameat2 382 - #elif defined __aarch64__ -@@ -388,7 +394,7 @@ static inline key_serial_t missing_request_key(const char *type, const char *des - /* ======================================================================= */ - - #if defined(__x86_64__) --# define systemd_NR_copy_file_range 326 -+# define systemd_NR_copy_file_range systemd_SC_arch_bias(326) - #elif defined(__i386__) - # define systemd_NR_copy_file_range 377 - #elif defined __s390__ -@@ -440,7 +446,7 @@ static inline ssize_t missing_copy_file_range(int fd_in, loff_t *off_in, - #if defined __i386__ - # define systemd_NR_bpf 357 - #elif defined __x86_64__ --# define systemd_NR_bpf 321 -+# define systemd_NR_bpf systemd_SC_arch_bias(321) - #elif defined __aarch64__ - # define systemd_NR_bpf 280 - #elif defined __arm__ -@@ -492,7 +498,7 @@ static inline int missing_bpf(int cmd, union bpf_attr *attr, size_t size) { - # if defined __i386__ - # define systemd_NR_pkey_mprotect 380 - # elif defined __x86_64__ --# define systemd_NR_pkey_mprotect 329 -+# define systemd_NR_pkey_mprotect systemd_SC_arch_bias(329) - # elif defined __aarch64__ - # define systemd_NR_pkey_mprotect 288 - # elif defined __arm__ -@@ -545,7 +551,7 @@ assert_cc(__NR_pkey_mprotect == systemd_NR_pkey_mprotect); - #elif defined __sparc__ - # define systemd_NR_statx 360 - #elif defined __x86_64__ --# define systemd_NR_statx 332 -+# define systemd_NR_statx systemd_SC_arch_bias(332) - #else - # warning "statx() syscall number unknown for your architecture" - #endif -@@ -647,7 +653,7 @@ static inline long missing_get_mempolicy(int *mode, unsigned long *nodemask, - #elif defined __ia64__ - # define systemd_NR_pidfd_send_signal (424 + 1024) - #else --# define systemd_NR_pidfd_send_signal 424 -+# define systemd_NR_pidfd_send_signal systemd_SC_arch_bias(424) - #endif - - /* may be (invalid) negative number due to libseccomp, see PR 13319 */ -@@ -691,7 +697,7 @@ static inline int missing_pidfd_send_signal(int fd, int sig, siginfo_t *info, un - #elif defined __ia64__ - # define systemd_NR_pidfd_open (434 + 1024) - #else --# define systemd_NR_pidfd_open 434 -+# define systemd_NR_pidfd_open systemd_SC_arch_bias(434) - #endif - - /* may be (invalid) negative number due to libseccomp, see PR 13319 */ |