1 |
commit: 4223dca39bd754d4e53a105b1a1d8f2615ad56a6 |
2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 29 09:12:21 2017 +0000 |
4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 09:13:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4223dca3 |
7 |
|
8 |
app-misc/screen: Revision bump, security bug #607116 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
.../files/screen-4.5.0-logfile-access-revert.patch | 17 +++++++++++++++++ |
13 |
.../{screen-4.5.0.ebuild => screen-4.5.0-r1.ebuild} | 2 ++ |
14 |
profiles/package.mask | 4 ---- |
15 |
3 files changed, 19 insertions(+), 4 deletions(-) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000..ec3fb6a |
20 |
--- /dev/null |
21 |
+++ b/app-misc/screen/files/screen-4.5.0-logfile-access-revert.patch |
22 |
@@ -0,0 +1,17 @@ |
23 |
+Revert commit 5460f5d28c01a9a58e021eb1dffef2965e629d58 |
24 |
+ |
25 |
+--- b/screen.c |
26 |
++++ a/screen.c |
27 |
+@@ -670,12 +670,6 @@ int main(int ac, char** av) |
28 |
+ Panic(0, "-L: logfile name can not start with \"-\" symbol"); |
29 |
+ if (strlen(screenlogfile) > PATH_MAX) |
30 |
+ Panic(0, "-L: logfile name too long. (max. %d char)", PATH_MAX); |
31 |
+- |
32 |
+- FILE *w_check; |
33 |
+- if ((w_check = fopen(screenlogfile, "w")) == NULL) |
34 |
+- Panic(0, "-L: logfile name access problem"); |
35 |
+- else |
36 |
+- fclose(w_check); |
37 |
+ } |
38 |
+ nwin_options.Lflag = 1; |
39 |
+ break; |
40 |
|
41 |
diff --git a/app-misc/screen/screen-4.5.0.ebuild b/app-misc/screen/screen-4.5.0-r1.ebuild |
42 |
similarity index 97% |
43 |
rename from app-misc/screen/screen-4.5.0.ebuild |
44 |
rename to app-misc/screen/screen-4.5.0-r1.ebuild |
45 |
index 7ea62d1..5ceb947 100644 |
46 |
--- a/app-misc/screen/screen-4.5.0.ebuild |
47 |
+++ b/app-misc/screen/screen-4.5.0-r1.ebuild |
48 |
@@ -38,6 +38,8 @@ PATCHES=( |
49 |
"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch |
50 |
# PATH_MAX usage needs an include on Solaris |
51 |
"${FILESDIR}"/${P}-solaris-PATH_MAX.patch |
52 |
+ # Revert patch due to security, bug #607116 |
53 |
+ "${FILESDIR}"/${P}-logfile-access-revert.patch |
54 |
) |
55 |
|
56 |
pkg_setup() { |
57 |
|
58 |
diff --git a/profiles/package.mask b/profiles/package.mask |
59 |
index 3bd0873..f36e499 100644 |
60 |
--- a/profiles/package.mask |
61 |
+++ b/profiles/package.mask |
62 |
@@ -68,10 +68,6 @@ x11-drivers/xf86-video-ivtv |
63 |
# Bug #606132 |
64 |
x11-drivers/xf86-video-v4l |
65 |
|
66 |
-# Jeroen Roovers <jer@g.o> (24 Jan 2017) |
67 |
-# Masked for bug #607116 |
68 |
-=app-misc/screen-4.5.0 |
69 |
- |
70 |
# Michał Górny <mgorny@g.o> (24 Jan 2017) |
71 |
# Mask 4.0.0 RCs (then final) for initial testing, and updating most |
72 |
# important revdeps. Also revdeps that require 4.0. |