Attachment #70798 for bug #103228

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

Lines 6-12 Link Here

(-)/usr/home/chinsan/project/cherokee/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.5.4	9	PORTVERSION= 0.5.5
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 1-3 Link Here

(-)/usr/home/chinsan/project/cherokee/distinfo (-3 / +3 lines)
1	MD5 (cherokee-0.5.4.tar.gz) = 4e207961bc8204a2e2026391649dd8af	1	MD5 (cherokee-0.5.5.tar.gz) = fb891b3da7eb921c09a5eb93e296f5e1
2	SHA256 (cherokee-0.5.4.tar.gz) = f44f16e8cf581ba8a7b22e4c9631e432967f43c9af50cf706432e8ad58a9c331	2	SHA256 (cherokee-0.5.5.tar.gz) = e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
3	SIZE (cherokee-0.5.4.tar.gz) = 1556342	3	SIZE (cherokee-0.5.5.tar.gz) = 1559655

Lines 1-5 Link Here

(-)/usr/home/chinsan/project/cherokee/files/patch-cherokee-fdpoll-kqueue.c (-2 / +2 lines)
1	--- cherokee/fdpoll-kqueue.c.orig Fri May 27 02:42:27 2005	1	--- cherokee/fdpoll-kqueue.c.orig Wed Sep 13 21:45:31 2006
2	+++ cherokee/fdpoll-kqueue.c Fri Sep 16 00:03:37 2005	2	+++ cherokee/fdpoll-kqueue.c Wed Sep 13 21:45:13 2006
3	@@ -27,6 +27,7 @@	3	@@ -27,6 +27,7 @@
4	#include "fdpoll-protected.h"	4	#include "fdpoll-protected.h"
5		5




--- 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};
 
 	gnutls_anon_client_credentials   anoncred;
-	
+
+#endif
+
+	int re;	
 	socket->is_tls = TLS;
+	socket->is_tls = TLS;
+
+# ifdef HAVE_GNUTLS
 
 	/* Acredentials
 	 */
 	gnutls_anon_allocate_client_credentials(&anoncred);

Lines 1-5 Link Here

(-)/usr/home/chinsan/project/cherokee/files/patch-cherokee-util.h (-5 / +5 lines)
1	--- cherokee/util.h.orig Sat Oct 15 19:31:05 2005	1	--- cherokee/util.h.orig Wed Sep 13 22:13:07 2006
2	+++ cherokee/util.h Thu Oct 20 00:59:40 2005	2	+++ cherokee/util.h Wed Sep 13 22:15:20 2006
3	@@ -31,6 +31,14 @@	3	@@ -31,6 +31,14 @@
4		4
5	#include <cherokee/common.h>	5	#include <cherokee/common.h>
Lines 12-17 Link Here
12	+# include <sys/socket.h>	12	+# include <sys/socket.h>
13	+#endif	13	+#endif
14	+	14	+
15	#ifdef HAVE_NETINET_IN_H	15	#include <time.h>
16	# include <netinet/in.h>	16	#include <dirent.h>
17	#endif	17

Return to bug 103228

Lines 1-27 Link Here

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