[arch-commits] Commit in varnish/repos (16 files)

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


    Date: Sunday, April 13, 2014 @ 17:14:17
  Author: dreisner
Revision: 210293

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  varnish/repos/extra-i686/PKGBUILD
    (from rev 210292, varnish/trunk/PKGBUILD)
  varnish/repos/extra-i686/varnish-vcl-reload
    (from rev 210292, varnish/trunk/varnish-vcl-reload)
  varnish/repos/extra-i686/varnish.install
    (from rev 210292, varnish/trunk/varnish.install)
  varnish/repos/extra-i686/varnish.service
    (from rev 210292, varnish/trunk/varnish.service)
  varnish/repos/extra-x86_64/PKGBUILD
    (from rev 210292, varnish/trunk/PKGBUILD)
  varnish/repos/extra-x86_64/varnish-vcl-reload
    (from rev 210292, varnish/trunk/varnish-vcl-reload)
  varnish/repos/extra-x86_64/varnish.install
    (from rev 210292, varnish/trunk/varnish.install)
  varnish/repos/extra-x86_64/varnish.service
    (from rev 210292, varnish/trunk/varnish.service)
Deleted:
  varnish/repos/extra-i686/PKGBUILD
  varnish/repos/extra-i686/varnish-vcl-reload
  varnish/repos/extra-i686/varnish.install
  varnish/repos/extra-i686/varnish.service
  varnish/repos/extra-x86_64/PKGBUILD
  varnish/repos/extra-x86_64/varnish-vcl-reload
  varnish/repos/extra-x86_64/varnish.install
  varnish/repos/extra-x86_64/varnish.service

---------------------------------+
 /PKGBUILD                       |  104 ++++++++++++++++++++++++++++++++++++++
 /varnish-vcl-reload             |   40 ++++++++++++++
 /varnish.install                |   28 ++++++++++
 /varnish.service                |   30 ++++++++++
 extra-i686/PKGBUILD             |   44 ----------------
 extra-i686/varnish-vcl-reload   |   20 -------
 extra-i686/varnish.install      |    6 --
 extra-i686/varnish.service      |   10 ---
 extra-x86_64/PKGBUILD           |   44 ----------------
 extra-x86_64/varnish-vcl-reload |   20 -------
 extra-x86_64/varnish.install    |    6 --
 extra-x86_64/varnish.service    |   10 ---
 12 files changed, 202 insertions(+), 160 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-i686/PKGBUILD	2014-04-13 15:14:17 UTC (rev 210293)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Douglas Soares de Andrade
-# Contributor: Roberto Alsina <ralsina at kde.org>
-
-pkgname=varnish
-pkgver=3.0.5
-pkgrel=1
-pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
-url="http://www.varnish-cache.org/"
-license=('BSD')
-depends=('gcc' 'libedit' 'pcre')
-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'
-         '03196dee7fc68e75069393d52c370762'
-         '276f1761b3c7c6a83688038659194bbb')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib \
-    --sbindir=/usr/bin
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
-  install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-
-  # license
-  install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: varnish/repos/extra-i686/PKGBUILD (from rev 210292, varnish/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Douglas Soares de Andrade
+# Contributor: Roberto Alsina <ralsina at kde.org>
+
+pkgname=varnish
+pkgver=4.0.0
+pkgrel=1
+pkgdesc="High-performance HTTP accelerator"
+arch=('i686' 'x86_64')
+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=('05af2deae29f37b166392a0237756250'
+         '03196dee7fc68e75069393d52c370762'
+         '699d118a069c2e63e49c81f275ce2658')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var/lib \
+    --sbindir=/usr/bin
+
+  make
+}
+
+package() {
+  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 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: extra-i686/varnish-vcl-reload
===================================================================
--- extra-i686/varnish-vcl-reload	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-i686/varnish-vcl-reload	2014-04-13 15:14:17 UTC (rev 210293)
@@ -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"

Copied: varnish/repos/extra-i686/varnish-vcl-reload (from rev 210292, varnish/trunk/varnish-vcl-reload)
===================================================================
--- extra-i686/varnish-vcl-reload	                        (rev 0)
+++ extra-i686/varnish-vcl-reload	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,20 @@
+#!/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"

Deleted: extra-i686/varnish.install
===================================================================
--- extra-i686/varnish.install	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-i686/varnish.install	2014-04-13 15:14:17 UTC (rev 210293)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove localstatedir -- compiled VCL and slab files will still be here.
-post_remove() {
-  rm -rf var/lib/varnish
-}

Copied: varnish/repos/extra-i686/varnish.install (from rev 210292, varnish/trunk/varnish.install)
===================================================================
--- extra-i686/varnish.install	                        (rev 0)
+++ extra-i686/varnish.install	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# remove localstatedir -- compiled VCL and slab files will still be here.
+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
+}

Deleted: extra-i686/varnish.service
===================================================================
--- extra-i686/varnish.service	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-i686/varnish.service	2014-04-13 15:14:17 UTC (rev 210293)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Web Application 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
-
-[Install]
-WantedBy=multi-user.target

Copied: varnish/repos/extra-i686/varnish.service (from rev 210292, varnish/trunk/varnish.service)
===================================================================
--- extra-i686/varnish.service	                        (rev 0)
+++ extra-i686/varnish.service	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,15 @@
+[Unit]
+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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-x86_64/PKGBUILD	2014-04-13 15:14:17 UTC (rev 210293)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Douglas Soares de Andrade
-# Contributor: Roberto Alsina <ralsina at kde.org>
-
-pkgname=varnish
-pkgver=3.0.5
-pkgrel=1
-pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
-url="http://www.varnish-cache.org/"
-license=('BSD')
-depends=('gcc' 'libedit' 'pcre')
-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'
-         '03196dee7fc68e75069393d52c370762'
-         '276f1761b3c7c6a83688038659194bbb')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib \
-    --sbindir=/usr/bin
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
-  install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-
-  # license
-  install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: varnish/repos/extra-x86_64/PKGBUILD (from rev 210292, varnish/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Contributor: Douglas Soares de Andrade
+# Contributor: Roberto Alsina <ralsina at kde.org>
+
+pkgname=varnish
+pkgver=4.0.0
+pkgrel=1
+pkgdesc="High-performance HTTP accelerator"
+arch=('i686' 'x86_64')
+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=('05af2deae29f37b166392a0237756250'
+         '03196dee7fc68e75069393d52c370762'
+         '699d118a069c2e63e49c81f275ce2658')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var/lib \
+    --sbindir=/usr/bin
+
+  make
+}
+
+package() {
+  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 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: extra-x86_64/varnish-vcl-reload
===================================================================
--- extra-x86_64/varnish-vcl-reload	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-x86_64/varnish-vcl-reload	2014-04-13 15:14:17 UTC (rev 210293)
@@ -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"

Copied: varnish/repos/extra-x86_64/varnish-vcl-reload (from rev 210292, varnish/trunk/varnish-vcl-reload)
===================================================================
--- extra-x86_64/varnish-vcl-reload	                        (rev 0)
+++ extra-x86_64/varnish-vcl-reload	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,20 @@
+#!/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"

Deleted: extra-x86_64/varnish.install
===================================================================
--- extra-x86_64/varnish.install	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-x86_64/varnish.install	2014-04-13 15:14:17 UTC (rev 210293)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove localstatedir -- compiled VCL and slab files will still be here.
-post_remove() {
-  rm -rf var/lib/varnish
-}

Copied: varnish/repos/extra-x86_64/varnish.install (from rev 210292, varnish/trunk/varnish.install)
===================================================================
--- extra-x86_64/varnish.install	                        (rev 0)
+++ extra-x86_64/varnish.install	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# remove localstatedir -- compiled VCL and slab files will still be here.
+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
+}

Deleted: extra-x86_64/varnish.service
===================================================================
--- extra-x86_64/varnish.service	2014-04-13 15:13:43 UTC (rev 210292)
+++ extra-x86_64/varnish.service	2014-04-13 15:14:17 UTC (rev 210293)
@@ -1,10 +0,0 @@
-[Unit]
-Description=Web Application 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
-
-[Install]
-WantedBy=multi-user.target

Copied: varnish/repos/extra-x86_64/varnish.service (from rev 210292, varnish/trunk/varnish.service)
===================================================================
--- extra-x86_64/varnish.service	                        (rev 0)
+++ extra-x86_64/varnish.service	2014-04-13 15:14:17 UTC (rev 210293)
@@ -0,0 +1,15 @@
+[Unit]
+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