[arch-commits] Commit in vsftpd/repos (38 files)

Bartłomiej Piotrowski bpiotrowski at nymeria.archlinux.org
Sun May 12 01:50:20 EDT 2013


    Date: Sunday, May 12, 2013 @ 07:50:20
  Author: bpiotrowski
Revision: 90372

archrelease: copy trunk to community-i686, community-x86_64

Added:
  vsftpd/repos/community-i686/PKGBUILD
    (from rev 90371, vsftpd/trunk/PKGBUILD)
  vsftpd/repos/community-i686/vsftpd-ssl.service
    (from rev 90371, vsftpd/trunk/vsftpd-ssl.service)
  vsftpd/repos/community-i686/vsftpd-ssl.socket
    (from rev 90371, vsftpd/trunk/vsftpd-ssl.socket)
  vsftpd/repos/community-i686/vsftpd-ssl at .service
    (from rev 90371, vsftpd/trunk/vsftpd-ssl at .service)
  vsftpd/repos/community-i686/vsftpd.install
    (from rev 90371, vsftpd/trunk/vsftpd.install)
  vsftpd/repos/community-i686/vsftpd.service
    (from rev 90371, vsftpd/trunk/vsftpd.service)
  vsftpd/repos/community-i686/vsftpd.socket
    (from rev 90371, vsftpd/trunk/vsftpd.socket)
  vsftpd/repos/community-i686/vsftpd.xinetd
    (from rev 90371, vsftpd/trunk/vsftpd.xinetd)
  vsftpd/repos/community-i686/vsftpd at .service
    (from rev 90371, vsftpd/trunk/vsftpd at .service)
  vsftpd/repos/community-x86_64/PKGBUILD
    (from rev 90371, vsftpd/trunk/PKGBUILD)
  vsftpd/repos/community-x86_64/vsftpd-ssl.service
    (from rev 90371, vsftpd/trunk/vsftpd-ssl.service)
  vsftpd/repos/community-x86_64/vsftpd-ssl.socket
    (from rev 90371, vsftpd/trunk/vsftpd-ssl.socket)
  vsftpd/repos/community-x86_64/vsftpd-ssl at .service
    (from rev 90371, vsftpd/trunk/vsftpd-ssl at .service)
  vsftpd/repos/community-x86_64/vsftpd.install
    (from rev 90371, vsftpd/trunk/vsftpd.install)
  vsftpd/repos/community-x86_64/vsftpd.service
    (from rev 90371, vsftpd/trunk/vsftpd.service)
  vsftpd/repos/community-x86_64/vsftpd.socket
    (from rev 90371, vsftpd/trunk/vsftpd.socket)
  vsftpd/repos/community-x86_64/vsftpd.xinetd
    (from rev 90371, vsftpd/trunk/vsftpd.xinetd)
  vsftpd/repos/community-x86_64/vsftpd at .service
    (from rev 90371, vsftpd/trunk/vsftpd at .service)
Deleted:
  vsftpd/repos/community-i686/PKGBUILD
  vsftpd/repos/community-i686/vsftpd-ssl.service
  vsftpd/repos/community-i686/vsftpd-ssl.socket
  vsftpd/repos/community-i686/vsftpd-ssl at .service
  vsftpd/repos/community-i686/vsftpd.d
  vsftpd/repos/community-i686/vsftpd.install
  vsftpd/repos/community-i686/vsftpd.service
  vsftpd/repos/community-i686/vsftpd.socket
  vsftpd/repos/community-i686/vsftpd.xinetd
  vsftpd/repos/community-i686/vsftpd at .service
  vsftpd/repos/community-x86_64/PKGBUILD
  vsftpd/repos/community-x86_64/vsftpd-ssl.service
  vsftpd/repos/community-x86_64/vsftpd-ssl.socket
  vsftpd/repos/community-x86_64/vsftpd-ssl at .service
  vsftpd/repos/community-x86_64/vsftpd.d
  vsftpd/repos/community-x86_64/vsftpd.install
  vsftpd/repos/community-x86_64/vsftpd.service
  vsftpd/repos/community-x86_64/vsftpd.socket
  vsftpd/repos/community-x86_64/vsftpd.xinetd
  vsftpd/repos/community-x86_64/vsftpd at .service

--------------------------------------+
 /PKGBUILD                            |  114 +++++++++++++++++++++++++++++++++
 /vsftpd-ssl.service                  |   20 +++++
 /vsftpd-ssl.socket                   |   18 +++++
 /vsftpd-ssl at .service                 |   18 +++++
 /vsftpd.install                      |   34 +++++++++
 /vsftpd.service                      |   20 +++++
 /vsftpd.socket                       |   18 +++++
 /vsftpd.xinetd                       |   20 +++++
 /vsftpd at .service                     |   16 ++++
 community-i686/PKGBUILD              |   59 -----------------
 community-i686/vsftpd-ssl.service    |   10 --
 community-i686/vsftpd-ssl.socket     |    9 --
 community-i686/vsftpd-ssl at .service   |    9 --
 community-i686/vsftpd.d              |   67 -------------------
 community-i686/vsftpd.install        |   17 ----
 community-i686/vsftpd.service        |   10 --
 community-i686/vsftpd.socket         |    9 --
 community-i686/vsftpd.xinetd         |   10 --
 community-i686/vsftpd at .service       |    8 --
 community-x86_64/PKGBUILD            |   59 -----------------
 community-x86_64/vsftpd-ssl.service  |   10 --
 community-x86_64/vsftpd-ssl.socket   |    9 --
 community-x86_64/vsftpd-ssl at .service |    9 --
 community-x86_64/vsftpd.d            |   67 -------------------
 community-x86_64/vsftpd.install      |   17 ----
 community-x86_64/vsftpd.service      |   10 --
 community-x86_64/vsftpd.socket       |    9 --
 community-x86_64/vsftpd.xinetd       |   10 --
 community-x86_64/vsftpd at .service     |    8 --
 29 files changed, 278 insertions(+), 416 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/PKGBUILD	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=vsftpd
-pkgver=3.0.2
-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  vsftpd-ssl.socket  vsftpd.socket
-        vsftpd.service  vsftpd at .service vsftpd-ssl.service vsftpd-ssl at .service)
-sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0'
-          '42c6055c1418ad93340bfa3b176b60f1e5b15e0a'
-          'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe'
-          'f81dab50243f7e82dc9722ca79b2b24de0882eb2'
-          '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba'
-          'cde3528825b073d3941c263e9e63b4c298a97c47'
-          '3a040a18893a5103a1d4a22e631ee247bde8c8d3'
-          '2b0a778d7b2329a6d4c01a64ef6c7d90144cd3ab'
-          'e5bd183664008bb0cc0353d4efb2e8e92a365798')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # build-time config
-  sed \
-    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-    -i builddefs.h
-
-  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
-}
-
-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 -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
-  install -D -m644 $srcdir/vsftpd at .service $pkgdir/usr/lib/systemd/system/vsftpd at .service 
-  install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
-  install -D -m644 $srcdir/vsftpd-ssl at .service $pkgdir/usr/lib/systemd/system/vsftpd-ssl at .service
-  install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket
-  install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket
-
-  install -d -m755 $pkgdir/usr/share/empty
-}

Copied: vsftpd/repos/community-i686/PKGBUILD (from rev 90371, vsftpd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=vsftpd
+pkgver=3.0.2
+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{,.asc}
+        vsftpd.xinetd vsftpd-ssl.socket  vsftpd.socket
+        vsftpd.service  vsftpd at .service vsftpd-ssl.service vsftpd-ssl at .service)
+sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56'
+            'SKIP'
+            '5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0'
+            'd5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe'
+            '9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9'
+            '50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8'
+            'd7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c'
+            'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422'
+            '4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # build-time config
+  sed \
+    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
+    -i builddefs.h
+
+  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  install -D -m755 vsftpd $pkgdir/usr/bin/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 -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
+  install -D -m644 $srcdir/vsftpd at .service $pkgdir/usr/lib/systemd/system/vsftpd at .service 
+  install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
+  install -D -m644 $srcdir/vsftpd-ssl at .service $pkgdir/usr/lib/systemd/system/vsftpd-ssl at .service
+  install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket
+  install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket
+
+  install -d -m755 $pkgdir/usr/share/empty
+}

Deleted: community-i686/vsftpd-ssl.service
===================================================================
--- community-i686/vsftpd-ssl.service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd-ssl.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,10 +0,0 @@
-[Unit]
-Description=vsftpd daemon (legacy implicit SSL)
-
-[Service]
-ExecStart=/usr/sbin/vsftpd -oimplicit_ssl=yes
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: vsftpd/repos/community-i686/vsftpd-ssl.service (from rev 90371, vsftpd/trunk/vsftpd-ssl.service)
===================================================================
--- community-i686/vsftpd-ssl.service	                        (rev 0)
+++ community-i686/vsftpd-ssl.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,10 @@
+[Unit]
+Description=vsftpd daemon (legacy implicit SSL)
+
+[Service]
+ExecStart=/usr/bin/vsftpd -oimplicit_ssl=yes
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/vsftpd-ssl.socket
===================================================================
--- community-i686/vsftpd-ssl.socket	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd-ssl.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=990
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Copied: vsftpd/repos/community-i686/vsftpd-ssl.socket (from rev 90371, vsftpd/trunk/vsftpd-ssl.socket)
===================================================================
--- community-i686/vsftpd-ssl.socket	                        (rev 0)
+++ community-i686/vsftpd-ssl.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=990
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Deleted: community-i686/vsftpd-ssl at .service
===================================================================
--- community-i686/vsftpd-ssl at .service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd-ssl at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,9 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server (legacy implicit SSL)
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardOutput=socket
-StandardError=syslog

Copied: vsftpd/repos/community-i686/vsftpd-ssl at .service (from rev 90371, vsftpd/trunk/vsftpd-ssl at .service)
===================================================================
--- community-i686/vsftpd-ssl at .service	                        (rev 0)
+++ community-i686/vsftpd-ssl at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,9 @@
+[Unit]
+Description=vsftpd per-connection server (legacy implicit SSL)
+
+[Service]
+ExecStart=-/usr/bin/vsftpd -oimplicit_ssl=yes
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardOutput=socket
+StandardError=syslog

Deleted: community-i686/vsftpd.d
===================================================================
--- community-i686/vsftpd.d	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd.d	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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

Deleted: community-i686/vsftpd.install
===================================================================
--- community-i686/vsftpd.install	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd.install	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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/community-i686/vsftpd.install (from rev 90371, vsftpd/trunk/vsftpd.install)
===================================================================
--- community-i686/vsftpd.install	                        (rev 0)
+++ community-i686/vsftpd.install	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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: community-i686/vsftpd.service
===================================================================
--- community-i686/vsftpd.service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,10 +0,0 @@
-[Unit]
-Description=vsftpd daemon
-
-[Service]
-ExecStart=/usr/sbin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: vsftpd/repos/community-i686/vsftpd.service (from rev 90371, vsftpd/trunk/vsftpd.service)
===================================================================
--- community-i686/vsftpd.service	                        (rev 0)
+++ community-i686/vsftpd.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,10 @@
+[Unit]
+Description=vsftpd daemon
+
+[Service]
+ExecStart=/usr/bin/vsftpd
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-i686/vsftpd.socket
===================================================================
--- community-i686/vsftpd.socket	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=21
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Copied: vsftpd/repos/community-i686/vsftpd.socket (from rev 90371, vsftpd/trunk/vsftpd.socket)
===================================================================
--- community-i686/vsftpd.socket	                        (rev 0)
+++ community-i686/vsftpd.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Deleted: community-i686/vsftpd.xinetd
===================================================================
--- community-i686/vsftpd.xinetd	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd.xinetd	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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/community-i686/vsftpd.xinetd (from rev 90371, vsftpd/trunk/vsftpd.xinetd)
===================================================================
--- community-i686/vsftpd.xinetd	                        (rev 0)
+++ community-i686/vsftpd.xinetd	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,10 @@
+service ftp
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/bin/vsftpd
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}

Deleted: community-i686/vsftpd at .service
===================================================================
--- community-i686/vsftpd at .service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-i686/vsftpd at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,8 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog

Copied: vsftpd/repos/community-i686/vsftpd at .service (from rev 90371, vsftpd/trunk/vsftpd at .service)
===================================================================
--- community-i686/vsftpd at .service	                        (rev 0)
+++ community-i686/vsftpd at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,8 @@
+[Unit]
+Description=vsftpd per-connection server
+
+[Service]
+ExecStart=-/usr/bin/vsftpd
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/PKGBUILD	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: judd <jvinet at zeroflux.org>
-
-pkgname=vsftpd
-pkgver=3.0.2
-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  vsftpd-ssl.socket  vsftpd.socket
-        vsftpd.service  vsftpd at .service vsftpd-ssl.service vsftpd-ssl at .service)
-sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0'
-          '42c6055c1418ad93340bfa3b176b60f1e5b15e0a'
-          'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe'
-          'f81dab50243f7e82dc9722ca79b2b24de0882eb2'
-          '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba'
-          'cde3528825b073d3941c263e9e63b4c298a97c47'
-          '3a040a18893a5103a1d4a22e631ee247bde8c8d3'
-          '2b0a778d7b2329a6d4c01a64ef6c7d90144cd3ab'
-          'e5bd183664008bb0cc0353d4efb2e8e92a365798')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # build-time config
-  sed \
-    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-    -i builddefs.h
-
-  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
-}
-
-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 -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
-  install -D -m644 $srcdir/vsftpd at .service $pkgdir/usr/lib/systemd/system/vsftpd at .service 
-  install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
-  install -D -m644 $srcdir/vsftpd-ssl at .service $pkgdir/usr/lib/systemd/system/vsftpd-ssl at .service
-  install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket
-  install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket
-
-  install -d -m755 $pkgdir/usr/share/empty
-}

Copied: vsftpd/repos/community-x86_64/PKGBUILD (from rev 90371, vsftpd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=vsftpd
+pkgver=3.0.2
+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{,.asc}
+        vsftpd.xinetd vsftpd-ssl.socket  vsftpd.socket
+        vsftpd.service  vsftpd at .service vsftpd-ssl.service vsftpd-ssl at .service)
+sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56'
+            'SKIP'
+            '5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0'
+            'd5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe'
+            '9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9'
+            '50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8'
+            'd7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c'
+            'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422'
+            '4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84')
+
+build() {
+  cd $pkgname-$pkgver
+
+  # build-time config
+  sed \
+    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
+    -i builddefs.h
+
+  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
+}
+
+package() {
+  cd $pkgname-$pkgver
+
+  install -D -m755 vsftpd $pkgdir/usr/bin/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 -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
+  install -D -m644 $srcdir/vsftpd at .service $pkgdir/usr/lib/systemd/system/vsftpd at .service 
+  install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
+  install -D -m644 $srcdir/vsftpd-ssl at .service $pkgdir/usr/lib/systemd/system/vsftpd-ssl at .service
+  install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket
+  install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket
+
+  install -d -m755 $pkgdir/usr/share/empty
+}

Deleted: community-x86_64/vsftpd-ssl.service
===================================================================
--- community-x86_64/vsftpd-ssl.service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd-ssl.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,10 +0,0 @@
-[Unit]
-Description=vsftpd daemon (legacy implicit SSL)
-
-[Service]
-ExecStart=/usr/sbin/vsftpd -oimplicit_ssl=yes
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: vsftpd/repos/community-x86_64/vsftpd-ssl.service (from rev 90371, vsftpd/trunk/vsftpd-ssl.service)
===================================================================
--- community-x86_64/vsftpd-ssl.service	                        (rev 0)
+++ community-x86_64/vsftpd-ssl.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,10 @@
+[Unit]
+Description=vsftpd daemon (legacy implicit SSL)
+
+[Service]
+ExecStart=/usr/bin/vsftpd -oimplicit_ssl=yes
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/vsftpd-ssl.socket
===================================================================
--- community-x86_64/vsftpd-ssl.socket	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd-ssl.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=990
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Copied: vsftpd/repos/community-x86_64/vsftpd-ssl.socket (from rev 90371, vsftpd/trunk/vsftpd-ssl.socket)
===================================================================
--- community-x86_64/vsftpd-ssl.socket	                        (rev 0)
+++ community-x86_64/vsftpd-ssl.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=990
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Deleted: community-x86_64/vsftpd-ssl at .service
===================================================================
--- community-x86_64/vsftpd-ssl at .service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd-ssl at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,9 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server (legacy implicit SSL)
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardOutput=socket
-StandardError=syslog

Copied: vsftpd/repos/community-x86_64/vsftpd-ssl at .service (from rev 90371, vsftpd/trunk/vsftpd-ssl at .service)
===================================================================
--- community-x86_64/vsftpd-ssl at .service	                        (rev 0)
+++ community-x86_64/vsftpd-ssl at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,9 @@
+[Unit]
+Description=vsftpd per-connection server (legacy implicit SSL)
+
+[Service]
+ExecStart=-/usr/bin/vsftpd -oimplicit_ssl=yes
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardOutput=socket
+StandardError=syslog

Deleted: community-x86_64/vsftpd.d
===================================================================
--- community-x86_64/vsftpd.d	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd.d	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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

Deleted: community-x86_64/vsftpd.install
===================================================================
--- community-x86_64/vsftpd.install	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd.install	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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/community-x86_64/vsftpd.install (from rev 90371, vsftpd/trunk/vsftpd.install)
===================================================================
--- community-x86_64/vsftpd.install	                        (rev 0)
+++ community-x86_64/vsftpd.install	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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: community-x86_64/vsftpd.service
===================================================================
--- community-x86_64/vsftpd.service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,10 +0,0 @@
-[Unit]
-Description=vsftpd daemon
-
-[Service]
-ExecStart=/usr/sbin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: vsftpd/repos/community-x86_64/vsftpd.service (from rev 90371, vsftpd/trunk/vsftpd.service)
===================================================================
--- community-x86_64/vsftpd.service	                        (rev 0)
+++ community-x86_64/vsftpd.service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,10 @@
+[Unit]
+Description=vsftpd daemon
+
+[Service]
+ExecStart=/usr/bin/vsftpd
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/vsftpd.socket
===================================================================
--- community-x86_64/vsftpd.socket	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=21
-Accept=yes
-
-[Install]
-WantedBy=sockets.target

Copied: vsftpd/repos/community-x86_64/vsftpd.socket (from rev 90371, vsftpd/trunk/vsftpd.socket)
===================================================================
--- community-x86_64/vsftpd.socket	                        (rev 0)
+++ community-x86_64/vsftpd.socket	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=vsftpd.service
+
+[Socket]
+ListenStream=21
+Accept=yes
+
+[Install]
+WantedBy=sockets.target

Deleted: community-x86_64/vsftpd.xinetd
===================================================================
--- community-x86_64/vsftpd.xinetd	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd.xinetd	2013-05-12 05:50:20 UTC (rev 90372)
@@ -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/community-x86_64/vsftpd.xinetd (from rev 90371, vsftpd/trunk/vsftpd.xinetd)
===================================================================
--- community-x86_64/vsftpd.xinetd	                        (rev 0)
+++ community-x86_64/vsftpd.xinetd	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,10 @@
+service ftp
+{
+        socket_type             = stream
+        wait                    = no
+        user                    = root
+        server                  = /usr/bin/vsftpd
+        log_on_success  += HOST DURATION
+        log_on_failure  += HOST
+        disable                 = yes
+}

Deleted: community-x86_64/vsftpd at .service
===================================================================
--- community-x86_64/vsftpd at .service	2013-05-12 05:49:50 UTC (rev 90371)
+++ community-x86_64/vsftpd at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -1,8 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog

Copied: vsftpd/repos/community-x86_64/vsftpd at .service (from rev 90371, vsftpd/trunk/vsftpd at .service)
===================================================================
--- community-x86_64/vsftpd at .service	                        (rev 0)
+++ community-x86_64/vsftpd at .service	2013-05-12 05:50:20 UTC (rev 90372)
@@ -0,0 +1,8 @@
+[Unit]
+Description=vsftpd per-connection server
+
+[Service]
+ExecStart=-/usr/bin/vsftpd
+ExecReload=/bin/kill -HUP $MAINPID
+StandardInput=socket
+StandardError=syslog



More information about the arch-commits mailing list