1 |
ssuominen 09/06/01 12:09:57 |
2 |
|
3 |
Added: imapproxyd.8 |
4 |
up-imapproxy-1.2.5_rc2-include_fix.patch |
5 |
imapproxy.initd pimpstat.8 |
6 |
up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch |
7 |
Removed: imapproxy.rc6 1.2.4-include-fix.patch |
8 |
Log: |
9 |
Fix loads of bulls.. |
10 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 net-mail/up-imapproxy/files/imapproxyd.8 |
14 |
|
15 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/imapproxyd.8?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/imapproxyd.8?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: imapproxyd.8 |
19 |
=================================================================== |
20 |
.\" Hey, EMACS: -*- nroff -*- |
21 |
.\" First parameter, NAME, should be all caps |
22 |
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection |
23 |
.\" other parameters are allowed: see man(7), man(1) |
24 |
.TH IMAPPROXYD 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon" |
25 |
.\" Please adjust this date whenever revising the manpage. |
26 |
.\" |
27 |
.SH NAME |
28 |
.B imapproxyd |
29 |
\- IMAP proxy daemon |
30 |
.SH SYNOPSIS |
31 |
.B imapproxyd |
32 |
.RI |
33 |
[ |
34 |
.B -f |
35 |
.RI |
36 |
<config file name> ] |
37 |
.RI |
38 |
[ |
39 |
.B -p |
40 |
.RI |
41 |
<pidfile name> ] |
42 |
.br |
43 |
.SH DESCRIPTION |
44 |
This manual page documents briefly the |
45 |
.B imapproxyd |
46 |
command. |
47 |
This manual page was written for the Debian distribution |
48 |
because the original program does not have a manual page. |
49 |
.PP |
50 |
UP-ImapProxy proxies IMAP transactions between an IMAP client and an IMAP |
51 |
server. The general idea is that the client should never know that it is |
52 |
not talking to the real IMAP server, but ImapProxy caches server connections. |
53 |
.PP |
54 |
ImapProxy was written to compensate for webmail clients that are unable to |
55 |
maintain persistent connections to an IMAP server. Most webmail clients |
56 |
need to log in to an IMAP server for nearly every single transaction; This |
57 |
behaviour can cause tragic performance problems on the IMAP server. |
58 |
ImapProxy tries to deal with this problem by leaving server connections |
59 |
open for a short time after a webmail client logs out. When the webmail |
60 |
client connects again, ImapProxy will determine if there is a cached |
61 |
connection available and reuse it if possible. |
62 |
.BR |
63 |
.SH FILES |
64 |
By default, UP-ImapProxy reads /etc/imapproxy.conf on startup. |
65 |
This can be changed by using the |
66 |
.I -f |
67 |
option |
68 |
.PP |
69 |
Unless foreground_mode has been enabled, UP-ImapProxy will write its PID to to |
70 |
a PID-file. It defaults to /var/run/imapproxy.pid, but can be overridden with |
71 |
the |
72 |
.I -p |
73 |
option |
74 |
.SH SEE ALSO |
75 |
.BR pimpstat (8), |
76 |
.br |
77 |
.SH AUTHOR |
78 |
This manual page was written by Jose Luis Tallon |
79 |
.nh |
80 |
<jltallon@×××××××××××××.net>, |
81 |
for the Debian GNU/Linux system (but may be used by others). |
82 |
|
83 |
|
84 |
|
85 |
|
86 |
|
87 |
1.1 net-mail/up-imapproxy/files/up-imapproxy-1.2.5_rc2-include_fix.patch |
88 |
|
89 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/up-imapproxy-1.2.5_rc2-include_fix.patch?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/up-imapproxy-1.2.5_rc2-include_fix.patch?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: up-imapproxy-1.2.5_rc2-include_fix.patch |
93 |
=================================================================== |
94 |
--- up-imapproxy-1.2.4.orig/src/imapcommon.c |
95 |
+++ up-imapproxy-1.2.4/src/imapcommon.c |
96 |
@@ -136,6 +136,7 @@ |
97 |
|
98 |
#include <openssl/evp.h> |
99 |
#include <openssl/err.h> |
100 |
+#include <openssl/md5.h> |
101 |
|
102 |
#include <pthread.h> |
103 |
#include <sys/types.h> |
104 |
|
105 |
|
106 |
|
107 |
1.1 net-mail/up-imapproxy/files/imapproxy.initd |
108 |
|
109 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/imapproxy.initd?rev=1.1&view=markup |
110 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/imapproxy.initd?rev=1.1&content-type=text/plain |
111 |
|
112 |
Index: imapproxy.initd |
113 |
=================================================================== |
114 |
#!/sbin/runscript |
115 |
# Copyright 1999-2009 Gentoo Foundation |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/files/imapproxy.initd,v 1.1 2009/06/01 12:09:57 ssuominen Exp $ |
118 |
|
119 |
depend() { |
120 |
use logger |
121 |
need net |
122 |
} |
123 |
|
124 |
start() { |
125 |
ebegin "Starting up-imapproxy" |
126 |
start-stop-daemon --start --quiet --exec /usr/sbin/imapproxyd |
127 |
eend $? |
128 |
} |
129 |
|
130 |
stop() { |
131 |
ebegin "Stopping up-imapproxy" |
132 |
start-stop-daemon --stop --quiet --exec /usr/sbin/imapproxyd |
133 |
eend $? |
134 |
} |
135 |
|
136 |
|
137 |
|
138 |
1.1 net-mail/up-imapproxy/files/pimpstat.8 |
139 |
|
140 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/pimpstat.8?rev=1.1&view=markup |
141 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/pimpstat.8?rev=1.1&content-type=text/plain |
142 |
|
143 |
Index: pimpstat.8 |
144 |
=================================================================== |
145 |
.\" Hey, EMACS: -*- nroff -*- |
146 |
.\" First parameter, NAME, should be all caps |
147 |
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection |
148 |
.\" other parameters are allowed: see man(7), man(1) |
149 |
.TH PIMPSTATS 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon" |
150 |
.\" Please adjust this date whenever revising the manpage. |
151 |
.\" |
152 |
.SH NAME |
153 |
pimpstat \- UP-ImapProxy statistics |
154 |
.SH SYNOPSIS |
155 |
.B pimpstat |
156 |
.RI [options] |
157 |
.br |
158 |
.SH DESCRIPTION |
159 |
This manual page documents briefly the |
160 |
.B pimpstat |
161 |
command. |
162 |
This manual page was written for the Debian distribution |
163 |
because the original program does not have a manual page. |
164 |
.SH SEE ALSO |
165 |
.BR imapproxyd (8), |
166 |
.br |
167 |
.SH AUTHOR |
168 |
This manual page was written by Jose Luis Tallon |
169 |
.nh |
170 |
<jltallon@×××××××××××××.net>, |
171 |
for the Debian GNU/Linux system (but may be used by others). |
172 |
|
173 |
|
174 |
|
175 |
1.1 net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch |
176 |
|
177 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch?rev=1.1&view=markup |
178 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch?rev=1.1&content-type=text/plain |
179 |
|
180 |
Index: up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch |
181 |
=================================================================== |
182 |
First part, |
183 |
|
184 |
Problems: Debian patchset version -5 against src/ directory. |
185 |
http://packages.debian.org/changelogs/pool/main/u/up-imapproxy/up-imapproxy_1.2.6-5/changelog |
186 |
|
187 |
Second part, |
188 |
|
189 |
Problems: http://bugzilla.redhat.com/show_bug.cgi?id=465859 |
190 |
Our solution to it: http://bugs.gentoo.org/show_bug.cgi?id=177780 |
191 |
by Holger Hoffstätte |
192 |
|
193 |
diff -ur up-imapproxy-1.2.6.orig/src/main.c up-imapproxy-1.2.6/src/main.c |
194 |
--- up-imapproxy-1.2.6.orig/src/main.c 2008-01-28 15:15:08.000000000 +0200 |
195 |
+++ up-imapproxy-1.2.6/src/main.c 2009-06-01 14:37:30.000000000 +0300 |
196 |
@@ -618,7 +618,7 @@ |
197 |
pthread_create( &RecycleThread, &attr, (void *)ICC_Recycle_Loop, NULL ); |
198 |
|
199 |
syslog(LOG_INFO, "%s: Launched ICC recycle thread with id %d", |
200 |
- fn, RecycleThread ); |
201 |
+ fn, (int)RecycleThread ); |
202 |
|
203 |
/* |
204 |
* Now start listening and accepting connections. |
205 |
@@ -1075,7 +1075,6 @@ |
206 |
ICD_Struct conn; |
207 |
int BytesRead; |
208 |
char *fn = "SetBannerAndCapability()"; |
209 |
- int NumRef = 0; |
210 |
|
211 |
/* initialize some stuff */ |
212 |
memset( &itd, 0, sizeof itd ); |
213 |
diff -ur up-imapproxy-1.2.6.orig/src/request.c up-imapproxy-1.2.6/src/request.c |
214 |
--- up-imapproxy-1.2.6.orig/src/request.c 2008-01-28 15:15:08.000000000 +0200 |
215 |
+++ up-imapproxy-1.2.6/src/request.c 2009-06-01 14:41:28.000000000 +0300 |
216 |
@@ -714,7 +714,7 @@ |
217 |
* avoid allocating additional buffers. Keep this in mind for future |
218 |
* code modification... |
219 |
*/ |
220 |
- snprintf( Username, BufLen, "Username:" ); |
221 |
+ snprintf( Username, MAXUSERNAMELEN - 1, "Username:" ); |
222 |
|
223 |
EVP_EncodeBlock( EncodedUsername, Username, strlen( Username ) ); |
224 |
|
225 |
@@ -770,7 +770,7 @@ |
226 |
/* |
227 |
* Same drill all over again, except this time it's for the password. |
228 |
*/ |
229 |
- snprintf( Password, BufLen, "Password:" ); |
230 |
+ snprintf( Password, MAXPASSWDLEN - 1, "Password:" ); |
231 |
|
232 |
EVP_EncodeBlock( EncodedPassword, Password, strlen( Password ) ); |
233 |
|
234 |
@@ -1197,7 +1197,7 @@ |
235 |
|
236 |
if ( Server->TraceOn ) |
237 |
{ |
238 |
- snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s SERVER: sd [%d]\n", time( 0 ), ( (TraceUser) ? TraceUser : "Null username" ), Server->conn->sd ); |
239 |
+ snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s SERVER: sd [%d]\n", time( 0 ), ( (*TraceUser) ? TraceUser : "Null username" ), Server->conn->sd ); |
240 |
write( Tracefd, TraceBuf, strlen( TraceBuf ) ); |
241 |
write( Tracefd, Server->ReadBuf, status ); |
242 |
} |
243 |
@@ -1243,7 +1243,7 @@ |
244 |
|
245 |
if ( Client->TraceOn ) |
246 |
{ |
247 |
- snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s CLIENT: sd [%d]\n", time( 0 ), ( (TraceUser) ? TraceUser : "Null username" ), Client->conn->sd ); |
248 |
+ snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s CLIENT: sd [%d]\n", time( 0 ), ( (*TraceUser) ? TraceUser : "Null username" ), Client->conn->sd ); |
249 |
write( Tracefd, TraceBuf, strlen( TraceBuf ) ); |
250 |
write( Tracefd, Client->ReadBuf, status ); |
251 |
} |
252 |
@@ -1902,7 +1902,7 @@ |
253 |
|
254 |
if ( BytesRead == -1 ) |
255 |
{ |
256 |
- syslog( LOG_NOTICE, "%s: Failed to read string literal from client on login." ); |
257 |
+ syslog( LOG_NOTICE, "%s: Failed to read string literal from client on login.", fn ); |
258 |
snprintf( SendBuf, BufLen, "%s NO LOGIN failed\r\n", Tag ); |
259 |
if ( IMAP_Write( Client.conn, SendBuf, strlen(SendBuf) ) == -1 ) |
260 |
{ |
261 |
diff -ur up-imapproxy-1.2.6.orig/src/select.c up-imapproxy-1.2.6/src/select.c |
262 |
--- up-imapproxy-1.2.6.orig/src/select.c 2008-01-28 15:15:08.000000000 +0200 |
263 |
+++ up-imapproxy-1.2.6/src/select.c 2009-06-01 14:37:30.000000000 +0300 |
264 |
@@ -349,7 +349,7 @@ |
265 |
{ |
266 |
if ( Server->LiteralBytesRemaining ) |
267 |
{ |
268 |
- syslog( LOG_ERR, "%s: Server response to SELECT command contains unexpected literal data on sd [%d].", fn ); |
269 |
+ syslog( LOG_ERR, "%s: Server response to SELECT command contains unexpected literal data on sd [%d].", fn, Server->conn ); |
270 |
/* |
271 |
* Must eat the literal. |
272 |
*/ |