From d149b8d7415c48b63b719e7a854295f13e2db857 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Thu, 22 Mar 2007 09:37:06 +0000 Subject: [PATCH] Remove disabled database drivers from the stable rlm_sql drivers (#171723). Autotools cleanup. More QA fixes. Package-Manager: portage-2.1.2.2 --- net-dialup/freeradius/ChangeLog | 10 +++- net-dialup/freeradius/Manifest | 36 ++++++------- ...adius-1.1.5 => digest-freeradius-1.1.5-r1} | 0 .../files/freeradius-1.1.5-qa-fixes.patch | 34 +++++++++++++ ....1.5.ebuild => freeradius-1.1.5-r1.ebuild} | 50 +++++++++++-------- 5 files changed, 90 insertions(+), 40 deletions(-) rename net-dialup/freeradius/files/{digest-freeradius-1.1.5 => digest-freeradius-1.1.5-r1} (100%) rename net-dialup/freeradius/{freeradius-1.1.5.ebuild => freeradius-1.1.5-r1.ebuild} (88%) diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog index 3bce524b129a..11359fe2a3c4 100644 --- a/net-dialup/freeradius/ChangeLog +++ b/net-dialup/freeradius/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-dialup/freeradius # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.63 2007/03/17 09:27:24 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.64 2007/03/22 09:37:06 mrness Exp $ + +*freeradius-1.1.5-r1 (22 Mar 2007) + + 22 Mar 2007; Alin Năstac + files/freeradius-1.1.5-qa-fixes.patch, -freeradius-1.1.5.ebuild, + +freeradius-1.1.5-r1.ebuild: + Remove disabled database drivers from the stable rlm_sql drivers (#171723). + Autotools cleanup. More QA fixes. *freeradius-1.1.5 (17 Mar 2007) diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest index c2b3f40c53fc..a744166620e7 100644 --- a/net-dialup/freeradius/Manifest +++ b/net-dialup/freeradius/Manifest @@ -29,10 +29,10 @@ AUX freeradius-1.1.5-nostrip.patch 358 RMD160 4bdeed5a26d448573efaf9b2cb01b623f5 MD5 88335ca56c9997fe62059237c619a11f files/freeradius-1.1.5-nostrip.patch 358 RMD160 4bdeed5a26d448573efaf9b2cb01b623f5c16df4 files/freeradius-1.1.5-nostrip.patch 358 SHA256 d978550096a2a86cdfc3b3134107be61b4162ee6816e3026176049f90c491645 files/freeradius-1.1.5-nostrip.patch 358 -AUX freeradius-1.1.5-qa-fixes.patch 918 RMD160 534e258f856109cfde01b65c0e8989260e19191d SHA1 5375c3b8a38a57c37d3ec4b01424d622b1fc9843 SHA256 074c2caac3bebb1ad4f1705fb09db99d9f2e1101bff630910888987edb49d2ce -MD5 6b5c4b903ecb274c789bb813a098e235 files/freeradius-1.1.5-qa-fixes.patch 918 -RMD160 534e258f856109cfde01b65c0e8989260e19191d files/freeradius-1.1.5-qa-fixes.patch 918 -SHA256 074c2caac3bebb1ad4f1705fb09db99d9f2e1101bff630910888987edb49d2ce files/freeradius-1.1.5-qa-fixes.patch 918 +AUX freeradius-1.1.5-qa-fixes.patch 1970 RMD160 404b98d39c10e1803ed11006339a0d312874333b SHA1 307c54b4c4138c91d4bcc318eb45d5762bbf39dc SHA256 2d03add889381ca832515ab6d283d9f3230bde48fff271d04439ba9f24e6936c +MD5 34c6e4c228868ec2d3dca90477c9269c files/freeradius-1.1.5-qa-fixes.patch 1970 +RMD160 404b98d39c10e1803ed11006339a0d312874333b files/freeradius-1.1.5-qa-fixes.patch 1970 +SHA256 2d03add889381ca832515ab6d283d9f3230bde48fff271d04439ba9f24e6936c files/freeradius-1.1.5-qa-fixes.patch 1970 AUX freeradius-1.1.5-ssl.patch 549 RMD160 9fb66e88d125f2303910f6ca07972d0cc4c4eb5b SHA1 38391589e8d7cdb4890f0e9bcf5d6ee69cdde05d SHA256 5aa0aae320b2b454653285d0109a6d00921d219d005e573050b927edf05c1adf MD5 9c9f4f4e3e1998d60ae59cd305f4e41d files/freeradius-1.1.5-ssl.patch 549 RMD160 9fb66e88d125f2303910f6ca07972d0cc4c4eb5b files/freeradius-1.1.5-ssl.patch 549 @@ -60,14 +60,14 @@ EBUILD freeradius-1.1.4.ebuild 4058 RMD160 c68e8ff5614b46a3917fc04dd87c70ede4da1 MD5 07dc274d36a57de5b92bee7adcf0674f freeradius-1.1.4.ebuild 4058 RMD160 c68e8ff5614b46a3917fc04dd87c70ede4da174f freeradius-1.1.4.ebuild 4058 SHA256 e6c1fa302530e542327a051dac69199314963ff541eae19ff7b0a62294ab4ac3 freeradius-1.1.4.ebuild 4058 -EBUILD freeradius-1.1.5.ebuild 4323 RMD160 ddaf07139fd492140e0082d851dc6193519ccd79 SHA1 9bc4c8594140bc1aa01fcf8e19810985d6d3ccaa SHA256 1e3ddbb9b863e64c20a312323ae18dba296d3c99c4a7c20cbccbcb94de62fb31 -MD5 60fd55e3f9635e1b64990a1d567c0c38 freeradius-1.1.5.ebuild 4323 -RMD160 ddaf07139fd492140e0082d851dc6193519ccd79 freeradius-1.1.5.ebuild 4323 -SHA256 1e3ddbb9b863e64c20a312323ae18dba296d3c99c4a7c20cbccbcb94de62fb31 freeradius-1.1.5.ebuild 4323 -MISC ChangeLog 11592 RMD160 b739fec17185f149cfa4a361a01d7d3b307e0d92 SHA1 3cecd9fec4c93ae7750abb44b483393d9cacff41 SHA256 a3bf8773cadf624ca559d100cff5375d04bf9e9f0c180ac8b32997380ac52372 -MD5 d08d56ad2213b96dc16d4e87bca03ff4 ChangeLog 11592 -RMD160 b739fec17185f149cfa4a361a01d7d3b307e0d92 ChangeLog 11592 -SHA256 a3bf8773cadf624ca559d100cff5375d04bf9e9f0c180ac8b32997380ac52372 ChangeLog 11592 +EBUILD freeradius-1.1.5-r1.ebuild 4548 RMD160 549b44d07622486b420efea1a2559ac61b3ffd5f SHA1 ce44e38c75df635c2070d8b017361055120d8800 SHA256 b807c7926c5a745e44552d64fb5752cb3f0849981b42e811955549b28250ebc5 +MD5 b80f430e34e3d80ab59bdd769cd7c8e8 freeradius-1.1.5-r1.ebuild 4548 +RMD160 549b44d07622486b420efea1a2559ac61b3ffd5f freeradius-1.1.5-r1.ebuild 4548 +SHA256 b807c7926c5a745e44552d64fb5752cb3f0849981b42e811955549b28250ebc5 freeradius-1.1.5-r1.ebuild 4548 +MISC ChangeLog 11889 RMD160 fd44a7b4d96571035eb41406e7920ef248c6bcfc SHA1 c6887fe2e6e558bc3ef0672f99ef2a980d8e9e7b SHA256 3deb5abacbfb1220062e57bdb6bbb4f69f33b16e4b340ee67c1b2e5b0b51dd5b +MD5 368f2bf6923c386c1d4564fdb5e5fca1 ChangeLog 11889 +RMD160 fd44a7b4d96571035eb41406e7920ef248c6bcfc ChangeLog 11889 +SHA256 3deb5abacbfb1220062e57bdb6bbb4f69f33b16e4b340ee67c1b2e5b0b51dd5b ChangeLog 11889 MISC metadata.xml 252 RMD160 aaf9aae6ca234ce5c447d0a6c29d732a5b2a58f0 SHA1 6b1b24914e633321a409132870aea89053fac655 SHA256 5c0974054864b2e9a572cd3c30b97aadae0b2781da4dabec791e23afdfa5ee76 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252 RMD160 aaf9aae6ca234ce5c447d0a6c29d732a5b2a58f0 metadata.xml 252 @@ -78,13 +78,13 @@ SHA256 f2c8dde98762ea60836e714eaf453c239dd1a9e21d96432f5412d2845809a08c files/di MD5 2b277a071f4ee41e01fa660b0a6b81d8 files/digest-freeradius-1.1.4 253 RMD160 c78e440389e30c3fe47f625d12b2d215ca89f38e files/digest-freeradius-1.1.4 253 SHA256 65fba54319d03e00ea41c198f32059db6345529452775af202ebe23f80a9e4af files/digest-freeradius-1.1.4 253 -MD5 71412418ce2dbc45fd63757145093fe0 files/digest-freeradius-1.1.5 253 -RMD160 f23f4a29e58ea13512d1e275160fa30dab5f11a0 files/digest-freeradius-1.1.5 253 -SHA256 727f15352c838fb71509b69c0e1bd9aac74b5a7abbf4cfe03affdb977648d8e5 files/digest-freeradius-1.1.5 253 +MD5 71412418ce2dbc45fd63757145093fe0 files/digest-freeradius-1.1.5-r1 253 +RMD160 f23f4a29e58ea13512d1e275160fa30dab5f11a0 files/digest-freeradius-1.1.5-r1 253 +SHA256 727f15352c838fb71509b69c0e1bd9aac74b5a7abbf4cfe03affdb977648d8e5 files/digest-freeradius-1.1.5-r1 253 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF+7SHJnxX6mF440QRAn+xAKDoQAVeR7oAw31rgI7TqafBdUn6rACdEADY -qpGZcXOVjCas427AkfwvZCM= -=rGQe +iD8DBQFGAk5NJnxX6mF440QRAifRAKDQ4NGh+7tXaWn3BDDRAmrnQ/N49QCdGjin +fh+L3bpG5H1RuUiLtLCuRR4= +=FV0v -----END PGP SIGNATURE----- diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.5 b/net-dialup/freeradius/files/digest-freeradius-1.1.5-r1 similarity index 100% rename from net-dialup/freeradius/files/digest-freeradius-1.1.5 rename to net-dialup/freeradius/files/digest-freeradius-1.1.5-r1 diff --git a/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch b/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch index 9c2422cefc4f..49e809113fde 100644 --- a/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch +++ b/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch @@ -1,3 +1,37 @@ +diff -Nru freeradius-1.1.5.orig/src/main/mainconfig.c freeradius-1.1.5/src/main/mainconfig.c +--- freeradius-1.1.5.orig/src/main/mainconfig.c 2007-03-22 11:09:57.000000000 +0200 ++++ freeradius-1.1.5/src/main/mainconfig.c 2007-03-22 11:13:26.000000000 +0200 +@@ -23,6 +23,7 @@ + + #include "autoconf.h" + #include "libradius.h" ++#include "ltdl.h" + + #include + #include +@@ -1487,6 +1488,10 @@ + /* + * Free the configuration. + */ ++extern void rl_free(void); ++extern void paircompare_builtin_free(void); ++extern void xlat_free(void); ++ + int free_mainconfig(void) + { + /* +diff -Nru freeradius-1.1.5.orig/src/modules/rlm_ldap/rlm_ldap.c freeradius-1.1.5/src/modules/rlm_ldap/rlm_ldap.c +--- freeradius-1.1.5.orig/src/modules/rlm_ldap/rlm_ldap.c 2006-05-09 02:45:02.000000000 +0300 ++++ freeradius-1.1.5/src/modules/rlm_ldap/rlm_ldap.c 2007-03-22 10:57:22.000000000 +0200 +@@ -175,6 +175,8 @@ + #include + + #include ++#define LDAP_DEPRECATED 1 ++#undef HAVE_LDAP_INT_TLS_CONFIG + #include + + #include diff -Nru freeradius-1.1.5.orig/src/modules/rlm_smb/smblib.c freeradius-1.1.5/src/modules/rlm_smb/smblib.c --- freeradius-1.1.5.orig/src/modules/rlm_smb/smblib.c 2004-02-26 21:04:35.000000000 +0200 +++ freeradius-1.1.5/src/modules/rlm_smb/smblib.c 2007-03-17 11:13:44.000000000 +0200 diff --git a/net-dialup/freeradius/freeradius-1.1.5.ebuild b/net-dialup/freeradius/freeradius-1.1.5-r1.ebuild similarity index 88% rename from net-dialup/freeradius/freeradius-1.1.5.ebuild rename to net-dialup/freeradius/freeradius-1.1.5-r1.ebuild index 5e6fd0ff51d2..8567e55aa87b 100644 --- a/net-dialup/freeradius/freeradius-1.1.5.ebuild +++ b/net-dialup/freeradius/freeradius-1.1.5-r1.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.5.ebuild,v 1.1 2007/03/17 09:27:24 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.5-r1.ebuild,v 1.1 2007/03/22 09:37:06 mrness Exp $ -inherit eutils flag-o-matic multilib +WANT_AUTOMAKE="none" + +inherit eutils multilib autotools DESCRIPTION="highly configurable free RADIUS server" SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz" @@ -47,26 +49,8 @@ src_unpack() { epatch "${FILESDIR}/${P}-nostrip.patch" epatch "${FILESDIR}/${P}-ssl.patch" epatch "${FILESDIR}/${P}-qa-fixes.patch" -} - -src_compile() { - autoconf || die "autoconf failed" - local myconf=" \ - `use_enable debug developer` \ - `use_with snmp` \ - `use_with frascend ascend-binary` \ - `use_with frxp experimental-modules` \ - `use_with udpfromto` \ - `use_with edirectory edir` " - - if useq frnothreads; then - myconf="${myconf} --without-threads" - fi - #fix bug #77613 - if has_version app-crypt/heimdal; then - myconf="${myconf} --enable-heimdal-krb5" - fi + cd "${S}" # kill modules we don't use if ! use ssl; then @@ -88,14 +72,38 @@ src_compile() { if ! use mysql; then einfo "removing rlm_sql_mysql (no use mysql)" rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql + sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable fi if ! use postgres; then einfo "removing rlm_sql_postgresql (no use postgres)" rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql + sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable fi if ! use firebird; then einfo "removing rlm_sql_firebird (no use firebird)" rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird + sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable + fi + + eautoconf || die "eautoconf failed" +} + +src_compile() { + local myconf=" \ + $(use_enable debug developer) \ + $(use_with snmp) \ + $(use_with frascend ascend-binary) \ + $(use_with frxp experimental-modules) \ + $(use_with udpfromto) \ + $(use_with edirectory edir) " + + if useq frnothreads; then + myconf="${myconf} --without-threads" + fi + + #fix bug #77613 + if has_version app-crypt/heimdal; then + myconf="${myconf} --enable-heimdal-krb5" fi econf --with-large-files --disable-ltdl-install --with-pic \ -- 2.26.2