diff options
| author |   Gustavo Felisberto <humpback@gentoo.org> | 2006-09-04 23:50:32 +0000 |
|---|---|---|
| committer | Gustavo Felisberto <humpback@gentoo.org> | 2006-09-04 23:50:32 +0000 |
| commit | 44e8f8042eb853915858eee43637fdde2f134f5c (patch) | |
| tree | 406dbd402463ca2ff634a16f13d437d869387e90 /net-ftp | |
| parent | New upstream release, add metadata as I am taking over this package. (diff) | |
| download | gentoo-2-44e8f8042eb853915858eee43637fdde2f134f5c.tar.gz gentoo-2-44e8f8042eb853915858eee43637fdde2f134f5c.tar.bz2 gentoo-2-44e8f8042eb853915858eee43637fdde2f134f5c.zip | |
fix gcc4 build issue.
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch | 12 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.2.10-r7.ebuild | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index c8906af9bda1..24c2f0827c29 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.109 2006/06/24 13:41:04 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.110 2006/09/04 23:50:32 humpback Exp $ + + 04 Sep 2006; Gustavo Felisberto <humpback@gentoo.org>; + +files/gcc4-mod_quotatab_sql.patch, proftpd-1.2.10-r7.ebuild: + Added patch to solve issue while building with gcc 4. Close bug #145940. + Thanks to everyone in that bug. 24 Jun 2006; Gustavo Felisberto <humpback@gentoo.org>; proftpd-1.3.0-r1.ebuild: diff --git a/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch b/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch new file mode 100644 index 000000000000..8cfdd22a04ad --- /dev/null +++ b/net-ftp/proftpd/files/gcc4-mod_quotatab_sql.patch @@ -0,0 +1,12 @@ +--- proftpd-1.2.10/contrib/mod_quotatab_sql.c.orig 2006-09-04 11:21:09.000000000 +0000 ++++ proftpd-1.2.10/contrib/mod_quotatab_sql.c 2006-09-04 11:22:27.000000000 +0000 +@@ -684,8 +684,7 @@ + return NULL; + } + +- tab->tab_data = pcalloc(tab->tab_pool, sizeof(char)); +- ((char *) tab->tab_data) = pstrdup(tab->tab_pool, select_query); ++ tab->tab_data = (void *) pstrdup(tab->tab_pool, select_query); + } + + /* Set all the necessary function pointers. */ diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild index 9885fc6be423..555fcd7246e9 100644 --- a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild +++ b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.8 2006/05/27 14:24:49 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.9 2006/09/04 23:50:32 humpback Exp $ inherit flag-o-matic eutils @@ -43,6 +43,9 @@ src_unpack() { # Fix ftpshut and SqlShowInfo, bug #100364 epatch "${FILESDIR}/proftpd-ftpshut.patch" epatch "${FILESDIR}/proftpd-sqlshowinfo.patch" + + # Fix gcc4 compile error, bug #145940 + epatch "${FILESDIR}/gcc4-mod_quotatab_sql.patch" } src_compile() { |