[arch-commits] Commit in screen/trunk (2 files)

[Gaëtan Bisson]

    Date: Sunday, February 26, 2017 @ 21:09:14
  Author: bisson
Revision: 289569

upstream update

Modified:
  screen/trunk/PKGBUILD
Deleted:
  screen/trunk/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch

----------------------------------------------------------------+
 PKGBUILD                                                       |   13 +----
 reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch |   22 ----------
 2 files changed, 3 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-26 19:32:08 UTC (rev 289568)
+++ PKGBUILD	2017-02-26 21:09:14 UTC (rev 289569)
@@ -4,8 +4,8 @@
 # Committer: dorphell <dorphell at gmx.net>
 
 pkgname=screen
-pkgver=4.5.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
 pkgdesc='Full-screen window manager that multiplexes a physical terminal'
 url='https://www.gnu.org/software/screen/'
 arch=('i686' 'x86_64')
@@ -14,11 +14,9 @@
 validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4'
               '71AA09D9E8870FDB0AA7B61E21F968DEF747ABD7')
 source=("https://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
-        'reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch'
         'tmpfiles.d'
         'pam.d')
-sha1sums=('b329f538e7265405a5c14e13520e95ced9d2cb17' 'SKIP'
-          '641bf674b8d279475f474e9fb1fe41c7b635b9e3'
+sha1sums=('d096ea40c7a349ec46f3bd4fcc02fd6a873318e6' 'SKIP'
           '76b9c70b77940eb1214fe65739f9f932dc57fb66'
           '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
 
@@ -27,11 +25,6 @@
 
 _ptygroup=5 #the UID of our PTY/TTY group
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
===================================================================
--- reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch	2017-02-26 19:32:08 UTC (rev 289568)
+++ reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch	2017-02-26 21:09:14 UTC (rev 289569)
@@ -1,22 +0,0 @@
-Description: Fix privilege escalation by reverting upstream commit 5460f5d2
-Author: Axel Beckert <abe at debian.org>
-Bug-Debian: https://bugs.debian.org/852484
-Bug-CVE: http://www.openwall.com/lists/oss-security/2017/01/24/10
-Bug: https://savannah.gnu.org/bugs/?50142
-     https://lists.gnu.org/archive/html/screen-devel/2017-01/msg00025.html
-
---- a/screen.c
-+++ b/screen.c
-@@ -673,12 +673,6 @@
-                 Panic(0, "-L: logfile name can not start with \"-\" symbol");
-               if (strlen(screenlogfile) > PATH_MAX)
-                 Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX);
--
--              FILE *w_check;
--              if ((w_check = fopen(screenlogfile, "w")) == NULL)
--                Panic(0, "-L: logfile name access problem");
--              else
--                fclose(w_check);
-             }
-             nwin_options.Lflag = 1;
-             break;