From 3f76c300c0badcebfb9cd735a185461ed68606b5 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Mon, 20 Mar 2023 11:43:42 +0100 Subject: [PATCH] screen: Make screen FHS compliant * Explicit use pam. * Change socket dir to /run and add tmpfiles file. * Only ship a simple screen binary without version fragments * Remove SUID bit from binary Signed-off-by: Stefan Schantl --- screen/screen.nm | 17 ++++++++++++----- screen/screen.tmpfiles | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 screen/screen.tmpfiles diff --git a/screen/screen.nm b/screen/screen.nm index eb8add2c0..4fe960b05 100644 --- a/screen/screen.nm +++ b/screen/screen.nm @@ -5,7 +5,7 @@ name = screen version = 4.9.0 -release = 1.1 +release = 2 groups = Application/System url = https://www.gnu.org/software/screen @@ -32,8 +32,9 @@ build end configure_options += \ - --with-socket-dir=/var/run/screen \ - --with-sys-screenrc=/etc/screenrc + --enable-pam \ + --with-socket-dir=/run/screen \ + --with-sys-screenrc=%{sysconfdir}/screenrc prepare_cmds ./autogen.sh @@ -41,8 +42,14 @@ build install_cmds # Install screenrc - mkdir -pv %{BUILDROOT}/etc - cp -vf %{DIR_SOURCE}/screenrc %{BUILDROOT}/etc/screenrc + mkdir -pv %{BUILDROOT}%{sysconfdir} + cp -vf %{DIR_SOURCE}/screenrc %{BUILDROOT}%{sysconfdir}/screenrc + + # Rename versioned screen binary into simple screen + mv -vf %{BUILDROOT}%{bindir}/screen{-%{version},} + + # Remove suid bit from binary. + chmod -v -s %{BUILDROOT}%{bindir}/screen end end diff --git a/screen/screen.tmpfiles b/screen/screen.tmpfiles new file mode 100644 index 000000000..9e4da5690 --- /dev/null +++ b/screen/screen.tmpfiles @@ -0,0 +1 @@ +d /run/screen 0775 root root -- 2.47.3