[arch-commits] Commit in screen/repos (14 files)

Gaetan Bisson bisson at archlinux.org
Tue Nov 11 18:20:25 UTC 2014


    Date: Tuesday, November 11, 2014 @ 19:20:24
  Author: bisson
Revision: 226068

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  screen/repos/extra-i686/PKGBUILD
    (from rev 226067, screen/trunk/PKGBUILD)
  screen/repos/extra-i686/hardstatus.patch
    (from rev 226067, screen/trunk/hardstatus.patch)
  screen/repos/extra-i686/install
    (from rev 226067, screen/trunk/install)
  screen/repos/extra-i686/pam.d
    (from rev 226067, screen/trunk/pam.d)
  screen/repos/extra-x86_64/PKGBUILD
    (from rev 226067, screen/trunk/PKGBUILD)
  screen/repos/extra-x86_64/hardstatus.patch
    (from rev 226067, screen/trunk/hardstatus.patch)
  screen/repos/extra-x86_64/install
    (from rev 226067, screen/trunk/install)
  screen/repos/extra-x86_64/pam.d
    (from rev 226067, screen/trunk/pam.d)
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                     |  116 ++++++++++++++++++++++++++++++++++++++++
 /install                      |   40 +++++++++++++
 /pam.d                        |    2 
 extra-i686/PKGBUILD           |   51 -----------------
 extra-i686/hardstatus.patch   |   28 +++++++++
 extra-i686/install            |   20 ------
 extra-i686/pam.d              |    1 
 extra-x86_64/PKGBUILD         |   51 -----------------
 extra-x86_64/hardstatus.patch |   28 +++++++++
 extra-x86_64/install          |   20 ------
 extra-x86_64/pam.d            |    1 
 11 files changed, 214 insertions(+), 144 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-11-11 18:19:44 UTC (rev 226067)
+++ extra-i686/PKGBUILD	2014-11-11 18:20:24 UTC (rev 226068)
@@ -1,51 +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.2.1
-pkgrel=2
-_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"{,.sig}
-        'pam.d')
-sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP'
-          '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
-
-options=('!makeflags')
-install=install
-
-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 226067, screen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-11-11 18:20:24 UTC (rev 226068)
@@ -0,0 +1,58 @@
+# $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.2.1
+pkgrel=3
+_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"{,.sig}
+        'hardstatus.patch'
+        'pam.d')
+sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP'
+          'd9d0ae0427eede2523954fdec549021f0f9640cd'
+          '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
+options=('!makeflags')
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p2 -i ../hardstatus.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
+}

Copied: screen/repos/extra-i686/hardstatus.patch (from rev 226067, screen/trunk/hardstatus.patch)
===================================================================
--- extra-i686/hardstatus.patch	                        (rev 0)
+++ extra-i686/hardstatus.patch	2014-11-11 18:20:24 UTC (rev 226068)
@@ -0,0 +1,28 @@
+From 8ffd5f465ef4ed07b45534393ed51502b9b0ea77 Mon Sep 17 00:00:00 2001
+From: Amadeusz Sławiński <amade at asmblr.net>
+Date: Sat, 17 May 2014 10:38:01 +0000
+Subject: Fix cpation/hardstatus rendering problem
+
+https://savannah.gnu.org/bugs/?42369
+https://savannah.gnu.org/bugs/?32339
+https://savannah.gnu.org/bugs/?42247
+
+Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
+---
+diff --git a/src/screen.c b/src/screen.c
+index 473e4fa..8b36bea 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2271,8 +2271,8 @@ int padlen;
+ 	  while (i-- > 0)
+ 	    *pn-- = ' ';
+ 	  numpad--;
+-	  if (r && p - buf == winmsg_rendpos[r - 1])
+-	    winmsg_rendpos[--r] = pn - buf;
++	  if (r && p - buf + 1== winmsg_rendpos[r - 1])
++	    winmsg_rendpos[--r] = pn - buf + 1;
+ 	}
+     }
+   return pn2;
+--
+cgit v0.9.0.2

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2014-11-11 18:19:44 UTC (rev 226067)
+++ extra-i686/install	2014-11-11 18:20:24 UTC (rev 226068)
@@ -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 226067, screen/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2014-11-11 18:20:24 UTC (rev 226068)
@@ -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	2014-11-11 18:19:44 UTC (rev 226067)
+++ extra-i686/pam.d	2014-11-11 18:20:24 UTC (rev 226068)
@@ -1 +0,0 @@
-auth		required	pam_unix.so

Copied: screen/repos/extra-i686/pam.d (from rev 226067, screen/trunk/pam.d)
===================================================================
--- extra-i686/pam.d	                        (rev 0)
+++ extra-i686/pam.d	2014-11-11 18:20:24 UTC (rev 226068)
@@ -0,0 +1 @@
+auth		required	pam_unix.so

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-11-11 18:19:44 UTC (rev 226067)
+++ extra-x86_64/PKGBUILD	2014-11-11 18:20:24 UTC (rev 226068)
@@ -1,51 +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.2.1
-pkgrel=2
-_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"{,.sig}
-        'pam.d')
-sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP'
-          '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
-
-options=('!makeflags')
-install=install
-
-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 226067, screen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-11-11 18:20:24 UTC (rev 226068)
@@ -0,0 +1,58 @@
+# $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.2.1
+pkgrel=3
+_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"{,.sig}
+        'hardstatus.patch'
+        'pam.d')
+sha1sums=('21eadf5f1d64120649f3390346253c6bc8a5103c' 'SKIP'
+          'd9d0ae0427eede2523954fdec549021f0f9640cd'
+          '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
+options=('!makeflags')
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p2 -i ../hardstatus.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
+}

Copied: screen/repos/extra-x86_64/hardstatus.patch (from rev 226067, screen/trunk/hardstatus.patch)
===================================================================
--- extra-x86_64/hardstatus.patch	                        (rev 0)
+++ extra-x86_64/hardstatus.patch	2014-11-11 18:20:24 UTC (rev 226068)
@@ -0,0 +1,28 @@
+From 8ffd5f465ef4ed07b45534393ed51502b9b0ea77 Mon Sep 17 00:00:00 2001
+From: Amadeusz Sławiński <amade at asmblr.net>
+Date: Sat, 17 May 2014 10:38:01 +0000
+Subject: Fix cpation/hardstatus rendering problem
+
+https://savannah.gnu.org/bugs/?42369
+https://savannah.gnu.org/bugs/?32339
+https://savannah.gnu.org/bugs/?42247
+
+Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
+---
+diff --git a/src/screen.c b/src/screen.c
+index 473e4fa..8b36bea 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2271,8 +2271,8 @@ int padlen;
+ 	  while (i-- > 0)
+ 	    *pn-- = ' ';
+ 	  numpad--;
+-	  if (r && p - buf == winmsg_rendpos[r - 1])
+-	    winmsg_rendpos[--r] = pn - buf;
++	  if (r && p - buf + 1== winmsg_rendpos[r - 1])
++	    winmsg_rendpos[--r] = pn - buf + 1;
+ 	}
+     }
+   return pn2;
+--
+cgit v0.9.0.2

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2014-11-11 18:19:44 UTC (rev 226067)
+++ extra-x86_64/install	2014-11-11 18:20:24 UTC (rev 226068)
@@ -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 226067, screen/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2014-11-11 18:20:24 UTC (rev 226068)
@@ -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	2014-11-11 18:19:44 UTC (rev 226067)
+++ extra-x86_64/pam.d	2014-11-11 18:20:24 UTC (rev 226068)
@@ -1 +0,0 @@
-auth		required	pam_unix.so

Copied: screen/repos/extra-x86_64/pam.d (from rev 226067, screen/trunk/pam.d)
===================================================================
--- extra-x86_64/pam.d	                        (rev 0)
+++ extra-x86_64/pam.d	2014-11-11 18:20:24 UTC (rev 226068)
@@ -0,0 +1 @@
+auth		required	pam_unix.so


More information about the arch-commits mailing list