--- Begin Message ---
Package: release.debian.org
Control: affects -1 + src:greetd
X-Debbugs-Cc: greetd@packages.debian.org
User: release.debian.org@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package greetd.
[ Reason ]
This is related to #1032914. I coordinated with the phog package
maintainer to fix the situation.
[ Impact ]
PAM configuration conflicts with phog's embedded version (in previous
version).
[ Tests ]
There are no upstream tests that cover this code.
I have no idea how to make autopkgtests for interactive graphical
programs yet, so none either.
I have manually tested it on my system, the phog maintainer too, and the
package has been in unstable for some time without complaint.
[ Risks ]
None I can see.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
[ Other info ]
Thanks for all the hard work.
unblock greetd/0.9.0-3
\_o<
--
Marc Dequènes
diff -Nru greetd-0.9.0/debian/changelog greetd-0.9.0/debian/changelog
--- greetd-0.9.0/debian/changelog 2023-02-09 00:38:57.000000000 +0900
+++ greetd-0.9.0/debian/changelog 2023-03-31 12:12:29.000000000 +0900
@@ -1,3 +1,29 @@
+greetd (0.9.0-3) unstable; urgency=medium
+
+ [ Arnaud Ferraris ]
+ * Update PAM configuration(s)
+ Except for the gnome-keyring bits, all items currently set in the
+ `greetd` PAM config are already part of the `login` config. Including
+ the latter makes the `greetd` config simpler.
+ This commit also calls the PAM modules needed for unlocking the KDE
+ wallet as well, and adds the `greetd-greeter` config (simply including
+ `login` as the greeter itself doesn't need to deal with keyrings).
+ Finally, switch to using debhelper for installing the configs instead of
+ handling those manually.
+ * Add Breaks/Replaces relationships on older `phog`
+ `phog` used to ship the `greetd` and `greetd-greeter` PAM configs,
+ leading to conflicts with the latest version of the `greetd` package.
+ This commit ensures we avoid this conflict and maintain a clean
+ upgrade path for both those packages.
+
+ -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Fri, 31 Mar 2023 12:12:29 +0900
+
+greetd (0.9.0-2) unstable; urgency=medium
+
+ * Provide PAM configuration (Closes: #1032786).
+
+ -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Mon, 13 Mar 2023 02:41:02 +0900
+
greetd (0.9.0-1) unstable; urgency=medium
* NUR:
diff -Nru greetd-0.9.0/debian/control greetd-0.9.0/debian/control
--- greetd-0.9.0/debian/control 2023-02-09 00:38:57.000000000 +0900
+++ greetd-0.9.0/debian/control 2023-03-31 12:12:29.000000000 +0900
@@ -35,7 +35,8 @@
adduser
Provides: x-display-manager
Suggests: wlgreet
+Breaks: phog (<< 0.1.3-2)
+Replaces: phog (<< 0.1.3-2)
Description: minimal Wayland login manager
greetd is a minimal and flexible login manager daemon that makes no
assumptions about what you want to launch.
-
diff -Nru greetd-0.9.0/debian/greetd.greetd-greeter.pam greetd-0.9.0/debian/greetd.greetd-greeter.pam
--- greetd-0.9.0/debian/greetd.greetd-greeter.pam 1970-01-01 09:00:00.000000000 +0900
+++ greetd-0.9.0/debian/greetd.greetd-greeter.pam 2023-03-31 12:12:29.000000000 +0900
@@ -0,0 +1,2 @@
+#%PAM-1.0
+@include login
diff -Nru greetd-0.9.0/debian/greetd.greetd.pam greetd-0.9.0/debian/greetd.greetd.pam
--- greetd-0.9.0/debian/greetd.greetd.pam 1970-01-01 09:00:00.000000000 +0900
+++ greetd-0.9.0/debian/greetd.greetd.pam 2023-03-31 12:12:29.000000000 +0900
@@ -0,0 +1,8 @@
+#%PAM-1.0
+@include login
+
+-auth optional pam_gnome_keyring.so
+-auth optional pam_kwallet5.so
+
+-session optional pam_gnome_keyring.so auto_start
+-session optional pam_kwallet5.so auto_start
diff -Nru greetd-0.9.0/debian/rules greetd-0.9.0/debian/rules
--- greetd-0.9.0/debian/rules 2023-02-09 00:38:57.000000000 +0900
+++ greetd-0.9.0/debian/rules 2023-03-31 12:12:29.000000000 +0900
@@ -30,10 +30,13 @@
# bad perms
chmod a-x debian/greetd/lib/systemd/system/greetd.service
+override_dh_installpam:
+ dh_installpam --name=greetd
+ dh_installpam --name=greetd-greeter
+
override_dh_installsystemd:
dh_installsystemd --no-stop-on-upgrade --no-start
execute_after_dh_auto_clean:
make -C man clean
rm -f debian/cargo-checksum.json
-
--- End Message ---