Fix build on uclibc, bug #444294

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 61 insertions, 9 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index ab9f276915bb..389c13ea6cf3 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.52 2012/08/23 20:59:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.53 2012/11/22 20:54:53 blueness Exp $
+
+  22 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
+  +files/varnish-3.0.3-pthread-uclibc.patch, varnish-3.0.3.ebuild:
+  Fix build on uclibc, bug #444294
 
 *varnish-3.0.3 (23 Aug 2012)
 
@@ -234,4 +238,3 @@
   19 Oct 2006; Thilo Bangert <bangert@gentoo.org> +files/varnishd.confd,
   +files/varnishd.initd, +metadata.xml, +varnish-1.0.1.ebuild:
   varnish - Varnish is an HTTP accelerator. aka a better squid
-
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 8bb4fff6ec35..07a3db74147a 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -7,6 +7,7 @@ AUX varnish-2.1.4-find-rst2man.py.patch 558 SHA256 3bf1bbc6b8b103c9cfbe4e0ef3661
 AUX varnish-2.1.4-virtual-ncsa.patch 1540 SHA256 6f08c3d21799cb845712f5c5590727521d857a5146347c582f6618a257825ecc SHA512 ab834b3560ac876f175e4275e19ab6ec6c701d7c39574ea18e624c324ead91bd7e0d3d1aed73ce89046ce53af563b413813da31b9e535ff91d0278f89fc799eb WHIRLPOOL c539674dfa77114bf1321c48aaad6fe664ddfa9fcce5b7116e866f3283e729efa6b676b5658656ad67ee4dea3a287be7161ab3079665544ff1425f5b063b5a7a
 AUX varnish-3.0.2-automagic.patch 1653 SHA256 de03979318fbde390e56106ed77fc32451bf904e7b564998e452a6e151218dae SHA512 62d17701574664fa4ce1a9cfe7204b4eea97a9f0deb822384878169bcb31839e12dd7ff7d1603779ea6cba6f20e07fc8a92eced8c7b5a9e5dca02ae449db66d0 WHIRLPOOL 6c03bd168e894cf87841a90ec8ec5e03f792d2b3f0e0e5ae15622225971667ec76f84564b7c57a6a14ac20169e9d7706bc834dc820edd69d6268ce130703f74e
 AUX varnish-3.0.3-automagic.patch 2110 SHA256 01cbcc5f2aabf1d0a54b06fc53352d7d73c30b5c899d5327b7cf34a696367a9a SHA512 b81e1d41eb79df720c3d8b42ae84f98de3a9d4b62a0b5f3f5f4aff14ed70d5f9e1216a66f564a85a82916cdcaca4eb34b4defaa30811dc8e0e3cf2c5bca6e515 WHIRLPOOL 8bc5bd2222d518eefd077e283a8a5941a2ef7cdb19552ae60157c1c5a3c11c24c41c11008424d86df44dc69e2e9f572f33fa4f11085f045a664032e3a8b09cd0
+AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f SHA512 c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8 WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnishd.confd 311 SHA256 06330cb231b6d64d85be34e5537c3c8741c0d50291f82cd549a2d0685f294e37 SHA512 8564151fbea198947c2db7ae28ab1d9865461fab81dc6c75fef9ad487b3b1d06468fe787319a479a57cdbee95eb7575df43d74839a590a843d6c8d812c9c7ba4 WHIRLPOOL c239fedf66d6f2a4d74af448d37204255b9a6df7ff275e490d9e40e8ae6151c29b477dc62a72f5fdb1325decfcfce139fba601734a283509ba511d9d5b0c7b5b
 AUX varnishd.initd 1047 SHA256 e8c46f79bf38a6e6aebfbbfea6dcbdd69865527301d03928c7ee4f2a379624a5 SHA512 ddedba87d69f2606edde1fcc9f7851f647e1d603b3fd6ef8e536a7a68ce55cd8e09d66cb93bdd7e7ab95311edadad6aa2eaab774152dbe204a40b0835e4fdc61 WHIRLPOOL 8284dd04e4ded9bc7244a78852720d50770792894d531bac5663c343ac0b191a2639ac4cda43b1c8e0a1bd2a9ec249afea9cb7852080d0c7eda704ae9e4aa899
 AUX varnishd.logrotate 115 SHA256 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e SHA512 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c WHIRLPOOL 87f82d58df67980478471468e87686edf349c4dc5e91d43f0b40f7e4ebc895e7a159e6f41336cbe5bf4dcf3c9646e106138a980f5ba5b9856f9a1628f136e79a
@@ -15,13 +16,23 @@ DIST varnish-3.0.2.tar.gz 1977852 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291
 DIST varnish-3.0.3.tar.gz 2070020 SHA256 2d37d18d952f58b208ac3a0706d4d3e4c0de304b1fcc9df5019571c75f148ab2 SHA512 5865248135e5c4dad4f104cf8efcc317836fdb580213f4fb898d67f3a4a9a7afb8d40f2fcfe986ba81d5774ab4f772ed45998c12356d92d463c6eb97d20d5942 WHIRLPOOL 00d7a8e0329f2efce5f35c51af03e407493e2a49831c5e5201e007497e6f79f45eeb006c170a9cc26221d5a83000d6e0e5c8fcc9a4d19435fef714590ff8ed49
 EBUILD varnish-2.0.4-r1.ebuild 1404 SHA256 b8f9c1d52f0142be9cd411f73dfc0a4bb2957baebc311bce5f3fc9ef9d74b451 SHA512 ba2e71c114eab1f1a23610e41d225236222bb066a7e27315ec46f0943a585c66a4b4b145e00327b4c44887369f9c1f7378fe66433e624367398f4e4ad8d4deea WHIRLPOOL dcb22e78109eddf10e8baa9f9dda85a25519ea2537fcda28a27f275a7da973b406e180002d50437823798acc946c33da58972c07fc39139aa99f5d2f79f5fa87
 EBUILD varnish-3.0.2-r1.ebuild 1590 SHA256 ae9f08eb8d8a0ddcc5bd806fd807efc91614b4bd69f48b9b6cbf34a90cc545c9 SHA512 efc1d3144248540a971bfee88e71587a565b1effe2ef4813d40a49415460aa1289e7868dc0c1985b92bf3098ce2ca62d9c066a5977af76ebac2a87eba76fcadf WHIRLPOOL bc70951ba5f16fbad710bf96bf8ed0b9ad904147c83272a1700a751f5584132e14532e7825f7f85dbc88a447a22a094f9039e6636d43405442a102e75b4defbb
-EBUILD varnish-3.0.3.ebuild 1596 SHA256 626f07279180ef2833272981c3ff933d9779b820f477e729c8ad08ba4f0ee94c SHA512 2819dd3179015547c58588b4ecab564e3ef072313bd3cee80344300baef4492061535fd20e567f189761b29ae3c72749e9901eba0e7442c584fd567881e3eeab WHIRLPOOL f893d3c00b593119734ce45a9b3c8b3651db719d35c12de77d695af19038e3c4e2576b19cfcf0635f8269fe9c64929c8a54b4ae9f4c98085476c0c75790fc367
-MISC ChangeLog 7817 SHA256 28bce1bf5f9313356f52c6dca786f6c0522efccbc90bcc5e0ad25fdb94ab4c9d SHA512 2ad7058b48806cc240281fb332a482d5bb568c5af0e080d744660edc70e604a43d0d62c7dba06c2dec87d8233150db5d45eaf537e96c609c3c589529739b9b2e WHIRLPOOL 1f4422779e538ca8e37432c4123549ad977dacf8a9d5ad83e2570f75d31650412441a6d527e35ffc86dab803b97b377f4d8da245ec53afe82ed204616a081069
+EBUILD varnish-3.0.3.ebuild 1645 SHA256 b1020a60b9409a304ba3d2dd5dd4631a5959abf01ea5fac0bae3005544ddcc2c SHA512 624ffa0855cccb4ed8543547213a1b93c27d73248ad51c24c03272d208c56da8379afb5d3d59bcbd892337f2842c2db6a90e198e7c0c3bef44c584c5200d3bd9 WHIRLPOOL 02590c9875d68d4f75e7627fc4cfbdf28d26a28b79d6ef745d77a6ee0d6a34630ebacd57579235cc22b5bb72cbad6ec8b53104ca0231274661c29b02d0d994f8
+MISC ChangeLog 7974 SHA256 9cb75ff8ce7d4b67269844fa920a9a8c5bd28d644bce7fb767cdc041d8559cf6 SHA512 339fc37d5fdad3c70ea0ad716048b5e11c1e729754c9db6806c330f92e81b3d447fc4400cc17b1e4562f835155e1beaa1aa53054d71962fec298c397e40d529f WHIRLPOOL 29d98e053cd243d2ccb7d3bb8bb6fb492407c88c6c4c8a43a472b3216c4b9edeb98d0fa7b8271c39945ac8b9975fb353c727c9404e2e79a10bf9938165639453
 MISC metadata.xml 1164 SHA256 40643a9267541e9550f18776cc5ab97e443ca53dc9e59f768cef18f3a6ef732b SHA512 15c7fe9cf443d0b1917feab552c494a36a85a4fa7f0937971adc1608ca92f9304251b300138fc9c4144b1a80da3123c9e7768ee7b507c5872842c05bd57077ae WHIRLPOOL 0c0aa67266333f1090915e1ed08a9a315f6a01c7c7a57f5793bc3f97ddb0f390daa8a6830492d2bda084bcff65d950b3af2a8bf448f1e0c913a06e19eb684a24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlA2mbcACgkQl5yvQNBFVTVtUACfTZ9wMz5me+X8Mb6u1R7/BPQo
-/UgAnRDbVM8mZysDjhvMTG5qwapz1XpB
-=A0p0
+iQIcBAEBCAAGBQJQrpEcAAoJEJOE+m71LUu6fPoP/3Pqgn4D+CBeU/aULWroCh3n
+9Gm9cdhm1mfPgQXBDoZ55OV9Wz1YfZY7P3CXPQFAXBQmr1FbSY1+c+66acT4MNCA
+QRrTbPloxcE8h9NsAA+oT1oWHB6QoJ43+fKnaVNtHp152dQTZ9LPdtaPbyv0o26Z
+9k+dzW2gLIBY4BWx1y4Skxyg2SKkdGbFbZYmN0IpSo9snf2zWSOjCtvDw95yyfZC
+wBsQsHApZp7n2Mjtj8OOlLTpkOvqp//ot2TpZR+Vy6Kb9y9Iw0cY+ZmIJ66Jt9Fp
+G2PBo0U/CXXW9jXj5UIJbH4QQdAw7X1g/unXeTae1k0C6I2YH587piY1cImc5rUU
+oZgihQCGCSA6tK9/GUivvT/NQMB34rn4I9ZpLFebnawmsOgtzl+ij8qkmOlerGTa
+uUz5Id6e6/Fp1S3Ce+fGTckOydWW/TnDMLYS07/Dyd53bm9F74mY7xjAcfT4ZxFv
+1wjQZZiPOb3hRJBqtiRvPuMO79/oV+se29t9w+d3WtySmcG621AQNIL5kDikwEAG
+RfTi6x6JPOtuZwTGXkFA/qLSaZk/dV+N66jq2KiNrqKp5KDSAwv/udMhgwlcTuvz
+sQ5RXuKCaIfI6IkUag7LPMAU2yPZ0y6wwZ+Mms3EO3+EAa4qRZzqFoZMZ/sURRSK
+Vom60rm/wAug20Qmb7O7
+=lfJf
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch b/www-servers/varnish/files/varnish-3.0.3-pthread-uclibc.patch
new file mode 100644
index 000000000000..93f3da3f878e
--- /dev/null
+++ b/www-servers/varnish/files/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
diff --git a/www-servers/varnish/varnish-3.0.3.ebuild b/www-servers/varnish/varnish-3.0.3.ebuild
index c2e8ac5de738..59861be943fb 100644
--- a/www-servers/varnish/varnish-3.0.3.ebuild
+++ b/www-servers/varnish/varnish-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.3.ebuild,v 1.1 2012/08/23 20:59:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.3.ebuild,v 1.2 2012/11/22 20:54:53 blueness Exp $
 
 EAPI="4"
 
@@ -29,7 +29,10 @@ RESTRICT="test" #315725
 
 DOCS=( README doc/changes.rst )
 
-PATCHES=( "${FILESDIR}"/${PN}-3.0.3-automagic.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.3-automagic.patch
+	"${FILESDIR}"/${PN}-3.0.3-pthread-uclibc.patch
+)
 
 src_prepare() {
 	autotools-utils_src_prepare