Attachment 56555 Details for Bug 85390 – file.diff

[patch] file.diff

file.diff (text/plain), 3.65 KB, created by tkato432 on 2005-08-28 11:10:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-08-28 11:10:21 UTC

Size: 3.65 KB

patch

obsolete

>diff -urN /usr/ports/www/cherokee/Makefile www/cherokee/Makefile
>--- /usr/ports/www/cherokee/Makefile	Tue Jul 12 21:15:14 2005
>+++ www/cherokee/Makefile	Thu Aug  4 18:39:36 2005
>@@ -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_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 -urN /usr/ports/www/cherokee/distinfo www/cherokee/distinfo
>--- /usr/ports/www/cherokee/distinfo	Tue Jul 12 21:15:14 2005
>+++ www/cherokee/distinfo	Thu Aug  4 18:38:50 2005
>@@ -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 -urN /usr/ports/www/cherokee/files/patch-cherokee-socket.c www/cherokee/files/patch-cherokee-socket.c
>--- /usr/ports/www/cherokee/files/patch-cherokee-socket.c	Thu Jan  1 09:00:00 1970
>+++ www/cherokee/files/patch-cherokee-socket.c	Thu Aug  4 21:17:47 2005
>@@ -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 -urN /usr/ports/www/cherokee/files/patch-cherokee-util.h www/cherokee/files/patch-cherokee-util.h
>--- /usr/ports/www/cherokee/files/patch-cherokee-util.h	Thu Jan  1 09:00:00 1970
>+++ www/cherokee/files/patch-cherokee-util.h	Thu Aug  4 21:05:25 2005
>@@ -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 -urN /usr/ports/www/cherokee/pkg-plist www/cherokee/pkg-plist
>--- /usr/ports/www/cherokee/pkg-plist	Tue Jul 12 21:15:14 2005
>+++ www/cherokee/pkg-plist	Thu Aug  4 21:15:05 2005
>@@ -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/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 @@
> %%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

Actions: View | Diff

Attachments on bug 85390: 56555