Version bump wrt security bug #127229.

(Portage version: 2.0.54)

6 files changed, 209 insertions, 11 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 61a8b9bf5ee1..73760d8b056a 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # 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.49 2006/03/12 11:51:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.50 2006/03/31 12:30:25 mrness Exp $
+
+*freeradius-1.1.1 (31 Mar 2006)
+
+  31 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  +files/freeradius-1.1.1-libradius_install.patch,
+  +files/freeradius-1.1.1-whole-archive-gentoo.patch,
+  +freeradius-1.1.1.ebuild:
+  Version bump wrt security bug #127229.
 
   12 Mar 2006; Alin Nastac <mrness@gentoo.org>
   -files/freeradius-1.0.5-user-password-ha1.patch,
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 61845bb7bf87..72bb0939a106 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,19 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7ffe798262e664be249be4252e2bfd40 ChangeLog 8312
 MD5 7dc694a1ee1c374e37a40f81bcaf28a3 files/digest-freeradius-1.1.0-r1 69
+MD5 0936eb82363dd9098d21fc7787f8e4cc files/digest-freeradius-1.1.1 69
 MD5 7dc1f8c829f2d44978b414662997041a files/freeradius-1.1.0-dict-attr-sizeof.patch 478
 MD5 66405667b57e288296ed7fae92e0a583 files/freeradius-1.1.0-libeap-fPIC.patch 458
 MD5 ce75b2dd4a38950b23b4a529b6d6b5ae files/freeradius-1.1.0-whole-archive-gentoo.patch 1728
+MD5 89b8fea5ed51f1e569af0ca7adf7827a files/freeradius-1.1.1-libradius_install.patch 563
+MD5 73e25b78f2cdb07ed8bbddbcdb9ac08b files/freeradius-1.1.1-whole-archive-gentoo.patch 1728
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
 MD5 adc7e9af3a2ab37f1ab021de3e279d41 files/radius.init 1675
 MD5 e7a9476cc2e95753463494b2950c8786 freeradius-1.1.0-r1.ebuild 3999
+MD5 7a08d6eba2575b67983b7f680909d607 freeradius-1.1.1.ebuild 3918
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEFAtkjG8pv1lIUX4RAqhcAJ0YEY4fJ4wwau97dfiIhlccP+Ss1wCg15V7
-B500nqSo4XzALgTQRBZQFo4=
-=i4ee
------END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.1 b/net-dialup/freeradius/files/digest-freeradius-1.1.1
new file mode 100644
index 000000000000..24f581764b66
--- /dev/null
+++ b/net-dialup/freeradius/files/digest-freeradius-1.1.1
@@ -0,0 +1 @@
+MD5 b38b24f6352090fdb571b9e8da52e12e freeradius-1.1.1.tar.gz 2358196
diff --git a/net-dialup/freeradius/files/freeradius-1.1.1-libradius_install.patch b/net-dialup/freeradius/files/freeradius-1.1.1-libradius_install.patch
new file mode 100644
index 000000000000..32b9b853d6c8
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.1-libradius_install.patch
@@ -0,0 +1,12 @@
+diff -Nru freeradius-1.1.1.orig/src/lib/Makefile freeradius-1.1.1/src/lib/Makefile
+--- freeradius-1.1.1.orig/src/lib/Makefile	2006-02-10 21:47:04.000000000 +0200
++++ freeradius-1.1.1/src/lib/Makefile	2006-03-31 13:18:09.000000000 +0300
+@@ -48,6 +48,7 @@
+ 	rm -rf .libs
+ 
+ install: all
+-	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la $(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 --git a/net-dialup/freeradius/files/freeradius-1.1.1-whole-archive-gentoo.patch b/net-dialup/freeradius/files/freeradius-1.1.1-whole-archive-gentoo.patch
new file mode 100644
index 000000000000..72da769d33be
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.1-whole-archive-gentoo.patch
@@ -0,0 +1,36 @@
+diff -Nur freeradius-1.1.1.orig/aclocal.m4 freeradius-1.1.1/aclocal.m4
+--- freeradius-1.1.1.orig/aclocal.m4	2005-12-08 20:54:09.000000000 +0200
++++ freeradius-1.1.1/aclocal.m4	2006-01-18 20:30:42.932178750 +0200
+@@ -1421,7 +1421,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+ 	whole_archive_flag_spec=
+       fi
+diff -Nur freeradius-1.1.1.orig/configure freeradius-1.1.1/configure
+--- freeradius-1.1.1.orig/configure	2006-01-01 18:25:01.000000000 +0200
++++ freeradius-1.1.1/configure	2006-01-18 20:30:42.936179000 +0200
+@@ -3511,7 +3511,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+ 	whole_archive_flag_spec=
+       fi
+diff -Nur freeradius-1.1.1.orig/ltconfig freeradius-1.1.1/ltconfig
+--- freeradius-1.1.1.orig/ltconfig	2003-06-24 14:03:39.000000000 +0300
++++ freeradius-1.1.1/ltconfig	2006-01-18 20:30:42.940179250 +0200
+@@ -1246,7 +1246,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++        whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+         whole_archive_flag_spec=
+       fi
diff --git a/net-dialup/freeradius/freeradius-1.1.1.ebuild b/net-dialup/freeradius/freeradius-1.1.1.ebuild
new file mode 100644
index 000000000000..e60d168c9025
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-1.1.1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.1.ebuild,v 1.1 2006/03/31 12:30:25 mrness Exp $
+
+inherit eutils flag-o-matic libtool
+
+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 frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl udpfromto"
+
+DEPEND="!net-dialup/cistronradius
+	!net-dialup/gnuradius
+	virtual/libc
+	>=sys-libs/db-3.2
+	sys-libs/gdbm
+	dev-lang/perl
+	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 )"
+
+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}-whole-archive-gentoo.patch"
+	epatch "${FILESDIR}/${P}-libradius_install.patch"
+
+	elibtoolize
+}
+
+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
+
+	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+		--mandir=/usr/share/man \
+		--with-large-files --disable-ltdl-install --with-pic \
+		${myconf} || die "configure failed"
+
+	make || die "make failed"
+}
+
+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
+	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/*
+
+	[ -z "${PR}" ] || mv "${D}/usr/share/doc/${P}" "${D}/usr/share/doc/${PF}"
+	gzip -f -9 "${D}/usr/share/doc/${PF}"/{rfc/*.txt,*}
+	dodoc CREDITS
+	#Copy SQL schemas to doc dir
+	docinto sql.schemas
+	dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql
+
+	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 [ -n "`'${ROOT}/etc/init.d/radiusd' status | grep start`" ]; then
+		"${ROOT}/etc/init.d/radiusd" stop
+	fi
+}
+
+pkg_postrm() {
+	if has_version ">${CATEGORY}/${PF}" || has_version "<${CATEGORY}/${PF}" ; then
+		ewarn "If radiusd service was running, it had been stopped!"
+		echo
+		ewarn "You should update the configuration files using etc-update"
+		ewarn "and start the radiusd service again by running:"
+		einfo "    /etc/init.d/radiusd start"
+
+		ebeep
+	fi
+}