mathopd: fix for glibc getline name-clash

mathopd/.md5sum

@@ -2,6 +2,7 @@ ec0d71c0c75986c1c4974320788945cc  dir_cgi-1.1.tar.gz
 56ed28d0c582903a2c29c9c5f9153e57  mathopd
 421d71cfad7e659c1d3a384752371c6d  mathopd-1.5p6.tar.gz
 3e318e6add3583d90373cc335e5ea75e  mathopd-config.patch
+3b2ecf96fd1b882eb5ee1ac27844019f  mathopd-getline.patch
 dd645079a41380fbb301da6d5559de84  mathopd.8.gz
 2f0f28b786a555bbd800c0cbcf0d7057  mathopd.conf
 11092a3c42c38d8a851a7807b6576349  mathopd.conf.5.gz

mathopd/Pkgfile

@@ -4,17 +4,20 @@
 
 name=mathopd
 version=1.5p6
-release=1
+release=2
 source=(http://www.mathopd.org/dist/$name-$version.tar.gz \
         http://jue.li/misc/dir_cgi/dir_cgi-1.1.tar.gz \
         http://www.mathopd.org/doc/mathopd.8.gz \
         http://www.mathopd.org/doc/mathopd.conf.5.gz \
-        mathopd-config.patch mathopd.conf mathopd)
+        mathopd-config.patch mathopd.conf mathopd \
+        mathopd-getline.patch)
 
 build () {
     cd $name-$version/src
 
     patch -p2 -i $SRC/mathopd-config.patch
+    patch -p2 -i $SRC/mathopd-getline.patch
+
     make
 
     install -d $PKG/{var/log,etc/rc.d,usr/{bin,sbin,man/man{8,5}}}

mathopd/mathopd-getline.patch

@@ -0,0 +1,39 @@
+diff -Nru mathopd-1.5p6.orig/src/request.c mathopd-1.5p6/src/request.c
+--- mathopd-1.5p6.orig/src/request.c	2009-08-24 16:32:23.822054573 +0200
++++ mathopd-1.5p6/src/request.c	2009-08-24 16:34:53.672062355 +0200
+@@ -210,7 +210,7 @@
+ 	return buf;
+ }
+ 
+-static char *getline(struct pool *p, int fold)
++static char *get_line(struct pool *p, int fold)
+ {
+ 	char *s, *olds, *sp, *end;
+ 	int f;
+@@ -247,7 +247,7 @@
+ 			break;
+ 		}
+ 	}
+-	log_d("getline: fallen off the end");
++	log_d("get_line: fallen off the end");
+ 	return 0;
+ }
+ 
+@@ -1172,7 +1172,7 @@
+ 	unsigned long cl;
+ 
+ 	do {
+-		l = getline(&r->cn->header_input, 0);
++		l = get_line(&r->cn->header_input, 0);
+ 		if (l == 0)
+ 			return -1;
+ 	} while (*l == 0);
+@@ -1201,7 +1201,7 @@
+ 	if (r->protocol_major && r->protocol_minor)
+ 		r->cn->keepalive = 1;
+ 	n = 0;
+-	while ((l = getline(&r->cn->header_input, 1)) != 0) {
++	while ((l = get_line(&r->cn->header_input, 1)) != 0) {
+ 		s = strchr(l, ':');
+ 		if (s == 0)
+ 			continue;