summaryrefslogtreecommitdiff
path: root/user/screen
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2024-08-29 09:56:37 +0000
committerZach van Rijn <me@zv.io>2024-10-24 15:33:40 +0000
commitcb43550541d42f1e35aab922f17ef62059d1440e (patch)
tree1b17e38c8e89e570ad530a4ab11546cf06395fa5 /user/screen
parent8c48e95727ada6e0a4cea2b8cd5192a6bc6929d4 (diff)
downloadpackages-cb43550541d42f1e35aab922f17ef62059d1440e.tar.gz
packages-cb43550541d42f1e35aab922f17ef62059d1440e.tar.bz2
packages-cb43550541d42f1e35aab922f17ef62059d1440e.tar.xz
packages-cb43550541d42f1e35aab922f17ef62059d1440e.zip
user/screen: bump { 4.8.0 --> 5.0.0 }.
Diffstat (limited to 'user/screen')
-rw-r--r--user/screen/APKBUILD15
-rw-r--r--user/screen/missing-header.patch11
-rw-r--r--user/screen/utmpx.patch21
3 files changed, 18 insertions, 29 deletions
diff --git a/user/screen/APKBUILD b/user/screen/APKBUILD
index 295e51c7f..9e95191e9 100644
--- a/user/screen/APKBUILD
+++ b/user/screen/APKBUILD
@@ -2,22 +2,21 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=screen
-pkgver=4.8.0
+pkgver=5.0.0
pkgrel=0
pkgdesc="A window manager that multiplexes a physical terminal"
-url="http://ftp.gnu.org/gnu/screen/"
+url="https://ftp.gnu.org/gnu/screen/"
arch="all"
options="!check" # No test suite.
license="GPL-3.0+"
depends=""
-makedepends="ncurses-dev utmps-dev libutempter-dev"
+makedepends="ncurses-dev utmps-dev libutempter-dev linux-pam-dev"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
- utmpx.patch
+ missing-header.patch
"
build() {
- export CFLAGS="-DNONETHACK -DGETUTENT"
LIBS="-lutmps -lskarnet" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,7 +24,7 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --enable-colors256
+ --enable-utmp
make
}
@@ -40,5 +39,5 @@ package() {
install -Dm644 etc/screenrc "$pkgdir"/etc/skel/.screenrc
}
-sha512sums="770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c screen-4.8.0.tar.gz
-82aca3e16c8cd7a3029d3b589ff2dd3471708d6287979ebb5cfdaedbd1f3012c0cd660b131e0cbe142b99786e49ef8b24c63159523d870e95ccf71ec94b82634 utmpx.patch"
+sha512sums="18a163313025c58950ec65fa83037ba1df0fa8e2346925593217fb0a6596f2f51914a4f0aec7f0e1c280d3d3ef964e7a886521f41f4b96f4ff08935be7f62117 screen-5.0.0.tar.gz
+b698b28177362b2f078b01d8ea51d4b9061f5663c6b2f4d5c89dac506f6b035c33cc505c5c84d8a38ee48e3ab202fc15d4c90dff1baf5368b4ddf128f4ae9556 missing-header.patch"
diff --git a/user/screen/missing-header.patch b/user/screen/missing-header.patch
new file mode 100644
index 000000000..34e44d4fe
--- /dev/null
+++ b/user/screen/missing-header.patch
@@ -0,0 +1,11 @@
+diff -ur a/utmp.c b/utmp.c
+--- a/utmp.c 2024-08-29 09:46:14.655729962 +0000
++++ b/utmp.c 2024-08-29 09:47:54.248164818 +0000
+@@ -35,6 +35,7 @@
+ #include <fcntl.h>
+ #include <stdint.h>
+ #include <stdbool.h>
++#include <signal.h>
+
+ #include "screen.h"
+
diff --git a/user/screen/utmpx.patch b/user/screen/utmpx.patch
deleted file mode 100644
index c8c6f444b..000000000
--- a/user/screen/utmpx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- screen-4.6.2/os.h.old 2018-09-27 23:11:11.655480028 -0700
-+++ screen-4.6.2/os.h 2018-09-27 23:11:34.745808665 -0700
-@@ -250,17 +250,13 @@
- #endif
-
- #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
--# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
-+# if defined(linux)
- # include <utmpx.h>
- # define UTMPFILE UTMPX_FILE
- # define utmp utmpx
--# define getutent getutxent
- # define getutid getutxid
- # define getutline getutxline
- # define pututline pututxline
--# define setutent setutxent
--# define endutent endutxent
--# define ut_time ut_xtime
- # else /* SVR4 */
- # include <utmp.h>
- # endif /* SVR4 */