summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2009-05-24 14:26:11 +0200
committerBertrand Jacquin <beber@meleeweb.net>2009-05-24 14:26:11 +0200
commit56c626da79026bf9d050de7873969ee450c1ca4f (patch)
tree67257938b1e1f37ae2775254070562a1c78a3550
parentgrep: fix pcre build (diff)
downloadpatches-56c626da79026bf9d050de7873969ee450c1ca4f.tar.gz
thttpd-2.25: Add fix for glibc 2.10 (getline redefinition)
-rw-r--r--thttpd/thttpd-2.25b-getline.diff20
1 files changed, 20 insertions, 0 deletions
diff --git a/thttpd/thttpd-2.25b-getline.diff b/thttpd/thttpd-2.25b-getline.diff
new file mode 100644
index 0000000..8d162b7
--- /dev/null
+++ b/thttpd/thttpd-2.25b-getline.diff
@@ -0,0 +1,20 @@
+--- extras/htpasswd.c.ori 2009-05-24 14:23:13.000000000 +0200
++++ extras/htpasswd.c 2009-05-24 14:23:30.000000000 +0200
+@@ -49,7 +49,7 @@
+ while((line[y++] = line[x++]));
+ }
+
+-static int getline(char *s, int n, FILE *f) {
++static int thttpd_getline(char *s, int n, FILE *f) {
+ register int i=0;
+
+ while(1) {
+@@ -228,7 +228,7 @@
+ strcpy(user,argv[2]);
+
+ found = 0;
+- while(!(getline(line,MAX_STRING_LEN,f))) {
++ while(!(thttpd_getline(line,MAX_STRING_LEN,f))) {
+ if(found || (line[0] == '#') || (!line[0])) {
+ putline(tfp,line);
+ continue;