From ce5c15f0614656a5574d392991bf5593bcbb4632 Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 11 Apr 2020 12:01:26 -0700 Subject: [PATCH 1/5] New package: greetd-0.5.1 --- srcpkgs/greetd/INSTALL.msg | 1 + srcpkgs/greetd/files/greetd.pam | 7 +++++ srcpkgs/greetd/files/greetd/run | 2 ++ srcpkgs/greetd/template | 49 +++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 srcpkgs/greetd/INSTALL.msg 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/INSTALL.msg b/srcpkgs/greetd/INSTALL.msg new file mode 100644 index 00000000000..64dbef9c4d5 --- /dev/null +++ b/srcpkgs/greetd/INSTALL.msg @@ -0,0 +1 @@ +In order for agreety to work correctly, disable the agetty service for the tty diff --git a/srcpkgs/greetd/files/greetd.pam b/srcpkgs/greetd/files/greetd.pam new file mode 100644 index 00000000000..1960d9497c0 --- /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 00000000000..3dba0cda3ec --- /dev/null +++ b/srcpkgs/greetd/files/greetd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec greetd diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template new file mode 100644 index 00000000000..35a014e8117 --- /dev/null +++ b/srcpkgs/greetd/template @@ -0,0 +1,49 @@ +# Template file for 'greetd' +pkgname=greetd +version=0.5.1 +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="travankor " +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=36396ce994f49d26d03654731ca50a1ebf73385fb8c4f1deba5aca4a3a990aa4 +nocross="mismatched types in pam" + +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/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 +} + +post_install() { + rm -f "${DESTDIR}"/usr/.crates.toml + rm -f "${DESTDIR}"/usr/.crates2.json +} From bede22529a9692c280df9f2fd0f4175bb8e3240c Mon Sep 17 00:00:00 2001 From: travankor Date: Sat, 11 Apr 2020 12:01:29 -0700 Subject: [PATCH 2/5] New package: gtkgreet-0.5 --- srcpkgs/gtkgreet/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/gtkgreet/template diff --git a/srcpkgs/gtkgreet/template b/srcpkgs/gtkgreet/template new file mode 100644 index 00000000000..2eab167a152 --- /dev/null +++ b/srcpkgs/gtkgreet/template @@ -0,0 +1,16 @@ +# Template file for 'gtkgreet' +pkgname=gtkgreet +version=0.5 +revision=1 +build_style=meson +configure_args="-Dlayershell=true" +hostmakedepends="pkg-config scdoc" +makedepends="gtk-layer-shell-devel json-c-devel" +depends="greetd" +short_desc="GTK based greeter for greetd" +maintainer="travankor " +license="GPL-3.0-or-later" +homepage="https://git.sr.ht/~kennylevinsen/gtkgreet" +distfiles="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${version}.tar.gz" +checksum=6ad116076deabe7c01821e6be985a3cd5d3f679afd27e3dfdeceff6f5d72f8c5 +nocross="greetd" From b3100f8a036dcf4c4c0fa37e8a451b82847f1b42 Mon Sep 17 00:00:00 2001 From: travankor Date: Mon, 25 May 2020 19:20:44 -0700 Subject: [PATCH 3/5] gtkgreet: update to 0.6. --- srcpkgs/gtkgreet/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtkgreet/template b/srcpkgs/gtkgreet/template index 2eab167a152..a6647558e11 100644 --- a/srcpkgs/gtkgreet/template +++ b/srcpkgs/gtkgreet/template @@ -1,6 +1,6 @@ # Template file for 'gtkgreet' pkgname=gtkgreet -version=0.5 +version=0.6 revision=1 build_style=meson configure_args="-Dlayershell=true" @@ -12,5 +12,4 @@ maintainer="travankor " license="GPL-3.0-or-later" homepage="https://git.sr.ht/~kennylevinsen/gtkgreet" distfiles="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${version}.tar.gz" -checksum=6ad116076deabe7c01821e6be985a3cd5d3f679afd27e3dfdeceff6f5d72f8c5 -nocross="greetd" +checksum=5c0c9dbcb0495b05a1bcbd9978a3ad13ec50e228ab07b05efc5efc294d1beebb From f9ffb53506f1b91e9cef897697b3ae47ea4482e1 Mon Sep 17 00:00:00 2001 From: travankor Date: Mon, 25 May 2020 19:20:48 -0700 Subject: [PATCH 4/5] greetd: update to 0.6.1. --- srcpkgs/greetd/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template index 35a014e8117..a8bd92ed9ef 100644 --- a/srcpkgs/greetd/template +++ b/srcpkgs/greetd/template @@ -1,9 +1,9 @@ # Template file for 'greetd' pkgname=greetd -version=0.5.1 +version=0.6.1 revision=1 build_style=cargo -conf_files="/etc/greetd/config.toml" +conf_files="/etc/greetd/greetd.conf" hostmakedepends="scdoc" makedepends="pam-devel" short_desc="Minimal and flexible login manager daemon" @@ -11,8 +11,7 @@ maintainer="travankor " 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=36396ce994f49d26d03654731ca50a1ebf73385fb8c4f1deba5aca4a3a990aa4 -nocross="mismatched types in pam" +checksum=8ae06bb07db4b04d9c05596ea528c918086bd0c3e78421896ce13be006fac8bd system_accounts="_greeter" _greeter_groups="video" @@ -33,9 +32,10 @@ pre_build() { 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/ + vinstall config.toml 644 etc/greetd/ greetd.conf vsv greetd for i in man/*.[0-9]; do From 1c69bbb07cf676cac912aa13fff578bc206cef60 Mon Sep 17 00:00:00 2001 From: travankor Date: Tue, 26 May 2020 00:18:18 -0700 Subject: [PATCH 5/5] scdoc: move pkg-config files to -devel. --- srcpkgs/greetd/template | 2 +- srcpkgs/gtkgreet/template | 2 +- srcpkgs/scdoc-devel | 1 + srcpkgs/scdoc/template | 10 +++++++++- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/scdoc-devel diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template index a8bd92ed9ef..a6f95b7bd2c 100644 --- a/srcpkgs/greetd/template +++ b/srcpkgs/greetd/template @@ -4,7 +4,7 @@ version=0.6.1 revision=1 build_style=cargo conf_files="/etc/greetd/greetd.conf" -hostmakedepends="scdoc" +hostmakedepends="scdoc-devel" makedepends="pam-devel" short_desc="Minimal and flexible login manager daemon" maintainer="travankor " diff --git a/srcpkgs/gtkgreet/template b/srcpkgs/gtkgreet/template index a6647558e11..86b4bcd6229 100644 --- a/srcpkgs/gtkgreet/template +++ b/srcpkgs/gtkgreet/template @@ -4,7 +4,7 @@ version=0.6 revision=1 build_style=meson configure_args="-Dlayershell=true" -hostmakedepends="pkg-config scdoc" +hostmakedepends="pkg-config scdoc-devel" makedepends="gtk-layer-shell-devel json-c-devel" depends="greetd" short_desc="GTK based greeter for greetd" diff --git a/srcpkgs/scdoc-devel b/srcpkgs/scdoc-devel new file mode 120000 index 00000000000..dc2de8606fe --- /dev/null +++ b/srcpkgs/scdoc-devel @@ -0,0 +1 @@ +scdoc \ No newline at end of file diff --git a/srcpkgs/scdoc/template b/srcpkgs/scdoc/template index 3dbd407ef42..e5034303ed1 100644 --- a/srcpkgs/scdoc/template +++ b/srcpkgs/scdoc/template @@ -1,7 +1,7 @@ # Template file for 'scdoc' pkgname=scdoc version=1.10.1 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="PREFIX=/usr" short_desc="Tool for generating roff manual pages" @@ -25,3 +25,11 @@ pre_build() { post_install() { vlicense COPYING } + +scdoc-devel_package() { +depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/lib/pkgconfig + } +}