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

2020-07-07 Thread Evangelos Foutras via arch-commits
Date: Tuesday, July 7, 2020 @ 19:25:33
  Author: foutrelis
Revision: 660156

upgpkg: vsftpd 3.0.3-7: reproducibility rebuild

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-07 19:24:33 UTC (rev 660155)
+++ PKGBUILD2020-07-07 19:25:33 UTC (rev 660156)
@@ -6,7 +6,7 @@
 
 pkgname=vsftpd
 pkgver=3.0.3
-pkgrel=6
+pkgrel=7
 pkgdesc='Very Secure FTP daemon'
 url='https://security.appspot.com/vsftpd.html'
 arch=('x86_64')


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

2019-07-04 Thread Levente Polyak via arch-commits
Date: Thursday, July 4, 2019 @ 22:57:06
  Author: anthraxx
Revision: 487454

upgpkg: vsftpd 3.0.3-6 fix xinetd server path

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-04 22:31:03 UTC (rev 487453)
+++ PKGBUILD2019-07-04 22:57:06 UTC (rev 487454)
@@ -6,7 +6,7 @@
 
 pkgname=vsftpd
 pkgver=3.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc='Very Secure FTP daemon'
 url='https://security.appspot.com/vsftpd.html'
 arch=('x86_64')
@@ -44,6 +44,7 @@
   # build-time config
   sed -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' -i builddefs.h
   sed -e 's|/usr/share/empty|/var/empty|g' -i tunables.c vsftpd.conf.5 INSTALL
+  sed -e 's|/usr/local/sbin/vsftpd|/usr/bin/vsftpd|' -i 
EXAMPLE/INTERNET_SITE/${pkgname}.xinetd
 
   # fix linking to openssl 1.1
   sed -e 's|SSL_library_init|SSL_CTX_new|' -i vsf_findlibs.sh


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

2018-04-17 Thread Levente Polyak via arch-commits
Date: Tuesday, April 17, 2018 @ 20:31:44
  Author: anthraxx
Revision: 316780

upgpkg: vsftpd 3.0.3-4 (libnsl rebuild)

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |   90 +
 1 file changed, 50 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-17 20:03:06 UTC (rev 316779)
+++ PKGBUILD2018-04-17 20:31:44 UTC (rev 316780)
@@ -1,5 +1,5 @@
-# $Id$
-# Maintainer:  Jonathan Steel 
+# Maintainer: Levente Polyak 
+# Contributor: Jonathan Steel 
 # Contributor: Bartłomiej Piotrowski 
 # Contributor: Andreas Radke 
 # Contributor: judd 
@@ -6,58 +6,68 @@
 
 pkgname=vsftpd
 pkgver=3.0.3
-pkgrel=3
-pkgdesc="Very Secure FTP daemon"
+pkgrel=4
+pkgdesc='Very Secure FTP daemon'
+url='https://security.appspot.com/vsftpd.html'
 arch=('x86_64')
-url="https://security.appspot.com/vsftpd.html;
 license=('GPL2')
-depends=('libcap' 'pam')
+depends=('glibc' 'openssl' 'libcap' 'pam' 'libnsl')
 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@.service $pkgname-ssl.service $pkgname-ssl@.service)
-md5sums=('da119d084bd3f98664636ea05b5bb398' 'SKIP'
- 'fcef2cd7631f73a883a3c3d479b25cb8' 'd05045a1244a1be9f3946578bfd0252d'
- '605e82df215a2f5dab1e1ee22b80460d' '32c9266536204fd8c4917c682b6359f1'
- 'c899151c1dbec8ea9051fae4d701f0f3' '987349e5c5570c762fed9e87c0b4e715')
+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}@.service
+${pkgname}-ssl.service
+${pkgname}-ssl@.service)
+sha256sums=('9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7'
+'SKIP'
+'d5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe'
+'9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9'
+'0597e571718ba0f4dc4b32a4ddd148103758c48c7d65dcb8bbedafc9e810e83d'
+'d7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c'
+'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422'
+'4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84')
 validpgpkeys=('8660FD3291B184CDBC2F6418AA62EC463C0E751C') # Chris Evans
 
-build() {
-  cd $pkgname-$pkgver
-
+prepare() {
+  cd ${pkgname}-${pkgver}
   # build-time config
-  sed \
--e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
--i builddefs.h
+  sed -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' -i builddefs.h
+  sed -e 's|/usr/share/empty|/var/empty|g' -i tunables.c vsftpd.conf.5 INSTALL
 
   # fix linking to openssl 1.1
   sed -e 's|SSL_library_init|SSL_CTX_new|' -i vsf_findlibs.sh
+}
 
-  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
+build() {
+  cd ${pkgname}-${pkgver}
+  make LINK='' CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 package() {
-  cd $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 EXAMPLE/INTERNET_SITE/$pkgname.xinetd 
"$pkgdir"/etc/xinetd.d/$pkgname
-  install -D -m644 RedHat/$pkgname.log "$pkgdir"/etc/logrotate.d/$pkgname
+  install -Dm 755 ${pkgname} -t "${pkgdir}/usr/bin"
+  install -Dm 644 ${pkgname}.conf -t "${pkgdir}/etc"
+  install -Dm 644 ${pkgname}.8 -t "${pkgdir}/usr/share/man/man8"
+  install -Dm 644 ${pkgname}.conf.5 -t "${pkgdir}/usr/share/man/man5"
+  install -Dm 644 EXAMPLE/INTERNET_SITE/${pkgname}.xinetd 
"${pkgdir}/etc/xinetd.d/${pkgname}"
+  install -Dm 644 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@.service 
"$pkgdir"/usr/lib/systemd/system/$pkgname@.service 
-  install -D -m644 "$srcdir"/$pkgname-ssl.service 
"$pkgdir"/usr/lib/systemd/system/$pkgname-ssl.service
-  install -D -m644 "$srcdir"/$pkgname-ssl@.service 
"$pkgdir"/usr/lib/systemd/system/$pkgname-ssl@.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 -Dm 644 "${srcdir}"/${pkgname}.service 

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

2017-03-08 Thread Antonio Rojas
Date: Thursday, March 9, 2017 @ 07:40:53
  Author: arojas
Revision: 215362

openssl 1.1 rebuild

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-09 07:29:16 UTC (rev 215361)
+++ PKGBUILD2017-03-09 07:40:53 UTC (rev 215362)
@@ -6,7 +6,7 @@
 
 pkgname=vsftpd
 pkgver=3.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
 url="https://security.appspot.com/vsftpd.html;
@@ -31,6 +31,9 @@
 -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
 -i builddefs.h
 
+  # fix linking to openssl 1.1
+  sed -e 's|SSL_library_init|SSL_CTX_new|' -i vsf_findlibs.sh
+
   CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
 }
 


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

2016-03-03 Thread Bartłomiej Piotrowski
Date: Thursday, March 3, 2016 @ 10:38:35
  Author: bpiotrowski
Revision: 164414

OpenSSL 1.0.2g rebuild

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-03 09:38:10 UTC (rev 164413)
+++ PKGBUILD2016-03-03 09:38:35 UTC (rev 164414)
@@ -6,7 +6,7 @@
 
 pkgname=vsftpd
 pkgver=3.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Very Secure FTP daemon"
 arch=('i686' 'x86_64')
 url="https://security.appspot.com/vsftpd.html;


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

2015-07-25 Thread Jonathan Steel
Date: Saturday, July 25, 2015 @ 21:28:09
  Author: jsteel
Revision: 137410

upgpkg: vsftpd 3.0.3-1

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-25 12:52:20 UTC (rev 137409)
+++ PKGBUILD2015-07-25 19:28:09 UTC (rev 137410)
@@ -5,8 +5,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=vsftpd
-pkgver=3.0.2
-pkgrel=5
+pkgver=3.0.3
+pkgrel=1
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
 url=https://security.appspot.com/vsftpd.html;
@@ -17,7 +17,7 @@
 source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
 $pkgname-ssl.socket $pkgname.socket $pkgname.service
 $pkgname@.service $pkgname-ssl.service $pkgname-ssl@.service)
-md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
+md5sums=('da119d084bd3f98664636ea05b5bb398' 'SKIP'
  'fcef2cd7631f73a883a3c3d479b25cb8' 'd05045a1244a1be9f3946578bfd0252d'
  '605e82df215a2f5dab1e1ee22b80460d' '32c9266536204fd8c4917c682b6359f1'
  'c899151c1dbec8ea9051fae4d701f0f3' '987349e5c5570c762fed9e87c0b4e715')


[arch-commits] Commit in vsftpd/trunk (PKGBUILD vsftpd.service)

2014-05-31 Thread Jonathan Steel
Date: Saturday, May 31, 2014 @ 14:32:48
  Author: jsteel
Revision: 112313

Fix FS#40599

Modified:
  vsftpd/trunk/PKGBUILD
  vsftpd/trunk/vsftpd.service

+
 PKGBUILD   |6 +++---
 vsftpd.service |1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-31 12:27:13 UTC (rev 112312)
+++ PKGBUILD2014-05-31 12:32:48 UTC (rev 112313)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer:  Jonathan Steel jsteel at aur.archlinux.org
+# Maintainer:  Jonathan Steel jsteel at aur.archlinux.org
 # Contributor: Bartłomiej Piotrowski nos...@bpiotrowski.pl
 # Contributor: Andreas Radke andy...@archlinux.org
 # Contributor: judd jvi...@zeroflux.org
@@ -6,7 +6,7 @@
 
 pkgname=vsftpd
 pkgver=3.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
 url=https://security.appspot.com/vsftpd.html;
@@ -21,7 +21,7 @@
 $pkgname.logrotate)
 md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
  'a8b05df3cf0087ab32245aa1d22e724a' 'fcef2cd7631f73a883a3c3d479b25cb8'
- 'd05045a1244a1be9f3946578bfd0252d' 'e36f6a1fdd68e88092677c99f1cbe09b'
+ 'd05045a1244a1be9f3946578bfd0252d' '605e82df215a2f5dab1e1ee22b80460d'
  '32c9266536204fd8c4917c682b6359f1' 'c899151c1dbec8ea9051fae4d701f0f3'
  '987349e5c5570c762fed9e87c0b4e715' 'f6276f8b80c13308c1da5310adcf6442')
 

Modified: vsftpd.service
===
--- vsftpd.service  2014-05-31 12:27:13 UTC (rev 112312)
+++ vsftpd.service  2014-05-31 12:32:48 UTC (rev 112313)
@@ -1,5 +1,6 @@
 [Unit]
 Description=vsftpd daemon
+After=network.target
 
 [Service]
 ExecStart=/usr/bin/vsftpd



[arch-commits] Commit in vsftpd/trunk (PKGBUILD vsftpd.logrotate)

2014-05-11 Thread Jonathan Steel
Date: Sunday, May 11, 2014 @ 13:51:14
  Author: jsteel
Revision: 110964

Added logrotate - FS#39696

Added:
  vsftpd/trunk/vsftpd.logrotate
Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 vsftpd.logrotate |7 +++
 2 files changed, 17 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-11 11:09:38 UTC (rev 110963)
+++ PKGBUILD2014-05-11 11:51:14 UTC (rev 110964)
@@ -1,21 +1,24 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Maintainer:  Jonathan Steel jsteel at aur.archlinux.org
+# Contributor: Bartłomiej Piotrowski nos...@bpiotrowski.pl
 # Contributor: Andreas Radke andy...@archlinux.org
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=vsftpd
 pkgver=3.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
 url=https://security.appspot.com/vsftpd.html;
 license=('GPL2')
-depends=('openssl')
+depends=('libcap' 'pam')
+optdepends=('logrotate')
 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@.service vsftpd-ssl.service vsftpd-ssl@.service)
+vsftpd.service  vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service
+$pkgname.logrotate)
 sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56'
 'SKIP'
 '5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0'
@@ -24,7 +27,8 @@
 '50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8'
 'd7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c'
 'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422'
-'4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84')
+'4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84'
+'a0df9d4e3d3b83ff32a15a9e3a98d79a0549a095a4f1c508346ffa6f8e335cd8')
 
 build() {
   cd $pkgname-$pkgver
@@ -45,6 +49,7 @@
   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/$pkgname.logrotate 
$pkgdir/etc/logrotate.d/$pkgname
 
   install -D -m644 $srcdir/vsftpd.service 
$pkgdir/usr/lib/systemd/system/vsftpd.service
   install -D -m644 $srcdir/vsftpd@.service 
$pkgdir/usr/lib/systemd/system/vsftpd@.service 

Added: vsftpd.logrotate
===
--- vsftpd.logrotate(rev 0)
+++ vsftpd.logrotate2014-05-11 11:51:14 UTC (rev 110964)
@@ -0,0 +1,7 @@
+/var/log/vsftpd.log {
+  missingok
+  notifempty
+  postrotate
+/usr/bin/killall -HUP vsftpd
+  endscript
+}



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

2014-05-11 Thread Jonathan Steel
Date: Sunday, May 11, 2014 @ 15:00:43
  Author: jsteel
Revision: 110968

Quote dirs and use $pkgname for files

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |   49 ++---
 1 file changed, 22 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-11 13:00:34 UTC (rev 110967)
+++ PKGBUILD2014-05-11 13:00:43 UTC (rev 110968)
@@ -14,24 +14,19 @@
 depends=('libcap' 'pam')
 optdepends=('logrotate')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=vsftpd.install
+install=$pkgname.install
 source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc}
-vsftpd.xinetd vsftpd-ssl.socket  vsftpd.socket
-vsftpd.service  vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service
+$pkgname.xinetd $pkgname-ssl.socket $pkgname.socket $pkgname.service
+$pkgname@.service $pkgname-ssl.service $pkgname-ssl@.service
 $pkgname.logrotate)
-sha256sums=('be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56'
-'SKIP'
-'5909f9b95479429c236170a06879d27d07ddda52d9c4c5543c961500c4cac2e0'
-'d5185e48fffc6253499a55e0fe0f90a3424fc639640af11a9d38df33fb145afe'
-'9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9'
-'50c392f373f8ce37aa226a9af7a6b038a8683ee3e041ebbad1bb483e47e8a1f8'
-'d7b8e4827d4f6bafcbf52f9d2d7380958c7b08bb3f757806aa89d4bc06c9671c'
-'b88a50fc68b3bf746d13c9a777df77791cd3eac6eb7c2df655418071c2adf422'
-'4a55c2468b08d858f71bacf1f4885847bec8e548b0e92088068d9bdd3884af84'
-'a0df9d4e3d3b83ff32a15a9e3a98d79a0549a095a4f1c508346ffa6f8e335cd8')
+md5sums=('8b00c749719089401315bd3c44dddbb2' 'SKIP'
+ 'a8b05df3cf0087ab32245aa1d22e724a' 'fcef2cd7631f73a883a3c3d479b25cb8'
+ 'd05045a1244a1be9f3946578bfd0252d' 'e36f6a1fdd68e88092677c99f1cbe09b'
+ '32c9266536204fd8c4917c682b6359f1' 'c899151c1dbec8ea9051fae4d701f0f3'
+ '987349e5c5570c762fed9e87c0b4e715' 'f6276f8b80c13308c1da5310adcf6442')
 
 build() {
-  cd $pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   # build-time config
   sed \
@@ -42,21 +37,21 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $srcdir/$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 -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/vsftpd.service 
$pkgdir/usr/lib/systemd/system/vsftpd.service
-  install -D -m644 $srcdir/vsftpd@.service 
$pkgdir/usr/lib/systemd/system/vsftpd@.service 
-  install -D -m644 $srcdir/vsftpd-ssl.service 
$pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
-  install -D -m644 $srcdir/vsftpd-ssl@.service 
$pkgdir/usr/lib/systemd/system/vsftpd-ssl@.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 -m644 $srcdir/$pkgname.service 
$pkgdir/usr/lib/systemd/system/$pkgname.service
+  install -D -m644 $srcdir/$pkgname@.service 
$pkgdir/usr/lib/systemd/system/$pkgname@.service 
+  install -D -m644 $srcdir/$pkgname-ssl.service 
$pkgdir/usr/lib/systemd/system/$pkgname-ssl.service
+  install -D -m644 $srcdir/$pkgname-ssl@.service 
$pkgdir/usr/lib/systemd/system/$pkgname-ssl@.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
+  install -d -m755 $pkgdir/usr/share/empty
 }



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

2012-01-05 Thread Eric Bélanger
Date: Thursday, January 5, 2012 @ 19:42:14
  Author: eric
Revision: 146201

upgpkg: vsftpd 2.3.5-1

Upstream update

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-06 00:39:17 UTC (rev 146200)
+++ PKGBUILD2012-01-06 00:42:14 UTC (rev 146201)
@@ -3,8 +3,8 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=vsftpd
-pkgver=2.3.4
-pkgrel=2
+pkgver=2.3.5
+pkgrel=1
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
 url=https://security.appspot.com/vsftpd.html;
@@ -12,12 +12,10 @@
 depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
-source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz;
+source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
 'vsftpd.xinetd' 'vsftpd.d')
-md5sums=('2ea5d19978710527bb7444d93b67767a'
- 'b07fd4609c70063c1d6b20142910c1a6'
- '60060a6c7db3b3b7baa1561a302e6923')
-sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea'
+sha1sums=('f15b39ba6d68c953ab3c3e613e6ddc2a26493755'
+  '2ddf92782f19dafc72439a2917acb1d7e124d149'
   'c87b4ce56dac15223694a6e86c01ea813b877596'
   '24f268956c24e78be0c234c6d31f41487922eafe')
 



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

2011-07-15 Thread Dave Reisner
Date: Friday, July 15, 2011 @ 19:59:43
  Author: dreisner
Revision: 131827

upgpkg: vsftpd 2.3.4-2
rebuild for tcp_wrappers removal

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-15 23:53:48 UTC (rev 131826)
+++ PKGBUILD2011-07-15 23:59:43 UTC (rev 131827)
@@ -4,12 +4,12 @@
 
 pkgname=vsftpd
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
 url=https://security.appspot.com/vsftpd.html;
 license=('GPL2')
-depends=('tcp_wrappers' 'openssl')
+depends=('openssl')
 backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
 install=vsftpd.install
 source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz;
@@ -25,7 +25,6 @@
   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}



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

2011-07-05 Thread Andrea Scarpino
Date: Tuesday, July 5, 2011 @ 05:57:35
  Author: andrea
Revision: 130325

new url and source

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-07-05 06:30:48 UTC (rev 130324)
+++ PKGBUILD2011-07-05 09:57:35 UTC (rev 130325)
@@ -7,17 +7,19 @@
 pkgrel=1
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
-url=http://vsftpd.beasts.org/;
+url=https://security.appspot.com/vsftpd.html;
 license=('GPL2')
 depends=('tcp_wrappers' '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)
-md5sums=('2ea5d19978710527bb7444d93b67767a' 'b07fd4609c70063c1d6b20142910c1a6'\
+source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz;
+'vsftpd.xinetd' 'vsftpd.d')
+md5sums=('2ea5d19978710527bb7444d93b67767a'
+ 'b07fd4609c70063c1d6b20142910c1a6'
  '60060a6c7db3b3b7baa1561a302e6923')
-sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea' 
'c87b4ce56dac15223694a6e86c01ea813b877596'\
- '24f268956c24e78be0c234c6d31f41487922eafe')
+sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea'
+  'c87b4ce56dac15223694a6e86c01ea813b877596'
+  '24f268956c24e78be0c234c6d31f41487922eafe')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}



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

2011-02-23 Thread Eric Bélanger
Date: Thursday, February 24, 2011 @ 00:05:08
  Author: eric
Revision: 19

upgpkg: vsftpd 2.3.4-1
Upstream update, Fixed license

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |   29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-24 03:18:27 UTC (rev 18)
+++ PKGBUILD2011-02-24 05:05:08 UTC (rev 19)
@@ -3,23 +3,24 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=vsftpd
-pkgver=2.3.2
+pkgver=2.3.4
 pkgrel=1
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
-license=('GPL')
-backup=(etc/vsftpd.conf etc/xinetd.d/vsftpd)
 url=http://vsftpd.beasts.org/;
+license=('GPL2')
 depends=('tcp_wrappers' '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)
-md5sums=('bad7b117d737a738738836041edc00db'
- 'b07fd4609c70063c1d6b20142910c1a6'
+md5sums=('2ea5d19978710527bb7444d93b67767a' 'b07fd4609c70063c1d6b20142910c1a6'\
  '60060a6c7db3b3b7baa1561a302e6923')
+sha1sums=('b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea' 
'c87b4ce56dac15223694a6e86c01ea813b877596'\
+ '24f268956c24e78be0c234c6d31f41487922eafe')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   # build-time config
   sed \
 -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \
@@ -29,13 +30,13 @@
 }
 
 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
+  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
+  install -d -m755 ${pkgdir}/usr/share/empty
 }



[arch-commits] Commit in vsftpd/trunk (PKGBUILD vsftpd.d)

2011-01-09 Thread Guillaume Alaux
Date: Sunday, January 9, 2011 @ 17:08:55
  Author: guillaume
Revision: 105508

Upstream release and PKGBUILD clean-up

Modified:
  vsftpd/trunk/PKGBUILD
  vsftpd/trunk/vsftpd.d

--+
 PKGBUILD |   42 +++
 vsftpd.d |   92 +++--
 2 files changed, 78 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-09 17:55:22 UTC (rev 105507)
+++ PKGBUILD2011-01-09 22:08:55 UTC (rev 105508)
@@ -3,21 +3,20 @@
 # Contributor: judd jvi...@zeroflux.org
 
 pkgname=vsftpd
-pkgver=2.2.2
-pkgrel=3
+pkgver=2.3.2
+pkgrel=1
 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' 'openssl' 'libcap')
+depends=('tcp_wrappers' 'openssl')
 install=vsftpd.install
 source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
 vsftpd.xinetd vsftpd.d)
-md5sums=('6d6bc136af14c23f8fef6f1a51f55418'
+md5sums=('bad7b117d737a738738836041edc00db'
  'b07fd4609c70063c1d6b20142910c1a6'
- '5cf6effd8b1603fa809eadf11bd696bd')
+ '60060a6c7db3b3b7baa1561a302e6923')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -26,22 +25,17 @@
 -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
+  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
+}

Modified: vsftpd.d
===
--- vsftpd.d2011-01-09 17:55:22 UTC (rev 105507)
+++ vsftpd.d2011-01-09 22:08:55 UTC (rev 105508)
@@ -1,39 +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 
-   if [ $? -gt 0 ]; 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;

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

2010-04-01 Thread Giovanni Scafora
Date: Thursday, April 1, 2010 @ 18:50:54
  Author: giovanni
Revision: 75602

upgpkg: vsftpd 2.2.2-3
openssl-1 rebuild

Modified:
  vsftpd/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 22:46:55 UTC (rev 75601)
+++ PKGBUILD2010-04-01 22:50:54 UTC (rev 75602)
@@ -4,14 +4,14 @@
 
 pkgname=vsftpd
 pkgver=2.2.2
-pkgrel=2
+pkgrel=3
 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')
+depends=('glibc' 'pam' 'tcp_wrappers' 'openssl' 'libcap')
 install=vsftpd.install
 source=(ftp://vsftpd.beasts.org/users/cevans/vsftpd-$pkgver.tar.gz \
 vsftpd.xinetd vsftpd.d)



[arch-commits] Commit in vsftpd/trunk (PKGBUILD vsftpd.d)

2010-03-07 Thread Paul Mattal
Date: Sunday, March 7, 2010 @ 15:58:34
  Author: paul
Revision: 71596

fixed startup script to properly reflect successful start at boot per FS#17866

Modified:
  vsftpd/trunk/PKGBUILD
  vsftpd/trunk/vsftpd.d

--+
 PKGBUILD |4 ++--
 vsftpd.d |3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-07 20:31:00 UTC (rev 71595)
+++ PKGBUILD2010-03-07 20:58:34 UTC (rev 71596)
@@ -4,7 +4,7 @@
 
 pkgname=vsftpd
 pkgver=2.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc=Very Secure FTP daemon
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,7 +17,7 @@
 vsftpd.xinetd vsftpd.d)
 md5sums=('6d6bc136af14c23f8fef6f1a51f55418'
  'b07fd4609c70063c1d6b20142910c1a6'
- 'e46ed8e4c4a6e6a3de59f60b98e4f569')
+ '5cf6effd8b1603fa809eadf11bd696bd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

Modified: vsftpd.d
===
--- vsftpd.d2010-03-07 20:31:00 UTC (rev 71595)
+++ vsftpd.d2010-03-07 20:58:34 UTC (rev 71596)
@@ -9,8 +9,7 @@
stat_busy Starting vsftpd FTP Daemon
if [ -z $PID ]; then 
/usr/sbin/vsftpd 
-   PID=`pidof -o %PPID /usr/sbin/vsftpd`
-   if [ -z $PID ]; then
+   if [ $? -gt 0 ]; then
stat_fail
else
add_daemon vsftpd