summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-09 13:39:07 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-09 13:39:07 +0000
commit08ac1414a27381ff56888520f350dca013b6029e (patch)
tree4b0979a850477f05ae87f2788a9d33942baeb4cc /www-servers/thttpd/files
parentppc stable #278527 (diff)
downloadgentoo-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/files')
-rw-r--r--www-servers/thttpd/files/thttpd-2.25b-glibc-2.10.patch21
1 files changed, 21 insertions, 0 deletions
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;