Commit fa860aec authored by Geoff Simmons's avatar Geoff Simmons

Set version 0.3.0 and update RPM packaging for Varnish 6.3.2.

parent b9533127
AC_PREREQ(2.68)
AC_COPYRIGHT([Copyright (c) 2019 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvdp-pesi], [trunk], [varnish-support@uplex.de], [vdp-pesi])
AC_INIT([libvdp-pesi], [0.3.0], [varnish-support@uplex.de], [vdp-pesi])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vdp_pesi.vcc)
AM_CONFIG_HEADER(config.h)
......
......@@ -10,8 +10,8 @@
# - this script (named pkg)
# - VDP pesi tarball (vdp-pesi-$VERSION.tar.gz)
# - RPM spec file (vdp-pesi.spec)
# - yum repo config for varnish62@packagecloud (varnishcache_varnish62.repo)
# (see https://packagecloud.io/varnishcache/varnish62/install#manual-rpm)
# - yum repo config for varnish63@packagecloud (varnishcache_varnish63.repo)
# (see https://packagecloud.io/varnishcache/varnish63/install#manual-rpm)
# Sample docker invocation:
# $ docker run -t -v $PWD:/srv -e VERSION=47.1.1 -e RELEASE=815 \
......@@ -44,22 +44,22 @@ sudo yum install -y -q \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
# set up varnish repo
sudo cp /srv/varnishcache_varnish62.repo /etc/yum.repos.d/
sudo cp /srv/varnishcache_varnish63.repo /etc/yum.repos.d/
sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish62'
sudo yum -q makecache -y --disablerepo='*' --enablerepo='varnishcache_varnish63'
# build requirements (cf. Requires for varnish-src.rpm)
sudo yum install -y -v varnish-devel-6.2.1 pkgconfig make gcc python-docutils \
sudo yum install -y -v varnish-devel-6.3.2 pkgconfig make gcc python-docutils \
yum-utils python3-sphinx jemalloc-devel libedit-devel ncurses-devel \
pcre-devel python3-docutils systemd-units
# build Varnish source
yumdownloader --source varnish-6.2.1-1.el7.src
rpm -ivh ./varnish-6.2.1-1.el7.src.rpm
yumdownloader --source varnish-6.3.2-1.el7.src
rpm -ivh ./varnish-6.3.2-1.el7.src.rpm
cd rpmbuild/SOURCES
tar xfz varnish-6.2.1.tgz
cd varnish-6.2.1
tar xfz varnish-6.3.2.tgz
cd varnish-6.3.2
./autogen.sh
./configure
make -j
......@@ -70,7 +70,7 @@ cd /home/builder
rpmbuild -ba -D "dist .${DIST}" \
-D "_version ${VERSION}" \
-D "_release ${RELEASE}" \
-D "VARNISHSRC ${HOME}/rpmbuild/SOURCES/varnish-6.2.1" \
-D "VARNISHSRC ${HOME}/rpmbuild/SOURCES/varnish-6.3.2" \
rpmbuild/SPECS/vdp-pesi.spec
sudo cp rpmbuild/RPMS/*/* /srv
......
[varnishcache_varnish62]
name=varnishcache_varnish62
baseurl=https://packagecloud.io/varnishcache/varnish62/el/7/$basearch
[varnishcache_varnish63]
name=varnishcache_varnish63
baseurl=https://packagecloud.io/varnishcache/varnish63/el/7/$basearch
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish62/gpgkey
gpgkey=https://packagecloud.io/varnishcache/varnish63/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
[varnishcache_varnish62-source]
name=varnishcache_varnish62-source
baseurl=https://packagecloud.io/varnishcache/varnish62/el/7/SRPMS
[varnishcache_varnish63-source]
name=varnishcache_varnish63-source
baseurl=https://packagecloud.io/varnishcache/varnish63/el/7/SRPMS
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish62/gpgkey
gpgkey=https://packagecloud.io/varnishcache/varnish63/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
......@@ -10,10 +10,10 @@ Group: System Environment/Daemons
Source0: %{name}-%{version}.tar.gz
# varnish from varnish62 at packagecloud
# Strictly require 6.2.1 by commit ID.
Requires: varnishd(abi)%{?_isa} == 9f8588e4ab785244e06c3446fe09bf9db5dd8753
# Strictly require 6.3.2 by commit ID.
Requires: varnishd(abi)%{?_isa} == 6870fd661a2b42c2e8adad838b5d92a71f27dccd
BuildRequires: varnish-devel == 6.2.1
BuildRequires: varnish-devel == 6.3.2
BuildRequires: pkgconfig
BuildRequires: make
BuildRequires: gcc
......@@ -72,7 +72,10 @@ rm -rf %{buildroot}
/sbin/ldconfig
%changelog
* Thu Nov 07 2019 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
* Thu Apr 23 2020 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Update for Varnish 6.3.2
* Thu Nov 07 2019 Geoff Simmons <geoff@uplex.de> - 0.2.7-1
- Bugfix: don't push gzip tail after ESI level 0 processing finishes
* Thu Nov 07 2019 Geoff Simmons <geoff@uplex.de> - 0.2.6-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