Fix typo in init script (#152191). Stable on x86 and amd64.

(Portage version: 2.1.1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 183 deletions

diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index a83a86d852ca..273f91327d1b 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -25,10 +25,10 @@ AUX radius.conf 129 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 SHA1 1741941
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
 RMD160 2509d00c869ddb2d4db84e0e4b5a9334ffd69964 files/radius.conf 129
 SHA256 2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 files/radius.conf 129
-AUX radius.init 1757 RMD160 79c0d3e6cba4b843c3408ca3169e26fd1df415b7 SHA1 11090d13dfdec0e444d25ca0c20079c191a6633d SHA256 1ea3d4b45ecac4058b9f8becb2b5a9119b0144b1dd8f8f2658083e7e5f862911
-MD5 441c6070a078645a197b655551ab4b24 files/radius.init 1757
-RMD160 79c0d3e6cba4b843c3408ca3169e26fd1df415b7 files/radius.init 1757
-SHA256 1ea3d4b45ecac4058b9f8becb2b5a9119b0144b1dd8f8f2658083e7e5f862911 files/radius.init 1757
+AUX radius.init 1759 RMD160 2cdd44e0b37c5ae07c4d6390a30bbc5efa1bb7d9 SHA1 119b8ab6ae6dc0f6c58cf0fc7bfa7798d16a5179 SHA256 20d7374fd439433f83185c68b59aac90b97e15c71caa69c9bf65ddab221cef2f
+MD5 aa0bdd2a066aff9e46e9029aaf382af1 files/radius.init 1759
+RMD160 2cdd44e0b37c5ae07c4d6390a30bbc5efa1bb7d9 files/radius.init 1759
+SHA256 20d7374fd439433f83185c68b59aac90b97e15c71caa69c9bf65ddab221cef2f files/radius.init 1759
 AUX radwatch.init 1675 RMD160 775b6b12a64a4eb862027dab006d689b5138e3c7 SHA1 632777631218896a981505d79b18e0da0e360526 SHA256 821a03a93b9d0f75559ac9a76b2444c5c4e62a89f7fd578dd7d1157a55ceff9e
 MD5 adc7e9af3a2ab37f1ab021de3e279d41 files/radwatch.init 1675
 RMD160 775b6b12a64a4eb862027dab006d689b5138e3c7 files/radwatch.init 1675
@@ -39,14 +39,14 @@ EBUILD freeradius-1.1.1-r1.ebuild 4922 RMD160 2c47fbc680d822d2d79a3689c8135778f8
 MD5 930026c080ec4dc4745d4dd4e4ab6f0c freeradius-1.1.1-r1.ebuild 4922
 RMD160 2c47fbc680d822d2d79a3689c8135778f8240ad7 freeradius-1.1.1-r1.ebuild 4922
 SHA256 3b54f96e802c16d6f9fc4ab901edc03a1e2ae967ab3d22e956449657b8dcb433 freeradius-1.1.1-r1.ebuild 4922
-EBUILD freeradius-1.1.3.ebuild 4832 RMD160 acd0d7fe4124064c7fb58c974bf36c904eb24141 SHA1 0d96da28bd813b7c0caee4ff70958ca1e4836c31 SHA256 80e3dd46e5bfb2aa40af330efd3633f1e3128ba03c1fb35c006cd0e0131285d0
-MD5 8a49629650ddcdbf88d3f81c8e6cb1a9 freeradius-1.1.3.ebuild 4832
-RMD160 acd0d7fe4124064c7fb58c974bf36c904eb24141 freeradius-1.1.3.ebuild 4832
-SHA256 80e3dd46e5bfb2aa40af330efd3633f1e3128ba03c1fb35c006cd0e0131285d0 freeradius-1.1.3.ebuild 4832
-MISC ChangeLog 10004 RMD160 78c34afa8e0cb1e983cc941af2addd547e68bd49 SHA1 d3feaa77ebc34308e4930c29cc2022f3fa39dd0c SHA256 f3a73538ace7d8aae18302c280211e031323fff53b37c7b9281606aedc045a2c
-MD5 78ddfd681e059a63f1ed8be8730b4395 ChangeLog 10004
-RMD160 78c34afa8e0cb1e983cc941af2addd547e68bd49 ChangeLog 10004
-SHA256 f3a73538ace7d8aae18302c280211e031323fff53b37c7b9281606aedc045a2c ChangeLog 10004
+EBUILD freeradius-1.1.3-r1.ebuild 4833 RMD160 e7148922ab3550963e96a4180efea48b9c40871e SHA1 c0f04e3eb22b314380ea2a89bfce107e4f14a011 SHA256 f929039b3d449c33cf98cfe0654e69dbb2199b19b71eb5420c9224069a99df88
+MD5 e30031e042fb7af55fa943a91947ffa8 freeradius-1.1.3-r1.ebuild 4833
+RMD160 e7148922ab3550963e96a4180efea48b9c40871e freeradius-1.1.3-r1.ebuild 4833
+SHA256 f929039b3d449c33cf98cfe0654e69dbb2199b19b71eb5420c9224069a99df88 freeradius-1.1.3-r1.ebuild 4833
+MISC ChangeLog 10226 RMD160 fb6d916d33a85a62423722d1bdfc8f256631c586 SHA1 d564df0be15aa1b2a51743a1879d24b154e8740c SHA256 b8235ba390fd45549d35678ef8a8f04ea077739184557b0acf2b0fb4856592af
+MD5 023b474f9e39ac4c1680557413803832 ChangeLog 10226
+RMD160 fb6d916d33a85a62423722d1bdfc8f256631c586 ChangeLog 10226
+SHA256 b8235ba390fd45549d35678ef8a8f04ea077739184557b0acf2b0fb4856592af ChangeLog 10226
 MISC metadata.xml 252 RMD160 aaf9aae6ca234ce5c447d0a6c29d732a5b2a58f0 SHA1 6b1b24914e633321a409132870aea89053fac655 SHA256 5c0974054864b2e9a572cd3c30b97aadae0b2781da4dabec791e23afdfa5ee76
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
 RMD160 aaf9aae6ca234ce5c447d0a6c29d732a5b2a58f0 metadata.xml 252
@@ -54,13 +54,13 @@ SHA256 5c0974054864b2e9a572cd3c30b97aadae0b2781da4dabec791e23afdfa5ee76 metadata
 MD5 78ba22a9dfb7ab2532fe1f9271ce0e1c files/digest-freeradius-1.1.1-r1 253
 RMD160 d3086e496d5fa6a0be623a239bc32dd8e18e7ca7 files/digest-freeradius-1.1.1-r1 253
 SHA256 e18fa7565a9735a1bc342deb1825bb0876285d955ea0ba2252209ca04f837782 files/digest-freeradius-1.1.1-r1 253
-MD5 51c1a43e2ddb45d5b0709b0d2dcdb3ee files/digest-freeradius-1.1.3 253
-RMD160 4562c10776eeed3a5a89d26db33f977c61b420b4 files/digest-freeradius-1.1.3 253
-SHA256 f2c8dde98762ea60836e714eaf453c239dd1a9e21d96432f5412d2845809a08c files/digest-freeradius-1.1.3 253
+MD5 51c1a43e2ddb45d5b0709b0d2dcdb3ee files/digest-freeradius-1.1.3-r1 253
+RMD160 4562c10776eeed3a5a89d26db33f977c61b420b4 files/digest-freeradius-1.1.3-r1 253
+SHA256 f2c8dde98762ea60836e714eaf453c239dd1a9e21d96432f5412d2845809a08c files/digest-freeradius-1.1.3-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAn503sf9c6kjmR8RAhjDAJwJ+EQmue1W2WCpLgncol8g9m2lAwCfcEy+
-vIN6LYsh9GPAeRyr2aNcaZU=
-=lMno
+iD8DBQFFOc0u3sf9c6kjmR8RAkW8AKC5UURzM3LxLp+Y3PeRQKjJ8WpPLQCeOk2A
+0axmEEG11kbofWHrVFV16D4=
+=rTbA
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.3 b/net-dialup/freeradius/files/digest-freeradius-1.1.3
deleted file mode 100644
index 4649a66b54e2..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d8724cdc15bc23c330a7d3a2080829bd freeradius-1.1.3.tar.gz 3068204
-RMD160 4ba264d2ed85e5300d48017d1e343b1db35fce90 freeradius-1.1.3.tar.gz 3068204
-SHA256 f615f67fb807494892015e671593801fe3ac30c04740cd1dc8d2f18fc218da35 freeradius-1.1.3.tar.gz 3068204
diff --git a/net-dialup/freeradius/freeradius-1.1.3.ebuild b/net-dialup/freeradius/freeradius-1.1.3.ebuild
deleted file mode 100644
index 749eaa29362c..000000000000
--- a/net-dialup/freeradius/freeradius-1.1.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# 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.3.ebuild,v 1.1 2006/09/09 08:42:14 mrness Exp $
-
-inherit eutils flag-o-matic multilib
-
-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
-	>=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
-
-	#TODO: Remove this function 6 months after all <1.1.1-r1 versions 
-	#      has been removed from the tree.
-	if cd "${ROOT}/usr/lib" ; then
-		einfo "Cleaning up lefovers from previous versions..."
-
-		local la_prefix file
-		for la_prefix in libradius libeap rlm_acct_unique rlm_always rlm_attr_filter rlm_attr_rewrite \
-			rlm_chap rlm_checkval rlm_counter rlm_cram rlm_dbm rlm_detail rlm_digest rlm_eap rlm_eap_gtc \
-			rlm_eap_leap rlm_eap_md5 rlm_eap_mschapv2 rlm_eap_peap rlm_eap_sim rlm_eap_tls rlm_eap_ttls \
-			rlm_example rlm_exec rlm_expr rlm_fastusers rlm_files rlm_ippool rlm_krb5 rlm_ldap rlm_mschap \
-			rlm_ns_mta_md5 rlm_otp rlm_pam rlm_pap rlm_passwd rlm_perl rlm_preprocess rlm_python rlm_radutmp \
-			rlm_realm rlm_sim_files rlm_smb rlm_sql rlm_sqlcounter rlm_sql_log rlm_unix ; do
-				for file in ${la_prefix}-{0.8.1,0.9.0,0.9.3,1.0.1,1.0.2,1.0.4,1.0.5,1.1.0,1.1.1}.la ; do
-					if [ -f "${file}" ] ; then
-						rm "${file}"
-					fi
-				done
-		done
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-}
-
-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 --libdir=/usr/$(get_libdir) \
-		--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
-	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
-}
-
-pkg_preinst() {
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = "/" ] && /etc/init.d/radiusd --quiet status ; then
-		/etc/init.d/radiusd stop
-	fi
-}
-
-pkg_postrm() {
-	if [ "${ROOT}" = "/" ]; then
-		ewarn "If radiusd service was running, it had been stopped!"
-		echo
-		ewarn "You should update the configuration files using etc-update or dispatch-conf"
-		ewarn "and start the radiusd service again by running:"
-		einfo "    /etc/init.d/radiusd start"
-
-		ebeep
-	fi
-	ewarn "Auth-Type := Sql is no longer valid in /etc/raddb/users file!"
-	ewarn "You should replace it with Auth-Type := Local."
-}