From 6076c6dfb4b1a440b1722937ea428378dd1bcad9 Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Tue, 12 Jul 2022 22:00:08 -0700 Subject: [PATCH 1/8] New package: radm-0.6.1 --- srcpkgs/radm/files/radm/run | 11 +++++++++++ srcpkgs/radm/template | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100755 srcpkgs/radm/files/radm/run create mode 100644 srcpkgs/radm/template diff --git a/srcpkgs/radm/files/radm/run b/srcpkgs/radm/files/radm/run new file mode 100755 index 000000000000..efe4752cf3ad --- /dev/null +++ b/srcpkgs/radm/files/radm/run @@ -0,0 +1,11 @@ +#!/bin/sh + +[ -r conf ] && . ./conf + +: ${x:=7} +: ${args:="-f $X"} +: ${wait_for_syslog:="true"} + +while [ "$wait_for_syslog" ] && [ ! -w /dev/log ]; do sleep 1; done + +exec setsid agetty -nl /usr/bin/radm -o "${args}" tty$x diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template new file mode 100644 index 000000000000..2bcab27bac9d --- /dev/null +++ b/srcpkgs/radm/template @@ -0,0 +1,23 @@ +# Template file for 'radm' +pkgname=radm +version=0.6.1 +revision=1 +build_style=cargo +makedepends="clang make pam-devel pandoc" +depends="seatd pam" +short_desc="Console-based display manager for Wayland sessions" +maintainer="Antonio Gurgel " +license="MIT" +homepage="https://sr.ht/~goorzhel/radm/" +distfiles="https://git.sr.ht/~goorzhel/radm/archive/${version}.tar.gz" +checksum=81b87b76f1a59e2675bd4373f03d682b5c7f2b53adc926164f384bae8676c98a + +post_install() { + make res/radm.1 + + vinstall res/pam 644 etc/pam.d radm + vinstall res/rsyslog 644 etc/rsyslog.d radm + vlicense LICENSE + vman res/radm.1 + vsv radm +} From 256fdd636865c0c165cbdc1dbbc210ac1a5bf0a8 Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 15:33:56 -0700 Subject: [PATCH 2/8] radm: move pandoc to hostmakedepends --- srcpkgs/radm/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index 2bcab27bac9d..a6dd029fe0f8 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -3,7 +3,8 @@ pkgname=radm version=0.6.1 revision=1 build_style=cargo -makedepends="clang make pam-devel pandoc" +hostmakedepends="pandoc" +makedepends="clang make pam-devel" depends="seatd pam" short_desc="Console-based display manager for Wayland sessions" maintainer="Antonio Gurgel " From 088759777dfe2267dc69722c1f87bb4b42f105fe Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 16:54:11 -0700 Subject: [PATCH 3/8] radm: update to 0.6.2. --- srcpkgs/radm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index a6dd029fe0f8..9ff26aa1e0df 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -1,6 +1,6 @@ # Template file for 'radm' pkgname=radm -version=0.6.1 +version=0.6.2 revision=1 build_style=cargo hostmakedepends="pandoc" @@ -11,7 +11,7 @@ maintainer="Antonio Gurgel " license="MIT" homepage="https://sr.ht/~goorzhel/radm/" distfiles="https://git.sr.ht/~goorzhel/radm/archive/${version}.tar.gz" -checksum=81b87b76f1a59e2675bd4373f03d682b5c7f2b53adc926164f384bae8676c98a +checksum=f0cddd451591a6007dee93f8dee1c4374b63cd20dce33b17ebfcf7216dbb5ade post_install() { make res/radm.1 From c6a94460e5b643010d766cf97b74dc7549b7fee7 Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 17:09:23 -0700 Subject: [PATCH 4/8] radm: clang belongs in host too --- srcpkgs/radm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index 9ff26aa1e0df..a8cdf03fdcc1 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -3,8 +3,8 @@ pkgname=radm version=0.6.2 revision=1 build_style=cargo -hostmakedepends="pandoc" -makedepends="clang make pam-devel" +hostmakedepends="pandoc libclang clang" +makedepends="make pam-devel" depends="seatd pam" short_desc="Console-based display manager for Wayland sessions" maintainer="Antonio Gurgel " From 41b4160329643b182b9679a05f1d6cdaf956a2f9 Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 17:47:00 -0700 Subject: [PATCH 5/8] radm: update to 0.6.3. `pam` crate broke on non-Intel. --- srcpkgs/radm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index a8cdf03fdcc1..a441d4b0ab02 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -1,6 +1,6 @@ # Template file for 'radm' pkgname=radm -version=0.6.2 +version=0.6.3 revision=1 build_style=cargo hostmakedepends="pandoc libclang clang" @@ -11,7 +11,7 @@ maintainer="Antonio Gurgel " license="MIT" homepage="https://sr.ht/~goorzhel/radm/" distfiles="https://git.sr.ht/~goorzhel/radm/archive/${version}.tar.gz" -checksum=f0cddd451591a6007dee93f8dee1c4374b63cd20dce33b17ebfcf7216dbb5ade +checksum=6b90b540674bf86b901652b0708f82e8688c5c7993d3a2e4ecd65c030d7b74f2 post_install() { make res/radm.1 From db785abbdb0977812e3f23ccf33ee27cc92f9a25 Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 18:47:33 -0700 Subject: [PATCH 6/8] radm: just put everything in hostmakedepends --- srcpkgs/radm/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index a441d4b0ab02..21eb56824b01 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -3,8 +3,7 @@ pkgname=radm version=0.6.3 revision=1 build_style=cargo -hostmakedepends="pandoc libclang clang" -makedepends="make pam-devel" +hostmakedepends="clang libclang make pam-devel pandoc" depends="seatd pam" short_desc="Console-based display manager for Wayland sessions" maintainer="Antonio Gurgel " From bf5cf946522047e4897b85605c2b69eb4c9ba12d Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 21:06:49 -0700 Subject: [PATCH 7/8] radm: hide pandoc behind build option --- srcpkgs/radm/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index 21eb56824b01..e02c8fb70771 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -3,7 +3,7 @@ pkgname=radm version=0.6.3 revision=1 build_style=cargo -hostmakedepends="clang libclang make pam-devel pandoc" +hostmakedepends="clang libclang make pam-devel $(vopt_if man pandoc)" depends="seatd pam" short_desc="Console-based display manager for Wayland sessions" maintainer="Antonio Gurgel " @@ -12,12 +12,21 @@ homepage="https://sr.ht/~goorzhel/radm/" distfiles="https://git.sr.ht/~goorzhel/radm/archive/${version}.tar.gz" checksum=6b90b540674bf86b901652b0708f82e8688c5c7993d3a2e4ecd65c030d7b74f2 +build_options="man" +desc_option_man="Use pandoc for manpages" + +case "$XBPS_MACHINE" in + x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;; +esac + post_install() { - make res/radm.1 + if [ "$build_option_man" ]; then + make res/radm.1 + vman res/radm.1 + fi vinstall res/pam 644 etc/pam.d radm vinstall res/rsyslog 644 etc/rsyslog.d radm vlicense LICENSE - vman res/radm.1 vsv radm } From 26e301e58083e8408cfc6e7ed985230f57a8106e Mon Sep 17 00:00:00 2001 From: Antonio Gurgel Date: Mon, 22 Aug 2022 21:13:40 -0700 Subject: [PATCH 8/8] radm: pam-devel back to makedepends --- srcpkgs/radm/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/radm/template b/srcpkgs/radm/template index e02c8fb70771..1a4bc9f8cb7d 100644 --- a/srcpkgs/radm/template +++ b/srcpkgs/radm/template @@ -3,7 +3,8 @@ pkgname=radm version=0.6.3 revision=1 build_style=cargo -hostmakedepends="clang libclang make pam-devel $(vopt_if man pandoc)" +hostmakedepends="clang libclang make $(vopt_if man pandoc)" +makedepends="pam-devel" depends="seatd pam" short_desc="Console-based display manager for Wayland sessions" maintainer="Antonio Gurgel "