summaryrefslogtreecommitdiff
path: root/package/systemd/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-06-08 23:48:34 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-06-08 23:48:34 +0200
commit892020b9b61deea7b9b741356ef5e5c31225b980 (patch)
tree8ecdc6364acf6a02fa1ccad441bfabe066b7b040 /package/systemd/patches
parent153cd7752e6a2483d9f617d5682d0b02f7c22581 (diff)
systemd: update patch, try to upstream
Diffstat (limited to 'package/systemd/patches')
-rw-r--r--package/systemd/patches/patch-Makefile_am10
-rw-r--r--package/systemd/patches/patch-configure_ac6
-rw-r--r--package/systemd/patches/patch-src_basic_socket-util_c11
3 files changed, 16 insertions, 11 deletions
diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am
index 775a6e660..fd2cddfb2 100644
--- a/package/systemd/patches/patch-Makefile_am
+++ b/package/systemd/patches/patch-Makefile_am
@@ -1,6 +1,6 @@
---- systemd-232.orig/Makefile.am 2016-11-03 18:16:42.000000000 +0100
-+++ systemd-232/Makefile.am 2016-12-27 19:28:30.933147951 +0100
-@@ -303,9 +303,9 @@ install-aliases-hook:
+--- systemd-233.orig/Makefile.am 2017-03-01 22:43:06.000000000 +0100
++++ systemd-233/Makefile.am 2017-06-07 22:02:15.904940794 +0200
+@@ -320,9 +320,9 @@ install-aliases-hook:
set -- $(SYSTEM_UNIT_ALIASES) && \
dir=$(systemunitdir) && $(install-aliases)
set -- $(USER_UNIT_ALIASES) && \
@@ -12,7 +12,7 @@
define install-aliases
while [ -n "$$1" ]; do \
-@@ -316,15 +316,6 @@ define install-aliases
+@@ -333,15 +333,6 @@ define install-aliases
done
endef
@@ -28,7 +28,7 @@
install-touch-usr-hook:
touch -c $(DESTDIR)/$(prefix)
-@@ -5014,39 +5005,6 @@ EXTRA_DIST += \
+@@ -5183,39 +5174,6 @@ EXTRA_DIST += \
src/timesync/timesyncd.conf.in
# ------------------------------------------------------------------------------
diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac
index 8cfc64fa5..acabb4cd4 100644
--- a/package/systemd/patches/patch-configure_ac
+++ b/package/systemd/patches/patch-configure_ac
@@ -1,6 +1,6 @@
---- systemd-231.orig/configure.ac 2016-07-25 21:49:47.000000000 +0200
-+++ systemd-231/configure.ac 2016-11-24 02:37:14.165088827 +0100
-@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
+--- systemd-233.orig/configure.ac 2017-03-01 22:43:06.000000000 +0100
++++ systemd-233/configure.ac 2017-06-07 22:02:15.896940483 +0200
+@@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
diff --git a/package/systemd/patches/patch-src_basic_socket-util_c b/package/systemd/patches/patch-src_basic_socket-util_c
index 78d871695..87fd0d929 100644
--- a/package/systemd/patches/patch-src_basic_socket-util_c
+++ b/package/systemd/patches/patch-src_basic_socket-util_c
@@ -1,12 +1,17 @@
---- systemd-232.orig/src/basic/socket-util.c 2016-11-03 18:16:42.000000000 +0100
-+++ systemd-232/src/basic/socket-util.c 2017-02-07 04:55:53.976146036 +0100
-@@ -657,8 +657,7 @@ int socknameinfo_pretty(union sockaddr_u
+--- systemd-233.orig/src/basic/socket-util.c 2017-03-01 22:43:06.000000000 +0100
++++ systemd-233/src/basic/socket-util.c 2017-06-08 22:45:25.000391693 +0200
+@@ -723,8 +723,12 @@ int socknameinfo_pretty(union sockaddr_u
assert(_ret);
- r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0,
- NI_IDN|NI_IDN_USE_STD3_ASCII_RULES);
++#ifdef HAVE_LIBIDN
++ r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0,
++ NI_IDN|NI_IDN_USE_STD3_ASCII_RULES);
++#else
+ r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0, 0);
++#endif
if (r != 0) {
int saved_errno = errno;