bump version; fix kerberos (#77613)

(Portage version: 2.0.51-r15)

7 files changed, 135 insertions, 19 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 5274f77ab800..3723b7eb6f9a 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/freeradius
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.23 2004/10/17 09:28:51 dholm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.24 2005/02/28 18:06:49 mrness Exp $
+
+*freeradius-1.0.2 (28 Feb 2005)
+
+  28 Feb 2005; Alin Nastac <mrness@gentoo.org> +files/radius.conf,
+  +files/radius.init, -files/0.9/radius.conf, -files/0.9/radius.init,
+  freeradius-1.0.1.ebuild, +freeradius-1.0.2.ebuild:
+  Bump version. Fix kerberos module when compiled against app-crypt/heimdal
+  (#77613).
 
   17 Oct 2004; David Holm <dholm@gentoo.org> freeradius-1.0.1.ebuild:
   Added to ~ppc.
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index bedd5db6ad61..8ca4ae91a8ef 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bd9ce6b7e41448390e46dfb33308852f freeradius-1.0.1.ebuild 2754
+MD5 943ea22efddca080957a55e1fcd72780 freeradius-1.0.2.ebuild 2764
 MD5 c739f6db427b9c556347dc9b71b8126b ChangeLog 3121
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
-MD5 224585e3ea7c804cdfa652c8b8d4bcc0 freeradius-1.0.1.ebuild 2762
+MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
+MD5 386aaf4470ecc4b4e0c43dec2bc02ba7 files/radius.init 807
 MD5 9f0188ba482e825cf2a89584f8caa813 files/digest-freeradius-1.0.1 69
+MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2 69
 MD5 3c2119ec1d8d807fe5ed14944747f0f8 files/freeradius-1.0.1-gcc34.patch 715
-MD5 fc6693f3df5a0694610110287a28568a files/0.9/radius.conf 129
-MD5 386aaf4470ecc4b4e0c43dec2bc02ba7 files/0.9/radius.init 807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCGUphmdTrptrqvGERAvPpAJ9NGLklOsfDb66XYLnN7+mziNiIBQCgl22E
-1xYpgo8TAgypkfOCJKT7vts=
-=HRSf
------END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2 b/net-dialup/freeradius/files/digest-freeradius-1.0.2
new file mode 100644
index 000000000000..54745a2d6470
--- /dev/null
+++ b/net-dialup/freeradius/files/digest-freeradius-1.0.2
@@ -0,0 +1 @@
+MD5 f5dfce4efbb03bbc47ceae08270a875e freeradius-1.0.2.tar.gz 2208884
diff --git a/net-dialup/freeradius/files/0.9/radius.conf b/net-dialup/freeradius/files/radius.conf
index 9811289ba453..9811289ba453 100644
--- a/net-dialup/freeradius/files/0.9/radius.conf
+++ b/net-dialup/freeradius/files/radius.conf
diff --git a/net-dialup/freeradius/files/0.9/radius.init b/net-dialup/freeradius/files/radius.init
index ec27f1fc4e54..ec27f1fc4e54 100644
--- a/net-dialup/freeradius/files/0.9/radius.init
+++ b/net-dialup/freeradius/files/radius.init
diff --git a/net-dialup/freeradius/freeradius-1.0.1.ebuild b/net-dialup/freeradius/freeradius-1.0.1.ebuild
index 8a26fab0a205..d70df8eeeaba 100644
--- a/net-dialup/freeradius/freeradius-1.0.1.ebuild
+++ b/net-dialup/freeradius/freeradius-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.1.ebuild,v 1.5 2005/02/21 02:41:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.1.ebuild,v 1.6 2005/02/28 18:06:49 mrness Exp $
 
 inherit eutils
 
@@ -110,9 +110,9 @@ src_install() {
 	rm ${D}/usr/sbin/rc.radiusd
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/0.9/radius.init radiusd
+	newexe ${FILESDIR}/radius.init radiusd
 
 	dodir /etc/conf.d
-	cp ${FILESDIR}/0.9/radius.conf ${D}/etc/conf.d/radiusd
+	cp ${FILESDIR}/radius.conf ${D}/etc/conf.d/radiusd
 }
 
diff --git a/net-dialup/freeradius/freeradius-1.0.2.ebuild b/net-dialup/freeradius/freeradius-1.0.2.ebuild
new file mode 100644
index 000000000000..90a1192e1183
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-1.0.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2.ebuild,v 1.1 2005/02/28 18:06:49 mrness Exp $
+
+inherit eutils
+
+IUSE="frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl"
+
+DESCRIPTION="highly configurable free RADIUS server"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
+HOMEPAGE="http://www.freeradius.org/"
+KEYWORDS="~x86 ~amd64 ~ppc"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/libc
+	>=sys-libs/db-3.2
+	sys-libs/gdbm
+	snmp? ( net-analyzer/net-snmp )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( virtual/krb5 )
+	frxp? ( dev-lang/python
+		dev-lang/perl )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	export WANT_AUTOCONF=2.1
+	autoconf
+}
+
+src_compile() {
+	local myconf=""
+
+	if ! useq snmp; then
+		myconf="--without-snmp"
+	fi
+	if useq frascend; then
+		myconf="${myconf} --with-ascend-binary"
+	fi
+	if useq frnothreads; then
+		myconf="${myconf} --without-threads"
+	fi
+	if useq frxp; then
+		myconf="${myconf} --with-experimental-modules"
+	fi
+	#fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
+	fi
+
+	# kill modules we don't use
+	if ! useq 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 ! useq ldap; then
+		einfo "removing rlm_ldap (no use ldap)"
+		rm -rf src/modules/rlm_ldap
+	fi
+	if ! useq kerberos; then
+		einfo "removing rlm_krb5 (no use kerberos)"
+		rm -rf src/modules/rlm_krb5
+	fi
+	if ! useq pam; then
+		einfo "removing rlm_pam (no use pam)"
+		rm -rf src/modules/rlm_pam
+	fi
+
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+		--mandir=/usr/share/man \
+		--with-large-files --disable-ltdl-install --disable-static \
+		${myconf} || die
+
+	make || die
+}
+
+pkg_preinst() {
+	enewgroup radiusd
+	enewuser radiusd -1 /bin/false /var/log/radius radiusd
+}
+
+src_install() {
+	dodir /etc
+	dodir /var/log
+	dodir /var/run
+	pkg_preinst
+	diropts -m0750 -o root -g radiusd
+	dodir /etc/raddb
+	diropts -m0750 -o radiusd -g radiusd
+	dodir /var/log/radius
+	dodir /var/log/radius/radacct
+	dodir /var/run/radiusd
+	diropts
+
+	make R=${D} install || die
+	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
+	    /etc/raddb/radiusd.conf
+
+	dodoc COPYRIGHT CREDITS INSTALL LICENSE README
+
+	rm ${D}/usr/sbin/rc.radiusd
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/radius.init radiusd
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/radius.conf radiusd
+}
+