Tue May 14 01:18:40 PDT 2013

4 files changed, 9 insertions, 79 deletions

diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index dc7f84eac..e5fb00be4 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165520 2012-08-22 17:11:02Z dreisner $
+# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
@@ -6,37 +6,34 @@
 
 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"
-        "$pkgname.conf.d"
-        "rc.$pkgname"
         varnish-vcl-reload
         varnish.service)
 md5sums=('714310c83fdbd2061d897dacd3f63d8b'
-         '3b563d2d9bd74a819fdb116d69d022f0'
-         '40b4c83b3ad225ed2f4bd7e677fe41a2'
          '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
 }
@@ -44,14 +41,7 @@ build() {
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
-  # reload helper
   install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
-
-  # sysvinit
-  install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname"
-  install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname"
-
-  # systemd
   install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 
   # license
diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish
deleted file mode 100644
index 352f07dbd..000000000
--- a/extra/varnish/rc.varnish
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/varnish
-
-pidfile=/run/varnish.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-    if [[ ! -d /proc/$PID ]]; then
-      # stale pidfile
-      unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Varnish Reverse Proxy"
-    if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then
-      add_daemon varnish
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Varnish Reverse Proxy"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon varnish
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-  ;;
-esac
diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d
deleted file mode 100644
index 4cf40c4fc..000000000
--- a/extra/varnish/varnish.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Command line options to varnishd
-#
-
-VARNISH_CFG="/etc/varnish/default.vcl"
-
-VARNISHD_OPTS="-a 0.0.0.0:80 \
-               -f $VARNISH_CFG \
-               -T localhost:6082 \
-               -s malloc,64M
-               -u nobody -g nobody"
diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service
index d5b0aa66d..851e32140 100644
--- a/extra/varnish/varnish.service
+++ b/extra/varnish/varnish.service
@@ -3,7 +3,7 @@ Description=Web Application Accelerator
 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]