Date: Friday, April 18, 2014 @ 08:25:42
Author: bisson
Revision: 211180
upstream update, PKGBUILD cleanup
Added:
screen/trunk/install
(from rev 211159, screen/trunk/screen.install)
screen/trunk/long-term.patch
(from rev 211159, screen/trunk/screen-4.0.3-long-term.patch)
screen/trunk/pam.d
(from rev 211159, screen/trunk/screen.pam)
Modified:
screen/trunk/PKGBUILD
Deleted:
screen/trunk/screen-4.0.3-caption-colors.patch
screen/trunk/screen-4.0.3-long-term.patch
screen/trunk/screen.install
screen/trunk/screen.pam
-----------------------------------+
PKGBUILD | 73 ++++++++++++++++++++----------------
install | 25 ++++++++++++
long-term.patch | 24 +++++++++++
pam.d | 1
screen-4.0.3-caption-colors.patch | 21 ----------
screen-4.0.3-long-term.patch | 24 -----------
screen.install | 26 ------------
screen.pam | 1
8 files changed, 92 insertions(+), 103 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-04-18 05:40:29 UTC (rev 211179)
+++ PKGBUILD 2014-04-18 06:25:42 UTC (rev 211180)
@@ -1,49 +1,60 @@
# $Id$
-# Maintainer: Allan McRae <al...@archlinux.org>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Allan McRae <al...@archlinux.org>
# Committer: dorphell <dorph...@gmx.net>
pkgname=screen
-pkgver=4.0.3
-pkgrel=15
+pkgver=4.2.0
+pkgrel=1
_ptygroup=5 #the UID of our PTY/TTY group
-pkgdesc="Full-screen window manager that multiplexes a physical terminal"
+pkgdesc='Full-screen window manager that multiplexes a physical terminal'
+url='http://www.gnu.org/software/screen/'
arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/screen/";
license=('GPL')
depends=('ncurses' 'pam')
backup=('etc/screenrc' 'etc/pam.d/screen')
+#source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz";
+source=("http://download.savannah.gnu.org/releases/screen/screen-${pkgver}.tar.gz";
+ 'long-term.patch'
+ 'pam.d')
+sha1sums=('85a206e1e474fd608f17e88bfe5f90a55f21c51a'
+ '4ca8408ec03e97777e37f45a99cf8ab503592734'
+ '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
options=('!makeflags')
-install=screen.install
-source=("http://ftp.gnu.org/gnu/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')
+install=install
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../long-term.patch
+ ./autogen.sh
+}
+
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 \
- --with-socket-dir=/run/screens
- 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 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/completer.zsh
"${pkgdir}"/usr/share/zsh/site-functions/screen
+ install -Dm644 etc/etcscreenrc "${pkgdir}"/etc/screenrc
+ install -Dm644 etc/screenrc "${pkgdir}"/etc/skel/.screenrc
}
Copied: screen/trunk/install (from rev 211159, screen/trunk/screen.install)
===================================================================
--- install (rev 0)
+++ install 2014-04-18 06:25:42 UTC (rev 211180)
@@ -0,0 +1,25 @@
+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
+ if [ $(vercmp $2 4.0.3-15) -lt 0 ]; then
+ echo 'The location of the screen sockets has changed.'
+ echo 'If you need to access running screen sessions, run'
+ echo ' # SCREENDIR=/tmp/screens/S-$USER/ screen ...'
+ fi
+}
+
+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
+}
Copied: screen/trunk/long-term.patch (from rev 211159,
screen/trunk/screen-4.0.3-long-term.patch)
===================================================================
--- long-term.patch (rev 0)
+++ long-term.patch 2014-04-18 06:25:42 UTC (rev 211180)
@@ -0,0 +1,24 @@
+diff -aur old/display.h new/display.h
+--- old/display.h 2014-04-16 11:38:41.000000000 -1000
++++ new/display.h 2014-04-17 16:20:36.992994397 -1000
+@@ -73,7 +73,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 -aur old/screen.h new/screen.h
+--- old/screen.h 2014-04-16 11:38:41.000000000 -1000
++++ new/screen.h 2014-04-17 16:20:36.992994397 -1000
+@@ -214,7 +214,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 */
+ int detachfirst; /* whether to detach remote sessions first */
+ }
Copied: screen/trunk/pam.d (from rev 211159, screen/trunk/screen.pam)
===================================================================
--- pam.d (rev 0)
+++ pam.d 2014-04-18 06:25:42 UTC (rev 211180)
@@ -0,0 +1 @@
+auth required pam_unix.so
Deleted: screen-4.0.3-caption-colors.patch
===================================================================
--- screen-4.0.3-caption-colors.patch 2014-04-18 05:40:29 UTC (rev 211179)
+++ screen-4.0.3-caption-colors.patch 2014-04-18 06:25:42 UTC (rev 211180)
@@ -1,21 +0,0 @@
-From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
-From: Sadrul Habib Chowdhury <sad...@users.sourceforge.net>
-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
Deleted: screen-4.0.3-long-term.patch
===================================================================
--- screen-4.0.3-long-term.patch 2014-04-18 05:40:29 UTC (rev 211179)
+++ screen-4.0.3-long-term.patch 2014-04-18 06:25:42 UTC (rev 211180)
@@ -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;
Deleted: screen.install
===================================================================
--- screen.install 2014-04-18 05:40:29 UTC (rev 211179)
+++ screen.install 2014-04-18 06:25:42 UTC (rev 211180)
@@ -1,26 +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
- if [ $(vercmp $2 4.0.3-15) -lt 0 ]; then
- echo 'The location of the screen sockets has changed.'
- echo 'If you need to access running screen sessions, run'
- echo ' # SCREENDIR=/tmp/screens/S-$USER/ screen ...'
- fi
-}
-
-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
-}
-
Deleted: screen.pam
===================================================================
--- screen.pam 2014-04-18 05:40:29 UTC (rev 211179)
+++ screen.pam 2014-04-18 06:25:42 UTC (rev 211180)
@@ -1 +0,0 @@
-auth required pam_unix.so
