Date: Mon, 5 Apr 2010 12:44:28 -0300 (BRT) From: Patrick Tracanelli <eksffa@freebsdbrasil.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/145409: [MAINTAINER] www/thundercache: update to 4.0 rev 29032010 Message-ID: <201004051544.o35FiSjh093737@treinamento196.lab1.bh.freebsdbrasil.com.br> Resent-Message-ID: <201004051550.o35Fo7kX073028@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145409 >Category: ports >Synopsis: [MAINTAINER] www/thundercache: update to 4.0 rev 29032010 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 05 15:50:06 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Patrick Tracanelli >Release: FreeBSD 8.0-STABLE i386 >Organization: FreeBSD Brasil LTDA >Environment: System: FreeBSD treinamento196.lab1.bh.freebsdbrasil.com.br 8.0-STABLE FreeBSD 8.0-STABLE #1: Fri Mar 12 15:26:31 BRT 2010 >Description: - Update to 4.0 rev 29032010 - Rework ports dependencies - Rework port - Add depend features check for curl Added file(s): - files/test-deps.sh.in Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- thundercache-4.0_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/thundercache/Makefile /usr/ports/www/thundercache.n/Makefile --- /usr/ports/www/thundercache/Makefile 2010-03-18 18:42:30.000000000 -0300 +++ /usr/ports/www/thundercache.n/Makefile 2010-04-05 11:18:28.000000000 -0300 @@ -12,12 +12,15 @@ MASTER_SITES= http://www.bmsoftware.org/freebsd/ \ http://www6.freebsdbrasil.com.br/~eksffa/l/dev/thunder/ \ ${MASTER_SITE_LOCAL}/jmelo -DISTNAME= thunder32bits_17032010 +DISTNAME= thunder32bits_29032010 MAINTAINER= eksffa@freebsdbrasil.com.br COMMENT= High-performance and high-eficiency caching proxy system -OPTIONS= DEPENDACK "I have read and understood the depends needs" off +OPTIONS= DEPENDACK "I have read and understood the depends needs" on \ + APACHE "Install apache for reporting viewing" on \ + PHP "Install PHP for reporting generating" on \ + PGSQL "Install PostgreSQL (report data storing)" on USE_OPENSSL= yes USE_BZIP2= yes @@ -37,25 +40,35 @@ .endif .if ${ARCH} == "amd64" -DISTNAME= thunder64bits_17032010 +DISTNAME= thunder64bits_29032010 .endif WRKSRC= ${WRKDIR}/thunder -USE_PHP+= curl pcre bcmath pdo mcrypt mhash session pgsql +.if defined (WITH_APACHE) +USE_APACHE= 2.0+ +.endif + +.if defined (WITH_PGSQL) USE_PGSQL= yes WANT_PGSQL_VER= 84 -USE_APACHE= 2.0+ +RUN_DEPENDS+= postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server +.endif + +.if defined(WITH_PHP) +USE_PHP+= curl pcre bcmath pdo mcrypt mhash session pgsql +.endif LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl:install -RUN_DEPENDS+= sudo:${PORTSDIR}/security/sudo \ - postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server \ - ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql -SUB_FILES= pkg-message log.sh +.if defined(APACHE+PHP) && defined(WITH_PGSQL) +LIB_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pdo_pgsql.so:${PORTSDIR}/databases/php5-pdo_pgsql +.endif + +SUB_FILES= pkg-message log.sh test-deps.sh +SUB_LIST= "GREP=${GREP}" pre-everything:: -.if !defined(WITH_DEPENDACK) @${ECHO_MSG} "" @${ECHO_MSG} "ATTENTION:" @${ECHO_MSG} "" @@ -71,12 +84,27 @@ @${ECHO_MSG} " After you understood it correctly, select DEPENDACK on" @${ECHO_MSG} " the OPTIONS screen. Run ''make config'' to acknowledge" @${ECHO_MSG} "" +.if !defined(WITH_DEPENDACK) @${FALSE} .endif +pre-install: + @(${CHMOD} +x ${WRKDIR}/test-deps.sh ; \ + if ! ${WRKDIR}/test-deps.sh > /dev/null 2>&1 ; then \ + ${ECHO_MSG} "FATAL: " ; \ + ${ECHO_MSG} "Some depends are not built with required features." ; \ + ${ECHO_MSG} "You must always honor at least the following options" ; \ + ${ECHO_MSG} "depends as listed:" ; \ + ${ECHO_MSG} "" ; \ + ${ECHO_MSG} "ftp/curl LIBSSH2=yes OPENSSL=yes PROXY=yes" ; \ + ${ECHO_MSG} "" ; \ + ${FALSE} ; \ + fi) + do-install: @${CP} -r ${WRKSRC} ${PREFIX}/ ${INSTALL_SCRIPT} ${WRKDIR}/log.sh ${PREFIX}/thunder/sbin/ + @${MKDIR} -m 755 /var/run/thunder post-install: @${CAT} ${PKGMESSAGE} diff -ruN --exclude=CVS /usr/ports/www/thundercache/distinfo /usr/ports/www/thundercache.n/distinfo --- /usr/ports/www/thundercache/distinfo 2010-03-18 15:35:19.000000000 -0300 +++ /usr/ports/www/thundercache.n/distinfo 2010-03-30 01:01:56.000000000 -0300 @@ -1,6 +1,6 @@ -MD5 (thunder32bits_17032010.tar.bz2) = 83a1c3319f50b30e9c126efe446218f6 -SHA256 (thunder32bits_17032010.tar.bz2) = 49a310295360feba0fda20ef043d861a4769b30c57f2fe14c046ea4d40d3f7e0 -SIZE (thunder32bits_17032010.tar.bz2) = 2729811 -MD5 (thunder64bits_17032010.tar.bz2) = ef1af778432abe887033b503a2ba6bdc -SHA256 (thunder64bits_17032010.tar.bz2) = 4ab6b36159ac1b25855feb70a933a96fb750ea6a81306c026dceae0cc8081535 -SIZE (thunder64bits_17032010.tar.bz2) = 3870257 +MD5 (thunder32bits_29032010.tar.bz2) = 51a940e7255abcaa278619efb6bf67fa +SHA256 (thunder32bits_29032010.tar.bz2) = f3ede1ffe3d77c11f349f839c473368c73acee85c5e6db8e677f4d8aa177abf9 +SIZE (thunder32bits_29032010.tar.bz2) = 1396108 +MD5 (thunder64bits_29032010.tar.bz2) = 5ab1831934092519b820e3377884267a +SHA256 (thunder64bits_29032010.tar.bz2) = 9fd65a917e211c939be9d864a250583d5e20d9740ab2562d5eabc82f11f7ac3e +SIZE (thunder64bits_29032010.tar.bz2) = 1456262 diff -ruN --exclude=CVS /usr/ports/www/thundercache/files/log.sh.in /usr/ports/www/thundercache.n/files/log.sh.in --- /usr/ports/www/thundercache/files/log.sh.in 2010-03-18 15:35:20.000000000 -0300 +++ /usr/ports/www/thundercache.n/files/log.sh.in 2010-03-30 01:01:56.000000000 -0300 @@ -23,5 +23,5 @@ :> ${LOG}/access.log -$PHP $THUNDERLOG $HOST $DB $USER $PASS $LOGTEMP/access.log >>$ {SCRIPTLOG} 2>&1 && rm -f $LOGTEMP/access.log +$PHP $THUNDERLOG $HOST $DB $USER $PASS $LOGTEMP/access.log >>${SCRIPTLOG} 2>&1 && rm -f $LOGTEMP/access.log diff -ruN --exclude=CVS /usr/ports/www/thundercache/files/pkg-message.in /usr/ports/www/thundercache.n/files/pkg-message.in --- /usr/ports/www/thundercache/files/pkg-message.in 2010-03-18 15:35:20.000000000 -0300 +++ /usr/ports/www/thundercache.n/files/pkg-message.in 2010-03-30 01:01:56.000000000 -0300 @@ -35,5 +35,10 @@ @hourly root %%PREFIX%%/thunder/sbin/log.sh -Configure %%PREFIX%%/thunder/etc/thunder.conf accordingly. +Configure %%PREFIX%%/thunder/etc/thunder.conf accordingly and finally, add +the following line to rc.conf: + + thundercache_enable="YES" + +And start it from %%PREFIX%%/etc/rc.d/thundercache diff -ruN --exclude=CVS /usr/ports/www/thundercache/files/test-deps.sh.in /usr/ports/www/thundercache.n/files/test-deps.sh.in --- /usr/ports/www/thundercache/files/test-deps.sh.in 1969-12-31 21:00:00.000000000 -0300 +++ /usr/ports/www/thundercache.n/files/test-deps.sh.in 2010-04-05 11:19:52.000000000 -0300 @@ -0,0 +1,16 @@ +#!/bin/sh + if ! ldd %%PREFIX%%/bin/curl | %%GREP%% "libssh" >/dev/null 2>&1 ; then + BARRIER=1 + fi + if ! ldd %%PREFIX%%/bin/curl | %%GREP%% "libssl" >/dev/null 2>&1 ; then + BARRIER=1 + fi + if ! %%PREFIX%%/bin/curl -h | %%GREP%% "proxy <host" >/dev/null 2>&1 ; then + BARRIER=1 + fi + + if [ "${BARRIER}" = 1 ] ; then + false + else + true + fi diff -ruN --exclude=CVS /usr/ports/www/thundercache/pkg-plist /usr/ports/www/thundercache.n/pkg-plist --- /usr/ports/www/thundercache/pkg-plist 2010-03-18 15:35:19.000000000 -0300 +++ /usr/ports/www/thundercache.n/pkg-plist 2010-03-30 01:02:09.000000000 -0300 @@ -1,65 +1,69 @@ +thunder/etc/thunder_postgre.sql thunder/etc/thunder.conf thunder/etc/log.sh thunder/etc/thunder.php -thunder/etc/thunder_postgre.sql thunder/logs/error.log thunder/logs/access.log -thunder/plugins/4shared.com.so -thunder/plugins/avast.com.so +thunder/plugins/youtube.com.so +thunder/plugins/xvideos.com.so +thunder/plugins/vimeo.com.so +thunder/plugins/rapidshare.com.so +thunder/plugins/grisoft.com.so thunder/plugins/avg.com.so +thunder/plugins/dailymotion.com.so +thunder/plugins/viddler.com.so +thunder/plugins/globo.com.so +thunder/plugins/windowsupdate.com.so +thunder/plugins/terra.com.so +thunder/plugins/ziddu.com.so +thunder/plugins/photobucket.com.so +thunder/plugins/video.msn.com.so thunder/plugins/avgate.com.so +thunder/plugins/etrustdownloads.ca.com.so +thunder/plugins/update.nai.com.so +thunder/plugins/metacafe.com.so thunder/plugins/avgate.net.so +thunder/plugins/kaspersky-labs.com.so +thunder/plugins/pornhub.com.so +thunder/plugins/nai.com.so +thunder/plugins/mediafire.com.so thunder/plugins/bitgravity.com.so -thunder/plugins/dailymotion.com.so +thunder/plugins/grandchase.com.br.so thunder/plugins/doubleclick.net.so -thunder/plugins/edgecastcdn.net.so -thunder/plugins/eset.com.so -thunder/plugins/etrustdownloads.ca.com.so +thunder/plugins/pop6.com.so thunder/plugins/freeav.com.so +thunder/plugins/googlevideo.com.so +thunder/plugins/edgecastcdn.net.so thunder/plugins/freeav.net.so -thunder/plugins/globo.com.so +thunder/plugins/tube8.com.so +thunder/plugins/microsoft.com.so thunder/plugins/sambatech.com.br.so -thunder/plugins/googlevideo.com.so -thunder/plugins/grandchase.com.br.so -thunder/plugins/grisoft.com.so -thunder/plugins/nai.com.so thunder/plugins/grisoft.cz.so -thunder/plugins/kaspersky-labs.com.so -thunder/plugins/kaspersky.com.so -thunder/plugins/mccont.com.so -thunder/plugins/mediafire.com.so -thunder/plugins/megaupload.com.so +thunder/plugins/symantecliveupdate.com.so +thunder/plugins/rad.msn.com.so thunder/plugins/megavideo.com.so -thunder/plugins/metacafe.com.so -thunder/plugins/microsoft.com.so -thunder/plugins/orkut.com.br.so +thunder/plugins/kaspersky.com.so thunder/plugins/orkut.com.so -thunder/plugins/photobucket.com.so -thunder/plugins/pop6.com.so -thunder/plugins/pornhub.com.so -thunder/plugins/pornotube.com.so -thunder/plugins/rad.msn.com.so -thunder/plugins/rapidshare.com.so -thunder/plugins/redtube.com.so -thunder/plugins/symantecliveupdate.com.so -thunder/plugins/terra.com.so -thunder/plugins/tube8.com.so thunder/plugins/uol.com.br.so -thunder/plugins/update.nai.com.so -thunder/plugins/viddler.com.so -thunder/plugins/video.msn.com.so -thunder/plugins/vimeo.com.so -thunder/plugins/windowsupdate.com.so +thunder/plugins/avast.com.so +thunder/plugins/eset.com.so thunder/plugins/xtube.com.so -thunder/plugins/xvideos.com.so -thunder/plugins/youtube.com.so -thunder/plugins/ziddu.com.so -thunder/sbin/thunder +thunder/plugins/redtube.com.so +thunder/plugins/4shared.com.so +thunder/plugins/pornotube.com.so +thunder/plugins/orkut.com.br.so +thunder/plugins/megaupload.com.so +thunder/plugins/mccont.com.so thunder/sbin/thunderlog.php +thunder/sbin/diskinfo +thunder/sbin/thunder thunder/sbin/log.sh @dirrm thunder/etc @dirrm thunder/logs/tmp @dirrm thunder/logs @dirrm thunder/plugins @dirrm thunder/sbin +@dirrm thunder/cache @dirrm thunder +@unexec /bin/rm /var/run/thunder/thunder.pid 2>/dev/null || true +@unexec /bin/rmdir /var/run/thunder 2>/dev/null || true --- thundercache-4.0_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004051544.o35FiSjh093737>