Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-selector
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
libvmod-selector
Commits
af5434c2
Commit
af5434c2
authored
May 21, 2021
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set version maxwait-6.6.0, and update RPMs for compatibility.
parent
a6dddff2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
35 deletions
+20
-35
configure.ac
configure.ac
+1
-1
pkg
pkg/rpm/pkg
+11
-6
varnishcache_varnish66.repo
pkg/rpm/varnishcache_varnish66.repo
+0
-21
vmod-selector.spec
pkg/rpm/vmod-selector.spec
+8
-7
No files found.
configure.ac
View file @
af5434c2
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], [
maxwait-6.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)
...
...
pkg/rpm/pkg
View file @
af5434c2
...
@@ -37,18 +37,23 @@ rm /home/builder/.rpmmacros
...
@@ -37,18 +37,23 @@ rm /home/builder/.rpmmacros
cd
/home/builder
cd
/home/builder
mkdir
-p
rpmbuild/
{
BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS
}
mkdir
-p
rpmbuild/
{
BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS
}
cp
/srv/vmod-selector.spec rpmbuild/SPECS
cp
/srv/vmod-selector.spec rpmbuild/SPECS
cp
/srv/vmod-selector-
${
VERSION
}
.tar.gz rpmbuild/SOURCES
cp
/srv/vmod-selector-maxwait-
${
VERSION
}
.tar.gz rpmbuild/SOURCES
# update the build env
set
+e
sudo
yum check-update
-y
-q
set
-e
sudo
yum upgrade
-y
-q
# set uplex repo for varnish-maxwait
sudo
yum-config-manager
--add-repo
https://pkg.uplex.de/rpm/7/uplex-varnish/x86_64/
# install epel7 repo
# install epel7 repo
sudo
yum
install
-y
-q
\
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
sudo cp
/srv/varnishcache_varnish66.repo /etc/yum.repos.d/
sudo
yum
-q
makecache
-y
--disablerepo
=
'*'
--enablerepo
=
'varnishcache_varnish66'
# build requirements
# build requirements
sudo
yum
install
--nogpgcheck
-y
-q
varnish-maxwait-devel
sudo
yum
install
-y
-q
varnish-devel pkgconfig make gcc python-docutils
sudo
yum
install
-y
-q
varnish-devel pkgconfig make gcc python-docutils
# build RPMs
# build RPMs
...
...
pkg/rpm/varnishcache_varnish66.repo
deleted
100644 → 0
View file @
a6dddff2
[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/vmod-selector.spec
View file @
af5434c2
# -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 strings
Name: vmod-selector
Name: vmod-selector
-maxwait
Version: %{_version}
Version: %{_version}
Release: %{_release}%{?dist}
Release: %{_release}%{?dist}
License: BSD
License: BSD
...
@@ -9,11 +9,9 @@ Group: System Environment/Daemons
...
@@ -9,11 +9,9 @@ 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 varnish66 at packagecloud
Requires: varnish-maxwait = 6.6.0
# This is the Requires for VMOD ABI compatibility with VRT >= 13.0.
Requires: varnishd(vrt)%{?_isa} >= 13
BuildRequires: varnish-
devel >
= 6.6.0
BuildRequires: varnish-
maxwait-devel
= 6.6.0
BuildRequires: pkgconfig
BuildRequires: pkgconfig
BuildRequires: make
BuildRequires: make
BuildRequires: gcc
BuildRequires: gcc
...
@@ -26,7 +24,7 @@ BuildRequires: python-docutils >= 0.6
...
@@ -26,7 +24,7 @@ BuildRequires: python-docutils >= 0.6
#BuildRequires: libtool
#BuildRequires: libtool
#BuildRequires: python-docutils >= 0.6
#BuildRequires: python-docutils >= 0.6
Provides: vmod-selector
, vmod-selector
-debuginfo
Provides: vmod-selector
-maxwait, vmod-selector-maxwait
-debuginfo
%description
%description
Varnish Module for matching fixed strings and prefixes, and
Varnish Module for matching fixed strings and prefixes, and
...
@@ -73,7 +71,10 @@ rm -rf %{buildroot}
...
@@ -73,7 +71,10 @@ rm -rf %{buildroot}
/sbin/ldconfig
/sbin/ldconfig
%changelog
%changelog
* Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
* Fri May 21 2021 Geoff Simmons <geoff@uplex.de> - %{_version}-%{_release}
- Compatibility with varnish-maxwait (6.6.0)
* Wed Jan 27 2021 Geoff Simmons <geoff@uplex.de> - 1.6.0-1
- Require VRT 13.0, compatible with Varnish 6.6
- Require VRT 13.0, compatible with Varnish 6.6
- Retains the legacy VMOD interface and search implementation,
- Retains the legacy VMOD interface and search implementation,
prior to the breaking changes beginning with versions 2.x.
prior to the breaking changes beginning with versions 2.x.
...
...
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