upgpkg: 1.20.0-1

PKGBUILD

@@ -6,8 +6,8 @@
 
 pkgbase=nginx
 pkgname=(nginx nginx-src)
-pkgver=1.18.0
-pkgrel=2
+pkgver=1.20.0
+pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=(x86_64)
 url='https://nginx.org'
@@ -15,7 +15,7 @@ license=(custom)
 depends=(pcre zlib openssl geoip mailcap libxcrypt)
 makedepends=(mercurial)
 checkdepends=(perl perl-gd perl-io-socket-ssl perl-fcgi perl-cache-memcached
-              memcached ffmpeg inetutils) 
+              memcached ffmpeg) 
 backup=(etc/nginx/fastcgi.conf
         etc/nginx/fastcgi_params
         etc/nginx/koi-win
@@ -27,11 +27,11 @@ backup=(etc/nginx/fastcgi.conf
         etc/logrotate.d/nginx)
 install=nginx.install
 source=($url/download/nginx-$pkgver.tar.gz{,.asc}
-        hg+https://hg.nginx.org/nginx-tests#revision=c1d167a13c24
+        hg+https://hg.nginx.org/nginx-tests#revision=feb754918372
         service
         logrotate)
 validpgpkeys=(B0F4253373F8F6F510D42178520A9993A1C052F8) # Maxim Dounin <mdounin@mdounin.ru>
-md5sums=('b2d33d24d89b8b1f87ff5d251aa27eb8'
+md5sums=('d3d7985527d535ebcda9fc3fdbd3a974'
          'SKIP'
          'SKIP'
          'ba2e3b08ce0f0fff7cced624d0ecf7cc'
@@ -110,7 +110,7 @@ package_nginx() {
   cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 
-  sed -e 's|\<user\s\+\w\+;|user html;|g' \
+  sed -e 's|\<user\s\+\w\+;|user http;|g' \
     -e '44s|html|/usr/share/nginx/html|' \
     -e '54s|html|/usr/share/nginx/html|' \
     -i "$pkgdir"/etc/nginx/nginx.conf
@@ -136,7 +136,7 @@ package_nginx() {
   install -d "$pkgdir"/usr/share/man/man8/
   gzip -9c man/nginx.8 > "$pkgdir"/usr/share/man/man8/nginx.8.gz
 
-  for i in ftdetect indent syntax; do
+  for i in ftdetect ftplugin indent syntax; do
     install -Dm644 contrib/vim/$i/nginx.vim \
       "$pkgdir/usr/share/vim/vimfiles/$i/nginx.vim"
   done