diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2012-12-17 19:06:47 +0100 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2012-12-17 19:55:29 +0100 |
| commit | 9ebf4c59cc8e931bbb13b2504d96c648f95c703f (patch) | |
| tree | 840a9569e13fff2825366f1092c7730a37f4be77 | |
| parent | 814e7531ff9a241a405d87e61162f45a42d8e031 (diff) | |
| download | aports-9ebf4c59cc8e931bbb13b2504d96c648f95c703f.tar.bz2 aports-9ebf4c59cc8e931bbb13b2504d96c648f95c703f.tar.xz | |
main/varnish: upgrade to 3.0.3
| -rw-r--r-- | main/varnish/APKBUILD | 12 | ||||
| -rw-r--r-- | main/varnish/varnish-3.0.3-pthread-uclibc.patch | 35 |
2 files changed, 42 insertions, 5 deletions
diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD index e2236b1bdf..6f61360d99 100644 --- a/main/varnish/APKBUILD +++ b/main/varnish/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=varnish -pkgver=3.0.2 -pkgrel=7 +pkgver=3.0.3 +pkgrel=0 pkgdesc="High-performance HTTP accelerator" url="http://www.varnish-cache.org/" arch="all" @@ -15,7 +15,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="http://repo.varnish-cache.org/source/varnish-$pkgver.tar.gz varnishd.initd varnishd.confd - varnishd.logrotate" + varnishd.logrotate + varnish-3.0.3-pthread-uclibc.patch" _builddir="$srcdir"/varnish-$pkgver prepare() { @@ -59,7 +60,8 @@ libs() { mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir"/usr/lib/ } -md5sums="c8eae0aabbe66b6daabdf3a1f58cd47a varnish-3.0.2.tar.gz +md5sums="714310c83fdbd2061d897dacd3f63d8b varnish-3.0.3.tar.gz 4f78964bf3eb6f1fd0fd2d533575982e varnishd.initd 6dd289ba81464eacc238109143126d6a varnishd.confd -a6cb8a43c9465699cf956dc992998225 varnishd.logrotate" +a6cb8a43c9465699cf956dc992998225 varnishd.logrotate +8c5532869bea7f668e2ce5d4585359f8 varnish-3.0.3-pthread-uclibc.patch" diff --git a/main/varnish/varnish-3.0.3-pthread-uclibc.patch b/main/varnish/varnish-3.0.3-pthread-uclibc.patch new file mode 100644 index 0000000000..93f3da3f87 --- /dev/null +++ b/main/varnish/varnish-3.0.3-pthread-uclibc.patch @@ -0,0 +1,35 @@ +Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc + +Because of the difference in how uClibc and glibc stack their header +files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h +on a uClibc system, whereas it does not on a glibc system. This happens +in mgt.h and mgt_main.c. This patch refines the check in those files +to take this fact into consideration. + +X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294 +--- + +diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h +index 905fbcc..5d3ab09 100644 +--- a/bin/varnishd/mgt.h ++++ b/bin/varnishd/mgt.h +@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path; + syslog(pri, fmt, __VA_ARGS__); \ + } while (0) + +-#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT) ++#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT) + #error "Keep pthreads out of in manager process" + #endif +diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c +index 1b7f1e3..dce42d9 100644 +--- a/bin/varnishd/varnishd.c ++++ b/bin/varnishd/varnishd.c +@@ -656,6 +656,6 @@ main(int argc, char * const *argv) + exit(exit_status); + } + +-#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT) ++#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT) + #error "Keep pthreads out of in manager process" + #endif |