[packages/systemd] - partial update; files need more work
arekm
arekm at pld-linux.org
Wed Jun 28 15:04:41 CEST 2017
commit 8e27187eea862a15dc0ffcc594b85efb3bdb1af6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jun 28 15:04:34 2017 +0200
- partial update; files need more work
gperf-3.1.patch | 299 ---------------------------------------------
pld-pam-systemd-user.patch | 20 +--
sysctl.patch | 15 +--
systemd-lz4.patch | 21 ----
systemd.spec | 40 +++---
target-pld.patch | 4 +-
6 files changed, 37 insertions(+), 362 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 346ae2b..ba9cf8e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -25,13 +25,13 @@ Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 232
-Release: 7
+Version: 233
+Release: 0.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 3e3a0b14050eff62e68be72142181730
+# Source0-md5: 11d3ff48f3361b8bdcfcdc076a31b537
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -72,7 +72,7 @@ Patch11: optional-tmp-on-tmpfs.patch
Patch12: uids_gids.patch
Patch13: sysctl.patch
Patch14: pld-pam-systemd-user.patch
-Patch15: gperf-3.1.patch
+
Patch16: %{name}-seccomp_disable_on_i386.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
@@ -85,7 +85,7 @@ BuildRequires: bzip2-devel
BuildRequires: coreutils >= 8.16
%{?with_cryptsetup:BuildRequires: cryptsetup-devel >= 1.6.0}
BuildRequires: curl-devel >= 7.32.0
-BuildRequires: dbus-devel >= 1.4.0
+BuildRequires: dbus-devel >= 1.9.18
BuildRequires: docbook-dtd45-xml
BuildRequires: docbook-style-xsl
BuildRequires: elfutils-devel >= 0.158
@@ -114,8 +114,8 @@ BuildRequires: lz4-devel >= r125
BuildRequires: m4
%{?with_pam:BuildRequires: pam-devel >= 1.1.2}
BuildRequires: pkgconfig >= 0.9.0
-BuildRequires: python >= 2
-BuildRequires: python-lxml
+BuildRequires: python3
+BuildRequires: python3-lxml
%{?with_qrencode:BuildRequires: qrencode-devel}
BuildRequires: rpmbuild(macros) >= 1.628
BuildRequires: sed >= 4.0
@@ -139,7 +139,7 @@ Requires: SysVinit-tools
Requires: agetty
%{?with_cryptsetup:Requires: cryptsetup >= 1.6.0}
Requires: curl-libs >= 7.32.0
-Requires: dbus >= 1.4.16-6
+Requires: dbus >= 1.9.18
Requires: filesystem >= 4.0-39
Requires: glibc >= 2.16
Requires: gnutls-libs >= 3.1.4
@@ -638,7 +638,7 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
+
%patch16 -p1
cp -p %{SOURCE2} src/systemd_booted.c
@@ -1072,13 +1072,13 @@ fi
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc DISTRO_PORTING NEWS README TODO
-/etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-/etc/dbus-1/system.d/org.freedesktop.import1.conf
-/etc/dbus-1/system.d/org.freedesktop.locale1.conf
-/etc/dbus-1/system.d/org.freedesktop.login1.conf
-/etc/dbus-1/system.d/org.freedesktop.machine1.conf
-/etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-/etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%attr(755,root,root) %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
%attr(444,root,root) %ghost %config(noreplace) %{_sysconfdir}/machine-id
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hostname
@@ -1100,7 +1100,6 @@ fi
%dir %{_sysconfdir}/systemd/system/multi-user.target.wants
%dir %{_sysconfdir}/systemd/system/sockets.target.wants
%dir %{_sysconfdir}/systemd/system/sysinit.target.wants
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/ctrl-alt-del.target
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/getty.target.wants/getty at tty1.service
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/machines.target
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target
@@ -1190,6 +1189,7 @@ fi
%attr(755,root,root) /lib/systemd/system-generators/systemd-hibernate-resume-generator
%attr(755,root,root) /lib/systemd/system-generators/systemd-system-update-generator
%attr(755,root,root) /lib/systemd/system-generators/systemd-sysv-generator
+%attr(755,root,root) /lib/systemd/system-generators/systemd-veritysetup-generator
%dir /lib/systemd/network
/lib/systemd/network/99-default.link
/lib/udev/rules.d/70-uaccess.rules
@@ -1801,7 +1801,7 @@ fi
%files networkd
%defattr(644,root,root,755)
-/etc/dbus-1/system.d/org.freedesktop.network1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%dir %{_sysconfdir}/systemd/network
%dir %{_sysconfdir}/systemd/system/network-online.target.wants
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
@@ -1827,9 +1827,9 @@ fi
%files resolved
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/resolved.conf
-/etc/dbus-1/system.d/org.freedesktop.resolve1.conf
+%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
-%{systemdunitdir}/dbus-org.freedesktop.resolve1.service
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/systemd/system/dbus-org.freedesktop.resolve1.service
%{systemdunitdir}/systemd-resolved.service
%attr(755,root,root) /lib/systemd/systemd-resolved
%{_mandir}/man5/resolved.conf.5*
diff --git a/gperf-3.1.patch b/gperf-3.1.patch
deleted file mode 100644
index 01adaaa..0000000
--- a/gperf-3.1.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-From c9f7b4d356a453a01aa77a6bb74ca7ef49732c08 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster at gmail.com>
-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/network/networkd-conf.h | 2 +-
- src/network/networkd-network.h | 2 +-
- src/nspawn/nspawn-settings.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 +-
- 19 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11bd46c..d58fff5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -255,6 +255,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
- #include <sys/resource.h>
- ])
-
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
-+
-+AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ #include <string.h>
-+ const char * in_word_set(const char *, size_t);
-+ $GPERF_TEST]
-+ )],
-+ [GPERF_LEN_TYPE=size_t],
-+ [AC_COMPILE_IFELSE(
-+ [AC_LANG_PROGRAM([
-+ #include <string.h>
-+ 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 3fac9c5..4b291d1 100644
---- a/src/basic/af-list.c
-+++ b/src/basic/af-list.c
-@@ -23,7 +23,7 @@
- #include "af-list.h"
- #include "macro.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-from-name.h"
- #include "af-to-name.h"
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
-index 6792d1e..2d598dc 100644
---- a/src/basic/arphrd-list.c
-+++ b/src/basic/arphrd-list.c
-@@ -23,7 +23,7 @@
- #include "arphrd-list.h"
- #include "macro.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-from-name.h"
- #include "arphrd-to-name.h"
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
-index 3e773a0..d68cc78 100644
---- a/src/basic/cap-list.c
-+++ b/src/basic/cap-list.c
-@@ -26,7 +26,7 @@
- #include "parse-util.h"
- #include "util.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-from-name.h"
- #include "cap-to-name.h"
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
-index 31b66ba..c6a01ee 100644
---- a/src/basic/errno-list.c
-+++ b/src/basic/errno-list.c
-@@ -23,7 +23,7 @@
- #include "macro.h"
-
- static const struct errno_name* lookup_errno(register const char *str,
-- register unsigned int len);
-+ register GPERF_LEN_TYPE len);
-
- #include "errno-from-name.h"
- #include "errno-to-name.h"
-diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index bbac2d8..fc27a07 100644
---- a/src/core/load-fragment.h
-+++ b/src/core/load-fragment.h
-@@ -120,7 +120,7 @@ int config_parse_restrict_namespaces(const char *unit, const char *filename, uns
- int config_parse_bind_paths(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 99d9149..d1520c4 100644
---- a/src/journal/journald-server.h
-+++ b/src/journal/journald-server.h
-@@ -179,7 +179,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,0) _sentinel_;
-
- /* 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 086fa1e..7556ee2 100644
---- a/src/login/logind.h
-+++ b/src/login/logind.h
-@@ -182,7 +182,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 70ff947..37c7431 100644
---- a/src/network/networkd-netdev.h
-+++ b/src/network/networkd-netdev.h
-@@ -175,7 +175,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/network/networkd-conf.h b/src/network/networkd-conf.h
-index 9381962..1136975 100644
---- a/src/network/networkd-conf.h
-+++ b/src/network/networkd-conf.h
-@@ -23,7 +23,7 @@ typedef struct Manager Manager;
-
- int manager_parse_config_file(Manager *m);
-
--const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_duid_type(
- const char *unit,
-diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
-index 4cf784f..b7da9d2 100644
---- a/src/network/networkd-network.h
-+++ b/src/network/networkd-network.h
-@@ -244,7 +244,7 @@ int config_parse_ntp(const char *unit, const char *filename, unsigned line, cons
- /* Legacy IPv4LL support */
- int config_parse_ipv4ll(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);
-
--const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- extern const sd_bus_vtable network_vtable[];
-
-diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
-index 4bd0c64..e9ea087 100644
---- a/src/nspawn/nspawn-settings.h
-+++ b/src/nspawn/nspawn-settings.h
-@@ -103,7 +103,7 @@ bool settings_private_network(Settings *s);
-
- DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free);
-
--const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
-
- int config_parse_capability(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_id128(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/resolve/dns-type.c b/src/resolve/dns-type.c
-index aaf5ed6..d89ae28 100644
---- a/src/resolve/dns-type.c
-+++ b/src/resolve/dns-type.c
-@@ -29,7 +29,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 fc425a3..8184d6c 100644
---- a/src/resolve/resolved-conf.h
-+++ b/src/resolve/resolved-conf.h
-@@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string);
- int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word);
- int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string);
-
--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_dns_servers(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_search_domains(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 aeaa092..e247913 100644
---- a/src/test/test-af-list.c
-+++ b/src/test/test-af-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.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-from-name.h"
- #include "af-list.h"
-diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
-index f3989ad..8f4f342 100644
---- a/src/test/test-arphrd-list.c
-+++ b/src/test/test-arphrd-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.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-from-name.h"
- #include "arphrd-list.h"
-diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
-index cba0724..0280697 100644
---- a/src/timesync/timesyncd-conf.h
-+++ b/src/timesync/timesyncd-conf.h
-@@ -22,7 +22,7 @@
- #include "conf-parser.h"
- #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 a99060d..5a25cec 100644
---- a/src/udev/net/link-config.h
-+++ b/src/udev/net/link-config.h
-@@ -94,7 +94,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 aa10bea..0902411 100644
---- a/src/udev/udev-builtin-keyboard.c
-+++ b/src/udev/udev-builtin-keyboard.c
-@@ -29,7 +29,7 @@
- #include "string-util.h"
- #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) {
diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch
index bf3e767..3b37ebb 100644
--- a/pld-pam-systemd-user.patch
+++ b/pld-pam-systemd-user.patch
@@ -1,19 +1,19 @@
---- systemd-232/src/login/systemd-user.m4.orig 2016-11-03 18:16:42.000000000 +0100
-+++ systemd-232/src/login/systemd-user.m4 2017-02-25 11:22:01.379262223 +0100
-@@ -2,11 +2,11 @@
+--- systemd-233/src/login/systemd-user.m4~ 2017-03-01 22:43:06.000000000 +0100
++++ systemd-233/src/login/systemd-user.m4 2017-06-28 14:12:06.729052169 +0200
+@@ -2,11 +2,10 @@
#
# Used by systemd --user instances.
-account required pam_unix.so
+account include system-auth
-
m4_ifdef(`HAVE_SELINUX',
--session required pam_selinux.so close
--session required pam_selinux.so nottys open
-+-session optional pam_selinux.so close
-+-session optional pam_selinux.so nottys open
+-session required pam_selinux.so close
+-session required pam_selinux.so nottys open
++session optional pam_selinux.so close
++session optional pam_selinux.so nottys open
)m4_dnl
--session required pam_loginuid.so
+-session required pam_loginuid.so
+-session optional pam_keyinit.so force revoke
-session optional pam_systemd.so
+session required pam_loginuid.so
-+session include system-auth
++session include system-auth
diff --git a/sysctl.patch b/sysctl.patch
index f1bd36b..d4c4eab 100644
--- a/sysctl.patch
+++ b/sysctl.patch
@@ -1,19 +1,14 @@
-kernel.sysrq is defined in /etc/sysctl.conf owned by rc-scripts.
-having it here as well, will print notice:
-
-# /lib/systemd/systemd-sysctl
-Overwriting earlier assignment of kernel/sysrq in file '/etc/sysctl.d/99-sysctl.conf'.
-
---- systemd-221/sysctl.d/50-default.conf~ 2015-02-28 18:38:38.000000000 +0200
-+++ systemd-221/sysctl.d/50-default.conf 2015-08-01 22:43:16.307974188 +0300
-@@ -11,12 +11,6 @@
+--- systemd-233/sysctl.d/50-default.conf~ 2017-03-01 22:43:06.000000000 +0100
++++ systemd-233/sysctl.d/50-default.conf 2017-06-28 14:09:04.347320793 +0200
+@@ -11,13 +11,6 @@
# (e.g. /etc/sysctl.d/90-override.conf), and put any assignments
# there.
-# System Request functionality of the kernel (SYNC)
-#
-# Use kernel.sysrq = 1 to allow all keys.
--# See http://fedoraproject.org/wiki/QA/Sysrq for a list of values and keys.
+-# See https://www.kernel.org/doc/html/latest/admin-guide/sysrq.html for a list
+-# of values and keys.
-kernel.sysrq = 16
-
# Append the PID to the core filename
diff --git a/systemd-lz4.patch b/systemd-lz4.patch
index 304813b..c0763d2 100644
--- a/systemd-lz4.patch
+++ b/systemd-lz4.patch
@@ -1,24 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index 0b10fc7de7..1928e65bde 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -623,10 +623,13 @@ AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"])
- have_lz4=no
- AC_ARG_ENABLE(lz4, AS_HELP_STRING([--disable-lz4], [Disable optional LZ4 support]))
- AS_IF([test "x$enable_lz4" != "xno"], [
-- PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-- [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available])
-+ PKG_CHECK_MODULES(LZ4, [ liblz4 < 10 ],
-+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
- have_lz4=yes],
-- have_lz4=no)
-+ [PKG_CHECK_MODULES(LZ4, [ liblz4 >= 125 ],
-+ [AC_DEFINE(HAVE_LZ4, 1, [Define if LZ4 is available])
-+ have_lz4=yes],
-+ have_lz4=no)])
- AS_IF([test "x$have_lz4" = xno -a "x$enable_lz4" = xyes],
- [AC_MSG_ERROR([*** LZ4 support requested but libraries not found])])
- ])
--- systemd-232/Makefile.am.orig 2017-04-05 19:08:21.126447292 +0200
+++ systemd-232/Makefile.am 2017-04-05 19:17:46.589774170 +0200
@@ -4255,6 +4255,10 @@
diff --git a/target-pld.patch b/target-pld.patch
index ed56122..d072379 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -133,10 +133,10 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd
+}
+
int hostname_setup(void) {
- int r;
_cleanup_free_ char *b = NULL;
- const char *hn;
bool enoent = false;
+ const char *hn;
+ int r;
- r = read_hostname_config("/etc/hostname", &b);
+ r = read_hostname(&b);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/8e27187eea862a15dc0ffcc594b85efb3bdb1af6
More information about the pld-cvs-commit
mailing list