Version bump.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

7 files changed, 366 insertions, 2 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 99cf058c13a3..08081770a228 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.88 2009/07/31 17:06:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.89 2009/08/23 10:38:04 mrness Exp $
+
+*freeradius-2.1.6 (23 Aug 2009)
+
+  23 Aug 2009; Alin Năstac <mrness@gentoo.org>
+  +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,
+  +freeradius-2.1.6.ebuild:
+  Version bump.
 
   31 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   freeradius-1.1.7.ebuild, freeradius-2.0.5.ebuild, freeradius-2.1.1.ebuild,
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 7fe0b277cc18..0d33ce9d52b1 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freeradius-1.1.7-qa-fixes.patch 1276 RMD160 6f91d3b370897864e2a1fd05a6aad69802169b56 SHA1 e71e0154ca513ba822bbeced72b0030eb309aa8e SHA256 ae447fbdc9ca1e11a8ca4af9d35821957de44e526684064c494c51f24cb46f7f
 AUX freeradius-1.1.7-ssl.patch 549 RMD160 ecbe747cda0b68ad72a4c473693616156d1b0cbf SHA1 be1acc21c7a029b56a56e254c87a3cf8517dd48a SHA256 a8907a79b2aee8f8c652568318af92d425a11638f644163c0da9cfcd5f3ee514
 AUX freeradius-1.1.7-versionless-la-files.patch 1624 RMD160 8c6c695812b4699c0eeff342b507e444c0060652 SHA1 b363b14c372c63913621261f292103752bc57333 SHA256 468aaf6e1c823793e40499d6e861acceab5a09235225ff6fefb7e1c8c653d846
@@ -11,6 +14,10 @@ AUX freeradius-2.1.3-pkglibdir.patch 2531 RMD160 f6c07c49f78db57c081b191973a6110
 AUX freeradius-2.1.3-qafixes.patch 1906 RMD160 d7ec64207b577b64a1f4b87a64511f43db0cf0e5 SHA1 e1338fb5698605d33d586de06ab102cec7fe4a58 SHA256 c8e2acafc9f1e1415681dba563e9bffe3a70896706cb154bf55081f8e6125a9d
 AUX freeradius-2.1.3-ssl.patch 577 RMD160 b3f3f09456e4d04ccc6d3c87873dcd647666f808 SHA1 97ebdc1106eae298c769a3f9753909d9970c972f SHA256 7e3f5d70e3edd252e866ce81310a9840a0638f2cc6d1b11990769b636e216047
 AUX freeradius-2.1.3-versionless-la-files.patch 1708 RMD160 6ea39b1655af1cf46e3714133506ebc63490cb16 SHA1 780c7bc300f8aa09d9f1ecf20f2e21311273a517 SHA256 08fd64f382e0abd1216e6a93b11c45c794d504417e56d7b50007d0c4dfecea77
+AUX freeradius-2.1.6-pkglibdir.patch 2547 RMD160 46fa13ce524ba1a61db27d130161464cafdca65f SHA1 0796e1bdd4b65699ccebf5f61dbdb18513464968 SHA256 bd7c15f0c66e80ed07bb98a731217c5260e30d628b7305849d57c907f860b1c1
+AUX freeradius-2.1.6-qafixes.patch 3686 RMD160 0860ee3afdec320406b2d2398fc8b73d80ec4e07 SHA1 ea1bc3e906e2d3e6d65f69d78ee2c845775b1004 SHA256 f0b3fc440636eeb33cc42a36d3ff344c816db55a8295bdbe816d00d4214eb1ec
+AUX freeradius-2.1.6-ssl.patch 577 RMD160 ac2fab3d5ffd8e78a09d1ec3f15b44026293739c SHA1 5b2ee68eb6ea5024feea868827f6dc784bba6554 SHA256 a7a3ed31fd470c23035f79a5b6252e163dde430a5d9dbcad5cf75bbd34b78672
+AUX freeradius-2.1.6-versionless-la-files.patch 1747 RMD160 80aba198197d373d70b4b83996389074e3995af4 SHA1 7613cad1b4824118c94d745f5c3e5bf494f3290f SHA256 4e60188f1a2cd63b6dc775dbc8d09afd93e94b43431f7a930fed86399dd4883b
 AUX radius.conf 129 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 SHA1 174194106a6a7698f92e884463f49f0f974cb569 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292
 AUX radius.init 1785 RMD160 0e409e935f4588b3c905af0e6e085e50617c2160 SHA1 3322995f7920ffda44a6d8c8eb38f1d18238ff43 SHA256 3e1e56774104e3b205f3436f5967be27894cb246d33949c86f6ed80ebbfa998a
 AUX radius.init-r1 1575 RMD160 68e08912962c74ed2bdbe43bb27ae5e0c449254f SHA1 75bae5946776c5b0493b2b2b5cb6ee0de0a2fc6c SHA256 5f20b72e4b627442313818cbe3c31cadfdc747fad18cacdafe58de62812eea41
@@ -18,9 +25,18 @@ DIST freeradius-1.1.7.tar.gz 3156228 RMD160 9d33a4b01fc791557153b375a41e3d905fc8
 DIST freeradius-server-2.0.5.tar.gz 3519755 RMD160 15080883413fee615387df0e6c1daaebc8a0f17c SHA1 8f0476f21bdcab9d0f5178039c1993a56f22d448 SHA256 dacb53042d04266d48c67d20b5822266809561d2bcfff2a6fe33c71e22db7ab6
 DIST freeradius-server-2.1.1.tar.gz 3648766 RMD160 34993de091b759a7d0bf9929f72180bf56d818ec SHA1 9c36457f1b9364e413d066f804e850fa2166e3b9 SHA256 48139053bd4498e6ef0535178059286fafd5ad6642b0348936060fd373194147
 DIST freeradius-server-2.1.3.tar.gz 3687388 RMD160 c528f20e70c577242c5fe5ec0191b8493a3b7853 SHA1 d361abc8d5ef193653915150ad7b9cc8e14fb21c SHA256 815d50aafd776b8e34a2af47fc62c898763eb04477f8f3ffcf9bb1a5664a574d
+DIST freeradius-server-2.1.6.tar.gz 3845088 RMD160 4335851a1a7800059f76e4860532a4d8ce0e6486 SHA1 de4f65f4c38864996a594f016cde798605aca370 SHA256 abeb0837c8c15c2261edc1029b32b4beff2879a50838589d73c1481bd0ae90a9
 EBUILD freeradius-1.1.7.ebuild 3954 RMD160 9f7614425410cb20b2511189b636564ab932298d SHA1 70b79388d062f95ea4420f61a8187e07b6b68496 SHA256 67fa0c852a7f5bdd78054b81e38ad384d600da1c410f9988f8e2c199dc5cb6a0
 EBUILD freeradius-2.0.5.ebuild 3902 RMD160 a6d262612984f85bc939d2353e035ce0b8699c26 SHA1 b3b6fffd840eae628eefbdf22d7e8ba85020a09d SHA256 f20eab141fd00f5248d9ad322c9597d3fae58964cfc7e32f31c3876e50379211
 EBUILD freeradius-2.1.1.ebuild 3904 RMD160 cc64ed34905007ac53eb27778d2adbb8ca7a44ac SHA1 198a69a6089bba780b43acf91602e92ff30e6c0d SHA256 7548cb67ef6d9d0a453a3e4838c62bf9e976eb908be538d7af35172307c9eec1
 EBUILD freeradius-2.1.3-r1.ebuild 4139 RMD160 42d9a0030b24ad1fdfaa08db4b7b9b3156f3951c SHA1 aa13ee25291df378b1201cd3605f015ee8a1b03f SHA256 32aff2306158849a0ec91bd3729e63108d891db9d012df013f868ee302fae1be
-MISC ChangeLog 17603 RMD160 0b1a633d7d84cbda3fa1ec3ca6332f29fc6597da SHA1 70610cd2523447fe3d7fbf82db6609dc6d33d738 SHA256 d889e9bf7fc6f8b58e6f20bc905c4d91fcbe850d71a01e88e719a93bf9bf9c05
+EBUILD freeradius-2.1.6.ebuild 4109 RMD160 af7ae1684809f66b9a1c6c8c2ba40507d933e916 SHA1 86bd59879920085bb76828d08cb688ff35f8218c SHA256 a9ace6ae311b69b02f0918623e8fbfaabd36bd244c11085327638135a330ba23
+MISC ChangeLog 17899 RMD160 481ed3a1d642954f5d9a612a410db96f21e6ec5e SHA1 d6b8a453e3e1b07c17a72e2dae5b53c656287cf8 SHA256 f6b750c37c7708bd79ee67ee20f1dc37e2fcff8b03ec8e12f52224110a7eb781
 MISC metadata.xml 719 RMD160 5e57d94f486ea920e3b41de1cd30fc2e0127091d SHA1 fc9985698a0f2bf2ae05d3e1e459f2b72513f798 SHA256 e8ab0e7372f3eda0b1f5f8604162c2d20c1fc2ead87700f2d8ecabc1bc30fd9c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqRHBsACgkQ9A5kJBGSrssMFwCggkR4fDS4WCDaoP0CKlsgRO/5
+fuAAn1g5DFHBSFwmZQ2pVSVMOYOEF1ZE
+=p9PW
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch
new file mode 100644
index 000000000000..cd4e8fa5c27b
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.6-pkglibdir.patch
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 000000000000..52fe59aefb88
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.6-qafixes.patch
@@ -0,0 +1,89 @@
+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
new file mode 100644
index 000000000000..7e3513033000
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.6-ssl.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..ab779480bd96
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.6-versionless-la-files.patch
@@ -0,0 +1,33 @@
+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/freeradius-2.1.6.ebuild b/net-dialup/freeradius/freeradius-2.1.6.ebuild
new file mode 100644
index 000000000000..3e0eb9f90c62
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.1.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.6.ebuild,v 1.1 2009/08/23 10:38:04 mrness Exp $
+
+EAPI="2"
+
+inherit eutils multilib pam autotools libtool
+
+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? ( virtual/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}"
+
+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 radiusd
+	enewuser radiusd -1 -1 /var/log/radius radiusd
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
+	epatch "${FILESDIR}/${P}-ssl.patch"
+	epatch "${FILESDIR}/${P}-qafixes.patch"
+	epatch "${FILESDIR}/${P}-pkglibdir.patch"
+
+	# 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 \
+		 --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 radiusd
+	dodir /etc/raddb
+	diropts -m0750 -o radiusd -g radiusd
+	dodir /var/log/radius
+	keepdir /var/log/radius/radacct
+	dodir /var/run/radiusd
+	diropts
+
+	make R="${D}" install || die "make install failed"
+	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
+	    /etc/raddb/radiusd.conf
+	chown -R root:radiusd "${D}"/etc/raddb/*
+
+	pamd_mimic_system radiusd auth account password session
+
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
+	prepalldocs
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd"
+
+	newinitd "${FILESDIR}/radius.init-r1" radiusd
+	newconfd "${FILESDIR}/radius.conf" radiusd
+}