[arch-commits] Commit in varnish/trunk (PKGBUILD varnish.install varnish.service)

Dave Reisner dreisner at nymeria.archlinux.org
Sun Apr 13 15:13:43 UTC 2014


    Date: Sunday, April 13, 2014 @ 17:13:43
  Author: dreisner
Revision: 210292

upgpkg: varnish 4.0.0-1

- push builtin.vcl to documentation, keep example as tracked default.vcl
- include python as dep for building vmods

Modified:
  varnish/trunk/PKGBUILD
  varnish/trunk/varnish.install
  varnish/trunk/varnish.service

-----------------+
 PKGBUILD        |   18 +++++++++++++-----
 varnish.install |    8 ++++++++
 varnish.service |    7 ++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-13 14:05:33 UTC (rev 210291)
+++ PKGBUILD	2014-04-13 15:13:43 UTC (rev 210292)
@@ -5,7 +5,7 @@
 # Contributor: Roberto Alsina <ralsina at kde.org>
 
 pkgname=varnish
-pkgver=3.0.5
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64')
@@ -12,14 +12,16 @@
 url="http://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
+makedepends=('python-docutils')
+optdepends=('python: needed for vmod development')
 backup=('etc/varnish/default.vcl')
 install=$pkgname.install
 source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         varnish-vcl-reload
         varnish.service)
-md5sums=('674d44775cc927aee4601edb37f60198'
+md5sums=('05af2deae29f37b166392a0237756250'
          '03196dee7fc68e75069393d52c370762'
-         '276f1761b3c7c6a83688038659194bbb')
+         '699d118a069c2e63e49c81f275ce2658')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -34,11 +36,17 @@
 }
 
 package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+  cd "$pkgname-$pkgver"
 
+  make DESTDIR="$pkgdir" install
+
   install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
   install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 
+  # 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 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

Modified: varnish.install
===================================================================
--- varnish.install	2014-04-13 14:05:33 UTC (rev 210291)
+++ varnish.install	2014-04-13 15:13:43 UTC (rev 210292)
@@ -4,3 +4,11 @@
 post_remove() {
   rm -rf var/lib/varnish
 }
+
+post_upgrade() {
+  if [ "$(vercmp 4.0.0-1 "$2")" -eq 1 ]; then
+    echo ":: You must update your VCL to be compatible with 4.0.0. See the following"
+    echo "   upgrade guide to port your configuration:"
+    echo "   https://www.varnish-cache.org/docs/trunk/whats-new/upgrading.html"
+  fi
+}

Modified: varnish.service
===================================================================
--- varnish.service	2014-04-13 14:05:33 UTC (rev 210291)
+++ varnish.service	2014-04-13 15:13:43 UTC (rev 210292)
@@ -1,10 +1,15 @@
 [Unit]
-Description=Web Application Accelerator
+Description=High-perfomance HTTP accelerator
 After=network.target
 
 [Service]
 ExecStart=/usr/bin/varnishd -a 0.0.0.0:80,[::]:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
 ExecReload=/usr/bin/varnish-vcl-reload
+PrivateTmp=true
+PrivateDevices=true
+LimitNOFILE=131072
+LimitMEMLOCK=82000
+LimitCORE=infinity
 
 [Install]
 WantedBy=multi-user.target




More information about the arch-commits mailing list