Added patch from Nils Goroll, compatibility for varnish-6.3, closes bz#1736943

Rebuilt against varnish-6.3.0
This commit is contained in:
Ingvar Hagelund 2019-09-29 00:49:24 +02:00
parent 264de2c9ca
commit 74cdd76263
3 changed files with 3206 additions and 7 deletions

View File

@ -0,0 +1,44 @@
--- /dev/null 2019-09-28 14:48:27.937320545 +0200
+++ bootstrap 2019-09-29 00:35:05.782099759 +0200
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+warn() {
+ echo "WARNING: $@" 1>&2
+}
+
+case `uname -s` in
+Darwin)
+ LIBTOOLIZE=glibtoolize
+ ;;
+FreeBSD)
+ LIBTOOLIZE=libtoolize
+ ;;
+Linux)
+ LIBTOOLIZE=libtoolize
+ ;;
+SunOS)
+ LIBTOOLIZE=libtoolize
+ ;;
+*)
+ warn "unrecognized platform:" `uname -s`
+ LIBTOOLIZE=libtoolize
+esac
+
+# check for varnishapi.m4 in custom paths
+dataroot=$(pkg-config --variable=datarootdir varnishapi 2>/dev/null)
+if [ -z "$dataroot" ] ; then
+ cat >&2 <<'EOF'
+Package varnishapi was not found in the pkg-config search path.
+Perhaps you should add the directory containing `varnishapi.pc'
+to the PKG_CONFIG_PATH environment variable
+EOF
+ exit 1
+fi
+set -ex
+mkdir -p m4
+aclocal -I m4 -I ${dataroot}/aclocal
+$LIBTOOLIZE --copy --force
+autoheader
+automake --add-missing --copy --foreign
+autoconf

File diff suppressed because it is too large Load Diff

View File

@ -3,19 +3,27 @@
Name: varnish-modules
Version: 0.15.0
Release: 6%{?dist}
Release: 7%{?dist}
Summary: A collection of modules ("vmods") extending Varnish VCL
License: BSD
URL: https://github.com/varnish/%{name}
Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz
Patch10: varnish-modules-0.15.0_fix_saintmode_for_varnish_6.1.patch
Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch
Patch99: varnish-modules-0.15.0.add.bootstrap.patch
# bz #1736943: Fetched forward compatibiliy patch from
# https://github.com/nigoroll/varnish-modules, checkout fe1a981
Patch100: varnish-modules-0.15.0.nigoroll_to_fe1a981_compatible_with_varnish-6.3.0.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: pkgconfig(varnishapi)
BuildRequires: varnish
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
Requires: varnish
Provides: vmod-bodyaccess = %{version}-%{release}
@ -38,12 +46,12 @@ tcp, var, xkey
%prep
%setup -q
%if "%varnishver" >= "6.1"
%patch10 -p1
%endif
%patch11 -p1
%patch99 -p0
%patch100 -p1
%build
sh bootstrap
%configure
%make_build
@ -65,6 +73,10 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro
%{_mandir}/man3/*.3*
%changelog
* Sun Sep 29 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-7
- Added patch from Nils Goroll, compatibility for varnish-6.3, closes bz#1736943
- Rebuilt against varnish-6.3.0
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild