version bump; add reload function in init script

Package-Manager: portage-2.0.51.19

6 files changed, 209 insertions, 6 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 028e6926d3b6..90bd31efd2ab 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.35 2005/05/22 14:00:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.36 2005/06/23 21:14:40 mrness Exp $
+
+*freeradius-1.0.4 (23 Jun 2005)
+
+  23 Jun 2005; Alin Nastac <mrness@gentoo.org>
+  +files/freeradius-1.0.4-whole-archive-gentoo.patch, files/radius.init,
+  +freeradius-1.0.4.ebuild:
+  Version bump. Add reload command to init script.
 
   22 May 2005; Alin Nastac <mrness@gentoo.org>
   -files/freeradius-1.0.1-gcc34.patch, files/radius.init,
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index daa141ea2989..bfe238d98e83 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 12985ef51d79958dc096c79dcc5ca75d freeradius-1.0.4.ebuild 3794
 MD5 6c54b5a372290cb51600596042d35177 freeradius-1.0.2-r5.ebuild 3798
-MD5 e813948eaa16c9e4633f78bee2b0f686 ChangeLog 5449
+MD5 947f99e84a80bec483f3f278a599a282 ChangeLog 5682
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
+MD5 6b0efd384f551fab6b82794e91dbb4d5 files/freeradius-1.0.4-whole-archive-gentoo.patch 1728
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
-MD5 6b5637b103a04e8edfede3cfd59f3ec5 files/radius.init 1009
+MD5 67947827b3450296502c3160cda1fca0 files/radius.init 1170
 MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r5 69
+MD5 9351bc95733a1a1a2535bb4e27927014 files/digest-freeradius-1.0.4 69
 MD5 6b0efd384f551fab6b82794e91dbb4d5 files/freeradius-1.0.2-whole-archive-gentoo.patch 1728
 MD5 8aad37163f389564f402f677cd270c3c files/freeradius-1.0.2-sql-escape.patch 2851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCkJCSjiC39V7gKu0RAl1eAJ9tDt17HSLSwaMKvVvf3tfAwhLJvgCgmhYJ
-eS71dntEj74H9wh6iZyL/3Q=
-=hKK6
+iD8DBQFCuyZNjiC39V7gKu0RAtDsAJ98T3xf4J0Wi78e/nsKskFaFRC21ACfeDFv
+3xLDSvhzJZPyxfNT4oc3tPc=
+=sq+P
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.4 b/net-dialup/freeradius/files/digest-freeradius-1.0.4
new file mode 100644
index 000000000000..c062c016f1e2
--- /dev/null
+++ b/net-dialup/freeradius/files/digest-freeradius-1.0.4
@@ -0,0 +1 @@
+MD5 edb5c3af6fabeff7b8e1131b6fa33e24 freeradius-1.0.4.tar.gz 2209057
diff --git a/net-dialup/freeradius/files/freeradius-1.0.4-whole-archive-gentoo.patch b/net-dialup/freeradius/files/freeradius-1.0.4-whole-archive-gentoo.patch
new file mode 100644
index 000000000000..a91911b67b57
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.0.4-whole-archive-gentoo.patch
@@ -0,0 +1,36 @@
+diff -Nru freeradius-1.0.2.orig/aclocal.m4 freeradius-1.0.2/aclocal.m4
+--- freeradius-1.0.2.orig/aclocal.m4	2005-02-13 03:03:20.000000000 +0200
++++ freeradius-1.0.2/aclocal.m4	2005-03-02 08:37:42.301666608 +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 -Nru freeradius-1.0.2.orig/configure freeradius-1.0.2/configure
+--- freeradius-1.0.2.orig/configure	2005-03-02 08:32:15.000000000 +0200
++++ freeradius-1.0.2/configure	2005-03-02 08:37:58.710172136 +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 -Nru freeradius-1.0.2.orig/ltconfig freeradius-1.0.2/ltconfig
+--- freeradius-1.0.2.orig/ltconfig	2003-06-24 14:03:39.000000000 +0300
++++ freeradius-1.0.2/ltconfig	2005-03-02 08:38:21.478710792 +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/files/radius.init b/net-dialup/freeradius/files/radius.init
index 94d67f5e4bb8..b8e69350c459 100644
--- a/net-dialup/freeradius/files/radius.init
+++ b/net-dialup/freeradius/files/radius.init
@@ -1,5 +1,7 @@
 #!/sbin/runscript
 
+opts="${opts} reload"
+
 depend() {
 	need net
 	use dns
@@ -44,3 +46,9 @@ stop () {
 	start-stop-daemon --stop --quiet --pidfile=/var/run/radiusd/radwatch.pid
 	eend $?
 }
+
+reload () {
+	ebegin "Reloading radiusd"
+	start-stop-daemon --stop --signal HUP --quiet --pidfile=/var/run/radiusd/radiusd.pid
+	eend $?
+}
diff --git a/net-dialup/freeradius/freeradius-1.0.4.ebuild b/net-dialup/freeradius/freeradius-1.0.4.ebuild
new file mode 100644
index 000000000000..ea2d098fdde7
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-1.0.4.ebuild
@@ -0,0 +1,148 @@
+# 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.4.ebuild,v 1.1 2005/06/23 21:14:40 mrness Exp $
+
+inherit eutils
+
+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 ~sparc"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="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
+	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 )"
+
+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
+	fi
+	enewgroup radiusd
+	enewuser radiusd -1 /bin/false /var/log/radius radiusd
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
+
+	export WANT_AUTOCONF=2.1
+	autoconf
+}
+
+src_compile() {
+	local myconf=" \
+		`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 --disable-static \
+		${myconf} || die
+
+	make || die
+}
+
+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
+	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 COPYRIGHT CREDITS INSTALL LICENSE
+	#Copy SQL schemas to doc dir
+	docinto sql.schemas
+	dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql
+
+	rm ${D}/usr/sbin/rc.radiusd
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/radius.init radiusd
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/radius.conf radiusd
+}
+
+pkg_preinst() {
+	enewgroup radiusd
+	enewuser radiusd -1 /bin/false /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
+}