Attachment #56555 for bug #85390

View | Details | Raw Unified | Return to bug 85390
Collapse All | Expand All

Lines 6-12 Link Here

(-)www/cherokee/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.4.24	9	PORTVERSION= 0.4.25
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/	11	MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/
12	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}	12	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}
Lines 24-30 Link Here
24	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www	24	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www
25	INSTALLS_SHLIB= yes	25	INSTALLS_SHLIB= yes
26		26
27	MAN1= cget.1 cherokee-config.1 cherokee.1	27	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
28		28
29	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	29	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
30	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	30	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}

Lines 1-2 Link Here

(-)www/cherokee/distinfo (-2 / +2 lines)
1	MD5 (cherokee-0.4.24.tar.gz) = dc51a96e46835fd2644048b12255bb81	1	MD5 (cherokee-0.4.25.tar.gz) = 1d6c1a6e9a83ca0b881f45f946e3f3c6
2	SIZE (cherokee-0.4.24.tar.gz) = 1402157	2	SIZE (cherokee-0.4.25.tar.gz) = 1419364




--- 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);




--- 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




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

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

%%DATADIR%%/icons/unknown.png
%%DATADIR%%/mime_types.txt
%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
%%PORTDOCS%%%%DOCSDIR%%/Cget.html
%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
%%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html

Return to bug 85390

Line 0 Link Here

(-)www/cherokee/files/patch-cherokee-socket.c (+27 lines)
	1	--- cherokee/socket.c.orig Tue Aug 2 05:32:12 2005
	2	+++ cherokee/socket.c Thu Aug 4 21:17:27 2005
	3	@@ -1052,15 +1052,20 @@
	4	cherokee_socket_init_client_tls (cherokee_socket_t *socket)
	5	{
	6	#ifdef HAVE_TLS
	7	- int re;
	8	-
	9	- socket->is_tls = TLS;
	10	-
	11	# ifdef HAVE_GNUTLS
	12	+
	13	const int kx_priority[] = {GNUTLS_KX_ANON_DH, 0};
	14
	15	gnutls_anon_client_credentials anoncred;
	16	+
	17	+# endif
	18	+
	19	+ int re;
	20
	21	+ socket->is_tls = TLS;
	22	+
	23	+# ifdef HAVE_GNUTLS
	24	+
	25	/* Acredentials
	26	*/
	27	gnutls_anon_allocate_client_credentials(&anoncred);

Line 0 Link Here

(-)www/cherokee/files/patch-cherokee-util.h (+23 lines)
	1	--- cherokee/util.h.orig Mon Aug 1 21:47:22 2005
	2	+++ cherokee/util.h Thu Aug 4 21:05:15 2005
	3	@@ -33,7 +33,19 @@
	4	#include <cherokee/buffer.h>
	5	#include <time.h>
	6	#include <dirent.h>
	7	-#include <netinet/in.h>
	8	+#include <sys/types.h>
	9	+
	10	+#ifdef HAVE_SYS_SOCKET_H
	11	+# include <sys/socket.h>
	12	+#endif
	13	+
	14	+#ifdef HAVE_ARPA_INET_H
	15	+# include <arpa/inet.h>
	16	+#endif
	17	+
	18	+#ifdef HAVE_NETINET_IN_H
	19	+# include <netinet/in.h>
	20	+#endif
	21
	22
	23	CHEROKEE_BEGIN_DECLS

Lines 1-10 Link Here

(-)www/cherokee/pkg-plist (-1 / +4 lines)
1	bin/cget	1	bin/cget
2	bin/cherokee-config	2	bin/cherokee-config
3	bin/cherokee-panic	3	bin/cherokee-panic
		4	bin/cherokee_logrotate
4	etc/cherokee/advanced.conf	5	etc/cherokee/advanced.conf
5	etc/cherokee/cherokee.conf	6	etc/cherokee/cherokee.conf
6	etc/cherokee/icons.conf	7	etc/cherokee/icons.conf
7	etc/cherokee/mime.conf	8	etc/cherokee/mime.conf
		9	etc/cherokee/mods-available/admin
8	etc/cherokee/mods-available/ssl	10	etc/cherokee/mods-available/ssl
9	etc/cherokee/sites-available/default	11	etc/cherokee/sites-available/default
10	etc/cherokee/sites-available/example.com	12	etc/cherokee/sites-available/example.com
Lines 29-34 Link Here
29	include/cherokee/mime.h	31	include/cherokee/mime.h
30	include/cherokee/module.h	32	include/cherokee/module.h
31	include/cherokee/module_loader.h	33	include/cherokee/module_loader.h
		34	include/cherokee/resolv_cache.h
32	include/cherokee/server.h	35	include/cherokee/server.h
33	include/cherokee/table.h	36	include/cherokee/table.h
34	include/cherokee/url.h	37	include/cherokee/url.h
Lines 93-99 Link Here
93	%%DATADIR%%/icons/unknown.png	96	%%DATADIR%%/icons/unknown.png
94	%%DATADIR%%/mime_types.txt	97	%%DATADIR%%/mime_types.txt
95	%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html	98	%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
96	%%PORTDOCS%%%%DOCSDIR%%/CGI_Executing.html	99	%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
97	%%PORTDOCS%%%%DOCSDIR%%/Cget.html	100	%%PORTDOCS%%%%DOCSDIR%%/Cget.html
98	%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html	101	%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
99	%%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html	102	%%PORTDOCS%%%%DOCSDIR%%/Compiling_and_Installing.html