[arch-commits] Commit in screen/repos (14 files)
Gaetan Bisson
bisson at archlinux.org
Tue Jun 23 23:02:23 UTC 2015
Date: Wednesday, June 24, 2015 @ 01:02:23
Author: bisson
Revision: 241246
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
screen/repos/extra-i686/PKGBUILD
(from rev 241245, screen/trunk/PKGBUILD)
screen/repos/extra-i686/install
(from rev 241245, screen/trunk/install)
screen/repos/extra-i686/pam.d
(from rev 241245, screen/trunk/pam.d)
screen/repos/extra-i686/resize.patch
(from rev 241245, screen/trunk/resize.patch)
screen/repos/extra-x86_64/PKGBUILD
(from rev 241245, screen/trunk/PKGBUILD)
screen/repos/extra-x86_64/install
(from rev 241245, screen/trunk/install)
screen/repos/extra-x86_64/pam.d
(from rev 241245, screen/trunk/pam.d)
screen/repos/extra-x86_64/resize.patch
(from rev 241245, screen/trunk/resize.patch)
Deleted:
screen/repos/extra-i686/PKGBUILD
screen/repos/extra-i686/install
screen/repos/extra-i686/pam.d
screen/repos/extra-x86_64/PKGBUILD
screen/repos/extra-x86_64/install
screen/repos/extra-x86_64/pam.d
---------------------------+
/PKGBUILD | 120 ++++++++++++++++++++++++++++++++++++++++++++
/install | 40 ++++++++++++++
/pam.d | 2
extra-i686/PKGBUILD | 53 -------------------
extra-i686/install | 20 -------
extra-i686/pam.d | 1
extra-i686/resize.patch | 24 ++++++++
extra-x86_64/PKGBUILD | 53 -------------------
extra-x86_64/install | 20 -------
extra-x86_64/pam.d | 1
extra-x86_64/resize.patch | 24 ++++++++
11 files changed, 210 insertions(+), 148 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-06-23 23:01:39 UTC (rev 241245)
+++ extra-i686/PKGBUILD 2015-06-23 23:02:23 UTC (rev 241246)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Committer: dorphell <dorphell at gmx.net>
-
-pkgname=screen
-pkgver=4.3.0
-pkgrel=2
-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')
-validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
-source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
- 'pam.d')
-sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
- '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
-
-backup=('etc/screenrc' 'etc/pam.d/screen')
-options=('!makeflags')
-install=install
-
-_ptygroup=5 #the UID of our PTY/TTY group
-
-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/extra-i686/PKGBUILD (from rev 241245, screen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Committer: dorphell <dorphell at gmx.net>
+
+pkgname=screen
+pkgver=4.3.0
+pkgrel=3
+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')
+validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
+source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
+ 'resize.patch'
+ 'pam.d')
+sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
+ 'ec34e5bb69444706538f089d4c9b3c9f1ad58641'
+ '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
+backup=('etc/screenrc' 'etc/pam.d/screen')
+options=('!makeflags')
+install=install
+
+_ptygroup=5 #the UID of our PTY/TTY group
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p2 -i ../resize.patch
+}
+
+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
+}
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2015-06-23 23:01:39 UTC (rev 241245)
+++ extra-i686/install 2015-06-23 23:02:23 UTC (rev 241246)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/screen.info.gz $infodir/dir 2>/dev/null
-}
-
-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
- install-info --delete $infodir/screen.info.gz $infodir/dir 2>/dev/null
-}
Copied: screen/repos/extra-i686/install (from rev 241245, screen/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info $infodir/screen.info.gz $infodir/dir 2>/dev/null
+}
+
+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
+ install-info --delete $infodir/screen.info.gz $infodir/dir 2>/dev/null
+}
Deleted: extra-i686/pam.d
===================================================================
--- extra-i686/pam.d 2015-06-23 23:01:39 UTC (rev 241245)
+++ extra-i686/pam.d 2015-06-23 23:02:23 UTC (rev 241246)
@@ -1 +0,0 @@
-auth required pam_unix.so
Copied: screen/repos/extra-i686/pam.d (from rev 241245, screen/trunk/pam.d)
===================================================================
--- extra-i686/pam.d (rev 0)
+++ extra-i686/pam.d 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1 @@
+auth required pam_unix.so
Copied: screen/repos/extra-i686/resize.patch (from rev 241245, screen/trunk/resize.patch)
===================================================================
--- extra-i686/resize.patch (rev 0)
+++ extra-i686/resize.patch 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1,24 @@
+From 27a8c9677a95b8de67c91f983b25691f0864c194 Mon Sep 17 00:00:00 2001
+From: Amadeusz Sławiński <amade at asmblr.net>
+Date: Sun, 21 Jun 2015 20:34:29 +0000
+Subject: Fix off by one error when resizing windows
+
+Bug: 45321
+
+Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
+---
+diff --git a/src/resize.c b/src/resize.c
+index d48be5f..7dfd77c 100644
+--- a/src/resize.c
++++ b/src/resize.c
+@@ -538,7 +538,7 @@ int wi;
+ wi = MAXWIDTH;
+ if (wi <= maxwidth)
+ return;
+- maxwidth = wi;
++ maxwidth = wi + 1;
+ debug1("New maxwidth: %d\n", maxwidth);
+ blank = (unsigned char *)xrealloc((char *)blank, maxwidth);
+ null = (unsigned char *)xrealloc((char *)null, maxwidth);
+--
+cgit v0.9.0.2
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-06-23 23:01:39 UTC (rev 241245)
+++ extra-x86_64/PKGBUILD 2015-06-23 23:02:23 UTC (rev 241246)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Committer: dorphell <dorphell at gmx.net>
-
-pkgname=screen
-pkgver=4.3.0
-pkgrel=2
-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')
-validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
-source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
- 'pam.d')
-sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
- '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
-
-backup=('etc/screenrc' 'etc/pam.d/screen')
-options=('!makeflags')
-install=install
-
-_ptygroup=5 #the UID of our PTY/TTY group
-
-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/extra-x86_64/PKGBUILD (from rev 241245, screen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Committer: dorphell <dorphell at gmx.net>
+
+pkgname=screen
+pkgver=4.3.0
+pkgrel=3
+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')
+validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4')
+source=("http://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
+ 'resize.patch'
+ 'pam.d')
+sha1sums=('504c424f719cd44907a3390d5238759e1cb56741' 'SKIP'
+ 'ec34e5bb69444706538f089d4c9b3c9f1ad58641'
+ '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
+backup=('etc/screenrc' 'etc/pam.d/screen')
+options=('!makeflags')
+install=install
+
+_ptygroup=5 #the UID of our PTY/TTY group
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p2 -i ../resize.patch
+}
+
+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
+}
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2015-06-23 23:01:39 UTC (rev 241245)
+++ extra-x86_64/install 2015-06-23 23:02:23 UTC (rev 241246)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/screen.info.gz $infodir/dir 2>/dev/null
-}
-
-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
- install-info --delete $infodir/screen.info.gz $infodir/dir 2>/dev/null
-}
Copied: screen/repos/extra-x86_64/install (from rev 241245, screen/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info $infodir/screen.info.gz $infodir/dir 2>/dev/null
+}
+
+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
+ install-info --delete $infodir/screen.info.gz $infodir/dir 2>/dev/null
+}
Deleted: extra-x86_64/pam.d
===================================================================
--- extra-x86_64/pam.d 2015-06-23 23:01:39 UTC (rev 241245)
+++ extra-x86_64/pam.d 2015-06-23 23:02:23 UTC (rev 241246)
@@ -1 +0,0 @@
-auth required pam_unix.so
Copied: screen/repos/extra-x86_64/pam.d (from rev 241245, screen/trunk/pam.d)
===================================================================
--- extra-x86_64/pam.d (rev 0)
+++ extra-x86_64/pam.d 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1 @@
+auth required pam_unix.so
Copied: screen/repos/extra-x86_64/resize.patch (from rev 241245, screen/trunk/resize.patch)
===================================================================
--- extra-x86_64/resize.patch (rev 0)
+++ extra-x86_64/resize.patch 2015-06-23 23:02:23 UTC (rev 241246)
@@ -0,0 +1,24 @@
+From 27a8c9677a95b8de67c91f983b25691f0864c194 Mon Sep 17 00:00:00 2001
+From: Amadeusz Sławiński <amade at asmblr.net>
+Date: Sun, 21 Jun 2015 20:34:29 +0000
+Subject: Fix off by one error when resizing windows
+
+Bug: 45321
+
+Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
+---
+diff --git a/src/resize.c b/src/resize.c
+index d48be5f..7dfd77c 100644
+--- a/src/resize.c
++++ b/src/resize.c
+@@ -538,7 +538,7 @@ int wi;
+ wi = MAXWIDTH;
+ if (wi <= maxwidth)
+ return;
+- maxwidth = wi;
++ maxwidth = wi + 1;
+ debug1("New maxwidth: %d\n", maxwidth);
+ blank = (unsigned char *)xrealloc((char *)blank, maxwidth);
+ null = (unsigned char *)xrealloc((char *)null, maxwidth);
+--
+cgit v0.9.0.2
More information about the arch-commits
mailing list