pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add an intended update for www/ varnish which brings the package up to version 4.1.0



Module Name:	pkgsrc-wip
Committed By:	Sevan Janiyan <venture37%geeklan.co.uk@localhost>
Pushed By:	sevan
Date:		Mon Oct 26 00:06:48 2015 +0000
Changeset:	de9981a3fec0c52640aa992625a77c7ebadf3c32

Added Files:
	varnish/DESCR
	varnish/Makefile
	varnish/PLIST
	varnish/distinfo
	varnish/files/smf/manifest.xml
	varnish/files/varnishd.sh
	varnish/files/varnishlog.sh
	varnish/files/varnishncsa.sh
	varnish/patches/patch-etc__Makefile.in
	varnish/patches/patch-lib_libvarnish_vtcp.c

Log Message:
Add an intended update for www/varnish which brings the package up to version
4.1.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=de9981a3fec0c52640aa992625a77c7ebadf3c32

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 varnish/DESCR                               |  9 +++
 varnish/Makefile                            | 66 +++++++++++++++++++
 varnish/PLIST                               | 98 +++++++++++++++++++++++++++++
 varnish/distinfo                            |  7 +++
 varnish/files/smf/manifest.xml              | 36 +++++++++++
 varnish/files/varnishd.sh                   | 13 ++++
 varnish/files/varnishlog.sh                 | 14 +++++
 varnish/files/varnishncsa.sh                | 14 +++++
 varnish/patches/patch-etc__Makefile.in      | 15 +++++
 varnish/patches/patch-lib_libvarnish_vtcp.c | 12 ++++
 10 files changed, 284 insertions(+)

diffs:
diff --git a/varnish/DESCR b/varnish/DESCR
new file mode 100644
index 0000000..ba07daa
--- /dev/null
+++ b/varnish/DESCR
@@ -0,0 +1,9 @@
+Varnish is
+
+* a high-performace HTTP accelerator designed for content-heavy
+  dynamic web sites.
+* designed for maximum performance on modern hardware and modern
+  operating systems. Varnish takes full advantage of modern virtual
+  memory systems and of advanced operating system features such as
+  kqueue, accept filters, sendfile etc. where available.
+* open source, published under a two-clause BSD license.
diff --git a/varnish/Makefile b/varnish/Makefile
new file mode 100644
index 0000000..5226232
--- /dev/null
+++ b/varnish/Makefile
@@ -0,0 +1,66 @@
+# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:20 wiz Exp $
+
+DISTNAME=	varnish-4.1.0
+CATEGORIES=	www
+MASTER_SITES=	http://repo.varnish-cache.org/source/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://varnish-cache.org/
+COMMENT=	High-performace HTTP accelerator
+LICENSE=	modified-bsd
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config gmake
+BUILD_DEFS+=	VARBASE
+
+CONF_FILES=		${PREFIX}/share/doc/varnish/example.vcl ${PKG_SYSCONFDIR}/example.vcl
+
+VRNUSER?=		varnish
+VRNGROUP?=		${VRNUSER}
+STATEDIR=		${VARBASE}/db
+VRNDIR=			${STATEDIR}/${PKGBASE}
+
+CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+OWN_DIRS+=		${VRNDIR}
+OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
+
+PKG_GROUPS+=		${VRNGROUP}
+PKG_USERS+=		${VRNUSER}:${VRNGROUP}
+PKG_HOME.${VRNUSER}=	${VRNDIR}
+PKG_SHELL.${VRNUSER}=	${SH}
+PKG_GECOS.${VRNUSER}=	Varnish daemon user
+
+FILES_SUBST+=		VRNUSER=${VRNUSER}
+FILES_SUBST+=		VRNGROUP=${VRNGROUP}
+
+RCD_SCRIPTS=		varnishd varnishlog varnishncsa
+PYTHON_FOR_BUILD_ONLY=	yes
+REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
+
+BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
+CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+# Explicitly disable epoll on illumos, provided for Linux compat only.
+CONFIGURE_ENV+=	ac_cv_func_epoll_ctl=no
+.  if ${PKGSRC_COMPILER} == "sunpro"
+CONFIGURE_ENV+=	VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
+.  else
+CONFIGURE_ENV+=	VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
+.  endif
+.endif
+
+# not signed/unsigned char safe
+BUILDLINK_TRANSFORM+=    rm:-Werror
+
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/varnish/PLIST b/varnish/PLIST
new file mode 100644
index 0000000..229d791
--- /dev/null
+++ b/varnish/PLIST
@@ -0,0 +1,98 @@
+@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:18 jperkin Exp $
+bin/varnishadm
+bin/varnishhist
+bin/varnishlog
+bin/varnishncsa
+bin/varnishstat
+bin/varnishtest
+bin/varnishtop
+include/varnish/vcli.h
+include/varnish/cache/cache.h
+include/varnish/cache/cache_backend.h
+include/varnish/cache/cache_director.h
+include/varnish/cache/cache_filter.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/obj_attr.h
+include/varnish/tbl/params.h
+include/varnish/tbl/req_body.h
+include/varnish/tbl/req_flags.h
+include/varnish/tbl/sess_attr.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/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
+include/varnish/vtcp.h
+include/varnish/vtim.h
+include/varnish/waiter/waiter.h
+lib/libvarnishapi.la
+lib/pkgconfig/varnishapi.pc
+lib/varnish/libvcc.la
+lib/varnish/vmods/libvmod_directors.la
+lib/varnish/libvarnish.la
+lib/varnish/libvarnishcompat.la
+lib/varnish/libvgz.la
+lib/varnish/vmods/libvmod_std.la
+man/man1/varnishadm.1
+man/man1/varnishd.1
+man/man1/varnishhist.1
+man/man1/varnishlog.1
+man/man1/varnishncsa.1
+man/man1/varnishstat.1
+man/man1/varnishtest.1
+man/man1/varnishtop.1
+man/man3/vmod_std.3
+man/man3/vmod_directors.3
+man/man7/vsl-query.7
+man/man7/vsl.7
+man/man7/varnish-cli.7
+man/man7/varnish-counters.7
+man/man7/vcl.7
+sbin/varnishd
+share/aclocal/varnish.m4
+share/doc/varnish/builtin.vcl
+share/doc/varnish/example.vcl
+share/varnish/vmodtool.py
diff --git a/varnish/distinfo b/varnish/distinfo
new file mode 100644
index 0000000..9c68f7f
--- /dev/null
+++ b/varnish/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.13 2015/03/09 00:47:05 mspo Exp $
+
+SHA1 (varnish-4.1.0.tar.gz) = 99edee05da3404d34cadb0e17ac3427351042afa
+RMD160 (varnish-4.1.0.tar.gz) = 13e6172691405d30c380942af2e89e19a4cca431
+Size (varnish-4.1.0.tar.gz) = 1990932 bytes
+SHA1 (patch-etc__Makefile.in) = 294da8aac5cc31d1d8e6a2714b48fbdbbe6c7f67
+SHA1 (patch-lib_libvarnish_vtcp.c) = 47d2da33ff566bb4c259a3b94a03698d04385ea6
diff --git a/varnish/files/smf/manifest.xml b/varnish/files/smf/manifest.xml
new file mode 100644
index 0000000..d374d5a
--- /dev/null
+++ b/varnish/files/smf/manifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="varnish">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default" />
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local" />
+    </dependency>
+    <method_context>
+      <method_environment>
+        <envvar name='PATH' value='@PREFIX@/sbin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/bin' />
+      </method_environment>
+    </method_context>
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/varnishd -a %{listen} -l %{size} -f %{config_file} -u @VRNUSER@ -g @VRNGROUP@" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/default.vcl" />
+      <propval name="listen" type="astring" value="0.0.0.0:8080" />
+      <propval name="size" type="astring" value="64M" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Varnish daemon</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
diff --git a/varnish/files/varnishd.sh b/varnish/files/varnishd.sh
new file mode 100644
index 0000000..01ffc50
--- /dev/null
+++ b/varnish/files/varnishd.sh
@@ -0,0 +1,13 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: varnishd
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="varnishd"
+rcvar=$name
+command="@PREFIX@/sbin/varnishd"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/varnish/files/varnishlog.sh b/varnish/files/varnishlog.sh
new file mode 100644
index 0000000..7e1536e
--- /dev/null
+++ b/varnish/files/varnishlog.sh
@@ -0,0 +1,14 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: varnishlog
+# REQUIRE: varnishd
+
+. /etc/rc.subr
+
+name="varnishlog"
+rcvar=$name
+command="@PREFIX@/bin/varnishlog"
+command_args="-D"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/varnish/files/varnishncsa.sh b/varnish/files/varnishncsa.sh
new file mode 100644
index 0000000..98122d6
--- /dev/null
+++ b/varnish/files/varnishncsa.sh
@@ -0,0 +1,14 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: varnishncsa
+# REQUIRE: varnishd
+
+. /etc/rc.subr
+
+name="varnishncsa"
+rcvar=$name
+command="@PREFIX@/bin/varnishncsa"
+command_args="-D"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/varnish/patches/patch-etc__Makefile.in b/varnish/patches/patch-etc__Makefile.in
new file mode 100644
index 0000000..7f0fa02
--- /dev/null
+++ b/varnish/patches/patch-etc__Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Put config file in examples
+
+--- etc/Makefile.in.orig	2015-09-30 11:39:21.000000000 +0000
++++ etc/Makefile.in
+@@ -241,7 +241,7 @@ target_vendor = @target_vendor@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-varnishconfdir = @varnishconfdir@
++varnishconfdir = @prefix@/share/examples/@PACKAGE@
+ DISTCLEANFILES = builtin.vcl
+ dist_doc_DATA = builtin.vcl \
+ 		example.vcl
diff --git a/varnish/patches/patch-lib_libvarnish_vtcp.c b/varnish/patches/patch-lib_libvarnish_vtcp.c
new file mode 100644
index 0000000..4d3b82e
--- /dev/null
+++ b/varnish/patches/patch-lib_libvarnish_vtcp.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- lib/libvarnish/vtcp.c.orig	2015-09-30 11:39:14.000000000 +0000
++++ lib/libvarnish/vtcp.c
+@@ -32,6 +32,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
++#include <sys/time.h>
+ #ifdef HAVE_SYS_FILIO_H
+ #  include <sys/filio.h>
+ #endif


Home | Main Index | Thread Index | Old Index