* [PR PATCH] screen: fix socket dir and utmp
@ 2024-11-17 23:58 tornaria
2024-11-18 2:41 ` [PR PATCH] [Updated] " tornaria
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: tornaria @ 2024-11-17 23:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages screen
https://github.com/void-linux/void-packages/pull/53113
screen: fix socket dir and utmp
This adjusts configure changes necessary for 5.0.0
- Use `/run/screens/S-<USER>` for socket dir as before; the default `$HOME/.screen` is not nice when home is shared.
- Enable UTMP so screen sessions show up (used to be enabled by default in 4.9.1)
- Other minor cleanup in the configure args
- No need to run autogen.sh
- skip check which are broken (https://savannah.gnu.org/bugs/?66416)
@leahneukirchen
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/53113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-screen-53113.patch --]
[-- Type: text/x-diff, Size: 1688 bytes --]
From edbc5bdcedc9892317a3c4135f310ea11ea18a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 17 Nov 2024 18:43:59 -0300
Subject: [PATCH] screen: fix socket dir and utmp
This adjusts configure changes necessary for 5.0.0
---
srcpkgs/screen/template | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 2f4bebecace95f..8618f3694983c6 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,12 +1,9 @@
# Template file for 'screen'
pkgname=screen
version=5.0.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"
+configure_args="--enable-telnet --enable-utmp --enable-socket-dir=/run/screens"
makedepends="libutempter-devel ncurses-devel pam-devel"
conf_files="/etc/screenrc /etc/skel/.screenrc"
short_desc="GNU screen manager with VT100/ANSI terminal emulation"
@@ -15,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="http://www.gnu.org/s/screen/"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971
+make_check=no # check is broken in 5.0.0
build_options="multiuser"
@@ -22,10 +20,6 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-pre_configure() {
- ./autogen.sh
-}
-
post_install() {
vinstall etc/etcscreenrc 0644 etc screenrc
vinstall etc/screenrc 0644 etc/skel .screenrc
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] screen: fix socket dir and utmp
2024-11-17 23:58 [PR PATCH] screen: fix socket dir and utmp tornaria
@ 2024-11-18 2:41 ` tornaria
2024-11-18 2:43 ` tornaria
2024-11-18 11:34 ` [PR PATCH] [Merged]: " leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2024-11-18 2:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages screen
https://github.com/void-linux/void-packages/pull/53113
screen: fix socket dir and utmp
This adjusts configure changes necessary for 5.0.0
- Use `/run/screens/S-<USER>` for socket dir as before; the default `$HOME/.screen` is not nice when home is shared.
- Enable UTMP so screen sessions show up (used to be enabled by default in 4.9.1)
- Other minor cleanup in the configure args
- No need to run autogen.sh
- skip check which are broken (https://savannah.gnu.org/bugs/?66416)
@leahneukirchen
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/53113.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-screen-53113.patch --]
[-- Type: text/x-diff, Size: 2155 bytes --]
From 5e8efc25f4935896096f5f46cffe387f87a7b0c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 17 Nov 2024 18:43:59 -0300
Subject: [PATCH] screen: fix socket dir and utmp
---
srcpkgs/screen/patches/fix-musl.patch | 10 ++++++++++
srcpkgs/screen/template | 12 +++---------
2 files changed, 13 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/screen/patches/fix-musl.patch
diff --git a/srcpkgs/screen/patches/fix-musl.patch b/srcpkgs/screen/patches/fix-musl.patch
new file mode 100644
index 00000000000000..97617e9b2c69ce
--- /dev/null
+++ b/srcpkgs/screen/patches/fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/utmp.c
++++ b/utmp.c
+@@ -30,6 +30,7 @@
+
+ #include "utmp.h"
+
++#include <signal.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template
index 2f4bebecace95f..8618f3694983c6 100644
--- a/srcpkgs/screen/template
+++ b/srcpkgs/screen/template
@@ -1,12 +1,9 @@
# Template file for 'screen'
pkgname=screen
version=5.0.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"
+configure_args="--enable-telnet --enable-utmp --enable-socket-dir=/run/screens"
makedepends="libutempter-devel ncurses-devel pam-devel"
conf_files="/etc/screenrc /etc/skel/.screenrc"
short_desc="GNU screen manager with VT100/ANSI terminal emulation"
@@ -15,6 +12,7 @@ license="GPL-3.0-or-later"
homepage="http://www.gnu.org/s/screen/"
distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971
+make_check=no # check is broken in 5.0.0
build_options="multiuser"
@@ -22,10 +20,6 @@ if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
makedepends+=" libxcrypt-devel"
fi
-pre_configure() {
- ./autogen.sh
-}
-
post_install() {
vinstall etc/etcscreenrc 0644 etc screenrc
vinstall etc/screenrc 0644 etc/skel .screenrc
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: screen: fix socket dir and utmp
2024-11-17 23:58 [PR PATCH] screen: fix socket dir and utmp tornaria
2024-11-18 2:41 ` [PR PATCH] [Updated] " tornaria
@ 2024-11-18 2:43 ` tornaria
2024-11-18 11:34 ` [PR PATCH] [Merged]: " leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: tornaria @ 2024-11-18 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/53113#issuecomment-2481818109
Comment:
Fix musl by adding an `#include <signal.h>`
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: screen: fix socket dir and utmp
2024-11-17 23:58 [PR PATCH] screen: fix socket dir and utmp tornaria
2024-11-18 2:41 ` [PR PATCH] [Updated] " tornaria
2024-11-18 2:43 ` tornaria
@ 2024-11-18 11:34 ` leahneukirchen
2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2024-11-18 11:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
There's a merged pull request on the void-packages repository
screen: fix socket dir and utmp
https://github.com/void-linux/void-packages/pull/53113
Description:
This adjusts configure changes necessary for 5.0.0
- Use `/run/screens/S-<USER>` for socket dir as before; the default `$HOME/.screen` is not nice when home is shared.
- Enable UTMP so screen sessions show up (used to be enabled by default in 4.9.1)
- Other minor cleanup in the configure args
- No need to run autogen.sh
- skip check which are broken (https://savannah.gnu.org/bugs/?66416)
@leahneukirchen
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-18 11:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-11-17 23:58 [PR PATCH] screen: fix socket dir and utmp tornaria
2024-11-18 2:41 ` [PR PATCH] [Updated] " tornaria
2024-11-18 2:43 ` tornaria
2024-11-18 11:34 ` [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).