From: Jan Palus <atler@pld-linux.org>
Date: Tue, 20 Jul 2021 17:13:02 +0000 (+0200)
Subject: up to 249.1
X-Git-Tag: auto/th/systemd-249.4-1~10
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsystemd.git;a=commitdiff_plain;h=8fd7539

up to 249.1
---

diff --git a/hostnamed-errno.patch b/hostnamed-errno.patch
deleted file mode 100644
index 286721d..0000000
--- a/hostnamed-errno.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4b5e7c3eaa0ccf5f438d1793fe07daaf59bc73f6 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Thu, 8 Jul 2021 00:23:21 +0200
-Subject: [PATCH] hostnamed: correct variable with errno in fallback_chassis
-
-fixes assertion failure on arm:
-
-systemd-hostnamed[642]: Assertion '(_error) != 0' failed at src/hostname/hostnamed.c:207, function fallback_chassis(). Aborting.
----
- src/hostname/hostnamed.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index bd535ddc4d..36702f2fb0 100644
---- a/src/hostname/hostnamed.c
-+++ b/src/hostname/hostnamed.c
-@@ -204,14 +204,14 @@ static const char* fallback_chassis(void) {
- 
-         r = read_one_line_file("/sys/class/dmi/id/chassis_type", &type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed to read DMI chassis type, ignoring: %m");
-+                log_debug_errno(r, "Failed to read DMI chassis type, ignoring: %m");
-                 goto try_acpi;
-         }
- 
-         r = safe_atou(type, &t);
-         free(type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed to parse DMI chassis type, ignoring: %m");
-+                log_debug_errno(r, "Failed to parse DMI chassis type, ignoring: %m");
-                 goto try_acpi;
-         }
- 
-@@ -260,14 +260,14 @@ static const char* fallback_chassis(void) {
- try_acpi:
-         r = read_one_line_file("/sys/firmware/acpi/pm_profile", &type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed read ACPI PM profile, ignoring: %m");
-+                log_debug_errno(r, "Failed read ACPI PM profile, ignoring: %m");
-                 return NULL;
-         }
- 
-         r = safe_atou(type, &t);
-         free(type);
-         if (r < 0) {
--                log_debug_errno(v, "Failed parse ACPI PM profile, ignoring: %m");
-+                log_debug_errno(r, "Failed parse ACPI PM profile, ignoring: %m");
-                 return NULL;
-         }
- 
--- 
-2.32.0
-
diff --git a/systemd.spec b/systemd.spec
index bdd96df..c963573 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -30,14 +30,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:	249
+Version:	249.1
 Release:	0.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:	fb0481dfe8f30ea06d270005f1039364
+# Source0-md5:	f237f154c1085de78503fc2b767e4173
 Source1:	%{name}-sysv-convert
 Source2:	%{name}_booted.c
 Source3:	network.service
@@ -76,7 +76,6 @@ Patch8:		proc-hidepid.patch
 Patch9:		%{name}-configfs.patch
 Patch10:	pld-boot_efi_mount.patch
 Patch11:	optional-tmp-on-tmpfs.patch
-Patch12:	hostnamed-errno.patch
 Patch13:	sysctl.patch
 Patch14:	pld-pam-%{name}-user.patch
 Patch15:	%{name}-x32.patch
@@ -736,7 +735,6 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1