mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 22:07:19 +02:00
fc74201f2b
* Clarify license * Patches are revised * Enable dhclient utility support * Enable system-wide network configuration support * Enable polkit-agent * disable_set_hostname.patch is no more appendable. Removed. * Add wpa_supplicant as runtime dependency * Add "provide net" rule to the service file * Re-arrange configure options in alphabetical order * Create plugdev group if missing on system * Display a message during install & upgrade
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
--- a/src/systemd/src/basic/stdio-util.h
|
|
+++ b/src/systemd/src/basic/stdio-util.h
|
|
@@ -19,7 +19,9 @@
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
+#if defined(__GLIBC__)
|
|
#include <printf.h>
|
|
+#endif
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
--- a/src/systemd/src/basic/util.h
|
|
+++ b/src/systemd/src/basic/util.h
|
|
@@ -46,6 +46,11 @@
|
|
#include "missing.h"
|
|
#include "time-util.h"
|
|
|
|
+#if !defined(__GLIBC__)
|
|
+typedef int (*__compar_fn_t) (const void*, const void*);
|
|
+typedef __compar_fn_t comparison_fn_t;
|
|
+#endif
|
|
+
|
|
size_t page_size(void) _pure_;
|
|
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())
|
|
|
|
--- a/src/systemd/sd-adapt/nm-sd-adapt.h
|
|
+++ b/src/systemd/sd-adapt/nm-sd-adapt.h
|
|
@@ -134,7 +134,7 @@
|
|
# ifdef HAVE___SECURE_GETENV
|
|
# define secure_getenv __secure_getenv
|
|
# else
|
|
-# error neither secure_getenv nor __secure_getenv is available
|
|
+# define secure_getenv getenv
|
|
# endif
|
|
#endif
|
|
|
|
--- a/src/systemd/src/basic/process-util.c
|
|
+++ b/src/systemd/src/basic/process-util.c
|
|
@@ -1018,8 +1018,9 @@
|
|
/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
|
|
* headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
|
|
* libpthread, as it is part of glibc anyway. */
|
|
-extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
|
|
-extern void* __dso_handle __attribute__ ((__weak__));
|
|
+//extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void * __dso_handle);
|
|
+//extern void* __dso_handle __attribute__ ((__weak__));
|
|
+#define __register_atfork(prepare,parent,child,dso) pthread_atfork(prepare,parent,child)
|
|
|
|
pid_t getpid_cached(void) {
|
|
pid_t current_value;
|
|
--- a/libnm-core/nm-json.c
|
|
+++ b/libnm-core/nm-json.c
|
|
@@ -23,6 +23,10 @@
|
|
|
|
#include <dlfcn.h>
|
|
|
|
+#ifndef RTLD_DEEPBIND
|
|
+#define RTLD_DEEPBIND 0
|
|
+#endif
|
|
+
|
|
void *_nm_jansson_json_object_iter_value;
|
|
void *_nm_jansson_json_object_key_to_iter;
|
|
void *_nm_jansson_json_integer;
|