Fix AC_CHECK_LIB for malloc_conf in jemalloc-2 and -3, bug #461638

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

3 files changed, 26 insertions, 21 deletions

diff --git a/www-servers/varnish/ChangeLog b/www-servers/varnish/ChangeLog
index 1d04d0b8fcdd..8f1239b3128b 100644
--- a/www-servers/varnish/ChangeLog
+++ b/www-servers/varnish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/varnish
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.56 2013/03/14 15:49:37 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/ChangeLog,v 1.57 2013/03/19 22:22:03 blueness Exp $
+
+  19 Mar 2013; Anthony G. Basile <blueness@gentoo.org>
+  files/varnish-3.0.3-automagic.patch:
+  Fix AC_CHECK_LIB for malloc_conf in jemalloc-2 and -3, bug #461638
 
 *varnish-3.0.3-r1 (14 Mar 2013)
 
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index d98ecbafd0ae..8c08f081bdbc 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX varnish-3.0.2-automagic.patch 1653 SHA256 de03979318fbde390e56106ed77fc32451bf904e7b564998e452a6e151218dae SHA512 62d17701574664fa4ce1a9cfe7204b4eea97a9f0deb822384878169bcb31839e12dd7ff7d1603779ea6cba6f20e07fc8a92eced8c7b5a9e5dca02ae449db66d0 WHIRLPOOL 6c03bd168e894cf87841a90ec8ec5e03f792d2b3f0e0e5ae15622225971667ec76f84564b7c57a6a14ac20169e9d7706bc834dc820edd69d6268ce130703f74e
-AUX varnish-3.0.3-automagic.patch 3767 SHA256 b77e0f365740eb41ca84d1c6546ee3b16c4b80ae3b34d29f3276fff5b9120411 SHA512 19e2c72a55cad22a81c8ccdb650dcf0c1e5c214d6f22bac2d5a3532d44047e79f1ec9989802cd4d4831a3210454ae32e2c10acd055c2855305314a8b5cb6e8c7 WHIRLPOOL 0400209b8d3fcd5cfd3b5546153353b0b93124601c1784b95e39f5bb37164696f482ae8bff9b51c3be9d80b4e71885a9e600abdb68073d39bebeea755ffdffd6
+AUX varnish-3.0.3-automagic.patch 3809 SHA256 f5707e08120b78f092e49b4ea4428a5a9bd25386429677a6af286fb081404c14 SHA512 4d3ab3b19c49bb51a7be26d4dd1937164ea5cb86d43992aef3e4cf162bd2c90141b0d908cc7c1b9b9799fbe7a5e262fe5a86f98a677d9f71702d9be2a2431433 WHIRLPOOL c300c98d130f281d9c405e8cf02a37ef2c563f26812d2e3b24eedec7d31e1aa54ce201150899998136f4dbff063a7a8efb84bf33462b0d48d4a1bbb896e68e5d
 AUX varnish-3.0.3-pthread-uclibc.patch 1348 SHA256 3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f SHA512 c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8 WHIRLPOOL 467f0e6c04b7c2fd12e4f55e670f73cc2042ae2312f3d5a3dd785ff0f94e62285acb1a5aea40694ee1dad2433e32c69933b6835e05c42b34ee83e50157a343d7
 AUX varnishd.confd 460 SHA256 9886fcc8b109e0eb603bb4e5a36156356b0763eb9c678faeab9b26481cd9aba0 SHA512 be6180eb23c46b1888fe4877470355da7369f863804ff7a59c3e5d03faefb29180518459c94b3adb4080ee7799a81017a9821c1bc6953b1666d856c1a11096ff WHIRLPOOL 1d7dbff9988b6418f6211bff4b7e2ae9790274e5edbc0fd7851ec24c8dadc0005be99273f2a45b4d0dd0f292ec2ae619c6f5989b7e9cb0d9bfcbbca48cd43cb5
 AUX varnishd.initd 989 SHA256 269c359025843051676972e505d0cc232cee54cbc6fed71ad72538ac2fce387f SHA512 4f0ae674354c3a682aa45b645cfdd475f7f5cad229d50234c9eebd916a046386370ec1adf210857e0e456003e93be18193653146b9950994361bb1e3c53d780c WHIRLPOOL c0621ef18e874505e96e368b8b6bb33c8dcec679af5f63dd4d621835382458224e238b49fe7f8469324d393d8655bf81cc744a2cb413da38d7a607e25015b539
@@ -11,22 +11,22 @@ 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-3.0.2-r1.ebuild 1590 SHA256 ae9f08eb8d8a0ddcc5bd806fd807efc91614b4bd69f48b9b6cbf34a90cc545c9 SHA512 efc1d3144248540a971bfee88e71587a565b1effe2ef4813d40a49415460aa1289e7868dc0c1985b92bf3098ce2ca62d9c066a5977af76ebac2a87eba76fcadf WHIRLPOOL bc70951ba5f16fbad710bf96bf8ed0b9ad904147c83272a1700a751f5584132e14532e7825f7f85dbc88a447a22a094f9039e6636d43405442a102e75b4defbb
 EBUILD varnish-3.0.3-r1.ebuild 1849 SHA256 45942cff0dfcb92f929d7d215d0d6dc914b452d61c9d17878a3772de6b03ce9b SHA512 8644fd477e73ace9b479a0b92b5a055c7146f6ee0fcbfcdc3ca31aa531e6c9535105721da0ad1f3ee490af4ea24b5cdcedde3e8192a9f56a2c0c71c2ec78f5f1 WHIRLPOOL 7534254259d54749da8ca29d551ecf08c9ada90812fb8caf943dd692a24061b067973448fc84253f724681bc6356dfe682f45a73b63f2286a2f09faf649cbc5c
-MISC ChangeLog 8657 SHA256 002c800cf4f86eb4de0c46e3b98546a4c287fa35e604dc81c9c1f7bfd360c035 SHA512 bfb1b4fb062fa225d16559edca2d14c709f483687c2786242d1165965ac29470d85d2500432a1c3af9eb350b2ea5303de9487b9d5c6ef1591b01ef6c2f5fbace WHIRLPOOL 5fa23532677741272acd5cb023eb248822ef3198462ebf13b8427743fe5e2be66f62980581f9e0b3479b19c83b1e5ee19f7ff0c80224b438c769035aa4f3c430
+MISC ChangeLog 8821 SHA256 f77715297c9e360a194c629bb2a683cfd8e72b79f052c98c204ea0f12cf89573 SHA512 1e11633561f660cfdc733e7ddf52f36ea221dd078704179d6406d9c3c937f3f99d164f0d2e2f748af170c8fb4b973fad7dbad24655a54ee6982c971f699654f7 WHIRLPOOL 07456b873a42fcedeb5276cd3ccb5cd9ae7bf04f0a7fd3fb4ab2e1ac856124457ecdc05eb88ca6e53f74f13279afcde8a336cf307dfa6002bcfbf9efad93ab01
 MISC metadata.xml 1233 SHA256 090efc54afbb430a517196775dbee9ea43526b1155602d36fa5c6a78253a378d SHA512 df155931660201fa2e392cb10ecc150b2782520528e6534ee9ce538f9feb37c78fca9a33d0bdedc8c97831389b5d9313327b5564d7684749423da7c5856e12f6 WHIRLPOOL b2376a4917199bf8c235dd5a27567e8c7c6f23d41626e6ff873bf41ad9c4712bcec75eb64e08cad06b012020b56c1e6b52f51abb1093827d17fa35b938c9e656
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRQfGBAAoJEJOE+m71LUu6odQP/0aC4uVp4wjUoNDRyeDQ9L8k
-tD0lVJbw9zdq0Wp3yyDE46eRN9WhRGJAK24rCGsoUKqMXhflbNPJMqES+giS32wD
-sxDrdQW27RdSUSqvzld9ttc2SRuEdUkF7+u3LUNRouWjW0braq/FbpyqHv3DBMnP
-uvoxSow7wcdy1xMGWxzSZSrLrMS9mPwuCOOp86PnZPG2NL9ePBvKFjA/SCpKfwDq
-/dBpz21CjmgGPiylmaLPf99xAsNooGeSB3yAZkMh/gZXNHuhUkKYOzpIotDDQ06T
-8xPAkE5Xj0QNRD7r10yS3l2O9ukT4o5AzK/0aQzhXFxAz05rssXIJePBG+fjioTC
-ncl0Xr22BsQXDmH++OGIZiTuOKVxe07vQuYL0id+ul4phdCymAswJtSmJpZ8oXDY
-Q9BzxyIkOdSe1JoMCvVt+ZvKEvOHkIfErClYLFFXrtEUTicQsboU5yhy+48m7Hqq
-AsUiqgQqNT6eXb0aeEcR7mm7r42RohP+gfMIxkudQCgfjetyCtALiwm/rrPzAgLP
-TSXMVdTiVagksNqvDNzJRkJSVOXk12QvQi4GGE2eSjIpPVYoEKwQYSs+CqhmrNDd
-v0AYOFBhRX256DNND51pDrBSgWZ7NDUXPP7vM6x4cjOsFEzV/oQ4aU288A12+Ai9
-qa+pAZas9GzFY7wQLVLQ
-=qxUF
+iQIcBAEBCAAGBQJRSOT2AAoJEJOE+m71LUu6+H0P/23oDA/BDMtu30LSh/3sqUSb
+2OgjHNowyUfrQTjGKvU8cDV5tmXJujcwVTiCFjEM/mtV7aY6D0XPOGdA7JtvVRdz
+uPEvpBXgluibkdX27kT356fi7+PYYSw5/cnN2lVPZe2Em82YDA2MWb/ILV+WIO9P
+bEAa3hiwVSar15bpk7NJwq/eW95r8rOKywNK5sZDgm4B0sTXhX/fyF/S4i43qO8D
+k217HhyycpAekCV9oByKKC/AAtiU9YcXVEMzGGYFERM4DzIEtdHEVCsLKsz3IIV6
+ZzlvlZZXvPEPpZhH1+8KaW7sgFYN2mDsc9owaIjHrCL5P6DqqR9LhaHJ8AFpfHfN
+3fZmGR0g4fv0CpRmkcDqN56Q13Ra8DPW2GbZ9ChrwgjwavyRwDQCHZMNLZ6a4qtg
+NL0J9+tgMgUoDv1m6hAzter8PhN/J6Q6Hxpalvsq3xIptfWyNN47ogdzehWmmKoq
+0VDfgirThNvszK6vUrHr0+glvxJ3Ywxm3/NYZFnj3wNkuDX/SgqkKMJNjLha2QCU
+KTuQBLNaT5JCM6lGpyNUDn9jQ64gdh+jMJ6pslb1XWOzJsia/zNGY5ENo4x6GKWC
+Sb6x3Aht+tW2vf4yb7msHglEuAmuA61dHwmL2kAgNvm0qLw7zyIL/VdmNlh6xL8A
+Kh/oKioMmxV6o4owILzh
+=josa
 -----END PGP SIGNATURE-----
diff --git a/www-servers/varnish/files/varnish-3.0.3-automagic.patch b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
index 70ca9f8cb2ee..ba18a3bbbc1c 100644
--- a/www-servers/varnish/files/varnish-3.0.3-automagic.patch
+++ b/www-servers/varnish/files/varnish-3.0.3-automagic.patch
@@ -64,7 +64,7 @@ diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac
  JEMALLOC_LDADD=
  AC_ARG_WITH([jemalloc],
              [AS_HELP_STRING([--with-jemalloc],
-@@ -279,18 +279,11 @@
+@@ -279,18 +279,13 @@
              [],
              [with_jemalloc=check])
  
@@ -81,14 +81,16 @@ diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac
 -esac
 -AC_SUBST(JEMALLOC_SUBDIR)
 +if test "x$with_jemalloc" != xno; then
-+      AC_CHECK_LIB([jemalloc], [jmalloc_conf],
++      AC_CHECK_LIB([jemalloc], [malloc_conf],
 +            [JEMALLOC_LDADD="-ljemalloc"],
-+            [AC_MSG_ERROR([No system jemalloc found])])
++            [AC_CHECK_LIB([jemalloc], [jmalloc_conf],
++                  [JEMALLOC_LDADD="-ljemalloc"],
++                        [AC_MSG_ERROR([No system jemalloc found])])])
 +fi
  AC_SUBST(JEMALLOC_LDADD)
  
  # Userland slab allocator, available only on Solaris
-@@ -582,7 +575,6 @@
+@@ -582,7 +577,6 @@
      lib/libvcl/Makefile
      lib/libvgz/Makefile
      lib/libvmod_std/Makefile
@@ -96,7 +98,6 @@ diff -Naur varnish-3.0.3.orig/configure.ac varnish-3.0.3/configure.ac
      man/Makefile
      redhat/Makefile
      varnishapi.pc
-diff -Naur varnish-3.0.3.orig/lib/Makefile.am varnish-3.0.3/lib/Makefile.am
 --- varnish-3.0.3.orig/lib/Makefile.am	2012-08-20 05:20:40.000000000 -0400
 +++ varnish-3.0.3/lib/Makefile.am	2013-03-14 10:58:39.000000000 -0400
 @@ -6,14 +6,12 @@