Fix loads of bulls..

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

10 files changed, 295 insertions, 34 deletions

diff --git a/net-mail/up-imapproxy/ChangeLog b/net-mail/up-imapproxy/ChangeLog
index b5d19c3c541c..b89f07cbf9de 100644
--- a/net-mail/up-imapproxy/ChangeLog
+++ b/net-mail/up-imapproxy/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/up-imapproxy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.19 2009/06/01 06:33:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.20 2009/06/01 12:09:57 ssuominen Exp $
+
+*up-imapproxy-1.2.6 (01 Jun 2009)
+
+  01 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +up-imapproxy-1.2.6.ebuild,
+  +files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch,
+  up-imapproxy-1.2.7_rc2.ebuild, +files/imapproxyd.8, +files/pimpstat.8:
+  Fix security issue differently and apply Debian patchset on top of that to
+  get neat package. Version bump to latest stable instead of using latest
+  release candidate as stable version. Add some manpages for the two
+  commands installed from Debian patchset.
 
 *up-imapproxy-1.2.7_rc2 (01 Jun 2009)
 
diff --git a/net-mail/up-imapproxy/Manifest b/net-mail/up-imapproxy/Manifest
index a34fa3b5813f..e6bf4f6951cc 100644
--- a/net-mail/up-imapproxy/Manifest
+++ b/net-mail/up-imapproxy/Manifest
@@ -1,8 +1,13 @@
-AUX 1.2.4-include-fix.patch 233 RMD160 408e8869aa1fcf266099d6fd620ef7159ab15dba SHA1 f098c507c728ba3025aa888d2aea6c91da2cae4b SHA256 df89e346f075f4854d2e7308d4570adf5c46514d4c0c30fe01177145f05d2d00
-AUX imapproxy.rc6 505 RMD160 f217612eb25c3dab81ce6d206f2a0681169db18d SHA1 deaa2f55e90fe57a97ac1032eba542ec72e5840d SHA256 b0d2369d4f311d37834145887e358c98e65451505985e2457dae9609f72579dd
+AUX imapproxy.initd 514 RMD160 fbcc8967435697d6936d92ce61afea58e5de2eff SHA1 1b9fca150cb64611e7ac8299ce5d422eeaf3967a SHA256 8c64f726f44f80e655ad4bd1ff636acef3053f1a69516a1fc0073fba45d3b569
+AUX imapproxyd.8 1984 RMD160 e6b87afe4763e50759fa5de7619952744217034a SHA1 2441fd8a8560eae86a13e9b5522be66a8bf24d21 SHA256 b1fcedc62f40664c6e820b2cc0e967d45aefa8334cc373dcf206bceba84beba2
+AUX pimpstat.8 836 RMD160 463e59586cf2ab98978bd476d3b5b057d13e4815 SHA1 5a2e00a3ddb28a28fa465a2053776d4b4bcc5256 SHA256 3bd8bb0ed654eda55123b5fc7e4b1a1bac4dfd822e59a91805cd5eab652e4cd8
+AUX up-imapproxy-1.2.5_rc2-include_fix.patch 233 RMD160 408e8869aa1fcf266099d6fd620ef7159ab15dba SHA1 f098c507c728ba3025aa888d2aea6c91da2cae4b SHA256 df89e346f075f4854d2e7308d4570adf5c46514d4c0c30fe01177145f05d2d00
+AUX up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch 3874 RMD160 bc0e51ea8ca2ec7388556fa320578740a45e314e SHA1 752d819130f2bb666609d2061c6c0c849132b52d SHA256 60c92d5106d176fd2808b1a93df7886187200fcbc66ac5984400fe6af5346531
 DIST up-imapproxy-1.2.5rc2.tar.gz 132296 RMD160 f84ced6852e15265ae937455091725728f0319cd SHA1 1e492c5c7633d8495f175cae61673c310865fdf3 SHA256 f71f7ad87456caffa48313d4c0a776fe8d38de6041ad60e65bc3eeb6e77cc4e2
+DIST up-imapproxy-1.2.6.tar.gz 134745 RMD160 4613acd3fcacdc40905ec8692afd3a4e9563258c SHA1 75f497e3fda44ff1526c46ac93e5c863bf6e0963 SHA256 2f5e841bc6c84799f890d24b984726efb7cce26c2ad95923864ddf0353fa3b01
 DIST up-imapproxy-1.2.7rc2.tar.gz 136832 RMD160 3269329f020d894cb492986d36458c0460eaab0f SHA1 b26f9823b4e7aeba74ce60538c4d517a92055c18 SHA256 e2f5e1631f337a2940a85690467a084de4205c029e8427d9aee4a8521b97169a
-EBUILD up-imapproxy-1.2.5_rc2.ebuild 1300 RMD160 59608d44c2c82b9caca38fde0c4bcfa2f3a56043 SHA1 4d178c319c38ca16e014c0aded11ce46b202311a SHA256 db7c71083403cbe814c029218a261b0c5a37fb3cb8a4f9fabb6a6287f976067c
-EBUILD up-imapproxy-1.2.7_rc2.ebuild 1233 RMD160 66e646925e5120a08b575aacda2bfaa42a041a44 SHA1 8c95fa7aa8895f32584c759d1048b0dbca2b0c23 SHA256 875badc67fe55531aae84c709ad35f0b7ea7e7d8e40d4b9de6c595fb0d318560
-MISC ChangeLog 2919 RMD160 1c6c0b9ffd1ff3e6d1eaac082cd4d3416223e365 SHA1 e1329a095adc0d7ec7d98244de882b45f5cc3522 SHA256 29987c394db101c9dd3599e30c3a428212634b125298216ac6a047f5d5a008bf
+EBUILD up-imapproxy-1.2.5_rc2.ebuild 1369 RMD160 42ea78e44f7f2c83cda4f833aadf7a4d22a68eb2 SHA1 cf0e325e1db91524f191e12e060ddcb84cc1fb90 SHA256 3adad77edb19d2a003ad949a39d0aeea1792e5378c453f16976a6b0d11671b2b
+EBUILD up-imapproxy-1.2.6.ebuild 1304 RMD160 553e945f2f31ebf0353935da87aa7b6b31112cb4 SHA1 2215c5651226ed90b565f828f3aa4e7ef7d16acb SHA256 a8b0e1193941886a97d7ae41b721b733d09f4b72ab8d7749943daf6e8929b140
+EBUILD up-imapproxy-1.2.7_rc2.ebuild 1422 RMD160 fef4545f176bd247225c01a66a8d24d9135cc9e5 SHA1 7ecd96cf39f1d6de94484d63fe52d29787a97075 SHA256 bdfae6973c562c8f9cac5fdd5dcbd9702aaf94404533da808330bbaf3f05164f
+MISC ChangeLog 3445 RMD160 01cca254d605b25bbfba3ca0dc3e356e8870415e SHA1 47da9d24a6df45bb084fbe2f09e4dbb721bee604 SHA256 d57542d602af72cd5514afeae0ded03ff2e7961d4519f57a1f9445cd550d6bff
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
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.
+ 	     */
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.5_rc2.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.5_rc2.ebuild
index ee2236b554a0..9af4b86fee1d 100644
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.5_rc2.ebuild
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.5_rc2.ebuild
@@ -1,39 +1,39 @@
-# Copyright 1999-2007 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/up-imapproxy-1.2.5_rc2.ebuild,v 1.3 2007/02/06 13:08:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.5_rc2.ebuild,v 1.4 2009/06/01 12:09:57 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server."
 HOMEPAGE="http://www.imapproxy.org/"
-SRC_URI="http://www.imapproxy.org/downloads/${P/_/}.tar.gz"
+SRC_URI="http://www.imapproxy.org/downloads/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="kerberos ssl tcpd"
+IUSE="kerberos ssl +tcpd"
 
-DEPEND=">=sys-libs/ncurses-5.1
+RDEPEND="sys-libs/ncurses
 	kerberos? ( virtual/krb5 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ssl? ( dev-libs/openssl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
 
-S="${WORKDIR}/${P/_/}"
-src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}"/1.2.4-include-fix.patch
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-include_fix.patch
 	sed -i -e 's:in\.imapproxyd:imapproxyd:g'  \
 		README Makefile.in include/imapproxy.h || die "sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_with kerberos krb5) \
 		$(use_with ssl openssl) \
-		$(use_with tcpd libwrap) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
+		$(use_with tcpd libwrap)
 }
 
 src_install() {
@@ -42,7 +42,14 @@ src_install() {
 	insinto /etc
 	doins scripts/imapproxy.conf || die "doins failed"
 
-	newinitd "${FILESDIR}"/imapproxy.rc6 imapproxy || die "initd failed"
+	newinitd "${FILESDIR}"/imapproxy.initd imapproxy || die "newinitd failed"
+
+	dodoc ChangeLog README README.known_issues
+	use ssl && dodoc README.ssl
+
+	doman "${FILESDIR}"/*.8
+}
 
-	dodoc ChangeLog README README.known_issues README.ssl
+pkg_postinst() {
+	elog "Installed manpages are for version 1.2.6."
 }
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.6.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.6.ebuild
new file mode 100644
index 000000000000..f925dca13420
--- /dev/null
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.6.ebuild
@@ -0,0 +1,49 @@
+# 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/up-imapproxy-1.2.6.ebuild,v 1.1 2009/06/01 12:09:57 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server."
+HOMEPAGE="http://www.imapproxy.org/"
+SRC_URI="http://www.imapproxy.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="kerberos ssl +tcpd"
+
+RDEPEND="sys-libs/ncurses
+	kerberos? ( virtual/krb5 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-debian_patchset_5_and_security_fix.patch
+	sed -i -e 's:in\.imapproxyd:imapproxyd:g' \
+		README Makefile.in include/imapproxy.h || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		$(use_with kerberos krb5) \
+		$(use_with ssl openssl) \
+		$(use_with tcpd libwrap)
+}
+
+src_install() {
+	dosbin bin/imapproxyd bin/pimpstat || die "dosbin failed"
+
+	insinto /etc
+	doins scripts/imapproxy.conf || die "doins failed"
+
+	newinitd "${FILESDIR}"/imapproxy.initd imapproxy || die "newinitd failed"
+
+	dodoc ChangeLog README README.known_issues
+	use ssl && dodoc README.ssl
+
+	doman "${FILESDIR}"/*.8
+}
diff --git a/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild
index 07b54da29499..af155834ed90 100644
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild
+++ b/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild
@@ -1,27 +1,28 @@
 # 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/up-imapproxy-1.2.7_rc2.ebuild,v 1.1 2009/06/01 06:33:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/up-imapproxy-1.2.7_rc2.ebuild,v 1.2 2009/06/01 12:09:57 ssuominen Exp $
 
 EAPI=2
-MY_P=${P/_}
 
 DESCRIPTION="Proxy IMAP transactions between an IMAP client and an IMAP server."
 HOMEPAGE="http://www.imapproxy.org/"
-SRC_URI="http://www.imapproxy.org/downloads/${MY_P}.tar.gz"
+SRC_URI="http://www.imapproxy.org/downloads/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="kerberos ssl tcpd"
+# This version has issues, don't keyword wrt #272044, Comment #1, by Holger
+# Hoffstätte. But do so for next release candidate.
+KEYWORDS=""
+IUSE="kerberos ssl +tcpd"
 
 RDEPEND="sys-libs/ncurses
 	kerberos? ( virtual/krb5 )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ssl? ( dev-libs/openssl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
 DEPEND="${RDEPEND}
 	sys-apps/sed"
 
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/${P/_}
 
 src_prepare() {
 	sed -i -e 's:in\.imapproxyd:imapproxyd:g' \
@@ -45,4 +46,10 @@ src_install() {
 
 	dodoc ChangeLog README README.known_issues
 	use ssl && dodoc README.ssl
+
+	doman "${FILESDIR}"/*.8
+}
+
+pkg_postinst() {
+	einfo "Installed manpages are for version 1.2.6."
 }