From f7eeda169864b15cf5b58a7daace4284b1bf5d35 Mon Sep 17 00:00:00 2001 From: Mark Hindley Date: Mon, 12 Nov 2018 09:19:10 +0000 Subject: Issue #92 fixed upstream so drop local patch. --- ...bc_program_invocation_name_pointer_overlap.diff | 37 ---------------------- debian/patches/series | 1 - 2 files changed, 38 deletions(-) delete mode 100644 debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff diff --git a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff b/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff deleted file mode 100644 index 034bf292b..000000000 --- a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff +++ /dev/null @@ -1,37 +0,0 @@ -Description: Avoid SIGABRT if program_invocation_short_name is a pointer within progam_invocation_short_name -Bug: https://github.com/elogind/elogind/issues/92 - ---- a/src/shared/musl_missing.c -+++ b/src/shared/musl_missing.c -@@ -26,14 +26,14 @@ - #if HAVE_PROGRAM_INVOCATION_NAME == 0 - char *program_invocation_name = NULL; - char *program_invocation_short_name = NULL; --#endif // libc does not provide these variables - --const char *program_arg_name = NULL; -+const char *program_arg_name = NULL; /* Helper */ -+#endif // libc does not provide program_invocation_[short_]name - - #include "musl_missing.h" - -+#if HAVE_PROGRAM_INVOCATION_NAME == 0 - static void elogind_free_program_name(void) { -- - if (program_invocation_name && (program_invocation_name != program_arg_name) && strlen(program_invocation_name)) - program_invocation_name = mfree(program_invocation_name); - if (program_invocation_short_name && (program_invocation_short_name != program_arg_name) && strlen(program_invocation_short_name)) -@@ -55,8 +55,11 @@ - program_invocation_name = strdup(program_arg_name); - if (NULL == program_invocation_short_name) - program_invocation_short_name = strdup(basename(program_arg_name)); --#if HAVE_PROGRAM_INVOCATION_NAME == 0 - atexit(elogind_free_program_name); --#endif // libc does not provide these variables - } -+#else -+void elogind_set_program_name(const char* pcall) { -+ assert(pcall && pcall[0]); -+} -+#endif // libc does not provide program_invocation_[short_]name - diff --git a/debian/patches/series b/debian/patches/series index 33125a623..295f7f092 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ manpage-branding.diff -Fix_glibc_program_invocation_name_pointer_overlap.diff -- cgit v1.2.3