Avoid collision with system getline(3).

4 files changed, 94 insertions, 1 deletions

diff --git a/www/apache/distinfo b/www/apache/distinfo
index 700e1dc4648..36dd1f7c1ff 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2008/02/23 05:16:33 obache Exp $
+$NetBSD: distinfo,v 1.59 2009/07/25 19:55:11 roy Exp $
 
 SHA1 (apache_1.3.41.tar.gz) = 3bbd4c4bc648e6ad5b696bb83420533f4d23daf8
 RMD160 (apache_1.3.41.tar.gz) = 74786c65c143af123f1d13e9d93dd5ff07e9a201
@@ -25,3 +25,6 @@ SHA1 (patch-am) = 76bbb4ae3a8cce666bf91fb605f72572350f23a1
 SHA1 (patch-an) = 45a5bf946628b1e1b2e60c217214965390f7b3d7
 SHA1 (patch-ao) = 96b97e1faf6828a6880c39eb246d07c4a56bfe12
 SHA1 (patch-aq) = 1fda54aae47edb675549095adac2eb0378d1f60c
+SHA1 (patch-ar) = 29276bc264b9d2ce7dea4a196ac3bd55e6853f53
+SHA1 (patch-as) = ef4143e0c809af5792f282ebbd405e7bda339484
+SHA1 (patch-at) = 85b7ff5b51014881e6187656660cf23f6d3283c0
diff --git a/www/apache/patches/patch-ar b/www/apache/patches/patch-ar
new file mode 100644
index 00000000000..44677b648a3
--- /dev/null
+++ b/www/apache/patches/patch-ar
@@ -0,0 +1,33 @@
+$NetBSD: patch-ar,v 1.9 2009/07/25 19:55:11 roy Exp $
+
+Avoid collision with system getline(3).
+
+--- src/support/htdigest.c.orig	2009-07-25 20:49:46.000000000 +0100
++++ src/support/htdigest.c	2009-07-25 20:50:01.000000000 +0100
+@@ -71,7 +71,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;
+ 
+@@ -158,7 +158,7 @@
+ {
+     static char line[MAX_STRING_LEN];
+ 
+-    while (!(getline(line, MAX_STRING_LEN, source))) {  
++    while (!(get_line(line, MAX_STRING_LEN, source))) {  
+ 	putline(target, line);
+     }
+ }
+@@ -216,7 +216,7 @@
+     ap_cpystrn(realm, argv[2], sizeof(realm));
+ 
+     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/apache/patches/patch-as b/www/apache/patches/patch-as
new file mode 100644
index 00000000000..4666c48cc5c
--- /dev/null
+++ b/www/apache/patches/patch-as
@@ -0,0 +1,24 @@
+$NetBSD: patch-as,v 1.9 2009/07/25 19:55:11 roy Exp $
+
+Avoid collision with system getline(3).
+
+--- src/support/htpasswd.c.orig	2009-07-25 20:50:15.000000000 +0100
++++ src/support/htpasswd.c	2009-07-25 20:50:27.000000000 +0100
+@@ -98,7 +98,7 @@
+  * Get a line of input from the user, not including any terminating
+  * newline.
+  */
+-static int getline(char *s, int n, FILE *f)
++static int get_line(char *s, int n, FILE *f)
+ {
+     register int i = 0;
+ 
+@@ -547,7 +547,7 @@
+ 	char scratch[MAX_STRING_LEN];
+ 
+ 	fpw = fopen(pwfilename, "r");
+-	while (! (getline(line, sizeof(line), fpw))) {
++	while (! (get_line(line, sizeof(line), fpw))) {
+ 	    char *colon;
+ 
+ 	    if ((line[0] == '#') || (line[0] == '\0')) {
diff --git a/www/apache/patches/patch-at b/www/apache/patches/patch-at
new file mode 100644
index 00000000000..5f386c6c688
--- /dev/null
+++ b/www/apache/patches/patch-at
@@ -0,0 +1,33 @@
+$NetBSD: patch-at,v 1.1 2009/07/25 19:55:11 roy Exp $
+
+Avoid collision with system getline(3).
+
+--- src/support/logresolve.c.orig	2009-07-25 20:50:40.000000000 +0100
++++ src/support/logresolve.c	2009-07-25 20:50:51.000000000 +0100
+@@ -71,7 +71,7 @@
+ #endif /* !MPE && !WIN32*/
+ 
+ static void cgethost(struct in_addr ipnum, char *string, int check);
+-static int getline(char *s, int n);
++static int get_line(char *s, int n);
+ static void stats(FILE *output);
+ 
+ 
+@@ -278,7 +278,7 @@
+  * gets a line from stdin
+  */
+ 
+-static int getline (char *s, int n)
++static int get_line (char *s, int n)
+ {
+     char *cp;
+ 
+@@ -326,7 +326,7 @@
+     for (i = 0; i < MAX_ERR + 2; i++)
+ 	errors[i] = 0;
+ 
+-    while (getline(line, MAXLINE)) {
++    while (get_line(line, MAXLINE)) {
+ 	if (line[0] == '\0')
+ 	    continue;
+ 	entries++;