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

Jonathan Steel jsteel at archlinux.org
Fri Mar 27 19:26:10 UTC 2015


    Date: Friday, March 27, 2015 @ 20:26:09
  Author: jsteel
Revision: 130051

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

Added:
  vsftpd/repos/community-i686/PKGBUILD
    (from rev 130050, vsftpd/trunk/PKGBUILD)
  vsftpd/repos/community-i686/vsftpd-ssl.service
    (from rev 130050, vsftpd/trunk/vsftpd-ssl.service)
  vsftpd/repos/community-i686/vsftpd-ssl.socket
    (from rev 130050, vsftpd/trunk/vsftpd-ssl.socket)
  vsftpd/repos/community-i686/vsftpd-ssl at .service
    (from rev 130050, vsftpd/trunk/vsftpd-ssl at .service)
  vsftpd/repos/community-i686/vsftpd.service
    (from rev 130050, vsftpd/trunk/vsftpd.service)
  vsftpd/repos/community-i686/vsftpd.socket
    (from rev 130050, vsftpd/trunk/vsftpd.socket)
  vsftpd/repos/community-i686/vsftpd at .service
    (from rev 130050, vsftpd/trunk/vsftpd at .service)
  vsftpd/repos/community-x86_64/PKGBUILD
    (from rev 130050, vsftpd/trunk/PKGBUILD)
  vsftpd/repos/community-x86_64/vsftpd-ssl.service
    (from rev 130050, vsftpd/trunk/vsftpd-ssl.service)
  vsftpd/repos/community-x86_64/vsftpd-ssl.socket
    (from rev 130050, vsftpd/trunk/vsftpd-ssl.socket)
  vsftpd/repos/community-x86_64/vsftpd-ssl at .service
    (from rev 130050, vsftpd/trunk/vsftpd-ssl at .service)
  vsftpd/repos/community-x86_64/vsftpd.service
    (from rev 130050, vsftpd/trunk/vsftpd.service)
  vsftpd/repos/community-x86_64/vsftpd.socket
    (from rev 130050, vsftpd/trunk/vsftpd.socket)
  vsftpd/repos/community-x86_64/vsftpd at .service
    (from rev 130050, 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.install
  vsftpd/repos/community-i686/vsftpd.logrotate
  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.install
  vsftpd/repos/community-x86_64/vsftpd.logrotate
  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                            |  120 +++++++++++++++++++++++++++++++++
 /vsftpd-ssl.service                  |   20 +++++
 /vsftpd-ssl.socket                   |   18 ++++
 /vsftpd-ssl at .service                 |   18 ++++
 /vsftpd.service                      |   22 ++++++
 /vsftpd.socket                       |   18 ++++
 /vsftpd at .service                     |   16 ++++
 community-i686/PKGBUILD              |   57 ---------------
 community-i686/vsftpd-ssl.service    |   10 --
 community-i686/vsftpd-ssl.socket     |    9 --
 community-i686/vsftpd-ssl at .service   |    9 --
 community-i686/vsftpd.install        |   17 ----
 community-i686/vsftpd.logrotate      |    7 -
 community-i686/vsftpd.service        |   11 ---
 community-i686/vsftpd.socket         |    9 --
 community-i686/vsftpd.xinetd         |   10 --
 community-i686/vsftpd at .service       |    8 --
 community-x86_64/PKGBUILD            |   57 ---------------
 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.install      |   17 ----
 community-x86_64/vsftpd.logrotate    |    7 -
 community-x86_64/vsftpd.service      |   11 ---
 community-x86_64/vsftpd.socket       |    9 --
 community-x86_64/vsftpd.xinetd       |   10 --
 community-x86_64/vsftpd at .service     |    8 --
 27 files changed, 232 insertions(+), 294 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/PKGBUILD	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer:  Jonathan Steel <jsteel at aur.archlinux.org>
-# Contributor: 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=4
-pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
-url="https://security.appspot.com/vsftpd.html"
-license=('GPL2')
-depends=('libcap' 'pam')
-optdepends=('logrotate')
-backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=$pkgname.install
-source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
-        $pkgname.xinetd $pkgname-ssl.socket $pkgname.socket $pkgname.service
-        $pkgname at .service $pkgname-ssl.service $pkgname-ssl at .service
-        $pkgname.logrotate)
-md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
-         'a8b05df3cf0087ab32245aa1d22e724a' 'fcef2cd7631f73a883a3c3d479b25cb8'
-         'd05045a1244a1be9f3946578bfd0252d' '605e82df215a2f5dab1e1ee22b80460d'
-         '32c9266536204fd8c4917c682b6359f1' 'c899151c1dbec8ea9051fae4d701f0f3'
-         '987349e5c5570c762fed9e87c0b4e715' 'f6276f8b80c13308c1da5310adcf6442')
-
-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 $pkgname "$pkgdir"/usr/bin/$pkgname
-  install -D -m644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
-  install -D -m644 $pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8
-  install -D -m644 $pkgname.conf.5 "$pkgdir"/usr/share/man/man5/$pkgname.conf.5
-  install -D -m644 "$srcdir"/$pkgname.xinetd "$pkgdir"/etc/xinetd.d/$pkgname
-  install -D -m644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
-
-  install -D -m644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
-  install -D -m644 "$srcdir"/$pkgname at .service "$pkgdir"/usr/lib/systemd/system/$pkgname at .service 
-  install -D -m644 "$srcdir"/$pkgname-ssl.service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.service
-  install -D -m644 "$srcdir"/$pkgname-ssl at .service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl at .service
-  install -D -m644 "$srcdir"/$pkgname.socket "$pkgdir"/usr/lib/systemd/system/$pkgname.socket
-  install -D -m644 "$srcdir"/$pkgname-ssl.socket "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.socket
-
-  install -d -m755 "$pkgdir"/usr/share/empty
-}

Copied: vsftpd/repos/community-i686/PKGBUILD (from rev 130050, vsftpd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-03-27 19:26:09 UTC (rev 130051)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
+# Contributor: 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=5
+pkgdesc="Very Secure FTP daemon"
+arch=('i686' 'x86_64')
+url="https://security.appspot.com/vsftpd.html"
+license=('GPL2')
+depends=('libcap' 'pam')
+optdepends=('logrotate')
+backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd' "etc/logrotate.d/$pkgname")
+source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
+        $pkgname-ssl.socket $pkgname.socket $pkgname.service
+        $pkgname at .service $pkgname-ssl.service $pkgname-ssl at .service)
+md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
+         'fcef2cd7631f73a883a3c3d479b25cb8' 'd05045a1244a1be9f3946578bfd0252d'
+         '605e82df215a2f5dab1e1ee22b80460d' '32c9266536204fd8c4917c682b6359f1'
+         'c899151c1dbec8ea9051fae4d701f0f3' '987349e5c5570c762fed9e87c0b4e715')
+validpgpkeys=('8660FD3291B184CDBC2F6418AA62EC463C0E751C') # Chris Evans
+
+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 $pkgname "$pkgdir"/usr/bin/$pkgname
+  install -D -m644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
+  install -D -m644 $pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8
+  install -D -m644 $pkgname.conf.5 "$pkgdir"/usr/share/man/man5/$pkgname.conf.5
+  install -D -m644 EXAMPLE/INTERNET_SITE/$pkgname.xinetd "$pkgdir"/etc/xinetd.d/$pkgname
+  install -D -m644 RedHat/$pkgname.log "$pkgdir"/etc/logrotate.d/$pkgname
+
+  install -D -m644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+  install -D -m644 "$srcdir"/$pkgname at .service "$pkgdir"/usr/lib/systemd/system/$pkgname at .service 
+  install -D -m644 "$srcdir"/$pkgname-ssl.service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.service
+  install -D -m644 "$srcdir"/$pkgname-ssl at .service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl at .service
+  install -D -m644 "$srcdir"/$pkgname.socket "$pkgdir"/usr/lib/systemd/system/$pkgname.socket
+  install -D -m644 "$srcdir"/$pkgname-ssl.socket "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.socket
+
+  install -d -m755 "$pkgdir"/usr/share/empty
+
+  for i in BENCHMARKS BUGS Changelog FAQ INSTALL README README.ssl REFS \
+           REWARD SPEED TODO TUNING; do
+    install -Dm644 $i "$pkgdir"/usr/share/doc/$pkgname/$i
+  done
+}

Deleted: community-i686/vsftpd-ssl.service
===================================================================
--- community-i686/vsftpd-ssl.service	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd-ssl.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,10 +0,0 @@
-[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

Copied: vsftpd/repos/community-i686/vsftpd-ssl.service (from rev 130050, vsftpd/trunk/vsftpd-ssl.service)
===================================================================
--- community-i686/vsftpd-ssl.service	                        (rev 0)
+++ community-i686/vsftpd-ssl.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd-ssl.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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 130050, vsftpd/trunk/vsftpd-ssl.socket)
===================================================================
--- community-i686/vsftpd-ssl.socket	                        (rev 0)
+++ community-i686/vsftpd-ssl.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd-ssl at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,9 +0,0 @@
-[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

Copied: vsftpd/repos/community-i686/vsftpd-ssl at .service (from rev 130050, vsftpd/trunk/vsftpd-ssl at .service)
===================================================================
--- community-i686/vsftpd-ssl at .service	                        (rev 0)
+++ community-i686/vsftpd-ssl at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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.install
===================================================================
--- community-i686/vsftpd.install	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd.install	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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
-}
-

Deleted: community-i686/vsftpd.logrotate
===================================================================
--- community-i686/vsftpd.logrotate	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd.logrotate	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,7 +0,0 @@
-/var/log/vsftpd.log {
-  missingok
-  notifempty
-  postrotate
-    /usr/bin/killall -HUP vsftpd
-  endscript
-}

Deleted: community-i686/vsftpd.service
===================================================================
--- community-i686/vsftpd.service	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,11 +0,0 @@
-[Unit]
-Description=vsftpd daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: vsftpd/repos/community-i686/vsftpd.service (from rev 130050, vsftpd/trunk/vsftpd.service)
===================================================================
--- community-i686/vsftpd.service	                        (rev 0)
+++ community-i686/vsftpd.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -0,0 +1,11 @@
+[Unit]
+Description=vsftpd daemon
+After=network.target
+
+[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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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 130050, vsftpd/trunk/vsftpd.socket)
===================================================================
--- community-i686/vsftpd.socket	                        (rev 0)
+++ community-i686/vsftpd.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd.xinetd	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,10 +0,0 @@
-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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-i686/vsftpd at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,8 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server
-
-[Service]
-ExecStart=-/usr/bin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog

Copied: vsftpd/repos/community-i686/vsftpd at .service (from rev 130050, vsftpd/trunk/vsftpd at .service)
===================================================================
--- community-i686/vsftpd at .service	                        (rev 0)
+++ community-i686/vsftpd at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/PKGBUILD	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer:  Jonathan Steel <jsteel at aur.archlinux.org>
-# Contributor: 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=4
-pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
-url="https://security.appspot.com/vsftpd.html"
-license=('GPL2')
-depends=('libcap' 'pam')
-optdepends=('logrotate')
-backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=$pkgname.install
-source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
-        $pkgname.xinetd $pkgname-ssl.socket $pkgname.socket $pkgname.service
-        $pkgname at .service $pkgname-ssl.service $pkgname-ssl at .service
-        $pkgname.logrotate)
-md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
-         'a8b05df3cf0087ab32245aa1d22e724a' 'fcef2cd7631f73a883a3c3d479b25cb8'
-         'd05045a1244a1be9f3946578bfd0252d' '605e82df215a2f5dab1e1ee22b80460d'
-         '32c9266536204fd8c4917c682b6359f1' 'c899151c1dbec8ea9051fae4d701f0f3'
-         '987349e5c5570c762fed9e87c0b4e715' 'f6276f8b80c13308c1da5310adcf6442')
-
-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 $pkgname "$pkgdir"/usr/bin/$pkgname
-  install -D -m644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
-  install -D -m644 $pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8
-  install -D -m644 $pkgname.conf.5 "$pkgdir"/usr/share/man/man5/$pkgname.conf.5
-  install -D -m644 "$srcdir"/$pkgname.xinetd "$pkgdir"/etc/xinetd.d/$pkgname
-  install -D -m644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
-
-  install -D -m644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
-  install -D -m644 "$srcdir"/$pkgname at .service "$pkgdir"/usr/lib/systemd/system/$pkgname at .service 
-  install -D -m644 "$srcdir"/$pkgname-ssl.service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.service
-  install -D -m644 "$srcdir"/$pkgname-ssl at .service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl at .service
-  install -D -m644 "$srcdir"/$pkgname.socket "$pkgdir"/usr/lib/systemd/system/$pkgname.socket
-  install -D -m644 "$srcdir"/$pkgname-ssl.socket "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.socket
-
-  install -d -m755 "$pkgdir"/usr/share/empty
-}

Copied: vsftpd/repos/community-x86_64/PKGBUILD (from rev 130050, vsftpd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-03-27 19:26:09 UTC (rev 130051)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
+# Contributor: 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=5
+pkgdesc="Very Secure FTP daemon"
+arch=('i686' 'x86_64')
+url="https://security.appspot.com/vsftpd.html"
+license=('GPL2')
+depends=('libcap' 'pam')
+optdepends=('logrotate')
+backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd' "etc/logrotate.d/$pkgname")
+source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
+        $pkgname-ssl.socket $pkgname.socket $pkgname.service
+        $pkgname at .service $pkgname-ssl.service $pkgname-ssl at .service)
+md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
+         'fcef2cd7631f73a883a3c3d479b25cb8' 'd05045a1244a1be9f3946578bfd0252d'
+         '605e82df215a2f5dab1e1ee22b80460d' '32c9266536204fd8c4917c682b6359f1'
+         'c899151c1dbec8ea9051fae4d701f0f3' '987349e5c5570c762fed9e87c0b4e715')
+validpgpkeys=('8660FD3291B184CDBC2F6418AA62EC463C0E751C') # Chris Evans
+
+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 $pkgname "$pkgdir"/usr/bin/$pkgname
+  install -D -m644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
+  install -D -m644 $pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8
+  install -D -m644 $pkgname.conf.5 "$pkgdir"/usr/share/man/man5/$pkgname.conf.5
+  install -D -m644 EXAMPLE/INTERNET_SITE/$pkgname.xinetd "$pkgdir"/etc/xinetd.d/$pkgname
+  install -D -m644 RedHat/$pkgname.log "$pkgdir"/etc/logrotate.d/$pkgname
+
+  install -D -m644 "$srcdir"/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+  install -D -m644 "$srcdir"/$pkgname at .service "$pkgdir"/usr/lib/systemd/system/$pkgname at .service 
+  install -D -m644 "$srcdir"/$pkgname-ssl.service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.service
+  install -D -m644 "$srcdir"/$pkgname-ssl at .service "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl at .service
+  install -D -m644 "$srcdir"/$pkgname.socket "$pkgdir"/usr/lib/systemd/system/$pkgname.socket
+  install -D -m644 "$srcdir"/$pkgname-ssl.socket "$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.socket
+
+  install -d -m755 "$pkgdir"/usr/share/empty
+
+  for i in BENCHMARKS BUGS Changelog FAQ INSTALL README README.ssl REFS \
+           REWARD SPEED TODO TUNING; do
+    install -Dm644 $i "$pkgdir"/usr/share/doc/$pkgname/$i
+  done
+}

Deleted: community-x86_64/vsftpd-ssl.service
===================================================================
--- community-x86_64/vsftpd-ssl.service	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd-ssl.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,10 +0,0 @@
-[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

Copied: vsftpd/repos/community-x86_64/vsftpd-ssl.service (from rev 130050, vsftpd/trunk/vsftpd-ssl.service)
===================================================================
--- community-x86_64/vsftpd-ssl.service	                        (rev 0)
+++ community-x86_64/vsftpd-ssl.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd-ssl.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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 130050, vsftpd/trunk/vsftpd-ssl.socket)
===================================================================
--- community-x86_64/vsftpd-ssl.socket	                        (rev 0)
+++ community-x86_64/vsftpd-ssl.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd-ssl at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,9 +0,0 @@
-[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

Copied: vsftpd/repos/community-x86_64/vsftpd-ssl at .service (from rev 130050, vsftpd/trunk/vsftpd-ssl at .service)
===================================================================
--- community-x86_64/vsftpd-ssl at .service	                        (rev 0)
+++ community-x86_64/vsftpd-ssl at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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.install
===================================================================
--- community-x86_64/vsftpd.install	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd.install	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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
-}
-

Deleted: community-x86_64/vsftpd.logrotate
===================================================================
--- community-x86_64/vsftpd.logrotate	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd.logrotate	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,7 +0,0 @@
-/var/log/vsftpd.log {
-  missingok
-  notifempty
-  postrotate
-    /usr/bin/killall -HUP vsftpd
-  endscript
-}

Deleted: community-x86_64/vsftpd.service
===================================================================
--- community-x86_64/vsftpd.service	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,11 +0,0 @@
-[Unit]
-Description=vsftpd daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target

Copied: vsftpd/repos/community-x86_64/vsftpd.service (from rev 130050, vsftpd/trunk/vsftpd.service)
===================================================================
--- community-x86_64/vsftpd.service	                        (rev 0)
+++ community-x86_64/vsftpd.service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -0,0 +1,11 @@
+[Unit]
+Description=vsftpd daemon
+After=network.target
+
+[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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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 130050, vsftpd/trunk/vsftpd.socket)
===================================================================
--- community-x86_64/vsftpd.socket	                        (rev 0)
+++ community-x86_64/vsftpd.socket	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd.xinetd	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,10 +0,0 @@
-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	2015-03-27 19:19:24 UTC (rev 130050)
+++ community-x86_64/vsftpd at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -1,8 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server
-
-[Service]
-ExecStart=-/usr/bin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog

Copied: vsftpd/repos/community-x86_64/vsftpd at .service (from rev 130050, vsftpd/trunk/vsftpd at .service)
===================================================================
--- community-x86_64/vsftpd at .service	                        (rev 0)
+++ community-x86_64/vsftpd at .service	2015-03-27 19:26:09 UTC (rev 130051)
@@ -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