diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-18 17:05:40 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 19:23:48 +0100 |
commit | 05109e8ef82f932077eba9d3a7be7e80cff478c1 (patch) | |
tree | 2aa5dfdab9be53b5fe0f6aad411b08f62c5f5d69 /gnu/packages/web.scm | |
parent | c11f86ff164b750151645caae9cdecca3570d876 (diff) | |
download | guix-05109e8ef82f932077eba9d3a7be7e80cff478c1.tar.gz |
gnu: varnish: Update to 6.2.0.
* gnu/packages/web.scm (varnish): Update to 6.2.0. [arguments]: Remove obsolete configure flag. Add substitution for /bin/rm.
Diffstat (limited to 'gnu/packages/web.scm')
-rw-r--r-- | gnu/packages/web.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 06e53aab4c..944459d4fd 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4810,13 +4810,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.1.1") + (version "6.2.0") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "0gf9hzzrr1lndbbqi8cwlfasi7l517cy3nbgna88i78lm247rvp0")))) + "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -4824,10 +4824,6 @@ deployments.") (string-append "PTHREAD_CC=" (assoc-ref %build-inputs "gcc") "/bin/gcc") - ;; XXX: Disable PCRE-JIT to work around a segmentation - ;; fault when using jemalloc 5.x: - ;; <https://github.com/varnishcache/varnish-cache/issues/2817> - "--disable-pcre-jit" "--localstatedir=/var") #:phases (modify-phases %standard-phases @@ -4839,6 +4835,8 @@ deployments.") (("/bin/sh") (which "sh"))) (substitute* "bin/varnishd/mgt/mgt_shmem.c" (("rm -rf") (string-append (which "rm") " -rf"))) + (substitute* "bin/varnishtest/vtc_main.c" + (("/bin/rm") (which "rm"))) #t)) (add-before 'install 'patch-Makefile (lambda _ |