summaryrefslogtreecommitdiffstats
path: root/abs/extra
diff options
context:
space:
mode:
Diffstat (limited to 'abs/extra')
-rw-r--r--abs/extra/community/vsftpd/PKGBUILD62
-rw-r--r--abs/extra/community/vsftpd/__changelog1
-rw-r--r--abs/extra/community/vsftpd/vsftpd.d93
-rw-r--r--abs/extra/community/vsftpd/vsftpd.install5
4 files changed, 88 insertions, 73 deletions
diff --git a/abs/extra/community/vsftpd/PKGBUILD b/abs/extra/community/vsftpd/PKGBUILD
index 32a4007..78ba1c5 100644
--- a/abs/extra/community/vsftpd/PKGBUILD
+++ b/abs/extra/community/vsftpd/PKGBUILD
@@ -1,52 +1,44 @@
-# $Id: PKGBUILD 29700 2009-03-11 22:18:56Z hugo $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=vsftpd
-pkgver=2.1.0
-pkgrel=4
+pkgver=2.3.4
+pkgrel=2
pkgdesc="Very Secure FTP daemon"
arch=('i686' 'x86_64')
-license=('GPL')
-backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd)
-url="http://vsftpd.beasts.org/"
-#makedepends=('vim')
-depends=('glibc' 'pam' 'tcp_wrappers>=7.6-8' 'openssl>=0.9.8j-1' 'libcap>=2.16')
+url="https://security.appspot.com/vsftpd.html"
+license=('GPL2')
+depends=('openssl')
+backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
install=vsftpd.install
-source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
- vsftpd.xinetd vsftpd.d run)
-md5sums=('7890b54e7ffa6106ffbdfda53f47fa41'
- 'b07fd4609c70063c1d6b20142910c1a6'
- 'e46ed8e4c4a6e6a3de59f60b98e4f569'
- '8abbed7cc75f9a9d2944e0e83c8dd90d')
+source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz"
+ 'vsftpd.xinetd' 'vsftpd.d' 'run')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
# build-time config
sed \
- -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
-e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-i builddefs.h
- make CFLAGS="${CFLAGS}" || return 1
- install -D -m755 vsftpd ${pkgdir}/usr/sbin/vsftpd || return 1
- install -D -m644 vsftpd.conf ${pkgdir}/etc/vsftpd.conf || return 1
- install -D -m644 vsftpd.8 ${pkgdir}/usr/share/man/man8/vsftpd.8 || return 1
- install -D -m644 vsftpd.conf.5 ${pkgdir}/usr/share/man/man5/vsftpd.conf.5 || return 1
- install -D -m644 ../vsftpd.xinetd ${pkgdir}/etc/xinetd.d/vsftpd || return 1
- install -D -m755 ../vsftpd.d ${pkgdir}/etc/rc.d/vsftpd || return 1
- mkdir -p $startdir/pkg/usr/share/empty
-# ex ${pkgdir}/etc/vsftpd.conf <<_EOF
-#2
-#i
-##
-## Use this to use vsftpd in standalone mode, otherwise it runs through (x)inetd
-##listen=YES
-#.
-#w
-#q
-#_EOF
-#}
# Below added for LinHES
mkdir -p $startdir/pkg/etc/sv/vsftpd/supervise
install -D -m755 $startdir/src/run $startdir/pkg/etc/sv/vsftpd/
+ make CFLAGS="${CFLAGS}"
}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ install -D -m755 vsftpd "${pkgdir}/usr/sbin/vsftpd"
+ install -D -m644 vsftpd.conf "${pkgdir}/etc/vsftpd.conf"
+ install -D -m644 vsftpd.8 "${pkgdir}/usr/share/man/man8/vsftpd.8"
+ install -D -m644 vsftpd.conf.5 "${pkgdir}/usr/share/man/man5/vsftpd.conf.5"
+ install -D -m644 "${srcdir}/vsftpd.xinetd" "${pkgdir}/etc/xinetd.d/vsftpd"
+ install -D -m755 "${srcdir}/vsftpd.d" "${pkgdir}/etc/rc.d/vsftpd"
+
+ install -d -m755 "${pkgdir}/usr/share/empty"
+}
+md5sums=('2ea5d19978710527bb7444d93b67767a'
+ 'b07fd4609c70063c1d6b20142910c1a6'
+ '60060a6c7db3b3b7baa1561a302e6923'
+ '8abbed7cc75f9a9d2944e0e83c8dd90d')
diff --git a/abs/extra/community/vsftpd/__changelog b/abs/extra/community/vsftpd/__changelog
new file mode 100644
index 0000000..82615f6
--- /dev/null
+++ b/abs/extra/community/vsftpd/__changelog
@@ -0,0 +1 @@
+-Add back run file and modify PKGBUILD to install run
diff --git a/abs/extra/community/vsftpd/vsftpd.d b/abs/extra/community/vsftpd/vsftpd.d
index b43a6d0..2731085 100644
--- a/abs/extra/community/vsftpd/vsftpd.d
+++ b/abs/extra/community/vsftpd/vsftpd.d
@@ -1,40 +1,67 @@
#!/bin/bash
+daemon_name=vsftpd
+
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/sbin/vsftpd`
+get_pid() {
+ pidof -o %PPID $daemon_name
+}
+
case "$1" in
- start)
- stat_busy "Starting vsftpd FTP Daemon"
- if [ -z "$PID" ]; then
- /usr/sbin/vsftpd &
- PID=`pidof -o %PPID /usr/sbin/vsftpd`
- if [ -z $PID ]; then
- stat_fail
- else
- add_daemon vsftpd
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping vsftpd FTP Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon vsftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
+ start)
+ stat_busy "Starting $daemon_name daemon"
+
+ PID=$(get_pid)
+ if [ -z "$PID" ]; then
+ [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
+ # RUN
+ $daemon_name &
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ echo $(get_pid) > /var/run/$daemon_name.pid
+ add_daemon $daemon_name
+ stat_done
+ fi
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping $daemon_name daemon"
+ PID=$(get_pid)
+ # KILL
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ #
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ rm -f /var/run/$daemon_name.pid &> /dev/null
+ rm_daemon $daemon_name
+ stat_done
+ fi
+ ;;
+
+ restart)
+ $0 stop
+ sleep 3
+ $0 start
+ ;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+ ;;
+
+ *)
+ echo "usage: $0 {start|stop|restart|status}"
esac
+
+exit 0
diff --git a/abs/extra/community/vsftpd/vsftpd.install b/abs/extra/community/vsftpd/vsftpd.install
index 3bbb2cc..48f134e 100644
--- a/abs/extra/community/vsftpd/vsftpd.install
+++ b/abs/extra/community/vsftpd/vsftpd.install
@@ -9,14 +9,9 @@ post_install() {
echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
echo ">>> it will be activated automatically at boot-up."
fi
-# Below added for LinHES
- add_service.sh vsftpd
}
post_upgrade() {
post_install $1
}
-post_remove() {
- remove_service.sh vsftpd
-}