Your message dated Thu, 02 May 2024 18:34:32 +0000
with message-id <e1s2bgk-002s6e...@fasolo.debian.org>
and subject line Bug#1064480: fixed in greetd 0.9.0-6.1
has caused the Debian Bug report #1064480,
regarding aardvark-dns - upcoming rust-nix update.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1064480: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1064480
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: greetd
Version: 0.9.0-6
We are preparing an update of rust-nix to version 0.27, the new version has
been uploaded to experlmental.
To build with this new version of nix, aardvark-dns needs a small patch
taken from upstream. A debdiff is attached, if I get no response I will
likely NMU this once the new version of rust-nix is in unstable.
diff -Nru greetd-0.9.0/debian/changelog greetd-0.9.0/debian/changelog
--- greetd-0.9.0/debian/changelog 2023-12-21 14:17:58.000000000 +0000
+++ greetd-0.9.0/debian/changelog 2024-02-22 22:50:17.000000000 +0000
@@ -1,3 +1,11 @@
+greetd (0.9.0-6.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream patch for nix 0.27
+ * Tighten build-dependency on nix.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 22 Feb 2024 22:50:17 +0000
+
greetd (0.9.0-6) unstable; urgency=medium
* Relax dependency on rpassword (Closes: #1057931).
diff -Nru greetd-0.9.0/debian/control greetd-0.9.0/debian/control
--- greetd-0.9.0/debian/control 2023-12-21 14:17:58.000000000 +0000
+++ greetd-0.9.0/debian/control 2024-02-22 22:50:17.000000000 +0000
@@ -6,7 +6,7 @@
debhelper-compat (= 13),
dh-cargo,
# greetd & greetd_ipc
- librust-nix-dev (>= 0.25),
+ librust-nix-0.27-dev,
librust-pam-sys-dev (>= 0.5.6),
librust-users-dev (>= 0.11.0),
librust-serde-derive-dev (>= 1.0),
diff -Nru greetd-0.9.0/debian/patches/nix-0.27.patch
greetd-0.9.0/debian/patches/nix-0.27.patch
--- greetd-0.9.0/debian/patches/nix-0.27.patch 1970-01-01 00:00:00.000000000
+0000
+++ greetd-0.9.0/debian/patches/nix-0.27.patch 2024-02-22 22:46:40.000000000
+0000
@@ -0,0 +1,43 @@
+This patch is based on the upstream commit described below, adapted for use
+in the Debian package by Peter Michael Green.
+
+commit 161218164d366482ab7fab9dcc59cbd40623ac2c
+Author: Kenny Levinsen <k...@kl.wtf>
+Date: Wed Feb 7 15:14:24 2024 +0100
+
+ Update dependencies
+
+diff --git a/greetd/Cargo.toml b/greetd/Cargo.toml
+index c206ac1..3b1446f 100644
+--- a/greetd/Cargo.toml
++++ b/greetd/Cargo.toml
+@@ -14,1 +14,1 @@ repository = "https://git.sr.ht/~kennylevinsen/greetd/";
+-nix = "0.26"
++nix = { version = "0.27", features = ["ioctl", "signal", "user", "fs",
"mman"] }
+diff --git a/greetd/src/main.rs b/greetd/src/main.rs
+index b88c6dc..92a53d4 100644
+--- a/greetd/src/main.rs
++++ b/greetd/src/main.rs
+@@ -22,7 +22,7 @@ use crate::{error::Error, session::worker};
+
+ async fn session_worker_main(config: config::Config) -> Result<(), Error> {
+ let raw_fd = config.internal.session_worker as RawFd;
+- let mut cur_flags = unsafe { FdFlag::from_bits_unchecked(fcntl(raw_fd,
FcntlArg::F_GETFD)?) };
++ let mut cur_flags = FdFlag::from_bits_retain(fcntl(raw_fd,
FcntlArg::F_GETFD)?);
+ cur_flags.insert(FdFlag::FD_CLOEXEC);
+ fcntl(raw_fd, FcntlArg::F_SETFD(cur_flags))?;
+ let sock = unsafe { UnixDatagram::from_raw_fd(raw_fd) };
+diff --git a/greetd/src/session/interface.rs b/greetd/src/session/interface.rs
+index f1d3f04..b31f47f 100644
+--- a/greetd/src/session/interface.rs
++++ b/greetd/src/session/interface.rs
+@@ -99,8 +99,7 @@ impl Session {
+ UnixDatagram::pair().map_err(|e| format!("could not create pipe:
{}", e))?;
+
+ let raw_child = childfd.as_raw_fd();
+- let mut cur_flags =
+- unsafe { FdFlag::from_bits_unchecked(fcntl(raw_child,
FcntlArg::F_GETFD)?) };
++ let mut cur_flags = FdFlag::from_bits_retain(fcntl(raw_child,
FcntlArg::F_GETFD)?);
+ cur_flags.remove(FdFlag::FD_CLOEXEC);
+ fcntl(raw_child, FcntlArg::F_SETFD(cur_flags))?;
+
diff -Nru greetd-0.9.0/debian/patches/relax_deps.patch
greetd-0.9.0/debian/patches/relax_deps.patch
--- greetd-0.9.0/debian/patches/relax_deps.patch 2023-12-21
14:17:58.000000000 +0000
+++ greetd-0.9.0/debian/patches/relax_deps.patch 2024-02-22
22:48:38.000000000 +0000
@@ -15,15 +15,4 @@
getopts = "0.2"
enquote = "1.1"
-nix = "0.26"
-+nix = ">=0.26"
---- a/greetd/Cargo.toml
-+++ b/greetd/Cargo.toml
-@@ -11,7 +11,7 @@
- debug = []
-
- [dependencies]
--nix = "0.26"
-+nix = ">=0.26"
- pam-sys = "0.5.6"
- users = "0.11.0"
- serde = { version = "1.0", features = ["derive"] }
++nix = ">= 0.26"
diff -Nru greetd-0.9.0/debian/patches/series greetd-0.9.0/debian/patches/series
--- greetd-0.9.0/debian/patches/series 2023-12-21 14:17:58.000000000 +0000
+++ greetd-0.9.0/debian/patches/series 2024-02-22 22:46:06.000000000 +0000
@@ -2,3 +2,4 @@
config_tweaks.patch
relax_deps.patch
rpassword_6.0_adaptation.patch
+nix-0.27.patch
--- End Message ---
--- Begin Message ---
Source: greetd
Source-Version: 0.9.0-6.1
Done: Peter Michael Green <plugw...@debian.org>
We believe that the bug you reported is fixed in the latest version of
greetd, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1064...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Peter Michael Green <plugw...@debian.org> (supplier of updated greetd package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 02 May 2024 16:30:23 +0000
Source: greetd
Architecture: source
Version: 0.9.0-6.1
Distribution: unstable
Urgency: medium
Maintainer: Marc Dequènes (Duck) <d...@duckcorp.org>
Changed-By: Peter Michael Green <plugw...@debian.org>
Closes: 1064480
Changes:
greetd (0.9.0-6.1) unstable; urgency=medium
.
* Non-maintainer upload.
* Add upstream patch for nix 0.27 (Closes: #1064480)
* Tighten build-dependency on nix.
Checksums-Sha1:
9ed58e074a0c63674e9db6d922be4700166129e0 2240 greetd_0.9.0-6.1.dsc
f675b2e444f9322228b83441ed66f92872626816 5800 greetd_0.9.0-6.1.debian.tar.xz
8de2859d15d8974c3d622ddb851f9f5e0bd3b617 13118
greetd_0.9.0-6.1_source.buildinfo
Checksums-Sha256:
d8100fa7aa50f9c9304928e2f7fd64a20a63afea266039287ec036cb9d6e7882 2240
greetd_0.9.0-6.1.dsc
2c81b22a0ed0b53a8f678204e6ed661f0184b7d251096bc919db76c4ec2f7850 5800
greetd_0.9.0-6.1.debian.tar.xz
96d5e9a7748fee480e51f4686a28d13d1b730345c860d3d99937e41e1c78e1f9 13118
greetd_0.9.0-6.1_source.buildinfo
Files:
7ad495a97c74a49814cfd8ed651a1ba9 2240 misc optional greetd_0.9.0-6.1.dsc
0d466143ac9bf5f1dc33da05159d14f6 5800 misc optional
greetd_0.9.0-6.1.debian.tar.xz
5c30a973acfc219f3d7a59e3c2e53dc6 13118 misc optional
greetd_0.9.0-6.1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJIBAEBCAAyFiEEU0DQATYMplbjSX63DEjqKnqP/XsFAmYz2jUUHHBsdWd3YXNo
QGRlYmlhbi5vcmcACgkQDEjqKnqP/Xvtig//atDEZ4qbCbDYEGLfU6BDP6vYAIME
vWJZAYtLadybNUWjDVcC9HZO1WgDR2lWIysfDKVSlBO0YNCs6rOIYN+FsdLiF0Hb
To2uvbZDrpoufnzheMALTAS5xNLQ7+/RMNMH4uWVK+uV8O1f32QhkZazpVCBCPzO
hHQ1CDDiaGs9vTN4Ram6f9PHTIqnrIczCxC8Km2nExQ/lwB3BEVxdEPG81d5fPm9
nYpxVC+zECT87YMJr/ACnfR+r1efgweHBtkaHuxbwp96u9hWSC3qUbxrUHEZycCC
Gpnnqry3lQ8gM6C2yANHTOKZRcZCMECnl3PDanolfUsSYJEvjXtvkV/S8Brz7dXO
sESdX7JoVK5vSeB4OYr0aDrRcoFOYNNTLI8GV4xU2JDj1vdH0fOmt+Hstpi2TiTF
6zc7b/xO3G7hwpr1z/oB+GqIHBwytXzwq45rxzAw/T1AIs4nidwrmOVooGMSLcW3
D0EV52sZcrlexxkcXfMGRUzHX8jiPWyG2Q/+NaCFGJdNLXhPZQ6PBOVMdJ1OdYjX
leOft+ii2e1qrxMKdaCoO5qYoaenwAQAOZnKeQMA8gQqNeaD05E4Su7wTno6GLmM
WCqm46X/ZqWe6t+1QoRL346OVZKnSqU3S+kJw6mG7HNfmRPzeURVLftCzpRqduZA
Lnfl2zEIJlR5Kpg=
=gTQB
-----END PGP SIGNATURE-----
pgpPCW8pQwemN.pgp
Description: PGP signature
--- End Message ---
