Commit 37e6fe10 authored by Geoff Simmons's avatar Geoff Simmons

Version 4.3.0, builds packages for Varnish 6.0.

parent 87cbdaa5
...@@ -9,7 +9,7 @@ Tracking Log Reader demon ...@@ -9,7 +9,7 @@ Tracking Log Reader demon
------------------------- -------------------------
:Author: Geoffrey Simmons :Author: Geoffrey Simmons
:Date: 2017-11-19 :Date: 2018-11-30
:Version: trunk :Version: trunk
:Manual section: 1 :Manual section: 1
...@@ -211,9 +211,18 @@ REQUIREMENTS ...@@ -211,9 +211,18 @@ REQUIREMENTS
============= =============
This version of the tracking reader is compatible with Varnish since This version of the tracking reader is compatible with Varnish since
version 5.2. See the source repository for versions that are version 6.0. See the source repository for versions that are
compatible with other versions of Varnish. compatible with other versions of Varnish.
Due to a `bug
<https://github.com/varnishcache/varnish-cache/issues/2790>`_ in
Varnish 6.1.0, when the tracking reader is built against that version,
it is unable to read binary log files (using the ``-f`` option) that
were written by earlier versions of Varnish. This causes errors in
development self-tests (``make check``), because the tests read from
binary log files and check the results against expected outputs. The
bug was fixed in version 6.1.1.
The messaging plugin for Kafka (``libtrackrdr-kafka``) requires The messaging plugin for Kafka (``libtrackrdr-kafka``) requires
libraries for Kafka (``librdkafka``) and the multi-threaded libary for libraries for Kafka (``librdkafka``) and the multi-threaded libary for
Zookeeper (``libzookeeper_mt``):: Zookeeper (``libzookeeper_mt``)::
......
AC_PREREQ(2.63) AC_PREREQ(2.63)
AC_COPYRIGHT([Copyright (c) 2012-2017 Otto Gmbh & Co KG]) AC_COPYRIGHT([Copyright (c) 2012-2017 Otto Gmbh & Co KG])
AC_INIT([trackrdrd], [trunk]) AC_INIT([trackrdrd], [4.3.0])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/trackrdrd.c) AC_CONFIG_SRCDIR(src/trackrdrd.c)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
...@@ -44,7 +44,7 @@ PKG_PROG_PKG_CONFIG ...@@ -44,7 +44,7 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([VARNISH], [varnishapi], PKG_CHECK_MODULES([VARNISH], [varnishapi],
[ac_varnish_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir varnishapi`], [ac_varnish_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir varnishapi`],
[AC_MSG_ERROR([Varnish trunk or 5.2 or later is required])]) [AC_MSG_ERROR([Varnish trunk or 6.0 or later is required])])
if test "x$ac_varnish_pkgdatadir" = x; then if test "x$ac_varnish_pkgdatadir" = x; then
AC_MSG_ERROR([couldn't get Varnish data dir from pkg-config]) AC_MSG_ERROR([couldn't get Varnish data dir from pkg-config])
fi fi
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# - RPM spec file (trackrdrd.spec) # - RPM spec file (trackrdrd.spec)
# - systemd unit file (trackrdrd.service) # - systemd unit file (trackrdrd.service)
# - logrotate config for the Kafka plugin (trackrdr-kafka.logrotate) # - logrotate config for the Kafka plugin (trackrdr-kafka.logrotate)
# - yum repo config for varnish5@packagecloud (varnishcache_varnish5.repo) # - yum repo config for varnish60@packagecloud (varnishcache_varnish60.repo)
# (see https://packagecloud.io/varnishcache/varnish5/install#manual-rpm) # (see https://packagecloud.io/varnishcache/varnish5/install#manual-rpm)
# At the end of the run, binary, source and debuginfo RPMs are in the # At the end of the run, binary, source and debuginfo RPMs are in the
...@@ -47,9 +47,9 @@ sudo rpm -Uvh \ ...@@ -47,9 +47,9 @@ sudo rpm -Uvh \
sudo yum install -y -q https://archive.cloudera.com/cdh5/one-click-install/redhat/7/x86_64/cloudera-cdh-5-0.x86_64.rpm sudo yum install -y -q https://archive.cloudera.com/cdh5/one-click-install/redhat/7/x86_64/cloudera-cdh-5-0.x86_64.rpm
# set up varnish repo # set up varnish repo
sudo cp /srv/varnishcache_varnish5.repo /etc/yum.repos.d/ sudo cp /srv/varnishcache_varnish60.repo /etc/yum.repos.d/
sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish5' sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish60'
# build requirements # build requirements
sudo yum install -y -q varnish-devel pkgconfig make gcc librdkafka-devel \ sudo yum install -y -q varnish-devel pkgconfig make gcc librdkafka-devel \
......
...@@ -11,16 +11,16 @@ Source0: %{name}-%{version}.tar.gz ...@@ -11,16 +11,16 @@ Source0: %{name}-%{version}.tar.gz
Source1: trackrdrd.service Source1: trackrdrd.service
Source2: trackrdr-kafka.logrotate Source2: trackrdr-kafka.logrotate
# varnish from varnish5 at packagecloud # varnish from varnish60 at packagecloud
# zookeeper-native from cloudera-cdh5.repo # zookeeper-native from cloudera-cdh5.repo
Requires: varnish >= 5.2.0 Requires: varnish >= 6.0.0, varnish < 6.1.0
Requires: librdkafka Requires: librdkafka
Requires: zookeeper-native Requires: zookeeper-native
Requires: zlib Requires: zlib
Requires: pcre Requires: pcre
Requires: logrotate Requires: logrotate
BuildRequires: varnish-devel >= 5.2.0 BuildRequires: varnish-devel >= 6.0.0, varnish-devel < 6.1.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
......
[varnishcache_varnish5] [varnishcache_varnish60]
name=varnishcache_varnish5 name=varnishcache_varnish60
baseurl=https://packagecloud.io/varnishcache/varnish5/el/7/$basearch baseurl=https://packagecloud.io/varnishcache/varnish60/el/7/$basearch
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish5/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish60/gpgkey
sslverify=1 sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300 metadata_expire=300
[varnishcache_varnish5-source] [varnishcache_varnish60-source]
name=varnishcache_varnish5-source name=varnishcache_varnish60-source
baseurl=https://packagecloud.io/varnishcache/varnish5/el/7/SRPMS baseurl=https://packagecloud.io/varnishcache/varnish60/el/7/SRPMS
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish5/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish60/gpgkey
sslverify=1 sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300 metadata_expire=300
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment