Date: Friday, April 18, 2014 @ 08:26:22 Author: bisson Revision: 211181
archrelease: copy trunk to staging-i686, staging-x86_64 Added: screen/repos/staging-i686/ screen/repos/staging-i686/PKGBUILD (from rev 211180, screen/trunk/PKGBUILD) screen/repos/staging-i686/install (from rev 211180, screen/trunk/install) screen/repos/staging-i686/long-term.patch (from rev 211180, screen/trunk/long-term.patch) screen/repos/staging-i686/pam.d (from rev 211180, screen/trunk/pam.d) screen/repos/staging-x86_64/ screen/repos/staging-x86_64/PKGBUILD (from rev 211180, screen/trunk/PKGBUILD) screen/repos/staging-x86_64/install (from rev 211180, screen/trunk/install) screen/repos/staging-x86_64/long-term.patch (from rev 211180, screen/trunk/long-term.patch) screen/repos/staging-x86_64/pam.d (from rev 211180, screen/trunk/pam.d) --------------------------------+ staging-i686/PKGBUILD | 60 +++++++++++++++++++++++++++++++++++++++ staging-i686/install | 25 ++++++++++++++++ staging-i686/long-term.patch | 24 +++++++++++++++ staging-i686/pam.d | 1 staging-x86_64/PKGBUILD | 60 +++++++++++++++++++++++++++++++++++++++ staging-x86_64/install | 25 ++++++++++++++++ staging-x86_64/long-term.patch | 24 +++++++++++++++ staging-x86_64/pam.d | 1 8 files changed, 220 insertions(+) Copied: screen/repos/staging-i686/PKGBUILD (from rev 211180, screen/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2014-04-18 06:26:22 UTC (rev 211181) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Committer: dorphell <dorph...@gmx.net> + +pkgname=screen +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' +url='http://www.gnu.org/software/screen/' +arch=('i686' 'x86_64') +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=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../long-term.patch + ./autogen.sh +} + +build() { + 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 + + 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 +} Copied: screen/repos/staging-i686/install (from rev 211180, screen/trunk/install) =================================================================== --- staging-i686/install (rev 0) +++ staging-i686/install 2014-04-18 06:26:22 UTC (rev 211181) @@ -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/repos/staging-i686/long-term.patch (from rev 211180, screen/trunk/long-term.patch) =================================================================== --- staging-i686/long-term.patch (rev 0) +++ staging-i686/long-term.patch 2014-04-18 06:26:22 UTC (rev 211181) @@ -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/repos/staging-i686/pam.d (from rev 211180, screen/trunk/pam.d) =================================================================== --- staging-i686/pam.d (rev 0) +++ staging-i686/pam.d 2014-04-18 06:26:22 UTC (rev 211181) @@ -0,0 +1 @@ +auth required pam_unix.so Copied: screen/repos/staging-x86_64/PKGBUILD (from rev 211180, screen/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2014-04-18 06:26:22 UTC (rev 211181) @@ -0,0 +1,60 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Committer: dorphell <dorph...@gmx.net> + +pkgname=screen +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' +url='http://www.gnu.org/software/screen/' +arch=('i686' 'x86_64') +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=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../long-term.patch + ./autogen.sh +} + +build() { + 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 + + 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 +} Copied: screen/repos/staging-x86_64/install (from rev 211180, screen/trunk/install) =================================================================== --- staging-x86_64/install (rev 0) +++ staging-x86_64/install 2014-04-18 06:26:22 UTC (rev 211181) @@ -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/repos/staging-x86_64/long-term.patch (from rev 211180, screen/trunk/long-term.patch) =================================================================== --- staging-x86_64/long-term.patch (rev 0) +++ staging-x86_64/long-term.patch 2014-04-18 06:26:22 UTC (rev 211181) @@ -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/repos/staging-x86_64/pam.d (from rev 211180, screen/trunk/pam.d) =================================================================== --- staging-x86_64/pam.d (rev 0) +++ staging-x86_64/pam.d 2014-04-18 06:26:22 UTC (rev 211181) @@ -0,0 +1 @@ +auth required pam_unix.so