Version bump.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 196 insertions, 0 deletions

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