[arch-commits] Commit in vsftpd/trunk (4 files)

[Jonathan Steel]

    Date: Friday, March 27, 2015 @ 20:19:24
  Author: jsteel
Revision: 130050

upgpkg: vsftpd 3.0.2-5

Modified:
  vsftpd/trunk/PKGBUILD
Deleted:
  vsftpd/trunk/vsftpd.install
  vsftpd/trunk/vsftpd.logrotate
  vsftpd/trunk/vsftpd.xinetd

------------------+
 PKGBUILD         |   33 ++++++++++++++++++---------------
 vsftpd.install   |   17 -----------------
 vsftpd.logrotate |    7 -------
 vsftpd.xinetd    |   10 ----------
 4 files changed, 18 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-27 18:07:15 UTC (rev 130049)
+++ PKGBUILD	2015-03-27 19:19:24 UTC (rev 130050)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer:  Jonathan Steel <jsteel at aur.archlinux.org>
+# 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>
@@ -6,7 +6,7 @@
 
 pkgname=vsftpd
 pkgver=3.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
 url="https://security.appspot.com/vsftpd.html"
@@ -13,20 +13,18 @@
 license=('GPL2')
 depends=('libcap' 'pam')
 optdepends=('logrotate')
-backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=$pkgname.install
+backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd' "etc/logrotate.d/$pkgname")
 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)
+        $pkgname-ssl.socket $pkgname.socket $pkgname.service
+        $pkgname at .service $pkgname-ssl.service $pkgname-ssl at .service)
 md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
-         'a8b05df3cf0087ab32245aa1d22e724a' 'fcef2cd7631f73a883a3c3d479b25cb8'
-         'd05045a1244a1be9f3946578bfd0252d' '605e82df215a2f5dab1e1ee22b80460d'
-         '32c9266536204fd8c4917c682b6359f1' 'c899151c1dbec8ea9051fae4d701f0f3'
-         '987349e5c5570c762fed9e87c0b4e715' 'f6276f8b80c13308c1da5310adcf6442')
+         'fcef2cd7631f73a883a3c3d479b25cb8' 'd05045a1244a1be9f3946578bfd0252d'
+         '605e82df215a2f5dab1e1ee22b80460d' '32c9266536204fd8c4917c682b6359f1'
+         'c899151c1dbec8ea9051fae4d701f0f3' '987349e5c5570c762fed9e87c0b4e715')
+validpgpkeys=('8660FD3291B184CDBC2F6418AA62EC463C0E751C') # Chris Evans
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # build-time config
   sed \
@@ -37,14 +35,14 @@
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  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 "$srcdir"/$pkgname.xinetd "$pkgdir"/etc/xinetd.d/$pkgname
-  install -D -m644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
+  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 
@@ -54,4 +52,9 @@
   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: vsftpd.install
===================================================================
--- vsftpd.install	2015-03-27 18:07:15 UTC (rev 130049)
+++ vsftpd.install	2015-03-27 19:19:24 UTC (rev 130050)
@@ -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: vsftpd.logrotate
===================================================================
--- vsftpd.logrotate	2015-03-27 18:07:15 UTC (rev 130049)
+++ vsftpd.logrotate	2015-03-27 19:19:24 UTC (rev 130050)
@@ -1,7 +0,0 @@
-/var/log/vsftpd.log {
-  missingok
-  notifempty
-  postrotate
-    /usr/bin/killall -HUP vsftpd
-  endscript
-}

Deleted: vsftpd.xinetd
===================================================================
--- vsftpd.xinetd	2015-03-27 18:07:15 UTC (rev 130049)
+++ vsftpd.xinetd	2015-03-27 19:19:24 UTC (rev 130050)
@@ -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
-}