Commit 0fcf3333 authored by Geoff Simmons's avatar Geoff Simmons

Set version 1.8.0 and update RPM packaging for Varnish 6.3.0.

parent df50e8d6
AC_PREREQ([2.68]) AC_PREREQ([2.68])
AC_INIT([libvmod-re2], [trunk], [varnish-support@uplex.de], [vmod-re2]) AC_INIT([libvmod-re2], [1.8.0], [varnish-support@uplex.de], [vmod-re2])
AC_COPYRIGHT([Copyright 2016-2017 UPLEX - Nils Goroll Systemoptimierung]) AC_COPYRIGHT([Copyright 2016-2017 UPLEX - Nils Goroll Systemoptimierung])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# - this script (named pkg) # - this script (named pkg)
# - VMOD re2 tarball (vmod-re2-$VERSION.tar.gz) # - VMOD re2 tarball (vmod-re2-$VERSION.tar.gz)
# - RPM spec file (vmod-re2.spec) # - RPM spec file (vmod-re2.spec)
# - yum repo config for varnish61@packagecloud (varnishcache_varnish61.repo) # - yum repo config for varnish63@packagecloud (varnishcache_varnish63.repo)
# (see https://packagecloud.io/varnishcache/varnish61/install#manual-rpm) # (see https://packagecloud.io/varnishcache/varnish63/install#manual-rpm)
# So this is a sample docker invocation: # So this is a sample docker invocation:
# #
...@@ -44,7 +44,7 @@ cp /srv/vmod-re2-${VERSION}.tar.gz rpmbuild/SOURCES ...@@ -44,7 +44,7 @@ cp /srv/vmod-re2-${VERSION}.tar.gz rpmbuild/SOURCES
sudo yum install -y -q epel-release sudo yum install -y -q epel-release
# set up varnish repo # set up varnish repo
sudo cp /srv/varnishcache_varnish61.repo /etc/yum.repos.d/ sudo cp /srv/varnishcache_varnish63.repo /etc/yum.repos.d/
sudo yum -q makecache -y fast sudo yum -q makecache -y fast
......
[varnishcache_varnish61] [varnishcache_varnish63]
name=varnishcache_varnish61 name=varnishcache_varnish63
baseurl=https://packagecloud.io/varnishcache/varnish61/el/7/$basearch baseurl=https://packagecloud.io/varnishcache/varnish63/el/7/$basearch
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish61/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish63/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_varnish61-source] [varnishcache_varnish63-source]
name=varnishcache_varnish61-source name=varnishcache_varnish63-source
baseurl=https://packagecloud.io/varnishcache/varnish61/el/7/SRPMS baseurl=https://packagecloud.io/varnishcache/varnish63/el/7/SRPMS
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish61/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish63/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
...@@ -9,12 +9,12 @@ Group: System Environment/Daemons ...@@ -9,12 +9,12 @@ Group: System Environment/Daemons
URL: https://code.uplex.de/uplex-varnish/libvmod-re2 URL: https://code.uplex.de/uplex-varnish/libvmod-re2
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# varnish from varnish61 at packagecloud # varnish from varnish63 at packagecloud
# This is the Requires for VMOD ABI compatibility with VRT >= 8.0. # This is the Requires for VMOD ABI compatibility with VRT >= 10.0.
Requires: varnishd(vrt)%{?_isa} >= 8 Requires: varnishd(vrt)%{?_isa} >= 10
Requires: re2 >= 20150501 Requires: re2 >= 20150501
BuildRequires: varnish-devel >= 6.1.0 BuildRequires: varnish-devel >= 6.3.0
BuildRequires: re2-devel >= 20150501 BuildRequires: re2-devel >= 20150501
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: make BuildRequires: make
...@@ -75,6 +75,9 @@ rm -rf %{buildroot} ...@@ -75,6 +75,9 @@ rm -rf %{buildroot}
/sbin/ldconfig /sbin/ldconfig
%changelog %changelog
* Tue Oct 8 2019 Geoff Simmons <geoff@uplex.de> - 1.8.0
- Require VRT 10.0, compatible with Varnish 6.3
* Mon Dec 3 2018 Geoff Simmons <geoff@uplex.de> - 1.6.1 * Mon Dec 3 2018 Geoff Simmons <geoff@uplex.de> - 1.6.1
- True dependency on VRT 8.0, compatible with Varnish 6.1, libvarnishapi.so.2 - True dependency on VRT 8.0, compatible with Varnish 6.1, libvarnishapi.so.2
......
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