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

(Portage version: 2.1.6.7/cvs/Linux x86_64)

6 files changed, 278 insertions, 2 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 648c4a541a71..6ae8dda48041 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dialup/freeradius
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.85 2008/10/12 09:08:55 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.86 2009/03/01 13:57:04 mrness Exp $
+
+*freeradius-2.1.3 (01 Mar 2009)
+
+  01 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +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,
+  +freeradius-2.1.3.ebuild:
+  Version bump. Remove static libraries and install rlm modules in pkglibdir
+  (#253136).
 
 *freeradius-2.1.1 (12 Oct 2008)
 
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
diff --git a/net-dialup/freeradius/freeradius-2.1.3.ebuild b/net-dialup/freeradius/freeradius-2.1.3.ebuild
new file mode 100644
index 000000000000..b51ad4e6c22d
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.1.3.ebuild
@@ -0,0 +1,142 @@
+# 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.3.ebuild,v 1.1 2009/03/01 13:57:04 mrness Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib pam
+
+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
+	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}
+	sys-devel/autoconf"
+
+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_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
+	epatch "${FILESDIR}/${P}-ssl.patch"
+	epatch "${FILESDIR}/${P}-qafixes.patch"
+	epatch "${FILESDIR}/${P}-pkglibdir.patch"
+
+	cd "${S}"
+
+	# 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
+}
+
+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
+}