ports/103228: [PATCH] www/cherokee: update to 0.5.5

[chinsan]

>Number:         103228
>Category:       ports
>Synopsis:       [PATCH] www/cherokee: update to 0.5.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 13 15:10:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     chinsan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
Taiwan
>Environment:
System: FreeBSD BSD6.giga.hgc.com.tw 6.1-STABLE FreeBSD 6.1-STABLE #5: Mon Jul 17 09:30:36 CST 2006
>Description:
- Update to 0.5.5

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- cherokee-0.5.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/cherokee/Makefile /usr/home/chinsan/project/cherokee/Makefile
--- /usr/ports/www/cherokee/Makefile	Wed Aug 16 05:20:19 2006
+++ /usr/home/chinsan/project/cherokee/Makefile	Wed Sep 13 21:42:06 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.5.4
+PORTVERSION=	0.5.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
diff -ruN --exclude=CVS /usr/ports/www/cherokee/distinfo /usr/home/chinsan/project/cherokee/distinfo
--- /usr/ports/www/cherokee/distinfo	Thu Jul 20 05:19:57 2006
+++ /usr/home/chinsan/project/cherokee/distinfo	Wed Sep 13 21:42:43 2006
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.5.4.tar.gz) = 4e207961bc8204a2e2026391649dd8af
-SHA256 (cherokee-0.5.4.tar.gz) = f44f16e8cf581ba8a7b22e4c9631e432967f43c9af50cf706432e8ad58a9c331
-SIZE (cherokee-0.5.4.tar.gz) = 1556342
+MD5 (cherokee-0.5.5.tar.gz) = fb891b3da7eb921c09a5eb93e296f5e1
+SHA256 (cherokee-0.5.5.tar.gz) = e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
+SIZE (cherokee-0.5.5.tar.gz) = 1559655
diff -ruN --exclude=CVS /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c /usr/home/chinsan/project/cherokee/files/patch-cherokee-fdpoll-kqueue.c
--- /usr/ports/www/cherokee/files/patch-cherokee-fdpoll-kqueue.c	Fri Jan 20 03:07:20 2006
+++ /usr/home/chinsan/project/cherokee/files/patch-cherokee-fdpoll-kqueue.c	Wed Sep 13 21:46:31 2006
@@ -1,5 +1,5 @@
---- cherokee/fdpoll-kqueue.c.orig	Fri May 27 02:42:27 2005
-+++ cherokee/fdpoll-kqueue.c	Fri Sep 16 00:03:37 2005
+--- cherokee/fdpoll-kqueue.c.orig	Wed Sep 13 21:45:31 2006
++++ cherokee/fdpoll-kqueue.c	Wed Sep 13 21:45:13 2006
 @@ -27,6 +27,7 @@
  #include "fdpoll-protected.h"
  
diff -ruN --exclude=CVS /usr/ports/www/cherokee/files/patch-cherokee-socket.c /usr/home/chinsan/project/cherokee/files/patch-cherokee-socket.c
--- /usr/ports/www/cherokee/files/patch-cherokee-socket.c	Tue Aug 30 09:33:56 2005
+++ /usr/home/chinsan/project/cherokee/files/patch-cherokee-socket.c	Wed Sep 13 22:07:19 2006
@@ -1,27 +1,23 @@
---- cherokee/socket.c.orig	Tue Aug  2 05:32:12 2005
-+++ cherokee/socket.c	Thu Aug  4 21:17:27 2005
-@@ -1052,15 +1052,20 @@
+--- cherokee/socket.c.orig	Wed Sep 13 21:48:51 2006
++++ cherokee/socket.c	Wed Sep 13 22:06:35 2006
+@@ -1122,13 +1122,17 @@
  cherokee_socket_init_client_tls (cherokee_socket_t *socket)
  {
  #ifdef HAVE_TLS
 -	int re;
 -
--	socket->is_tls = TLS;
--
  # ifdef HAVE_GNUTLS
 +
- 	const int kx_priority[] = {GNUTLS_KX_ANON_DH, 0};
- 
+ 	const int                        kx_priority[] = {GNUTLS_KX_ANON_DH, 0};
  	gnutls_anon_client_credentials   anoncred;
+-	
 +
-+# endif
++#endif
 +
-+	int re;
- 	
-+	socket->is_tls = TLS;
++	int re;	
+ 	socket->is_tls = TLS;
 +
 +# ifdef HAVE_GNUTLS
-+
+ 
  	/* Acredentials
  	 */
- 	gnutls_anon_allocate_client_credentials(&anoncred);
diff -ruN --exclude=CVS /usr/ports/www/cherokee/files/patch-cherokee-util.h /usr/home/chinsan/project/cherokee/files/patch-cherokee-util.h
--- /usr/ports/www/cherokee/files/patch-cherokee-util.h	Sat Oct 22 03:49:10 2005
+++ /usr/home/chinsan/project/cherokee/files/patch-cherokee-util.h	Wed Sep 13 22:15:52 2006
@@ -1,5 +1,5 @@
---- cherokee/util.h.orig	Sat Oct 15 19:31:05 2005
-+++ cherokee/util.h	Thu Oct 20 00:59:40 2005
+--- cherokee/util.h.orig	Wed Sep 13 22:13:07 2006
++++ cherokee/util.h	Wed Sep 13 22:15:20 2006
 @@ -31,6 +31,14 @@
  
  #include <cherokee/common.h>
@@ -12,6 +12,6 @@
 +# include <sys/socket.h>
 +#endif
 +
- #ifdef HAVE_NETINET_IN_H
- # include <netinet/in.h>
- #endif
+ #include <time.h>
+ #include <dirent.h>
+ 
--- cherokee-0.5.5.patch ends here ---

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