Attachment #53883 for bug #81513

View | Details | Raw Unified | Return to bug 81513
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.19	9	PORTVERSION= 0.4.23
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 25-31 Link Here
25	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www	25	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www
26	INSTALLS_SHLIB= yes	26	INSTALLS_SHLIB= yes
27		27
28	MAN1= cherokee-config.1 cherokee.1	28	MAN1= cget.1 cherokee-config.1 cherokee.1
29		29
30	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	30	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
31	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	31	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}

Lines 1-2 Link Here

(-)www/cherokee/distinfo (-2 / +2 lines)
1	MD5 (cherokee-0.4.19.tar.gz) = ecd2b9e52450bdd70f0eed8f0c803871	1	MD5 (cherokee-0.4.23.tar.gz) = 915416b891a7ac60d4d7a0868c305bd2
2	SIZE (cherokee-0.4.19.tar.gz) = 1024984	2	SIZE (cherokee-0.4.23.tar.gz) = 1340107




--- cherokee/buffer.c.orig	Tue May 24 00:46:59 2005
+++ cherokee/buffer.c	Tue May 24 16:18:01 2005
@@ -39,6 +39,10 @@
 #include "util.h"
 #include "crc32.h"
 
+#ifndef va_copy
+#define va_copy(to,fr) ((to)=(fr))
+#endif
+
 #define BUFFER_VA_LEN 200
 
 #define TO_HEX(c) (c>9? c+'a'-10 : c+'0')

Line 0 Link Here

(-)www/cherokee/files/patch-cherokee-config_protocol_scanner.c (+11 lines)
	1	--- cherokee/config_protocol_scanner.c.orig Sat May 21 02:14:14 2005
	2	+++ cherokee/config_protocol_scanner.c Tue May 24 16:15:26 2005
	3	@@ -782,7 +782,7 @@
	4	case 6:
	5	YY_RULE_SETUP
	6	#line 47 "config_protocol_scanner.l"
	7	-{ yy_config_protocol_lval.number = atoll(yy_config_protocol_text); return T_NUM; }
	8	+{ yy_config_protocol_lval.number = strtoll(yy_config_protocol_text, (char **)NULL, 10); return T_NUM; }
	9	YY_BREAK
	10	case 7:
	11	/* rule 7 can match eol */




etc/cherokee/sites-available/example.com
etc/cherokee/sites-enabled/default
%%PAM5%%etc/pam.d/cherokee
include/cherokee/admin_client.h
include/cherokee/buffer.h
include/cherokee/cherokee-config.h
include/cherokee/cherokee.h
include/cherokee/common.h
include/cherokee/config_value.h
include/cherokee/connection.h
include/cherokee/downloader.h
include/cherokee/encoder.h

include/cherokee/table.h
include/cherokee/url.h
include/cherokee/util.h
lib/cherokee/libplugin_admin.so
lib/cherokee/libplugin_cgi.so
lib/cherokee/libplugin_combined.so
lib/cherokee/libplugin_common.so
lib/cherokee/libplugin_dirlist.so
lib/cherokee/libplugin_error_redir.so
lib/cherokee/libplugin_fastcgi.so
lib/cherokee/libplugin_file.so
lib/cherokee/libplugin_gzip.so
lib/cherokee/libplugin_htdigest.so
lib/cherokee/libplugin_ncsa.so
lib/cherokee/libplugin_nn.so
%%PAM%%lib/cherokee/libplugin_pam.so
lib/cherokee/libplugin_phpcgi.so
lib/cherokee/libplugin_plain.so
lib/cherokee/libplugin_read_config.so
lib/cherokee/libplugin_redir.so
lib/cherokee/libplugin_remote_control.so
lib/cherokee/libplugin_server_info.so

lib/libcherokee-client.a
lib/libcherokee-client.so
lib/libcherokee-client.so.0
lib/libcherokee-config.a
lib/libcherokee-config.so
lib/libcherokee-config.so.0
lib/libcherokee-server.a
lib/libcherokee-server.so
lib/libcherokee-server.so.0

%%DATADIR%%/icons/text.png
%%DATADIR%%/icons/unknown.png
%%DATADIR%%/mime_types.txt
www/images/cherokee-logo.png
www/images/powered_by_cherokee.png
www/images/top-layer.png
www/index.html
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/deps
@dirrm %%DATADIR%%

@dirrm etc/cherokee/mods-enabled
@dirrm etc/cherokee/mods-available
@dirrm etc/cherokee
@unexec rmdir %D/www/images 2>/dev/null || true
@unexec rmdir %D/www/data 2>/dev/null || true

Return to bug 81513

Line 0 Link Here

(-)www/cherokee/files/patch-cherokee-buffer.c (+13 lines)
	1	--- cherokee/buffer.c.orig Tue May 24 00:46:59 2005
	2	+++ cherokee/buffer.c Tue May 24 16:18:01 2005
	3	@@ -39,6 +39,10 @@
	4	#include "util.h"
	5	#include "crc32.h"
	6
	7	+#ifndef va_copy
	8	+#define va_copy(to,fr) ((to)=(fr))
	9	+#endif
	10	+
	11	#define BUFFER_VA_LEN 200
	12
	13	#define TO_HEX(c) (c>9? c+'a'-10 : c+'0')

Lines 10-19 Link Here

(-)www/cherokee/pkg-plist (-1 / +15 lines)
10	etc/cherokee/sites-available/example.com	10	etc/cherokee/sites-available/example.com
11	etc/cherokee/sites-enabled/default	11	etc/cherokee/sites-enabled/default
12	%%PAM5%%etc/pam.d/cherokee	12	%%PAM5%%etc/pam.d/cherokee
		13	include/cherokee/admin_client.h
13	include/cherokee/buffer.h	14	include/cherokee/buffer.h
14	include/cherokee/cherokee-config.h	15	include/cherokee/cherokee-config.h
15	include/cherokee/cherokee.h	16	include/cherokee/cherokee.h
16	include/cherokee/common.h	17	include/cherokee/common.h
		18	include/cherokee/config_value.h
17	include/cherokee/connection.h	19	include/cherokee/connection.h
18	include/cherokee/downloader.h	20	include/cherokee/downloader.h
19	include/cherokee/encoder.h	21	include/cherokee/encoder.h
Lines 32-49 Link Here
32	include/cherokee/table.h	34	include/cherokee/table.h
33	include/cherokee/url.h	35	include/cherokee/url.h
34	include/cherokee/util.h	36	include/cherokee/util.h
		37	lib/cherokee/libplugin_admin.so
35	lib/cherokee/libplugin_cgi.so	38	lib/cherokee/libplugin_cgi.so
36	lib/cherokee/libplugin_combined.so	39	lib/cherokee/libplugin_combined.so
37	lib/cherokee/libplugin_common.so	40	lib/cherokee/libplugin_common.so
38	lib/cherokee/libplugin_dirlist.so	41	lib/cherokee/libplugin_dirlist.so
39	lib/cherokee/libplugin_error_redir.so	42	lib/cherokee/libplugin_error_redir.so
		43	lib/cherokee/libplugin_fastcgi.so
40	lib/cherokee/libplugin_file.so	44	lib/cherokee/libplugin_file.so
41	lib/cherokee/libplugin_gzip.so	45	lib/cherokee/libplugin_gzip.so
		46	lib/cherokee/libplugin_htdigest.so
42	lib/cherokee/libplugin_ncsa.so	47	lib/cherokee/libplugin_ncsa.so
43	lib/cherokee/libplugin_nn.so	48	lib/cherokee/libplugin_nn.so
44	%%PAM%%lib/cherokee/libplugin_pam.so	49	%%PAM%%lib/cherokee/libplugin_pam.so
45	lib/cherokee/libplugin_phpcgi.so	50	lib/cherokee/libplugin_phpcgi.so
46	lib/cherokee/libplugin_plain.so	51	lib/cherokee/libplugin_plain.so
		52	lib/cherokee/libplugin_read_config.so
47	lib/cherokee/libplugin_redir.so	53	lib/cherokee/libplugin_redir.so
48	lib/cherokee/libplugin_remote_control.so	54	lib/cherokee/libplugin_remote_control.so
49	lib/cherokee/libplugin_server_info.so	55	lib/cherokee/libplugin_server_info.so
Lines 54-59 Link Here
54	lib/libcherokee-client.a	60	lib/libcherokee-client.a
55	lib/libcherokee-client.so	61	lib/libcherokee-client.so
56	lib/libcherokee-client.so.0	62	lib/libcherokee-client.so.0
		63	lib/libcherokee-config.a
		64	lib/libcherokee-config.so
		65	lib/libcherokee-config.so.0
57	lib/libcherokee-server.a	66	lib/libcherokee-server.a
58	lib/libcherokee-server.so	67	lib/libcherokee-server.so
59	lib/libcherokee-server.so.0	68	lib/libcherokee-server.so.0
Lines 85-90 Link Here
85	%%DATADIR%%/icons/text.png	94	%%DATADIR%%/icons/text.png
86	%%DATADIR%%/icons/unknown.png	95	%%DATADIR%%/icons/unknown.png
87	%%DATADIR%%/mime_types.txt	96	%%DATADIR%%/mime_types.txt
		97	www/images/cherokee-logo.png
		98	www/images/powered_by_cherokee.png
		99	www/images/top-layer.png
		100	www/index.html
88	@dirrm %%DATADIR%%/icons	101	@dirrm %%DATADIR%%/icons
89	@dirrm %%DATADIR%%/deps	102	@dirrm %%DATADIR%%/deps
90	@dirrm %%DATADIR%%	103	@dirrm %%DATADIR%%
Lines 96-99 Link Here
96	@dirrm etc/cherokee/mods-enabled	109	@dirrm etc/cherokee/mods-enabled
97	@dirrm etc/cherokee/mods-available	110	@dirrm etc/cherokee/mods-available
98	@dirrm etc/cherokee	111	@dirrm etc/cherokee
99	@unexec rmdir %%LOCALBASE%%/www/data 2>/dev/null \|\| true	112	@unexec rmdir %D/www/images 2>/dev/null \|\| true
		113	@unexec rmdir %D/www/data 2>/dev/null \|\| true