cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for Varnish to 6.0.0, initial upgrade by me, then some tweaks by kn@

Browse Source 
for proper python handling.

OK kn@
This commit is contained in:
gonzalo 2018-04-03 09:40:27 +00:00
parent 40b5cebdee
commit 7cf5721328
6 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
www/varnish/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.36 2018/02/05 14:03:26 gonzalo Exp $
# $OpenBSD: Makefile,v 1.37 2018/04/03 09:40:27 gonzalo Exp $
COMMENT = high-performance HTTP accelerator
DISTNAME = varnish-5.2.1
REVISION = 1
DISTNAME = varnish-6.0.0
CATEGORIES = www
SHARED_LIBS = varnishapi 1.0
SHARED_LIBS = varnishapi 1.0 # 1.6
HOMEPAGE = https://www.varnish-cache.org/
@ -17,38 +16,43 @@ MAINTAINER = Jim Razmus II <jim@openbsd.org> \
# BSD
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = https://varnish-cache.org/_downloads/
MASTER_SITES = https://varnish-cache.org/_downloads/
EXTRACT_SUFX = .tgz
WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
WANTLIB += c curses execinfo m pcre pthread readline
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODPY_RUNDEP = No
MODPY_ADJ_FILES = lib/libvcc/{vsc,vmod}tool.py
BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool \
textproc/py-docutils
LIB_DEPENDS = devel/pcre
textproc/py-docutils${MODPY_FLAVOR}
LIB_DEPENDS = devel/pcre
# The internal backtrace implementation fails to build with -Werror on arm/hppa
LIB_DEPENDS += devel/libexecinfo
WRKDIST = ${WRKDIR}/${DISTNAME}
USE_GMAKE = Yes
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
PYTHON="${MODPY_BIN}"
TEST_TARGET = check
post-patch:
pre-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
${PREFIX}/share/examples/varnish
rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}

4
www/varnish/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
SIZE (varnish-5.2.1.tgz) = 2827676
SHA256 (varnish-6.0.0.tgz) = x7KDnJWyvx8zarwgtdixScOqct7/FC8jedHUMSBrC+4=
SIZE (varnish-6.0.0.tgz) = 3033621

14
www/varnish/patches/patch-lib_libvmod_unix_cred_compat_h Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-lib_libvmod_unix_cred_compat_h,v 1.1 2018/04/03 09:40:27 gonzalo Exp $
Index: lib/libvmod_unix/cred_compat.h
--- lib/libvmod_unix/cred_compat.h.orig
+++ lib/libvmod_unix/cred_compat.h
@@ -48,7 +48,7 @@ get_ids(int fd, uid_t *uid, gid_t *gid)
#if defined(SO_PEERCRED)
- struct ucred ucred;
+ struct sockpeercred ucred;
socklen_t l = sizeof(ucred);
errno = 0;

8
www/varnish/pkg/DESCR
View File

@ -1,2 +1,6 @@
Varnish is a reverse Web accelerator designed for content-heavy
dynamic web sites.
Varnish Cache is a web application accelerator also known as a caching
HTTP reverse proxy. You install it in front of any server that speaks
HTTP and configure it to cache the contents.
Varnish Cache is really, really fast. It typically speeds up delivery
with a factor of 300 - 1000x, depending on your architecture.

4
www/varnish/pkg/MESSAGE
View File

@ -1,8 +1,8 @@
Varnish has a default configuration built in, however see vcl(7)
or the following link for more information:
http://www.varnish-cache.org/wiki/VCLExamples
${HOMEPAGE}wiki/VCLExamples
and for further information:
https://www.varnish-cache.org/docs/5.0/
${HOMEPAGE}docs/6.0/

12
www/varnish/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2017/09/18 14:09:53 gonzalo Exp $
@comment $OpenBSD: PLIST,v 1.12 2018/04/03 09:40:27 gonzalo Exp $
@newgroup _varnish:625
@newuser _varnish:625:_varnish:daemon:Varnish Cache:/var/varnish:/bin/sh
@bin bin/varnishadm
@ -14,10 +14,9 @@ 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/cache/cache_varnishd.h
include/varnish/common/
include/varnish/common/com_params.h
include/varnish/common/common.h
include/varnish/common/common_vsm.h
include/varnish/common/common_param.h
include/varnish/miniobj.h
include/varnish/tbl/
include/varnish/tbl/acct_fields_bereq.h
@ -63,7 +62,6 @@ include/varnish/vapi/
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
@ -97,8 +95,10 @@ lib/varnish/
lib/varnish/vmods/
lib/varnish/vmods/libvmod_blob.so
lib/varnish/vmods/libvmod_directors.so
lib/varnish/vmods/libvmod_proxy.so
lib/varnish/vmods/libvmod_purge.so
lib/varnish/vmods/libvmod_std.so
lib/varnish/vmods/libvmod_unix.so
lib/varnish/vmods/libvmod_vtc.so
@man man/man1/varnishadm.1
@man man/man1/varnishd.1
@ -110,8 +110,10 @@ lib/varnish/vmods/libvmod_vtc.so
@man man/man1/varnishtop.1
@man man/man3/vmod_blob.3
@man man/man3/vmod_directors.3
@man man/man3/vmod_proxy.3
@man man/man3/vmod_purge.3
@man man/man3/vmod_std.3
@man man/man3/vmod_unix.3
@man man/man3/vmod_vtc.3
@man man/man7/varnish-cli.7
@man man/man7/varnish-counters.7