diff options
Diffstat (limited to 'net-mail/up-imapproxy/files')
| -rw-r--r-- | net-mail/up-imapproxy/files/imapproxy.initd (renamed from net-mail/up-imapproxy/files/imapproxy.rc6) | 8 | ||||
| -rw-r--r-- | net-mail/up-imapproxy/files/imapproxyd.8 | 64 | ||||
| -rw-r--r-- | net-mail/up-imapproxy/files/pimpstat.8 | 27 | ||||
| -rw-r--r-- | net-mail/up-imapproxy/files/up-imapproxy-1.2.5_rc2-include_fix.patch (renamed from net-mail/up-imapproxy/files/1.2.4-include-fix.patch) | 0 | ||||
| -rw-r--r-- | net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch | 91 |
5 files changed, 186 insertions, 4 deletions
diff --git a/net-mail/up-imapproxy/files/imapproxy.rc6 b/net-mail/up-imapproxy/files/imapproxy.initd index aabdd888e170..8797f0480543 100644 --- a/net-mail/up-imapproxy/files/imapproxy.rc6 +++ b/net-mail/up-imapproxy/files/imapproxy.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/files/imapproxy.rc6,v 1.2 2004/07/14 23:52:37 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/files/imapproxy.initd,v 1.1 2009/06/01 12:09:57 ssuominen Exp $ depend() { use logger @@ -9,13 +9,13 @@ depend() { } start() { - ebegin "Starting imapproxy" + ebegin "Starting up-imapproxy" start-stop-daemon --start --quiet --exec /usr/sbin/imapproxyd eend $? } stop() { - ebegin "Stopping imapproxy" + ebegin "Stopping up-imapproxy" start-stop-daemon --stop --quiet --exec /usr/sbin/imapproxyd eend $? } diff --git a/net-mail/up-imapproxy/files/imapproxyd.8 b/net-mail/up-imapproxy/files/imapproxyd.8 new file mode 100644 index 000000000000..1c70d9525756 --- /dev/null +++ b/net-mail/up-imapproxy/files/imapproxyd.8 @@ -0,0 +1,64 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH IMAPPROXYD 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon" +.\" Please adjust this date whenever revising the manpage. +.\" +.SH NAME +.B imapproxyd +\- IMAP proxy daemon +.SH SYNOPSIS +.B imapproxyd +.RI +[ +.B -f +.RI +<config file name> ] +.RI +[ +.B -p +.RI +<pidfile name> ] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B imapproxyd +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +UP-ImapProxy proxies IMAP transactions between an IMAP client and an IMAP +server. The general idea is that the client should never know that it is +not talking to the real IMAP server, but ImapProxy caches server connections. +.PP +ImapProxy was written to compensate for webmail clients that are unable to +maintain persistent connections to an IMAP server. Most webmail clients +need to log in to an IMAP server for nearly every single transaction; This +behaviour can cause tragic performance problems on the IMAP server. +ImapProxy tries to deal with this problem by leaving server connections +open for a short time after a webmail client logs out. When the webmail +client connects again, ImapProxy will determine if there is a cached +connection available and reuse it if possible. +.BR +.SH FILES +By default, UP-ImapProxy reads /etc/imapproxy.conf on startup. +This can be changed by using the +.I -f +option +.PP +Unless foreground_mode has been enabled, UP-ImapProxy will write its PID to to +a PID-file. It defaults to /var/run/imapproxy.pid, but can be overridden with +the +.I -p +option +.SH SEE ALSO +.BR pimpstat (8), +.br +.SH AUTHOR +This manual page was written by Jose Luis Tallon +.nh +<jltallon@adv-solutions.net>, +for the Debian GNU/Linux system (but may be used by others). + + diff --git a/net-mail/up-imapproxy/files/pimpstat.8 b/net-mail/up-imapproxy/files/pimpstat.8 new file mode 100644 index 000000000000..2466e7ce2780 --- /dev/null +++ b/net-mail/up-imapproxy/files/pimpstat.8 @@ -0,0 +1,27 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH PIMPSTATS 8 "Mar 12, 2004" "Dave McMurtrie" "IMAP proxy daemon" +.\" Please adjust this date whenever revising the manpage. +.\" +.SH NAME + pimpstat \- UP-ImapProxy statistics +.SH SYNOPSIS +.B pimpstat +.RI [options] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B pimpstat +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.SH SEE ALSO +.BR imapproxyd (8), +.br +.SH AUTHOR +This manual page was written by Jose Luis Tallon +.nh +<jltallon@adv-solutions.net>, +for the Debian GNU/Linux system (but may be used by others). diff --git a/net-mail/up-imapproxy/files/1.2.4-include-fix.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.5_rc2-include_fix.patch index eafcd1b31c2c..eafcd1b31c2c 100644 --- a/net-mail/up-imapproxy/files/1.2.4-include-fix.patch +++ b/net-mail/up-imapproxy/files/up-imapproxy-1.2.5_rc2-include_fix.patch diff --git a/net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch b/net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch new file mode 100644 index 000000000000..82e1e5f2e6a6 --- /dev/null +++ b/net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch @@ -0,0 +1,91 @@ +First part, + +Problems: Debian patchset version -5 against src/ directory. +http://packages.debian.org/changelogs/pool/main/u/up-imapproxy/up-imapproxy_1.2.6-5/changelog + +Second part, + +Problems: http://bugzilla.redhat.com/show_bug.cgi?id=465859 +Our solution to it: http://bugs.gentoo.org/show_bug.cgi?id=177780 +by Holger Hoffstätte + +diff -ur up-imapproxy-1.2.6.orig/src/main.c up-imapproxy-1.2.6/src/main.c +--- up-imapproxy-1.2.6.orig/src/main.c 2008-01-28 15:15:08.000000000 +0200 ++++ up-imapproxy-1.2.6/src/main.c 2009-06-01 14:37:30.000000000 +0300 +@@ -618,7 +618,7 @@ + pthread_create( &RecycleThread, &attr, (void *)ICC_Recycle_Loop, NULL ); + + syslog(LOG_INFO, "%s: Launched ICC recycle thread with id %d", +- fn, RecycleThread ); ++ fn, (int)RecycleThread ); + + /* + * Now start listening and accepting connections. +@@ -1075,7 +1075,6 @@ + ICD_Struct conn; + int BytesRead; + char *fn = "SetBannerAndCapability()"; +- int NumRef = 0; + + /* initialize some stuff */ + memset( &itd, 0, sizeof itd ); +diff -ur up-imapproxy-1.2.6.orig/src/request.c up-imapproxy-1.2.6/src/request.c +--- up-imapproxy-1.2.6.orig/src/request.c 2008-01-28 15:15:08.000000000 +0200 ++++ up-imapproxy-1.2.6/src/request.c 2009-06-01 14:41:28.000000000 +0300 +@@ -714,7 +714,7 @@ + * avoid allocating additional buffers. Keep this in mind for future + * code modification... + */ +- snprintf( Username, BufLen, "Username:" ); ++ snprintf( Username, MAXUSERNAMELEN - 1, "Username:" ); + + EVP_EncodeBlock( EncodedUsername, Username, strlen( Username ) ); + +@@ -770,7 +770,7 @@ + /* + * Same drill all over again, except this time it's for the password. + */ +- snprintf( Password, BufLen, "Password:" ); ++ snprintf( Password, MAXPASSWDLEN - 1, "Password:" ); + + EVP_EncodeBlock( EncodedPassword, Password, strlen( Password ) ); + +@@ -1197,7 +1197,7 @@ + + if ( Server->TraceOn ) + { +- snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s SERVER: sd [%d]\n", time( 0 ), ( (TraceUser) ? TraceUser : "Null username" ), Server->conn->sd ); ++ snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s SERVER: sd [%d]\n", time( 0 ), ( (*TraceUser) ? TraceUser : "Null username" ), Server->conn->sd ); + write( Tracefd, TraceBuf, strlen( TraceBuf ) ); + write( Tracefd, Server->ReadBuf, status ); + } +@@ -1243,7 +1243,7 @@ + + if ( Client->TraceOn ) + { +- snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s CLIENT: sd [%d]\n", time( 0 ), ( (TraceUser) ? TraceUser : "Null username" ), Client->conn->sd ); ++ snprintf( TraceBuf, sizeof TraceBuf - 1, "\n\n-----> C= %d %s CLIENT: sd [%d]\n", time( 0 ), ( (*TraceUser) ? TraceUser : "Null username" ), Client->conn->sd ); + write( Tracefd, TraceBuf, strlen( TraceBuf ) ); + write( Tracefd, Client->ReadBuf, status ); + } +@@ -1902,7 +1902,7 @@ + + if ( BytesRead == -1 ) + { +- syslog( LOG_NOTICE, "%s: Failed to read string literal from client on login." ); ++ syslog( LOG_NOTICE, "%s: Failed to read string literal from client on login.", fn ); + snprintf( SendBuf, BufLen, "%s NO LOGIN failed\r\n", Tag ); + if ( IMAP_Write( Client.conn, SendBuf, strlen(SendBuf) ) == -1 ) + { +diff -ur up-imapproxy-1.2.6.orig/src/select.c up-imapproxy-1.2.6/src/select.c +--- up-imapproxy-1.2.6.orig/src/select.c 2008-01-28 15:15:08.000000000 +0200 ++++ up-imapproxy-1.2.6/src/select.c 2009-06-01 14:37:30.000000000 +0300 +@@ -349,7 +349,7 @@ + { + if ( Server->LiteralBytesRemaining ) + { +- syslog( LOG_ERR, "%s: Server response to SELECT command contains unexpected literal data on sd [%d].", fn ); ++ syslog( LOG_ERR, "%s: Server response to SELECT command contains unexpected literal data on sd [%d].", fn, Server->conn ); + /* + * Must eat the literal. + */ |