Date: Thursday, January 5, 2012 @ 19:42:46 Author: eric Revision: 146202
archrelease: copy trunk to extra-i686, extra-x86_64 Added: vsftpd/repos/extra-i686/PKGBUILD (from rev 146201, vsftpd/trunk/PKGBUILD) vsftpd/repos/extra-i686/vsftpd.d (from rev 146201, vsftpd/trunk/vsftpd.d) vsftpd/repos/extra-i686/vsftpd.install (from rev 146201, vsftpd/trunk/vsftpd.install) vsftpd/repos/extra-i686/vsftpd.xinetd (from rev 146201, vsftpd/trunk/vsftpd.xinetd) vsftpd/repos/extra-x86_64/PKGBUILD (from rev 146201, vsftpd/trunk/PKGBUILD) vsftpd/repos/extra-x86_64/vsftpd.d (from rev 146201, vsftpd/trunk/vsftpd.d) vsftpd/repos/extra-x86_64/vsftpd.install (from rev 146201, vsftpd/trunk/vsftpd.install) vsftpd/repos/extra-x86_64/vsftpd.xinetd (from rev 146201, vsftpd/trunk/vsftpd.xinetd) Deleted: vsftpd/repos/extra-i686/PKGBUILD vsftpd/repos/extra-i686/vsftpd.d vsftpd/repos/extra-i686/vsftpd.install vsftpd/repos/extra-i686/vsftpd.xinetd vsftpd/repos/extra-x86_64/PKGBUILD vsftpd/repos/extra-x86_64/vsftpd.d vsftpd/repos/extra-x86_64/vsftpd.install vsftpd/repos/extra-x86_64/vsftpd.xinetd -----------------------------+ extra-i686/PKGBUILD | 84 ++++++++++++-------------- extra-i686/vsftpd.d | 134 +++++++++++++++++++++--------------------- extra-i686/vsftpd.install | 34 +++++----- extra-i686/vsftpd.xinetd | 20 +++--- extra-x86_64/PKGBUILD | 84 ++++++++++++-------------- extra-x86_64/vsftpd.d | 134 +++++++++++++++++++++--------------------- extra-x86_64/vsftpd.install | 34 +++++----- extra-x86_64/vsftpd.xinetd | 20 +++--- 8 files changed, 270 insertions(+), 274 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-i686/PKGBUILD 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=vsftpd -pkgver=2.3.4 -pkgrel=2 -pkgdesc="Very Secure FTP daemon" -arch=('i686' 'x86_64') -url="https://security.appspot.com/vsftpd.html" -license=('GPL2') -depends=('openssl') -backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') -install=vsftpd.install -source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" - 'vsftpd.xinetd' 'vsftpd.d') -md5sums=('2ea5d19978710527bb7444d93b67767a' - 'b07fd4609c70063c1d6b20142910c1a6' - '60060a6c7db3b3b7baa1561a302e6923') -sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea' - 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # build-time config - sed \ - -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ - -i builddefs.h - 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" -} Copied: vsftpd/repos/extra-i686/PKGBUILD (from rev 146201, vsftpd/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=vsftpd +pkgver=2.3.5 +pkgrel=1 +pkgdesc="Very Secure FTP daemon" +arch=('i686' 'x86_64') +url="https://security.appspot.com/vsftpd.html" +license=('GPL2') +depends=('openssl') +backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') +install=vsftpd.install +source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} + 'vsftpd.xinetd' 'vsftpd.d') +sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755' + '2ddf92782f19dafc72439a2917acb1d7e124d149' + 'c87b4ce56dac15223694a6e86c01ea813b877596' + '24f268956c24e78be0c234c6d31f41487922eafe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # build-time config + sed \ + -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ + -i builddefs.h + 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" +} Deleted: extra-i686/vsftpd.d =================================================================== --- extra-i686/vsftpd.d 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-i686/vsftpd.d 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - 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 Copied: vsftpd/repos/extra-i686/vsftpd.d (from rev 146201, vsftpd/trunk/vsftpd.d) =================================================================== --- extra-i686/vsftpd.d (rev 0) +++ extra-i686/vsftpd.d 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,67 @@ +#!/bin/bash + +daemon_name=vsftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + 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 Deleted: extra-i686/vsftpd.install =================================================================== --- extra-i686/vsftpd.install 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-i686/vsftpd.install 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then - echo ">>> It appears that your current kernel has linux security" - echo ">>> capabilities built as a module. vsftpd requires this" - echo ">>> functionality to operate." - echo ">>>" - echo ">>> To activate the module, please load it now (modprobe capability)." - echo ">>> Also, you should add it to your MODULES array in rc.conf, so" - echo ">>> it will be activated automatically at boot-up." - fi -} - -post_upgrade() { - post_install $1 -} - Copied: vsftpd/repos/extra-i686/vsftpd.install (from rev 146201, vsftpd/trunk/vsftpd.install) =================================================================== --- extra-i686/vsftpd.install (rev 0) +++ extra-i686/vsftpd.install 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,17 @@ +# arg 1: the new package version +post_install() { + if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then + echo ">>> It appears that your current kernel has linux security" + echo ">>> capabilities built as a module. vsftpd requires this" + echo ">>> functionality to operate." + echo ">>>" + echo ">>> To activate the module, please load it now (modprobe capability)." + echo ">>> Also, you should add it to your MODULES array in rc.conf, so" + echo ">>> it will be activated automatically at boot-up." + fi +} + +post_upgrade() { + post_install $1 +} + Deleted: extra-i686/vsftpd.xinetd =================================================================== --- extra-i686/vsftpd.xinetd 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-i686/vsftpd.xinetd 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,10 +0,0 @@ -service ftp -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/vsftpd - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} Copied: vsftpd/repos/extra-i686/vsftpd.xinetd (from rev 146201, vsftpd/trunk/vsftpd.xinetd) =================================================================== --- extra-i686/vsftpd.xinetd (rev 0) +++ extra-i686/vsftpd.xinetd 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,10 @@ +service ftp +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/vsftpd + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-x86_64/PKGBUILD 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=vsftpd -pkgver=2.3.4 -pkgrel=2 -pkgdesc="Very Secure FTP daemon" -arch=('i686' 'x86_64') -url="https://security.appspot.com/vsftpd.html" -license=('GPL2') -depends=('openssl') -backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') -install=vsftpd.install -source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" - 'vsftpd.xinetd' 'vsftpd.d') -md5sums=('2ea5d19978710527bb7444d93b67767a' - 'b07fd4609c70063c1d6b20142910c1a6' - '60060a6c7db3b3b7baa1561a302e6923') -sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea' - 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # build-time config - sed \ - -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ - -i builddefs.h - 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" -} Copied: vsftpd/repos/extra-x86_64/PKGBUILD (from rev 146201, vsftpd/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=vsftpd +pkgver=2.3.5 +pkgrel=1 +pkgdesc="Very Secure FTP daemon" +arch=('i686' 'x86_64') +url="https://security.appspot.com/vsftpd.html" +license=('GPL2') +depends=('openssl') +backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') +install=vsftpd.install +source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} + 'vsftpd.xinetd' 'vsftpd.d') +sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755' + '2ddf92782f19dafc72439a2917acb1d7e124d149' + 'c87b4ce56dac15223694a6e86c01ea813b877596' + '24f268956c24e78be0c234c6d31f41487922eafe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # build-time config + sed \ + -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ + -i builddefs.h + 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" +} Deleted: extra-x86_64/vsftpd.d =================================================================== --- extra-x86_64/vsftpd.d 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-x86_64/vsftpd.d 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - 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 Copied: vsftpd/repos/extra-x86_64/vsftpd.d (from rev 146201, vsftpd/trunk/vsftpd.d) =================================================================== --- extra-x86_64/vsftpd.d (rev 0) +++ extra-x86_64/vsftpd.d 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,67 @@ +#!/bin/bash + +daemon_name=vsftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + 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 Deleted: extra-x86_64/vsftpd.install =================================================================== --- extra-x86_64/vsftpd.install 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-x86_64/vsftpd.install 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then - echo ">>> It appears that your current kernel has linux security" - echo ">>> capabilities built as a module. vsftpd requires this" - echo ">>> functionality to operate." - echo ">>>" - echo ">>> To activate the module, please load it now (modprobe capability)." - echo ">>> Also, you should add it to your MODULES array in rc.conf, so" - echo ">>> it will be activated automatically at boot-up." - fi -} - -post_upgrade() { - post_install $1 -} - Copied: vsftpd/repos/extra-x86_64/vsftpd.install (from rev 146201, vsftpd/trunk/vsftpd.install) =================================================================== --- extra-x86_64/vsftpd.install (rev 0) +++ extra-x86_64/vsftpd.install 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,17 @@ +# arg 1: the new package version +post_install() { + if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then + echo ">>> It appears that your current kernel has linux security" + echo ">>> capabilities built as a module. vsftpd requires this" + echo ">>> functionality to operate." + echo ">>>" + echo ">>> To activate the module, please load it now (modprobe capability)." + echo ">>> Also, you should add it to your MODULES array in rc.conf, so" + echo ">>> it will be activated automatically at boot-up." + fi +} + +post_upgrade() { + post_install $1 +} + Deleted: extra-x86_64/vsftpd.xinetd =================================================================== --- extra-x86_64/vsftpd.xinetd 2012-01-06 00:42:14 UTC (rev 146201) +++ extra-x86_64/vsftpd.xinetd 2012-01-06 00:42:46 UTC (rev 146202) @@ -1,10 +0,0 @@ -service ftp -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/vsftpd - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} Copied: vsftpd/repos/extra-x86_64/vsftpd.xinetd (from rev 146201, vsftpd/trunk/vsftpd.xinetd) =================================================================== --- extra-x86_64/vsftpd.xinetd (rev 0) +++ extra-x86_64/vsftpd.xinetd 2012-01-06 00:42:46 UTC (rev 146202) @@ -0,0 +1,10 @@ +service ftp +{ + socket_type = stream + wait = no + user = root + server = /usr/sbin/vsftpd + log_on_success += HOST DURATION + log_on_failure += HOST + disable = yes +}