[gentoo-commits] repo/gentoo:master commit in: profiles/, app-misc/screen/files/, app-misc/screen/

[gentoo-commits] repo/gentoo:master commit in: profiles/, app-misc/screen/files/, app-misc/screen/

[Sven Wegener]

commit:     4223dca39bd754d4e53a105b1a1d8f2615ad56a6
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 09:12:21 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 09:13:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4223dca3

app-misc/screen: Revision bump, security bug #607116

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/screen-4.5.0-logfile-access-revert.patch      | 17 +++++++++++++++++
 .../{screen-4.5.0.ebuild => screen-4.5.0-r1.ebuild}     |  2 ++
 profiles/package.mask                                   |  4 ----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app-misc/screen/files/screen-4.5.0-logfile-access-revert.patch b/app-misc/screen/files/screen-4.5.0-logfile-access-revert.patch
new file mode 100644
index 00000000..ec3fb6a
--- /dev/null
+++ b/app-misc/screen/files/screen-4.5.0-logfile-access-revert.patch
@@ -0,0 +1,17 @@
+Revert commit 5460f5d28c01a9a58e021eb1dffef2965e629d58
+
+--- b/screen.c
++++ a/screen.c
+@@ -670,12 +670,6 @@ int main(int ac, char** av)
+                 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;

diff --git a/app-misc/screen/screen-4.5.0.ebuild b/app-misc/screen/screen-4.5.0-r1.ebuild
similarity index 97%
rename from app-misc/screen/screen-4.5.0.ebuild
rename to app-misc/screen/screen-4.5.0-r1.ebuild
index 7ea62d1..5ceb947 100644
--- a/app-misc/screen/screen-4.5.0.ebuild
+++ b/app-misc/screen/screen-4.5.0-r1.ebuild
@@ -38,6 +38,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
 	# PATH_MAX usage needs an include on Solaris
 	"${FILESDIR}"/${P}-solaris-PATH_MAX.patch
+	# Revert patch due to security, bug #607116
+	"${FILESDIR}"/${P}-logfile-access-revert.patch
 )
 
 pkg_setup() {

diff --git a/profiles/package.mask b/profiles/package.mask
index 3bd0873..f36e499 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -68,10 +68,6 @@ x11-drivers/xf86-video-ivtv
 # Bug #606132
 x11-drivers/xf86-video-v4l
 
-# Jeroen Roovers <jer@gentoo.org> (24 Jan 2017)
-# Masked for bug #607116
-=app-misc/screen-4.5.0
-
 # Michał Górny <mgorny@gentoo.org> (24 Jan 2017)
 # Mask 4.0.0 RCs (then final) for initial testing, and updating most
 # important revdeps. Also revdeps that require 4.0.