diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-07 10:42:47 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-07 10:42:47 +0000 |
commit | 3da67bd2ae2e33cb08745e6438a4078f0aea237c (patch) | |
tree | ad19430772f9421deb9065b2c267112d619ccfcf | |
parent | remove old (diff) | |
download | gentoo-2-3da67bd2ae2e33cb08745e6438a4078f0aea237c.tar.gz gentoo-2-3da67bd2ae2e33cb08745e6438a4078f0aea237c.tar.bz2 gentoo-2-3da67bd2ae2e33cb08745e6438a4078f0aea237c.zip |
Fix building with GLIBC 2.10+ wrt #277672.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
-rw-r--r-- | net-mail/qpopper/ChangeLog | 6 | ||||
-rw-r--r-- | net-mail/qpopper/files/qpopper-4.0.16-glibc-2.10.patch | 93 | ||||
-rw-r--r-- | net-mail/qpopper/qpopper-4.0.16.ebuild | 5 |
3 files changed, 101 insertions, 3 deletions
diff --git a/net-mail/qpopper/ChangeLog b/net-mail/qpopper/ChangeLog index b8a14802dfae..f88233b943b4 100644 --- a/net-mail/qpopper/ChangeLog +++ b/net-mail/qpopper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/qpopper # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/ChangeLog,v 1.29 2009/07/02 14:44:24 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/ChangeLog,v 1.30 2009/08/07 10:42:47 ssuominen Exp $ + + 07 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> qpopper-4.0.16.ebuild, + +files/qpopper-4.0.16-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #277672. 02 Jul 2009; Raúl Porcel <armin76@gentoo.org> qpopper-4.0.16.ebuild: sparc stable wrt #271136 diff --git a/net-mail/qpopper/files/qpopper-4.0.16-glibc-2.10.patch b/net-mail/qpopper/files/qpopper-4.0.16-glibc-2.10.patch new file mode 100644 index 000000000000..baf22e29ef74 --- /dev/null +++ b/net-mail/qpopper/files/qpopper-4.0.16-glibc-2.10.patch @@ -0,0 +1,93 @@ +diff -ur qpopper4.0.16.orig/popper/popper.c qpopper4.0.16/popper/popper.c +--- qpopper4.0.16.orig/popper/popper.c 2009-01-10 02:28:26.000000000 +0200 ++++ qpopper4.0.16/popper/popper.c 2009-08-07 13:42:40.000000000 +0300 +@@ -31,7 +31,7 @@ + * (thanks to Kyle McKay for the patch) + * + * 04/04/02 [rg] +- * - getline() now clears out storage buffer when giving up ++ * - get_line() now clears out storage buffer when giving up + * after discarding bytes. Fixes looping DOS attack seen + * on some systems. + * +@@ -41,7 +41,7 @@ + * + * 06/01/01 [rg] + * - Added patch by Carles Xavier Munyoz to fix erroneous +- * scanning for \n in getline(). ++ * scanning for \n in get_line(). + * + * 01/15/01 [rg] + * - Handle run-time options bShy, bDo_timing, bUpdate_on_abort. +@@ -150,7 +150,7 @@ + char message [ MAXLINELEN ]; + pop_result rslt = POP_FAILURE; + char * tgetline(); +- char * getline(); ++ char * get_line(); + + /* + * seed random with the current time to nearest second +@@ -415,7 +415,7 @@ + + + /* +- * Our own getline. One reason we don't use fgets because there was ++ * Our own get_line. One reason we don't use fgets because there was + * a comment here that fgets was broken on AIX. Another reason is + * that we need to read out of the TLS stream at times. + * +@@ -425,7 +425,7 @@ + */ + + char +-*getline ( char *str, int size, POP *pPOP ) ++*get_line ( char *str, int size, POP *pPOP ) + { + char *p = NULL; + int nRead = 0; +@@ -433,7 +433,7 @@ + int nBufSz = sizeof ( pPOP->pcInBuf ); + + +- _DEBUG_LOG2 ( pPOP, "getline(%p,%d)", str, size ); ++ _DEBUG_LOG2 ( pPOP, "get_line(%p,%d)", str, size ); + + /* + * See if there's a line in our input buffer +@@ -472,7 +472,7 @@ + pPOP->pcInStart - pPOP->pcInBuf ); + pPOP->pcInStart = pPOP->pcInEnd = pPOP->pcInBuf; + } +- _DEBUG_LOG3 ( pPOP, "getline() returning %d: '%.*s'", ++ _DEBUG_LOG3 ( pPOP, "get_line() returning %d: '%.*s'", + strlen(str), MIN(25, (int) strlen(str)), str ); + return ( str ); + } /* got a line */ +@@ -560,7 +560,7 @@ + } /* found a '\n' */ + } /* loop and discard until we see a '\n' */ + +- _DEBUG_LOG2 ( pPOP, "getline() returning %d ('%c')", ++ _DEBUG_LOG2 ( pPOP, "get_line() returning %d ('%c')", + strlen(str), *str ); + return ( str ); + } /* nRoom == 0 */ +@@ -583,7 +583,7 @@ + break; + } /* main loop */ + +- _DEBUG_LOG0 ( pPOP, "getline() returning NULL" ); ++ _DEBUG_LOG0 ( pPOP, "get_line() returning NULL" ); + return ( NULL ); + } + +@@ -614,7 +614,7 @@ + VERSION, timeout, p->user, p->client, p->ipaddr ); + } + else +- str = getline ( str, size, p ); ++ str = get_line ( str, size, p ); + + alarm ( 0 ); + signal ( SIGALRM, SIG_DFL ); diff --git a/net-mail/qpopper/qpopper-4.0.16.ebuild b/net-mail/qpopper/qpopper-4.0.16.ebuild index 182049ab9351..c6b2a3c607f5 100644 --- a/net-mail/qpopper/qpopper-4.0.16.ebuild +++ b/net-mail/qpopper/qpopper-4.0.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/qpopper-4.0.16.ebuild,v 1.3 2009/07/02 14:44:24 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/qpopper/qpopper-4.0.16.ebuild,v 1.4 2009/08/07 10:42:47 ssuominen Exp $ EAPI="2" #inherit eutils flag-o-matic ssl-cert @@ -38,7 +38,8 @@ pkg_setup() { src_prepare() { # Test dirs are full of binary craft. Drop it. rm -rf test/ ./mmangle/test - epatch "${FILESDIR}/${PN}-4.0.14-parallel-build.patch" + epatch "${FILESDIR}"/${PN}-4.0.14-parallel-build.patch + epatch "${FILESDIR}"/${P}-glibc-2.10.patch sed -i -e 's:-o popauth:& ${LDFLAGS}:' popper/Makefile.in } |