diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-15 13:32:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-15 13:32:31 +0200 |
| commit | b35ec53d09f67948407a7da174bf9266821b2c4a (patch) | |
| tree | 26ed3083b21e2425f40f535a4ae7ffa96b58c705 /package/systemd | |
| parent | ae04c4af5b1a699ddac2069cf241d91e1ee3741f (diff) | |
systemd: update patch, add locale/ssp requirements
Diffstat (limited to 'package/systemd')
| -rw-r--r-- | package/systemd/Makefile | 2 | ||||
| -rw-r--r-- | package/systemd/patches/patch-configure_ac | 26 | ||||
| -rw-r--r-- | package/systemd/patches/patch-src_basic_socket-util_c | 10 |
3 files changed, 31 insertions, 7 deletions
diff --git a/package/systemd/Makefile b/package/systemd/Makefile index 978213bed..ac3c04389 100644 --- a/package/systemd/Makefile +++ b/package/systemd/Makefile @@ -43,7 +43,9 @@ CONFIGURE_ARGS+= --disable-static \ --with-default-dnssec=no \ --without-python \ --disable-acl \ + --disable-idn \ --disable-libidn \ + --disable-libidn2 \ --disable-libcryptsetup \ --disable-seccomp \ --disable-xkbcommon \ diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac index acabb4cd4..526191bbb 100644 --- a/package/systemd/patches/patch-configure_ac +++ b/package/systemd/patches/patch-configure_ac @@ -1,5 +1,5 @@ --- 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 ++++ systemd-233/configure.ac 2017-06-15 08:42:17.595843900 +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]) @@ -9,3 +9,27 @@ M4_DEFINES= AC_CHECK_TOOL(OBJCOPY, objcopy) +@@ -1012,6 +1010,15 @@ fi + AM_CONDITIONAL(HAVE_LIBIDN, [test "$have_libidn" = "yes"]) + + # ------------------------------------------------------------------------------ ++have_idn=no ++AC_ARG_ENABLE(idn, AS_HELP_STRING([--disable-idn], [disable optional IDN support])) ++if test "x$enable_idn" != "xno"; then ++ have_idn=yes ++ AC_DEFINE(HAVE_IDN, [1], [IDN is enabled]) ++fi ++AM_CONDITIONAL(ENABLE_IDN, [test "$have_idn" = "yes"]) ++ ++# ------------------------------------------------------------------------------ + have_libiptc=no + AC_ARG_ENABLE(libiptc, AS_HELP_STRING([--disable-libiptc], [disable optional LIBIPTC support])) + if test "x$enable_libiptc" != "xno"; then +@@ -1672,6 +1679,7 @@ AC_MSG_RESULT([ + GNUTLS: ${have_gnutls} + libcurl: ${have_libcurl} + libidn: ${have_libidn} ++ IDN: ${have_idn} + libiptc: ${have_libiptc} + ELFUTILS: ${have_elfutils} + binfmt: ${have_binfmt} diff --git a/package/systemd/patches/patch-src_basic_socket-util_c b/package/systemd/patches/patch-src_basic_socket-util_c index 87fd0d929..6a47d4d7c 100644 --- a/package/systemd/patches/patch-src_basic_socket-util_c +++ b/package/systemd/patches/patch-src_basic_socket-util_c @@ -1,14 +1,12 @@ --- 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 ++++ systemd-233/src/basic/socket-util.c 2017-06-15 08:42:17.623845703 +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); ++#ifdef HAVE_IDN + 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 |