Remove old, vulnerable versions.

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

16 files changed, 28 insertions, 851 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index b9b65b62938c..da56015a0444 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,17 @@
 # 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.108 2012/10/03 10:29:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.109 2012/10/04 04:02:34 flameeyes Exp $
+
+  04 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/freeradius-2.1.10-pkglibdir.patch,
+  -files/freeradius-2.1.10-qafixes.patch, -files/freeradius-2.1.10-ssl.patch,
+  -files/freeradius-2.1.10-versionless-la-files.patch,
+  -files/freeradius-2.1.12-pkglibdir.patch,
+  -files/freeradius-2.1.12-qafixes.patch, -files/freeradius-2.1.12-ssl.patch,
+  -files/freeradius-2.1.12-versionless-la-files.patch, -files/radius.conf,
+  -files/radius.init-r1, -files/radius.init-r2, -freeradius-2.1.11-r1.ebuild,
+  -freeradius-2.1.12.ebuild, metadata.xml:
+  Remove old, vulnerable versions.
 
   03 Oct 2012; Agostino Sarubbo <ago@gentoo.org> freeradius-2.2.0.ebuild:
   Stable for amd64, wrt bug #434802
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 140ae9eb8c53..1d8895f31047 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,22 +1,21 @@
-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
-AUX freeradius-2.1.10-ssl.patch 582 SHA256 8ba257bea3504f1b800185af49ca0fe2a3f9bf65f0699c73e39f02e712467cef SHA512 b461158b05c404af87aa0c461e3d301780b9f5f1be935304258da51384d47024af0761ee14fe00c285f6586466484cee35c2d08089b0cef47b97bee58a66e6f0 WHIRLPOOL 82c759651b60bbfcec654404479e39494e33a297d0e76759564b2e15a6b5f51294be4e291f583765b319db27678b3912a76b0138ef70d23524bda255ddd23274
-AUX freeradius-2.1.10-versionless-la-files.patch 2404 SHA256 8668376594966a6440df8a720560602ac290cedf45bce3b23d38b5a8a685c1db SHA512 c90a241c848974736fa0ab761741a47b53d0b518e2640ddbf6147834763e870b72e56fd8e40077de56074f7f925212e4b8a4eda33f0b1b5557b3d7e2217081ee WHIRLPOOL fc75bce59bde62c19cd196fcf814fb98df7fc10b3298a422e03e7aa071be2a0c9ab488ae1590b3ba33c5304951edf6445d9177602e7ba1025535ab8bb934aaf2
-AUX freeradius-2.1.12-pkglibdir.patch 2555 SHA256 e0b0444d2ecd30518ad00df3d8744ae64adf6bab640bae977b31e0220614b5dd SHA512 4c9681fd5f6f843eb01346b273b34896412b37d6fe7cc4e6e563ebc8e919369da0f753e52fc23ba50ba58e06ba4ef5b8bb351d478972526c377b8c7900d5105a WHIRLPOOL a42ddbac304429dc013bcf174fcd5cb9d16c181d72557ba0efaea2aee3af9023ce799c5c1d8d8c0c4cc0d19bb39c03c2fb9e38d5fa00c6d881183127dc50dd2c
-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 radius.conf 129 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 SHA512 e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b WHIRLPOOL c409c0a928e01045f1a60aab7e24ba2ef1645a94ac120cddc6a05b39b0b2dd0e79e50bb40d68ff9ec31aa8d1173c4f2d6f626376eda7d07fc47fc491d8f2bbcf
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
 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
 EBUILD freeradius-2.2.0.ebuild 5092 SHA256 2e1ec863489ca964976ab85056233c10a0c011214e20f93765b61b9950860ce7 SHA512 2a32c49a74cfc5dafa44a2bb463a04abf5dc1823c50f01de004b291218dba3c422da6ee04f0250bf495b17f4593b08e78ef6e5e95a267b71e0e77ce37f1cb71e WHIRLPOOL 463afa3262625777f73b25866f716bfc228480d04db748f73b296c5cd41a559aa2cd25c3645fcaae46a51403c14837a814ff065127443f994e35641ad567d5c0
-MISC ChangeLog 24114 SHA256 f40aa2724b9f2dc199d58c85834aaf775dc4bb87f1069bb2917d0c18a064cbac SHA512 a965ea913aea8d2886a5418e49e826963ab8d52eae215a7a4f9f0c8a99a8a69e3c048f16dfa3830fc05ef2105702c934775af1557e5a7420e4ba5e6897d3208b WHIRLPOOL 3af11fedec2be3e272704db97802b0c9f2246be2037844adb35ad39d8ea8257b0d852a699798eb017ffef8149c17cfe1a02e8b23dc03795cd169b48b34231b1d
-MISC metadata.xml 928 SHA256 0ed307b597546bed9f6e8bc6bec74535296f35a7e582870ec87a4998e8599f4a SHA512 c91ff3579e272eec306e308e31e6331adc31ca0967b7c8e2ab742fd9aed9a1eb786a4fb7396c8b525df890c47ac3c5e92fbefd8833eaa36079f5be8aa4a9f212 WHIRLPOOL 4ccf522adca2bc8964b5e97bd17150b97c94cca3967d1f48e5f2ca420ce4820108dc379e2a68f0f0b98e82f08df6f5605b8ae81f6afe99eec5572ee0352ad5f7
+MISC ChangeLog 24707 SHA256 1384c0c73903ea067ab005598f93552ba3bac43bb6deeebf4710306563b67771 SHA512 fcaa0e60d3badf7dd62e82b3ba6051564a0db696d8fd583b7ffb6e3af5aabbfd756bcab793ee1ea8d934f88e40e30109d7b7732e0c52ddcbdeca8da47a26ed3c WHIRLPOOL ab2101a9759fbbc70a106596dd1fa6ac4d5fddfe1a12b84d2d092370ad0429b426472ea314962025e375da4ef82f0409c54c53ea41f1dfdff8c7f6a3284f49ce
+MISC metadata.xml 336 SHA256 29863f9bf25dd54d1faeb3c29ff6121932ebb82f7fc59f7475f7a59e9aebe2e0 SHA512 7568e5fb08935d3c8644da304503213feb684da114c6a07461656b629e4d90c258674348cbee76044592bacc0aab31fe0509fe81f7bc15b8f48349e27bc7ed39 WHIRLPOOL 18a5342bb89deb766897dd3985e6b665ed001e6c80d8a8e52148ccb8cd9ffe0bc7729b9404e11e0d6bdbc7f2ca103e391a7b3ba5b0a27c403a532c5439058bae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQbQpeAAoJEBzRPIrUMBNCyccH/3n12sRXYPveDwwv1iAQdL1w
+bJlX2DoPGYmd+CUguZaF8OrI5/V8eNpWd2wq3uIiQNQju2eVeSV9zGsxnjvhBdwx
+USWVnFbtn0qlzyLpJ6V6rUZTpQ5/VwZl3ePt4HGk8ykbPpFnWZSZpOT9mnCuB9zN
+8upGanIU2h8b3gg8rOhCMIbHs2JMJHFrDD0d18MOtRYMvzdwt3HZW/0OwLGFr+7i
+BAQXpUBRavaKCUteZPnld3PoLVWuoBZVxH4RKLW+f0+ngdn7Z08zO6BHE/fYUJew
+QCTT/SXKHzR6B76qWie3/+Lw+E9DlthBAtnVNkPtHdediGMSzEC3WzWo9getOQU=
+=2eVa
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-2.1.10-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.10-pkglibdir.patch
deleted file mode 100644
index 294b60452590..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.10-pkglibdir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur freeradius-server-2.1.10.orig/Make.inc.in freeradius-server-2.1.10/Make.inc.in
---- freeradius-server-2.1.10.orig/Make.inc.in	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/Make.inc.in	2011-02-09 17:51:46.000000000 +0100
-@@ -10,6 +10,7 @@
- sysconfdir	= @sysconfdir@
- localstatedir	= @localstatedir@
- libdir		= @libdir@
-+pkglibdir	= @libdir@/freeradius
- bindir		= @bindir@
- sbindir		= @sbindir@
- docdir		= @docdir@
-diff -Naur freeradius-server-2.1.10.orig/raddb/radiusd.conf.in freeradius-server-2.1.10/raddb/radiusd.conf.in
---- freeradius-server-2.1.10.orig/raddb/radiusd.conf.in	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/raddb/radiusd.conf.in	2011-02-09 17:51:57.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 -Naur freeradius-server-2.1.10.orig/src/modules/Makefile freeradius-server-2.1.10/src/modules/Makefile
---- freeradius-server-2.1.10.orig/src/modules/Makefile	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/modules/Makefile	2011-02-09 17:52:11.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 -Naur freeradius-server-2.1.10.orig/src/modules/rules.mak freeradius-server-2.1.10/src/modules/rules.mak
---- freeradius-server-2.1.10.orig/src/modules/rules.mak	2011-02-09 17:50:58.000000000 +0100
-+++ freeradius-server-2.1.10/src/modules/rules.mak	2011-02-09 17:52:53.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,11 +164,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.10-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.10-qafixes.patch
deleted file mode 100644
index a8b21f2d26ae..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.10-qafixes.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -Naur freeradius-server-2.1.10.orig/configure.in freeradius-server-2.1.10/configure.in
---- freeradius-server-2.1.10.orig/configure.in	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/configure.in	2011-02-09 17:42:53.000000000 +0100
-@@ -556,7 +556,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 -Naur freeradius-server-2.1.10.orig/configure.in.orig freeradius-server-2.1.10/configure.in.orig
-diff -Naur freeradius-server-2.1.10.orig/src/include/radiusd.h freeradius-server-2.1.10/src/include/radiusd.h
---- freeradius-server-2.1.10.orig/src/include/radiusd.h	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/include/radiusd.h	2011-02-09 17:42:53.000000000 +0100
-@@ -645,6 +645,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 -Naur freeradius-server-2.1.10.orig/src/include/radiusd.h.orig freeradius-server-2.1.10/src/include/radiusd.h.orig
-diff -Naur freeradius-server-2.1.10.orig/src/lib/Makefile freeradius-server-2.1.10/src/lib/Makefile
---- freeradius-server-2.1.10.orig/src/lib/Makefile	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/lib/Makefile	2011-02-09 17:42:53.000000000 +0100
-@@ -42,7 +42,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 -Naur freeradius-server-2.1.10.orig/src/lib/Makefile.orig freeradius-server-2.1.10/src/lib/Makefile.orig
-diff -Naur freeradius-server-2.1.10.orig/src/main/listen.c freeradius-server-2.1.10/src/main/listen.c
---- freeradius-server-2.1.10.orig/src/main/listen.c	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/main/listen.c	2011-02-09 17:42:53.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 -Naur freeradius-server-2.1.10.orig/src/modules/rlm_passwd/rlm_passwd.c freeradius-server-2.1.10/src/modules/rlm_passwd/rlm_passwd.c
---- freeradius-server-2.1.10.orig/src/modules/rlm_passwd/rlm_passwd.c	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/modules/rlm_passwd/rlm_passwd.c	2011-02-09 17:42:53.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.10-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.10-ssl.patch
deleted file mode 100644
index 09ec28c2cddc..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.10-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur freeradius-server-2.1.10.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.10/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.10.orig/src/modules/rlm_eap/libeap/Makefile	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/modules/rlm_eap/libeap/Makefile	2011-02-09 17:41:44.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.10-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.10-versionless-la-files.patch
deleted file mode 100644
index c86c844abaf5..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.10-versionless-la-files.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur freeradius-server-2.1.10.orig/src/lib/Makefile freeradius-server-2.1.10/src/lib/Makefile
---- freeradius-server-2.1.10.orig/src/lib/Makefile	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/lib/Makefile	2011-02-09 17:39:25.000000000 +0100
-@@ -54,7 +54,5 @@
- 	$(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
- 
- reconfig:
-diff -Naur freeradius-server-2.1.10.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.10/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.10.orig/src/modules/rlm_eap/libeap/Makefile	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/modules/rlm_eap/libeap/Makefile	2011-02-09 17:40:00.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 -Naur freeradius-server-2.1.10.orig/src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rules.mak
---- freeradius-server-2.1.10.orig/src/modules/rlm_sql/drivers/rules.mak	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rules.mak	2011-02-09 17:40:17.000000000 +0100
-@@ -147,6 +147,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 -Naur freeradius-server-2.1.10.orig/src/modules/rules.mak freeradius-server-2.1.10/src/modules/rules.mak
---- freeradius-server-2.1.10.orig/src/modules/rules.mak	2010-09-28 13:03:56.000000000 +0200
-+++ freeradius-server-2.1.10/src/modules/rules.mak	2011-02-09 17:39:43.000000000 +0100
-@@ -171,6 +171,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.12-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.12-pkglibdir.patch
deleted file mode 100644
index 207619b65921..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.12-pkglibdir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Nru freeradius-server-2.1.12.orig//Make.inc.in freeradius-server-2.1.12/Make.inc.in
---- freeradius-server-2.1.12.orig//Make.inc.in	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/Make.inc.in	2011-11-20 13:04:20.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.12.orig//raddb/radiusd.conf.in freeradius-server-2.1.12/raddb/radiusd.conf.in
---- freeradius-server-2.1.12.orig//raddb/radiusd.conf.in	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/raddb/radiusd.conf.in	2011-11-20 13:04:20.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.12.orig//src/modules/Makefile freeradius-server-2.1.12/src/modules/Makefile
---- freeradius-server-2.1.12.orig//src/modules/Makefile	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/modules/Makefile	2011-11-20 13:04:20.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.12.orig//src/modules/rules.mak freeradius-server-2.1.12/src/modules/rules.mak
---- freeradius-server-2.1.12.orig//src/modules/rules.mak	2011-11-20 12:48:22.000000000 +0100
-+++ freeradius-server-2.1.12/src/modules/rules.mak	2011-11-20 13:04:20.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,11 +164,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.12-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.12-qafixes.patch
deleted file mode 100644
index 6b8c2f6c7a4b..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.12-qafixes.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nru freeradius-server-2.1.12.orig//configure.in freeradius-server-2.1.12/configure.in
---- freeradius-server-2.1.12.orig//configure.in	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/configure.in	2011-11-20 12:50:50.000000000 +0100
-@@ -577,7 +577,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.12.orig//src/include/radiusd.h freeradius-server-2.1.12/src/include/radiusd.h
---- freeradius-server-2.1.12.orig//src/include/radiusd.h	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/include/radiusd.h	2011-11-20 12:50:50.000000000 +0100
-@@ -652,6 +652,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.12.orig//src/lib/Makefile freeradius-server-2.1.12/src/lib/Makefile
---- freeradius-server-2.1.12.orig//src/lib/Makefile	2011-11-20 12:48:22.000000000 +0100
-+++ freeradius-server-2.1.12/src/lib/Makefile	2011-11-20 12:50:50.000000000 +0100
-@@ -42,7 +42,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.12.orig//src/main/listen.c freeradius-server-2.1.12/src/main/listen.c
---- freeradius-server-2.1.12.orig//src/main/listen.c	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/main/listen.c	2011-11-20 12:50:50.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.12.orig//src/modules/rlm_passwd/rlm_passwd.c freeradius-server-2.1.12/src/modules/rlm_passwd/rlm_passwd.c
---- freeradius-server-2.1.12.orig//src/modules/rlm_passwd/rlm_passwd.c	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/modules/rlm_passwd/rlm_passwd.c	2011-11-20 12:50:50.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.12-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.12-ssl.patch
deleted file mode 100644
index 6488c87a429f..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.12-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.1.12.orig//src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.12/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.12.orig//src/modules/rlm_eap/libeap/Makefile	2011-11-20 12:48:22.000000000 +0100
-+++ freeradius-server-2.1.12/src/modules/rlm_eap/libeap/Makefile	2011-11-20 12:49:19.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.12-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.12-versionless-la-files.patch
deleted file mode 100644
index c3cd082479c9..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.1.12-versionless-la-files.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nru freeradius-server-2.1.12.orig//src/lib/Makefile freeradius-server-2.1.12/src/lib/Makefile
---- freeradius-server-2.1.12.orig//src/lib/Makefile	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/lib/Makefile	2011-11-20 12:47:22.000000000 +0100
-@@ -54,7 +54,5 @@
- 	$(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
- 
- reconfig:
-diff -Nru freeradius-server-2.1.12.orig//src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.12/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.1.12.orig//src/modules/rlm_eap/libeap/Makefile	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/modules/rlm_eap/libeap/Makefile	2011-11-20 12:47:22.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.12.orig//src/modules/rlm_sql/drivers/rules.mak freeradius-server-2.1.12/src/modules/rlm_sql/drivers/rules.mak
---- freeradius-server-2.1.12.orig//src/modules/rlm_sql/drivers/rules.mak	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/modules/rlm_sql/drivers/rules.mak	2011-11-20 12:47:22.000000000 +0100
-@@ -147,6 +147,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 -Nru freeradius-server-2.1.12.orig//src/modules/rules.mak freeradius-server-2.1.12/src/modules/rules.mak
---- freeradius-server-2.1.12.orig//src/modules/rules.mak	2011-09-30 16:12:07.000000000 +0200
-+++ freeradius-server-2.1.12/src/modules/rules.mak	2011-11-20 12:47:22.000000000 +0100
-@@ -171,6 +171,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/radius.conf b/net-dialup/freeradius/files/radius.conf
deleted file mode 100644
index 9811289ba453..000000000000
--- a/net-dialup/freeradius/files/radius.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for /etc/init.d/radiusd
-
-# see man pages for radiusd run `radiusd -h`
-# for valid cmdline options
-#RADIUSD_OPTS=""
diff --git a/net-dialup/freeradius/files/radius.init-r1 b/net-dialup/freeradius/files/radius.init-r1
deleted file mode 100644
index 8c5f8c7927d9..000000000000
--- a/net-dialup/freeradius/files/radius.init-r1
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-
-opts="${opts} reload"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	# set the location of log files
-	if ! cd /var/log/radius ; then
-		eerror "Failed to change current directory to /var/log/radius"
-		return 1
-	fi
-
-	if [ ! -d /var/run/radiusd ] && ! mkdir /var/run/radiusd ; then
-		eerror "Failed to create /var/run/radiusd"
-		return 1
-	fi
-	
-	if [ ! -f /etc/raddb/radiusd.conf ] ; then
-		eerror "No /etc/raddb/radiusd.conf file exists!"
-		return 1
-	fi
-
-	RADIUSD_USER=`grep '^ *user *=' /etc/raddb/radiusd.conf | cut -d ' ' -f 3`
-	RADIUSD_GROUP=`grep '^ *group *=' /etc/raddb/radiusd.conf | cut -d ' ' -f 3`
-	if [ -n "${RADIUSD_USER}" ] && ! getent passwd ${RADIUSD_USER} > /dev/null ; then
-		eerror "${RADIUSD_USER} user missing!"
-		return 1
-	fi
-	if [ -n "${RADIUSD_GROUP}" ] && ! getent group ${RADIUSD_GROUP} > /dev/null ; then
-		eerror "${RADIUSD_GROUP} group missing!"
-		return 1
-	fi
-
-	# radius.log is created before privileges are dropped - need to set proper permissions on it
-	[ -f radius.log ] || touch radius.log || return 1
-
-	chown -R "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" . /var/run/radiusd && \
-		chmod -R u+rwX,g+rX . /var/run/radiusd || return 1
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting radiusd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/radiusd -- ${RADIUSD_OPTS} >/dev/null
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping radiusd"
-	start-stop-daemon --stop --quiet --pidfile=/var/run/radiusd/radiusd.pid
-	eend $?
-}
-
-reload () {
-	ebegin "Reloading radiusd"
-	kill -HUP `</var/run/radiusd/radiusd.pid`
-	eend $?
-}
diff --git a/net-dialup/freeradius/files/radius.init-r2 b/net-dialup/freeradius/files/radius.init-r2
deleted file mode 100644
index 107bbd9cc3ba..000000000000
--- a/net-dialup/freeradius/files/radius.init-r2
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/sbin/runscript
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -d /var/run/radiusd ] && ! mkdir /var/run/radiusd ; then
-		eerror "Failed to create /var/run/radiusd"
-		return 1
-	fi
-	
-	if [ ! -f /etc/raddb/radiusd.conf ] ; then
-		eerror "No /etc/raddb/radiusd.conf file exists!"
-		return 1
-	fi
-
-	RADIUSD_USER=`grep '^ *user *=' /etc/raddb/radiusd.conf | cut -d ' ' -f 3`
-	RADIUSD_GROUP=`grep '^ *group *=' /etc/raddb/radiusd.conf | cut -d ' ' -f 3`
-	if [ -n "${RADIUSD_USER}" ] && ! getent passwd ${RADIUSD_USER} > /dev/null ; then
-		eerror "${RADIUSD_USER} user missing!"
-		return 1
-	fi
-	if [ -n "${RADIUSD_GROUP}" ] && ! getent group ${RADIUSD_GROUP} > /dev/null ; then
-		eerror "${RADIUSD_GROUP} group missing!"
-		return 1
-	fi
-
-	local dirs=/var/run/radiusd
-	[ -d /var/log/radius ] && dirs="${dirs} /var/log/radius"
-	chown -R "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" ${dirs} && \
-		chmod -R u+rwX,g+rX ${dirs} || return 1
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting radiusd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/radiusd -- ${RADIUSD_OPTS} >/dev/null
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping radiusd"
-	start-stop-daemon --stop --quiet --pidfile=/var/run/radiusd/radiusd.pid
-	eend $?
-}
-
-reload () {
-	ebegin "Reloading radiusd"
-	kill -HUP `</var/run/radiusd/radiusd.pid`
-	eend $?
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.11-r1.ebuild b/net-dialup/freeradius/freeradius-2.1.11-r1.ebuild
deleted file mode 100644
index 2cff5e559042..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.1.11-r1.ebuild,v 1.1 2012/07/09 09:42:05 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib pam autotools libtool user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-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"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	sys-libs/readline
-	net-libs/libpcap
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="frxp? ( threads )"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radius
-	enewuser radius -1 -1 /var/log/radius radius
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1.10-versionless-la-files.patch"
-	epatch "${FILESDIR}/${PN}-2.1.10-ssl.patch"
-	epatch "${FILESDIR}/${PN}-2.1.10-qafixes.patch"
-	epatch "${FILESDIR}/${PN}-2.1.10-pkglibdir.patch"
-
-	append-flags -lpthread
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	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 bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or 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
-
-	# These are needed for fixing libtool-2 related issues (#261189)
-	# Keep these lines even if you don't patch *.{in,am} files!
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	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) \
-		$(use_with threads)"
-
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-static --disable-ltdl-install --with-system-libtool \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	chown -R root:radius "${D}"/etc/raddb
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.12.ebuild b/net-dialup/freeradius/freeradius-2.1.12.ebuild
deleted file mode 100644
index 4e257a42a37d..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.12.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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.1.12.ebuild,v 1.3 2012/06/14 06:50:26 polynomial-c Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib pam autotools libtool user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-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"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	sys-libs/readline
-	net-libs/libpcap
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="frxp? ( threads )"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	if has_version '<net-dialup/freeradius-2.1.12'; then
-		elog "Please rename radiusd group/user as radius"
-		elog "and update /etc/raddb/radius.conf accordingly!"
-	else
-		enewgroup radius
-		enewuser radius -1 -1 /var/log/radius radius
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-qafixes.patch"
-	epatch "${FILESDIR}/${P}-pkglibdir.patch"
-
-	append-flags -lpthread
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	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 bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or 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
-
-	# These are needed for fixing libtool-2 related issues (#261189)
-	# Keep these lines even if you don't patch *.{in,am} files!
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	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) \
-		$(use_with threads)"
-
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-static --disable-ltdl-install --with-system-libtool \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radius
-	dodir /etc/raddb
-	diropts -m0750 -o radius -g radius
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	chown -R root:radius "${D}"/etc/raddb
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r2" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 48c3cbdb2d7c..f22289de184b 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -3,19 +3,6 @@
 <pkgmetadata>
   <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>