Remove stale patches. Version bump, ebuild and init script rewrite: patches are now hosted on dev.gentoo.org instead than in $FILESDIR; remove threads USE flag (solves bug #296907); enable DHCP support unconditionally, as it's not an extra dependency (solves bug #376721); add "old" directory to SRC_URI (solves bug #398771); adds sqlite support (solves bug #401569) as well as oracle (untested), iodbc and unixodbc; make readline, python and pcap optional; use REQUIRED_USE to disallow firebird support for bindist packages; support USE=-ssl properly; always turn on optional features that add no extra dependencies, including experimental modules (drops frascend, frxp and udpfromto USE flags); enable edirectory support when ldap is enabled (drops edirectory USE flag); add pkg_config function to generate required TLS certificates; new init script uses the latest runscript syntax support, which allows for detecting crashed radiusd instances.

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

26 files changed, 292 insertions, 718 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 760f50914bfc..7a6cb555384f 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.103 2012/07/09 09:42:05 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.104 2012/09/30 07:01:04 flameeyes Exp $
+
+*freeradius-2.2.0 (30 Sep 2012)
+
+  30 Sep 2012; Diego E. Pettenò <flameeyes@gentoo.org> +files/radius.conf-r3,
+  +files/radius.init-r3, +freeradius-2.2.0.ebuild,
+  -files/freeradius-2.0.5-ssl.patch, -files/freeradius-2.0.5-threads.patch,
+  -files/freeradius-2.0.5-versionless-la-files.patch,
+  -files/freeradius-2.1.1-qafixes.patch, -files/freeradius-2.1.1-ssl.patch,
+  -files/freeradius-2.1.1-versionless-la-files.patch,
+  -files/freeradius-2.1.3-pkglibdir.patch,
+  -files/freeradius-2.1.3-qafixes.patch, -files/freeradius-2.1.3-ssl.patch,
+  -files/freeradius-2.1.3-versionless-la-files.patch,
+  -files/freeradius-2.1.6-nothreads.patch,
+  -files/freeradius-2.1.6-pkglibdir.patch,
+  -files/freeradius-2.1.6-qafixes.patch, -files/freeradius-2.1.6-ssl.patch,
+  -files/freeradius-2.1.6-versionless-la-files.patch,
+  -files/freeradius-2.1.7-nothreads.patch,
+  -files/freeradius-2.1.7-pkglibdir.patch,
+  -files/freeradius-2.1.7-qafixes.patch, -files/freeradius-2.1.7-ssl.patch,
+  -files/freeradius-2.1.7-versionless-la-files.patch, metadata.xml:
+  Remove stale patches. Version bump, ebuild and init script rewrite: patches
+  are now hosted on dev.gentoo.org instead than in $FILESDIR; remove threads USE
+  flag (solves bug #296907); enable DHCP support unconditionally, as it's not an
+  extra dependency (solves bug #376721); add "old" directory to SRC_URI (solves
+  bug #398771); adds sqlite support (solves bug #401569) as well as oracle
+  (untested), iodbc and unixodbc; make readline, python and pcap optional; use
+  REQUIRED_USE to disallow firebird support for bindist packages; support
+  USE=-ssl properly; always turn on optional features that add no extra
+  dependencies, including experimental modules (drops frascend, frxp and
+  udpfromto USE flags); enable edirectory support when ldap is enabled (drops
+  edirectory USE flag); add pkg_config function to generate required TLS
+  certificates; new init script uses the latest runscript syntax support, which
+  allows for detecting crashed radiusd instances.
 
 *freeradius-2.1.11-r1 (09 Jul 2012)
 
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index a93823cbbf7b..8cd4ef3dd21d 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,12 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX freeradius-2.0.5-ssl.patch 577 SHA256 95e8a4ea4a36d53997b63dc9d509e5617cbd9d01fa43762e0e34883a3bb96363 SHA512 d0f3906dcc9ecaf32cee5d5b468e6a3567e5399d309281246a8695e5966531a426f9fdc51849701189596eb99551751ed2fb01a28334dd561fdb5731cff228b4 WHIRLPOOL e5ad4758286cff11062837c07ef46bc2c8444c1840b5aac1e6db4868600ce97361d620387aaae761fc7d6637ef9df868afa55f178a5efd421797dafe0ea8e667
-AUX freeradius-2.0.5-threads.patch 488 SHA256 3706944349b6dcfb003931dcd48278d766b53ca56a062b5e17c92535c242c273 SHA512 41de939361d149866b26c2afd0381b47132678da379c5373d9d42500c0cef19bd69107af5e890f96fd90c6226f23207d5022859234965a1c055e618ff68b70c8 WHIRLPOOL 00e38dc890594a739e6e0d99ff0d22aea2e060c918a3142fa6b8a30c04168497a213d5a38141865e67a27b69e88d9b0fec8beade8782fe964baa68ebd7d3bd5f
-AUX freeradius-2.0.5-versionless-la-files.patch 1708 SHA256 0b223ffa3e5bf4331737a58ef53e8cc80fd53cc76f8cec1b42653e3307689b48 SHA512 2400ec413a61e84842c4d90dbd323efc0f82ee00f9d6464133d5ef113dcf882b4ad29f9d8c005d6fa63984ad9ce920516f3397c41ff7ada99f7b57a06a91b2c6 WHIRLPOOL 8d18be3e6e1528e766feb945483c00e419f5b46b596c9ef463e622233967f046af2c2884007ef2b6047759957e534f9ebf86296e74ab0fb4977c1742afe095d1
-AUX freeradius-2.1.1-qafixes.patch 420 SHA256 c41c76e6caa476874d62a622302247a1a3b6a570ede5cbd102d0be093f32b0ba SHA512 78555d278cba8f90ef00638d965afdbe25439ffa845517f7589d96914e3b959fdccf9425e3beabaee3d7a70bc30c2538ed8b18bfd666fc8bdb198032f0fa6f74 WHIRLPOOL 21cddce115c8effd88cbc9dc163b8393ad7eae0db17f12a139206cf276f3482d740038e2e55b86e9fad6e5e0e79a62dca546cac6360fb2747f28d0f6b8eb272d
-AUX freeradius-2.1.1-ssl.patch 577 SHA256 e5bf1193dc6594fc3fe739b0f6aac6f1045ec43b443aa063f842ee17550cbc75 SHA512 f24d9949b5c48c4a93f24d46f9aee6c500cb762846e3a33a69524d2f6653703193e748690bbadb61df8e81877f7248c6307b452f260e007c983464794c4d26d0 WHIRLPOOL 12ecea4aea8f5421719762eb9bd94f3cbeafb6895876d4ed324a1450c1fa41e27187226af08ae023c5036b25e29cadda9163d486313127be7b4148ed5d1163a6
-AUX freeradius-2.1.1-versionless-la-files.patch 1708 SHA256 4d64c158abfdb3f6a6fcfb8fe45def375c14615b1ed25f86409b27aed9814e28 SHA512 66f14470dc7161326f7f62b0ddcb05c90f6f8013014b2e5b335e00a08067e95fdcc4648791c62e63181a239ddf6a8b86a0e0cb2d7fbc98d08f1c215e26c7100a WHIRLPOOL 97443110c141a265e5018f4e035ee7afcb85de667aa9dc96b82c426d490d6158729ec4c68f511c446474c91ea6b858ac68e59fdd1edcd4833168dad9d66cb8de
 AUX freeradius-2.1.10-ipv6.patch 453 SHA256 15a227b1a9cb213763170e7f030bb30521af26ae1920a4acf51499a6628d492d SHA512 73c6ec69b830c9a9c58d93ef6d8764062938ef9757c4bb3063302b66ef456592f5e100acdfc302a0dc076d0c20eca63a176eabed1ba86ebc50be43db0dd9626d WHIRLPOOL 37bc461bb794d6f3b6be47805e46ee72e16f273455afc8b1fb0ec981b5914a787b48ec6773f728e8bcc08426dccf43855ef7f7447b72ba21b3efb24b8be7fde9
 AUX freeradius-2.1.10-pkglibdir.patch 2551 SHA256 19e366a1eba9423185c5a7139f3affd0100a46ac94f5993f84a54cc77251bafc SHA512 4f2f813078aa6d08d0a576886cb5410d6152924c571726cfb965c87af880cbe52f9e8b7acc83ad78b00194c76ee444291d55a2c51a2e26c59336232b9e97f1e8 WHIRLPOOL 4c18d8530ac64ebfdc1ab70bc2bdc918d6692ac1b456890cd0727a312f2a65d7f49ac9ef07262b78cf1650078cfbd540034e1195566ca611c51d8879afbe53f6
 AUX freeradius-2.1.10-qafixes.patch 4043 SHA256 1d10cd8011482178b4e0add67768675b524e2cfc6aca08b2b3c4bb96ff72519b SHA512 cfcfe253df189663dcbb5934081d4cbd83319bc2d0508d7696a0f3db2d36a5b7a956c89e4f50e9e73788bc73719bfe354a1c93a3313d7b026db66e58b6884dfc WHIRLPOOL d872f0546b05e5c54efd9b2a3609f96edaca3fcb5845ffc26e58eec5f5d4f8ec6ea9ade8db5b63c9cc1ebc79e8d66f80518eb4d7883291a63a563648e4463e0c
@@ -16,43 +10,28 @@ AUX freeradius-2.1.12-pkglibdir.patch 2555 SHA256 e0b0444d2ecd30518ad00df3d8744a
 AUX freeradius-2.1.12-qafixes.patch 3716 SHA256 f50a79b94f87a06330c95a77018e32e3ddff290d3b56a1260a637d8283476580 SHA512 76130b3afcd5e11492e04f60a1e8a5a4f5cc37f594640b36194b48eb6a514cfd3d142a6f67eb171ff69a9e02ada877f5fe0302f589724a3bdd5e04bec8fbbb9c WHIRLPOOL 4d5352d88e262acd7ab17c06b75aaafbc00a24eab4b51fdfad735c0d17bb818cd74dbffa26289965ec0ebe69cefc7d269516575995cf1dc6f236cf53ed5f485a
 AUX freeradius-2.1.12-ssl.patch 583 SHA256 e7a348ad24de18f5299c2d0544d6a8ed25913a00955c2bdb108d763163b38fab SHA512 aed2dbe6207d23069910dbb330af560e61cc36bb7827552af8ec2560101255ac5ffbd9c2817e964024ea6a6517fd415fc5d3e9c4c0c12282dcdf4adfafdd8727 WHIRLPOOL 32bb834f4585769326a254642c2cad1b254e8659659889010407f26483bf747aafffd77a788556d5ad1678ff4c8ebf560cd9801ad8ce11c3f7c070bde984a930
 AUX freeradius-2.1.12-versionless-la-files.patch 2408 SHA256 edf8a85096492b36e9c1c1e48aea733d5134c44c789621dce948c36227549e74 SHA512 e0b465985538f9a3de2b8254e0d8e177fa6a8d4b2e483b44618f9e0fbc03b068eb61638c00e22e6be22fda3e2b74212c9e7dde223b1621836b6bea2aa9a5c616 WHIRLPOOL e223943de35b9d8b068eb6c84b2832a04613a467bbcb0fa7925aa4adfe506cd3bc30fe0acc4b546be549d88468a1d8e8139b9b4d25a5c3e27de7202ca9eef3e6
-AUX freeradius-2.1.3-pkglibdir.patch 2531 SHA256 27ac457b45d2e7212b85813294f42ac3e40041536e97a40213945080b053d281 SHA512 3bab2b2a610dc3819894887fdbe1a572589c8e0dae985fd5e555b0c56064d226c618c199da3d998a4315ddf913e1d27cb7e75ab5feba67b6e9c4580855643f67 WHIRLPOOL cbdc6195dccc29828edec20d9279d8897c5d4bb31daf60d15855f3bdaedccc8ed3c0bc8be101d84e3bfcc60b4e84bef55de02fc0b32dc281e1df38ee1531a872
-AUX freeradius-2.1.3-qafixes.patch 1906 SHA256 c8e2acafc9f1e1415681dba563e9bffe3a70896706cb154bf55081f8e6125a9d SHA512 15b7237e757343936eb4a7e13963a4999677809ea01174b018208b5377313122a78f48b66181145dd59a50a351a06001cc56fd915f1051449eab495fcd73d81b WHIRLPOOL 40ad9d7267b25fcc56b7b658de84ddc2b9d2aa01d91552bbff22ebc810168851798bcd7360153c6db1e362e36076a3cfc0802df2264bdd81f60fecfa5fc570c3
-AUX freeradius-2.1.3-ssl.patch 577 SHA256 7e3f5d70e3edd252e866ce81310a9840a0638f2cc6d1b11990769b636e216047 SHA512 4abc99b4ded086c6245b193b6a3eadb971fbe58d06c3fcba160a6a415a015a37e2c3e330cd0763da3ebbe93214cc21517c156f1fe0addf806914b4fc1b5e609b WHIRLPOOL c5410983cdd2c72be729c60eaa09a770a46a6932fae834cc703adf982ea015195253c74dcfcba23c9564896aa061f351b9cd06c2b88aec2b4d3a127310a58866
-AUX freeradius-2.1.3-versionless-la-files.patch 1708 SHA256 08fd64f382e0abd1216e6a93b11c45c794d504417e56d7b50007d0c4dfecea77 SHA512 d70f279d9fabf391cbcef251197eeb51a3e106ab0fa97fded99fde4b68dcf782467488a0b3f9d7a43bbb010b3932d89dcd2d1a57bafb2207f108cb2941865ee1 WHIRLPOOL 98670aca4fe27cbc04948e6b13e75560b608884deb62dd4ba513c287ef382a594427283817fc234e586825d8307cbe3dda8f815a6e8b4b4dd70aeea976225839
-AUX freeradius-2.1.6-nothreads.patch 514 SHA256 cad3e87971a5824d8f17fa462d7a9b0fe317261704eeebffdc404c4d41f2787a SHA512 3cc884e4469c5b9ddf551e915c1f009c17866f4647d8e090ba5928efcfae89031fbb6edde128c541faf4bc5e123847544974a514d3661d82514b91ee43729bed WHIRLPOOL 62dfb7003d87dfdc52aa92a35411e30b60877b406c5ec6975d5a74ba766635018cd1bc68892c5343bb839cce39bf68c3c26d5fc9a14d10b987edf344b351c8e7
-AUX freeradius-2.1.6-pkglibdir.patch 2547 SHA256 bd7c15f0c66e80ed07bb98a731217c5260e30d628b7305849d57c907f860b1c1 SHA512 7e12d5d3d1b05cba21ce5efb82d51d9e9d66fc34410c2b1a551f03c2bcdb882be7f59d28ed98181817657f6243ca4a69224717b59fc5fcb80ffe808f458fb34c WHIRLPOOL a20b474b2e8a828dd50fd5133bac446a375046626453e201e3b45c28dfc558695fc92d2ef184c8b34cc3285ecc81dc3c4483ab915c25754a8965df3c3a8289c5
-AUX freeradius-2.1.6-qafixes.patch 3686 SHA256 f0b3fc440636eeb33cc42a36d3ff344c816db55a8295bdbe816d00d4214eb1ec SHA512 5111fae1db42eb635ecdf7d4692b1295de37462a917b29d82914376df0cbeee320ba190b90bdd5585227717b2225d42bbf88dbe922ea97a207d6fcca51f7c910 WHIRLPOOL 67dc28916afc994259e6a817ce1e7ede58a7e212c08ebecfdd86fb345d77568531827f61a876979cc707138a7b323d5bcb2ffb85a5b49fd173fc8e3a028dfc84
-AUX freeradius-2.1.6-ssl.patch 577 SHA256 a7a3ed31fd470c23035f79a5b6252e163dde430a5d9dbcad5cf75bbd34b78672 SHA512 1e08950d504fa04d89c640f453da43c74072c55fb46d94e618a3afa05437051a44c8a17bc6f7e6d9a435f6a7a54727507292526cbf8ef33c40297808e4ca4a04 WHIRLPOOL 2dd491dbee00e38eac55a846c10572fecda25e0e700f515d20d7f6cb9581f5f1e1d26243af711fe37f2b850937b666ab26e1ca4c3ff636ae0edb2a9a01a3bda8
-AUX freeradius-2.1.6-versionless-la-files.patch 1747 SHA256 4e60188f1a2cd63b6dc775dbc8d09afd93e94b43431f7a930fed86399dd4883b SHA512 1be152682c6617a7683c8f3a016160f35de45aa116280b508f7f6c40b33c96d2480a3d7eda01b1a96d7d8781804c6ebd05d594be8831fd65f3b90d5f780452b3 WHIRLPOOL 934d1da163a87139e1a6b17ca57370114408efe1b59f1801acf32eb29f145fa509c031e38753f32aabe4b68412d51384abcb9cb5cbd502820b6d11283b239e85
-AUX freeradius-2.1.7-nothreads.patch 514 SHA256 09a33aaa0dae9223028564907324bfb869d52b027188211148ffe9a922fc083f SHA512 2fb643da3074f376b9796f5059f093ae11b653f861b514f4609665e38b7a62aebe7f5e91916b8bad503b4caa6060492e1bd3fcd39a283a60fe09f0ad82713711 WHIRLPOOL ec3f5a6ea4041ac1cc6906d6aa4bf299142618d318a7c84665e39b88cf220b026290b10045b0bbd62f1773568cb98f8cf7a34dccf0678b54393efc0c9606a16d
-AUX freeradius-2.1.7-pkglibdir.patch 2547 SHA256 471bff48a68fa104e4e10eed5a71721a9924f2072ebdfbb223f932ccdb6c556f SHA512 4ff022a851bc84dda06ad5b1380cf6e031eb5c08b74f06c2aab6021abdcd52ceafdc197ed357e34f63ca40d6ef9b1643550d74871ed387dc40de24a9877cf7b4 WHIRLPOOL bf55fa4dc585b54f4194b251612193ee434d694107e273ef552b63a91a42abc686a4b5260185e084be6fd8a21112da2bf97b00d70d94768920305d6f6f201b5d
-AUX freeradius-2.1.7-qafixes.patch 3686 SHA256 59e9c05eadb6bb0da32bd75e2317a613f37698da576e6feced041d95f7c59299 SHA512 fa471e81dc4c042fd3fa7af5be3cb55daffbcc937205ccb881c8b6de1a51a008d8dd9fdbcf3c23a7708e585823b540a2f282cc2d87270bc8738fc376e1febf84 WHIRLPOOL ab11c8d3bc31713c27b6ea1fb2bca5e11516548aa23ff7d6d904ae5d1fd3f5ab2f93635ced56ab2f3dde6d8c4feb0923d0288146b6b55216629d09806e9455ff
-AUX freeradius-2.1.7-ssl.patch 577 SHA256 160d021a70b293e651f1e834d17a5373a0be9afa2bde70eb323a5b27bddc4210 SHA512 4fb38b30dcdb194371d6c9d4783fe8df396e8f0957d2e29f33a21eac0a33235cd4ae916668227ef2582922ca53bc2b3280ba7671c3207da2404525c30ffa87aa WHIRLPOOL 49cd744ae02b995aacbd3415df37711816611ff06691fc07091b173df0dd29bbf74e6382936593ee828de13118dcb97af4dad69734e8d462b573d40cc3946748
-AUX freeradius-2.1.7-versionless-la-files.patch 1747 SHA256 156078ae2b72a388d5514fe27721d076853cd6fa4394a9fd02060088fad69b8f SHA512 c6408f8616d2cb8e3ab706a8199cbfcc1711b2ed3e30dd206434bc259957f8f070ed98e2f7da9495e5e4d78847c395b504b7647cb462000bb7727bc02e062df1 WHIRLPOOL 77b141320e34cb3bd243a96a7982c6997f809b7934f00d15831d1bb56d25c142505a56248a5236c08234211baeb15053e9cb5fef5e0b618e9766d88597acab24
 AUX radius.conf 129 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 SHA512 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b WHIRLPOOL c409c0a928e01045f1a60aab7e24ba2ef1645a94ac120cddc6a05b39b0b2dd0e79e50bb40d68ff9ec31aa8d1173c4f2d6f626376eda7d07fc47fc491d8f2bbcf
+AUX radius.conf-r3 345 SHA256 992331df42b77fe2b38fc6d715cfe0bc8d0d874fdcbbd510c9c99c85a77e6285 SHA512 353cb99bdb1c055b1590d34a4e148852de2b46f0c6292c88d1aad8c69eaaee6006e249eca79cd28dcd7690721f2ab65524f39c9015e714b10c439d343b7bf307 WHIRLPOOL 2f947c9728c7134cd8068933dd1784bfd1c39f15fa1d76f6e1c0d38087093399fe53a2a4e17b81413eb497f162ed69f19cd44129f34baa19ca2a347eaef6f9d9
 AUX radius.init-r1 1575 SHA256 5f20b72e4b627442313818cbe3c31cadfdc747fad18cacdafe58de62812eea41 SHA512 25c9cec70befd126bc5d324e802ecdf2ad940478edab55cb4384f0392690cade2fa2735c1eb18d990616c3d506b470c9007292192baf7a11ffe67b79c2e6df3b WHIRLPOOL 62e0b177a62b5248494f39baedd7ed65b6b8c10d2b872bd11a0c075b8d55069e890e4c92816b8fb6a4f6abc1234eea3235f1cb4a465ad59099f6f9fdd799a0d3
 AUX radius.init-r2 1358 SHA256 8a3d7d571985aef8c16c19a8b57bb7e1e2c7cf5dcfb24da421ce4bd241c5a001 SHA512 21265b729f1080a59805ac186280a4ad2cc2a26d56636b1969197ebbdf0a0fd471da31805ca9ce1e18693e90522a610ff95ec743a39f3a2b73e33ac3ee19a0da WHIRLPOOL 1b6fc4b3d55f6e69c04ea837510737e98744165f516b3bd582ee598221988dd8704e8f66781c9fa9c46d18cbb69b1c89afc79f2b48e047fb07fa592c8419c0c1
-DIST freeradius-server-2.1.11.tar.gz 4219356 SHA256 274ef96aa528d8b759f2fa06f2ba49ecbe1612e99fdedbb7016b557804b16b85
-DIST freeradius-server-2.1.12.tar.gz 4257106 SHA256 e597567c81ddbee385df8f076162c868ee6db5bf446c45ace94078c0c7d53805
+AUX radius.init-r3 779 SHA256 054572f5936fb6f226260eb9add2fada600a84a93e3b6ea6a78634fc886cd4ee SHA512 28779ec20bb8b5a803d2769c46e3cc9e3db74886d7b88819c90a2b8a945425f3a8fcbba0c70140191f777ffd9d40b3eb368dfefb0c7261d9df3b9e767d539604 WHIRLPOOL 671f3bfa5a038caceb6ccb3bb988fdc56290b51e27bd8ca1505358cc66e08a9df446d95db514b4b568bf7ae2cf38c2c53e4a14679a327dcfa6830e42109eba12
+DIST freeradius-2.2.0-patches-4.tar.xz 3140 SHA256 9fd7b6f7e1501d63a073e6279b20eb6d8154e7898d81c85a5c548543ab33c1af SHA512 38ebd65d9ad8ce8f513f2f5c7fd9ff43b81cf468038a49f9eb7f4a54d13783e88866c3031e7abc0fc8b65d2aec4f347efa358b9e7e2aadb2d15567ce7e125d1d WHIRLPOOL a532444f6bfebe260a6b4bf43157fa1624ce9920a86635172ac94e0f757263904bac6ca6a472e12df73e32a8d25d6f7b094272bd743d13c566f23bfcbff6df27
+DIST freeradius-server-2.1.11.tar.gz 4219356 SHA256 274ef96aa528d8b759f2fa06f2ba49ecbe1612e99fdedbb7016b557804b16b85 SHA512 c0cc39c26ccf897960a9c49f9c59116133bf0395fcfee5b5b339c53d8d42fef667ac6b6a01461b2a87f879fbdb3ee5ba9197e3f57a8bdc63d7ef7b583cfcb9e6 WHIRLPOOL 42dfe7c7a1d262e739138122f70871e55379fe64e6c846591c79a01f5b2c358f3b2cca4ee2667bfe5b34236d8fb42e11a065424cece2fec85a24b6d531ab6121
+DIST freeradius-server-2.1.12.tar.gz 4257106 SHA256 e597567c81ddbee385df8f076162c868ee6db5bf446c45ace94078c0c7d53805 SHA512 543ca20faa5ab2c45d7e0c9627c2860ac6eb2d1e3e920beffad612bb4a50a3ae65fe8f20a385541bca75ba05575091168de22c9c245f6869ecd5c862e6686189 WHIRLPOOL 88b8584fc8f27cfca99ec4a51ac77b653d0fa258aa80ccdd5d928893ec7a43c9c3db6a4e4716cc16d8da7dbbae64272862adba8ba3ba0558f1819996db42e5be
+DIST freeradius-server-2.2.0.tar.gz 4289865 SHA256 ac22eefe7bd7c1c2b4de28613e628fd3e9ccae08a00a103e5f75aac0927bf009 SHA512 8652d27a292c3a8627c13b0bf12b829d3f2c50d82ed85eb342d1ec5c84ceabf8963907d50464a5907d2934f1b069a491411b1d5129efaaecefe4a30251b2b607 WHIRLPOOL 9f7dc926da7a33bfb425cb668bc9cf940a7a2dafa2a73ba8847a15f0d725476fdb4afc41963426ade9175709007f6f72892c3e9cd33d82c6601f57b873f92471
 EBUILD freeradius-2.1.11-r1.ebuild 4110 SHA256 225eb1e6dbb61c11c144fa3aef9ef72fce155e6a2f118cbfc5598bf846f67ace SHA512 de7ffdb2561c05c746ed0b6a5b6e659ec952e128686884db80fdceb75754f1e1f11fc520075bdb7d4415211fe128c790b9157274af99de0ef1dcc9eb4b65b5c2 WHIRLPOOL 0dd3d935a38e01bb95383a034554ee51be5def5ad093f4c1072bd48e13c50bcdca0a3ff2e9c651c0e7c63e37130148a4249c975ce9d2fb3b5df5bb6aa7e22848
 EBUILD freeradius-2.1.12.ebuild 4251 SHA256 bd5397d4eb0f5f0bba8afc6b8ff96c1429a8212a6a0e21fd28e2de8187e96c8b SHA512 dcbc4014f6903e13652edca9d27a93bf9dead16e08328050887b7a9c525e54c03d74d21b0576c5e016bbdeb5de779413e1de9be2955af11c5313026f683e9331 WHIRLPOOL 8118823f7dddce10c62fa579b91433fa8d6c1beb6cc3b6f467de31b1ffe86facf4501cc974bcf151753c05b060eb566b95c369ff247bfdbaffe4521d595706eb
-MISC ChangeLog 21610 SHA256 48478ba72a4e0f8e5a7bf3c07244ae9560f345a1a7cfd6043a0d80db94d58743 SHA512 a7a9501341f0c41cd4005752c27c2c4b9d8bc833468eeaaa0f32678f3cd1ddd5d14eb7d1d36c903e141d367314fd71ba12ebb18016b76d95c47e500cc282a297 WHIRLPOOL 1a78df0da0fdb3ac31ff7a23e93c0cc21bffb06a4524629d489db518967095e20450284be11445a37fbfe21479456dcf2518ac4bb4fcfb6e2df7107dac0ce532
-MISC metadata.xml 573 SHA256 7524e8206191eb51975962a161ddaf4dc7e472a51616e135b833e38896c2bd5f SHA512 b04fdd5e7278114db06ae84616a3ab755eb3efac8ea6d11fa944376a8bc783e5d1025a34107893a170fc0593af76927dec4a2b751a33c3127333f7bd3940db1a WHIRLPOOL a666e68bee0c78e20895b5d1646f03ce0b3618c16dc3b52f705708acb6e0683fba6230284dc29be7265e136a94cb4369ef56d3e22ec52f708e0f0015ac34dc42
+EBUILD freeradius-2.2.0.ebuild 5085 SHA256 c2d9bcb297ccb91acdd40d6533d946ef94ae44f9669d6f69c619ca6b3c111dd6 SHA512 cb20a9c7707912022df06fb1a20e4fb7d7d0c0724b2dac24b2d2a8c9f7bec56b3615175862f439a88baab4c0d1c08313afd610fe14fbe631956145aebb1bc875 WHIRLPOOL 98c13b793b601ddb6ebaa4c8b24cb2efb5f27c95e818f83c5c32be925ccbd442eef2ac22df2ef909f45a13da64da8990be3537e5c6470ee87041007286bbda5c
+MISC ChangeLog 23624 SHA256 8873854ae31b01ff09abbf4acb373cba83894e35a4ad33e6c3b88a754a833ebf SHA512 b3afc129513feb413a391d993236e2b1a3098dc6d7d87da334b3e4653f93ea3f21a273f8ebdda73f8149e8e4784ecf9a8ac837a1d3a8d7ba0d962e20886ce2c4 WHIRLPOOL 17246ebe98e7705d3f24aba5c79635f994138b8361f35f7e903224a4089e5d75ae61572276056d1ae1418fae020c5ec5b3de5ef5c3ce3015e59e2f57babdaa61
+MISC metadata.xml 928 SHA256 0ed307b597546bed9f6e8bc6bec74535296f35a7e582870ec87a4998e8599f4a SHA512 c91ff3579e272eec306e308e31e6331adc31ca0967b7c8e2ab742fd9aed9a1eb786a4fb7396c8b525df890c47ac3c5e92fbefd8833eaa36079f5be8aa4a9f212 WHIRLPOOL 4ccf522adca2bc8964b5e97bd17150b97c94cca3967d1f48e5f2ca420ce4820108dc379e2a68f0f0b98e82f08df6f5605b8ae81f6afe99eec5572ee0352ad5f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP+qdzAAoJEPiazRVxLXTF1OwP/1QbEDnLT4XdLyPAkip9d5ha
-Tc0fOi9CVHe0KdJ2rYMfH2Wu1NV+C/L22+3Hz11MFWzRjgTtnmECKCfym+L7Z1AL
-3NR6oW+jvLvW4QFfx6+TipVBCD6a1a62ZImY9xmPPN7dk/BRlclvIxyKgCQfCQ6h
-wLHKhIa3ahI+FVXF2HubRYoJNwnxrZV3AbMZpKkJb6ahQWWN0H1v1OFlut+Hy+vw
-NZ2m330lzsQGrcuJkAqIAbypPmSShcgk+JZwb/z84b9hfujizxd0ZVEtgf7+WhGa
-pBw3wlp6mHHZVYho0vOvqwseivpaIySHMg05ZIJc/pxhLoUdjRgjyzbv/g/2LCxH
-xC80B69NuCKBC5WMIDowUMJ6Avlb7Lm6DvV4O3Z101heUGh0UgKz9xTGxIyrm1aq
-XxbM0/l6wKONJeLvoe9CXug4e/+TfDFxpBk8uwq6Uean8OZ5hba+jzFQMXVVZ04P
-Wb18n4qnmXpZlMGeQb3Cr1Ef45WWgorlpDT9NoZytW8l7UZsBkift4pofm5C1UFT
-QaiszJvld19ukOKj+WlSbfyxnbSsQtEMWYiJwpPrZMT28/TnNLnMoF6G13/pSk5W
-Wf56n8NKQ3/5y++Wlf/k1Tjt4qIpNFzLFyfuIxruiqk0b4/8M+cCJBRsCLqRxUuZ
-yU1CwmsvAIWBmWlQWrhy
-=/N+U
+iQEcBAEBCAAGBQJQZ+46AAoJEBzRPIrUMBNC8nEIAJlUEfZFLgBUXVvJVCiFWV6X
+ef2EVFP2VXuuFZwaru97tlwa99Hp5liAyZeOmDNFb4LjfQmTsPScRtGD1LuTqlwM
+3FTHDdif07dXwbvrAlxRoMjkE/fEaCbFWPmbwJGhVF706xYNSjmrMN5CWBI929EP
+0rj55fy+XQTNFPS1A5IAMHKv5FTXOoyb7Tn74QHbi7dw3ntAfpYUiLtsyVcSWx1d
+KYzq2AVooCYLPoDLGcx8WM0IZabrDxXmxOAu8UyCQK7X0DIVTRIzuyo0mG2cX2O9
+sZ5pbGSisH2fRgGWBjRi6pkbizXsq8LoqCv7qdt3qDgoJICh9LyEuEyW3iYfF8k=
+=ij6H
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-2.0.5-ssl.patch b/net-dialup/freeradius/files/freeradius-2.0.5-ssl.patch
deleted file mode 100644
index 94063f06b113..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.5-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile	2008-07-01 21:18:15.000000000 +0200
-+++ freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile	2008-07-01 21:18:35.000000000 +0200
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.0.5-threads.patch b/net-dialup/freeradius/files/freeradius-2.0.5-threads.patch
deleted file mode 100644
index 35ceb39626eb..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.5-threads.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/freeradius-2.0.5-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.0.5-versionless-la-files.patch
deleted file mode 100644
index ca80831ab7cc..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.5-versionless-la-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru freeradius-server-2.0.5.orig/src/lib/Makefile freeradius-server-2.0.5/src/lib/Makefile
---- freeradius-server-2.0.5.orig/src/lib/Makefile	2008-04-20 17:18:39.000000000 +0200
-+++ freeradius-server-2.0.5/src/lib/Makefile	2008-07-01 21:17:25.000000000 +0200
-@@ -53,5 +53,3 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile	2007-11-25 14:56:10.000000000 +0100
-+++ freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile	2008-07-01 21:17:25.000000000 +0200
-@@ -40,5 +40,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.0.5.orig/src/modules/rules.mak freeradius-server-2.0.5/src/modules/rules.mak
---- freeradius-server-2.0.5.orig/src/modules/rules.mak	2008-01-10 11:12:01.000000000 +0100
-+++ freeradius-server-2.0.5/src/modules/rules.mak	2008-07-01 21:17:25.000000000 +0200
-@@ -163,6 +163,4 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
diff --git a/net-dialup/freeradius/files/freeradius-2.1.1-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.1-qafixes.patch
deleted file mode 100644
index e120ae688463..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.1-qafixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru freeradius-server-2.1.1.orig/src/main/listen.c freeradius-server-2.1.1/src/main/listen.c
---- freeradius-server-2.1.1.orig/src/main/listen.c	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/src/main/listen.c	2008-10-12 08:47:46.000000000 +0000
-@@ -45,6 +45,9 @@
- #include <fcntl.h>
- #endif
- 
-+#ifdef WITH_UDPFROMTO
-+#include <freeradius-devel/udpfromto.h>
-+#endif
- 
- /*
-  *	We'll use this below.
diff --git a/net-dialup/freeradius/files/freeradius-2.1.1-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.1-ssl.patch
deleted file mode 100644
index 7023da15d02e..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.1-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile	2008-10-12 08:32:40.000000000 +0000
-+++ freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile	2008-10-12 08:33:22.000000000 +0000
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.1.1-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.1-versionless-la-files.patch
deleted file mode 100644
index ad5579b5ce4a..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.1-versionless-la-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru freeradius-server-2.1.1.orig/src/lib/Makefile freeradius-server-2.1.1/src/lib/Makefile
---- freeradius-server-2.1.1.orig/src/lib/Makefile	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/src/lib/Makefile	2008-10-12 08:31:40.000000000 +0000
-@@ -53,5 +53,3 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile	2008-10-12 08:31:40.000000000 +0000
-@@ -40,5 +40,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.1.1.orig/src/modules/rules.mak freeradius-server-2.1.1/src/modules/rules.mak
---- freeradius-server-2.1.1.orig/src/modules/rules.mak	2008-09-25 08:41:26.000000000 +0000
-+++ freeradius-server-2.1.1/src/modules/rules.mak	2008-10-12 08:31:40.000000000 +0000
-@@ -163,6 +163,4 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch
deleted file mode 100644
index ca7b80bdb875..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nru freeradius-server-2.1.3.orig/Make.inc.in freeradius-server-2.1.3/Make.inc.in
---- freeradius-server-2.1.3.orig/Make.inc.in	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/Make.inc.in	2009-03-01 13:19:54.000000000 +0000
-@@ -10,6 +10,7 @@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
- libdir		= @libdir@
-+pkglibdir	= @libdir@/freeradius
- bindir		= @bindir@
- sbindir		= @sbindir@
- docdir		= @docdir@
-diff -Nru freeradius-server-2.1.3.orig/raddb/radiusd.conf.in freeradius-server-2.1.3/raddb/radiusd.conf.in
---- freeradius-server-2.1.3.orig/raddb/radiusd.conf.in	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/raddb/radiusd.conf.in	2009-03-01 13:16:14.000000000 +0000
-@@ -103,7 +103,7 @@
- #	make
- #	make install
- #
--libdir = @libdir@
-+libdir = @libdir@/freeradius
- 
- #  pidfile: Where to place the PID of the RADIUS server.
- #
-diff -Nru freeradius-server-2.1.3.orig/src/modules/Makefile freeradius-server-2.1.3/src/modules/Makefile
---- freeradius-server-2.1.3.orig/src/modules/Makefile	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/modules/Makefile	2009-03-01 13:18:39.000000000 +0000
-@@ -12,7 +12,7 @@
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- 
- install:
--	$(INSTALL) -d -m 755 $(R)$(libdir)
-+	$(INSTALL) -d -m 755 $(R)$(pkglibdir)
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- 
- clean:
-diff -Nru freeradius-server-2.1.3.orig/src/modules/rules.mak freeradius-server-2.1.3/src/modules/rules.mak
---- freeradius-server-2.1.3.orig/src/modules/rules.mak	2009-03-01 13:02:14.000000000 +0000
-+++ freeradius-server-2.1.3/src/modules/rules.mak	2009-03-01 13:19:13.000000000 +0000
-@@ -117,7 +117,7 @@
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
--	-rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
-+	-rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
- 
- #######################################################################
- #
-@@ -158,11 +158,11 @@
- #  Do any module-specific installation.
- #
- #  If there isn't a TARGET defined, then don't do anything.
--#  Otherwise, install the libraries into $(libdir)
-+#  Otherwise, install the libraries into $(pkglibdir)
- #
- install:
- 	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
--		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
-+		$(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
- 	fi
diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch
deleted file mode 100644
index 2dce55e98fcc..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru freeradius-server-2.1.3.orig/configure.in freeradius-server-2.1.3/configure.in
---- freeradius-server-2.1.3.orig/configure.in	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/configure.in	2009-03-05 22:25:53.000000000 +0000
-@@ -544,7 +544,19 @@
- 	],
- 	[ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
- 
--AC_LIB_READLINE
-+AC_CHECK_LIB(readline, readline,
-+	[ LIBREADLINE="-lreadline"
-+	AC_DEFINE(HAVE_LIBREADLINE, 1,
-+		[Define to 1 if you have a readline compatible library.])
-+	AC_DEFINE(HAVE_READLINE_READLINE_H, 1,
-+		[Define to 1 if you have the <readline/readline.h> header file.])
-+	AC_DEFINE(HAVE_READLINE_HISTORY, 1,
-+		[Define if your readline library has \`add_history'])
-+	AC_DEFINE(HAVE_READLINE_HISTORY_H, 1,
-+		[Define to 1 if you have the <readline/history.h> header file.])
-+	],
-+	[ LIBREADLINE="" ])
-+AC_SUBST(LIBREADLINE)
- 
- dnl #############################################################
- dnl #
-diff -Nru freeradius-server-2.1.3.orig/src/lib/Makefile freeradius-server-2.1.3/src/lib/Makefile
---- freeradius-server-2.1.3.orig/src/lib/Makefile	2009-03-05 22:24:10.000000000 +0000
-+++ freeradius-server-2.1.3/src/lib/Makefile	2009-03-05 22:25:53.000000000 +0000
-@@ -41,7 +41,7 @@
- 
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
-+	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LIBS)
- 
- $(LT_OBJS): $(INCLUDES)
- 
-diff -Nru freeradius-server-2.1.3.orig/src/main/listen.c freeradius-server-2.1.3/src/main/listen.c
---- freeradius-server-2.1.3.orig/src/main/listen.c	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/main/listen.c	2009-03-05 22:25:53.000000000 +0000
-@@ -45,6 +45,9 @@
- #include <fcntl.h>
- #endif
- 
-+#ifdef WITH_UDPFROMTO
-+#include <freeradius-devel/udpfromto.h>
-+#endif
- 
- /*
-  *	We'll use this below.
diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch
deleted file mode 100644
index 923933cad907..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile	2009-03-01 11:35:56.000000000 +0000
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch
deleted file mode 100644
index 1e45df52f6aa..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru freeradius-server-2.1.3.orig/src/lib/Makefile freeradius-server-2.1.3/src/lib/Makefile
---- freeradius-server-2.1.3.orig/src/lib/Makefile	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/lib/Makefile	2009-03-01 11:37:10.000000000 +0000
-@@ -53,5 +53,3 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.3.orig/src/modules/rlm_eap/libeap/Makefile	2009-03-01 11:36:40.000000000 +0000
-+++ freeradius-server-2.1.3/src/modules/rlm_eap/libeap/Makefile	2009-03-01 11:37:10.000000000 +0000
-@@ -45,5 +45,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.1.3.orig/src/modules/rules.mak freeradius-server-2.1.3/src/modules/rules.mak
---- freeradius-server-2.1.3.orig/src/modules/rules.mak	2008-12-05 16:37:56.000000000 +0000
-+++ freeradius-server-2.1.3/src/modules/rules.mak	2009-03-01 11:37:10.000000000 +0000
-@@ -165,6 +165,4 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
diff --git a/net-dialup/freeradius/files/freeradius-2.1.6-nothreads.patch b/net-dialup/freeradius/files/freeradius-2.1.6-nothreads.patch
deleted file mode 100644
index 41a41c8d6e21..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.6-nothreads.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru freeradius-server-2.1.6.orig/src/main/event.c freeradius-server-2.1.6/src/main/event.c
---- freeradius-server-2.1.6.orig/src/main/event.c	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/main/event.c	2009-09-05 07:52:42.000000000 +0200
-@@ -1667,7 +1667,9 @@
- 	 */
- 	request->num_proxied_requests = 1;
- 	request->num_proxied_responses = 0;
-+#ifdef HAVE_PTHREAD_H
- 	request->child_pid = NO_SUCH_CHILD_PID;
-+#endif
- 
- 	update_event_timestamp(request->proxy, request->proxy_when.tv_sec);
- 
diff --git a/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch
deleted file mode 100644
index cd4e8fa5c27b..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru freeradius-server-2.1.6.orig/Make.inc.in freeradius-server-2.1.6/Make.inc.in
---- freeradius-server-2.1.6.orig/Make.inc.in	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/Make.inc.in	2009-08-23 10:49:43.000000000 +0200
-@@ -10,6 +10,7 @@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
- libdir		= @libdir@
-+pkglibdir	= @libdir@/freeradius
- bindir		= @bindir@
- sbindir		= @sbindir@
- docdir		= @docdir@
-diff -Nru freeradius-server-2.1.6.orig/raddb/radiusd.conf.in freeradius-server-2.1.6/raddb/radiusd.conf.in
---- freeradius-server-2.1.6.orig/raddb/radiusd.conf.in	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/raddb/radiusd.conf.in	2009-08-23 10:49:43.000000000 +0200
-@@ -103,7 +103,7 @@
- #	make
- #	make install
- #
--libdir = @libdir@
-+libdir = @libdir@/freeradius
- 
- #  pidfile: Where to place the PID of the RADIUS server.
- #
-diff -Nru freeradius-server-2.1.6.orig/src/modules/Makefile freeradius-server-2.1.6/src/modules/Makefile
---- freeradius-server-2.1.6.orig/src/modules/Makefile	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/modules/Makefile	2009-08-23 10:49:43.000000000 +0200
-@@ -12,7 +12,7 @@
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- 
- install:
--	$(INSTALL) -d -m 755 $(R)$(libdir)
-+	$(INSTALL) -d -m 755 $(R)$(pkglibdir)
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- 
- clean:
-diff -Nru freeradius-server-2.1.6.orig/src/modules/rules.mak freeradius-server-2.1.6/src/modules/rules.mak
---- freeradius-server-2.1.6.orig/src/modules/rules.mak	2009-08-23 10:46:57.000000000 +0200
-+++ freeradius-server-2.1.6/src/modules/rules.mak	2009-08-23 10:49:43.000000000 +0200
-@@ -123,7 +123,7 @@
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
--	-rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
-+	-rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
- 
- #######################################################################
- #
-@@ -164,13 +164,13 @@
- #  Do any module-specific installation.
- #
- #  If there isn't a TARGET defined, then don't do anything.
--#  Otherwise, install the libraries into $(libdir)
-+#  Otherwise, install the libraries into $(pkglibdir)
- #
- install:
- 	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
--		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
-+		$(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
- 	fi
- 
- .PHONY: scan
diff --git a/net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch
deleted file mode 100644
index 52fe59aefb88..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nru freeradius-server-2.1.6.orig/configure.in freeradius-server-2.1.6/configure.in
---- freeradius-server-2.1.6.orig/configure.in	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/configure.in	2009-08-23 10:48:53.000000000 +0200
-@@ -544,7 +544,19 @@
- 	],
- 	[ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
- 
--AC_LIB_READLINE
-+AC_CHECK_LIB(readline, readline,
-+	[ LIBREADLINE="-lreadline"
-+	AC_DEFINE(HAVE_LIBREADLINE, 1,
-+		[Define to 1 if you have a readline compatible library.])
-+	AC_DEFINE(HAVE_READLINE_READLINE_H, 1,
-+		[Define to 1 if you have the <readline/readline.h> header file.])
-+	AC_DEFINE(HAVE_READLINE_HISTORY, 1,
-+		[Define if your readline library has \`add_history'])
-+	AC_DEFINE(HAVE_READLINE_HISTORY_H, 1,
-+		[Define to 1 if you have the <readline/history.h> header file.])
-+	],
-+	[ LIBREADLINE="" ])
-+AC_SUBST(LIBREADLINE)
- 
- dnl #############################################################
- dnl #
-diff -Nru freeradius-server-2.1.6.orig/src/lib/Makefile freeradius-server-2.1.6/src/lib/Makefile
---- freeradius-server-2.1.6.orig/src/lib/Makefile	2009-08-23 10:46:57.000000000 +0200
-+++ freeradius-server-2.1.6/src/lib/Makefile	2009-08-23 10:48:53.000000000 +0200
-@@ -41,7 +41,7 @@
- 
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
-+	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LIBS)
- 
- $(LT_OBJS): $(INCLUDES)
- 
-diff -Nru freeradius-server-2.1.6.orig/src/main/listen.c freeradius-server-2.1.6/src/main/listen.c
---- freeradius-server-2.1.6.orig/src/main/listen.c	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/main/listen.c	2009-08-23 10:48:53.000000000 +0200
-@@ -45,6 +45,9 @@
- #include <fcntl.h>
- #endif
- 
-+#ifdef WITH_UDPFROMTO
-+#include <freeradius-devel/udpfromto.h>
-+#endif
- 
- /*
-  *	We'll use this below.
-diff -Nru freeradius-server-2.1.6.orig/src/include/radiusd.h freeradius-server-2.1.6/src/include/radiusd.h
---- freeradius-server-2.1.6.orig/src/include/radiusd.h	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/include/radiusd.h	2009-08-23 11:34:17.000000000 +0200
-@@ -637,6 +637,7 @@
- void event_new_fd(rad_listen_t *listener);
- 
- /* evaluate.c */
-+int radius_get_vp(REQUEST *request, const char *name, VALUE_PAIR **vp_p);
- int radius_evaluate_condition(REQUEST *request, int modreturn, int depth,
- 			      const char **ptr, int evaluate_it, int *presult);
- int radius_update_attrlist(REQUEST *request, CONF_SECTION *cs,
-diff -Nru freeradius-server-2.1.6.orig/src/modules/rlm_passwd/rlm_passwd.c freeradius-server-2.1.6/src/modules/rlm_passwd/rlm_passwd.c
---- freeradius-server-2.1.6.orig/src/modules/rlm_passwd/rlm_passwd.c	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/modules/rlm_passwd/rlm_passwd.c	2009-08-23 11:29:38.000000000 +0200
-@@ -247,8 +247,7 @@
- 
- static struct mypasswd * get_next(char *name, struct hashtable *ht)
- {
--#define passwd ((struct mypasswd *) ht->buffer)
--	struct mypasswd * hashentry;
-+	struct mypasswd * hashentry, * passwd;
- 	char buffer[1024];
- 	int len;
- 	char *list, *nextlist;
-@@ -267,6 +266,7 @@
- 	}
- 	/*	printf("try to find in file\n"); */
- 	if (!ht->fp) return NULL;
-+	passwd = (struct mypasswd *) ht->buffer;
- 	while (fgets(buffer, 1024,ht->fp)) {
- 		if(*buffer && *buffer!='\n' && (len = string_to_entry(buffer, ht->nfields, ht->delimiter, passwd, sizeof(ht->buffer)-1)) &&
- 			(!ht->ignorenis || (*buffer !='-' && *buffer != '+') ) ){
-@@ -288,7 +288,6 @@
- 	fclose(ht->fp);
- 	ht->fp = NULL;
- 	return NULL;
--#undef passwd
- }
- 
- static struct mypasswd * get_pw_nam(char * name, struct hashtable* ht)
diff --git a/net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch
deleted file mode 100644
index 7e3513033000..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile	2009-08-23 10:46:57.000000000 +0200
-+++ freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile	2009-08-23 10:47:38.000000000 +0200
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch
deleted file mode 100644
index ab779480bd96..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru freeradius-server-2.1.6.orig/src/lib/Makefile freeradius-server-2.1.6/src/lib/Makefile
---- freeradius-server-2.1.6.orig/src/lib/Makefile	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/lib/Makefile	2009-08-23 10:45:51.000000000 +0200
-@@ -53,8 +53,6 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
- 
- .PHONY: scan
- scan:
-diff -Nru freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.6.orig/src/modules/rlm_eap/libeap/Makefile	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/modules/rlm_eap/libeap/Makefile	2009-08-23 10:44:15.000000000 +0200
-@@ -44,5 +44,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.1.6.orig/src/modules/rules.mak freeradius-server-2.1.6/src/modules/rules.mak
---- freeradius-server-2.1.6.orig/src/modules/rules.mak	2009-05-18 13:13:55.000000000 +0200
-+++ freeradius-server-2.1.6/src/modules/rules.mak	2009-08-23 10:44:15.000000000 +0200
-@@ -171,8 +171,6 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
- 
- .PHONY: scan
diff --git a/net-dialup/freeradius/files/freeradius-2.1.7-nothreads.patch b/net-dialup/freeradius/files/freeradius-2.1.7-nothreads.patch
deleted file mode 100644
index a1835ff783d7..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.7-nothreads.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru freeradius-server-2.1.7.orig/src/main/event.c freeradius-server-2.1.7/src/main/event.c
---- freeradius-server-2.1.7.orig/src/main/event.c	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/main/event.c	2009-12-05 09:17:06.000000000 +0100
-@@ -1617,7 +1617,9 @@
- 	 */
- 	request->num_proxied_requests = 1;
- 	request->num_proxied_responses = 0;
-+#ifdef HAVE_PTHREAD_H
- 	request->child_pid = NO_SUCH_CHILD_PID;
-+#endif
- 
- 	update_event_timestamp(request->proxy, request->proxy_when.tv_sec);
- 
diff --git a/net-dialup/freeradius/files/freeradius-2.1.7-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.7-pkglibdir.patch
deleted file mode 100644
index c11ca3199160..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.7-pkglibdir.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru freeradius-server-2.1.7.orig/Make.inc.in freeradius-server-2.1.7/Make.inc.in
---- freeradius-server-2.1.7.orig/Make.inc.in	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/Make.inc.in	2009-12-05 09:16:12.000000000 +0100
-@@ -10,6 +10,7 @@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
- libdir		= @libdir@
-+pkglibdir	= @libdir@/freeradius
- bindir		= @bindir@
- sbindir		= @sbindir@
- docdir		= @docdir@
-diff -Nru freeradius-server-2.1.7.orig/raddb/radiusd.conf.in freeradius-server-2.1.7/raddb/radiusd.conf.in
---- freeradius-server-2.1.7.orig/raddb/radiusd.conf.in	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/raddb/radiusd.conf.in	2009-12-05 09:16:12.000000000 +0100
-@@ -103,7 +103,7 @@
- #	make
- #	make install
- #
--libdir = @libdir@
-+libdir = @libdir@/freeradius
- 
- #  pidfile: Where to place the PID of the RADIUS server.
- #
-diff -Nru freeradius-server-2.1.7.orig/src/modules/Makefile freeradius-server-2.1.7/src/modules/Makefile
---- freeradius-server-2.1.7.orig/src/modules/Makefile	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/modules/Makefile	2009-12-05 09:16:12.000000000 +0100
-@@ -12,7 +12,7 @@
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- 
- install:
--	$(INSTALL) -d -m 755 $(R)$(libdir)
-+	$(INSTALL) -d -m 755 $(R)$(pkglibdir)
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
- 
- clean:
-diff -Nru freeradius-server-2.1.7.orig/src/modules/rules.mak freeradius-server-2.1.7/src/modules/rules.mak
---- freeradius-server-2.1.7.orig/src/modules/rules.mak	2009-12-05 09:13:50.000000000 +0100
-+++ freeradius-server-2.1.7/src/modules/rules.mak	2009-12-05 09:16:12.000000000 +0100
-@@ -123,7 +123,7 @@
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
- 	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
--	-rpath $(libdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
-+	-rpath $(pkglibdir) $^ $(LIBRADIUS) $(RLM_LIBS) $(LIBS)
- 
- #######################################################################
- #
-@@ -164,13 +164,13 @@
- #  Do any module-specific installation.
- #
- #  If there isn't a TARGET defined, then don't do anything.
--#  Otherwise, install the libraries into $(libdir)
-+#  Otherwise, install the libraries into $(pkglibdir)
- #
- install:
- 	@[ "x$(RLM_INSTALL)" = "x" ] || $(MAKE) $(MFLAGS) $(RLM_INSTALL)
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
--		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
-+		$(TARGET).la $(R)$(pkglibdir)/$(TARGET).la || exit $$?; \
- 	fi
- 
- .PHONY: scan
diff --git a/net-dialup/freeradius/files/freeradius-2.1.7-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.7-qafixes.patch
deleted file mode 100644
index 28d6e373c23e..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.7-qafixes.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nru freeradius-server-2.1.7.orig/configure.in freeradius-server-2.1.7/configure.in
---- freeradius-server-2.1.7.orig/configure.in	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/configure.in	2009-12-05 09:15:14.000000000 +0100
-@@ -552,7 +552,19 @@
- 	],
- 	[ AC_MSG_WARN([pcap library not found, silently disabling the RADIUS sniffer.]) ])
- 
--AC_LIB_READLINE
-+AC_CHECK_LIB(readline, readline,
-+	[ LIBREADLINE="-lreadline"
-+	AC_DEFINE(HAVE_LIBREADLINE, 1,
-+		[Define to 1 if you have a readline compatible library.])
-+	AC_DEFINE(HAVE_READLINE_READLINE_H, 1,
-+		[Define to 1 if you have the <readline/readline.h> header file.])
-+	AC_DEFINE(HAVE_READLINE_HISTORY, 1,
-+		[Define if your readline library has \`add_history'])
-+	AC_DEFINE(HAVE_READLINE_HISTORY_H, 1,
-+		[Define to 1 if you have the <readline/history.h> header file.])
-+	],
-+	[ LIBREADLINE="" ])
-+AC_SUBST(LIBREADLINE)
- 
- dnl #############################################################
- dnl #
-diff -Nru freeradius-server-2.1.7.orig/src/include/radiusd.h freeradius-server-2.1.7/src/include/radiusd.h
---- freeradius-server-2.1.7.orig/src/include/radiusd.h	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/include/radiusd.h	2009-12-05 09:15:14.000000000 +0100
-@@ -642,6 +642,7 @@
- void event_new_fd(rad_listen_t *listener);
- 
- /* evaluate.c */
-+int radius_get_vp(REQUEST *request, const char *name, VALUE_PAIR **vp_p);
- int radius_evaluate_condition(REQUEST *request, int modreturn, int depth,
- 			      const char **ptr, int evaluate_it, int *presult);
- int radius_update_attrlist(REQUEST *request, CONF_SECTION *cs,
-diff -Nru freeradius-server-2.1.7.orig/src/lib/Makefile freeradius-server-2.1.7/src/lib/Makefile
---- freeradius-server-2.1.7.orig/src/lib/Makefile	2009-12-05 09:13:50.000000000 +0100
-+++ freeradius-server-2.1.7/src/lib/Makefile	2009-12-05 09:15:14.000000000 +0100
-@@ -41,7 +41,7 @@
- 
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^
-+	$(LDFLAGS) $(LINK_MODE) -o $@ -rpath $(libdir) $^ $(LIBS)
- 
- $(LT_OBJS): $(INCLUDES)
- 
-diff -Nru freeradius-server-2.1.7.orig/src/main/listen.c freeradius-server-2.1.7/src/main/listen.c
---- freeradius-server-2.1.7.orig/src/main/listen.c	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/main/listen.c	2009-12-05 09:15:14.000000000 +0100
-@@ -49,6 +49,9 @@
- #include <fcntl.h>
- #endif
- 
-+#ifdef WITH_UDPFROMTO
-+#include <freeradius-devel/udpfromto.h>
-+#endif
- 
- /*
-  *	We'll use this below.
-diff -Nru freeradius-server-2.1.7.orig/src/modules/rlm_passwd/rlm_passwd.c freeradius-server-2.1.7/src/modules/rlm_passwd/rlm_passwd.c
---- freeradius-server-2.1.7.orig/src/modules/rlm_passwd/rlm_passwd.c	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/modules/rlm_passwd/rlm_passwd.c	2009-12-05 09:15:14.000000000 +0100
-@@ -247,8 +247,7 @@
- 
- static struct mypasswd * get_next(char *name, struct hashtable *ht)
- {
--#define passwd ((struct mypasswd *) ht->buffer)
--	struct mypasswd * hashentry;
-+	struct mypasswd * hashentry, * passwd;
- 	char buffer[1024];
- 	int len;
- 	char *list, *nextlist;
-@@ -267,6 +266,7 @@
- 	}
- 	/*	printf("try to find in file\n"); */
- 	if (!ht->fp) return NULL;
-+	passwd = (struct mypasswd *) ht->buffer;
- 	while (fgets(buffer, 1024,ht->fp)) {
- 		if(*buffer && *buffer!='\n' && (len = string_to_entry(buffer, ht->nfields, ht->delimiter, passwd, sizeof(ht->buffer)-1)) &&
- 			(!ht->ignorenis || (*buffer !='-' && *buffer != '+') ) ){
-@@ -288,7 +288,6 @@
- 	fclose(ht->fp);
- 	ht->fp = NULL;
- 	return NULL;
--#undef passwd
- }
- 
- static struct mypasswd * get_pw_nam(char * name, struct hashtable* ht)
diff --git a/net-dialup/freeradius/files/freeradius-2.1.7-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.7-ssl.patch
deleted file mode 100644
index f30c09da182d..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.7-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.1.7.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.7/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.7.orig/src/modules/rlm_eap/libeap/Makefile	2009-12-05 09:13:50.000000000 +0100
-+++ freeradius-server-2.1.7/src/modules/rlm_eap/libeap/Makefile	2009-12-05 09:14:06.000000000 +0100
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.1.7-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.7-versionless-la-files.patch
deleted file mode 100644
index c33bb761e801..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.7-versionless-la-files.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru freeradius-server-2.1.7.orig/src/lib/Makefile freeradius-server-2.1.7/src/lib/Makefile
---- freeradius-server-2.1.7.orig/src/lib/Makefile	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/lib/Makefile	2009-12-05 09:12:55.000000000 +0100
-@@ -53,8 +53,6 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
- 
- .PHONY: scan
- scan:
-diff -Nru freeradius-server-2.1.7.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.7/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.7.orig/src/modules/rlm_eap/libeap/Makefile	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/modules/rlm_eap/libeap/Makefile	2009-12-05 09:12:55.000000000 +0100
-@@ -44,5 +44,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.1.7.orig/src/modules/rules.mak freeradius-server-2.1.7/src/modules/rules.mak
---- freeradius-server-2.1.7.orig/src/modules/rules.mak	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/modules/rules.mak	2009-12-05 09:12:55.000000000 +0100
-@@ -171,8 +171,6 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
- 
- .PHONY: scan
diff --git a/net-dialup/freeradius/files/radius.conf-r3 b/net-dialup/freeradius/files/radius.conf-r3
new file mode 100644
index 000000000000..2b29f0f940fd
--- /dev/null
+++ b/net-dialup/freeradius/files/radius.conf-r3
@@ -0,0 +1,12 @@
+# Config file for /etc/init.d/radiusd
+
+# see man pages for radiusd run `radiusd -h`
+# for valid cmdline options
+#RADIUSD_OPTS=""
+
+# Change this value if you change it in /etc/raddb/radiusd.conf
+pidfile=/var/run/radiusd/radiusd.pid
+
+# Change these values if you change them in /etc/raddb/radiusd.conf
+# RADIUSD_USER=radius
+# RADIUSD_GROUP=radius
diff --git a/net-dialup/freeradius/files/radius.init-r3 b/net-dialup/freeradius/files/radius.init-r3
new file mode 100644
index 000000000000..3195416e8499
--- /dev/null
+++ b/net-dialup/freeradius/files/radius.init-r3
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/files/radius.init-r3,v 1.1 2012/09/30 07:01:04 flameeyes Exp $
+
+command=/usr/sbin/radiusd
+command_args="${RADIUSD_OPTS}"
+pidfile="${pidfile:-/var/run/radiusd/radiusd.pid}"
+extra_started_commands="reload"
+
+depend() {
+    need net
+    use dns
+}
+
+start_pre() {
+    if [ ! -f /etc/raddb/radiusd.conf ] ; then
+	eerror "No /etc/raddb/radiusd.conf file exists!"
+	return 1
+    fi
+
+    checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
+	$(dirname ${pidfile}) /var/log/radius
+}
+
+reload() {
+    ebegin "Reloading radiusd"
+    kill -HUP $(cat /var/run/radiusd/radiusd.pid)
+    eend $?
+}
diff --git a/net-dialup/freeradius/freeradius-2.2.0.ebuild b/net-dialup/freeradius/freeradius-2.2.0.ebuild
new file mode 100644
index 000000000000..317ef2ae7614
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.2.0.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.2.0.ebuild,v 1.1 2012/09/30 07:01:04 flameeyes Exp $
+
+EAPI=4
+
+PATCHSET=4
+
+inherit eutils pam autotools user
+
+MY_P="${PN}-server-${PV}"
+
+DESCRIPTION="Highly configurable free RADIUS server"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
+	ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
+	http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bindist debug firebird kerberos ldap mysql
+pam postgres ssl pcap readline ruby sqlite python odbc iodbc
+oracle"
+
+RDEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	sys-devel/libtool
+	dev-lang/perl
+	sys-libs/gdbm
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	pcap? ( net-libs/libpcap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-server )
+	firebird? ( dev-db/firebird )
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	ruby? ( dev-lang/ruby:1.8 )
+	sqlite? ( dev-db/sqlite:3 )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( dev-db/libiodbc )
+	oracle? ( dev-db/oracle-instantclient-basic )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="bindist? ( !firebird )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup radius
+	enewuser radius -1 -1 /var/log/radius radius
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/patches/*.patch
+
+	# most of the configuration options do not appear as ./configure
+	# switches. Instead it identifies the directories that are available
+	# and run through them. These might check for the presence of
+	# various libraries, in which case they are not built.  To avoid
+	# automagic dependencies, we just remove all the modules that we're
+	# not interested in using.
+
+	use ssl || rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap}
+	use ldap || rm -r src/modules/rlm_ldap
+	use kerberos || rm -r src/modules/rlm_krb5
+	use pam || rm -r src/modules/rlm_pam
+	use python || rm -r src/modules/rlm_python
+	use ruby || rm -r src/modules/rlm_ruby
+
+	# these are all things we don't have in portage/I don't want to deal
+	# with myself
+	rm -r src/modules/rlm_eap/types/rlm_eap_tnc # requires TNCS library
+	rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 # requires libeap-ikev2
+	rm -r src/modules/rlm_opendirectory # requires some membership.h
+	rm -r src/modules/rlm_redis{,who} # requires redis
+	rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds,sybase}
+
+	# sql drivers that are not part of experimental are loaded from a
+	# file, so we have to remove them from the file itself when we
+	# remove them.
+	usesqldriver() {
+		local flag=$1
+		local driver=rlm_sql_${2:-${flag}}
+
+		if ! use ${flag}; then
+			rm -r src/modules/rlm_sql/drivers/${driver} || die
+			sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
+		fi
+	}
+
+	usesqldriver mysql
+	usesqldriver postgres postgresql
+	usesqldriver firebird
+	usesqldriver iodbc
+	usesqldriver odbc unixodbc
+	usesqldriver oracle
+	usesqldriver sqlite
+
+	# remove bundled ltdl to avoid conflicts
+	rm -r libltdl
+
+	eautoreconf
+}
+
+src_configure() {
+	# fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
+	fi
+
+	use readline || export ac_cv_lib_readline=no
+	use pcap || export ac_cv_lib_pcap_pcap_open_live=no
+
+	# do not try to enable static with static-libs; upstream is a
+	# massacre of libtool best practices so you also have to make sure
+	# to --enable-shared explicitly.
+	econf \
+		--enable-shared --disable-static \
+		--disable-ltdl-install \
+		--with-system-libtool \
+		--with-system-libltdl \
+		--with-ascend-binary \
+		--with-udpfromto \
+		--with-dhcp \
+		--with-iodbc-include-dir=/usr/include/iodbc \
+		--with-experimental-modules \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-logdir=/var/log/radius \
+		$(use_enable debug developer) \
+		$(use_with ldap edir) \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	dodir /etc
+	diropts -m0750 -o root -g radius
+	dodir /etc/raddb
+	diropts -m0750 -o radius -g radius
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	diropts
+
+	emake R="${D}" install
+	chown -R root:radius "${D}"/etc/raddb
+
+	sed -i -e '/run_dir/s:=.*:=/var/run/radiusd:' \
+		"${D}"/etc/raddb/radiusd.conf
+
+	pamd_mimic_system radiusd auth account password session
+
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd"
+
+	newinitd "${FILESDIR}/radius.init-r3" radiusd
+	newconfd "${FILESDIR}/radius.conf-r3" radiusd
+}
+
+pkg_config() {
+	if use ssl; then
+		cd "${ROOT}"/etc/raddb/certs
+		./bootstrap
+	fi
+}
+
+pkg_postinst() {
+	elog "Users are no longer read from /etc/raddb/radiusd.conf. Please"
+	elog "configure them in /etc/conf.d/radius instead."
+	elog "Also make sure that if you change the pidfile in /etc/raddb/radiusd.conf"
+	elog "you change the pidfile definition in /etc/conf.d/radius as well."
+	if use ssl; then
+		ewarn "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
+		ewarn "to start the radiusd service."
+	fi
+}
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 19b5ea9129d8..48c3cbdb2d7c 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -1,13 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-dialup</herd>
-<longdescription>Highly configurable free RADIUS server.</longdescription>
-<use>
-	<flag name='edirectory'>Enables Novell eDirectory integration</flag>
-	<flag name='frascend'>Enables Ascend binary mode</flag>
-	<flag name='frxp'>Enables experimental modules</flag>
-	<flag name='udpfromto'>Compile in UDPFROMTO support (enables freeradius to
-	specify source address correctly in multi-homed setups)</flag>
-</use>
+  <herd>net-dialup</herd>
+  <use>
+    <flag name='edirectory' restrict='&lt;net-dialup/freeradius-2.2.0'>
+      Enables Novell eDirectory integration. Requires ldap USE flag enabled.
+    </flag>
+    <flag name='frascend' restrict='&lt;net-dialup/freeradius-2.2.0'>
+      Enables Ascend binary mode
+    </flag>
+    <flag name='frxp' restrict='&lt;net-dialup/freeradius-2.2.0'>
+      Enables experimental modules
+    </flag>
+    <flag name='udpfromto' restrict='&lt;net-dialup/freeradius-2.2.0'>
+      Compile in UDPFROMTO support (enables freeradius to
+      specify source address correctly in multi-homed setups)
+    </flag>
+    <flag name='pcap' restrict='&gt;=net-dialup/freeradius-2.2.0'>
+      Build the RADIUS sniffer which requires <pkg>net-libs/libpcap</pkg>.
+    </flag>
+  </use>
 </pkgmetadata>