Commit d7e91f43 authored by Geoff Simmons's avatar Geoff Simmons

Set version 1.3.0 and update RPM packaging for Varnish 6.3.

parent 9f6ab738
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.3.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 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)
# 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 \
...@@ -43,7 +43,7 @@ cp /srv/vmod-selector-${VERSION}.tar.gz rpmbuild/SOURCES ...@@ -43,7 +43,7 @@ cp /srv/vmod-selector-${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
# -D MUST pass in _version and _release, and SHOULD pass in dist. # -D MUST pass in _version and _release, and SHOULD pass in dist.
Summary: Varnish VMOD for matching strings associated with backends, regexen and other strings Summary: Varnish VMOD for matching strings associated with backends, regexen and other data
Name: vmod-selector Name: vmod-selector
Version: %{_version} Version: %{_version}
Release: %{_release}%{?dist} Release: %{_release}%{?dist}
...@@ -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 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
BuildRequires: varnish-devel >= 6.1.0 BuildRequires: varnish-devel >= 6.3.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: make BuildRequires: make
BuildRequires: gcc BuildRequires: gcc
...@@ -31,7 +31,7 @@ Provides: vmod-selector, vmod-selector-debuginfo ...@@ -31,7 +31,7 @@ Provides: vmod-selector, vmod-selector-debuginfo
%description %description
Varnish Module for matching fixed strings and prefixes, and Varnish Module for matching fixed strings and prefixes, and
associating the matched string with backends, regular expressions and associating the matched string with backends, regular expressions and
other strings. other data.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
...@@ -73,7 +73,10 @@ rm -rf %{buildroot} ...@@ -73,7 +73,10 @@ rm -rf %{buildroot}
/sbin/ldconfig /sbin/ldconfig
%changelog %changelog
* Fri Nov 30 2018 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release} * Tue Oct 8 2019 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Require VRT 10.0, compatible with Varnish 6.3
* Fri Nov 30 2018 Geoff Simmons <geoff@uplex.de> - 1.0.0-1
Compatibilty with VRT 8 (Varnish 6.1 and libvarnishapi.so.2) Compatibilty with VRT 8 (Varnish 6.1 and libvarnishapi.so.2)
* Tue Jul 10 2018 Geoff Simmons <geoff@uplex.de> - 0.5.0-1 * Tue Jul 10 2018 Geoff Simmons <geoff@uplex.de> - 0.5.0-1
......
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