Attachment 126338 Details for Bug 170095 – xcache-2.0.1.patch

[patch] xcache-2.0.1.patch

xcache-2.0.1.patch (text/plain), 7.69 KB, created by Martin Matuska on 2012-07-23 21:00:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2012-07-23 21:00:35 UTC

Size: 7.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/xcache/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- Makefile	11 May 2012 09:26:07 -0000	1.17
>+++ Makefile	23 Jul 2012 19:58:57 -0000
>@@ -6,44 +6,67 @@
> #
> 
> PORTNAME=	xcache
>-DISTVERSION=	2.0.0
>-PORTREVISION=	1
>+PORTVERSION=	2.0.1
> CATEGORIES=	www
> MASTER_SITES=	http://xcache.lighttpd.net/pub/Releases/${DISTVERSION}/
> 
> MAINTAINER=	ale@FreeBSD.org
> COMMENT=	A fast and stable php opcode cacher
> 
>+LICENSE=	BSD
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+
> USE_BZIP2=	yes
> USE_PHP=	yes
> USE_PHPIZE=	yes
> 
> CONFIGURE_ARGS=	--enable-xcache=shared
> 
>-OPTIONS=	CONSTANT "Enable handling of compile time constants" off \
>-		COVERAGER "Enable code coverage dumper" off
>+OPTIONS_DEFINE=	CONSTANT COVERAGER
>+CONSTANT_DESC=	Enable handling of compile time constants
>+COVERAGER_DESC=	Enable code coverage dumper
> 
> SUB_FILES=	pkg-message
> PKGMESSAGE=	${WRKDIR}/pkg-message
> 
>-ADMINFILES=	common-en.lang.php common-zh-simplified-utf-8.lang.php \
>-		common-zh-traditional-utf-8.lang.php common.php config.php.example \
>-		edit.php edit.tpl.php footer.tpl.php header.tpl.php \
>-		help-en.lang.php help-zh-simplified-utf-8.lang.php \
>-		help-zh-traditional-utf-8.lang.php help.php index.php \
>-		mkpassword.php tablesort.js xcache.css xcache.php xcache.tpl.php
>-
>-COVERAGERFILES=	common-en.lang.php common-zh-simplified-gb2312.lang.php \
>-		common-zh-simplified-utf-8.lang.php common.php config.php.example \
>-		coverager.css coverager.php coverager.tpl.php index.php
>+ADMINFILES=	common-en.lang.php \
>+		common-zh-simplified-utf-8.lang.php \
>+		common-zh-traditional-utf-8.lang.php \
>+		common.php \
>+		config.default.php \
>+		config.example.php \
>+		edit.php \
>+		edit.tpl.php \
>+		footer.tpl.php \
>+		header.tpl.php \
>+		help-en.lang.php \
>+		help-zh-simplified-utf-8.lang.php \
>+		help-zh-traditional-utf-8.lang.php \
>+		help.php \
>+		index.php \
>+		mkpassword.php \
>+		tablesort.js \
>+		xcache.css \
>+		xcache.php \
>+		xcache.tpl.php
>+
>+COVERAGERFILES=	common-en.lang.php \
>+		common-zh-simplified-gb2312.lang.php \
>+		common-zh-simplified-utf-8.lang.php \
>+		common.php \
>+		config.php.example \
>+		coverager.css \
>+		coverager.php \
>+		coverager.tpl.php \
>+		index.php
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITH_CONSTANT)
>+.if ${PORT_OPTIONS:MCONSTANT}
> CONFIGURE_ARGS+=--enable-xcache-constant
> .endif
> 
>-.if defined(WITH_COVERAGER)
>+.if ${PORT_OPTIONS:MCOVERAGER}
> CONFIGURE_ARGS+=--enable-xcache-coverager
> PLIST_SUB+=	COVERAGER=""
> .else
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/www/xcache/distinfo,v
>retrieving revision 1.15
>diff -u -r1.15 distinfo
>--- distinfo	2 May 2012 09:52:47 -0000	1.15
>+++ distinfo	23 Jul 2012 19:58:57 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (xcache-2.0.0.tar.bz2) = ca26b0772d8b88223f281f5099a3b7d9f4b6597a87ae857301271c1fd5a3f64a
>-SIZE (xcache-2.0.0.tar.bz2) = 108614
>+SHA256 (xcache-2.0.1.tar.bz2) = b6e350f3b327b11e033da44f8b5f464b173e2256b5acc792a1179d29cb499289
>+SIZE (xcache-2.0.1.tar.bz2) = 112352
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/www/xcache/pkg-plist,v
>retrieving revision 1.5
>diff -u -r1.5 pkg-plist
>--- pkg-plist	3 Sep 2009 10:18:17 -0000	1.5
>+++ pkg-plist	23 Jul 2012 19:58:57 -0000
>@@ -4,7 +4,8 @@
> %%EXAMPLESDIR%%/admin/common-zh-simplified-utf-8.lang.php
> %%EXAMPLESDIR%%/admin/common-zh-traditional-utf-8.lang.php
> %%EXAMPLESDIR%%/admin/common.php
>-%%EXAMPLESDIR%%/admin/config.php.example
>+%%EXAMPLESDIR%%/admin/config.default.php
>+%%EXAMPLESDIR%%/admin/config.example.php
> %%EXAMPLESDIR%%/admin/edit.php
> %%EXAMPLESDIR%%/admin/edit.tpl.php
> %%EXAMPLESDIR%%/admin/footer.tpl.php
>Index: files/patch-xcache.c
>===================================================================
>RCS file: files/patch-xcache.c
>diff -N files/patch-xcache.c
>--- files/patch-xcache.c	11 May 2012 09:26:08 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,48 +0,0 @@
>-Index: xcache.c
>-===================================================================
>---- xcache.c	(revision 899)
>-+++ xcache.c	(revision 900)
>-@@ -839,7 +839,7 @@
>- 				while (xc_stack_count(s)) {
>- 					entry_php = (xc_entry_php_t *) xc_stack_pop(s);
>- 					TRACE("unhold %d:%s", entry_php->file_inode, entry_php->entry.name.str.val);
>--					entry_php->refcount ++;
>-+					--entry_php->refcount;
>- 					assert(entry_php->refcount >= 0);
>- 				}
>- 			} LEAVE_LOCK(cache);
>-@@ -1939,11 +1939,16 @@
>- 
>- 		if (stored_php) {
>- 			compiler->new_entry.php = stored_php;
>--			xc_php_addref_unlocked(stored_php);
>- 			xc_entry_php_init(&compiler->new_entry, compiler->opened_path TSRMLS_CC);
>- 			stored_entry = xc_entry_php_store_unlocked(cache, compiler->entry_hash.entryslotid, &compiler->new_entry TSRMLS_CC);
>--			TRACE(" cached %d:%s, holding", compiler->new_entry.file_inode, stored_entry->entry.name.str.val);
>--			xc_entry_hold_php_unlocked(cache, stored_entry TSRMLS_CC);
>-+			if (stored_entry) {
>-+				xc_php_addref_unlocked(stored_php);
>-+				TRACE(" cached %d:%s, holding", compiler->new_entry.file_inode, stored_entry->entry.name.str.val);
>-+				xc_entry_hold_php_unlocked(cache, stored_entry TSRMLS_CC);
>-+			}
>-+			else {
>-+				gaveup = 1;
>-+			}
>- 			break;
>- 		}
>- 
>-@@ -2021,10 +2026,11 @@
>- 		}
>- 		/* entry_store */
>- 		compiler->new_entry.php = stored_php;
>--		xc_php_addref_unlocked(stored_php);
>- 		stored_entry = xc_entry_php_store_unlocked(cache, compiler->entry_hash.entryslotid, &compiler->new_entry TSRMLS_CC);
>--		if (!stored_entry) {
>--			xc_php_release_unlocked(cache, stored_php);
>-+		if (stored_entry) {
>-+			xc_php_addref_unlocked(stored_php);
>-+			TRACE(" cached %d:%s, holding", compiler->new_entry.file_inode, stored_entry->entry.name.str.val);
>-+			xc_entry_hold_php_unlocked(cache, stored_entry TSRMLS_CC);
>- 		}
>- 	} LEAVE_LOCK_EX(cache);
>- 	/* }}} */
>Index: files/patch-xcache.ini
>===================================================================
>RCS file: /home/pcvs/ports/www/xcache/files/patch-xcache.ini,v
>retrieving revision 1.7
>diff -u -r1.7 patch-xcache.ini
>--- files/patch-xcache.ini	2 May 2012 09:52:47 -0000	1.7
>+++ files/patch-xcache.ini	23 Jul 2012 19:58:57 -0000
>@@ -1,25 +1,19 @@
>---- xcache.ini.orig	2012-04-12 12:05:56.000000000 +0200
>-+++ xcache.ini	2012-04-12 12:07:57.000000000 +0200
>-@@ -1,17 +1,13 @@
>+--- xcache.ini.orig	2012-06-26 12:11:30.000000000 +0200
>++++ xcache.ini	2012-07-23 21:46:53.540225111 +0200
>+@@ -2,14 +2,8 @@
>  [xcache-common]
>--;; install as zend extension (recommended), normally "$extension_dir/xcache.so"
>+ ;; WARNING: zend_extension* = *xcache* MUST be the first(above) of all zend_extension*=*
>+ ;; using extension=xcache.so is not recommended
>+-
>+-;; non-windows example
>+-;; update xxx accordingly
> -zend_extension = /usr/local/lib/php/extensions/non-debug-non-zts-xxx/xcache.so
>--; zend_extension_ts = /usr/local/lib/php/extensions/non-debug-zts-xxx/xcache.so
>--;; For windows users, replace xcache.so with php_xcache.dll
>+-;; windows example:
> -zend_extension_ts = c:/php/extensions/php_xcache.dll
>--;; or install as extension, make sure your extension_dir setting is correct
>-+;; install as zend extension (recommended)
>+-;; for newer PHP, _ts is removed, use the following line instead
>+-zend_extension = c:/php/extensions/php_xcache.dll
> +zend_extension = %%LOCALBASE%%/lib/php/%%PHP_EXT_DIR%%/xcache.so
>-+zend_extension_ts = %%LOCALBASE%%/lib/php/%%PHP_EXT_DIR%%/xcache.so
>-+;; or install as extension
>- ; extension = xcache.so
>--;; or win32:
>--; extension = php_xcache.dll
>++;zend_extension_ts = %%LOCALBASE%%/lib/php/%%PHP_EXT_DIR%%/xcache.so
>  
>  [xcache.admin]
>  xcache.admin.enable_auth = On
>--xcache.admin.user = "mOo"
>-+xcache.admin.user = "admin"
>- ; xcache.admin.pass = md5($your_password)
>- xcache.admin.pass = ""
>-

Actions: View | Diff

Attachments on bug 170095: 126338