Remove old version. Remove useless pkg_preinst function.

(Portage version: 2.1.3.16)

7 files changed, 8 insertions, 283 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index b8c03fc6218c..9686904b0ecf 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,12 @@
 # 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.72 2007/09/24 08:40:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.73 2007/11/05 06:19:09 mrness Exp $
+
+  05 Nov 2007; Alin Năstac <mrness@gentoo.org>
+  -files/freeradius-1.1.6-qa-fixes.patch, -files/freeradius-1.1.6-ssl.patch,
+  -files/freeradius-1.1.6-versionless-la-files.patch,
+  -freeradius-1.1.6.ebuild, freeradius-1.1.7.ebuild:
+  Remove old version. Remove useless pkg_preinst function.
 
   24 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
   freeradius-1.1.7.ebuild:
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.6 b/net-dialup/freeradius/files/digest-freeradius-1.1.6
deleted file mode 100644
index 590998561d73..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a053d353ce5f393cb70795fd363a586f freeradius-1.1.6.tar.gz 3175652
-RMD160 ed82342938d3845c4e6938b5c4f3117e2397367b freeradius-1.1.6.tar.gz 3175652
-SHA256 d503bac14ca37eab4798f6ab3dbdfb744aa846f7dc76ded45966d127948e71f8 freeradius-1.1.6.tar.gz 3175652
diff --git a/net-dialup/freeradius/files/freeradius-1.1.6-qa-fixes.patch b/net-dialup/freeradius/files/freeradius-1.1.6-qa-fixes.patch
deleted file mode 100644
index e095e536d56d..000000000000
--- a/net-dialup/freeradius/files/freeradius-1.1.6-qa-fixes.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nru freeradius-1.1.6.orig/configure.in freeradius-1.1.6/configure.in
---- freeradius-1.1.6.orig/configure.in	2007-04-04 12:23:57.000000000 +0300
-+++ freeradius-1.1.6/configure.in	2007-04-12 21:33:37.000000000 +0300
-@@ -803,7 +803,7 @@
- else
-   devflags=""
-   CFLAGS="$CFLAGS -DNDEBUG"
--  INSTALLSTRIP="-s"
-+  INSTALLSTRIP=""
-   AC_MSG_RESULT(no.)
- fi
- 
-diff -Nru freeradius-1.1.6.orig/src/main/mainconfig.c freeradius-1.1.6/src/main/mainconfig.c
---- freeradius-1.1.6.orig/src/main/mainconfig.c	2007-04-08 01:06:08.000000000 +0300
-+++ freeradius-1.1.6/src/main/mainconfig.c	2007-04-12 21:33:44.000000000 +0300
-@@ -23,6 +23,7 @@
- 
- #include "autoconf.h"
- #include "libradius.h"
-+#include "ltdl.h"
- 
- #include <stdlib.h>
- #include <string.h>
-@@ -1501,6 +1502,10 @@
- /*
-  *	Free the configuration.
-  */
-+extern void rl_free(void);
-+extern void paircompare_builtin_free(void);
-+extern void xlat_free(void);
-+
- int free_mainconfig(void)
- {
- 	/*
-diff -Nru freeradius-1.1.6.orig/src/modules/rlm_ldap/rlm_ldap.c freeradius-1.1.6/src/modules/rlm_ldap/rlm_ldap.c
---- freeradius-1.1.6.orig/src/modules/rlm_ldap/rlm_ldap.c	2007-04-08 10:14:45.000000000 +0300
-+++ freeradius-1.1.6/src/modules/rlm_ldap/rlm_ldap.c	2007-04-12 21:33:44.000000000 +0300
-@@ -175,6 +175,8 @@
- #include	<string.h>
- 
- #include	<lber.h>
-+#define LDAP_DEPRECATED 1
-+#undef HAVE_LDAP_INT_TLS_CONFIG
- #include        <ldap.h>
- 
- #include	<errno.h>
-diff -Nru freeradius-1.1.6.orig/src/modules/rlm_smb/smblib.c freeradius-1.1.6/src/modules/rlm_smb/smblib.c
---- freeradius-1.1.6.orig/src/modules/rlm_smb/smblib.c	2004-02-26 21:04:35.000000000 +0200
-+++ freeradius-1.1.6/src/modules/rlm_smb/smblib.c	2007-04-12 21:33:44.000000000 +0300
-@@ -23,6 +23,8 @@
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include <string.h>
-+
- int SMBlib_errno;
- int SMBlib_SMB_Error;
- #define SMBLIB_ERRNO
-diff -Nru freeradius-1.1.6.orig/src/modules/rlm_smb/smblib-util.c freeradius-1.1.6/src/modules/rlm_smb/smblib-util.c
---- freeradius-1.1.6.orig/src/modules/rlm_smb/smblib-util.c	2004-02-26 21:04:35.000000000 +0200
-+++ freeradius-1.1.6/src/modules/rlm_smb/smblib-util.c	2007-04-12 21:33:44.000000000 +0300
-@@ -23,6 +23,8 @@
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include <string.h>
-+
- #include "smblib-priv.h"
- 
- #include "rfcnb.h"
diff --git a/net-dialup/freeradius/files/freeradius-1.1.6-ssl.patch b/net-dialup/freeradius/files/freeradius-1.1.6-ssl.patch
deleted file mode 100644
index 18dcd0795a73..000000000000
--- a/net-dialup/freeradius/files/freeradius-1.1.6-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-1.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.1.6/src/modules/rlm_eap/libeap/Makefile
---- freeradius-1.1.6.orig/src/modules/rlm_eap/libeap/Makefile	2007-04-12 21:32:44.000000000 +0300
-+++ freeradius-1.1.6/src/modules/rlm_eap/libeap/Makefile	2007-04-12 21:34:41.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-1.1.6-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-1.1.6-versionless-la-files.patch
deleted file mode 100644
index 8f5cf418a497..000000000000
--- a/net-dialup/freeradius/files/freeradius-1.1.6-versionless-la-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru freeradius-1.1.6.orig/src/lib/Makefile freeradius-1.1.6/src/lib/Makefile
---- freeradius-1.1.6.orig/src/lib/Makefile	2006-04-12 23:45:20.000000000 +0300
-+++ freeradius-1.1.6/src/lib/Makefile	2007-04-12 21:32:08.000000000 +0300
-@@ -51,5 +51,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-1.1.6.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.1.6/src/modules/rlm_eap/libeap/Makefile
---- freeradius-1.1.6.orig/src/modules/rlm_eap/libeap/Makefile	2006-03-23 13:17:46.000000000 +0200
-+++ freeradius-1.1.6/src/modules/rlm_eap/libeap/Makefile	2007-04-12 21:32:08.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-1.1.6.orig/src/modules/rules.mak freeradius-1.1.6/src/modules/rules.mak
---- freeradius-1.1.6.orig/src/modules/rules.mak	2006-07-06 19:42:57.000000000 +0300
-+++ freeradius-1.1.6/src/modules/rules.mak	2007-04-12 21:32:08.000000000 +0300
-@@ -162,6 +162,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-1.1.6.ebuild b/net-dialup/freeradius/freeradius-1.1.6.ebuild
deleted file mode 100644
index 1610dc7e56bb..000000000000
--- a/net-dialup/freeradius/freeradius-1.1.6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.6.ebuild,v 1.4 2007/07/06 12:30:06 corsair Exp $
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib autotools
-
-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 ~ppc64 ~sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug edirectory firebird frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl 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 )
-	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"
-
-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}-qa-fixes.patch"
-
-	cd "${S}"
-
-	# 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
-	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 firebird; then
-		einfo "removing rlm_sql_firebird (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) "
-
-	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
-
-	econf --with-large-files --disable-ltdl-install --with-pic \
-		 --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
-}
-
-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."
-}
diff --git a/net-dialup/freeradius/freeradius-1.1.7.ebuild b/net-dialup/freeradius/freeradius-1.1.7.ebuild
index 6146d705cc1c..2dbf495999e2 100644
--- a/net-dialup/freeradius/freeradius-1.1.7.ebuild
+++ b/net-dialup/freeradius/freeradius-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.7.ebuild,v 1.3 2007/09/24 08:40:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.7.ebuild,v 1.4 2007/11/05 06:19:09 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -137,8 +137,3 @@ src_install() {
 	newinitd "${FILESDIR}/radius.init" radiusd
 	newconfd "${FILESDIR}/radius.conf" radiusd
 }
-
-pkg_preinst() {
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}