diff --git a/common/shlibs b/common/shlibs index 35cf029b0f8..03be74d08d2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1214,7 +1214,6 @@ libpurple.so.0 libpurple-2.10.6_1 libpurple-client.so.0 libpurple-2.10.6_1 libjabber.so.0 libpurple-2.13.0_1 libgnt.so.0 libgnt-2.10.6_1 -libvarnishapi.so.2 libvarnishapi-6.1.1_1 libao.so.4 libao-1.1.0_1 libjansson.so.4 jansson-2.4_1 libleveldb.so.1 leveldb-1.8.0_1 diff --git a/srcpkgs/libvarnishapi b/srcpkgs/libvarnishapi deleted file mode 120000 index 1605f8f84bb..00000000000 --- a/srcpkgs/libvarnishapi +++ /dev/null @@ -1 +0,0 @@ -varnish \ No newline at end of file diff --git a/srcpkgs/libvarnishapi-devel b/srcpkgs/libvarnishapi-devel deleted file mode 120000 index 1605f8f84bb..00000000000 --- a/srcpkgs/libvarnishapi-devel +++ /dev/null @@ -1 +0,0 @@ -varnish \ No newline at end of file diff --git a/srcpkgs/varnish/INSTALL.msg b/srcpkgs/varnish/INSTALL.msg new file mode 100644 index 00000000000..3b1bebb7afb --- /dev/null +++ b/srcpkgs/varnish/INSTALL.msg @@ -0,0 +1 @@ +varnish is no longer provided by Void Linux, and will be fully removed from the repos on 2019/04/25 diff --git a/srcpkgs/varnish/files/varnish-vcl-reload b/srcpkgs/varnish/files/varnish-vcl-reload deleted file mode 100644 index 7e84a258bf3..00000000000 --- a/srcpkgs/varnish/files/varnish-vcl-reload +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -cfg=${1:-/etc/varnish/default.vcl} -if [ ! -e "$cfg" ]; then - printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2 - exit 1 -fi - -activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $3 }') -if [ -z "$activecfg" ]; then - printf 'ERROR: No active VCL found!\n' >&2 - exit 1 -fi - -newcfg=$(date +'vcl-%s') -printf 'INFO: using new config %s\n' "$cfg" - -varnishadm "vcl.load $newcfg $cfg" && -varnishadm "vcl.use $newcfg" && -varnishadm "vcl.discard $activecfg" diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run deleted file mode 100755 index 8080615090f..00000000000 --- a/srcpkgs/varnish/files/varnishd/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nogroup -F diff --git a/srcpkgs/varnish/patches/musl.patch b/srcpkgs/varnish/patches/musl.patch deleted file mode 100644 index a417c319043..00000000000 --- a/srcpkgs/varnish/patches/musl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- include/vpf.h 2016-03-03 14:40:01.000000000 +0100 -+++ include/vpf.h 2018-01-11 11:45:26.521900821 +0100 -@@ -30,6 +30,8 @@ - #ifndef VPF_H_INCLUDED - #define VPF_H_INCLUDED - -+#include -+ - struct vpf_fh; - - struct vpf_fh *VPF_Open(const char *path, mode_t mode, pid_t *pidptr); ---- include/vsb.h 2017-11-14 14:39:22.000000000 +0100 -+++ include/vsb.h 2018-01-11 11:48:15.505912873 +0100 -@@ -31,6 +31,8 @@ - #ifndef VSB_H_INCLUDED - #define VSB_H_INCLUDED - -+#include -+ - /* - * Structure definition - */ diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template index 173e0740359..03e959cf22b 100644 --- a/srcpkgs/varnish/template +++ b/srcpkgs/varnish/template @@ -1,49 +1,9 @@ # Template file for 'varnish' pkgname=varnish version=6.1.1 -revision=2 -lib32disabled=yes -build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="pkg-config python python-docutils python-Sphinx" -makedepends="pcre-devel readline-devel jemalloc-devel" -short_desc="A fast caching HTTP reverse proxy" -maintainer="Juan RP " -license="BSD-2-Clause" +revision=3 +noarch=yes +build_style=meta +short_desc="A fast caching HTTP reverse proxy (removed package)" +license="metapackage" homepage="https://varnish-cache.org/" -distfiles="https://varnish-cache.org/_downloads/${pkgname}-${version}.tgz" -checksum=e0ee7c88a8149d8890b26fd9e1d909859ea895a39ca188d76a96869cff87c93d - -conf_files="/etc/varnish/default.vcl" -make_dirs="/var/varnish 750 nobody nogroup" - -nocross="Cannot run test program when cross compiling (PCRE_JIT)" - -case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" libexecinfo-devel" - broken="Segfaults when running ../../bin/varnishd/varnishd -x cli > include/cli.rst" - ;; -esac - -post_install() { - vinstall etc/example.vcl 644 etc/varnish default.vcl - vsv varnishd - vlicense LICENSE -} - -libvarnishapi_package() { - short_desc+=" - API runtime library" - pkg_install() { - vmove "usr/lib/*.so.*" - } -} -libvarnishapi-devel_package() { - depends="libvarnishapi>=${version}_${revision}" - short_desc+=" - API development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share/man/man3 - } -} diff --git a/srcpkgs/varnish/update b/srcpkgs/varnish/update deleted file mode 100644 index 30fbc3a065b..00000000000 --- a/srcpkgs/varnish/update +++ /dev/null @@ -1 +0,0 @@ -site="https://varnish-cache.org/releases/index.html"