ports/138195: www/wwwcount IPv6 and NFS lock enable

[Takefu Kenji]

>Number:         138195
>Category:       ports
>Synopsis:       www/wwwcount IPv6 and NFS lock enable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 26 06:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Takefu Kenji
>Release:        FreeBSD 7.2-RELEASE-p3
>Organization:
FM-PASERI-NET
>Environment:
>Description:
IPv6 address support.
NFS filesystem support.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -rubN www/wwwcount/Makefile /usr/ports/www/wwwcount/Makefile
--- www/wwwcount/Makefile	2009-08-26 14:58:01.000000000 +0900
+++ /usr/ports/www/wwwcount/Makefile	2009-03-21 02:49:26.000000000 +0900
@@ -7,7 +7,7 @@
 
 PORTNAME=	wwwcount
 PORTVERSION=	2.5
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.muquit.com/muquit/software/Count/src/wwwcount2.5/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -20,10 +20,6 @@
 USE_GMAKE=	yes
 MAN1=		mkstrip.1
 
-PATCH_SITES+=	http://www.hagyroom.com/labs/wwwcount/
-PATCHFILES+=	wwwcount2.5-fcntl.patch
-PATCH_DIST_STRIP+=	-p1
-
 pre-configure:
 	cd ${WRKSRC}; PREFIX=${PREFIX} ./Count-config
 
diff -rubN www/wwwcount/distinfo /usr/ports/www/wwwcount/distinfo
--- www/wwwcount/distinfo	2009-08-26 12:20:14.000000000 +0900
+++ /usr/ports/www/wwwcount/distinfo	2006-01-24 12:14:17.000000000 +0900
@@ -1,6 +1,3 @@
 MD5 (wwwcount2.5.tar.gz) = 8f0068561b5c86903f37396d69438667
 SHA256 (wwwcount2.5.tar.gz) = ac9ab8b0eafa715a1be8b352969744d4691f47cf10c4dc9098b16b9789654292
 SIZE (wwwcount2.5.tar.gz) = 445343
-MD5 (wwwcount2.5-fcntl.patch) = debcf633d5c0d64c657be48d4b4a0c31
-SHA256 (wwwcount2.5-fcntl.patch) = 3cb98b48d02be66aeb9912a44c225f357ce854da353ba0595ecf0218f41c9d75
-SIZE (wwwcount2.5-fcntl.patch) = 3011
diff -rubN www/wwwcount/files/patch-src_rwdata.c /usr/ports/www/wwwcount/files/patch-src_rwdata.c
--- www/wwwcount/files/patch-src_rwdata.c	2009-08-05 11:29:57.000000000 +0900
+++ /usr/ports/www/wwwcount/files/patch-src_rwdata.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,65 +0,0 @@
---- src/rwdata.c.org	Mon Mar 19 10:59:51 2001
-+++ src/rwdata.c	Wed May  9 16:58:31 2001
-@@ -69,7 +69,7 @@
-     do_increment;   /* should be counter be incremented */
- 
- {
--#define IP_LENGTH   16
-+#define IP_LENGTH   40
-     int
-         length,
-         n,
-@@ -356,7 +356,7 @@
-                 if ((ipbuf != (char *) NULL) && (*ipbuf != '\0'))
-                 {
-                     Debug2("ipbuf is not NULL=%s",ipbuf,0);
--                    safeStrcat(readbuf,":",1,malloc_size-1,strlen(readbuf));
-+                    safeStrcat(readbuf,";",1,malloc_size-1,strlen(readbuf));
-                     safeStrcat(readbuf,ipbuf,IP_LENGTH,malloc_size-1,
-                         strlen(readbuf));
-                 }
-@@ -373,7 +373,7 @@
-                     if ((ipbuf != (char *) NULL) && (*ipbuf != '\0'))
-                     {
-                         Debug2("ipbuf is not NULL=%s",ipbuf,0);
--                        safeStrcat(readbuf,":",1,malloc_size-1,strlen(readbuf));
-+                        safeStrcat(readbuf,";",1,malloc_size-1,strlen(readbuf));
-                         safeStrcat(readbuf,ipbuf,IP_LENGTH,malloc_size-1,
-                         strlen(readbuf));
-                     }
-@@ -406,7 +406,7 @@
-         {
-             if (remote_ip != (char *) NULL)
-             {
--                safeStrcat(readbuf,":",1,
-+                safeStrcat(readbuf,";",1,
-                         malloc_size-1,strlen(readbuf));
-                 safeStrcat(readbuf,remote_ip,IP_LENGTH,
-                         malloc_size-1,strlen(readbuf));
-@@ -422,7 +422,7 @@
-             {
-                 if (remote_ip != (char *) NULL)
-                 {
--                    safeStrcat(readbuf,":",1,
-+                    safeStrcat(readbuf,";",1,
-                         malloc_size-1,strlen(readbuf));
-                     safeStrcat(readbuf,remote_ip,IP_LENGTH,
-                         malloc_size-1,strlen(readbuf));
-@@ -547,7 +547,7 @@
-         *v;
- 
-     p=allbuf;
--    v=mystrtok(p,":");
-+    v=mystrtok(p,";");
-     if (v != (char *) NULL)
-     {
-         safeStrcpy(dbuf,v,dbuf_size);
-@@ -556,7 +556,7 @@
-         */
- 
-         p=(char *) NULL;
--        v=mystrtok(p,":");
-+        v=mystrtok(p,";");
-         if (v != (char *) NULL)
-         {
-             safeStrcpy(ipbuf,v,ipbuf_size);


>Release-Note:
>Audit-Trail:
>Unformatted: