commit 3334bf8f1530b6844335384d6d9b2c95afac6184
Author: Jan Palus <[email protected]>
Date: Wed Jul 13 16:45:58 2022 +0200
up to 251.3
size_t-format.patch | 25 -------------------------
systemd-split-usr-fix.patch | 4 ++--
systemd.spec | 8 +++-----
3 files changed, 5 insertions(+), 32 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index d8cf926..7a3fbf2 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -29,14 +29,14 @@ 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: 251.2
+Version: 251.3
Release: 1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
#Source0Download: https://github.com/systemd/systemd/releases
Source0:
https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b5cc5a46e80ab3aa25f8e15f763b05fa
+# Source0-md5: 114c576ea4b80c719336351d9c862add
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -79,8 +79,7 @@ Patch13: sysctl.patch
Patch14: pld-pam-%{name}-user.patch
Patch15: %{name}-x32.patch
Patch16: rpm-macros.patch
-Patch17: size_t-format.patch
-Patch18: %{name}-include.patch
+Patch17: %{name}-include.patch
URL: https://www.freedesktop.org/wiki/Software/systemd/
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -774,7 +773,6 @@ Makra RPM-a definiujące ścieżki i skryptlety związane z
systemd.
%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p1
cp -p %{SOURCE2} src/systemd_booted.c
diff --git a/size_t-format.patch b/size_t-format.patch
deleted file mode 100644
index c9fa299..0000000
--- a/size_t-format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eeb94014a14d68c6b661b77883ee96b9b20e5e7a Mon Sep 17 00:00:00 2001
-From: Daan De Meyer <[email protected]>
-Date: Sun, 22 May 2022 14:36:07 +0200
-Subject: [PATCH] coredump: Fix format string type mismatch
-
-Fixes #23471
----
- src/coredump/coredump.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
-index 003d4f74d16c..fc1b7bb43459 100644
---- a/src/coredump/coredump.c
-+++ b/src/coredump/coredump.c
-@@ -512,8 +512,8 @@ static int save_external_coredump(
-
- if (truncated)
- log_struct(LOG_INFO,
-- LOG_MESSAGE("Core file was truncated to %zu
bytes.", max_size),
-- "SIZE_LIMIT=%zu", max_size,
-+ LOG_MESSAGE("Core file was truncated to %"PRIu64"
bytes.", max_size),
-+ "SIZE_LIMIT=%"PRIu64, max_size,
- "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR);
-
- r = fix_permissions(fd, tmp, fn, context, uid);
diff --git a/systemd-split-usr-fix.patch b/systemd-split-usr-fix.patch
index 13175b3..9b239d2 100644
--- a/systemd-split-usr-fix.patch
+++ b/systemd-split-usr-fix.patch
@@ -1,8 +1,8 @@
--- systemd-stable-249.4/src/core/systemd.pc.in.orig 2021-08-24
13:04:08.000000000 +0200
+++ systemd-stable-249.4/src/core/systemd.pc.in 2021-09-27
19:10:02.119608114 +0200
@@ -65,16 +65,16 @@ systemdshutdowndir=${systemd_shutdown_di
- tmpfiles_dir=${prefix}/lib/tmpfiles.d
- tmpfilesdir=${tmpfiles_dir}
+
+ user_tmpfiles_dir=${prefix}/share/user-tmpfiles.d
-sysusers_dir=${rootprefix}/lib/sysusers.d
+sysusers_dir=${prefix}/lib/sysusers.d
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/a781c36262be2b1dfdc6064ba319dedcbf1139b5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
