diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 13:39:07 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 13:39:07 +0000 |
| commit | 08ac1414a27381ff56888520f350dca013b6029e (patch) | |
| tree | 4b0979a850477f05ae87f2788a9d33942baeb4cc /www-servers/thttpd | |
| parent | ppc stable #278527 (diff) | |
| download | gentoo-2-08ac1414a27381ff56888520f350dca013b6029e.tar.gz gentoo-2-08ac1414a27381ff56888520f350dca013b6029e.tar.bz2 gentoo-2-08ac1414a27381ff56888520f350dca013b6029e.zip | |
Fix building with GLIBC 2.10+ wrt #274049.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'www-servers/thttpd')
| -rw-r--r-- | www-servers/thttpd/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch | 21 | ||||
| -rw-r--r-- | www-servers/thttpd/thttpd-2.25b-r7.ebuild | 5 |
3 files changed, 30 insertions, 4 deletions
diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog index e2c79a010ea3..8ab6e339b4f1 100644 --- a/www-servers/thttpd/ChangeLog +++ b/www-servers/thttpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/thttpd -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.29 2008/06/26 08:39:18 bangert Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.30 2009/08/09 13:39:07 ssuominen Exp $ + + 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + thttpd-2.25b-r7.ebuild, +files/thttpd-2.25b-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #274049. 26 Jun 2008; Thilo Bangert <bangert@gentoo.org> -thttpd-2.25b-r6.ebuild, thttpd-2.25b-r7.ebuild: diff --git a/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch b/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch new file mode 100644 index 000000000000..c97227827e4b --- /dev/null +++ b/www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch @@ -0,0 +1,21 @@ +diff -ur thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c +--- thttpd-2.25b.orig/extras/htpasswd.c 2001-12-19 02:08:08.000000000 +0200 ++++ thttpd-2.25b/extras/htpasswd.c 2009-08-09 16:40:06.000000000 +0300 +@@ -49,7 +49,7 @@ + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int get_line(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(get_line(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; diff --git a/www-servers/thttpd/thttpd-2.25b-r7.ebuild b/www-servers/thttpd/thttpd-2.25b-r7.ebuild index 9dbf6f7721a1..1cb059d5d3a6 100644 --- a/www-servers/thttpd/thttpd-2.25b-r7.ebuild +++ b/www-servers/thttpd/thttpd-2.25b-r7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.6 2008/06/26 08:39:18 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.25b-r7.ebuild,v 1.7 2009/08/09 13:39:07 ssuominen Exp $ inherit eutils flag-o-matic @@ -22,6 +22,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${MY_P}/*.diff + epatch "${FILESDIR}"/${P}-glibc-2.10.patch } pkg_setup() { |