[Midnightbsd-cvs] mports [20661] trunk/www: upgrade varnish

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Nov 6 19:32:29 EST 2015


Revision: 20661
          http://svnweb.midnightbsd.org/mports/?rev=20661
Author:   laffer1
Date:     2015-11-06 19:32:29 -0500 (Fri, 06 Nov 2015)
Log Message:
-----------
upgrade varnish

Modified Paths:
--------------
    trunk/www/Makefile

Added Paths:
-----------
    trunk/www/varnish4/
    trunk/www/varnish4/Makefile
    trunk/www/varnish4/distinfo
    trunk/www/varnish4/files/
    trunk/www/varnish4/files/no-inet6.patch
    trunk/www/varnish4/files/pkg-message.in
    trunk/www/varnish4/files/varnishd.in
    trunk/www/varnish4/files/varnishlog.in
    trunk/www/varnish4/files/varnishncsa.in
    trunk/www/varnish4/pkg-descr
    trunk/www/varnish4/pkg-plist

Removed Paths:
-------------
    trunk/www/varnish/

Modified: trunk/www/Makefile
===================================================================
--- trunk/www/Makefile	2015-11-07 00:28:22 UTC (rev 20660)
+++ trunk/www/Makefile	2015-11-07 00:32:29 UTC (rev 20661)
@@ -115,7 +115,7 @@
 SUBDIR += tomcat7
 SUBDIR += transmission-web
 SUBDIR += validator
-SUBDIR += varnish
+SUBDIR += varnish4
 SUBDIR += w3m
 SUBDIR += webkit-gtk2
 SUBDIR += webkit-gtk3

Added: trunk/www/varnish4/Makefile
===================================================================
--- trunk/www/varnish4/Makefile	                        (rev 0)
+++ trunk/www/varnish4/Makefile	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,47 @@
+# $MidnightBSD$
+
+PORTNAME=	varnish
+PORTVERSION=	4.0.3
+CATEGORIES=	www
+MASTER_SITES=	http://repo.varnish-cache.org/source/
+PKGNAMESUFFIX=	4
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	High-performance HTTP accelerator
+
+LICENSE=	bsd2
+
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libedit.so.0:${PORTSDIR}/devel/libedit
+
+CONFLICTS=	varnish-2.* varnish-3.*
+
+USES=		autoreconf cpe gmake libtool pkgconfig python:2,build readline shebangfix
+SHEBANG_FILES=	lib/libvcc/vmodtool.py
+python_OLD_CMD=	/usr/bin/env python
+CPE_VENDOR=	varnish-cache
+CFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
+CONFIGURE_ENV=	RST2MAN=true
+USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+
+USE_RC_SUBR=	varnishd varnishlog varnishncsa
+SUB_FILES=	pkg-message
+.if defined(NO_INET6) || defined(WITHOUT_INET6)
+BAD_TESTS+=	r00832
+EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.am
+.if defined(BAD_TESTS)
+	${RM} -f ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
+.endif
+
+regression-test check test: build
+	${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check
+
+.include <bsd.port.mk>


Property changes on: trunk/www/varnish4/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/distinfo
===================================================================
--- trunk/www/varnish4/distinfo	                        (rev 0)
+++ trunk/www/varnish4/distinfo	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,2 @@
+SHA256 (varnish-4.0.3.tar.gz) = 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206
+SIZE (varnish-4.0.3.tar.gz) = 1866760


Property changes on: trunk/www/varnish4/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/files/no-inet6.patch
===================================================================
--- trunk/www/varnish4/files/no-inet6.patch	                        (rev 0)
+++ trunk/www/varnish4/files/no-inet6.patch	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,8 @@
+--- bin/varnishtest/tests/c00005.vtc	2012-08-20 05:20:39.000000000 -0400
++++ bin/varnishtest/tests/c00005.vtc	2012-09-26 12:09:59.000000000 -0400
+@@ -32,5 +32,4 @@
+ 		! "localhost";
+ 		"0.0.0.0" / 0;
+-		"::" / 0;
+ 	}
+ 


Property changes on: trunk/www/varnish4/files/no-inet6.patch
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/files/pkg-message.in
===================================================================
--- trunk/www/varnish4/files/pkg-message.in	                        (rev 0)
+++ trunk/www/varnish4/files/pkg-message.in	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,12 @@
+QUICK-START GUIDE
+
+It's two in the morning and someone posted a link to your website on
+slashdot.  Don't panic, it takes only a minute to set up Varnish in
+front of your web server:
+
+1) Install Varnish
+2) Reconfigure your web server to listen on localhost:8080
+3) echo 'varnishd_enable="YES"' >>/etc/rc.conf
+4) %%PREFIX%%/etc/rc.d/varnishd start
+
+Refer to the documentation for more advanced configuration.


Property changes on: trunk/www/varnish4/files/pkg-message.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/files/varnishd.in
===================================================================
--- trunk/www/varnish4/files/varnishd.in	                        (rev 0)
+++ trunk/www/varnish4/files/varnishd.in	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,84 @@
+#!/bin/sh
+#
+# $FreeBSD: head/www/varnish4/files/varnishd.in 387610 2015-05-27 14:34:42Z feld $
+#
+
+# PROVIDE: varnishd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable varnishd:
+#
+# varnishd_enable="YES"
+#
+# Configuration variables and their default values:
+#
+# varnishd_pidfile - full path to the PID file.
+#	default: "/var/run/varnishd.pid"
+#
+# varnishd_listen - address and port at which varnishd will listen for
+#	client requests.
+#	default: ":80"
+#
+# varnishd_admin - address and port at which varnishd will listen for
+#	administrative commands.
+#	default: "localhost:81"
+#
+# varnishd_backend - address of the backend server.
+#	default: "localhost:8080"
+#
+# varnishd_config - name of the varnishd config file.
+#	default: unset.
+#
+# varnishd_hash - hash algorithm
+#       default: "classic,16383"
+#
+# varnishd_storage - storage method and parameters.
+#	default: "file,/tmp,100M"
+#
+# varnishd_user - unprivileged user for the child process.
+#	default: "www"
+#
+# varnishd_group - unprivileged group for the child process.
+#	default: "www"
+#
+# varnishd_flags - complete command line arguments.
+#	default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
+#	default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
+#
+# See varnishd(1) for a detailed overview of command-line options.
+#
+
+. /etc/rc.subr
+
+name=varnishd
+rcvar=varnishd_enable
+
+load_rc_config ${name}
+
+: ${varnishd_enable:=NO}
+: ${varnishd_pidfile=/var/run/${name}.pid}
+: ${varnishd_listen=:80}
+: ${varnishd_admin=localhost:81}
+: ${varnishd_backend=localhost:8080}
+: ${varnishd_storage=file,/tmp,100M}
+: ${varnishd_hash=classic,16383}
+: ${varnishd_user=www}
+: ${varnishd_group=www}
+
+command="%%PREFIX%%/sbin/${name}"
+pidfile="${varnishd_pidfile}"
+
+if [ -n "${varnishd_config}" ] ; then
+	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
+else
+	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
+fi
+
+# If we leave these set, rc.subr will su to them before starting
+# varnishd, which is not what we want.
+unset varnishd_user
+unset varnishd_group
+
+run_rc_command "$1"


Property changes on: trunk/www/varnish4/files/varnishd.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/files/varnishlog.in
===================================================================
--- trunk/www/varnish4/files/varnishlog.in	                        (rev 0)
+++ trunk/www/varnish4/files/varnishlog.in	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# $FreeBSD: head/www/varnish4/files/varnishlog.in 392997 2015-07-27 17:53:18Z feld $
+#
+
+# PROVIDE: varnishlog
+# REQUIRE: DAEMON varnishd
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable varnishlog:
+#
+# varnishlog_enable="YES"
+#
+# Configuration variables and their default values:
+#
+# varnishlog_pidfile - full path to the PID file.
+#	default: "/var/run/varnishlog.pid"
+#
+# varnishlog_file - full path to the log file.
+#	default: "/var/log/varnish.log"
+#
+# varnishlog_flags - command line arguments.
+#	default: "-D -P ${varnishlog_pidfile} -a -w ${varnishlog_file}"
+#
+# Add the following line to /etc/newsyslog.conf to rotate the log file
+# once a day:
+#
+# /var/log/varnish.log 640 7 * @T00 JB /var/run/varnishlog.pid
+#
+# See varnishlog(1) for a detailed overview of command-line options.
+#
+
+. /etc/rc.subr
+
+name=varnishlog
+rcvar=varnishlog_enable
+
+load_rc_config ${name}
+: ${varnishlog_enable:=NO}
+: ${varnishlog_pidfile=/var/run/${name}.pid}
+: ${varnishlog_file=/var/log/varnish.log}
+: ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
+
+command="%%PREFIX%%/bin/${name}"
+pidfile=${varnishlog_pidfile}
+start_precmd=precmd
+
+precmd()
+{
+	waitcount=0
+	vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
+	
+        # wait no longer than 5s for  _.vsm file to arrive from varnishd
+	while :
+	do
+		if [ -f ${vsm} ] ; then
+			break
+		else
+			case "${waitcount}" in
+				5)	echo "${name}: Failed to start. Missing ${vsm} ?"
+					break
+					;;
+				*)	echo "${name}: waiting for ${vsm}"
+					waitcount=$((waitcount+1))
+					sleep 1
+					;;
+			esac
+		fi
+	done
+}
+
+run_rc_command "$1"


Property changes on: trunk/www/varnish4/files/varnishlog.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/files/varnishncsa.in
===================================================================
--- trunk/www/varnish4/files/varnishncsa.in	                        (rev 0)
+++ trunk/www/varnish4/files/varnishncsa.in	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,78 @@
+#!/bin/sh
+#
+# $FreeBSD: head/www/varnish4/files/varnishncsa.in 392997 2015-07-27 17:53:18Z feld $
+#
+
+# PROVIDE: varnishncsa
+# REQUIRE: DAEMON varnishd
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable varnishncsa:
+#
+# varnishncsa_enable="YES"
+#
+# Configuration variables and their default values:
+#
+# varnishncsa_pidfile - full path to the PID file.
+#	default: "/var/run/varnishncsa.pid"
+#
+# varnishncsa_file - full path to the log file.
+#	default: "/var/log/varnishncsa.log"
+#
+# varnishncsa_flags - command line arguments.
+#	default: "-D -P ${varnishncsa_pidfile} -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
+#
+# varnishncsa_logformat - log file format.
+#       default: "" (uses varnishncsa's default format)
+#       example: "%h %l %u %t %r %s %b %{Referer}i %{User-agent}i"
+#
+# Add the following line to /etc/newsyslog.conf to rotate the log file
+# once a day:
+#
+# /var/log/varnishncsa.log 640 7 * @T00 JB /var/run/varnishncsa.pid
+#
+# See varnishncsa(1) for a detailed overview of command-line options.
+#
+
+. /etc/rc.subr
+
+name=varnishncsa
+rcvar=varnishncsa_enable
+
+load_rc_config ${name}
+
+: ${varnishncsa_enable:=NO}
+: ${varnishncsa_pidfile=/var/run/${name}.pid}
+: ${varnishncsa_file=/var/log/${name}.log}
+: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
+
+command="%%PREFIX%%/bin/${name}"
+pidfile=${varnishncsa_pidfile}
+start_precmd=precmd
+
+precmd()
+{
+	waitcount=0
+	vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
+	
+        # wait no longer than 5s for  _.vsm file to arrive from varnishd
+	while :
+	do
+		if [ -f ${vsm} ] ; then
+			break
+		else
+			case "${waitcount}" in
+				5)	echo "${name}: Failed to start. Missing ${vsm} ?"
+					break
+					;;
+				*)	echo "${name}: waiting for ${vsm}"
+					waitcount=$((waitcount+1))
+					sleep 1
+					;;
+			esac
+		fi
+	done
+}
+
+run_rc_command "$1"


Property changes on: trunk/www/varnish4/files/varnishncsa.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/pkg-descr
===================================================================
--- trunk/www/varnish4/pkg-descr	                        (rev 0)
+++ trunk/www/varnish4/pkg-descr	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,12 @@
+This is the Varnish high-performance HTTP accelerator.
+
+Documentation and additional information about Varnish is available on
+<URL:http://varnish.projects.linpro.no/>.
+
+Technical questions about Varnish and this release should be addressed
+to <varnish-dev at projects.linpro.no>.
+
+Questions about commercial support and services related to Varnish
+should be addressed to <varnish at linpro.no>.
+
+WWW: http://www.varnish-cache.org/


Property changes on: trunk/www/varnish4/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/varnish4/pkg-plist
===================================================================
--- trunk/www/varnish4/pkg-plist	                        (rev 0)
+++ trunk/www/varnish4/pkg-plist	2015-11-07 00:32:29 UTC (rev 20661)
@@ -0,0 +1,91 @@
+bin/varnishadm
+bin/varnishhist
+bin/varnishlog
+bin/varnishncsa
+bin/varnishstat
+bin/varnishtest
+bin/varnishtop
+include/varnish/cache/cache.h
+include/varnish/cache/cache_backend.h
+include/varnish/common/common.h
+include/varnish/common/params.h
+include/varnish/miniobj.h
+include/varnish/tbl/acct_fields_bereq.h
+include/varnish/tbl/acct_fields_req.h
+include/varnish/tbl/backend_poll.h
+include/varnish/tbl/ban_vars.h
+include/varnish/tbl/bo_flags.h
+include/varnish/tbl/body_status.h
+include/varnish/tbl/debug_bits.h
+include/varnish/tbl/feature_bits.h
+include/varnish/tbl/http_headers.h
+include/varnish/tbl/http_response.h
+include/varnish/tbl/locks.h
+include/varnish/tbl/req_body.h
+include/varnish/tbl/sess_close.h
+include/varnish/tbl/steps.h
+include/varnish/tbl/symbol_kind.h
+include/varnish/tbl/vcc_types.h
+include/varnish/tbl/vcl_returns.h
+include/varnish/tbl/vrt_stv_var.h
+include/varnish/tbl/vsc_all.h
+include/varnish/tbl/vsc_f_main.h
+include/varnish/tbl/vsc_fields.h
+include/varnish/tbl/vsc_levels.h
+include/varnish/tbl/vsc_types.h
+include/varnish/tbl/vsl_tags.h
+include/varnish/tbl/vsl_tags_http.h
+include/varnish/vapi/vapi_options.h
+include/varnish/vapi/voptget.h
+include/varnish/vapi/vsc.h
+include/varnish/vapi/vsc_int.h
+include/varnish/vapi/vsl.h
+include/varnish/vapi/vsl_int.h
+include/varnish/vapi/vsm.h
+include/varnish/vapi/vsm_int.h
+include/varnish/vas.h
+include/varnish/vav.h
+include/varnish/vbm.h
+include/varnish/vcl.h
+include/varnish/vcli.h
+include/varnish/vcs.h
+include/varnish/vdef.h
+include/varnish/vmod_abi.h
+include/varnish/vqueue.h
+include/varnish/vre.h
+include/varnish/vrt.h
+include/varnish/vrt_obj.h
+include/varnish/vsa.h
+include/varnish/vsb.h
+include/varnish/vsha256.h
+lib/libvarnishapi.so
+lib/libvarnishapi.so.1
+lib/libvarnishapi.so.1.0.0
+lib/varnish/libvarnish.so
+lib/varnish/libvarnishcompat.so
+lib/varnish/libvcc.so
+lib/varnish/libvgz.so
+lib/varnish/vmods/libvmod_directors.so
+lib/varnish/vmods/libvmod_std.so
+libdata/pkgconfig/varnishapi.pc
+man/man1/varnishadm.1.gz
+man/man1/varnishd.1.gz
+man/man1/varnishhist.1.gz
+man/man1/varnishlog.1.gz
+man/man1/varnishncsa.1.gz
+man/man1/varnishstat.1.gz
+man/man1/varnishtest.1.gz
+man/man1/varnishtop.1.gz
+man/man3/vmod_directors.3.gz
+man/man3/vmod_std.3.gz
+man/man7/varnish-cli.7.gz
+man/man7/varnish-counters.7.gz
+man/man7/vcl.7.gz
+man/man7/vsl-query.7.gz
+man/man7/vsl.7.gz
+sbin/varnishd
+share/aclocal/varnish.m4
+%%PORTDOCS%%%%DOCSDIR%%/builtin.vcl
+%%PORTDOCS%%%%DOCSDIR%%/example.vcl
+%%DATADIR%%/vmodtool.py
+ at dir varnish


Property changes on: trunk/www/varnish4/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list