From: leahneukirchen <leahneukirchen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Fix utempter
Date: Fri, 09 Dec 2022 19:37:49 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40988@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1369 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages utempter
https://github.com/void-linux/void-packages/pull/40988
Fix utempter
<!-- Uncomment relevant sections and delete options which are not applicable -->
utempter was not installed setgid `utmp`, so it didn't work.
Enable utempter for screen and tmux.
ping @sgn and @steinex.
#### Testing the changes
- I tested the changes in this PR: **YES***
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/40988.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-utempter-40988.patch --]
[-- Type: text/x-diff, Size: 3087 bytes --]
From e8f9b5aaa5b37d5b8fad1b68c9187e5929c83175 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Dec 2022 19:21:45 +0100
Subject: [PATCH 1/3] libutempter: install helper binary setgid utmp.
Else it doesn't work.
---
srcpkgs/libutempter/INSTALL | 6 ++++++
srcpkgs/libutempter/template | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libutempter/INSTALL
diff --git a/srcpkgs/libutempter/INSTALL b/srcpkgs/libutempter/INSTALL
new file mode 100644
index 000000000000..fc3bfaad1442
--- /dev/null
+++ b/srcpkgs/libutempter/INSTALL
@@ -0,0 +1,6 @@
+case "${ACTION}" in
+post)
+ chgrp utmp usr/lib/utempter/utempter
+ chmod g+s usr/lib/utempter/utempter
+ ;;
+esac
diff --git a/srcpkgs/libutempter/template b/srcpkgs/libutempter/template
index f2999ccebd32..3a89e4126cfc 100644
--- a/srcpkgs/libutempter/template
+++ b/srcpkgs/libutempter/template
@@ -1,7 +1,7 @@
# Template file for 'libutempter'
pkgname=libutempter
version=1.2.1
-revision=1
+revision=2
build_style=gnu-makefile
short_desc="Library interface to record user sessions in utmp/wtmp files"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2d1a83f68dd45868b21930dbddb4347650765e72 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Dec 2022 19:30:06 +0100
Subject: [PATCH 2/3] tmux: use libutempter.
---
srcpkgs/tmux/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index 7b0c26a66313..55aab2e19567 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -1,10 +1,11 @@
# Template file for 'tmux'
pkgname=tmux
version=3.3a
-revision=1
+revision=2
build_style=gnu-configure
+configure_args="--enable-utempter"
hostmakedepends="byacc automake pkg-config"
-makedepends="libevent-devel ncurses-devel"
+makedepends="libevent-devel libutempter-devel ncurses-devel"
depends="ncurses-base"
short_desc="Terminal Multiplexer"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
From bf99f39f0569d7f48b6c3710b5f83075b4800d6a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 9 Dec 2022 19:34:38 +0100
Subject: [PATCH 3/3] screen: use libutempter.
---
srcpkgs/screen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 6e33ba3d5c50..00b84edea6c5 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,13 +1,13 @@
# Template file for 'screen'
pkgname=screen
version=4.9.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam
--enable-colors256 --enable-rxvt_osc --enable-telnet
--enable-use-locale --with-socket-dir=/run/screens --with-pty-group=5"
hostmakedepends="automake"
-makedepends="pam-devel ncurses-devel"
+makedepends="libutempter-devel ncurses-devel pam-devel"
conf_files="/etc/screenrc /etc/skel/.screenrc"
short_desc="GNU screen manager with VT100/ANSI terminal emulation"
maintainer="Frank Steinborn <steinex@nognu.de>"
next reply other threads:[~2022-12-09 18:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-09 18:37 leahneukirchen [this message]
2022-12-14 22:43 ` sbromberger
2022-12-14 23:39 ` vincele
2022-12-14 23:47 ` vincele
2022-12-15 8:52 ` vincele
2022-12-15 22:59 ` [PR PATCH] [Merged]: " leahneukirchen
2022-12-15 23:18 ` vincele
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40988@inbox.vuxu.org \
--to=leahneukirchen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).