From ecd48a0e68097451a7e64d3e1aad90f37a6f43b4 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Wed, 8 Jan 2020 17:16:15 +0800 Subject: [PATCH] remove no need patchs --- ...dev-use-bfq-as-the-default-scheduler.patch | 2 +- ...-NoNewPrivileges-for-all-long-runnin.patch | 178 ------------------ ...e-etc-resolv.conf-symlink-at-runtime.patch | 48 ----- systemd.spec | 14 +- 4 files changed, 9 insertions(+), 233 deletions(-) rename 464a73411c13596a130a7a8f0ac00ca728e5f69e.patch => 0001-udev-use-bfq-as-the-default-scheduler.patch (95%) delete mode 100644 0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch delete mode 100644 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch diff --git a/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch b/0001-udev-use-bfq-as-the-default-scheduler.patch similarity index 95% rename from 464a73411c13596a130a7a8f0ac00ca728e5f69e.patch rename to 0001-udev-use-bfq-as-the-default-scheduler.patch index 4de01c4..bbb294b 100644 --- a/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch +++ b/0001-udev-use-bfq-as-the-default-scheduler.patch @@ -1,4 +1,4 @@ -From 464a73411c13596a130a7a8f0ac00ca728e5f69e Mon Sep 17 00:00:00 2001 +From 5ab4d083dbe0a1ae095875c4af6ac26749b67211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 14 Aug 2019 15:57:42 +0200 Subject: [PATCH] udev: use bfq as the default scheduler diff --git a/0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch b/0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch deleted file mode 100644 index 39c2f50..0000000 --- a/0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 224a4eaf6701431af907179e313138213b60ce6c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 3 Apr 2019 10:56:14 +0200 -Subject: [PATCH] Revert "units: set NoNewPrivileges= for all long-running - services" - -This reverts commit 64d7f7b4a15f1534fb19fda6b601fec50783bee4. ---- - units/systemd-coredump@.service.in | 1 - - units/systemd-hostnamed.service.in | 1 - - units/systemd-initctl.service.in | 1 - - units/systemd-journal-remote.service.in | 1 - - units/systemd-journald.service.in | 1 - - units/systemd-localed.service.in | 1 - - units/systemd-logind.service.in | 1 - - units/systemd-machined.service.in | 1 - - units/systemd-networkd.service.in | 1 - - units/systemd-resolved.service.in | 1 - - units/systemd-rfkill.service.in | 1 - - units/systemd-timedated.service.in | 1 - - units/systemd-timesyncd.service.in | 1 - - 13 files changed, 13 deletions(-) - -diff --git a/units/systemd-coredump@.service.in b/units/systemd-coredump@.service.in -index afb2ab9d17..5babc11e4c 100644 ---- a/units/systemd-coredump@.service.in -+++ b/units/systemd-coredump@.service.in -@@ -22,7 +22,6 @@ IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes - Nice=9 --NoNewPrivileges=yes - OOMScoreAdjust=500 - PrivateDevices=yes - PrivateNetwork=yes -diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in -index b4f606cf78..f7977e1504 100644 ---- a/units/systemd-hostnamed.service.in -+++ b/units/systemd-hostnamed.service.in -@@ -19,7 +19,6 @@ ExecStart=@rootlibexecdir@/systemd-hostnamed - IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateDevices=yes - PrivateNetwork=yes - PrivateTmp=yes -diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in -index c276283908..f48d673d58 100644 ---- a/units/systemd-initctl.service.in -+++ b/units/systemd-initctl.service.in -@@ -14,6 +14,5 @@ DefaultDependencies=no - - [Service] - ExecStart=@rootlibexecdir@/systemd-initctl --NoNewPrivileges=yes - NotifyAccess=all - SystemCallArchitectures=native -diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in -index dd6322e62c..c867aca104 100644 ---- a/units/systemd-journal-remote.service.in -+++ b/units/systemd-journal-remote.service.in -@@ -17,7 +17,6 @@ ExecStart=@rootlibexecdir@/systemd-journal-remote --listen-https=-3 --output=/va - LockPersonality=yes - LogsDirectory=journal/remote - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateDevices=yes - PrivateNetwork=yes - PrivateTmp=yes -diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index fab405502a..308622e9b3 100644 ---- a/units/systemd-journald.service.in -+++ b/units/systemd-journald.service.in -@@ -22,7 +22,6 @@ FileDescriptorStoreMax=4224 - IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - Restart=always - RestartSec=0 - RestrictAddressFamilies=AF_UNIX AF_NETLINK -diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in -index 7bca34409a..05fb4f0c80 100644 ---- a/units/systemd-localed.service.in -+++ b/units/systemd-localed.service.in -@@ -19,7 +19,6 @@ ExecStart=@rootlibexecdir@/systemd-localed - IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateDevices=yes - PrivateNetwork=yes - PrivateTmp=yes -diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in -index 3eef95c661..53af530aea 100644 ---- a/units/systemd-logind.service.in -+++ b/units/systemd-logind.service.in -@@ -27,7 +27,6 @@ FileDescriptorStoreMax=512 - IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateTmp=yes - ProtectControlGroups=yes - ProtectHome=yes -diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in -index d6deefea08..092abc128f 100644 ---- a/units/systemd-machined.service.in -+++ b/units/systemd-machined.service.in -@@ -22,7 +22,6 @@ ExecStart=@rootlibexecdir@/systemd-machined - IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - ProtectHostname=yes - RestrictAddressFamilies=AF_UNIX AF_NETLINK AF_INET AF_INET6 - RestrictRealtime=yes -diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index 2c74da6f1e..eaabcb9941 100644 ---- a/units/systemd-networkd.service.in -+++ b/units/systemd-networkd.service.in -@@ -24,7 +24,6 @@ CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_N - ExecStart=!!@rootlibexecdir@/systemd-networkd - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - ProtectControlGroups=yes - ProtectHome=yes - ProtectKernelModules=yes -diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in -index eee5d5ea8f..a8f442ef6f 100644 ---- a/units/systemd-resolved.service.in -+++ b/units/systemd-resolved.service.in -@@ -25,7 +25,6 @@ CapabilityBoundingSet=CAP_SETPCAP CAP_NET_RAW CAP_NET_BIND_SERVICE - ExecStart=!!@rootlibexecdir@/systemd-resolved - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateDevices=yes - PrivateTmp=yes - ProtectControlGroups=yes -diff --git a/units/systemd-rfkill.service.in b/units/systemd-rfkill.service.in -index 3abb958310..7447ed5b5b 100644 ---- a/units/systemd-rfkill.service.in -+++ b/units/systemd-rfkill.service.in -@@ -18,7 +18,6 @@ Before=shutdown.target - - [Service] - ExecStart=@rootlibexecdir@/systemd-rfkill --NoNewPrivileges=yes - StateDirectory=systemd/rfkill - TimeoutSec=30s - Type=notify -diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in -index df546f471f..4d50999a22 100644 ---- a/units/systemd-timedated.service.in -+++ b/units/systemd-timedated.service.in -@@ -19,7 +19,6 @@ ExecStart=@rootlibexecdir@/systemd-timedated - IPAddressDeny=any - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateTmp=yes - ProtectControlGroups=yes - ProtectHome=yes -diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in -index 6512531e1c..2b2e1d73d2 100644 ---- a/units/systemd-timesyncd.service.in -+++ b/units/systemd-timesyncd.service.in -@@ -24,7 +24,6 @@ CapabilityBoundingSet=CAP_SYS_TIME - ExecStart=!!@rootlibexecdir@/systemd-timesyncd - LockPersonality=yes - MemoryDenyWriteExecute=yes --NoNewPrivileges=yes - PrivateDevices=yes - PrivateTmp=yes - ProtectControlGroups=yes diff --git a/0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch deleted file mode 100644 index 9aefc6d..0000000 --- a/0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0c670fec00f3d5c103d9b7415d4e0510c61ad006 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime - -If the symlink doesn't exists, and we are being started, let's -create it to provie name resolution. - -If it exists, do nothing. In particular, if it is a broken symlink, -we cannot really know if the administator configured it to point to -a location used by some service that hasn't started yet, so we -don't touch it in that case either. - -https://bugzilla.redhat.com/show_bug.cgi?id=1313085 ---- - src/resolve/resolved.c | 4 ++++ - tmpfiles.d/etc.conf.m4 | 3 --- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index 2ca9fbdc72..3c8a9ff12a 100644 ---- a/src/resolve/resolved.c -+++ b/src/resolve/resolved.c -@@ -49,6 +49,10 @@ static int run(int argc, char *argv[]) { - /* Drop privileges, but only if we have been started as root. If we are not running as root we assume most - * privileges are already dropped. */ - if (getuid() == 0) { -+ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); -+ if (r < 0 && errno != EEXIST) -+ log_warning_errno(errno, -+ "Could not create /etc/resolv.conf symlink: %m"); - - /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ - r = drop_privileges(uid, gid, -diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index f82e0b82ce..66a777bdb2 100644 ---- a/tmpfiles.d/etc.conf.m4 -+++ b/tmpfiles.d/etc.conf.m4 -@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - m4_ifdef(`HAVE_SMACK_RUN_LABEL', - t /etc/mtab - - - - security.SMACK64=_ - )m4_dnl --m4_ifdef(`ENABLE_RESOLVE', --L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --)m4_dnl - C! /etc/nsswitch.conf - - - - - m4_ifdef(`HAVE_PAM', - C! /etc/pam.d - - - - diff --git a/systemd.spec b/systemd.spec index 3190928..7fdd45a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 243 -Release: 6 +Release: 7 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -45,11 +45,7 @@ Source105: rule_generator.functions Source106: write_net_rules Source107: detect_virt -# https://bugzilla.redhat.com/show_bug.cgi?id=1738828 -#https://github.com/keszybz/systemd/commit/464a73411c13596a130a7a8f0ac00ca728e5f69e.patch -Patch0001: 464a73411c13596a130a7a8f0ac00ca728e5f69e.patch -Patch0002: 0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch -Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +Patch0001: 0001-udev-use-bfq-as-the-default-scheduler.patch #openEuler Patch9002: 1509-fix-journal-file-descriptors-leak-problems.patch @@ -1439,6 +1435,12 @@ fi %exclude /usr/share/man/man3/* %changelog +* Wed Jan 08 2020 openEuler Buildteam - 243-7 +- Type:NA +- ID:NA +- SUG:NA +- DESC:remove noneed patch + * Mon Dec 23 2019 openEuler Buildteam - 243-6 - Type:NA - ID:NA -- Gitee