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

[Takefu]

Can this PR register again?

--- wwwcount.patch begins here ---
diff -ruN /usr/ports/www/wwwcount/Makefile www/wwwcount/Makefile
--- /usr/ports/www/wwwcount/Makefile	2009-03-21 02:49:26.000000000 +0900
+++ www/wwwcount/Makefile	2009-08-26 14:58:01.000000000 +0900
@@ -7,7 +7,7 @@

 PORTNAME=	wwwcount
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://www.muquit.com/muquit/software/Count/src/wwwcount2.5/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -20,6 +20,10 @@
 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 -ruN /usr/ports/www/wwwcount/distinfo www/wwwcount/distinfo
--- /usr/ports/www/wwwcount/distinfo	2011-03-21 14:19:55.000000000 +0900
+++ www/wwwcount/distinfo	2011-10-06 15:00:01.000000000 +0900
@@ -1,2 +1,4 @@
 SHA256 (wwwcount2.5.tar.gz) = ac9ab8b0eafa715a1be8b352969744d4691f47cf10c4dc9098b16b9789654292
 SIZE (wwwcount2.5.tar.gz) = 445343
+SHA256 (wwwcount2.5-fcntl.patch) = 3cb98b48d02be66aeb9912a44c225f357ce854da353ba0595ecf0218f41c9d75
+SIZE (wwwcount2.5-fcntl.patch) = 3011
diff -ruN /usr/ports/www/wwwcount/files/patch-src_rwdata.c www/wwwcount/files/patch-src_rwdata.c
--- /usr/ports/www/wwwcount/files/patch-src_rwdata.c	1970-01-01 09:00:00.000000000 +0900
+++ www/wwwcount/files/patch-src_rwdata.c	2009-08-05 11:29:57.000000000 +0900
@@ -0,0 +1,65 @@
+--- 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);
diff -ruN /usr/ports/www/wwwcount/pkg-plist www/wwwcount/pkg-plist
--- /usr/ports/www/wwwcount/pkg-plist	1999-10-05 13:52:23.000000000 +0900
+++ www/wwwcount/pkg-plist	2011-10-06 15:31:07.000000000 +0900
@@ -19,10 +19,6 @@
 lib/Counter/digits/mkstrip.sh
 lib/Counter/rgb.txt
 www/cgi-bin/Count.cgi
- at exec touch /var/log/Counter.log
- at exec chown nobody:nobody /var/log/Counter.log
- at exec chmod 644 /var/log/Counter.log
- at unexec rm /var/log/Counter.log
 @dirrm etc/Counter/conf
 @dirrm etc/Counter/data
 @dirrm etc/Counter
@@ -37,3 +33,5 @@
 @dirrm lib/Counter/digits/bang
 @dirrm lib/Counter/digits
 @dirrm lib/Counter
+ at cwd /
+ at rmtry var/log/Counter.log
--- wwwcount.patch ends here ---


sylvio at FreeBSD.org さんは書きました (2010/04/23 5:55):
> Synopsis: www/wwwcount IPv6 and NFS lock enable
> 
> State-Changed-From-To: feedback->closed
> State-Changed-By: sylvio
> State-Changed-When: Thu Apr 22 20:55:13 UTC 2010
> State-Changed-Why: 
> Timeout of feedback of submitter. (timeout > 2180 days)
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=138195
> 
> 


--