summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2017-01-29 09:12:21 +0000
committerSven Wegener <swegener@gentoo.org>2017-01-29 09:13:29 +0000
commit4223dca39bd754d4e53a105b1a1d8f2615ad56a6 (patch)
tree213e7ad58fafbea8b6ccd4d189c7b9932f96ea42
parentdev-libs/OpenNI2: Any jre/jdk SLOT is acceptable (diff)
downloadgentoo-4223dca39bd754d4e53a105b1a1d8f2615ad56a6.tar.gz
gentoo-4223dca39bd754d4e53a105b1a1d8f2615ad56a6.tar.bz2
gentoo-4223dca39bd754d4e53a105b1a1d8f2615ad56a6.zip
app-misc/screen: Revision bump, security bug #607116
Package-Manager: Portage-2.3.3, Repoman-2.3.1
-rw-r--r--app-misc/screen/files/screen-4.5.0-logfile-access-revert.patch17
-rw-r--r--app-misc/screen/screen-4.5.0-r1.ebuild (renamed from app-misc/screen/screen-4.5.0.ebuild)2
-rw-r--r--profiles/package.mask4
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 000000000000..ec3fb6a4cf5d
--- /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
index 7ea62d184fb9..5ceb9474bb14 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 3bd087359213..f36e4991961e 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.