1 |
radhermit 12/11/02 06:15:58 |
2 |
|
3 |
Modified: nzbget.initd |
4 |
Added: nzbget-9.0_pre477-buffer-overflows.patch |
5 |
nzbget-9.0_pre477-header.patch |
6 |
Log: |
7 |
Version bump to development release. Fix potential buffer overflows (bug #434264), change from /var/run to /run, remove need |
8 |
|
9 |
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
10 |
|
11 |
Revision Changes Path |
12 |
1.4 net-nntp/nzbget/files/nzbget.initd |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget.initd?rev=1.4&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget.initd?rev=1.4&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget.initd?r1=1.3&r2=1.4 |
17 |
|
18 |
Index: nzbget.initd |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v |
21 |
retrieving revision 1.3 |
22 |
retrieving revision 1.4 |
23 |
diff -u -r1.3 -r1.4 |
24 |
--- nzbget.initd 25 Dec 2011 07:42:35 -0000 1.3 |
25 |
+++ nzbget.initd 2 Nov 2012 06:15:57 -0000 1.4 |
26 |
@@ -1,14 +1,10 @@ |
27 |
#!/sbin/runscript |
28 |
-# Copyright 1999-2011 Gentoo Foundation |
29 |
+# Copyright 1999-2012 Gentoo Foundation |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v 1.3 2011/12/25 07:42:35 radhermit Exp $ |
32 |
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v 1.4 2012/11/02 06:15:57 radhermit Exp $ |
33 |
|
34 |
extra_started_commands="pause unpause" |
35 |
|
36 |
-depend() { |
37 |
- need net |
38 |
-} |
39 |
- |
40 |
start() { |
41 |
ebegin "Starting nzbget" |
42 |
start-stop-daemon --quiet --start --user "${NZBGET_USER}" \ |
43 |
|
44 |
|
45 |
|
46 |
1.1 net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget-9.0_pre477-buffer-overflows.patch?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: nzbget-9.0_pre477-buffer-overflows.patch |
52 |
=================================================================== |
53 |
--- nzbget-9.0-testing/RemoteClient.cpp |
54 |
+++ nzbget-9.0-testing/RemoteClient.cpp |
55 |
@@ -541,20 +541,20 @@ |
56 |
{ |
57 |
if (szParameters[0] == '\0') |
58 |
{ |
59 |
- strncat(szParameters, " (", 1024); |
60 |
+ strncat(szParameters, " (", sizeof(szParameters) - strlen(szParameters) - 1); |
61 |
} |
62 |
else |
63 |
{ |
64 |
- strncat(szParameters, ", ", 1024); |
65 |
+ strncat(szParameters, ", ", sizeof(szParameters) - strlen(szParameters) - 1); |
66 |
} |
67 |
NZBParameter* pNZBParameter = *it; |
68 |
- strncat(szParameters, pNZBParameter->GetName(), 1024); |
69 |
- strncat(szParameters, "=", 1024); |
70 |
- strncat(szParameters, pNZBParameter->GetValue(), 1024); |
71 |
+ strncat(szParameters, pNZBParameter->GetName(), sizeof(szParameters) - strlen(szParameters) - 1); |
72 |
+ strncat(szParameters, "=", sizeof(szParameters) - strlen(szParameters) - 1); |
73 |
+ strncat(szParameters, pNZBParameter->GetValue(), sizeof(szParameters) - strlen(szParameters) - 1); |
74 |
} |
75 |
if (szParameters[0] != '\0') |
76 |
{ |
77 |
- strncat(szParameters, ")", 1024); |
78 |
+ strncat(szParameters, ")", sizeof(szParameters) - strlen(szParameters) - 1); |
79 |
} |
80 |
|
81 |
if (!szPattern || ((MatchedNZBInfo*)pGroupInfo->GetNZBInfo())->m_bMatch) |
82 |
@@ -672,10 +672,10 @@ |
83 |
|
84 |
if (ntohl(ListResponse.m_iPostJobCount) > 0 || ntohl(ListResponse.m_bPostPaused)) |
85 |
{ |
86 |
- strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState)); |
87 |
+ strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState) - strlen(szServerState) - 1); |
88 |
if (ntohl(ListResponse.m_bPostPaused)) |
89 |
{ |
90 |
- strncat(szServerState, " paused", sizeof(szServerState)); |
91 |
+ strncat(szServerState, " paused", sizeof(szServerState) - strlen(szServerState) - 1); |
92 |
} |
93 |
} |
94 |
|
95 |
|
96 |
|
97 |
|
98 |
1.1 net-nntp/nzbget/files/nzbget-9.0_pre477-header.patch |
99 |
|
100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget-9.0_pre477-header.patch?rev=1.1&view=markup |
101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-nntp/nzbget/files/nzbget-9.0_pre477-header.patch?rev=1.1&content-type=text/plain |
102 |
|
103 |
Index: nzbget-9.0_pre477-header.patch |
104 |
=================================================================== |
105 |
--- nzbget-9.0-testing/Scanner.cpp |
106 |
+++ nzbget-9.0-testing/Scanner.cpp |
107 |
@@ -36,6 +36,8 @@ |
108 |
#include <fstream> |
109 |
#ifdef WIN32 |
110 |
#include <direct.h> |
111 |
+#else |
112 |
+#include <unistd.h> |
113 |
#endif |
114 |
#include <sys/stat.h> |
115 |
#include <errno.h> |