Version bump.

Package-Manager: portage-2.1.4.4

6 files changed, 206 insertions, 3 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 23831f329616..8708f2c1dd28 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/freeradius
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.74 2007/11/30 05:24:47 mrness Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.75 2008/04/13 17:41:18 mrness Exp $
+
+*freeradius-2.0.3 (13 Apr 2008)
+
+  13 Apr 2008; Alin Năstac <mrness@gentoo.org>
+  +files/freeradius-2.0.3-check-radiusd.patch,
+  +files/freeradius-2.0.3-ssl.patch,
+  +files/freeradius-2.0.3-versionless-la-files.patch,
+  +freeradius-2.0.3.ebuild:
+  Version bump.
 
   30 Nov 2007; Alin Năstac <mrness@gentoo.org> freeradius-1.1.7.ebuild:
   Disable firebird support when bindist USE flag is enabled (#200284).
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 41a027fbfac3..99f3b890ce74 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,9 +1,14 @@
 AUX freeradius-1.1.7-qa-fixes.patch 1276 RMD160 6f91d3b370897864e2a1fd05a6aad69802169b56 SHA1 e71e0154ca513ba822bbeced72b0030eb309aa8e SHA256 ae447fbdc9ca1e11a8ca4af9d35821957de44e526684064c494c51f24cb46f7f
 AUX freeradius-1.1.7-ssl.patch 549 RMD160 ecbe747cda0b68ad72a4c473693616156d1b0cbf SHA1 be1acc21c7a029b56a56e254c87a3cf8517dd48a SHA256 a8907a79b2aee8f8c652568318af92d425a11638f644163c0da9cfcd5f3ee514
 AUX freeradius-1.1.7-versionless-la-files.patch 1624 RMD160 8c6c695812b4699c0eeff342b507e444c0060652 SHA1 b363b14c372c63913621261f292103752bc57333 SHA256 468aaf6e1c823793e40499d6e861acceab5a09235225ff6fefb7e1c8c653d846
+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 radius.conf 129 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 SHA1 174194106a6a7698f92e884463f49f0f974cb569 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292
 AUX radius.init 1785 RMD160 0e409e935f4588b3c905af0e6e085e50617c2160 SHA1 3322995f7920ffda44a6d8c8eb38f1d18238ff43 SHA256 3e1e56774104e3b205f3436f5967be27894cb246d33949c86f6ed80ebbfa998a
 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
 EBUILD freeradius-1.1.7.ebuild 3916 RMD160 5a3feca99336a9d5e28b66ade7552060359135dd SHA1 411dd6d76ecd5dc17cb895d8d1a3f3561172e3c5 SHA256 158e31d1631bda75f5b8bd61082bedb5de9b812b4e3f00854f53aa251d70be05
-MISC ChangeLog 14156 RMD160 e1b4a021af3b2d4bf8aa947b1efee23744b90dc8 SHA1 f3e388ea2f78df5681df158f97261262c76274f0 SHA256 0bd5fd51ff443da61f04b6725c9bc7504cf85b372b796d5354679508f34d87ac
+EBUILD freeradius-2.0.3.ebuild 3891 RMD160 d486e8c96cefbbdc871f33d69d64bad66160117c SHA1 c9d9bc52d95b928816988a0c495f92fa2c09c00a SHA256 6499cb3ae81f0155004440f8d5ec77de354102ae68b815ceca795aa8a930cc6b
+MISC ChangeLog 14420 RMD160 e19137875b8188bd82063ad615ad65ff5ba480ca SHA1 ef05235db6592c8381cf933b3985583b9c54dc3a SHA256 522bde7433f6d4413ea801118a6e20dd2fdf3765afae890bc1acd2cbaef6d515
 MISC metadata.xml 327 RMD160 e58c61ac6067fcaff23b38b1b3833ec8d621eb73 SHA1 fa8febc970b58eb22e5351e54ca784c105a50ecd SHA256 a36fe9c841f1c40a07d9a96a321643460caf7bf3134015bd4e091e0a207aa076
diff --git a/net-dialup/freeradius/files/freeradius-2.0.3-check-radiusd.patch b/net-dialup/freeradius/files/freeradius-2.0.3-check-radiusd.patch
new file mode 100644
index 000000000000..210ddda6a5db
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.3-check-radiusd.patch
@@ -0,0 +1,12 @@
+diff -Nru freeradius-server-2.0.3.orig/scripts/check-radiusd-config.in freeradius-server-2.0.3/scripts/check-radiusd-config.in
+--- freeradius-server-2.0.3.orig/scripts/check-radiusd-config.in	2007-05-15 01:27:24.000000000 +0300
++++ freeradius-server-2.0.3/scripts/check-radiusd-config.in	2008-04-13 20:38:50.000000000 +0300
+@@ -35,7 +35,7 @@
+ #  Note that you might have to add a '-d raddb' to the command line
+ #  options, if your database is somewhere other than /etc/raddb
+ #
+-$sbindir/radiusd -X -p 32768 > startup.log 2>&1 &
++$sbindir/radiusd -X > startup.log 2>&1 &
+ 
+ #
+ #  Remember what it's process ID was.
diff --git a/net-dialup/freeradius/files/freeradius-2.0.3-ssl.patch b/net-dialup/freeradius/files/freeradius-2.0.3-ssl.patch
new file mode 100644
index 000000000000..a948080e4d02
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.3-ssl.patch
@@ -0,0 +1,11 @@
+diff -Nru freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile	2008-04-13 18:46:14.000000000 +0300
++++ freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile	2008-04-13 18:46:28.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.3-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.0.3-versionless-la-files.patch
new file mode 100644
index 000000000000..40b6fe150af0
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.0.3-versionless-la-files.patch
@@ -0,0 +1,28 @@
+diff -Nru freeradius-server-2.0.3.orig/src/lib/Makefile freeradius-server-2.0.3/src/lib/Makefile
+--- freeradius-server-2.0.3.orig/src/lib/Makefile	2008-03-17 08:28:54.000000000 +0200
++++ freeradius-server-2.0.3/src/lib/Makefile	2008-04-13 18:45:30.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.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile	2007-11-25 15:56:10.000000000 +0200
++++ freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile	2008-04-13 18:45:30.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.3.orig/src/modules/rules.mak freeradius-server-2.0.3/src/modules/rules.mak
+--- freeradius-server-2.0.3.orig/src/modules/rules.mak	2008-01-10 12:12:01.000000000 +0200
++++ freeradius-server-2.0.3/src/modules/rules.mak	2008-04-13 18:45:30.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/freeradius-2.0.3.ebuild b/net-dialup/freeradius/freeradius-2.0.3.ebuild
new file mode 100644
index 000000000000..2a25773c90d3
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-2.0.3.ebuild
@@ -0,0 +1,138 @@
+# 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.3.ebuild,v 1.1 2008/04/13 17:41:18 mrness Exp $
+
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib autotools
+
+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"
+	epatch "${FILESDIR}/${P}-check-radiusd.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/*
+
+	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
+}