From flynn@energyhq.homeip.net  Tue Jan 29 09:19:37 2002
Return-Path: <flynn@energyhq.homeip.net>
Received: from energyhq.homeip.net (213-97-200-73.uc.nombres.ttd.es [213.97.200.73])
	by hub.freebsd.org (Postfix) with ESMTP id 92B7437B417
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 29 Jan 2002 09:19:35 -0800 (PST)
Received: (from flynn@localhost)
	by energyhq.homeip.net (8.11.6/8.11.6) id g0THJRS23671;
	Tue, 29 Jan 2002 18:19:27 +0100 (CET)
	(envelope-from flynn)
Message-Id: <200201291719.g0THJRS23671@energyhq.homeip.net>
Date: Tue, 29 Jan 2002 18:19:27 +0100 (CET)
From: Miguel Mendez <flynn@energyhq.homeip.net>
Reply-To: Miguel Mendez <flynn@energyhq.homeip.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Unbreak Port: www/arena 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         34415
>Category:       ports
>Synopsis:       Unbreak Port: www/arena
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 29 09:20:01 PST 2002
>Closed-Date:    Tue Jan 29 12:24:54 PST 2002
>Last-Modified:  Tue Jan 29 12:25:10 PST 2002
>Originator:     Miguel Mendez
>Release:        FreeBSD 4.5-RC i386
>Organization:
I got hit by the strcasestr virus, Inc
>Environment:
System: FreeBSD energyhq.homeip.net 4.5-RC FreeBSD 4.5-RC #0: Sat Jan 26 21:13:11 CET 2002 root@energyhq.homeip.net:/storage2/obj/storage2/src/sys/ENERGYHQ i386


	
>Description:

	www/arena is currently broken because it uses it's own strcasestr
implementation. I doubt anyone is still using this but I thought I might fix
it.
	
>How-To-Repeat:
	
>Fix:

	

--- arena.diff begins here ---
diff -ruN arena.old/files/patch-Library::Implementation::HTString.c arena/files/patch-Library::Implementation::HTString.c
--- arena.old/files/patch-Library::Implementation::HTString.c	Thu Jan  1 01:00:00 1970
+++ arena/files/patch-Library::Implementation::HTString.c	Tue Jan 29 18:13:04 2002
@@ -0,0 +1,19 @@
+--- Library/Implementation/HTString.c.orig	Tue Jan 29 18:10:31 2002
++++ Library/Implementation/HTString.c	Tue Jan 29 18:11:09 2002
+@@ -65,6 +65,7 @@
+ /*
+ ** strcasestr(s1,s2) -- like strstr(s1,s2) but case-insensitive.
+ */
++#ifndef __FreeBSD__
+ PUBLIC char * strcasestr (char * s1, char * s2)
+ {
+     char * ptr = s1;
+@@ -85,7 +86,7 @@
+     }
+     return NULL;
+ }
+-
++#endif
+ 
+ 
+ /*	Allocate a new copy of a string, and returns it
diff -ruN arena.old/files/patch-Library::Implementation::HTString.h arena/files/patch-Library::Implementation::HTString.h
--- arena.old/files/patch-Library::Implementation::HTString.h	Thu Jan  1 01:00:00 1970
+++ arena/files/patch-Library::Implementation::HTString.h	Tue Jan 29 18:12:43 2002
@@ -0,0 +1,11 @@
+--- Library/Implementation/HTString.h.orig	Tue Jan 29 18:11:15 2002
++++ Library/Implementation/HTString.h	Tue Jan 29 18:11:47 2002
+@@ -68,7 +68,7 @@
+    This works like strstr() but is not case-sensitive.
+    
+  */
+-extern char * strcasestr (char * s1, char * s2);
++// extern char * strcasestr (char * s1, char * s2);
+ /*
+ 
+ Strip white space off a string
--- arena.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Tue Jan 29 12:24:54 PST 2002 
State-Changed-Why:  
Fixed, Thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34415 
>Unformatted:
