Version bump which fixes bug #218843.

Package-Manager: portage-2.1.4.4

6 files changed, 260 insertions, 6 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index e42523ac3b1f..f93f4b3266a9 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # 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.76 2008/04/14 19:55:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.77 2008/05/14 21:15:16 mrness Exp $
+
+*freeradius-2.0.4 (14 May 2008)
+
+  14 May 2008; Alin Năstac <mrness@gentoo.org>
+  +files/freeradius-2.0.4-ssl.patch,
+  +files/freeradius-2.0.4-versionless-la-files.patch, +files/radius.init-r1,
+  +freeradius-2.0.4.ebuild:
+  Version bump which fixes bug #218843.
 
   14 Apr 2008; Alin Năstac <mrness@gentoo.org> freeradius-1.1.7.ebuild,
   freeradius-2.0.3.ebuild:
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index ee88c2f5a16b..3c7a6a65cea8 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -7,18 +7,23 @@ AUX freeradius-1.1.7-versionless-la-files.patch 1624 RMD160 8c6c695812b4699c0eef
 AUX freeradius-2.0.3-check-radiusd.patch 616 RMD160 cfdcb73ff5432402a7e77fd818097cdc72e3dbb8 SHA1 287b0e0136a02bcdccde8478761de1389ede9069 SHA256 70d4bd6437d1d03c5c6b17fbf7036458916a34bcec5a5376a5a76e81c3d1fe7f
 AUX freeradius-2.0.3-ssl.patch 577 RMD160 717dd1749f2c8b1260adc5b7c1ee57aac09ffe53 SHA1 c1b1c3dc2e5ad6963cce3a955426bbc0a610166b SHA256 886648af5c0c2ccc76868aa12fc4f3a6656a33792539c7778e986cc9763dadc2
 AUX freeradius-2.0.3-versionless-la-files.patch 1708 RMD160 eb71c619bd38f4fd8cf6b656665d3498d19d4151 SHA1 da9c89a249a9e0cbe14bfbe888f7f9c7d9ea6796 SHA256 5958e2b1612b67694124949d24fb4b6c2f56ef54025f073362353bb9d2ff4cac
+AUX freeradius-2.0.4-ssl.patch 577 RMD160 8fc4092cd7c0f4e7d706ca55e6374664f42ae398 SHA1 d70c809294ee76de7e8188e5aac944d5fbc28070 SHA256 8a25c0f34dd564b424671ac407d9d581852288e392bcf61a7ffc1568007bbb30
+AUX freeradius-2.0.4-versionless-la-files.patch 1708 RMD160 36bb738386d9417ecfec6d774dfe81f5cbbdcb74 SHA1 6dec9ec05711ce4929cf7316b5aa7f1c18dfbbc4 SHA256 ab96b7c84698dc4e1f5efe1684f2245c53f3b546739ca90a9cd2fb015e3feea2
 AUX radius.conf 129 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 SHA1 174194106a6a7698f92e884463f49f0f974cb569 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292
 AUX radius.init 1785 RMD160 0e409e935f4588b3c905af0e6e085e50617c2160 SHA1 3322995f7920ffda44a6d8c8eb38f1d18238ff43 SHA256 3e1e56774104e3b205f3436f5967be27894cb246d33949c86f6ed80ebbfa998a
+AUX radius.init-r1 1575 RMD160 68e08912962c74ed2bdbe43bb27ae5e0c449254f SHA1 75bae5946776c5b0493b2b2b5cb6ee0de0a2fc6c SHA256 5f20b72e4b627442313818cbe3c31cadfdc747fad18cacdafe58de62812eea41
 DIST freeradius-1.1.7.tar.gz 3156228 RMD160 9d33a4b01fc791557153b375a41e3d905fc8efe5 SHA1 4e8515f82260478ef881ed7b87b7ca258e19ccba SHA256 8a6497b418d037ab3a79801e91bb3c2e4c2d6b2edb6f3677bb93e730a42b54f8
 DIST freeradius-server-2.0.3.tar.gz 3488944 RMD160 38767631dd1653dbf050ee844ed9761ae0f7a89e SHA1 d0e6565ce234fe50bb5c4eb2a6f4aaf605a021fc SHA256 a8b62e984d5545cfeb7ef5422738f22280bf7427aaecce81a1ad8328effab163
+DIST freeradius-server-2.0.4.tar.gz 3510202 RMD160 06e28ee76e0b74d493d15b7a16298251d3804589 SHA1 97c60eaab0493a29ed6e071812b474adcd95d7ab SHA256 280580f31e9f5795390299d3c73667c1ce21732cf0baee28e3418cb14de04375
 EBUILD freeradius-1.1.7.ebuild 3934 RMD160 3ef843d662af508a093a4bf9c7823c37ed4769f1 SHA1 7ac78d74f79941eed16ff6e8db442a174268c03d SHA256 d2f9f0437504e295f1d70abbeb4a54d267bc34477516664c5339f9e394b49b8b
 EBUILD freeradius-2.0.3.ebuild 3913 RMD160 c104a9c84c82327cdcc58ca659a039234d19cc8f SHA1 5ad4cd292dfa35010b314a38240af3703b7f76cf SHA256 5e7f2a4cbaa86954f857a396fe27752e3378f9c579321b9aa804910071b574b9
-MISC ChangeLog 14551 RMD160 7c946690921d6e6ab5506c81dc266fd4ac733075 SHA1 aaffc93b715e974fa4b8a09a2b845437df4f3dc7 SHA256 4298774ef6417596ac01b33048517bf6793e0647162cf9e6d390b84054f79169
+EBUILD freeradius-2.0.4.ebuild 3869 RMD160 deea6079b4b448b24bb40c2aea580c7809ac5e82 SHA1 2edb46b10d1c67ef37a964b1e25c621ef8cce183 SHA256 367b53db98b8e9bfac4f1683a4b3b6efb37dbc5e4efef50dbc96d371da5e7105
+MISC ChangeLog 14815 RMD160 61f932f7103de568ffcb53bd87b5a4e55e79bc59 SHA1 e650be1f534190929b5660e473aad75fa4d09a9c SHA256 7a2a19a51a120f7515a4cb940fe3771280c02324ff6c6d00836e49a218cb0df3
 MISC metadata.xml 327 RMD160 e58c61ac6067fcaff23b38b1b3833ec8d621eb73 SHA1 fa8febc970b58eb22e5351e54ca784c105a50ecd SHA256 a36fe9c841f1c40a07d9a96a321643460caf7bf3134015bd4e091e0a207aa076
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIA7bD+fWpoTWIA9ERAqm0AJsH9xToJm/iJbJLNwi6ajbe6mdoQQCff/Ln
-iGwZAd69OMgTpI4GKSc5JRI=
-=4aUE
+iEYEARECAAYFAkgrVnEACgkQ+fWpoTWIA9EAMQCdHdKYCntYagBBRp1Fiu1or6lZ
+XCEAoIE6ibz6oBrFY+zgwNbCA9vQynbD
+=o3Ex
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/freeradius-2.0.4-ssl.patch b/net-dialup/freeradius/files/freeradius-2.0.4-ssl.patch
new file mode 100644
index 000000000000..2f30e8ef563a
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.4-ssl.patch
@@ -0,0 +1,11 @@
+diff -Nru freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile	2008-05-14 01:58:48.000000000 +0300
++++ freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile	2008-05-14 01:59:07.000000000 +0300
+@@ -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.4-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.0.4-versionless-la-files.patch
new file mode 100644
index 000000000000..8d308019264f
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.4-versionless-la-files.patch
@@ -0,0 +1,28 @@
+diff -Nru freeradius-server-2.0.4.orig/src/lib/Makefile freeradius-server-2.0.4/src/lib/Makefile
+--- freeradius-server-2.0.4.orig/src/lib/Makefile	2008-04-20 18:18:39.000000000 +0300
++++ freeradius-server-2.0.4/src/lib/Makefile	2008-05-14 01:57:57.000000000 +0300
+@@ -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.4.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile	2007-11-25 15:56:10.000000000 +0200
++++ freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile	2008-05-14 01:57:57.000000000 +0300
+@@ -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.4.orig/src/modules/rules.mak freeradius-server-2.0.4/src/modules/rules.mak
+--- freeradius-server-2.0.4.orig/src/modules/rules.mak	2008-01-10 12:12:01.000000000 +0200
++++ freeradius-server-2.0.4/src/modules/rules.mak	2008-05-14 01:57:57.000000000 +0300
+@@ -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/files/radius.init-r1 b/net-dialup/freeradius/files/radius.init-r1
new file mode 100644
index 000000000000..8c5f8c7927d9
--- /dev/null
+++ b/net-dialup/freeradius/files/radius.init-r1
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+
+opts="${opts} reload"
+
+depend() {
+	need net
+	use dns
+}
+
+checkconfig() {
+	# set the location of log files
+	if ! cd /var/log/radius ; then
+		eerror "Failed to change current directory to /var/log/radius"
+		return 1
+	fi
+
+	if [ ! -d /var/run/radiusd ] && ! mkdir /var/run/radiusd ; then
+		eerror "Failed to create /var/run/radiusd"
+		return 1
+	fi
+	
+	if [ ! -f /etc/raddb/radiusd.conf ] ; then
+		eerror "No /etc/raddb/radiusd.conf file exists!"
+		return 1
+	fi
+
+	RADIUSD_USER=`grep '^ *user *=' /etc/raddb/radiusd.conf | cut -d ' ' -f 3`
+	RADIUSD_GROUP=`grep '^ *group *=' /etc/raddb/radiusd.conf | cut -d ' ' -f 3`
+	if [ -n "${RADIUSD_USER}" ] && ! getent passwd ${RADIUSD_USER} > /dev/null ; then
+		eerror "${RADIUSD_USER} user missing!"
+		return 1
+	fi
+	if [ -n "${RADIUSD_GROUP}" ] && ! getent group ${RADIUSD_GROUP} > /dev/null ; then
+		eerror "${RADIUSD_GROUP} group missing!"
+		return 1
+	fi
+
+	# radius.log is created before privileges are dropped - need to set proper permissions on it
+	[ -f radius.log ] || touch radius.log || return 1
+
+	chown -R "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" . /var/run/radiusd && \
+		chmod -R u+rwX,g+rX . /var/run/radiusd || return 1
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting radiusd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/radiusd -- ${RADIUSD_OPTS} >/dev/null
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping radiusd"
+	start-stop-daemon --stop --quiet --pidfile=/var/run/radiusd/radiusd.pid
+	eend $?
+}
+
+reload () {
+	ebegin "Reloading radiusd"
+	kill -HUP `</var/run/radiusd/radiusd.pid`
+	eend $?
+}
diff --git a/net-dialup/freeradius/freeradius-2.0.4.ebuild b/net-dialup/freeradius/freeradius-2.0.4.ebuild
new file mode 100644
index 000000000000..5d8f2356e97f
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.0.4.ebuild
@@ -0,0 +1,139 @@
+# 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.ebuild,v 1.1 2008/05/14 21:15:16 mrness Exp $
+
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib autotools 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? ( dev-db/postgresql )
+	!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
+
+	eautoconf || die "eautoconf failed"
+}
+
+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 \
+		 --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
+}