Commit b50f4b63 authored by Geoff Simmons's avatar Geoff Simmons

Set version 1.6.0, and update RPM packaging.

parent 521362f4
AC_PREREQ(2.68) AC_PREREQ(2.68)
AC_COPYRIGHT([Copyright (c) 2018 UPLEX - Nils Goroll Systemoptimierung]) AC_COPYRIGHT([Copyright (c) 2018 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvmod-selector], [trunk], [varnish-support@uplex.de], [vmod-selector]) AC_INIT([libvmod-selector], [1.6.0], [varnish-support@uplex.de], [vmod-selector])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_selector.vcc) AC_CONFIG_SRCDIR(src/vmod_selector.vcc)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# - this script (named pkg) # - this script (named pkg)
# - VMOD selector tarball (vmod-selector-$VERSION.tar.gz) # - VMOD selector tarball (vmod-selector-$VERSION.tar.gz)
# - RPM spec file (vmod-selector.spec) # - RPM spec file (vmod-selector.spec)
# - yum repo config for varnish65@packagecloud (varnishcache_varnish65.repo) # - yum repo config for varnish66@packagecloud (varnishcache_varnish66.repo)
# (see https://packagecloud.io/varnishcache/varnish65/install#manual-rpm) # (see https://packagecloud.io/varnishcache/varnish66/install#manual-rpm)
# Sample docker invocation: # Sample docker invocation:
# $ docker run -t -v $PWD:/srv -e VERSION=47.1.1 -e RELEASE=815 \ # $ docker run -t -v $PWD:/srv -e VERSION=47.1.1 -e RELEASE=815 \
...@@ -44,9 +44,9 @@ sudo yum install -y -q \ ...@@ -44,9 +44,9 @@ sudo yum install -y -q \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
# set up varnish repo # set up varnish repo
sudo cp /srv/varnishcache_varnish65.repo /etc/yum.repos.d/ sudo cp /srv/varnishcache_varnish66.repo /etc/yum.repos.d/
sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish65' sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish66'
# build requirements # build requirements
sudo yum install -y -q varnish-devel pkgconfig make gcc python-docutils sudo yum install -y -q varnish-devel pkgconfig make gcc python-docutils
......
[varnishcache_varnish65] [varnishcache_varnish66]
name=varnishcache_varnish65 name=varnishcache_varnish66
baseurl=https://packagecloud.io/varnishcache/varnish65/el/7/$basearch baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/$basearch
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish65/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish66/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_varnish65-source] [varnishcache_varnish66-source]
name=varnishcache_varnish65-source name=varnishcache_varnish66-source
baseurl=https://packagecloud.io/varnishcache/varnish65/el/7/SRPMS baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/SRPMS
repo_gpgcheck=1 repo_gpgcheck=1
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish65/gpgkey gpgkey=https://packagecloud.io/varnishcache/varnish66/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,11 +9,11 @@ Group: System Environment/Daemons ...@@ -9,11 +9,11 @@ Group: System Environment/Daemons
URL: https://code.uplex.de/uplex-varnish/libvmod-selector URL: https://code.uplex.de/uplex-varnish/libvmod-selector
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
# varnish from varnish65 at packagecloud # varnish from varnish66 at packagecloud
# This is the Requires for VMOD ABI compatibility with VRT >= 12.0. # This is the Requires for VMOD ABI compatibility with VRT >= 13.0.
Requires: varnishd(vrt)%{?_isa} >= 12 Requires: varnishd(vrt)%{?_isa} >= 13
BuildRequires: varnish-devel >= 6.5.1 BuildRequires: varnish-devel >= 6.6.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
...@@ -74,6 +74,11 @@ rm -rf %{buildroot} ...@@ -74,6 +74,11 @@ rm -rf %{buildroot}
%changelog %changelog
* Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release} * Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Require VRT 13.0, compatible with Varnish 6.6
- Retains the legacy VMOD interface and search implementation,
prior to the breaking changes beginning with versions 2.x.
* Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - 1.5.0-1
- Require VRT 12.0, compatible with Varnish 6.5 - Require VRT 12.0, compatible with Varnish 6.5
- Versions 1.x retain the legacy VMOD interface and search - Versions 1.x retain the legacy VMOD interface and search
implementation, prior to the breaking changes beginning implementation, prior to the breaking changes beginning
......
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