Fix bugs #225725 and #225937, thanks to Mathieu Segaud <mathieu.segaud@regala.cx>

Package-Manager: portage-2.1.4.4

4 files changed, 40 insertions, 6 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 9c3b250318ce..a56348a872c5 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # 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.78 2008/05/21 18:53:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.79 2008/06/14 11:09:41 mrness Exp $
+
+*freeradius-2.0.4-r1 (14 Jun 2008)
+
+  14 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  +files/freeradius-2.0.4-gnu-source.patch, -freeradius-2.0.4.ebuild,
+  +freeradius-2.0.4-r1.ebuild:
+  Fix bugs #225725 and #225937, thanks to Mathieu Segaud
+  <mathieu.segaud@regala.cx>.
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
   freeradius-1.1.7.ebuild, freeradius-2.0.3.ebuild, freeradius-2.0.4.ebuild:
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 939fa90c43b8..942d2e7206f1 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freeradius-1.1.7-qa-fixes.patch 1276 RMD160 6f91d3b370897864e2a1fd05a6aad69802169b56 SHA1 e71e0154ca513ba822bbeced72b0030eb309aa8e SHA256 ae447fbdc9ca1e11a8ca4af9d35821957de44e526684064c494c51f24cb46f7f
 AUX freeradius-1.1.7-ssl.patch 549 RMD160 ecbe747cda0b68ad72a4c473693616156d1b0cbf SHA1 be1acc21c7a029b56a56e254c87a3cf8517dd48a SHA256 a8907a79b2aee8f8c652568318af92d425a11638f644163c0da9cfcd5f3ee514
 AUX freeradius-1.1.7-versionless-la-files.patch 1624 RMD160 8c6c695812b4699c0eeff342b507e444c0060652 SHA1 b363b14c372c63913621261f292103752bc57333 SHA256 468aaf6e1c823793e40499d6e861acceab5a09235225ff6fefb7e1c8c653d846
 AUX freeradius-2.0.3-check-radiusd.patch 616 RMD160 cfdcb73ff5432402a7e77fd818097cdc72e3dbb8 SHA1 287b0e0136a02bcdccde8478761de1389ede9069 SHA256 70d4bd6437d1d03c5c6b17fbf7036458916a34bcec5a5376a5a76e81c3d1fe7f
 AUX freeradius-2.0.3-ssl.patch 577 RMD160 717dd1749f2c8b1260adc5b7c1ee57aac09ffe53 SHA1 c1b1c3dc2e5ad6963cce3a955426bbc0a610166b SHA256 886648af5c0c2ccc76868aa12fc4f3a6656a33792539c7778e986cc9763dadc2
 AUX freeradius-2.0.3-versionless-la-files.patch 1708 RMD160 eb71c619bd38f4fd8cf6b656665d3498d19d4151 SHA1 da9c89a249a9e0cbe14bfbe888f7f9c7d9ea6796 SHA256 5958e2b1612b67694124949d24fb4b6c2f56ef54025f073362353bb9d2ff4cac
+AUX freeradius-2.0.4-gnu-source.patch 451 RMD160 8acdf4efa24c89effb373c3955fd94f9bd6345cf SHA1 660f27ab8a6bb6859d44ffbafc5372fa31480404 SHA256 33864788fbe2b30f55de92dda3e7bda57f98cca818e2b418d58803340d137d40
 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 radius.conf 129 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 SHA1 174194106a6a7698f92e884463f49f0f974cb569 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292
@@ -14,6 +18,13 @@ DIST freeradius-server-2.0.3.tar.gz 3488944 RMD160 38767631dd1653dbf050ee844ed97
 DIST freeradius-server-2.0.4.tar.gz 3510202 RMD160 06e28ee76e0b74d493d15b7a16298251d3804589 SHA1 97c60eaab0493a29ed6e071812b474adcd95d7ab SHA256 280580f31e9f5795390299d3c73667c1ce21732cf0baee28e3418cb14de04375
 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.ebuild 3879 RMD160 766f9a29348b400ded51b78deaf99ab7e2b3a5bd SHA1 a3929381d93fa57c2710b39076107047360d7f8f SHA256 0754cf7a0412d5790ebdc7b553001bec6646d7da185ac5c76267d07dad8c5758
-MISC ChangeLog 15038 RMD160 40f7438e322e067216bb5108710753a15cba90c6 SHA1 e2891a1fc3ea52914ce3e5f0c0b28b23f089f45d SHA256 437fc82c721e343d1276b6a24ed0cf6b3bf2ef525d28928d3c5cd332f73d7b37
+EBUILD freeradius-2.0.4-r1.ebuild 4025 RMD160 3c76e3ba2ea4915d462896d34d80ed0e9f8a775d SHA1 3a97c8c8c2c303e3f9ae79d7f1c9d0eeb84cd59a SHA256 dfd0d2d8cd9318d02ca8c0e43e3121ed9dca465cf05c5076edd2da0c824f8683
+MISC ChangeLog 15309 RMD160 054468e2e285acdc36c43f27f61997684a8b44d5 SHA1 7962dbb53dcb8915b59fb2762ce74be4444742b3 SHA256 857008beff8d13ea9b6f782dc7dd9d4e209f70b64c9cf18ef8e6681a7dcb9685
 MISC metadata.xml 327 RMD160 e58c61ac6067fcaff23b38b1b3833ec8d621eb73 SHA1 fa8febc970b58eb22e5351e54ca784c105a50ecd SHA256 a36fe9c841f1c40a07d9a96a321643460caf7bf3134015bd4e091e0a207aa076
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhTp0EACgkQ+fWpoTWIA9EJjgCdGoJQmJT29v7PsWThGN77NKiD
+ddMAn25+xP4eezSDNSkYfrNLIN9ddzga
+=ZnZY
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-2.0.4-gnu-source.patch b/net-dialup/freeradius/files/freeradius-2.0.4-gnu-source.patch
new file mode 100644
index 000000000000..704004cc1dcd
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.4-gnu-source.patch
@@ -0,0 +1,12 @@
+--- freeradius-server-2.0.4.orig/configure.in	2008-04-26 17:10:09.000000000 +0200
++++ freeradius-server-2.0.4/configure.in	2008-06-13 14:18:04.000000000 +0200
+@@ -38,6 +38,9 @@
+ dnl #
+ dnl #############################################################
+ 
++dnl Define _GNU_SOURCE, this should be done before any feature test.
++AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate all library features])
++
+ dnl Check for GNU cc
+ AC_PROG_CC
+ AC_PROG_CXX
diff --git a/net-dialup/freeradius/freeradius-2.0.4.ebuild b/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild
index 50f223431770..00f04dea3eb6 100644
--- a/net-dialup/freeradius/freeradius-2.0.4.ebuild
+++ b/net-dialup/freeradius/freeradius-2.0.4-r1.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.4.ebuild,v 1.2 2008/05/21 18:53:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild,v 1.1 2008/06/14 11:09:41 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -13,7 +13,8 @@ HOMEPAGE="http://www.freeradius.org/"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads udpfromto"
+IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads udpfromto \
+    elibc_glibc"
 
 RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
@@ -49,6 +50,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
 	epatch "${FILESDIR}/${P}-ssl.patch"
+	use elibc_glibc && epatch "${FILESDIR}/${P}-gnu-source.patch"
 
 	cd "${S}"
 
@@ -85,6 +87,7 @@ src_unpack() {
 		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
 	fi
 
+	eautoheader || die "eautoheaders failed"
 	eautoconf || die "eautoconf failed"
 }
 
@@ -103,7 +106,7 @@ src_compile() {
 		myconf="${myconf} --enable-heimdal-krb5"
 	fi
 
-	econf --disable-ltdl-install \
+	econf --disable-ltdl-install --with-system-libtool \
 		 --localstatedir=/var ${myconf} || die "econf failed"
 
 	make || die "make failed"