10 files changed, 116 insertions, 10 deletions

diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 007b35cedcd2..9bccc9920227 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.24
+PORTVERSION=	0.4.25
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www
 INSTALLS_SHLIB=	yes
 
-MAN1=		cget.1 cherokee-config.1 cherokee.1
+MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/www/cherokee-devel/distinfo b/www/cherokee-devel/distinfo
index e7352aa0fe79..c27f7869c793 100644
--- a/www/cherokee-devel/distinfo
+++ b/www/cherokee-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (cherokee-0.4.24.tar.gz) = dc51a96e46835fd2644048b12255bb81
-SIZE (cherokee-0.4.24.tar.gz) = 1402157
+MD5 (cherokee-0.4.25.tar.gz) = 1d6c1a6e9a83ca0b881f45f946e3f3c6
+SIZE (cherokee-0.4.25.tar.gz) = 1419364
diff --git a/www/cherokee-devel/files/patch-cherokee-socket.c b/www/cherokee-devel/files/patch-cherokee-socket.c
new file mode 100644
index 000000000000..9e2f4f133ffc
--- /dev/null
+++ b/www/cherokee-devel/files/patch-cherokee-socket.c
@@ -0,0 +1,27 @@
+--- 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_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};
+ 
+ 	gnutls_anon_client_credentials   anoncred;
++
++# endif
++
++	int re;
+ 	
++	socket->is_tls = TLS;
++
++# ifdef HAVE_GNUTLS
++
+ 	/* Acredentials
+ 	 */
+ 	gnutls_anon_allocate_client_credentials(&anoncred);
diff --git a/www/cherokee-devel/files/patch-cherokee-util.h b/www/cherokee-devel/files/patch-cherokee-util.h
new file mode 100644
index 000000000000..2d395ea092ed
--- /dev/null
+++ b/www/cherokee-devel/files/patch-cherokee-util.h
@@ -0,0 +1,23 @@
+--- cherokee/util.h.orig	Mon Aug  1 21:47:22 2005
++++ cherokee/util.h	Thu Aug  4 21:05:15 2005
+@@ -33,7 +33,19 @@
+ #include <cherokee/buffer.h>
+ #include <time.h>
+ #include <dirent.h>
+-#include <netinet/in.h>
++#include <sys/types.h>
++
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
++
++#ifdef HAVE_ARPA_INET_H
++# include <arpa/inet.h>
++#endif
++
++#ifdef HAVE_NETINET_IN_H
++# include <netinet/in.h>
++#endif
+ 
+ 
+ CHEROKEE_BEGIN_DECLS
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index 020f6fa2d31f..53715250af88 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -1,10 +1,12 @@
 bin/cget
 bin/cherokee-config
 bin/cherokee-panic
+bin/cherokee_logrotate
 etc/cherokee/advanced.conf
 etc/cherokee/cherokee.conf
 etc/cherokee/icons.conf
 etc/cherokee/mime.conf
+etc/cherokee/mods-available/admin
 etc/cherokee/mods-available/ssl
 etc/cherokee/sites-available/default
 etc/cherokee/sites-available/example.com
@@ -29,6 +31,7 @@ include/cherokee/macros.h
 include/cherokee/mime.h
 include/cherokee/module.h
 include/cherokee/module_loader.h
+include/cherokee/resolv_cache.h
 include/cherokee/server.h
 include/cherokee/table.h
 include/cherokee/url.h
@@ -93,7 +96,7 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
 %%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/CGI_Executing.html
+%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
 %%PORTDOCS%%%%DOCSDIR%%/Cget.html
 %%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
 %%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 007b35cedcd2..9bccc9920227 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cherokee
-PORTVERSION=	0.4.24
+PORTVERSION=	0.4.25
 CATEGORIES=	www
 MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-wwwroot=${PREFIX}/www
 INSTALLS_SHLIB=	yes
 
-MAN1=		cget.1 cherokee-config.1 cherokee.1
+MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/www/cherokee/distinfo b/www/cherokee/distinfo
index e7352aa0fe79..c27f7869c793 100644
--- a/www/cherokee/distinfo
+++ b/www/cherokee/distinfo
@@ -1,2 +1,2 @@
-MD5 (cherokee-0.4.24.tar.gz) = dc51a96e46835fd2644048b12255bb81
-SIZE (cherokee-0.4.24.tar.gz) = 1402157
+MD5 (cherokee-0.4.25.tar.gz) = 1d6c1a6e9a83ca0b881f45f946e3f3c6
+SIZE (cherokee-0.4.25.tar.gz) = 1419364
diff --git a/www/cherokee/files/patch-cherokee-socket.c b/www/cherokee/files/patch-cherokee-socket.c
new file mode 100644
index 000000000000..9e2f4f133ffc
--- /dev/null
+++ b/www/cherokee/files/patch-cherokee-socket.c
@@ -0,0 +1,27 @@
+--- 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_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};
+ 
+ 	gnutls_anon_client_credentials   anoncred;
++
++# endif
++
++	int re;
+ 	
++	socket->is_tls = TLS;
++
++# ifdef HAVE_GNUTLS
++
+ 	/* Acredentials
+ 	 */
+ 	gnutls_anon_allocate_client_credentials(&anoncred);
diff --git a/www/cherokee/files/patch-cherokee-util.h b/www/cherokee/files/patch-cherokee-util.h
new file mode 100644
index 000000000000..2d395ea092ed
--- /dev/null
+++ b/www/cherokee/files/patch-cherokee-util.h
@@ -0,0 +1,23 @@
+--- cherokee/util.h.orig	Mon Aug  1 21:47:22 2005
++++ cherokee/util.h	Thu Aug  4 21:05:15 2005
+@@ -33,7 +33,19 @@
+ #include <cherokee/buffer.h>
+ #include <time.h>
+ #include <dirent.h>
+-#include <netinet/in.h>
++#include <sys/types.h>
++
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif
++
++#ifdef HAVE_ARPA_INET_H
++# include <arpa/inet.h>
++#endif
++
++#ifdef HAVE_NETINET_IN_H
++# include <netinet/in.h>
++#endif
+ 
+ 
+ CHEROKEE_BEGIN_DECLS
diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist
index 020f6fa2d31f..53715250af88 100644
--- a/www/cherokee/pkg-plist
+++ b/www/cherokee/pkg-plist
@@ -1,10 +1,12 @@
 bin/cget
 bin/cherokee-config
 bin/cherokee-panic
+bin/cherokee_logrotate
 etc/cherokee/advanced.conf
 etc/cherokee/cherokee.conf
 etc/cherokee/icons.conf
 etc/cherokee/mime.conf
+etc/cherokee/mods-available/admin
 etc/cherokee/mods-available/ssl
 etc/cherokee/sites-available/default
 etc/cherokee/sites-available/example.com
@@ -29,6 +31,7 @@ include/cherokee/macros.h
 include/cherokee/mime.h
 include/cherokee/module.h
 include/cherokee/module_loader.h
+include/cherokee/resolv_cache.h
 include/cherokee/server.h
 include/cherokee/table.h
 include/cherokee/url.h
@@ -93,7 +96,7 @@ share/aclocal/cherokee.m4
 %%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
 %%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/CGI_Executing.html
+%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
 %%PORTDOCS%%%%DOCSDIR%%/Cget.html
 %%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
 %%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html