Version bump - fixes randomization of the listening port when compiled with gcc-4.3 -O2 (#228887).

(Portage version: 2.1.4.4)

5 files changed, 188 insertions, 3 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index a56348a872c5..e0b668d1a2bc 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,15 @@
 # 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.79 2008/06/14 11:09:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.80 2008/07/01 19:56:51 mrness Exp $
+
+*freeradius-2.0.5 (01 Jul 2008)
+
+  01 Jul 2008; Alin Năstac <mrness@gentoo.org>
+  +files/freeradius-2.0.5-ssl.patch,
+  +files/freeradius-2.0.5-versionless-la-files.patch,
+  +freeradius-2.0.5.ebuild:
+  Version bump - fixes randomization of the listening port when compiled with
+  gcc-4.3 -O2 (#228887).
 
 *freeradius-2.0.4-r1 (14 Jun 2008)
 
diff --git a/net-dialup/freeradius/files/freeradius-2.0.5-ssl.patch b/net-dialup/freeradius/files/freeradius-2.0.5-ssl.patch
new file mode 100644
index 000000000000..94063f06b113
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.5-ssl.patch
@@ -0,0 +1,11 @@
+diff -Nru freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile	2008-07-01 21:18:15.000000000 +0200
++++ freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile	2008-07-01 21:18:35.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.0.5-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.0.5-versionless-la-files.patch
new file mode 100644
index 000000000000..ca80831ab7cc
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.5-versionless-la-files.patch
@@ -0,0 +1,28 @@
+diff -Nru freeradius-server-2.0.5.orig/src/lib/Makefile freeradius-server-2.0.5/src/lib/Makefile
+--- freeradius-server-2.0.5.orig/src/lib/Makefile	2008-04-20 17:18:39.000000000 +0200
++++ freeradius-server-2.0.5/src/lib/Makefile	2008-07-01 21:17:25.000000000 +0200
+@@ -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.0.5.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.0.5.orig/src/modules/rlm_eap/libeap/Makefile	2007-11-25 14:56:10.000000000 +0100
++++ freeradius-server-2.0.5/src/modules/rlm_eap/libeap/Makefile	2008-07-01 21:17:25.000000000 +0200
+@@ -40,5 +40,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.0.5.orig/src/modules/rules.mak freeradius-server-2.0.5/src/modules/rules.mak
+--- freeradius-server-2.0.5.orig/src/modules/rules.mak	2008-01-10 11:12:01.000000000 +0100
++++ freeradius-server-2.0.5/src/modules/rules.mak	2008-07-01 21:17:25.000000000 +0200
+@@ -163,6 +163,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.0.4-r1.ebuild b/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild
index 00f04dea3eb6..66348e94016e 100644
--- a/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild,v 1.1 2008/06/14 11:09:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild,v 1.2 2008/07/01 19:56:51 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -14,7 +14,7 @@ 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 \
-    elibc_glibc"
+	elibc_glibc"
 
 RDEPEND="!net-dialup/cistronradius
 	!net-dialup/gnuradius
diff --git a/net-dialup/freeradius/freeradius-2.0.5.ebuild b/net-dialup/freeradius/freeradius-2.0.5.ebuild
new file mode 100644
index 000000000000..ad6931932f51
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.0.5.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.5.ebuild,v 1.1 2008/07/01 19:56:51 mrness Exp $
+
+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"
+
+	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_compile() {
+	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-ltdl-install --with-system-libtool \
+		 --localstatedir=/var ${myconf} || die "econf failed"
+
+	make || die "make 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
+}