* [PR PATCH] New package: greetd-0.7.0
@ 2021-06-06 6:09 cinerea0
2021-06-06 6:12 ` cinerea0
` (53 more replies)
0 siblings, 54 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-06 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is a new pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 3135 bytes --]
From f858bc9c45e4384f7d487e1f381a802053339cef Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Sun, 6 Jun 2021 02:08:30 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/files/README.voidlinux | 2 ++
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/template | 50 +++++++++++++++++++++++++++
4 files changed, 62 insertions(+)
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..38ea5fcd9748
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,50 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/greetd.conf"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+
+pre_build() {
+ # Void accounts are prefixed with underscore
+ vsed -i "16s/greeter/_greeter/" config.toml
+
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/
+ vinstall config.toml 644 etc/greetd/ greetd.conf
+ vsv greetd
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ # Void-specific documentation.
+ vdoc "${FILESDIR}/README.voidlinux"
+
+ rm -f "${DESTDIR}"/usr/.crates.toml
+ rm -f "${DESTDIR}"/usr/.crates2.json
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
@ 2021-06-06 6:12 ` cinerea0
2021-06-08 3:26 ` [PR REVIEW] " ericonr
` (52 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-06 6:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 397 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-855345642
Comment:
This PR builds off #20873, though does not close it because it does not provide all packages present in that PR. I tested it, and `greetd` works much better when the TTY it's replacing is disabled, which is why the README.voidlinux file has been included.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
2021-06-06 6:12 ` cinerea0
@ 2021-06-08 3:26 ` ericonr
2021-06-08 3:26 ` ericonr
` (51 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-06-08 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r647082554
Comment:
IMO a patch or configure arg should be used, otherwise it's easy for this fix to get lost.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (2 preceding siblings ...)
2021-06-08 3:26 ` ericonr
@ 2021-06-08 3:26 ` ericonr
2021-06-08 3:26 ` ericonr
` (49 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-06-08 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r647082043
Comment:
```suggestion
rm "${DESTDIR}"/usr/.crates.toml
rm "${DESTDIR}"/usr/.crates2.json
```
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
2021-06-06 6:12 ` cinerea0
2021-06-08 3:26 ` [PR REVIEW] " ericonr
@ 2021-06-08 3:26 ` ericonr
2021-06-08 3:26 ` ericonr
` (50 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-06-08 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r647082124
Comment:
Comment isn't really necessary, purpose is somewhat obvious.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (3 preceding siblings ...)
2021-06-08 3:26 ` ericonr
@ 2021-06-08 3:26 ` ericonr
2021-06-08 14:31 ` [PR PATCH] [Updated] " cinerea0
` (48 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-06-08 3:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r647082442
Comment:
Doesn't it carry a makefile or something to build these? Doing all this manually seems not great...
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (4 preceding siblings ...)
2021-06-08 3:26 ` ericonr
@ 2021-06-08 14:31 ` cinerea0
2021-06-08 14:33 ` [PR REVIEW] " cinerea0
` (47 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-08 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 3662 bytes --]
From d5768cbc6d78dad2fdcf7299a3b7e62a55cfc251 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 8 Jun 2021 10:30:47 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/files/README.voidlinux | 2 +
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/patches/fix-system-user.patch | 8 ++++
srcpkgs/greetd/template | 43 ++++++++++++++++++++
5 files changed, 63 insertions(+)
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..76e03ed01a65
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- config.toml.orig 2020-12-22 06:29:48.000000000 -0500
++++ config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..bf5ed4c392fa
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,43 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/greetd.conf"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+
+pre_build() {
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/
+ vinstall config.toml 644 etc/greetd/ greetd.conf
+ vsv greetd
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (5 preceding siblings ...)
2021-06-08 14:31 ` [PR PATCH] [Updated] " cinerea0
@ 2021-06-08 14:33 ` cinerea0
2021-06-08 14:36 ` cinerea0
` (46 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-08 14:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New review comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r647502737
Comment:
No, unfortunately. The whole build is orchestrated by Cargo and doesn't have a `build.rs` file that would contain additional steps besides just compiling the binaries.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (6 preceding siblings ...)
2021-06-08 14:33 ` [PR REVIEW] " cinerea0
@ 2021-06-08 14:36 ` cinerea0
2021-06-12 1:04 ` [PR PATCH] [Updated] " cinerea0
` (45 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-08 14:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-856824202
Comment:
One thing I just noticed while going over [the manual installation instructions](https://git.sr.ht/~kennylevinsen/greetd#manually-from-source) is this:
```
# Create the greeter user
sudo useradd -M -G video greeter
sudo chown -R greeter:greeter /etc/greetd/
```
Does xbps-src have a mechanism for changing the owner of a directory, and if it does is it even necessary here? I'm using greetd + tuigreet right now and that directory and its contents being owned by root doesn't seem to negatively affect it.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (7 preceding siblings ...)
2021-06-08 14:36 ` cinerea0
@ 2021-06-12 1:04 ` cinerea0
2021-06-12 22:04 ` cinerea0
` (44 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-12 1:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 4000 bytes --]
From da3b6be200195d85177bb80fb4f649ad093add9d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Fri, 11 Jun 2021 21:04:29 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/INSTALL | 5 +++
srcpkgs/greetd/files/README.voidlinux | 2 +
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/patches/fix-system-user.patch | 8 ++++
srcpkgs/greetd/template | 43 ++++++++++++++++++++
6 files changed, 68 insertions(+)
create mode 100644 srcpkgs/greetd/INSTALL
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/INSTALL b/srcpkgs/greetd/INSTALL
new file mode 100644
index 000000000000..3f310de0bdaa
--- /dev/null
+++ b/srcpkgs/greetd/INSTALL
@@ -0,0 +1,5 @@
+case ${ACTION} in
+post)
+ chown -R _greeter:_greeter etc/greetd
+ ;;
+esac
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..76e03ed01a65
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- config.toml.orig 2020-12-22 06:29:48.000000000 -0500
++++ config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..70704c36908a
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,43 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+
+pre_build() {
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/
+ vinstall config.toml 644 etc/greetd/
+ vsv greetd
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (8 preceding siblings ...)
2021-06-12 1:04 ` [PR PATCH] [Updated] " cinerea0
@ 2021-06-12 22:04 ` cinerea0
2021-06-15 1:42 ` cinerea0
` (43 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-12 22:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 732 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-856824202
Comment:
One thing I just noticed while going over [the manual installation instructions](https://git.sr.ht/~kennylevinsen/greetd#manually-from-source) is this:
```
# Create the greeter user
sudo useradd -M -G video greeter
sudo chown -R greeter:greeter /etc/greetd/
```
Does xbps-src have a mechanism for changing the owner of a directory, and if it does is it even necessary here? I'm using greetd + tuigreet right now and that directory and its contents being owned by root doesn't seem to negatively affect it.
EDIT: Figured it out, incorporated an INSTALL file in the commit below.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (9 preceding siblings ...)
2021-06-12 22:04 ` cinerea0
@ 2021-06-15 1:42 ` cinerea0
2021-06-15 17:24 ` [PR PATCH] [Updated] " cinerea0
` (42 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-15 1:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-861106309
Comment:
@ericonr Is this package now acceptable despite the manual building of the man pages?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (10 preceding siblings ...)
2021-06-15 1:42 ` cinerea0
@ 2021-06-15 17:24 ` cinerea0
2021-06-17 2:36 ` ericonr
` (41 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-15 17:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 4046 bytes --]
From a1e4184f2002a9be4b01ecfbe1d9a1481f38ad0c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@protonmail.com>
Date: Tue, 15 Jun 2021 13:24:08 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/INSTALL | 6 +++
srcpkgs/greetd/files/README.voidlinux | 2 +
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/patches/fix-system-user.patch | 8 ++++
srcpkgs/greetd/template | 43 ++++++++++++++++++++
6 files changed, 69 insertions(+)
create mode 100644 srcpkgs/greetd/INSTALL
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/INSTALL b/srcpkgs/greetd/INSTALL
new file mode 100644
index 000000000000..c9750c7ee36b
--- /dev/null
+++ b/srcpkgs/greetd/INSTALL
@@ -0,0 +1,6 @@
+case ${ACTION} in
+post)
+ chown _greeter:_greeter etc/greetd
+ chown _greeter:_greeter etc/greetd/config.toml
+ ;;
+esac
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..76e03ed01a65
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- config.toml.orig 2020-12-22 06:29:48.000000000 -0500
++++ config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..70704c36908a
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,43 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+
+pre_build() {
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/
+ vinstall config.toml 644 etc/greetd/
+ vsv greetd
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (11 preceding siblings ...)
2021-06-15 17:24 ` [PR PATCH] [Updated] " cinerea0
@ 2021-06-17 2:36 ` ericonr
2021-06-17 14:36 ` cinerea0
` (40 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-06-17 2:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-862870130
Comment:
IMO we should ask upstream for a Makefile for that. Makes no sense for every distro package to duplicate the logic.
I'd appreciate help in reviewing the pam stuff as well.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (12 preceding siblings ...)
2021-06-17 2:36 ` ericonr
@ 2021-06-17 14:36 ` cinerea0
2021-06-17 14:50 ` ericonr
` (39 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-17 14:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-863295462
Comment:
I'll see if I can figure out the build.rs format so I can submit a patch with build instructions for the man files. As for the PAM stuff, the configuration file here was lifted from [the Arch package](https://aur.archlinux.org/cgit/aur.git/tree/greetd.pam?h=greetd), which is maintained by greetd's author. I know that doesn't automatically make it trustworthy, but I think it proves a solid base.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (13 preceding siblings ...)
2021-06-17 14:36 ` cinerea0
@ 2021-06-17 14:50 ` ericonr
2021-06-20 20:55 ` [PR REVIEW] " sbogomolov
` (38 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-06-17 14:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-863306758
Comment:
I don't think you need to use `build.rs`, even. Adding a makefile for the extra bits sounds just as good to me.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (14 preceding siblings ...)
2021-06-17 14:50 ` ericonr
@ 2021-06-20 20:55 ` sbogomolov
2021-06-20 20:57 ` sbogomolov
` (37 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-20 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 268 bytes --]
New review comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r654987752
Comment:
I think I know the answer. The greetd is started as root, but it will start the command from its config as `_greeter`.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (15 preceding siblings ...)
2021-06-20 20:55 ` [PR REVIEW] " sbogomolov
@ 2021-06-20 20:57 ` sbogomolov
2021-06-21 0:50 ` [PR REVIEW] " cinerea0
` (36 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-20 20:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-864610929
Comment:
Another possibly stupid question, shouldn't the `greetd.pam` file be named `greetd`? From what I am reading, the file name should match the name of the service.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (16 preceding siblings ...)
2021-06-20 20:57 ` sbogomolov
@ 2021-06-21 0:50 ` cinerea0
2021-06-21 0:50 ` cinerea0
` (35 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-21 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New review comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r655015043
Comment:
Right, the suggestion you made at first is only necessary if the program does not change users and drop privileges on its own, such as when creating user-level services.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (17 preceding siblings ...)
2021-06-21 0:50 ` [PR REVIEW] " cinerea0
@ 2021-06-21 0:50 ` cinerea0
2021-06-21 7:35 ` sbogomolov
` (34 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-21 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-864645902
Comment:
@sbogomolov I experimented with changing the filename to just `greetd`, it caused keyring errors.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (18 preceding siblings ...)
2021-06-21 0:50 ` cinerea0
@ 2021-06-21 7:35 ` sbogomolov
2021-06-21 7:36 ` sbogomolov
` (33 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-21 7:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-864801959
Comment:
@cinerea0 Will it work with `.pam`? I've checked the Arch [PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=greetd) and it looks like they are using it without the extension:
```
install -Dm644 "$srcdir/greetd.pam" \
"$pkgdir/etc/pam.d/greetd"
```
For me renaming it to `greetd` did not create any problems. I'm not using keyring though :)
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (19 preceding siblings ...)
2021-06-21 7:35 ` sbogomolov
@ 2021-06-21 7:36 ` sbogomolov
2021-06-22 20:46 ` sbogomolov
` (32 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-21 7:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-864801959
Comment:
@cinerea0 Will it work with `.pam`? I've checked the Arch [PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=greetd) and it looks like it is used without the extension there:
```
install -Dm644 "$srcdir/greetd.pam" \
"$pkgdir/etc/pam.d/greetd"
```
For me renaming it to `greetd` did not create any problems. I'm not using keyring though :)
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (20 preceding siblings ...)
2021-06-21 7:36 ` sbogomolov
@ 2021-06-22 20:46 ` sbogomolov
2021-06-27 5:11 ` [PR PATCH] [Updated] " cinerea0
` (31 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-22 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-866321825
Comment:
@cinerea0 FIY I have installed and configured keyring and it also works fine with greetd (without .pam).
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (21 preceding siblings ...)
2021-06-22 20:46 ` sbogomolov
@ 2021-06-27 5:11 ` cinerea0
2021-06-27 5:16 ` cinerea0
` (30 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-27 5:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 4050 bytes --]
From 72f7f0de2e60160c3d607af78939c14240741985 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 27 Jun 2021 01:10:53 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/INSTALL | 6 +++
srcpkgs/greetd/files/README.voidlinux | 2 +
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/patches/fix-system-user.patch | 8 ++++
srcpkgs/greetd/template | 43 ++++++++++++++++++++
6 files changed, 69 insertions(+)
create mode 100644 srcpkgs/greetd/INSTALL
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/INSTALL b/srcpkgs/greetd/INSTALL
new file mode 100644
index 000000000000..c9750c7ee36b
--- /dev/null
+++ b/srcpkgs/greetd/INSTALL
@@ -0,0 +1,6 @@
+case ${ACTION} in
+post)
+ chown _greeter:_greeter etc/greetd
+ chown _greeter:_greeter etc/greetd/config.toml
+ ;;
+esac
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..76e03ed01a65
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- config.toml.orig 2020-12-22 06:29:48.000000000 -0500
++++ config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..34877bb1b38d
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,43 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+
+pre_build() {
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/ greetd
+ vinstall config.toml 644 etc/greetd/
+ vsv greetd
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (22 preceding siblings ...)
2021-06-27 5:11 ` [PR PATCH] [Updated] " cinerea0
@ 2021-06-27 5:16 ` cinerea0
2021-06-27 8:56 ` sbogomolov
` (29 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-27 5:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869102210
Comment:
After experimenting a bit, I discovered that the issue with just using `greetd` without the `.pam` file extension should only be a problem for me; I have fixed this in the most recent push. As for building the man pages manually, I have submitted a patch upstream that can be found here: https://lists.sr.ht/~kennylevinsen/greetd-devel/patches/23488. I'd assume that as soon as that gets merged and a new release is cut this PR can be approved.
On a different topic, can anyone explain why my patch is failing now? Is it because of the switch to -Np1?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (23 preceding siblings ...)
2021-06-27 5:16 ` cinerea0
@ 2021-06-27 8:56 ` sbogomolov
2021-06-27 8:58 ` sbogomolov
` (28 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-27 8:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869126721
Comment:
When I tried to use this with gtkgreet I have noticed that it was complaining about not being able to use `~/.cache`. This happens because by default home folder is set to `/var/empty`. I have fixed this by adding following to the `template`:
```
_greeter_homedir="/etc/greeted/_greeter"
```
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (24 preceding siblings ...)
2021-06-27 8:56 ` sbogomolov
@ 2021-06-27 8:58 ` sbogomolov
2021-06-27 9:01 ` sbogomolov
` (27 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-27 8:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 605 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869126721
Comment:
When I tried to use this with gtkgreet I have noticed that it was complaining about not being able to use `~/.cache`. This happens because by default home folder is set to `/var/empty`. I have fixed this by adding following to the `template`:
```
_greeter_homedir="/etc/greeted/_greeter"
```
My 'INSTALL' looks like this:
```
case ${ACTION} in
post)
mkdir etc/greetd/_greeter
chown -R _greeter:_greeter etc/greetd
;;
esac
```
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (25 preceding siblings ...)
2021-06-27 8:58 ` sbogomolov
@ 2021-06-27 9:01 ` sbogomolov
2021-06-27 9:02 ` sbogomolov
` (26 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-27 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 716 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869126721
Comment:
When I tried to use this with gtkgreet I have noticed that it was complaining about not being able to use `~/.cache`. This happens because by default home folder is set to `/var/empty`. I have fixed this by adding following to the `template`:
```
_greeter_homedir="/etc/greeted/_greeter"
```
My `INSTALL` looks like this:
```
case ${ACTION} in
post)
mkdir etc/greetd/_greeter
chown -R _greeter:_greeter etc/greetd
;;
esac
```
And a question for educational purposes :) Why did you choose to use `INSTALL` instead of `post_install()`?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (26 preceding siblings ...)
2021-06-27 9:01 ` sbogomolov
@ 2021-06-27 9:02 ` sbogomolov
2021-06-27 9:02 ` sbogomolov
` (25 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-27 9:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 718 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869126721
Comment:
When I tried to use this with `gtkgreet` I have noticed that it was complaining about not being able to use `~/.cache`. This happens because by default home folder is set to `/var/empty`. I have fixed this by adding following to the `template`:
```
_greeter_homedir="/etc/greeted/_greeter"
```
My `INSTALL` looks like this:
```
case ${ACTION} in
post)
mkdir etc/greetd/_greeter
chown -R _greeter:_greeter etc/greetd
;;
esac
```
And a question for educational purposes :) Why did you choose to use `INSTALL` instead of `post_install()`?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (27 preceding siblings ...)
2021-06-27 9:02 ` sbogomolov
@ 2021-06-27 9:02 ` sbogomolov
2021-06-27 23:58 ` [PR PATCH] [Updated] " cinerea0
` (24 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-27 9:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 717 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869126721
Comment:
When I tried to use this with `gtkgreet` I have noticed that it was complaining about not being able to use `~/.cache`. This happens because by default home folder is set to `/var/empty`. I have fixed this by adding following to the `template`:
```
_greeter_homedir="/etc/greetd/_greeter"
```
My `INSTALL` looks like this:
```
case ${ACTION} in
post)
mkdir etc/greetd/_greeter
chown -R _greeter:_greeter etc/greetd
;;
esac
```
And a question for educational purposes :) Why did you choose to use `INSTALL` instead of `post_install()`?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (28 preceding siblings ...)
2021-06-27 9:02 ` sbogomolov
@ 2021-06-27 23:58 ` cinerea0
2021-06-28 0:15 ` cinerea0
` (23 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-27 23:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 4140 bytes --]
From c216376f517df0a0ed951fd4867195565cf1421b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 27 Jun 2021 19:57:33 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/INSTALL | 6 +++
srcpkgs/greetd/files/README.voidlinux | 2 +
srcpkgs/greetd/files/greetd.pam | 7 +++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/patches/fix-system-user.patch | 8 ++++
srcpkgs/greetd/template | 45 ++++++++++++++++++++
6 files changed, 71 insertions(+)
create mode 100644 srcpkgs/greetd/INSTALL
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/INSTALL b/srcpkgs/greetd/INSTALL
new file mode 100644
index 000000000000..c9750c7ee36b
--- /dev/null
+++ b/srcpkgs/greetd/INSTALL
@@ -0,0 +1,6 @@
+case ${ACTION} in
+post)
+ chown _greeter:_greeter etc/greetd
+ chown _greeter:_greeter etc/greetd/config.toml
+ ;;
+esac
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..6f47f3fd538d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- a/config.toml 2020-12-22 06:29:48.000000000 -0500
++++ b/config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..7b9d314479eb
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,45 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+_greeter_homedir="/var/lib/_greeter"
+make_dirs="/var/lib/_greeter 0755 _greeter _greeter"
+
+pre_build() {
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/ greetd
+ vinstall config.toml 644 etc/greetd/
+ vsv greetd
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (29 preceding siblings ...)
2021-06-27 23:58 ` [PR PATCH] [Updated] " cinerea0
@ 2021-06-28 0:15 ` cinerea0
2021-06-28 6:36 ` sbogomolov
` (22 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-28 0:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869247916
Comment:
@sbogomolov Please try with my most recent commit and see if the problem with `gtkgreet` persists. As for `INSTALL` vs. `post_install()`, the former lets you change things after they're unpacked into the user's system while the latter doesn't. Since `xbps` doesn't let you install files with a non-root owner except under very specific circumstances, I had to use an `INSTALL` file to change the owner afterwards.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (30 preceding siblings ...)
2021-06-28 0:15 ` cinerea0
@ 2021-06-28 6:36 ` sbogomolov
2021-06-28 15:31 ` cinerea0
` (21 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-28 6:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869401783
Comment:
Thanks for the explanation. I'll try the last commit.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (31 preceding siblings ...)
2021-06-28 6:36 ` sbogomolov
@ 2021-06-28 15:31 ` cinerea0
2021-06-28 16:04 ` [PR PATCH] [Updated] " cinerea0
` (20 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-28 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 726 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869784699
Comment:
I received the following information from the greetd dev indirectly:
> It's chowned so the greeter user (not the service user) can read them, as the examples currently put greeter configuration in there as well; the alternative would be to make it world readable. I recall problem reports that included permission of /etc/greetd, but feel free to submit a patch. I take no responsibility for what mistakes past me might have made. :)
Seeing this and the Arch package, and knowing that greetd worked fine before including the `INSTALL` file, I'll be removing it in the next push.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (32 preceding siblings ...)
2021-06-28 15:31 ` cinerea0
@ 2021-06-28 16:04 ` cinerea0
2021-06-28 16:47 ` sbogomolov
` (19 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-28 16:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 3745 bytes --]
From 1e57cfb6c48dc22a0c66e3481107cab31d447a71 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 28 Jun 2021 12:04:34 -0400
Subject: [PATCH] New package: greetd-0.7.0
---
srcpkgs/greetd/files/README.voidlinux | 2 +
srcpkgs/greetd/files/greetd.pam | 7 +++
srcpkgs/greetd/files/greetd/run | 3 ++
srcpkgs/greetd/patches/fix-system-user.patch | 8 ++++
srcpkgs/greetd/template | 45 ++++++++++++++++++++
5 files changed, 65 insertions(+)
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..a9d69837ec28
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..6f47f3fd538d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- a/config.toml 2020-12-22 06:29:48.000000000 -0500
++++ b/config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..02797e68840c
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,45 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.7.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/${pkgname}/archive/${version}.tar.gz"
+checksum=5229b7f00be40187de9df6240fc3b1f4012dd5e4777bb8661016cc7c2c105df7
+
+system_accounts="_greeter"
+_greeter_groups="video"
+_greeter_homedir="/var/lib/_greeter"
+make_dirs="/var/lib/_greeter 0755 _greeter _greeter"
+
+pre_build() {
+ for i in man/*.scd; do
+ scdoc < "$i" > "${i:: -4}"
+ done
+
+ for f in man/*-[0-9]; do
+ num="${f: -1}"
+ mv "$f" "${f/-$num/.$num}"
+ done
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall config.toml 644 etc/greetd/
+
+ for i in man/*.[0-9]; do
+ vman "$i"
+ done
+
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/ greetd
+ vsv greetd
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (33 preceding siblings ...)
2021-06-28 16:04 ` [PR PATCH] [Updated] " cinerea0
@ 2021-06-28 16:47 ` sbogomolov
2021-06-28 16:47 ` sbogomolov
` (18 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-28 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869841271
Comment:
I can confirm that it works fine with `gtkgreet` without `INSTALL` script. The previous change to add home directory for `_greeter` worked as well.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (34 preceding siblings ...)
2021-06-28 16:47 ` sbogomolov
@ 2021-06-28 16:47 ` sbogomolov
2021-06-28 21:59 ` sbogomolov
` (17 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-28 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869841271
Comment:
I can confirm that this works fine with `gtkgreet` without `INSTALL` script. The previous change to add home directory for `_greeter` worked as well.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (35 preceding siblings ...)
2021-06-28 16:47 ` sbogomolov
@ 2021-06-28 21:59 ` sbogomolov
2021-06-28 22:05 ` [PR REVIEW] " sbogomolov
` (16 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-28 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-869841271
Comment:
I can confirm that this works fine with `gtkgreet` without the `INSTALL`. The previous change to add home directory for `_greeter` worked as well.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (36 preceding siblings ...)
2021-06-28 21:59 ` sbogomolov
@ 2021-06-28 22:05 ` sbogomolov
2021-06-28 22:05 ` sbogomolov
` (15 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-28 22:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New review comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r660146513
Comment:
Do you think it would make sense to redirect stdeer?
```
exec 2>&1
```
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (37 preceding siblings ...)
2021-06-28 22:05 ` [PR REVIEW] " sbogomolov
@ 2021-06-28 22:05 ` sbogomolov
2021-06-30 0:37 ` cinerea0
` (14 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: sbogomolov @ 2021-06-28 22:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New review comment by sbogomolov on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r660146513
Comment:
Do you think it would make sense to redirect stdeer?
```
exec 2>&1
exec greetd
```
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR REVIEW] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (38 preceding siblings ...)
2021-06-28 22:05 ` sbogomolov
@ 2021-06-30 0:37 ` cinerea0
2021-08-04 4:51 ` cinerea0
` (13 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-06-30 0:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New review comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#discussion_r661051031
Comment:
Only if greetd spews stuff to stderr instead of stdout, which I have no insight with.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (39 preceding siblings ...)
2021-06-30 0:37 ` cinerea0
@ 2021-08-04 4:51 ` cinerea0
2021-09-07 19:06 ` [PR PATCH] [Updated] " cinerea0
` (12 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-08-04 4:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-892360898
Comment:
Good news, the patch I submitted has been applied. Now we just have to wait until a new version is released.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.7.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (40 preceding siblings ...)
2021-08-04 4:51 ` cinerea0
@ 2021-09-07 19:06 ` cinerea0
2021-09-07 19:32 ` New package: greetd-0.8.0 cinerea0
` (11 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-09-07 19:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.7.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 3617 bytes --]
From 9a2472d212afa9faa9fb90e540f22e92f5f6fb5c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 7 Sep 2021 15:06:04 -0400
Subject: [PATCH] New package: greetd-0.8.0
---
srcpkgs/greetd/files/README.voidlinux | 2 ++
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 4 +++
srcpkgs/greetd/patches/fix-system-user.patch | 8 +++++
srcpkgs/greetd/template | 38 ++++++++++++++++++++
5 files changed, 59 insertions(+)
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..19c22236bdc2
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2>&1
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..6f47f3fd538d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- a/config.toml 2020-12-22 06:29:48.000000000 -0500
++++ b/config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..cf5f3c400b0c
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,38 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.8.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="pkg-config scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/greetd/archive/${version}.tar.gz"
+checksum=47a73709df60f04b63fc50cfc409e47a451a9620777638f527b9d9333256035f
+
+system_accounts="_greeter"
+_greeter_groups="video"
+_greeter_homedir="/var/lib/_greeter"
+make_dirs="/var/lib/_greeter 0755 _greeter _greeter"
+
+pre_build() {
+ cd man
+ make all
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall config.toml 644 etc/greetd/
+
+ cd man
+ make install
+
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/ greetd
+ vsv greetd
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (41 preceding siblings ...)
2021-09-07 19:06 ` [PR PATCH] [Updated] " cinerea0
@ 2021-09-07 19:32 ` cinerea0
2021-10-02 2:41 ` cinerea0
` (10 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-09-07 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-914571052
Comment:
New release just came out incorporating my patch! Is this good to merge now, @ericonr?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (42 preceding siblings ...)
2021-09-07 19:32 ` New package: greetd-0.8.0 cinerea0
@ 2021-10-02 2:41 ` cinerea0
2021-10-04 19:18 ` cinerea0
` (9 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-10-02 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-932668382
Comment:
Currently experiencing a bug with greetd after a system update; will re-open when I found out the cause.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (43 preceding siblings ...)
2021-10-02 2:41 ` cinerea0
@ 2021-10-04 19:18 ` cinerea0
2021-11-14 8:05 ` ericonr
` (8 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-10-04 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-933781070
Comment:
The recent `runit-void` update re-enabled the `agetty-tty1` service, which interfered with greetd. Given that this is mentioned in the README.voidlinux file, I don't think anything needs to be changed.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (44 preceding siblings ...)
2021-10-04 19:18 ` cinerea0
@ 2021-11-14 8:05 ` ericonr
2021-11-15 22:02 ` cinerea0
` (7 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: ericonr @ 2021-11-14 8:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-968243461
Comment:
The packaging looks about right. Do you think this is useful by itself without gtkgreet?
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (45 preceding siblings ...)
2021-11-14 8:05 ` ericonr
@ 2021-11-15 22:02 ` cinerea0
2021-12-12 10:52 ` rslabbert
` (6 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2021-11-15 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-969363208
Comment:
Yes, I think so. The package as it is contains `agreety`, which provides an agetty-like login screen. I currently use it with https://github.com/apognu/tuigreet, which I plan on packaging if this is accepted into the repos and can be used to shut down all future package requests for Ly. I can try packaging gtkgreet as well, if you'd like.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (46 preceding siblings ...)
2021-11-15 22:02 ` cinerea0
@ 2021-12-12 10:52 ` rslabbert
2022-01-06 2:54 ` [PR PATCH] [Updated] " cinerea0
` (5 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: rslabbert @ 2021-12-12 10:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New comment by rslabbert on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-991875403
Comment:
Wanted to add here that I can confirm this package works work me locally, and I have a PR for tuigreet waiting for this to be merged to add a dependency: https://github.com/void-linux/void-packages/pull/34491
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Updated] New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (47 preceding siblings ...)
2021-12-12 10:52 ` rslabbert
@ 2022-01-06 2:54 ` cinerea0
2022-01-06 2:55 ` cinerea0
` (4 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2022-01-06 2:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1609 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages greetd
https://github.com/void-linux/void-packages/pull/31320
New package: greetd-0.8.0
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
A patch file from https://github.com/void-linux/void-packages/pull/31320.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-greetd-31320.patch --]
[-- Type: text/x-diff, Size: 3617 bytes --]
From 46c2fe664705c89d979af5f4e57caae9667b0b4d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 5 Jan 2022 21:53:56 -0500
Subject: [PATCH] New package: greetd-0.8.0
---
srcpkgs/greetd/files/README.voidlinux | 2 ++
srcpkgs/greetd/files/greetd.pam | 7 ++++
srcpkgs/greetd/files/greetd/run | 4 +++
srcpkgs/greetd/patches/fix-system-user.patch | 8 +++++
srcpkgs/greetd/template | 38 ++++++++++++++++++++
5 files changed, 59 insertions(+)
create mode 100644 srcpkgs/greetd/files/README.voidlinux
create mode 100644 srcpkgs/greetd/files/greetd.pam
create mode 100644 srcpkgs/greetd/files/greetd/run
create mode 100644 srcpkgs/greetd/patches/fix-system-user.patch
create mode 100644 srcpkgs/greetd/template
diff --git a/srcpkgs/greetd/files/README.voidlinux b/srcpkgs/greetd/files/README.voidlinux
new file mode 100644
index 000000000000..3fe48e949867
--- /dev/null
+++ b/srcpkgs/greetd/files/README.voidlinux
@@ -0,0 +1,2 @@
+In order for agreety to work correctly, disable the agetty service for the tty
+set in /etc/greetd/config.toml.
diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam
new file mode 100644
index 000000000000..1960d9497c08
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+
+auth required pam_securetty.so
+auth requisite pam_nologin.so
+auth include system-local-login
+account include system-local-login
+session include system-local-login
diff --git a/srcpkgs/greetd/files/greetd/run b/srcpkgs/greetd/files/greetd/run
new file mode 100644
index 000000000000..19c22236bdc2
--- /dev/null
+++ b/srcpkgs/greetd/files/greetd/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2>&1
+exec greetd
diff --git a/srcpkgs/greetd/patches/fix-system-user.patch b/srcpkgs/greetd/patches/fix-system-user.patch
new file mode 100644
index 000000000000..6f47f3fd538d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-system-user.patch
@@ -0,0 +1,8 @@
+--- a/config.toml 2020-12-22 06:29:48.000000000 -0500
++++ b/config.toml 2021-06-07 23:51:31.868809783 -0400
+@@ -13,4 +13,4 @@
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
+ # in the `video` group.
+-user = "greeter"
++user = "_greeter"
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
new file mode 100644
index 000000000000..cf5f3c400b0c
--- /dev/null
+++ b/srcpkgs/greetd/template
@@ -0,0 +1,38 @@
+# Template file for 'greetd'
+pkgname=greetd
+version=0.8.0
+revision=1
+build_style=cargo
+conf_files="/etc/greetd/config.toml"
+hostmakedepends="pkg-config scdoc"
+makedepends="pam-devel"
+short_desc="Minimal and flexible login manager daemon"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://git.sr.ht/~kennylevinsen/greetd"
+distfiles="https://git.sr.ht/~kennylevinsen/greetd/archive/${version}.tar.gz"
+checksum=47a73709df60f04b63fc50cfc409e47a451a9620777638f527b9d9333256035f
+
+system_accounts="_greeter"
+_greeter_groups="video"
+_greeter_homedir="/var/lib/_greeter"
+make_dirs="/var/lib/_greeter 0755 _greeter _greeter"
+
+pre_build() {
+ cd man
+ make all
+}
+
+do_install() {
+ vbin "target/${RUST_TARGET}/release/agreety"
+ vbin "target/${RUST_TARGET}/release/fakegreet"
+ vbin "target/${RUST_TARGET}/release/greetd"
+ vinstall config.toml 644 etc/greetd/
+
+ cd man
+ make install
+
+ vinstall ${FILESDIR}/greetd.pam 644 etc/pam.d/ greetd
+ vsv greetd
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (48 preceding siblings ...)
2022-01-06 2:54 ` [PR PATCH] [Updated] " cinerea0
@ 2022-01-06 2:55 ` cinerea0
2022-01-06 3:08 ` cinerea0
` (3 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2022-01-06 2:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-1006243745
Comment:
Rebasing to check if the autocfg bug affects this package, too.
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (49 preceding siblings ...)
2022-01-06 2:55 ` cinerea0
@ 2022-01-06 3:08 ` cinerea0
2022-01-17 9:50 ` Relected
` (2 subsequent siblings)
53 siblings, 0 replies; 55+ messages in thread
From: cinerea0 @ 2022-01-06 3:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-1006243745
Comment:
Rebasing to check if the autocfg bug affects this package, too.
EDIT: Great, it doesn't!
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (50 preceding siblings ...)
2022-01-06 3:08 ` cinerea0
@ 2022-01-17 9:50 ` Relected
2022-02-19 15:38 ` KSPAtlas
2022-02-25 23:27 ` [PR PATCH] [Merged]: " leahneukirchen
53 siblings, 0 replies; 55+ messages in thread
From: Relected @ 2022-01-17 9:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by Relected on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-1014331258
Comment:
as a wayland user i would love this package to be added
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (51 preceding siblings ...)
2022-01-17 9:50 ` Relected
@ 2022-02-19 15:38 ` KSPAtlas
2022-02-25 23:27 ` [PR PATCH] [Merged]: " leahneukirchen
53 siblings, 0 replies; 55+ messages in thread
From: KSPAtlas @ 2022-02-19 15:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by KSPAtlas on void-packages repository
https://github.com/void-linux/void-packages/pull/31320#issuecomment-1046045030
Comment:
> as a wayland user i would love this package to be added
The wayland situation on void is terrible because of wlroots being outdated
^ permalink raw reply [flat|nested] 55+ messages in thread
* Re: [PR PATCH] [Merged]: New package: greetd-0.8.0
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
` (52 preceding siblings ...)
2022-02-19 15:38 ` KSPAtlas
@ 2022-02-25 23:27 ` leahneukirchen
53 siblings, 0 replies; 55+ messages in thread
From: leahneukirchen @ 2022-02-25 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]
There's a merged pull request on the void-packages repository
New package: greetd-0.8.0
https://github.com/void-linux/void-packages/pull/31320
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Closes #23221.
^ permalink raw reply [flat|nested] 55+ messages in thread
end of thread, other threads:[~2022-02-25 23:27 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-06 6:09 [PR PATCH] New package: greetd-0.7.0 cinerea0
2021-06-06 6:12 ` cinerea0
2021-06-08 3:26 ` [PR REVIEW] " ericonr
2021-06-08 3:26 ` ericonr
2021-06-08 3:26 ` ericonr
2021-06-08 3:26 ` ericonr
2021-06-08 14:31 ` [PR PATCH] [Updated] " cinerea0
2021-06-08 14:33 ` [PR REVIEW] " cinerea0
2021-06-08 14:36 ` cinerea0
2021-06-12 1:04 ` [PR PATCH] [Updated] " cinerea0
2021-06-12 22:04 ` cinerea0
2021-06-15 1:42 ` cinerea0
2021-06-15 17:24 ` [PR PATCH] [Updated] " cinerea0
2021-06-17 2:36 ` ericonr
2021-06-17 14:36 ` cinerea0
2021-06-17 14:50 ` ericonr
2021-06-20 20:55 ` [PR REVIEW] " sbogomolov
2021-06-20 20:57 ` sbogomolov
2021-06-21 0:50 ` [PR REVIEW] " cinerea0
2021-06-21 0:50 ` cinerea0
2021-06-21 7:35 ` sbogomolov
2021-06-21 7:36 ` sbogomolov
2021-06-22 20:46 ` sbogomolov
2021-06-27 5:11 ` [PR PATCH] [Updated] " cinerea0
2021-06-27 5:16 ` cinerea0
2021-06-27 8:56 ` sbogomolov
2021-06-27 8:58 ` sbogomolov
2021-06-27 9:01 ` sbogomolov
2021-06-27 9:02 ` sbogomolov
2021-06-27 9:02 ` sbogomolov
2021-06-27 23:58 ` [PR PATCH] [Updated] " cinerea0
2021-06-28 0:15 ` cinerea0
2021-06-28 6:36 ` sbogomolov
2021-06-28 15:31 ` cinerea0
2021-06-28 16:04 ` [PR PATCH] [Updated] " cinerea0
2021-06-28 16:47 ` sbogomolov
2021-06-28 16:47 ` sbogomolov
2021-06-28 21:59 ` sbogomolov
2021-06-28 22:05 ` [PR REVIEW] " sbogomolov
2021-06-28 22:05 ` sbogomolov
2021-06-30 0:37 ` cinerea0
2021-08-04 4:51 ` cinerea0
2021-09-07 19:06 ` [PR PATCH] [Updated] " cinerea0
2021-09-07 19:32 ` New package: greetd-0.8.0 cinerea0
2021-10-02 2:41 ` cinerea0
2021-10-04 19:18 ` cinerea0
2021-11-14 8:05 ` ericonr
2021-11-15 22:02 ` cinerea0
2021-12-12 10:52 ` rslabbert
2022-01-06 2:54 ` [PR PATCH] [Updated] " cinerea0
2022-01-06 2:55 ` cinerea0
2022-01-06 3:08 ` cinerea0
2022-01-17 9:50 ` Relected
2022-02-19 15:38 ` KSPAtlas
2022-02-25 23:27 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).