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

[Dave Reisner]

    Date: Monday, May 13, 2013 @ 19:50:55
  Author: dreisner
Revision: 185367

upgpkg: varnish 3.0.3-3

- move daemon binary to /usr/bin, update service file
- remove bogus backup entry

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

-----------------+
 PKGBUILD        |   13 +++++++------
 varnish.service |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-13 17:49:56 UTC (rev 185366)
+++ PKGBUILD	2013-05-13 17:50:55 UTC (rev 185367)
@@ -6,14 +6,13 @@
 
 pkgname=varnish
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64')
 url="http://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
-backup=('etc/conf.d/varnish'
-        'etc/varnish/default.vcl')
+backup=('etc/varnish/default.vcl')
 install=$pkgname.install
 options=('!libtool')
 source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
@@ -21,18 +20,20 @@
         varnish.service)
 md5sums=('714310c83fdbd2061d897dacd3f63d8b'
          '03196dee7fc68e75069393d52c370762'
-         '1adf5282d111a9e00e99786045451016')
+         'a59b17d8e3066abcf3dd7755a2212dd4')
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # disable JIT compilation for now, as it's crashy on VCL reload
+  # disable JIT compilation, as it's crashy crashy (bug in PCRE)
+  # this is flagged out and disabled by default in $nextrelease of Varnish.
   sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c
 
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
-    --localstatedir=/var/lib
+    --localstatedir=/var/lib \
+    --sbindir=/usr/bin
 
   make
 }

Modified: varnish.service
===================================================================
--- varnish.service	2013-05-13 17:49:56 UTC (rev 185366)
+++ varnish.service	2013-05-13 17:50:55 UTC (rev 185367)
@@ -3,7 +3,7 @@
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
+ExecStart=/usr/bin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
 ExecReload=/usr/bin/varnish-vcl-reload
 
 [Install]