Fix broken build when threads USE flag is disabled (#230639).

Package-Manager: portage-2.1.4.4

4 files changed, 25 insertions, 7 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index e0b668d1a2bc..48e54fc296b1 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.80 2008/07/01 19:56:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.81 2008/07/04 18:38:07 mrness Exp $
+
+  04 Jul 2008; Alin Năstac <mrness@gentoo.org>
+  +files/freeradius-2.0.5-threads.patch, freeradius-2.0.5.ebuild:
+  Fix broken build when threads USE flag is disabled (#230639).
 
 *freeradius-2.0.5 (01 Jul 2008)
 
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index c4d7b3a36a87..64c01aa65a0e 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -11,6 +11,7 @@ AUX freeradius-2.0.4-gnu-source.patch 451 RMD160 8acdf4efa24c89effb373c3955fd94f
 AUX freeradius-2.0.4-ssl.patch 577 RMD160 8fc4092cd7c0f4e7d706ca55e6374664f42ae398 SHA1 d70c809294ee76de7e8188e5aac944d5fbc28070 SHA256 8a25c0f34dd564b424671ac407d9d581852288e392bcf61a7ffc1568007bbb30
 AUX freeradius-2.0.4-versionless-la-files.patch 1708 RMD160 36bb738386d9417ecfec6d774dfe81f5cbbdcb74 SHA1 6dec9ec05711ce4929cf7316b5aa7f1c18dfbbc4 SHA256 ab96b7c84698dc4e1f5efe1684f2245c53f3b546739ca90a9cd2fb015e3feea2
 AUX freeradius-2.0.5-ssl.patch 577 RMD160 f8082efad0f668771246d0022439588de95f0a10 SHA1 bed0145c6806fa84bac26252a4e945d3cf084986 SHA256 95e8a4ea4a36d53997b63dc9d509e5617cbd9d01fa43762e0e34883a3bb96363
+AUX freeradius-2.0.5-threads.patch 488 RMD160 5d155cd4582fd03dcbaa6a207d1c21d6495129ff SHA1 2cb9d3da653f082a7210339d821a525e51466798 SHA256 3706944349b6dcfb003931dcd48278d766b53ca56a062b5e17c92535c242c273
 AUX freeradius-2.0.5-versionless-la-files.patch 1708 RMD160 24b1c1b12a967732b492976300052a9c153c7db4 SHA1 81d25ed73da565adc61bc8c882bb208648f25b76 SHA256 0b223ffa3e5bf4331737a58ef53e8cc80fd53cc76f8cec1b42653e3307689b48
 AUX radius.conf 129 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 SHA1 174194106a6a7698f92e884463f49f0f974cb569 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292
 AUX radius.init 1785 RMD160 0e409e935f4588b3c905af0e6e085e50617c2160 SHA1 3322995f7920ffda44a6d8c8eb38f1d18238ff43 SHA256 3e1e56774104e3b205f3436f5967be27894cb246d33949c86f6ed80ebbfa998a
@@ -22,13 +23,13 @@ DIST freeradius-server-2.0.5.tar.gz 3519755 RMD160 15080883413fee615387df0e6c1da
 EBUILD freeradius-1.1.7.ebuild 3944 RMD160 0a473d0f67d5465107d80a665a97e10f235098b4 SHA1 2e60887443197a5e4d6e46c740a9954bee37f925 SHA256 4068cd38e2dd349f57a1bb134a5935e4bc51103156e69dcb3fc43504f83e8508
 EBUILD freeradius-2.0.3.ebuild 3923 RMD160 791fbfca3cb30c750b7ade6038c9c3cea66a257e SHA1 dd34e60eae35690e7dc554ca1ea2e70d16ef5684 SHA256 1f795ad59c743e411d4061ad152efca880e66b6c164a5107933d679cd6acc4a9
 EBUILD freeradius-2.0.4-r1.ebuild 4022 RMD160 636fb617e9eecb9dd66c0026ac99f462f43194a4 SHA1 8dab4af6a32e896987ea8c1c80259560bd76ed8e SHA256 9bbeef8132d40c163065848af295e38626a88d76fe2181a221586c97ab5cea6c
-EBUILD freeradius-2.0.5.ebuild 3851 RMD160 47e9c9e96e512e5f6cad5f8a3dfc26eae6157968 SHA1 e128c329124679c71e0a8274cc06730c6f9e4858 SHA256 98f7c9db9d403e83d64a0164653d34b8184253b9653eb67cbf2f1ee5b02b5389
-MISC ChangeLog 15613 RMD160 19bf8c0e0ad86d5c87eb28b1f3ca2bb52dc8793d SHA1 2f26363ee50b950f207b67baf301d00b30fa7ab0 SHA256 d42ce8a89e40c0a68414a88b3b0272286ea538ba2506a58fb42b40c749cc7223
+EBUILD freeradius-2.0.5.ebuild 3892 RMD160 27d3903789c24857252ab494cbefc27fb655b5c7 SHA1 38de6016a4230b1ac262ad85e91ae7d19da20582 SHA256 159795bea4ed3f2fc49217d332dcc61f2880a9732e2baade747a926cb25f5f17
+MISC ChangeLog 15792 RMD160 827a054c1af680d1848fa43f132d0d4993598815 SHA1 c8b0d2a929b5c7025c64a8657e62d363d9fbc8c1 SHA256 47b3a29d3594e645e9ccee1ec78d8a95449d79a9e03cc71c637a37d377a90208
 MISC metadata.xml 327 RMD160 e58c61ac6067fcaff23b38b1b3833ec8d621eb73 SHA1 fa8febc970b58eb22e5351e54ca784c105a50ecd SHA256 a36fe9c841f1c40a07d9a96a321643460caf7bf3134015bd4e091e0a207aa076
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhqjBMACgkQPrHvTlXvhtsd0wCfYIW4dbH4h0zR2Re452nVGxlU
-QLcAoJ5TJ1elEfEfWtbhQwxz19IB/iQA
-=TSKY
+iEYEARECAAYFAkhubhoACgkQPrHvTlXvhtvEyQCgjDIS8UvIehPTw45a1dArK7m6
+ojkAoIlaCeSsxNlgDURQxpfxibyQPT1z
+=cXPt
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-2.0.5-threads.patch b/net-dialup/freeradius/files/freeradius-2.0.5-threads.patch
new file mode 100644
index 000000000000..35ceb39626eb
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.5-threads.patch
@@ -0,0 +1,12 @@
+diff -Nru freeradius-server-2.0.5.orig/src/main/event.c freeradius-server-2.0.5/src/main/event.c
+--- freeradius-server-2.0.5.orig/src/main/event.c	2008-06-06 15:10:27.000000000 +0200
++++ freeradius-server-2.0.5/src/main/event.c	2008-07-04 20:31:18.000000000 +0200
+@@ -982,7 +982,7 @@
+ 			break;
+ 		}
+ 
+-#if defined(HAVE_PTHREAD_H) || defined(WITH_PROXY)
++#if defined(HAVE_PTHREAD_H)
+ 		/*
+ 		 *	A child thread MAY still be running on the
+ 		 *	request.  Ask the thread to stop working on
diff --git a/net-dialup/freeradius/freeradius-2.0.5.ebuild b/net-dialup/freeradius/freeradius-2.0.5.ebuild
index ad6931932f51..b49edfa38228 100644
--- a/net-dialup/freeradius/freeradius-2.0.5.ebuild
+++ b/net-dialup/freeradius/freeradius-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.5.ebuild,v 1.1 2008/07/01 19:56:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.5.ebuild,v 1.2 2008/07/04 18:38:07 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -49,6 +49,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
 	epatch "${FILESDIR}/${P}-ssl.patch"
+	epatch "${FILESDIR}/${P}-threads.patch"
 
 	cd "${S}"