diff --git a/rpm/systemd-backport-build-sys-add-check-for-gperf-lookup-function-signat.patch b/rpm/systemd-backport-build-sys-add-check-for-gperf-lookup-function-signat.patch new file mode 100644 index 0000000..16b3207 --- /dev/null +++ b/rpm/systemd-backport-build-sys-add-check-for-gperf-lookup-function-signat.patch @@ -0,0 +1,260 @@ +From 4932ee51e991a14dfacfafdcacb0fcec316ae496 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 10 Jan 2017 02:39:05 -0500 +Subject: [PATCH] build-sys: add check for gperf lookup function signature + (#5055) + +gperf-3.1 generates lookup functions that take a size_t length +parameter instead of unsigned int. Test for this at configure time. + +Fixes: https://github.com/systemd/systemd/issues/5039 +--- + configure.ac | 22 ++++++++++++++++++++++ + src/basic/af-list.c | 2 +- + src/basic/arphrd-list.c | 2 +- + src/basic/cap-list.c | 2 +- + src/basic/errno-list.c | 2 +- + src/core/load-fragment.h | 2 +- + src/journal/journald-server.h | 2 +- + src/login/logind.h | 2 +- + src/network/networkd-netdev.h | 2 +- + src/resolve/dns-type.c | 2 +- + src/resolve/resolved-conf.h | 2 +- + src/test/test-af-list.c | 2 +- + src/test/test-arphrd-list.c | 2 +- + src/timesync/timesyncd-conf.h | 2 +- + src/udev/net/link-config.h | 2 +- + src/udev/udev-builtin-keyboard.c | 2 +- + 16 files changed, 37 insertions(+), 15 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d9ab3624dd..64c4f6b4ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -242,6 +242,28 @@ AC_CHECK_SIZEOF(rlim_t,,[ + #include + ]) + ++GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)" ++ ++AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([ ++ #include ++ const char * in_word_set(const char *, size_t); ++ $GPERF_TEST] ++ )], ++ [GPERF_LEN_TYPE=size_t], ++ [AC_COMPILE_IFELSE( ++ [AC_LANG_PROGRAM([ ++ #include ++ const char * in_word_set(const char *, unsigned); ++ $GPERF_TEST] ++ )], ++ [GPERF_LEN_TYPE=unsigned], ++ [AC_MSG_ERROR([** unable to determine gperf len type])] ++ )] ++) ++ ++AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type]) ++ + # ------------------------------------------------------------------------------ + # we use python to build the man page index + have_python=no +diff --git a/src/basic/af-list.c b/src/basic/af-list.c +index f396115a34..cbdec82240 100644 +--- a/src/basic/af-list.c ++++ b/src/basic/af-list.c +@@ -25,7 +25,7 @@ + #include "util.h" + #include "af-list.h" + +-static const struct af_name* lookup_af(register const char *str, register unsigned int len); ++static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len); + + #include "af-to-name.h" + #include "af-from-name.h" +diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c +index 284043cd90..edabe4f863 100644 +--- a/src/basic/arphrd-list.c ++++ b/src/basic/arphrd-list.c +@@ -25,7 +25,7 @@ + #include "util.h" + #include "arphrd-list.h" + +-static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); ++static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); + + #include "arphrd-to-name.h" + #include "arphrd-from-name.h" +diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c +index bd5bffbfa5..f27cb732a1 100644 +--- a/src/basic/cap-list.c ++++ b/src/basic/cap-list.c +@@ -25,7 +25,7 @@ + #include "cap-list.h" + #include "missing.h" + +-static const struct capability_name* lookup_capability(register const char *str, register unsigned int len); ++static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len); + + #include "cap-to-name.h" + #include "cap-from-name.h" +diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c +index 34d1331486..26a6fc47c5 100644 +--- a/src/basic/errno-list.c ++++ b/src/basic/errno-list.c +@@ -25,7 +25,7 @@ + #include "errno-list.h" + + static const struct errno_name* lookup_errno(register const char *str, +- register unsigned int len); ++ register GPERF_LEN_TYPE len); + + #include "errno-to-name.h" + #include "errno-from-name.h" +diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h +index fcca2b0221..6fe345e670 100644 +--- a/src/core/load-fragment.h ++++ b/src/core/load-fragment.h +@@ -107,7 +107,7 @@ int config_parse_bus_name(const char* unit, const char *filename, unsigned line, + int config_parse_exec_utmp_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + + /* gperf prototypes */ +-const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + extern const char load_fragment_gperf_nulstr[]; + + typedef enum Disabled { +diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h +index d954c5190d..070d4e8eb6 100644 +--- a/src/journal/journald-server.h ++++ b/src/journal/journald-server.h +@@ -150,7 +150,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne + void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,4); + + /* gperf lookup function */ +-const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + + int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + +diff --git a/src/login/logind.h b/src/login/logind.h +index ce99d75bc1..c75c03e249 100644 +--- a/src/login/logind.h ++++ b/src/login/logind.h +@@ -177,7 +177,7 @@ int manager_unit_is_active(Manager *manager, const char *unit); + int manager_job_is_active(Manager *manager, const char *path); + + /* gperf lookup function */ +-const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + + int manager_set_lid_switch_ignore(Manager *m, usec_t until); + +diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h +index 19fb5bb185..1c4b95b027 100644 +--- a/src/network/networkd-netdev.h ++++ b/src/network/networkd-netdev.h +@@ -200,7 +200,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_; + int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + + /* gperf */ +-const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + + /* Macros which append INTERFACE= to the message */ + +diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c +index 63b4b36e88..057d695e0e 100644 +--- a/src/resolve/dns-type.c ++++ b/src/resolve/dns-type.c +@@ -27,7 +27,7 @@ typedef const struct { + } dns_type; + + static const struct dns_type_name * +-lookup_dns_type (register const char *str, register unsigned int len); ++lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len); + + #include "dns_type-from-name.h" + #include "dns_type-to-name.h" +diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h +index b3dbea7b6b..17b0960594 100644 +--- a/src/resolve/resolved-conf.h ++++ b/src/resolve/resolved-conf.h +@@ -26,7 +26,7 @@ + int manager_parse_dns_server(Manager *m, DnsServerType type, const char *string); + int manager_parse_config_file(Manager *m); + +-const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + + int config_parse_dnsv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + int config_parse_support(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c +index d69104f540..a73b05d5ed 100644 +--- a/src/test/test-af-list.c ++++ b/src/test/test-af-list.c +@@ -23,7 +23,7 @@ + #include "macro.h" + #include "util.h" + +-static const struct af_name* lookup_af(register const char *str, register unsigned int len); ++static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len); + + #include "af-list.h" + #include "af-to-name.h" +diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c +index d7c8eaa4a9..696fbb9d5b 100644 +--- a/src/test/test-arphrd-list.c ++++ b/src/test/test-arphrd-list.c +@@ -23,7 +23,7 @@ + #include "macro.h" + #include "util.h" + +-static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len); ++static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len); + + #include "arphrd-list.h" + #include "arphrd-to-name.h" +diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h +index 56466fe462..a776475ea9 100644 +--- a/src/timesync/timesyncd-conf.h ++++ b/src/timesync/timesyncd-conf.h +@@ -25,7 +25,7 @@ + + #include "timesyncd-manager.h" + +-const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + + int manager_parse_server_string(Manager *m, ServerType type, const char *string); + +diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h +index 9875057e84..9ffc52131c 100644 +--- a/src/udev/net/link-config.h ++++ b/src/udev/net/link-config.h +@@ -92,7 +92,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_; + MACPolicy mac_policy_from_string(const char *p) _pure_; + + /* gperf lookup function */ +-const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length); ++const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length); + + int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); + int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c +index 01f3879f37..e08a8adac6 100644 +--- a/src/udev/udev-builtin-keyboard.c ++++ b/src/udev/udev-builtin-keyboard.c +@@ -25,7 +25,7 @@ + + #include "udev.h" + +-static const struct key *keyboard_lookup_key(const char *str, unsigned len); ++static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len); + #include "keyboard-keys-from-name.h" + + static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) { +-- +2.28.0 + diff --git a/rpm/systemd.spec b/rpm/systemd.spec index d451996..db17e86 100644 --- a/rpm/systemd.spec +++ b/rpm/systemd.spec @@ -55,6 +55,7 @@ Patch40: systemd-234-sd-login-read-list-of-uids-of-sessions-from-UIDS-not Patch41: 0001-aarch64-Force-udev-path.-Contributes-to-JB-49681.patch Patch42: 0002-We-do-not-have-a-clean-environment-where-HAVE_SPIT_U.patch # end +Patch43: systemd-backport-build-sys-add-check-for-gperf-lookup-function-signat.patch Patch99: systemd-225_fix_build_with_glibc228.patch BuildRequires: audit-libs-devel @@ -237,6 +238,8 @@ This package includes tests for systemd. # udev path temporary fix %patch41 -p1 %patch42 -p1 +# gperf 3.1 compatibility fix +%patch43 -p1 #systemd-225_fix_build_with_glibc228.patch %patch99 -p1