Stable on amd64 and x86. Version bump.

(Portage version: 2.1.1-r2)

7 files changed, 216 insertions, 5 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 2d14dc0466ac..fd4f3aed3b83 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/freeradius
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.60 2006/12/14 17:56:06 mrness Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.61 2007/01/18 20:28:24 mrness Exp $
+
+*freeradius-1.1.4 (18 Jan 2007)
+
+  18 Jan 2007; Alin Năstac <mrness@gentoo.org>
+  +files/freeradius-1.1.4-nostrip.patch, +files/freeradius-1.1.4-ssl.patch,
+  +files/freeradius-1.1.4-versionless-la-files.patch,
+  -freeradius-1.1.3-r1.ebuild, freeradius-1.1.3-r2.ebuild,
+  +freeradius-1.1.4.ebuild:
+  Stable on amd64 and x86. Version bump.
 
 *freeradius-1.1.3-r2 (14 Dec 2006)
 
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.4 b/net-dialup/freeradius/files/digest-freeradius-1.1.4
new file mode 100644
index 000000000000..374707f3b91e
--- /dev/null
+++ b/net-dialup/freeradius/files/digest-freeradius-1.1.4
@@ -0,0 +1,3 @@
+MD5 0027d4cf8882bbafee30755a16632c6a freeradius-1.1.4.tar.gz 3088835
+RMD160 7f594557b27ada4f27dfc6d51f6c6b95a13edeee freeradius-1.1.4.tar.gz 3088835
+SHA256 017fe27b59c8d16c61739cd8aec123150365f2885dfdf04d289bf3039f26f7e3 freeradius-1.1.4.tar.gz 3088835
diff --git a/net-dialup/freeradius/files/freeradius-1.1.4-nostrip.patch b/net-dialup/freeradius/files/freeradius-1.1.4-nostrip.patch
new file mode 100644
index 000000000000..a8c36b66789f
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.4-nostrip.patch
@@ -0,0 +1,12 @@
+diff -Nru freeradius-1.1.4.orig/configure.in freeradius-1.1.4/configure.in
+--- freeradius-1.1.4.orig/configure.in	2007-01-05 01:42:28.000000000 +0200
++++ freeradius-1.1.4/configure.in	2007-01-18 08:14:22.000000000 +0200
+@@ -800,7 +800,7 @@
+ else
+   devflags=""
+   CFLAGS="$CFLAGS -DNDEBUG"
+-  INSTALLSTRIP="-s"
++  INSTALLSTRIP=""
+   AC_MSG_RESULT(no.)
+ fi
+ 
diff --git a/net-dialup/freeradius/files/freeradius-1.1.4-ssl.patch b/net-dialup/freeradius/files/freeradius-1.1.4-ssl.patch
new file mode 100644
index 000000000000..5e1f0e0af618
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.4-ssl.patch
@@ -0,0 +1,11 @@
+diff -Nru freeradius-1.1.4.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.1.4/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-1.1.4.orig/src/modules/rlm_eap/libeap/Makefile	2007-01-18 08:13:47.000000000 +0200
++++ freeradius-1.1.4/src/modules/rlm_eap/libeap/Makefile	2007-01-18 08:16:44.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-1.1.4-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-1.1.4-versionless-la-files.patch
new file mode 100644
index 000000000000..977341ac4ccd
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.4-versionless-la-files.patch
@@ -0,0 +1,28 @@
+diff -Nru freeradius-1.1.4.orig/src/lib/Makefile freeradius-1.1.4/src/lib/Makefile
+--- freeradius-1.1.4.orig/src/lib/Makefile	2006-04-12 23:45:20.000000000 +0300
++++ freeradius-1.1.4/src/lib/Makefile	2007-01-18 08:13:00.000000000 +0200
+@@ -51,5 +51,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-1.1.4.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.1.4/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-1.1.4.orig/src/modules/rlm_eap/libeap/Makefile	2006-03-23 13:17:46.000000000 +0200
++++ freeradius-1.1.4/src/modules/rlm_eap/libeap/Makefile	2007-01-18 08:13:00.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-1.1.4.orig/src/modules/rules.mak freeradius-1.1.4/src/modules/rules.mak
+--- freeradius-1.1.4.orig/src/modules/rules.mak	2006-07-06 19:42:57.000000000 +0300
++++ freeradius-1.1.4/src/modules/rules.mak	2007-01-18 08:13:00.000000000 +0200
+@@ -162,6 +162,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-1.1.3-r2.ebuild b/net-dialup/freeradius/freeradius-1.1.3-r2.ebuild
index 26da241941c0..d56919ab9ae2 100644
--- a/net-dialup/freeradius/freeradius-1.1.3-r2.ebuild
+++ b/net-dialup/freeradius/freeradius-1.1.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.3-r2.ebuild,v 1.1 2006/12/14 17:56:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.3-r2.ebuild,v 1.2 2007/01/18 20:28:24 mrness Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="highly configurable free RADIUS server"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
 HOMEPAGE="http://www.freeradius.org/"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug edirectory frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl udpfromto"
diff --git a/net-dialup/freeradius/freeradius-1.1.4.ebuild b/net-dialup/freeradius/freeradius-1.1.4.ebuild
new file mode 100644
index 000000000000..c88a9801ebd6
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-1.1.4.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.4.ebuild,v 1.1 2007/01/18 20:28:24 mrness Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="highly configurable free RADIUS server"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
+HOMEPAGE="http://www.freeradius.org/"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug edirectory firebird frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl 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? ( dev-db/postgresql )
+	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"
+
+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}-nostrip.patch"
+	epatch "${FILESDIR}/${P}-ssl.patch"
+}
+
+src_compile() {
+	autoconf || die "autoconf failed"
+
+	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` "
+
+	if useq frnothreads; then
+		myconf="${myconf} --without-threads"
+	fi
+	#fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
+	fi
+
+	# kill modules we don't use
+	if ! use ssl; then
+		einfo "removing rlm_eap_tls and rlm_x99_token (no use ssl)"
+		rm -rf src/modules/rlm_eap/types/rlm_eap_tls src/modules/rlm_x99_token
+	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 firebird; then
+		einfo "removing rlm_sql_firebird (no use firebird)"
+		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
+	fi
+
+	econf --with-large-files --disable-ltdl-install --with-pic \
+		 --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/*
+
+	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
+	gzip -f -9 "${D}/usr/share/doc/${PF}"/{rfc/*.txt,*}
+	dodoc CREDITS
+
+	rm "${D}/usr/sbin/rc.radiusd"
+
+	newinitd "${FILESDIR}/radius.init" radiusd
+	newconfd "${FILESDIR}/radius.conf" radiusd
+}
+
+pkg_preinst() {
+	enewgroup radiusd
+	enewuser radiusd -1 -1 /var/log/radius radiusd
+}
+
+pkg_prerm() {
+	if [ "${ROOT}" = "/" ] && /etc/init.d/radiusd --quiet status ; then
+		/etc/init.d/radiusd stop
+	fi
+}
+
+pkg_postrm() {
+	if [ "${ROOT}" = "/" ]; then
+		ewarn "If radiusd service was running, it had been stopped!"
+		echo
+		ewarn "You should update the configuration files using etc-update or dispatch-conf"
+		ewarn "and start the radiusd service again by running:"
+		einfo "    /etc/init.d/radiusd start"
+
+		ebeep
+	fi
+	ewarn "Auth-Type := Sql is no longer valid in /etc/raddb/users file!"
+	ewarn "You should replace it with Auth-Type := Local."
+}