Index: head/www/privoxy/Makefile =================================================================== --- head/www/privoxy/Makefile (revision 421154) +++ head/www/privoxy/Makefile (revision 421155) @@ -1,107 +1,111 @@ # Created by: John von Essen # $FreeBSD$ PORTNAME= privoxy -PORTVERSION= 3.0.24 +PORTVERSION= 3.0.26 CATEGORIES= www ipv6 -MASTER_SITES= SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29 +MASTER_SITES= https://www.privoxy.org/sf-download-mirror/Sources/${PORTVERSION}%20(stable)/ \ + SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29 DISTNAME= privoxy-${PORTVERSION}-stable-src MAINTAINER= fk@fabiankeil.de COMMENT= Privoxy is a web proxy with advanced filtering capabilities LIB_DEPENDS= libpcre.so:devel/pcre WRKSRC= ${WRKDIR}/privoxy-${PORTVERSION}-stable USES= autoreconf cpe gmake shebangfix GNU_CONFIGURE= yes SHEBANG_FILES= tools/privoxy-log-parser.pl tools/privoxy-regression-test.pl tools/uagen.pl USE_RC_SUBR= privoxy SUB_FILES= pkg-message MAKEFILE= GNUmakefile # privoxy-devel is the development release available at the Privoxy website. # It's not (yet) part of the FreeBSD ports collection. CONFLICTS= privoxy-devel-[0-9]* USERS= privoxy GROUPS= privoxy CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= ACCEPT_FILTER BROKEN_STRPTIME COMPRESSION DEBUG \ - DOCS EDITOR FORCE PRIVOXY_TOOLS TOGGLE +OPTIONS_DEFINE= ACCEPT_FILTER BROKEN_STRPTIME BUMP_FD_SETSIZE COMPRESSION \ + DEBUG DOCS EDITOR FORCE PRIVOXY_TOOLS TOGGLE ACCEPT_FILTER_DESC= Support for accf_http(9) BROKEN_STRPTIME_DESC= Enable workaround for standards/173421 COMPRESSION_DESC= Support compression of buffered content DOCS_DESC= Let Privoxy serve the user manual EDITOR_DESC= Support use of the web-based action editor +BUMP_FD_SETSIZE_DESC= Support more client connections at the same time FORCE_DESC= Support bypassing of blocks PRIVOXY_TOOLS_DESC= Install Privoxy-Log-Parser, uagen, etc. TOGGLE_DESC= Support for remote toggling OPTIONS_DEFAULT= EDITOR FORCE TOGGLE PRIVOXY_TOOLS OPTIONS_SUB= yes ACCEPT_FILTER_CONFIGURE_ON= --enable-accept-filter BROKEN_STRPTIME_CONFIGURE_ON= --enable-strptime-sanity-checks + +BUMP_FD_SETSIZE_CONFIGURE_ON= --with-fdsetsize=8192 COMPRESSION_CONFIGURE_ON= --enable-compression DEBUG_CONFIGURE_ON= --with-debug EDITOR_CONFIGURE_OFF= --disable-editor FORCE_CONFIGURE_OFF= --disable-force TOGGLE_CONFIGURE_OFF= --disable-toggle PRIVOXY_TOOLS_USES= perl5 PRIVOXY_TOOLS_USE= PERL5=run PRIVOXY_TOOLS_RUN_DEPENDS= curl:ftp/curl post-patch: ${REINPLACE_CMD} \ -e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \ -e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \ -e 's,^\(actionsfile user\),#\1,' \ -e 's,^\(filterfile user\),#\1,' \ ${WRKSRC}/config ${REINPLACE_CMD} \ -e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl post-patch-DOCS-on: ${REINPLACE_CMD} \ -e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \ ${WRKSRC}/config pre-configure: @(cd ${WRKSRC}; ${AUTOHEADER}) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/privoxy/templates ${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${STAGEDIR}${PREFIX}/etc/privoxy/templates .for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl ${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${STAGEDIR}${PREFIX}/bin .endfor .for defaultfile in default.action default.filter regression-tests.action ${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${STAGEDIR}${PREFIX}/etc/privoxy .endfor @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for examplefile in config match-all.action trust user.action ${INSTALL_DATA} ${WRKSRC}/${examplefile} ${STAGEDIR}${EXAMPLESDIR}/ .endfor ${INSTALL_MAN} ${WRKSRC}/privoxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR}/user-manual ${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${STAGEDIR}${DOCSDIR}/user-manual ${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${STAGEDIR}${DOCSDIR}/user-manual .include Index: head/www/privoxy/distinfo =================================================================== --- head/www/privoxy/distinfo (revision 421154) +++ head/www/privoxy/distinfo (revision 421155) @@ -1,2 +1,3 @@ -SHA256 (privoxy-3.0.24-stable-src.tar.gz) = a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012 -SIZE (privoxy-3.0.24-stable-src.tar.gz) = 1728265 +TIMESTAMP = 1472287144 +SHA256 (privoxy-3.0.26-stable-src.tar.gz) = 57e415b43ee5dfdca74685cc034053eaae962952fdabd086171551a86abf9cd8 +SIZE (privoxy-3.0.26-stable-src.tar.gz) = 1741772 Index: head/www/privoxy/files/privoxy.in =================================================================== --- head/www/privoxy/files/privoxy.in (revision 421154) +++ head/www/privoxy/files/privoxy.in (revision 421155) @@ -1,67 +1,67 @@ #!/bin/sh # # $FreeBSD$ # # # PROVIDE: privoxy # REQUIRE: DAEMON # BEFORE: LOGIN # # This rc script understands the following variables # which are read from /etc/rc.conf: # # privoxy_enable (bool): Set to "NO" by default. # Set it to "YES" to enable Privoxy. # privoxy_config (str): Privoxy's configuration file. Default is: # %%PREFIX%%/etc/privoxy/config. # privoxy_flags (str): List of additional Privoxy options you want # to use. None set by default. # privoxy_pidfile (str): Default is /var/run/privoxy/privoxy.pid. # privoxy_user (str): Privoxy Daemon user. Default is privoxy. # # Usage: # %%PREFIX%%/etc/rc.d/privoxy [fast|force|one](start|stop|restart|rcvar|status|poll) . /etc/rc.subr name="privoxy" rcvar=privoxy_enable load_rc_config ${name} : ${privoxy_enable="NO"} : ${privoxy_config="%%PREFIX%%/etc/privoxy/config"} : ${privoxy_logdir="/var/log/privoxy"} : ${privoxy_user="privoxy"} : ${privoxy_piddir="/var/run/privoxy"} : ${privoxy_pidfile="${privoxy_piddir}/privoxy.pid"} privoxy_prestart () { - if [ ! -e ${privoxy_config} ]; then - echo config file not found. Copying the example file to ${privoxy_config}. - cp %%PREFIX%%/share/examples/privoxy/config ${privoxy_config} - chown ${privoxy_user}:${privoxy_user} ${privoxy_config}; + if [ ! -e "${privoxy_config}" ]; then + echo "config file not found. Copying the example file to ${privoxy_config}." + cp %%PREFIX%%/share/examples/privoxy/config "${privoxy_config}" + chown "${privoxy_user}:${privoxy_user}" "${privoxy_config}"; fi actionfile="%%PREFIX%%/etc/privoxy/match-all.action" - if [ ! -e ${actionfile} ]; then - echo ${actionfile} not found. Copying the example file. - cp %%PREFIX%%/share/examples/privoxy/match-all.action ${actionfile} - chown ${privoxy_user}:${privoxy_user} ${actionfile} + if [ ! -e "${actionfile}" ]; then + echo "${actionfile} not found. Copying the example file." + cp %%PREFIX%%/share/examples/privoxy/match-all.action "${actionfile}" + chown "${privoxy_user}:${privoxy_user}" "${actionfile}" fi - if [ ! -e ${privoxy_logdir} ]; then - echo ${privoxy_logdir} not found. Creating ... - mkdir ${privoxy_logdir} - chown ${privoxy_user}:${privoxy_user} ${privoxy_logdir} - chmod 0750 ${privoxy_logdir} + if [ ! -e "${privoxy_logdir}" ]; then + echo "${privoxy_logdir} not found. Creating ..." + mkdir "${privoxy_logdir}" + chown "${privoxy_user}:${privoxy_user}" "${privoxy_logdir}" + chmod 0750 "${privoxy_logdir}" fi - if [ ! -d ${privoxy_piddir} ]; then - mkdir -p ${privoxy_piddir} - chown ${privoxy_user}:${privoxy_user} ${privoxy_piddir} + if [ ! -d "${privoxy_piddir}" ]; then + mkdir -p "${privoxy_piddir}" + chown "${privoxy_user}:${privoxy_user}" "${privoxy_piddir}" fi } start_precmd="privoxy_prestart" command="%%PREFIX%%/sbin/privoxy" command_args="${privoxy_flags} --pidfile ${privoxy_pidfile} ${privoxy_config}" run_rc_command "$1" Index: head/www/privoxy/pkg-plist =================================================================== --- head/www/privoxy/pkg-plist (revision 421154) +++ head/www/privoxy/pkg-plist (revision 421155) @@ -1,68 +1,69 @@ %%PRIVOXY_TOOLS%%bin/privoxy-log-parser.pl %%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl %%PRIVOXY_TOOLS%%bin/uagen.pl sbin/privoxy man/man1/privoxy.1.gz etc/privoxy/default.action etc/privoxy/default.filter etc/privoxy/regression-tests.action etc/privoxy/templates/blocked etc/privoxy/templates/cgi-error-404 etc/privoxy/templates/cgi-error-bad-param etc/privoxy/templates/cgi-error-disabled etc/privoxy/templates/cgi-error-file etc/privoxy/templates/cgi-error-file-read-only etc/privoxy/templates/cgi-error-modified etc/privoxy/templates/cgi-error-parse etc/privoxy/templates/cgi-style.css +etc/privoxy/templates/client-tags etc/privoxy/templates/connect-failed etc/privoxy/templates/connection-timeout etc/privoxy/templates/default etc/privoxy/templates/edit-actions-add-url-form etc/privoxy/templates/edit-actions-for-url etc/privoxy/templates/edit-actions-for-url-filter etc/privoxy/templates/edit-actions-list etc/privoxy/templates/edit-actions-list-button etc/privoxy/templates/edit-actions-list-section etc/privoxy/templates/edit-actions-list-url etc/privoxy/templates/edit-actions-remove-url-form etc/privoxy/templates/edit-actions-url-form etc/privoxy/templates/forwarding-failed etc/privoxy/templates/mod-local-help etc/privoxy/templates/mod-support-and-service etc/privoxy/templates/mod-title etc/privoxy/templates/mod-unstable-warning etc/privoxy/templates/no-server-data etc/privoxy/templates/no-such-domain etc/privoxy/templates/show-request etc/privoxy/templates/show-status etc/privoxy/templates/show-status-file etc/privoxy/templates/show-url-info etc/privoxy/templates/show-version etc/privoxy/templates/toggle etc/privoxy/templates/toggle-mini etc/privoxy/templates/untrusted etc/privoxy/templates/url-info-osd.xml %%PORTDOCS%%%%DOCSDIR%%/user-manual/actions-file.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/appendix.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/config.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/configuration.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/contact.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/copyright.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/files-in-use.jpg %%PORTDOCS%%%%DOCSDIR%%/user-manual/filter-file.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/index.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/installation.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/introduction.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/p_doc.css %%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy2.jpg %%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy_setup.jpg %%PORTDOCS%%%%DOCSDIR%%/user-manual/quickstart.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/seealso.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/startup.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/templates.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html %%EXAMPLESDIR%%/config %%EXAMPLESDIR%%/match-all.action %%EXAMPLESDIR%%/trust %%EXAMPLESDIR%%/user.action