Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Apr 2010 20:25:37 GMT
From:      Spil <spil.oss@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/145619: [www/eaccelerator] patch for php 5.3.2
Message-ID:  <201004102025.o3AKPbMu031254@www.freebsd.org>
Resent-Message-ID: <201004102030.o3AKU2ET059891@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         145619
>Category:       ports
>Synopsis:       [www/eaccelerator] patch for php 5.3.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 10 20:30:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Spil
>Release:        FreeBSD 8.0-p2
>Organization:
>Environment:
FreeBSD www.example.org 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #1: Thu Jan 14 16:35:41 UTC 2010     root@:/usr/obj/usr/src/sys/SERVER80  i386
 
>Description:
eaccelerator has a new version for PHP 5.3.2.
>How-To-Repeat:
Install php 5.3.2 and use eaccelerator
>Fix:
See attached patch

Patch attached with submission follows:

diff -ruN eaccelerator-0.9.5.3/Makefile eaccelerator/Makefile
--- eaccelerator-0.9.5.3/Makefile	2008-06-18 14:26:58.000000000 +0200
+++ eaccelerator/Makefile	2010-04-10 19:48:08.000000000 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eaccelerator
-PORTVERSION=	0.9.5.3
+PORTVERSION=	0.9.6
 CATEGORIES=	www
 MASTER_SITES=	http://bart.eaccelerator.net/source/${PORTVERSION}/
 
@@ -17,12 +17,6 @@
 USE_PHPIZE=	yes
 USE_PHP_BUILD=	yes
 
-CONFIGURE_ARGS=	--enable-eaccelerator=shared \
-		--with-eaccelerator-shared-memory \
-		--with-eaccelerator-sessions \
-		--with-eaccelerator-content-caching \
-		--with-eaccelerator-userid=80
-
 USE_BZIP2=	yes
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -31,24 +25,10 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${PHP_VER} == 5
-CONFIGURE_ARGS+=	--without-eaccelerator-encoder
-PLIST_SUB+=		ENCODER="@comment "
-.else
-PLIST_SUB+=		ENCODER=""
-
-post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g; s|0777|0755|g" \
-		${WRKSRC}/encoder.php > ${WRKSRC}/encoder
-.endif
-
 do-install:
 	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \
 	       ${PREFIX}/lib/php/${PHP_EXT_DIR}
-.if ${PHP_VER} == 4
-	${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
-.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -ruN eaccelerator-0.9.5.3/distinfo eaccelerator/distinfo
--- eaccelerator-0.9.5.3/distinfo	2008-06-18 14:26:58.000000000 +0200
+++ eaccelerator/distinfo	2010-04-10 19:42:25.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (eaccelerator-0.9.5.3.tar.bz2) = caf797223739516882f870342f74b935
-SHA256 (eaccelerator-0.9.5.3.tar.bz2) = aa4f0e7817e0193d698db71cc858f45461c2820266941ae2034eb1b82c379e45
-SIZE (eaccelerator-0.9.5.3.tar.bz2) = 555631
+MD5 (eaccelerator-0.9.6.tar.bz2) = 85fa6150265a81f0cea852bc973382b9
+SHA256 (eaccelerator-0.9.6.tar.bz2) = ab1f309078d04ede3297b96f6c2689104e349e11e61376866f59c983ddde9a56
+SIZE (eaccelerator-0.9.6.tar.bz2) = 105833
diff -ruN eaccelerator-0.9.5.3/files/patch-encoder.php eaccelerator/files/patch-encoder.php
--- eaccelerator-0.9.5.3/files/patch-encoder.php	2006-02-02 10:06:14.000000000 +0100
+++ eaccelerator/files/patch-encoder.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
---- encoder.php.orig	Fri May  6 10:26:43 2005
-+++ encoder.php	Thu Feb  2 09:39:47 2006
-@@ -1,10 +1,12 @@
-+#!%%LOCALBASE%%/bin/php -f
-+
- <?php
- $web_error = "";
- 
- function eaccelerator_encoder_usage() {
--  echo "Usage:\tphp -q encoder.php [options] source_file_name\n";
--  echo       "\tphp -q encoder.php [options] source_file_name...\n";
--  echo       "\tphp -q encoder.php [options] source_directory_name...\n\n";
-+  echo "Usage:\tencoder [options] source_file_name\n";
-+  echo       "\tencoder [options] source_file_name...\n";
-+  echo       "\tencoder [options] source_directory_name...\n\n";
-   echo "Options:\n";
-   echo "\t-s suffix\n\t\tencode files only with following suffix (default is \"php\")\n";
-   echo "\t-a\n\t\tencode all files (no by default)\n";
-@@ -17,10 +19,10 @@
-   echo               "\t\tfile name. If you encode directory or several files at once\n";
-   echo               "\t\tthen 'target' specifyes an output directory name.\n";
-   echo "\nExamples:\n";
--  echo "\tphp -q encoder.php some_file.php\n";
--  echo "\tphp -q encoder.php some_file.php -o some_encoded_file.php\n";
--  echo "\tphp -q encoder.php *.php -o some_dir\n";
--  echo "\tphp -q encoder.php ~/public_html/x -rcf -sphp -sinc -o ~/public_html/y\n";
-+  echo "\tencoder some_file.php\n";
-+  echo "\tencoder some_file.php -o some_encoded_file.php\n";
-+  echo "\tencoder *.php -o some_dir\n";
-+  echo "\tencoder ~/public_html/x -rcf -sphp -sinc -o ~/public_html/y\n";
-   echo "\n";
-   exit();
- }
diff -ruN eaccelerator-0.9.5.3/pkg-plist eaccelerator/pkg-plist
--- eaccelerator-0.9.5.3/pkg-plist	2006-04-12 18:41:08.000000000 +0200
+++ eaccelerator/pkg-plist	2010-04-10 19:47:36.000000000 +0200
@@ -1,4 +1,3 @@
-%%ENCODER%%bin/encoder
 lib/php/%%PHP_EXT_DIR%%/eaccelerator.so
 @dirrmtry lib/php/%%PHP_EXT_DIR%%
 %%EXAMPLESDIR%%/control.php


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004102025.o3AKPbMu031254>