Version bump. Remove static libraries and install rlm modules in pkglibdir (#253136).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 124 insertions, 0 deletions

diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch b/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch
new file mode 100644
index 000000000000..ca7b80bdb875
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.3-pkglibdir.patch
@@ -0,0 +1,61 @@
+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
new file mode 100644
index 000000000000..37a31a97391b
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.3-qafixes.patch
@@ -0,0 +1,24 @@
+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-01 12:16:55.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 -Nru freeradius-server-2.1.3.orig/src/main/radmin.c freeradius-server-2.1.3/src/main/radmin.c
+--- freeradius-server-2.1.3.orig/src/main/radmin.c	2008-12-05 16:37:56.000000000 +0000
++++ freeradius-server-2.1.3/src/main/radmin.c	2009-03-01 12:22:44.000000000 +0000
+@@ -47,6 +47,7 @@
+ #else /* !defined(HAVE_READLINE_H) */
+ extern char *readline ();
+ #endif /* !defined(HAVE_READLINE_H) */
++#include <readline/history.h>
+ char *cmdline = NULL;
+ #else /* !defined(HAVE_READLINE_READLINE_H) */
+   /* no readline */
diff --git a/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch
new file mode 100644
index 000000000000..923933cad907
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.3-ssl.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..1e45df52f6aa
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.3-versionless-la-files.patch
@@ -0,0 +1,28 @@
+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