From 5becede04b36667de9a77f40ab7dfdda3e12c836 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 15 Feb 2019 21:23:21 +0000 Subject: screen: update to 4.6.2. closes #1035 --- abs/extra/screen/PKGBUILD | 70 ++++++++++++---------- abs/extra/screen/pam.d | 1 + abs/extra/screen/screen-4.0.3-caption-colors.patch | 21 ------- abs/extra/screen/screen-4.0.3-long-term.patch | 24 -------- abs/extra/screen/screen.install | 21 ------- abs/extra/screen/screen.pam | 1 - abs/extra/screen/tmpfiles.d | 1 + 7 files changed, 39 insertions(+), 100 deletions(-) create mode 100644 abs/extra/screen/pam.d delete mode 100644 abs/extra/screen/screen-4.0.3-caption-colors.patch delete mode 100644 abs/extra/screen/screen-4.0.3-long-term.patch delete mode 100644 abs/extra/screen/screen.install delete mode 100644 abs/extra/screen/screen.pam create mode 100644 abs/extra/screen/tmpfiles.d diff --git a/abs/extra/screen/PKGBUILD b/abs/extra/screen/PKGBUILD index 3413734..a360b2f 100644 --- a/abs/extra/screen/PKGBUILD +++ b/abs/extra/screen/PKGBUILD @@ -1,48 +1,52 @@ -# $Id: PKGBUILD 147962 2012-01-29 04:41:21Z allan $ -# Maintainer: Allan McRae +# Maintainer: Gaetan Bisson +# Contributor: Allan McRae # Committer: dorphell pkgname=screen -pkgver=4.0.3 -pkgrel=13 -_ptygroup=5 #the UID of our PTY/TTY group -pkgdesc="Full-screen window manager that multiplexes a physical terminal" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/screen/" +pkgver=4.6.2 +pkgrel=1 +pkgdesc='Full-screen window manager that multiplexes a physical terminal' +url='https://www.gnu.org/software/screen/' +arch=('x86_64') license=('GPL') depends=('ncurses' 'pam') +source=("https://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz" + 'tmpfiles.d' + 'pam.d') +sha256sums=('1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a' + '1f33ce4faca7bd05dd80403411af31e682d5d23e79558e884ae5a35f1dd96223' + '971c25929ea97422c09e10679ab98e9e6c59295aae1a4a9970909d2206e23090') + backup=('etc/screenrc' 'etc/pam.d/screen') options=('!makeflags') -install=screen.install -source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz - screen-4.0.3-long-term.patch - screen-4.0.3-caption-colors.patch - screen.pam) -md5sums=('8506fd205028a96c741e4037de6e3c42' - '2723c3e71d5a2e5a74b6ddbc5215ef0f' - '191b6ced695ce2ae3a65bf02c2d4220f' - '74f7919d7b65436cc2ea5341fa8ca374') + +_ptygroup=5 #the UID of our PTY/TTY group build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch - patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch - - ./configure --prefix=/usr --enable-pam \ - --with-sys-screenrc=/etc/screenrc --enable-colors256 \ - --enable-rxvt_osc --enable-telnet \ - --with-pty-group=$_ptygroup \ - --mandir=/usr/share/man --infodir=/usr/share/info - make + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-colors256 \ + --enable-pam \ + --enable-rxvt_osc \ + --enable-telnet \ + --with-pty-group=$_ptygroup \ + --with-socket-dir=/run/screens \ + --with-sys-screenrc=/etc/screenrc \ + + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen + install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/screen + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/screen.conf - install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen - install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc - install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc + install -Dm644 etc/etcscreenrc "${pkgdir}"/etc/screenrc + install -Dm644 etc/screenrc "${pkgdir}"/etc/skel/.screenrc } diff --git a/abs/extra/screen/pam.d b/abs/extra/screen/pam.d new file mode 100644 index 0000000..07c42ad --- /dev/null +++ b/abs/extra/screen/pam.d @@ -0,0 +1 @@ +auth required pam_unix.so diff --git a/abs/extra/screen/screen-4.0.3-caption-colors.patch b/abs/extra/screen/screen-4.0.3-caption-colors.patch deleted file mode 100644 index c92cb0c..0000000 --- a/abs/extra/screen/screen-4.0.3-caption-colors.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001 -From: Sadrul Habib Chowdhury -Date: Tue, 26 Jan 2010 20:17:26 +0000 -Subject: Accommodate more color changes in the caption. - ---- -diff --git a/src/screen.c b/src/screen.c -index b1c3dfb..2cceae0 100644 ---- a/src/screen.c -+++ b/src/screen.c -@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; - #endif - - static char winmsg_buf[MAXSTR]; --#define MAX_WINMSG_REND 16 /* rendition changes */ -+#define MAX_WINMSG_REND 256 /* rendition changes */ - static int winmsg_rend[MAX_WINMSG_REND]; - static int winmsg_rendpos[MAX_WINMSG_REND]; - static int winmsg_numrend; --- -cgit v0.8.3.4 diff --git a/abs/extra/screen/screen-4.0.3-long-term.patch b/abs/extra/screen/screen-4.0.3-long-term.patch deleted file mode 100644 index 3e66acd..0000000 --- a/abs/extra/screen/screen-4.0.3-long-term.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h ---- screen-4.0.3-orig//display.h 2003-07-02 00:01:42.000000000 +1000 -+++ screen-4.0.3/display.h 2010-12-03 20:19:23.826671689 +1000 -@@ -85,7 +85,7 @@ - struct win *d_other; /* pointer to other window */ - int d_nonblock; /* -1 don't block if obufmax reached */ - /* >0: block after nonblock secs */ -- char d_termname[20 + 1]; /* $TERM */ -+ char d_termname[40 + 1]; /* $TERM */ - char *d_tentry; /* buffer for tgetstr */ - char d_tcinited; /* termcap inited flag */ - int d_width, d_height; /* width/height of the screen */ -diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h ---- screen-4.0.3-orig//screen.h 2003-08-22 22:28:43.000000000 +1000 -+++ screen-4.0.3/screen.h 2010-12-03 20:19:43.163338333 +1000 -@@ -202,7 +202,7 @@ - char preselect[20]; - int esc; /* his new escape character unless -1 */ - int meta_esc; /* his new meta esc character unless -1 */ -- char envterm[20 + 1]; /* terminal type */ -+ char envterm[40 + 1]; /* terminal type */ - int encoding; /* encoding of display */ - } - attach; diff --git a/abs/extra/screen/screen.install b/abs/extra/screen/screen.install deleted file mode 100644 index 9340e60..0000000 --- a/abs/extra/screen/screen.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/abs/extra/screen/screen.pam b/abs/extra/screen/screen.pam deleted file mode 100644 index 07c42ad..0000000 --- a/abs/extra/screen/screen.pam +++ /dev/null @@ -1 +0,0 @@ -auth required pam_unix.so diff --git a/abs/extra/screen/tmpfiles.d b/abs/extra/screen/tmpfiles.d new file mode 100644 index 0000000..2273828 --- /dev/null +++ b/abs/extra/screen/tmpfiles.d @@ -0,0 +1 @@ +d /run/screens 0755 root root - -- cgit v0.12