Removing insecure versions.

13 files changed, 7 insertions, 937 deletions

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 7fc676e808b5..ea2a3f2c2819 100644
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.27 2004/06/16 16:05:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.28 2004/06/16 17:20:55 eradicator Exp $
+
+  16 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/usermin-1.070-gentoo.patch, -files/patch/setup.sh,
+  -files/patch/usermin, -files/patch/usermin-init, -usermin-1.000.ebuild,
+  -usermin-1.030.ebuild, -usermin-1.060-r1.ebuild, -usermin-1.070-r1.ebuild:
+  Removing insecure versions.
 
   16 Jun 2004; Luca Barbato <lu_zero@gentoo.org> usermin-1.080.ebuild:
   Marked ppc
diff --git a/app-admin/usermin/files/digest-usermin-1.000 b/app-admin/usermin/files/digest-usermin-1.000
deleted file mode 100644
index bc5c4185b31a..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03f58a9ea602bf4c9c7c781eeafb5020 usermin-1.000.tar.gz 1677887
diff --git a/app-admin/usermin/files/digest-usermin-1.030 b/app-admin/usermin/files/digest-usermin-1.030
deleted file mode 100644
index c856f61e1b05..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.030
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2be5a4be73720419a9539cd33b30b972 usermin-1.030.tar.gz 1816433
diff --git a/app-admin/usermin/files/digest-usermin-1.060-r1 b/app-admin/usermin/files/digest-usermin-1.060-r1
deleted file mode 100644
index ae61db43e04f..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.060-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 014fb6ddbbd05434b9c7c2a25fd83fc9 usermin-1.060.tar.gz 2097457
diff --git a/app-admin/usermin/files/digest-usermin-1.070-r1 b/app-admin/usermin/files/digest-usermin-1.070-r1
deleted file mode 100644
index 762fae304065..000000000000
--- a/app-admin/usermin/files/digest-usermin-1.070-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8e557a9c62e721351d71eff3a32ad470 usermin-1.070.tar.gz 2009552
diff --git a/app-admin/usermin/files/patch/setup.sh b/app-admin/usermin/files/patch/setup.sh
deleted file mode 100644
index 9a9fed2fa7ba..000000000000
--- a/app-admin/usermin/files/patch/setup.sh
+++ /dev/null
@@ -1,579 +0,0 @@
-#!/bin/sh
-# setup.sh
-# This script should be run after the usermin archive is unpacked, in order
-# to setup the various config files
-
-# Find install directory
-LANG=
-export LANG
-cd `dirname $0`
-if [ -x /bin/pwd ]; then
-	wadir=`/bin/pwd`
-else
-	wadir=`pwd`;
-fi
-ver=`cat "$wadir/version"`
-
-echo "***********************************************************************"
-echo "*            Welcome to the Usermin setup script, version $ver       *"
-echo "***********************************************************************"
-echo "Usermin is a web-based interface that allows Unix-like operating"
-echo "systems and common Unix services to be easily administered."
-echo ""
-
-# Only root can run this
-id | grep "uid=0(" >/dev/null
-if [ $? != "0" ]; then
-	uname -a | grep -i CYGWIN >/dev/null
-	if [ $? != "0" ]; then
-		echo "ERROR: The Usermin install script must be run as root";
-		echo "";
-		exit 1;
-	fi
-fi
-
-# Display install directory
-echo "Installing Usermin in $wadir ..."
-allmods=`cd "$wadir"; echo */module.info | sed -e 's/\/module.info//g'`
-if [ "$allmods" = "" ]; then
-	echo "ERROR: Failed to get module list"
-	echo ""
-	exit 1
-fi
-echo ""
-
-# Ask for usermin config directory
-echo "***********************************************************************"
-echo "Usermin uses separate directories for configuration files and log files."
-echo "Unless you want to run multiple versions of Usermin at the same time"
-echo "you can just accept the defaults."
-echo ""
-printf "Config file directory [/etc/usermin]: "
-if [ "$config_dir" = "" ]; then
-	read config_dir
-fi
-if [ "$config_dir" = "" ]; then
-	config_dir=/etc/usermin
-fi
-abspath=`echo $config_dir | grep "^/"`
-if [ "$abspath" = "" ]; then
-	echo "Config directory must be an absolute path"
-	echo ""
-	exit 2
-fi
-if [ ! -d $config_dir ]; then
-	mkdir $config_dir;
-	if [ $? != 0 ]; then
-		echo "ERROR: Failed to create directory $config_dir"
-		echo ""
-		exit 2
-	fi
-fi
-if [ -r "$config_dir/config" ]; then
-	echo "Found existing Usermin configuration in $config_dir"
-	echo ""
-	upgrading=1
-fi
-
-# Check if upgrading from an old version
-if [ "$upgrading" = 1 ]; then
-	# Get current var path
-	var_dir=`cat $config_dir/var-path`
-
-	# Get current perl path
-	perl=`cat $config_dir/perl-path`
-
-	# Create temp files directory
-	$perl "$wadir/maketemp.pl"
-	if [ "$?" != "0" ]; then
-		echo "ERROR: Failed to create or check temp files directory /tmp/.webmin"
-		echo ""
-		exit 2
-	fi
-
-	# Get old os name and version
-	os_type=`grep "^os_type=" $config_dir/config | sed -e 's/os_type=//g'`
-	os_version=`grep "^os_version=" $config_dir/config | sed -e 's/os_version=//g'`
-	real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
-	real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
-
-	# Get old root, host, port, ssl and boot flag
-	oldwadir=`grep "^root=" $config_dir/miniserv.conf | sed -e 's/root=//g'`
-	port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
-	ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
-	atboot=`grep "^atboot=" $config_dir/miniserv.conf | sed -e 's/atboot=//g'`
-	inetd=`grep "^inetd=" $config_dir/miniserv.conf | sed -e 's/inetd=//g'`
-
-	if [ "$inetd" != "1" ]; then
-		# Stop old version
-		$config_dir/stop >/dev/null 2>&1
-	fi
-
-	# Update ACLs
-	$perl "$wadir/newmods.pl" $config_dir $allmods
-
-	# Update miniserv.conf with new root directory and mime types file
-	grep -v "^root=" $config_dir/miniserv.conf | grep -v "^mimetypes=" >/tmp/.webmin/$$.miniserv.conf
-	mv /tmp/.webmin/$$.miniserv.conf $config_dir/miniserv.conf
-	echo "root=$wadir" >> $config_dir/miniserv.conf
-	echo "mimetypes=$wadir/mime.types" >> $config_dir/miniserv.conf
-	grep logout= $config_dir/miniserv.conf >/dev/null
-	if [ $? != "0" ]; then
-		echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf
-	fi
-	
-	# Check for third-party modules in old version
-	if [ "$wadir" != "$oldwadir" ]; then
-		echo "Checking for third-party modules .."
-		if [ "$webmin_upgrade" != "" ]; then
-			autothird=1
-		fi
-		$perl "$wadir/thirdparty.pl" "$wadir" "$oldwadir" $autothird
-		echo "..done"
-		echo ""
-	fi
-
-	# Remove old cache of module infos
-	rm -f $config_dir/module.infos.cache
-else
-	# Config directory exists .. make sure it is not in use
-	ls $config_dir | grep -v rpmsave >/dev/null 2>&1
-	if [ "$?" = "0" -a "$config_dir" != "/etc/usermin" ]; then
-		echo "ERROR: Config directory $config_dir is not empty"
-		echo ""
-		exit 2
-	fi
-
-	# Ask for log directory
-	printf "Log file directory [/var/usermin]: "
-	if [ "$var_dir" = "" ]; then
-		read var_dir
-	fi
-	if [ "$var_dir" = "" ]; then
-		var_dir=/var/usermin
-	fi
-	abspath=`echo $var_dir | grep "^/"`
-	if [ "$abspath" = "" ]; then
-		echo "Log file directory must be an absolute path"
-		echo ""
-		exit 3
-	fi
-	if [ "$var_dir" = "/" ]; then
-		echo "Log directory cannot be /"
-		exit ""
-		exit 3
-	fi
-	if [ ! -d $var_dir ]; then
-		mkdir $var_dir
-		if [ $? != 0 ]; then
-			echo "ERROR: Failed to create directory $var_dir"
-			echo ""
-			exit 3
-		fi
-	fi
-	echo ""
-
-	# Ask where perl is installed
-	echo "***********************************************************************"
-	echo "Usermin is written entirely in Perl. Please enter the full path to the"
-	echo "Perl 5 interpreter on your system."
-	echo ""
-	if [ -x /usr/bin/perl ]; then
-		perldef=/usr/bin/perl
-	elif [ -x /usr/local/bin/perl ]; then
-		perldef=/usr/local/bin/perl
-	else
-		perldef=""
-	fi
-	if [ "$perl" = "" ]; then
-		if [ "$perldef" = "" ]; then
-			printf "Full path to perl: "
-			read perl
-			if [ "$perl" = "" ]; then
-				echo "ERROR: No path entered!"
-				echo ""
-				exit 4
-			fi
-		else
-			printf "Full path to perl (default $perldef): "
-			read perl
-			if [ "$perl" = "" ]; then
-				perl=$perldef
-			fi
-		fi
-	fi
-	echo ""
-
-	# Test perl 
-	echo "Testing Perl ..."
-	if [ ! -x $perl ]; then
-		echo "ERROR: Failed to find perl at $perl"
-		echo ""
-		exit 5
-	fi
-	$perl -e 'print "foobar\n"' 2>/dev/null | grep foobar >/dev/null
-	if [ $? != "0" ]; then
-		echo "ERROR: Failed to run test perl script. Maybe $perl is"
-		echo "not the perl interpreter, or is not installed properly"
-		echo ""
-		exit 6
-	fi
-	$perl -e 'exit ($] < 5.002 ? 1 : 0)'
-	if [ $? = "1" ]; then
-		echo "ERROR: Detected old perl version. Usermin requires"
-		echo "perl 5.002 or better to run"
-		echo ""
-		exit 7
-	fi
-	$perl -e 'use Socket; print "foobar\n"' 2>/dev/null | grep foobar >/dev/null
-	if [ $? != "0" ]; then
-		echo "ERROR: Perl Socket module not installed. Maybe Perl has"
-		echo "not been properly installed on your system"
-		echo ""
-		exit 8
-	fi
-	$perl -e '$c = crypt("xx", "yy"); exit($c ? 0 : 1)'
-	if [ $? != "0" ]; then
-		echo "ERROR: Perl crypt function does not work. Maybe Perl has"
-		echo "not been properly installed on your system"
-		echo ""
-		exit 8
-	fi
-	echo "Perl seems to be installed ok"
-	echo ""
-
-	# Create temp files directory
-	$perl "$wadir/maketemp.pl"
-	if [ "$?" != "0" ]; then
-		echo "ERROR: Failed to create or check temp files directory /tmp/.webmin"
-		echo ""
-		exit 2
-	fi
-
-	# Ask for operating system type
-	echo "***********************************************************************"
-	if [ "$os_type" = "" ]; then
-		if [ "$autoos" = "" ]; then
-			autoos=2
-		fi
-		$perl "$wadir/oschooser.pl" "$wadir/os_list.txt" /tmp/.webmin/$$.os $autoos
-		if [ $? != 0 ]; then
-			exit $?
-		fi
-		. /tmp/.webmin/$$.os
-		rm -f /tmp/.webmin/$$.os
-	fi
-	echo "Operating system name:    $real_os_type"
-	echo "Operating system version: $real_os_version"
-	echo ""
-
-	# Ask for web server port, name and password
-	echo "***********************************************************************"
-	echo "Usermin uses its own password protected web server to provide access"
-	echo "to the administration programs. The setup script needs to know :"
-	echo " - What port to run the web server on. There must not be another"
-	echo "   web server already using this port."
-	echo " - If the webserver should use SSL (if your system supports it)."
-	echo ""
-	printf "Web server port (default 20000): "
-	if [ "$port" = "" ]; then
-		read port
-		if [ "$port" = "" ]; then
-			port=20000
-		fi
-	fi
-	if [ $port -lt 1 ]; then
-		echo "ERROR: $port is not a valid port number"
-		echo ""
-		exit 11
-	fi
-	if [ $port -gt 65535 ]; then
-		echo "ERROR: $port is not a valid port number. Port numbers cannot be"
-		echo "       greater than 65535"
-		echo ""
-		exit 12
-	fi
-	$perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port
-	if [ $? != "0" ]; then
-		echo "ERROR: TCP port $port is already in use by another program"
-		echo ""
-		exit 13
-	fi
-	if [ "$ssl" = "" ]; then
-		ssl=0
-		$perl -e 'use Net::SSLeay' >/dev/null 2>/dev/null
-		if [ $? = "0" ]; then
-			printf "Use SSL (y/n): "
-			read sslyn
-			if [ "$sslyn" = "y" -o "$sslyn" = "Y" ]; then
-				ssl=1
-			fi
-		else
-			echo "The Perl SSLeay library is not installed. SSL not available."
-			rm -f core
-		fi
-	fi
-
-	# Create webserver config file
-	echo $perl > $config_dir/perl-path
-	echo $var_dir > $config_dir/var-path
-	echo "***********************************************************************"
-	echo "Creating web server config files.."
-	cfile=$config_dir/miniserv.conf
-	echo "port=$port" >> $cfile
-	echo "root=$wadir" >> $cfile
-	echo "mimetypes=$wadir/mime.types" >> $cfile
-	echo "addtype_cgi=internal/cgi" >> $cfile
-	echo "realm=Usermin Server" >> $cfile
-	echo "logfile=$var_dir/miniserv.log" >> $cfile
-	echo "errorlog=$var_dir/miniserv.error" >> $cfile
-	echo "pidfile=$var_dir/miniserv.pid" >> $cfile
-	echo "logtime=168" >> $cfile
-	echo "ppath=$ppath" >> $cfile
-	echo "ssl=$ssl" >> $cfile
-	echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
-	echo "env_WEBMIN_VAR=$var_dir" >> $cfile
-	echo "atboot=$atboot" >> $cfile
-	echo "logout=$config_dir/logout-flag" >> $cfile
-	echo "listen=20000" >> $cfile
-	echo "denyfile=\\.pl\$" >> $cfile
-	echo "log=1" >> $cfile
-	echo "blockhost_failures=5" >> $cfile
-	echo "blockhost_time=60" >> $cfile
-	if [ "$allow" != "" ]; then
-		echo "allow=$allow" >> $cfile
-	fi
-	if [ "$session" != "" ]; then
-		echo "session=$session" >> $cfile
-	else
-		echo "session=1" >> $cfile
-	fi
-	echo "unixauth=user" >> $cfile
-	echo "localauth=1" >> $cfile
-	echo "pam=usermin" >> $cfile
-	#echo "denyusers=root" >> $cfile
-
-	ufile=$config_dir/miniserv.users
-	echo "user:x:0::" > $ufile
-	chmod 644 $ufile
-	echo "userfile=$ufile" >> $cfile
-
-	kfile=$config_dir/miniserv.pem
-	openssl version >/dev/null 2>&1
-	if [ "$?" = "0" ]; then
-		# We can generate a new SSL key for this host
-		host=`hostname`
-		openssl req -newkey rsa:512 -x509 -nodes -out /tmp/.webmin/cert -keyout /tmp/.webmin/key -days 1825 >/dev/null 2>&1 <<EOF
-.
-.
-.
-Usermin Webserver
-.
-*
-root@$host
-EOF
-		if [ "$?" = "0" ]; then
-			cat /tmp/.webmin/cert /tmp/.webmin/key >$kfile
-		fi
-		rm -f /tmp/.webmin/cert /tmp/.webmin/key
-	fi
-	if [ ! -r $kfile ]; then
-		# Fall back to the built-in key
-		cp "$wadir/miniserv.pem" $kfile
-	fi
-	chmod 600 $kfile
-	echo "keyfile=$config_dir/miniserv.pem" >> $cfile
-
-	chmod 644 $cfile
-	echo "..done"
-	echo ""
-
-	echo "Creating access control file.."
-	afile=$config_dir/webmin.acl
-	rm -f $afile
-	echo "user: $allmods" >> $afile
-	chmod 644 $afile
-	echo "..done"
-	echo ""
-
-fi
-
-if [ "$noperlpath" = "" ]; then
-	echo "Inserting path to perl into scripts.."
-	(find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl -
-	echo "..done"
-	echo ""
-fi
-
-echo "Creating start and stop scripts.."
-rm -f $config_dir/stop $config_dir/start
-echo "#!/bin/sh" >>$config_dir/start
-echo "echo Starting Usermin server in $wadir" >>$config_dir/start
-echo "trap '' 1" >>$config_dir/start
-echo "LANG=" >>$config_dir/start
-echo "export LANG" >>$config_dir/start
-uname -a | grep -i 'HP/*UX' >/dev/null
-if [ $? = "0" ]; then
-	echo "exec "$wadir/miniserv.pl" $config_dir/miniserv.conf &" >>$config_dir/start
-else
-	uname -a | grep -i FreeBSD >/dev/null
-	if [ "$?" = "0" ]; then
-		echo "LD_PRELOAD=/usr/lib/libpam.so.1" >>$config_dir/start
-		echo "export LD_PRELOAD" >>$config_dir/start
-	fi
-	echo "exec "$wadir/miniserv.pl" $config_dir/miniserv.conf" >>$config_dir/start
-fi
-
-echo "#!/bin/sh" >>$config_dir/stop
-echo "echo Stopping Usermin server in $wadir" >>$config_dir/stop
-echo "pidfile=\`grep \"^pidfile=\" $config_dir/miniserv.conf | sed -e 's/pidfile=//g'\`" >>$config_dir/stop
-echo "kill \`cat \$pidfile\`" >>$config_dir/stop
-chmod 755 $config_dir/start $config_dir/stop
-echo "..done"
-echo ""
-
-if [ "$upgrading" = 1 ]; then
-	echo "Updating config files.."
-else
-	echo "Copying config files.."
-fi
-$perl "$wadir/copyconfig.pl" "$os_type" "$os_version" "$wadir" $config_dir "" $allmods
-if [ "$upgrading" != 1 ]; then
-	# Store the OS and version
-	echo "os_type=$os_type" >> $config_dir/config
-	echo "os_version=$os_version" >> $config_dir/config
-	echo "real_os_type=$real_os_type" >> $config_dir/config
-	echo "real_os_version=$real_os_version" >> $config_dir/config
-	if [ -r /etc/system.cnf ]; then
-		# Found a caldera system config file .. get the language
-		source /etc/system.cnf
-		if [ "$CONF_LST_LANG" = "us" ]; then
-			CONF_LST_LANG=en
-		elif [ "$CONF_LST_LANG" = "uk" ]; then
-			CONF_LST_LANG=en
-		fi
-		grep "lang=$CONF_LST_LANG," "$wadir/lang_list.txt" >/dev/null 2>&1
-		if [ "$?" = 0 ]; then
-			echo "lang=$CONF_LST_LANG" >> $config_dir/config
-		fi
-	fi
-
-	# Set additional usermin-specific options
-	echo "userconfig=.usermin" >> $config_dir/config
-	echo "overlang=ulang" >> $config_dir/config
-	echo "nofeedbackcc=2" >> $config_dir/config
-	echo "nofeedbackconf=1" >> $config_dir/config
-fi
-echo $ver > $config_dir/version
-echo "..done"
-echo ""
-
-# Set passwd_ fields in miniserv.conf from global config
-grep passwd_file= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	grep passwd_file= $config_dir/config >> $config_dir/miniserv.conf
-	grep passwd_uindex= $config_dir/config >> $config_dir/miniserv.conf
-	grep passwd_pindex= $config_dir/config >> $config_dir/miniserv.conf
-fi
-
-# Set usermin-specific SID cookie name
-grep sidname= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo sidname=usid >> $config_dir/miniserv.conf
-fi
-
-if [ "$theme" = "" ]; then
-	theme=`cat "$wadir/defaulttheme" 2>/dev/null`
-fi
-oldthemeline=`grep "^theme=" $config_dir/config`
-oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`
-if [ "$theme" != "" ] && [ "$oldthemeline" = "" ] && [ -d "$wadir/$theme" ]; then
-	# Set a special theme if none was set before
-	echo "theme=$theme" >> $config_dir/config
-	echo "preroot=$theme" >> $config_dir/miniserv.conf
-fi
-
-if [ "$nouninstall" = "" ]; then
-	echo "Creating uninstall script $config_dir/uninstall.sh .."
-	cat >$config_dir/uninstall.sh <<EOF
-#!/bin/sh
-echo "Deleting $wadir .."
-rm -rf "$wadir"
-echo "Deleting $config_dir .."
-rm -rf $config_dir
-echo "Done!"
-
-EOF
-	chmod +x $config_dir/uninstall.sh
-	echo "..done"
-	echo ""
-fi
-
-echo "Changing ownership and permissions .."
-chown -R root:bin $config_dir
-chmod -R 755 $config_dir
-if [ "$nochown" = "" ]; then
-	chown -R root:bin "$wadir"
-	chmod -R og-w "$wadir"
-	if [ $var_dir != "/var" ]; then
-		chown -R root:bin $var_dir
-		chmod -R og-w $var_dir
-	fi
-fi
-echo "..done"
-echo ""
-
-printf "Do you want to add usermin to the your computers's boot [y/n]: "
-read answer
-echo "Adding Usermin to boot .."
-if [ "$answer" = "y" ]; then
-	rc-update add usermin default;
-fi
-echo "..done"
-echo ""
-
-if [ "$nostart" = "" ]; then
-	if [ "$inetd" != "1" ]; then
-		echo "Attempting to start Usermin mini web server.."
-		$config_dir/start
-		if [ $? != "0" ]; then
-			echo "ERROR: Failed to start web server!"
-			echo ""
-			exit 14
-		fi
-		echo "..done"
-		echo ""
-	fi
-
-	echo "***********************************************************************"
-	echo "Usermin has been installed and started successfully. Use your web"
-	echo "browser to go to"
-	echo ""
-	host=`hostname`
-	if [ "$ssl" = "1" ]; then
-		echo "  https://$host:$port/"
-	else
-		echo "  http://$host:$port/"
-	fi
-	echo ""
-	echo "and login as any Unix user on your system."
-	echo ""
-	if [ "$ssl" = "1" ]; then
-		echo "Because Usermin uses SSL for encryption only, the certificate"
-		echo "it uses is not signed by one of the recognized CAs such as"
-		echo "Verisign. When you first connect to the Usermin server, your"
-		echo "browser will ask you if you want to accept the certificate"
-		echo "presented, as it does not recognize the CA. Say yes."
-		echo ""
-	fi
-fi
-
-if [ "$oldwadir" != "$wadir" -a "$upgrading" = 1 ]; then
-	echo "The directory from the previous version of Usermin"
-	echo "   $oldwadir"
-	echo "Can now be safely deleted to free up disk space, assuming"
-	echo "that all third-party modules have been copied to the new"
-	echo "version."
-	echo ""
-fi
-
diff --git a/app-admin/usermin/files/patch/usermin b/app-admin/usermin/files/patch/usermin
deleted file mode 100644
index 5c0ee8c1e9c7..000000000000
--- a/app-admin/usermin/files/patch/usermin
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/files/patch/usermin,v 1.3 2004/02/13 19:10:36 vapier Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Usermin"
-	/usr/sbin/usermin start --pidfile /var/run/usermin.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Usermin"
-	/usr/sbin/usermin stop --pidfile /var/run/usermin.pid
-	eend $?
-}
diff --git a/app-admin/usermin/files/patch/usermin-init b/app-admin/usermin/files/patch/usermin-init
deleted file mode 100644
index 43a0e06273ed..000000000000
--- a/app-admin/usermin/files/patch/usermin-init
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-# chkconfig: 235 99 10
-# description: Start or stop the Usermin server
-#
-### BEGIN INIT INFO
-# Provides: usermin
-# Required-Start: $network
-# Required-Stop: $network
-# Default-Start: 2 3 5
-# Default-Stop: 0 1 6
-# Description: Start or stop the Usermin server
-### END INIT INFO
-
-start=/etc/usermin/start
-stop=/etc/usermin/stop
-lockfile=/var/lock/subsys/usermin
-confFile=/etc/usermin/miniserv.conf
-pidFile=/var/usermin/miniserv.pid
-etc_dir=/etc/usermin
-name='Usermin'
-
-case "$1" in
-'start')
-	$start >/dev/null 2>&1 </dev/null
-	RETVAL=$?
-	if [ "$RETVAL" = "0" ]; then
-		touch $lockfile >/dev/null 2>&1
-	fi
-	;;
-'stop')
-	$stop
-	RETVAL=$?
-	if [ "$RETVAL" = "0" ]; then
-		rm -f $lockfile
-	fi
-	;;
-'status')
-	pidfile=`grep "^pidfile=" $confFile | sed -e 's/pidfile=//g'`
-	if [ "$pidfile" = "" ]; then
-		pidfile=$pidFile
-	fi
-	if [ -s $pidfile ]; then
-		pid=`cat $pidfile`
-		kill -0 $pid >/dev/null 2>&1
-		if [ "$?" = "0" ]; then
-			echo "$name (pid $pid) is running"
-			RETVAL=0
-		else
-			echo "$name is stopped"
-			RETVAL=1
-		fi
-	else
-		echo "$name is stopped"
-		RETVAL=1
-	fi
-	;;
-'restart')
-	$stop && $start
-	RETVAL=$?
-	;;
-'setup')
-	echo "Entering $etc_dir .."
-	cd $etc_dir
-	echo "..done"
-	echo ""
-	echo "Etering Setup ..."
-	./setup.sh
-	echo "..done"
-	echo ""
-	;;
-
-*)
-	echo "Usage: $0 { start | stop | restart | setup }"
-	RETVAL=1
-	;;
-esac
-exit $RETVAL
-
diff --git a/app-admin/usermin/files/usermin-1.070-gentoo.patch b/app-admin/usermin/files/usermin-1.070-gentoo.patch
deleted file mode 100644
index 355b05a394a5..000000000000
--- a/app-admin/usermin/files/usermin-1.070-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- setup.sh.orig	2004-04-22 16:46:12.000000000 -0700
-+++ setup.sh	2004-04-22 16:49:39.000000000 -0700
-@@ -194,12 +194,12 @@
- 	fi
- 
- 	# Ask for log directory
--	printf "Log file directory [/var/usermin]: "
-+	printf "Log file directory [/var/log/usermin]: "
- 	if [ "$var_dir" = "" ]; then
- 		read var_dir
- 	fi
- 	if [ "$var_dir" = "" ]; then
--		var_dir=/var/usermin
-+		var_dir=/var/log/usermin
- 	fi
- 	abspath=`echo $var_dir | grep "^/"`
- 	if [ "$abspath" = "" ]; then
-@@ -606,7 +606,8 @@
- 	rm -f $config_dir/install-dir
- fi
- 
--if [ "$nostart" = "" ]; then
-+#if [ "$nostart" = "" ]; then
-+if false; then
- 	if [ "$inetd" != "1" ]; then
- 		echo "Attempting to start Usermin mini web server.."
- 		$config_dir/start
diff --git a/app-admin/usermin/usermin-1.000.ebuild b/app-admin/usermin/usermin-1.000.ebuild
deleted file mode 100644
index 209a1267282d..000000000000
--- a/app-admin/usermin/usermin-1.000.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.000.ebuild,v 1.7 2004/04/23 00:23:15 eradicator Exp $
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc alpha ppc"
-IUSE="ssl"
-
-DEPEND="dev-lang/perl
-	sys-apps/lsof
-	ssl? ( dev-perl/Net-SSLeay )
-	dev-perl/Authen-PAM"
-
-src_install() {
-	dodir /usr/libexec/usermin
-	dodir /usr/sbin
-	mv *.* ${D}/usr/libexec/usermin
-	mv * ${D}/usr/libexec/usermin
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/patch/usermin usermin
-	exeinto /usr/libexec/usermin
-#	newexe ${FILESDIR}/patch/setup.sh setup.sh
-#	newexe ${FILESDIR}/patch/usermin-init usermin-init
-	dosym /usr/libexec/usermin /etc/usermin
-	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-}
-
-pkg_postinst() {
-	einfo "Configure usermin by running \"usermin setup\"."
-	echo
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	usermin stop
-}
-
-#pkg_postrm() {
-#	/usr/libexec/usermin/uninstall.sh
-#}
diff --git a/app-admin/usermin/usermin-1.030.ebuild b/app-admin/usermin/usermin-1.030.ebuild
deleted file mode 100644
index 1b76b77f5800..000000000000
--- a/app-admin/usermin/usermin-1.030.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.030.ebuild,v 1.6 2004/01/05 12:55:44 weeve Exp $
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ~sparc alpha ~ppc"
-IUSE="ssl"
-
-DEPEND="dev-lang/perl
-	sys-apps/lsof
-	>=sys-apps/sed-4
-	dev-perl/Authen-PAM
-	ssl? ( dev-perl/Net-SSLeay )"
-
-src_install() {
-	dodir /usr/libexec/usermin
-	dodir /usr/sbin
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
-	mv * ${D}/usr/libexec/usermin
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/patch/usermin usermin
-	exeinto /usr/libexec/usermin
-	newexe ${FILESDIR}/patch/setup.sh setup.sh
-	newexe ${FILESDIR}/patch/usermin-init usermin-init
-	dosym /usr/libexec/usermin /etc/usermin
-	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-}
-
-pkg_postinst() {
-	einfo "Configure usermin by running \"usermin setup\"."
-	echo
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	usermin stop
-}
diff --git a/app-admin/usermin/usermin-1.060-r1.ebuild b/app-admin/usermin/usermin-1.060-r1.ebuild
deleted file mode 100644
index e9eee360cf66..000000000000
--- a/app-admin/usermin/usermin-1.060-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.060-r1.ebuild,v 1.2 2004/04/11 03:20:33 weeve Exp $
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ppc"
-IUSE="ssl"
-
-DEPEND="dev-lang/perl
-	sys-apps/lsof
-	>=sys-apps/sed-4
-	dev-perl/Authen-PAM
-	ssl? ( dev-perl/Net-SSLeay )"
-
-src_install() {
-	dodir /usr/libexec/usermin
-	dodir /usr/sbin
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
-	mv * ${D}/usr/libexec/usermin
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/patch/usermin usermin
-	exeinto /usr/libexec/usermin
-	newexe ${FILESDIR}/patch/setup.sh setup.sh
-	newexe ${FILESDIR}/patch/usermin-init usermin-init
-	dosym /usr/libexec/usermin /etc/usermin
-	dosym /usr/libexec/usermin/usermin-init /usr/sbin/usermin
-
-	# Bug #46273
-	cp ${D}/usr/libexec/usermin/quota/generic-linux-lib.pl ${D}/usr/libexec/usermin/quota/gentoo-linux-lib.pl
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-}
-
-pkg_postinst() {
-	einfo "Configure usermin by running \"usermin setup\"."
-	echo
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	usermin stop
-}
diff --git a/app-admin/usermin/usermin-1.070-r1.ebuild b/app-admin/usermin/usermin-1.070-r1.ebuild
deleted file mode 100644
index dfc40a098dee..000000000000
--- a/app-admin/usermin/usermin-1.070-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.070-r1.ebuild,v 1.4 2004/06/06 14:00:20 weeve Exp $
-
-inherit eutils
-
-DESCRIPTION="a web-based user administration interface"
-HOMEPAGE="http://www.webmin.com/index6.html"
-SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ppc"
-IUSE="ssl"
-
-RDEPEND="dev-lang/perl
-	sys-apps/lsof
-	>=sys-apps/sed-4
-	dev-perl/Authen-PAM
-	ssl? ( dev-perl/Net-SSLeay )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	# Point to the correct mysql location
-	sed -i "s:/usr/local/mysql:/usr:g" mysql/config
-
-	# Bug #46273... missing config for gentoo
-	cp quota/generic-linux-lib.pl quota/gentoo-linux-lib.p
-}
-
-src_install() {
-	dodir /usr/libexec/usermin
-	cp -a * ${D}/usr/libexec/usermin
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init.d.usermin usermin
-
-	insinto /etc/pam.d
-	newins ${FILESDIR}/${PN}.pam ${PN}
-
-	dosym ../usr/libexec/usermin /etc/usermin
-}
-
-pkg_postinst() {
-	/etc/init.d/usermin stop >& /dev/null
-	stopstatus=$?
-
-	cd /usr/libexec/usermin
-	config_dir=/etc/usermin
-	var_dir=/var/log/usermin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	use ssl && ssl=1 || ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl /usr/libexec/usermin/maketemp.pl
-	./setup.sh > /tmp/.webmin/usermin-setup.out 2>&1
-
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		/etc/init.d/usermin start
-	fi
-
-	einfo "Add usermin to your boot-time services with 'rc-update add usermin'."
-	einfo "Point your web browser to http://localhost:20000 to use usermin."
-}
-
-pkg_prerm() {
-	/etc/init.d/usermin stop >& /dev/null
-}