Date: Wednesday, January 25, 2017 @ 08:50:48
Author: bisson
Revision: 287404
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
screen/repos/extra-i686/PKGBUILD
(from rev 287403, screen/trunk/PKGBUILD)
screen/repos/extra-i686/pam.d
(from rev 287403, screen/trunk/pam.d)
screen/repos/extra-i686/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
(from rev 287403,
screen/trunk/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch)
screen/repos/extra-i686/tmpfiles.d
(from rev 287403, screen/trunk/tmpfiles.d)
screen/repos/extra-x86_64/PKGBUILD
(from rev 287403, screen/trunk/PKGBUILD)
screen/repos/extra-x86_64/pam.d
(from rev 287403, screen/trunk/pam.d)
screen/repos/extra-x86_64/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
(from rev 287403,
screen/trunk/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch)
screen/repos/extra-x86_64/tmpfiles.d
(from rev 287403, screen/trunk/tmpfiles.d)
Deleted:
screen/repos/extra-i686/PKGBUILD
screen/repos/extra-i686/pam.d
screen/repos/extra-i686/tmpfiles.d
screen/repos/extra-x86_64/PKGBUILD
screen/repos/extra-x86_64/pam.d
screen/repos/extra-x86_64/tmpfiles.d
-----------------------------------------------------------------------------+
/PKGBUILD |
126 ++++++++++
/pam.d |
2
/tmpfiles.d |
2
extra-i686/PKGBUILD |
56 ----
extra-i686/pam.d |
1
extra-i686/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch |
22 +
extra-i686/tmpfiles.d |
1
extra-x86_64/PKGBUILD |
56 ----
extra-x86_64/pam.d |
1
extra-x86_64/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch |
22 +
extra-x86_64/tmpfiles.d |
1
11 files changed, 174 insertions(+), 116 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-25 08:49:54 UTC (rev 287403)
+++ extra-i686/PKGBUILD 2017-01-25 08:50:48 UTC (rev 287404)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Allan McRae <[email protected]>
-# Committer: dorphell <[email protected]>
-
-pkgname=screen
-pkgver=4.5.0
-pkgrel=1
-pkgdesc='Full-screen window manager that multiplexes a physical terminal'
-url='https://www.gnu.org/software/screen/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('ncurses' 'pam')
-validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4'
- '71AA09D9E8870FDB0AA7B61E21F968DEF747ABD7')
-source=("https://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
- 'tmpfiles.d'
- 'pam.d')
-sha1sums=('b329f538e7265405a5c14e13520e95ced9d2cb17' 'SKIP'
- '76b9c70b77940eb1214fe65739f9f932dc57fb66'
- '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
-
-backup=('etc/screenrc' 'etc/pam.d/screen')
-options=('!makeflags')
-
-_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 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/screen.conf
-
- 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 287403,
screen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Committer: dorphell <[email protected]>
+
+pkgname=screen
+pkgver=4.5.0
+pkgrel=2
+pkgdesc='Full-screen window manager that multiplexes a physical terminal'
+url='https://www.gnu.org/software/screen/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('ncurses' 'pam')
+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'
+ '76b9c70b77940eb1214fe65739f9f932dc57fb66'
+ '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
+backup=('etc/screenrc' 'etc/pam.d/screen')
+options=('!makeflags')
+
+_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}"
+
+ ./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 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/screen.conf
+
+ 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/pam.d
===================================================================
--- extra-i686/pam.d 2017-01-25 08:49:54 UTC (rev 287403)
+++ extra-i686/pam.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -1 +0,0 @@
-auth required pam_unix.so
Copied: screen/repos/extra-i686/pam.d (from rev 287403, screen/trunk/pam.d)
===================================================================
--- extra-i686/pam.d (rev 0)
+++ extra-i686/pam.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1 @@
+auth required pam_unix.so
Copied:
screen/repos/extra-i686/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
(from rev 287403,
screen/trunk/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch)
===================================================================
--- extra-i686/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
(rev 0)
+++ extra-i686/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1,22 @@
+Description: Fix privilege escalation by reverting upstream commit 5460f5d2
+Author: Axel Beckert <[email protected]>
+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;
Deleted: extra-i686/tmpfiles.d
===================================================================
--- extra-i686/tmpfiles.d 2017-01-25 08:49:54 UTC (rev 287403)
+++ extra-i686/tmpfiles.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -1 +0,0 @@
-d /run/screens 0755 root root -
Copied: screen/repos/extra-i686/tmpfiles.d (from rev 287403,
screen/trunk/tmpfiles.d)
===================================================================
--- extra-i686/tmpfiles.d (rev 0)
+++ extra-i686/tmpfiles.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1 @@
+d /run/screens 0755 root root -
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-25 08:49:54 UTC (rev 287403)
+++ extra-x86_64/PKGBUILD 2017-01-25 08:50:48 UTC (rev 287404)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <[email protected]>
-# Contributor: Allan McRae <[email protected]>
-# Committer: dorphell <[email protected]>
-
-pkgname=screen
-pkgver=4.5.0
-pkgrel=1
-pkgdesc='Full-screen window manager that multiplexes a physical terminal'
-url='https://www.gnu.org/software/screen/'
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('ncurses' 'pam')
-validpgpkeys=('2EE59A5D0C50167B5535BBF1B708A383C53EF3A4'
- '71AA09D9E8870FDB0AA7B61E21F968DEF747ABD7')
-source=("https://ftp.gnu.org/gnu/screen/screen-${pkgver}.tar.gz"{,.sig}
- 'tmpfiles.d'
- 'pam.d')
-sha1sums=('b329f538e7265405a5c14e13520e95ced9d2cb17' 'SKIP'
- '76b9c70b77940eb1214fe65739f9f932dc57fb66'
- '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
-
-backup=('etc/screenrc' 'etc/pam.d/screen')
-options=('!makeflags')
-
-_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 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/screen.conf
-
- 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 287403,
screen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Gaetan Bisson <[email protected]>
+# Contributor: Allan McRae <[email protected]>
+# Committer: dorphell <[email protected]>
+
+pkgname=screen
+pkgver=4.5.0
+pkgrel=2
+pkgdesc='Full-screen window manager that multiplexes a physical terminal'
+url='https://www.gnu.org/software/screen/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('ncurses' 'pam')
+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'
+ '76b9c70b77940eb1214fe65739f9f932dc57fb66'
+ '1ab4b512d2ac840d16db6986d7c98d7ce2f6383f')
+
+backup=('etc/screenrc' 'etc/pam.d/screen')
+options=('!makeflags')
+
+_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}"
+
+ ./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 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/screen.conf
+
+ 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/pam.d
===================================================================
--- extra-x86_64/pam.d 2017-01-25 08:49:54 UTC (rev 287403)
+++ extra-x86_64/pam.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -1 +0,0 @@
-auth required pam_unix.so
Copied: screen/repos/extra-x86_64/pam.d (from rev 287403, screen/trunk/pam.d)
===================================================================
--- extra-x86_64/pam.d (rev 0)
+++ extra-x86_64/pam.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1 @@
+auth required pam_unix.so
Copied:
screen/repos/extra-x86_64/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
(from rev 287403,
screen/trunk/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch)
===================================================================
--- extra-x86_64/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
(rev 0)
+++ extra-x86_64/reverse-cherry-pick-5460f5d2-to-fix-privilege-escalation.patch
2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1,22 @@
+Description: Fix privilege escalation by reverting upstream commit 5460f5d2
+Author: Axel Beckert <[email protected]>
+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;
Deleted: extra-x86_64/tmpfiles.d
===================================================================
--- extra-x86_64/tmpfiles.d 2017-01-25 08:49:54 UTC (rev 287403)
+++ extra-x86_64/tmpfiles.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -1 +0,0 @@
-d /run/screens 0755 root root -
Copied: screen/repos/extra-x86_64/tmpfiles.d (from rev 287403,
screen/trunk/tmpfiles.d)
===================================================================
--- extra-x86_64/tmpfiles.d (rev 0)
+++ extra-x86_64/tmpfiles.d 2017-01-25 08:50:48 UTC (rev 287404)
@@ -0,0 +1 @@
+d /run/screens 0755 root root -
