The package rpms/greetd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/greetd.git/commit/?id=53e8c90d7f8....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 53e8c90d7f888a7b97c2dd5f6194d19ffe5adea1
Author: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Thu Jan 5 20:52:13 2023 -0800
Update to 0.9.0 (#2158656)
diff --git a/.gitignore b/.gitignore
index fea10ae..ec243d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
/results_*/
/x86_64
*.src.rpm
-/greetd-0.8.0.tar.gz
-/greetd-docs-a00d582a.md
+/greetd-0.9.0.tar.gz
+/greetd-docs-18faaa75.md
diff --git a/greetd-fix-metadata.diff b/greetd-fix-metadata.diff
index bdc9fe5..133ebb3 100644
--- a/greetd-fix-metadata.diff
+++ b/greetd-fix-metadata.diff
@@ -6,13 +6,13 @@ diff -rup greetd-0.8.0.orig/agreety/Cargo.toml
greetd-0.8.0/agreety/Cargo.toml
[dependencies]
-greetd_ipc = { path = "../greetd_ipc", features = ["sync-codec"]}
-+greetd_ipc = { version = "0.8.0", features = ["sync-codec"]}
++greetd_ipc = { version = "0.9.0", features = ["sync-codec"]}
inish = { path = "../inish"}
rpassword = "5.0"
getopts = "0.2"
- enquote = "1.0.3"
--nix = "0.19"
-+nix = "0.20"
+ enquote = "1.1"
+-nix = "0.26"
++nix = "0.24"
diff -rup greetd-0.8.0.orig/Cargo.toml greetd-0.8.0/Cargo.toml
--- greetd-0.8.0.orig/Cargo.toml 2021-09-10 04:00:36.053783328 +0000
+++ greetd-0.8.0/Cargo.toml 2021-09-10 04:00:48.617044265 +0000
@@ -30,8 +30,8 @@ diff -rup greetd-0.8.0.orig/fakegreet/Cargo.toml
greetd-0.8.0/fakegreet/Cargo.to
[dependencies]
serde = { version = "1.0", features = ["derive"] }
-greetd_ipc = { path = "../greetd_ipc", features = ["tokio-codec"] }
-+greetd_ipc = { version = "0.8.0", features = ["tokio-codec"] }
- tokio = { version = "1.0", features = ["process"] }
++greetd_ipc = { version = "0.9.0", features = ["tokio-codec"] }
+ tokio = { version = "1.5", features = ["process",
"macros", "time", "net", "rt"] }
thiserror = "1.0"
diff -rup greetd-0.8.0.orig/greetd/Cargo.toml greetd-0.8.0/greetd/Cargo.toml
--- greetd-0.8.0.orig/greetd/Cargo.toml 2021-09-10 04:00:36.053783328 +0000
@@ -40,14 +40,14 @@ diff -rup greetd-0.8.0.orig/greetd/Cargo.toml
greetd-0.8.0/greetd/Cargo.toml
debug = []
[dependencies]
--nix = "0.19"
-+nix = "0.20"
+-nix = "0.26"
++nix = "0.24"
pam-sys = "0.5.6"
users = "0.11.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-greetd_ipc = { path = "../greetd_ipc", features = ["tokio-codec"] }
-+greetd_ipc = { version = "0.8.0", features = ["tokio-codec"] }
++greetd_ipc = { version = "0.9.0", features = ["tokio-codec"] }
inish = { path = "../inish" }
libc = "0.2"
- tokio = { version = "1.0", features = ["net", "sync",
"macros", "signal", "rt", "io-util",
"time"] }
+ tokio = { version = "1", features = ["net", "sync",
"macros", "signal", "rt", "io-util",
"time"] }
diff --git a/greetd.spec b/greetd.spec
index 8ccc78b..bdf7294 100644
--- a/greetd.spec
+++ b/greetd.spec
@@ -1,4 +1,4 @@
-%global doc_commit a00d582a
+%global doc_commit 18faaa75
%global username greetd
%global selinuxtype targeted
%global forgeurl
https://git.sr.ht/~kennylevinsen/greetd
@@ -6,8 +6,8 @@
%bcond_without selinux
Name: greetd
-Version: 0.8.0
-Release: 3%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
Summary: A generic greeter daemon
# Apache-2.0
@@ -39,8 +39,6 @@ Patch: greetd-fix-metadata.diff
Provides: service(graphical-login) = greetd
-ExclusiveArch: %{rust_arches}
-
BuildRequires: make
BuildRequires: rust-packaging >= 23
BuildRequires: scdoc >= 1.10
@@ -70,7 +68,7 @@ without greetd daemon.
%if %{with selinux}
# SELinux subpackage
%package selinux
-Summary: %{name} SELinux policy
+Summary: SELinux policy for %{name}
BuildArch: noarch
Requires: selinux-policy-%{selinuxtype}
Requires(post): selinux-policy-%{selinuxtype}
@@ -208,7 +206,8 @@ fi
%endif
%changelog
-* Wed Aug 10 2022 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.8.0-3
+* Thu Jan 05 2023 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.9.0-1
+- Update to 0.9.0 (#2158656)
- Fix /var/lib/greetd ownership on ostree systems
- Convert to SPDX license format
- Drop patch for 1891682 - fixed in all supported releases.
diff --git a/sources b/sources
index 66e6ab1..2d4c2e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (greetd-0.8.0.tar.gz) =
40f007e38ca41faac97b3faba60e49d524c9e3afb4b594fcbc04a129701fa6177a915b2998e61f0ca615f4c8bd3078ef9fbd562c8fb72298f5605efd75a3f370
-SHA512 (greetd-docs-a00d582a.md) =
3535e6efd396d5e8c48476ef0bdf9f8b200dcfb516571e433bfb6baee4035ea360589e0b5bbbda8f303fa6185d22585133555e9064cbf3920834ae227dc4b186
+SHA512 (greetd-0.9.0.tar.gz) =
3ea8022e68384fc61417eec50f172ed2f4c1865d00c86816c5efc25c5d21572c3013d472a7c532846cb1a90f79171d44383b844f03eeab50ffc869947b2fac78
+SHA512 (greetd-docs-18faaa75.md) =
463c63be2384b3d6561709a13cce6f480a8c197633c3dccda2a0167718486bb46d58deb7a5c91258334f92b4cbe305afd30f7d26eb06517946f8ff7327b3b4b0
commit bd7ae4597f7a99b84da5105c3e425528b10927ba
Author: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Thu Jan 5 20:49:54 2023 -0800
Drop patch for 1891682 - fixed in all supported releases.
diff --git a/greetd-rhbz1891682.patch b/greetd-rhbz1891682.patch
deleted file mode 100644
index 7f11605..0000000
--- a/greetd-rhbz1891682.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/greetd/src/session/worker.rs b/greetd/src/session/worker.rs
-index 8b87ac8..00e44bb 100644
---- a/greetd/src/session/worker.rs
-+++ b/greetd/src/session/worker.rs
-@@ -211,7 +211,7 @@ fn worker(sock: &UnixDatagram) -> Result<(), Error> {
- let cusername = CString::new(username)?;
- let command = if source_profile {
- format!(
-- "[ -f /etc/profile ] && . /etc/profile; [ -f $HOME/.profile ]
&& . $HOME/.profile; exec {}",
-+ "unset BASH_VERSION; [ -f /etc/profile ] && . /etc/profile; [
-f $HOME/.profile ] && . $HOME/.profile; exec {}",
- cmd.join(" ")
- )
- } else {
diff --git a/greetd.spec b/greetd.spec
index 70f20ac..8ccc78b 100644
--- a/greetd.spec
+++ b/greetd.spec
@@ -35,9 +35,7 @@ Source103: %{name}.sysusers
Source104: %{name}.tmpfiles
# Update dependencies and unbundle greetd_ipc crate.
-Patch0: greetd-fix-metadata.diff
-# Fix unexpected sourcing of bashrc from /etc/profile
-Patch1: greetd-rhbz1891682.patch
+Patch: greetd-fix-metadata.diff
Provides: service(graphical-login) = greetd
@@ -213,6 +211,7 @@ fi
* Wed Aug 10 2022 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.8.0-3
- Fix /var/lib/greetd ownership on ostree systems
- Convert to SPDX license format
+- Drop patch for 1891682 - fixed in all supported releases.
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit 6f9a41ddfbe0f381ab123c3fe9179a3bf497c873
Author: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Fri Aug 12 00:45:45 2022 -0700
Convert to SPDX license format.
Generate LICENSE.dependencies during build.
diff --git a/LICENSE.dependencies b/LICENSE.dependencies
deleted file mode 100644
index d20c0ac..0000000
--- a/LICENSE.dependencies
+++ /dev/null
@@ -1,35 +0,0 @@
-ASL 2.0 or Boost: rust-ryu 1.0.9
-ASL 2.0 or MIT: rust-autocfg 1.1.0
-ASL 2.0 or MIT: rust-pin-project-lite 0.2.8
-ASL 2.0 or MIT: rust-signal-hook-registry 1.4.0
-ASL 2.0: rust-rpassword 5.0.1
-GPLv3: rust-greetd_ipc 0.8.0
-MIT or ASL 2.0: rust-async-trait 0.1.53
-MIT or ASL 2.0: rust-bitflags 1.3.2
-MIT or ASL 2.0: rust-cfg-if 1.0.0
-MIT or ASL 2.0: rust-getopts 0.2.21
-MIT or ASL 2.0: rust-itoa 1.0.1
-MIT or ASL 2.0: rust-libc 0.2.121
-MIT or ASL 2.0: rust-log 0.4.16
-MIT or ASL 2.0: rust-once_cell 1.10.0
-MIT or ASL 2.0: rust-pam-sys 0.5.6
-MIT or ASL 2.0: rust-proc-macro2 1.0.36
-MIT or ASL 2.0: rust-quote 1.0.17
-MIT or ASL 2.0: rust-serde 1.0.136
-MIT or ASL 2.0: rust-serde_derive 1.0.136
-MIT or ASL 2.0: rust-serde_json 1.0.79
-MIT or ASL 2.0: rust-socket2 0.4.4
-MIT or ASL 2.0: rust-syn 1.0.90
-MIT or ASL 2.0: rust-thiserror 1.0.30
-MIT or ASL 2.0: rust-thiserror-impl 1.0.30
-MIT or ASL 2.0: rust-unicode-width 0.1.9
-MIT or ASL 2.0: rust-unicode-xid 0.2.2
-MIT: rust-bytes 1.1.0
-MIT: rust-memoffset 0.6.5
-MIT: rust-mio 0.8.2
-MIT: rust-nix0.20 0.20.2
-MIT: rust-tokio 1.17.0
-MIT: rust-tokio-macros 1.7.0
-MIT: rust-users 0.11.0
-Unlicense or MIT: rust-memchr 2.4.1
-Unlicense: rust-enquote 1.1.0
diff --git a/greetd.spec b/greetd.spec
index fbf830b..70f20ac 100644
--- a/greetd.spec
+++ b/greetd.spec
@@ -10,17 +10,15 @@ Version: 0.8.0
Release: 3%{?dist}
Summary: A generic greeter daemon
-# Upstream license specification: GPL-3.0
-# ASL 2.0
-# ASL 2.0 or Boost
-# ASL 2.0 or MIT
-# GPLv3
+# Apache-2.0
+# Apache-2.0 OR BSL-1.0
+# Apache-2.0 OR MIT
+# GPL-3.0
# MIT
-# MIT or ASL 2.0
+# MIT OR Apache-2.0
# Unlicense
-# Unlicense or MIT
-# See LICENSE.dependencies for a full list of buildroot crates and licenses
-License: GPLv3 and ASL 2.0 and MIT and Unlicense
+# Unlicense OR MIT
+License: GPL-3.0-only AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0
OR MIT) AND MIT AND Unlicense AND (Unlicense OR MIT)
URL:
https://kl.wtf/projects/greetd
Source0: %{forgeurl}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# Better offline documentation file
@@ -35,8 +33,6 @@ Source102: %{name}-greeter.pam
Source103: %{name}.sysusers
# /var/lib/greetd contents and ownership
Source104: %{name}.tmpfiles
-# Full list of buildroot crates and dependencies
-Source105: LICENSE.dependencies
# Update dependencies and unbundle greetd_ipc crate.
Patch0: greetd-fix-metadata.diff
@@ -48,7 +44,7 @@ Provides: service(graphical-login) = greetd
ExclusiveArch: %{rust_arches}
BuildRequires: make
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 23
BuildRequires: scdoc >= 1.10
BuildRequires: sed
BuildRequires: systemd-rpm-macros
@@ -90,7 +86,6 @@ Custom SELinux policy module for %{name}
%prep
%autosetup -p1
%cargo_prep
-cp %{SOURCE105} .
# patch greetd daemon user
sed -i 's/"greeter"/"%{username}"/' config.toml
# replace README with a better documentation file
@@ -110,6 +105,7 @@ done
%build
%cargo_build
+%{?cargo_license} >LICENSE.dependencies
%make_build -C man
%if %{with selinux}
@@ -155,7 +151,7 @@ XDG_CONFIG_DIR=%{_sharedstatedir}/%{name}/.config
if [ ! -d $XDG_CONFIG_DIR/systemd ]; then
mkdir -p $XDG_CONFIG_DIR/systemd/user
ln -sf /dev/null $XDG_CONFIG_DIR/systemd/user/xdg-desktop-portal.service
- chown -R %{username}:%{username} $XDG_CONFIG_DIR
+ chown -R %{username}:%{username} $XDG_CONFIG_DIR
fi
exit 0
@@ -216,6 +212,7 @@ fi
%changelog
* Wed Aug 10 2022 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.8.0-3
- Fix /var/lib/greetd ownership on ostree systems
+- Convert to SPDX license format
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit 67997f01fd59cbce2fb74ff90350a7faaa8ef9b5
Author: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Sun Jul 10 00:43:11 2022 -0700
Fix /var/lib/greetd ownership on ostree systems
diff --git a/greetd.spec b/greetd.spec
index c292d2a..fbf830b 100644
--- a/greetd.spec
+++ b/greetd.spec
@@ -7,7 +7,7 @@
Name: greetd
Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A generic greeter daemon
# Upstream license specification: GPL-3.0
@@ -33,8 +33,10 @@ Source101: %{name}.pam
Source102: %{name}-greeter.pam
# User definition
Source103: %{name}.sysusers
+# /var/lib/greetd contents and ownership
+Source104: %{name}.tmpfiles
# Full list of buildroot crates and dependencies
-Source104: LICENSE.dependencies
+Source105: LICENSE.dependencies
# Update dependencies and unbundle greetd_ipc crate.
Patch0: greetd-fix-metadata.diff
@@ -50,6 +52,7 @@ BuildRequires: rust-packaging
BuildRequires: scdoc >= 1.10
BuildRequires: sed
BuildRequires: systemd-rpm-macros
+%{?sysusers_requires_compat}
%if %{with selinux}
# This ensures that the *-selinux package and all it’s dependencies are not pulled
@@ -87,7 +90,7 @@ Custom SELinux policy module for %{name}
%prep
%autosetup -p1
%cargo_prep
-cp %{SOURCE104} .
+cp %{SOURCE105} .
# patch greetd daemon user
sed -i 's/"greeter"/"%{username}"/' config.toml
# replace README with a better documentation file
@@ -132,6 +135,7 @@ install -D -m644 -vp config.toml
%{buildroot}%{_sysconfdir}/%{name}/confi
install -D -m644 -vp %{SOURCE101} %{buildroot}%{_sysconfdir}/pam.d/%{name}
install -D -m644 -vp %{SOURCE102} %{buildroot}%{_sysconfdir}/pam.d/%{name}-greeter
install -D -m644 -vp %{SOURCE103} %{buildroot}%{_sysusersdir}/%{name}.conf
+install -D -m644 -vp %{SOURCE104} %{buildroot}%{_tmpfilesdir}/%{name}.conf
install -d -m750 -vp %{buildroot}%{_sharedstatedir}/%{name}
@@ -195,6 +199,7 @@ fi
%{_mandir}/man5/greetd.5*
%{_mandir}/man7/greetd-ipc.7*
%{_sysusersdir}/%{name}.conf
+%{_tmpfilesdir}/%{name}.conf
%{_unitdir}/%{name}.service
%files fakegreet
@@ -209,6 +214,9 @@ fi
%endif
%changelog
+* Wed Aug 10 2022 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 0.8.0-3
+- Fix /var/lib/greetd ownership on ostree systems
+
* Thu Jul 21 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.8.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/greetd.sysusers b/greetd.sysusers
index 1022001..fe7a3f0 100644
--- a/greetd.sysusers
+++ b/greetd.sysusers
@@ -1,2 +1,2 @@
#Type Name ID GECOS Home directory Shell
-u greetd - "greetd daemon" /var/lib/greetd /sbin/nologin
+u greetd - "greetd daemon" /var/lib/greetd
diff --git a/greetd.tmpfiles b/greetd.tmpfiles
new file mode 100644
index 0000000..f0cf431
--- /dev/null
+++ b/greetd.tmpfiles
@@ -0,0 +1,3 @@
+# Path Mode User Group Age Argument
+# Dynamic users/groups are not stable across builds (see also:
https://pagure.io/fedora-kde/SIG/issue/87)
+Z /var/lib/greetd - greetd greetd - -