diff --git a/0001-basic-update-CIFS-magic.patch b/0001-basic-update-CIFS-magic.patch deleted file mode 100644 index 098a4ed18a3c0fe0447009c21843b1a27075636f..0000000000000000000000000000000000000000 --- a/0001-basic-update-CIFS-magic.patch +++ /dev/null @@ -1,68 +0,0 @@ -From bbe53713455be38c0a587626439fd171f28c77fc Mon Sep 17 00:00:00 2001 -From: Frantisek Sumsal -Date: Sun, 30 Jan 2022 23:40:05 +0100 -Subject: [PATCH] basic: update CIFS magic - -Kernel commit dea2903719283c156b53741126228c4a1b40440f exposed (and -renamed) CIFS_MAGIC_NUMBER as CIFS_SUPER_MAGIC along with -SMB2_SUPER_MAGIC. - -This fixes the following build fail on current Fedora Rawhide: -``` -../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers: - -Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC -Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC -``` ---- - src/basic/filesystems-gperf.gperf | 4 ++-- - src/basic/missing_magic.h | 11 ++++++++--- - 2 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/src/basic/filesystems-gperf.gperf b/src/basic/filesystems-gperf.gperf -index 08c8c44510..e8c5357f91 100644 ---- a/src/basic/filesystems-gperf.gperf -+++ b/src/basic/filesystems-gperf.gperf -@@ -40,7 +40,7 @@ ceph, {CEPH_SUPER_MAGIC} - cgroup2, {CGROUP2_SUPER_MAGIC} - # note that the cgroupfs magic got reassigned from cpuset - cgroup, {CGROUP_SUPER_MAGIC} --cifs, {CIFS_MAGIC_NUMBER} -+cifs, {CIFS_SUPER_MAGIC, SMB2_SUPER_MAGIC} - coda, {CODA_SUPER_MAGIC} - configfs, {CONFIGFS_MAGIC} - cramfs, {CRAMFS_MAGIC} -@@ -109,7 +109,7 @@ selinuxfs, {SELINUX_MAGIC} - shiftfs, {SHIFTFS_MAGIC} - smackfs, {SMACK_MAGIC} - # smb3 is an alias for cifs --smb3, {CIFS_MAGIC_NUMBER} -+smb3, {CIFS_SUPER_MAGIC} - # smbfs was removed from the kernel in 2010, the magic remains - smbfs, {SMB_SUPER_MAGIC} - sockfs, {SOCKFS_MAGIC} -diff --git a/src/basic/missing_magic.h b/src/basic/missing_magic.h -index 7d9320bb6d..c104fcfba3 100644 ---- a/src/basic/missing_magic.h -+++ b/src/basic/missing_magic.h -@@ -38,9 +38,14 @@ - #define XFS_SB_MAGIC 0x58465342 - #endif - --/* Not exposed yet. Defined at fs/cifs/cifsglob.h */ --#ifndef CIFS_MAGIC_NUMBER --#define CIFS_MAGIC_NUMBER 0xFF534D42 -+/* dea2903719283c156b53741126228c4a1b40440f (5.17) */ -+#ifndef CIFS_SUPER_MAGIC -+#define CIFS_SUPER_MAGIC 0xFF534D42 -+#endif -+ -+/* dea2903719283c156b53741126228c4a1b40440f (5.17) */ -+#ifndef SMB2_SUPER_MAGIC -+#define SMB2_SUPER_MAGIC 0xFE534D42 - #endif - - /* 257f871993474e2bde6c497b54022c362cf398e1 (4.5) */ --- -2.19.1.6.gb485710b - diff --git a/systemd.spec b/systemd.spec index b81e8c9bc0d0663736e0bb48840912c6e60d04d2..3899f2bf4706eecf066d4f863b1eed3788d0f4e2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,11 +20,11 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 250 +Version: 250.4 Release: %{anolis_release}%{?dist} License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager -Source0: https://github.com/systemd/systemd/archive/refs/tags/%{name}-%{version}.tar.gz +Source0: https://github.com/systemd/systemd-stable/archive/refs/tags/v%{version}.tar.gz # This file must be available before %%prep. # It is generated during systemd build and can be found in build/src/core/. @@ -54,8 +54,6 @@ Source22: sysusers.attr Source23: sysusers.prov Source24: sysusers.generate-pre.sh -Patch1: 0001-basic-update-CIFS-magic.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: clang @@ -94,7 +92,6 @@ BuildRequires: qrencode-devel BuildRequires: libmicrohttpd-devel BuildRequires: libxkbcommon-devel BuildRequires: iptables-devel -BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(tss2-esys) BuildRequires: pkgconfig(tss2-rc) BuildRequires: pkgconfig(tss2-mu) @@ -251,7 +248,6 @@ Recommends: libelf.so.1%{?elf_suffix} Recommends: libelf.so.1(ELFUTILS_1.7)%{?elf_bits} # used by home, cryptsetup, cryptenroll -Recommends: libfido2.so.1%{?elf_suffix} Recommends: libtss2-esys.so.0%{?elf_suffix} Recommends: libtss2-mu.so.0%{?elf_suffix} Recommends: libtss2-rc.so.0%{?elf_suffix} @@ -371,7 +367,7 @@ other libraries from systemd-libs. This package conflicts with the main systemd package and is meant for use in non-systemd systems. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-stable-%{version} -p1 test -f src/login/systemd-user.in cp %{SOURCE12} src/login/systemd-user.in @@ -422,7 +418,7 @@ CONFIGURE_OPTS=( -Dlibidn2=true -Dlibiptc=false -Dlibcurl=true - -Dlibfido2=true + -Dlibfido2=false -Defi=true -Dgnu-efi="true" -Dtpm=true @@ -861,6 +857,12 @@ fi %files standalone-sysusers -f .file-list-standalone-sysusers %changelog +* Fri Mar 25 2022 Chunmei Xu - 250.4-1 +- update to 250.4 from stable repo + +* Wed Mar 23 2022 Chunmei Xu - 250-2 +- disable libfido2 + * Thu Mar 03 2022 Chunmei Xu - 250-1 - init from upstream v250 - fix build failed with "found unknown filesystem(s) defined in kernel headers" diff --git a/systemd-250.tar.gz b/v250.4.tar.gz similarity index 57% rename from systemd-250.tar.gz rename to v250.4.tar.gz index 29a42f04e949865f019f70c50ecbe3e9bf57012b..3149d2994d497478f6caedcc7d5de0035c274c71 100644 Binary files a/systemd-250.tar.gz and b/v250.4.tar.gz differ