Browse Source

systemd: update patch, add locale/ssp requirements

Waldemar Brodkorb 7 years ago
parent
commit
b35ec53d09

+ 2 - 0
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 \

+ 25 - 1
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}

+ 4 - 6
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

+ 2 - 0
target/config/Config.in.runtime

@@ -35,6 +35,8 @@ config ADK_RUNTIME_INIT_SYSTEMD
 	select ADK_PACKAGE_SYSTEMD
 	select ADK_PACKAGE_DBUS
 	select ADK_PACKAGE_DBUS_WITH_SYSTEMD
+	select ADK_RUNTIME_ENABLE_LOCALE
+	select ADK_TARGET_USE_SSP
 	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_UCLIBC_NG
 
 config ADK_RUNTIME_INIT_SIMPLEINIT