Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvdp-pesi
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
uplex-varnish
libvdp-pesi
Commits
0692f48d
Commit
0692f48d
authored
Apr 21, 2021
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set version 1.1.0, and update RPM packaging.
parent
29cd6a6b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
210 additions
and
1 deletion
+210
-1
configure.ac
configure.ac
+1
-1
pkg
pkg/rpm/pkg
+75
-0
varnishcache_varnish66.repo
pkg/rpm/varnishcache_varnish66.repo
+21
-0
vdp-pesi.spec
pkg/rpm/vdp-pesi.spec
+113
-0
No files found.
configure.ac
View file @
0692f48d
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], [
1.1.0
], [varnish-support@uplex.de], [vdp-pesi])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vdp_pesi.vcc)
AM_CONFIG_HEADER(config.h)
...
...
pkg/rpm/pkg
0 → 100755
View file @
0692f48d
#! /bin/bash -ex
# Build script for a VDP pesi el7 RPM
# to be run in the rpmbuild/centos7 docker container.
# Env variables VERSION and RELEASE MUST be set in the docker invocation.
# DIST is set by the rpmbuild/centos7 container.
# The directory mounted to /srv MUST contain these files:
# - this script (named pkg)
# - VDP pesi tarball (vdp-pesi-$VERSION.tar.gz)
# - RPM spec file (vdp-pesi.spec)
# - yum repo config for varnish66@packagecloud (varnishcache_varnish66.repo)
# (see https://packagecloud.io/varnishcache/varnish66/install#manual-rpm)
# Sample docker invocation:
# $ docker run -t -v $PWD:/srv -e VERSION=47.1.1 -e RELEASE=815 \
# rpmbuild/centos7 /srv/pkg
# At the end of the run, binary, source and debuginfo RPMs are in the
# directory mounted to /srv.
if
[
-z
$VERSION
]
;
then
echo
"Env variable VERSION MUST be set"
exit
1
fi
if
[
-z
$RELEASE
]
;
then
echo
"Env variable RELEASE MUST be set"
exit
1
fi
# delete the peculiar macros from the rpmbuild/centos7 image
rm
/home/builder/.rpmmacros
# set up the build environment
cd
/home/builder
mkdir
-p
rpmbuild/
{
BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS
}
cp
/srv/vdp-pesi.spec rpmbuild/SPECS
cp
/srv/vdp-pesi-
${
VERSION
}
.tar.gz rpmbuild/SOURCES
# install epel7 repo
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_varnish66.repo /etc/yum.repos.d/
sudo
yum
-q
makecache
-y
--disablerepo
=
'*'
--enablerepo
=
'varnishcache_varnish66'
# build requirements (cf. Requires for varnish-src.rpm)
sudo
yum
install
-y
-v
varnish-devel-6.6.0 pkgconfig make gcc python-docutils
\
yum-utils python3-sphinx jemalloc-devel libedit-devel ncurses-devel
\
pcre-devel python3-docutils systemd-units git
# build Varnish source
cd
rpmbuild/SOURCES
git clone https://github.com/varnishcache/varnish-cache.git
cd
varnish-cache
git checkout varnish-6.6.0
./autogen.sh
./configure
make
-j
# build RPMs
cd
/home/builder
rpmbuild
-ba
-D
"dist .
${
DIST
}
"
\
-D
"_version
${
VERSION
}
"
\
-D
"_release
${
RELEASE
}
"
\
-D
"VARNISHSRC
${
HOME
}
/rpmbuild/SOURCES/varnish-cache"
\
rpmbuild/SPECS/vdp-pesi.spec
sudo cp
rpmbuild/RPMS/
*
/
*
/srv
sudo cp
rpmbuild/SRPMS/
*
/srv
pkg/rpm/varnishcache_varnish66.repo
0 → 100644
View file @
0692f48d
[varnishcache_varnish66]
name=varnishcache_varnish66
baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/$basearch
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish66/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
[varnishcache_varnish66-source]
name=varnishcache_varnish66-source
baseurl=https://packagecloud.io/varnishcache/varnish66/el/7/SRPMS
repo_gpgcheck=1
gpgcheck=0
enabled=1
gpgkey=https://packagecloud.io/varnishcache/varnish66/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300
pkg/rpm/vdp-pesi.spec
0 → 100644
View file @
0692f48d
# -D MUST pass in _version and _release, and SHOULD pass in dist.
Summary: Varnish Delivery Processor for parallel Edge Side Includes
Name: vdp-pesi
Version: %{_version}
Release: %{_release}%{?dist}
License: BSD
Group: System Environment/Daemons
#URL: https://code.uplex.de/uplex-varnish/libvdp-pesi
Source0: %{name}-%{version}.tar.gz
# varnish from varnish66 at packagecloud
# Strictly require 6.6.0 by commit ID.
Requires: varnishd(abi)%{?_isa} == ef54768fc10f5b19556c7cf9866efc88cfbda8ff
BuildRequires: varnish-devel == 6.6.0
BuildRequires: pkgconfig
BuildRequires: make
BuildRequires: gcc
BuildRequires: python-docutils >= 0.6
# git builds
#BuildRequires: automake
#BuildRequires: autoconf
#BuildRequires: autoconf-archive
#BuildRequires: libtool
#BuildRequires: python-docutils >= 0.6
Provides: vdp-pesi, vdp-pesi-debuginfo
%description
Varnish Delivery Processor that implements Edge Side Includes by
running ESI subrequests in parallel threads.
%prep
%setup -q -n %{name}-%{version}
%build
# if this were a git build
# ./autogen.sh
%configure VARNISHSRC=%{VARNISHSRC}
%{__make} %{?_smp_mflags}
%check
%{__make} %{?_smp_mflags} check
%install
%{__make} install DESTDIR=%{buildroot}
# Only use the version-specific docdir created by %doc below
rm -rf %{buildroot}%{_docdir}
# None of these for fedora/epel
find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
find %{buildroot}/%{_libdir}/ -name '*.a' -exec rm -f {} ';'
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_libdir}/varnish*/vmods/
%{_mandir}/man3/*.3*
%doc README.rst COPYING LICENSE
%post
/sbin/ldconfig
%changelog
* Wed Apr 21 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Update for Varnish 6.6.0
* Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - 1.0.0-1
- Update for Varnish 6.5.1
* Thu Apr 23 2020 Geoff Simmons <geoff@uplex.de> - 0.3.0-1
- 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
- Bugfix assertions for partially deliveded / unpended subtrees
* Thu Nov 07 2019 Geoff Simmons <geoff@uplex.de> - 0.2.5-1
- Bugfix handling of includes with empty responses
* Tue Nov 05 2019 Geoff Simmons <geoff@uplex.de> - 0.2.4-1
- Bugfixes: gunzip included response for a decompressed client response
- Fix invalid URLs in includes
- More rigrorous testing of the gzip-gunzip permutations.
* Wed Oct 23 2019 Geoff Simmons <geoff@uplex.de> - 0.2.3-1
- Bugfix racy assertions when a VDP in the stack failed.
* Wed Oct 23 2019 Geoff Simmons <geoff@uplex.de> - 0.2.2-1
- Bugfix order of VDP finalization at ESI level > 0, e.g. gzipped ESI
include within an uncompressed response at level 0.
* Sun Sep 08 2019 Geoff Simmons <geoff@uplex.de> - 0.2.1-1
- Bugfix: no assertion when the VDP never runs, for example when the
body is empty due to HEAD requests, status 204, etc.
* Sun Sep 08 2019 Geoff Simmons <geoff@uplex.de> - 0.2.0-1
Require Varnish 6.2.1.
* Thu Aug 08 2019 Geoff Simmons <geoff@uplex.de> - 0.1.0-1
Initial package version for compatibility with Varnish 6.2.0.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment