From 70541218d856b76e6e9cf9a61130d15e42da6e3e Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Sun, 3 Oct 2004 10:03:59 +0000
Subject: [PATCH] nuke more INSTALL scripts...

---
 net/vsftpd/pkg/DEINSTALL | 30 --------------
 net/vsftpd/pkg/INSTALL   | 89 ----------------------------------------
 net/vsftpd/pkg/MESSAGE   |  9 ++++
 net/vsftpd/pkg/PLIST     |  9 ++--
 4 files changed, 13 insertions(+), 124 deletions(-)
 delete mode 100644 net/vsftpd/pkg/DEINSTALL
 delete mode 100644 net/vsftpd/pkg/INSTALL
 create mode 100644 net/vsftpd/pkg/MESSAGE

diff --git a/net/vsftpd/pkg/DEINSTALL b/net/vsftpd/pkg/DEINSTALL
deleted file mode 100644
index ba9f3e29d02..00000000000
--- a/net/vsftpd/pkg/DEINSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2004/04/14 18:59:08 xsa Exp $
-#
-# opennap de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=${SYSCONFDIR}/vsftpd.conf
-VSFTPDUSER=_vsftpd
-VSFTPDGROUP=_vsftpd
-
-if [ ${PKG_DELETE_EXTRA} != Yes -a -f $CONFIG_FILE ]; then
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|           userdel $VSFTPDUSER"
-    echo "|           groupdel $VSFTPDGROUP"
-    echo "|           rm -f $CONFIG_FILE"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-fi
-
-exit 0
-
diff --git a/net/vsftpd/pkg/INSTALL b/net/vsftpd/pkg/INSTALL
deleted file mode 100644
index de7fe6dcb21..00000000000
--- a/net/vsftpd/pkg/INSTALL
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.3 2004/06/24 03:16:55 brad Exp $
-#
-# Pre/post-installation setup of vsftpd
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
-SAMPLE_CONFIG_DIR=$PREFIX/share/examples/vsftpd
-VSFTPDUSER=_vsftpd
-VSFTPDGROUP=_vsftpd
-ID=513
-
-do_usergroup_install()
-{
-  # Create vsftpd user and group
-  groupinfo -e $VSFTPDGROUP
-  if [ $? -eq 0 ]; then
-    echo "===> Using $VSFTPDGROUP group for vsftpd"
-  else
-    echo "===> Creating $VSFTPDGROUP group for vsftpd"
-    groupadd -g $ID $VSFTPDGROUP
-  fi
-  userinfo -e $VSFTPDUSER
-  if [ $? -eq 0 ]; then
-    echo "===> Using $VSFTPDUSER user for vsftpd"
-  else
-    echo "===> Creating $VSFTPDUSER user for vsftpd"
-    useradd -g $VSFTPDGROUP -d /nonexistent -c 'vsftpd user' -s /sbin/nologin -u $ID $VSFTPDUSER
-  fi
-}
-
-do_notice()
-{
-  echo
-  echo "+---------------"
-  echo "| The existing $1 configuration files in $CONFIG_DIR have NOT"
-  echo "| been changed.  You may want to compare them to the current samples in"
-  echo "| $SAMPLE_CONFIG_DIR, and update your configuration"
-  echo "| files as needed."
-  echo "+---------------"
-  echo
-}
-
-do_install()
-{
-  install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/vsftpd.conf $CONFIG_DIR
-  echo
-  echo "+---------------"
-  echo "| The $1 configuration files have been installed in $CONFIG_DIR."
-  echo "| Please view these files and change the configuration to meet your needs."
-  echo "| You must also add one of the two folowing lines to your inetd.conf :"
-  echo "|"
-  echo "| ftp stream tcp nowait root ${PREFIX}/sbin/vsftpd vsftpd"
-  echo "|"
-  echo "| ftp stream tcp nowait root /usr/libexec/tcpd ${PREFIX}/sbin/vsftpd"
-  echo "|"
-  echo "| The second line is to use vsftpd with tcp-wrappers, see tcpd(8)."
-  echo "+---------------"
-  echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	do_usergroup_install
-	;;
-    POST-INSTALL)
-	if [ ! -f $CONFIG_DIR/vsftpd.conf ]; then
-	   do_install $1
-	else
-	   do_notice $1
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/net/vsftpd/pkg/MESSAGE b/net/vsftpd/pkg/MESSAGE
new file mode 100644
index 00000000000..c81fd9851ec
--- /dev/null
+++ b/net/vsftpd/pkg/MESSAGE
@@ -0,0 +1,9 @@
+You must also add one of the two folowing lines to your inetd.conf
+
+ftp stream tcp nowait root ${PREFIX}/sbin/vsftpd vsftpd"
+
+or
+
+ftp stream tcp nowait root /usr/libexec/tcpd ${PREFIX}/sbin/vsftpd"
+
+The second line is to use vsftpd with tcp-wrappers, see tcpd(8).
diff --git a/net/vsftpd/pkg/PLIST b/net/vsftpd/pkg/PLIST
index 8872ccf0d6b..4b1c21ee6dc 100644
--- a/net/vsftpd/pkg/PLIST
+++ b/net/vsftpd/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:47 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2004/10/03 10:03:59 xsa Exp $
+@newgroup _vsftpd:513
+@newuser _vsftpd:513:_vsftpd:daemon:vsftpd user:/nonexistent:/sbin/nologin
 @man man/man5/vsftpd.conf.5
 @man man/man8/vsftpd.8
 sbin/vsftpd
@@ -24,7 +26,4 @@ share/examples/vsftpd/VIRTUAL_USERS/vsftpd.pam
 share/examples/vsftpd/VIRTUAL_USERS_2/
 share/examples/vsftpd/VIRTUAL_USERS_2/README
 share/examples/vsftpd/vsftpd.conf
-@cwd ${SYSCONFDIR}
-@extra vsftpd.conf
-@extraunexec userdel _vsftpd
-@extraunexec groupdel _vsftpd
+@sample ${SYSCONFDIR}/vsftpd.conf