summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2013-02-10 10:52:47 +0000
committerEray Aslan <eras@gentoo.org>2013-02-10 10:52:47 +0000
commitf0507c0fb3829e74be952b2c87c67d772b93c44c (patch)
tree8f3f007e987b65eabd7f676993a1e58051a15f3a /net-mail/up-imapproxy
parentAdding IMA/EVM utilities to the main tree (diff)
downloadgentoo-2-f0507c0fb3829e74be952b2c87c67d772b93c44c.tar.gz
gentoo-2-f0507c0fb3829e74be952b2c87c67d772b93c44c.tar.bz2
gentoo-2-f0507c0fb3829e74be952b2c87c67d772b93c44c.zip
Remove old
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)
Diffstat (limited to 'net-mail/up-imapproxy')
-rw-r--r--net-mail/up-imapproxy/ChangeLog10
-rw-r--r--net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch91
-rw-r--r--net-mail/up-imapproxy/up-imapproxy-1.2.6.ebuild49
3 files changed, 7 insertions, 143 deletions
diff --git a/net-mail/up-imapproxy/ChangeLog b/net-mail/up-imapproxy/ChangeLog
index 5ebe58af31fc..681ec1afa88d 100644
--- a/net-mail/up-imapproxy/ChangeLog
+++ b/net-mail/up-imapproxy/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-mail/up-imapproxy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.28 2011/11/28 11:41:27 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/up-imapproxy/ChangeLog,v 1.29 2013/02/10 10:52:46 eras Exp $
+
+ 10 Feb 2013; Eray Aslan <eras@gentoo.org>
+ -files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch,
+ -up-imapproxy-1.2.6.ebuild:
+ Remove old
28 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
up-imapproxy-1.2.7.ebuild:
@@ -116,4 +121,3 @@
12 Nov 2003; <max@gentoo.org> up-imapproxy-1.2.1.ebuild,
files/imapproxy.initd:
Initial version. Fixes bug 29768.
-
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
deleted file mode 100644
index 82e1e5f2e6a6..000000000000
--- a/net-mail/up-imapproxy/files/up-imapproxy-1.2.6-debian_patchset_5_and_security_fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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.6.ebuild b/net-mail/up-imapproxy/up-imapproxy-1.2.6.ebuild
deleted file mode 100644
index ecf0e4ec1c23..000000000000
--- a/net-mail/up-imapproxy/up-imapproxy-1.2.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.3 2009/06/03 18:54:33 maekke 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
-}