Date: Monday, January 31, 2022 @ 04:32:21 Author: svenstaro Revision: 435571
upgpkg: varnish 7.0.2-2: Use upstream suggestions (FS#73381) Modified: varnish/trunk/PKGBUILD varnish/trunk/varnish.install Deleted: varnish/trunk/varnish.sysusers ------------------+ PKGBUILD | 30 ++++++++++-------------------- varnish.install | 8 -------- varnish.sysusers | 2 -- 3 files changed, 10 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-31 00:35:29 UTC (rev 435570) +++ PKGBUILD 2022-01-31 04:32:21 UTC (rev 435571) @@ -6,7 +6,7 @@ pkgname=varnish pkgver=7.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="High-performance HTTP accelerator" arch=('x86_64') url="https://www.varnish-cache.org/" @@ -17,18 +17,10 @@ backup=('etc/varnish/default.vcl') install=$pkgname.install source=("https://varnish-cache.org/_downloads/varnish-$pkgver.tgz" - "git+https://github.com/varnishcache/pkg-varnish-cache.git#commit=d3e6a3f" - varnish.sysusers) + "git+https://github.com/varnishcache/pkg-varnish-cache.git#commit=a5df068") sha512sums=('5eb08345c95152639266b7ad241185188477f8fd04e88e4dfda1579719a1a413790a0616f25d70994f6d3b8f7640ea80926ece7c547555dad856fd9f6960c9a3' - 'SKIP' - '1eeeba4ab990c1790495f9ff4625ad37f21e155e08e0c255e09d18c44054f3a59613b81c07d8701610b0b266e5181ae8bbae2523138737f3c4f0e1a6c287bb0c') + 'SKIP') -prepare() { - cd "varnish-$pkgver" - - ./autogen.sh -} - build() { cd "varnish-$pkgver" @@ -41,12 +33,13 @@ make } -# check() { -# cd "varnish-$pkgver" -# -# make check -# } +check() { + cd "varnish-$pkgver" + rm bin/varnishtest/tests/m00000.vtc + make check +} + package() { cd "varnish-$pkgver" @@ -56,13 +49,10 @@ install -Dm644 "$srcdir/pkg-varnish-cache/systemd/varnishncsa.service" "$pkgdir/usr/lib/systemd/system/varnishncsa.service" install -Dm755 "$srcdir/pkg-varnish-cache/systemd/varnishreload" "$pkgdir/usr/bin/varnishreload" install -Dm755 "$srcdir/pkg-varnish-cache/systemd/varnish.logrotate" "$pkgdir/etc/logrotate.d/varnish" + install -Dm755 "$srcdir/pkg-varnish-cache/systemd/varnish.sysusers" "$pkgdir/usr/lib/sysusers.d/varnish.conf" - # create varnish:varnish user/group - install -Dm644 "$srcdir/varnish.sysusers" "$pkgdir/usr/lib/sysusers.d/varnish.conf" - # config install -Dm644 "etc/example.vcl" "$pkgdir/etc/varnish/default.vcl" - install -Dm644 "etc/builtin.vcl" "$pkgdir/usr/share/doc/varnish/builtin.vcl" # license install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" Modified: varnish.install =================================================================== --- varnish.install 2022-01-31 00:35:29 UTC (rev 435570) +++ varnish.install 2022-01-31 04:32:21 UTC (rev 435571) @@ -2,11 +2,3 @@ post_remove() { rm -rf var/lib/varnish } - -post_upgrade() { - if [[ $(vercmp 6.0.0-1 "$2") -eq 1 ]]; then - echo ":: You must update your VCL to be compatible with varnish 6. See the" - echo " following upgrade guide to port your configuration:" - echo " http://varnish-cache.org/docs/6.2/whats-new/upgrading-6.2.html" - fi -} Deleted: varnish.sysusers =================================================================== --- varnish.sysusers 2022-01-31 00:35:29 UTC (rev 435570) +++ varnish.sysusers 2022-01-31 04:32:21 UTC (rev 435571) @@ -1,2 +0,0 @@ -u varnishlog -:varnish "Varnish Cache Proxy" -g varnish -