upgpkg: nginx-accesskey 1.12.2-1

1 files changed, 61 insertions, 53 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 262998af5c52..fea617d01ada 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,18 +5,16 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
 
-_ngx_acc_rev=2.0.3
-
 pkgname=nginx-accesskey
 _pkgname=nginx
-pkgver=1.10.2
-pkgrel=2
+pkgver=1.12.2
+pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server, with ngx_http_accesskey_module.'
 arch=('i686' 'x86_64')
 url='http://nginx.org'
 license=('custom')
-depends=('pcre' 'zlib' 'openssl')
-makedepends=('hardening-wrapper')
+depends=('pcre' 'zlib' 'openssl' 'geoip' 'mailcap')
+makedepends=('git')
 backup=('etc/nginx/fastcgi.conf'
         'etc/nginx/fastcgi_params'
         'etc/nginx/koi-win'
@@ -29,54 +27,64 @@ backup=('etc/nginx/fastcgi.conf'
         'etc/logrotate.d/nginx')
 install=nginx.install
 source=($url/download/nginx-$pkgver.tar.gz
-        http://wiki.nginx.org/images/5/51/Nginx-accesskey-$_ngx_acc_rev.tar.gz
+        nginx-accesskey::git+https://github.com/Martchus/nginx-accesskey.git
         service
         logrotate)
-sha256sums=('1045ac4987a396e2fa5d0011daf8987b612dd2f05181b67507da68cbe7d765c2'
-            'd9e94321e78a02de16c57f3e048fd31059fd8116ed03d6de7180f435c52502b1'
-            '4ecbc33ce4bf2965996f51b0c7edb677904ba5cff9a32e93e1487a428d3a751b'
+sha256sums=('305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416'
+            'SKIP'
+            '113bb2c530afd7f81ebccb42e6fa293fd87be2d87c99a32623097c6b97157297'
             '8700222687c1848f7669faaa23708adc92d6634de156b8935b5b9a9b062ce6e9')
 
 build() {
     cd "$srcdir"
-    tar zxvf Nginx-accesskey-$_ngx_acc_rev.tar.gz
 
     cd "$srcdir"/$_pkgname-$pkgver
 
     ./configure \
-        --prefix=/etc/nginx \
-        --conf-path=/etc/nginx/nginx.conf \
-        --sbin-path=/usr/bin/nginx \
-        --pid-path=/run/nginx.pid \
-        --lock-path=/run/lock/nginx.lock \
-        --user=http \
-        --group=http \
-        --http-log-path=/var/log/nginx/access.log \
-        --error-log-path=stderr \
-        --http-client-body-temp-path=/var/lib/nginx/client-body \
-        --http-proxy-temp-path=/var/lib/nginx/proxy \
-        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
-        --http-scgi-temp-path=/var/lib/nginx/scgi \
-        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
-        --with-mail \
-        --with-mail_ssl_module \
-        --with-ipv6 \
-        --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_gunzip_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_ssl_module \
-        --with-http_v2_module \
-        --with-http_stub_status_module \
-        --with-http_addition_module \
-        --with-http_degradation_module \
-        --with-http_flv_module \
-        --with-http_mp4_module \
-        --with-http_secure_link_module \
-        --with-http_sub_module \
-        --add-module="$srcdir"/nginx-accesskey-$_ngx_acc_rev
+      --prefix=/etc/nginx \
+      --conf-path=/etc/nginx/nginx.conf \
+      --sbin-path=/usr/bin/nginx \
+      --pid-path=/run/nginx.pid \
+      --lock-path=/run/lock/nginx.lock \
+      --user=http \
+      --group=http \
+      --http-log-path=/var/log/nginx/access.log \
+      --error-log-path=stderr \
+      --http-client-body-temp-path=/var/lib/nginx/client-body \
+      --http-proxy-temp-path=/var/lib/nginx/proxy \
+      --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+      --http-scgi-temp-path=/var/lib/nginx/scgi \
+      --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+      --with-compat \
+      --with-file-aio \
+      --with-http_addition_module \
+      --with-http_auth_request_module \
+      --with-http_dav_module \
+      --with-http_degradation_module \
+      --with-http_flv_module \
+      --with-http_geoip_module \
+      --with-http_gunzip_module \
+      --with-http_gzip_static_module \
+      --with-http_mp4_module \
+      --with-http_realip_module \
+      --with-http_secure_link_module \
+      --with-http_slice_module \
+      --with-http_ssl_module \
+      --with-http_stub_status_module \
+      --with-http_sub_module \
+      --with-http_v2_module \
+      --with-mail \
+      --with-mail_ssl_module \
+      --with-pcre-jit \
+      --with-stream \
+      --with-stream_geoip_module \
+      --with-stream_realip_module \
+      --with-stream_ssl_module \
+      --with-stream_ssl_preread_module \
+      --with-threads \
+      --add-module="$srcdir"/nginx-accesskey \
+      --with-cc-opt="$CFLAGS $CPPFLAGS" \
+      --with-ld-opt="$LDFLAGS"
     make
 }
 
@@ -84,24 +92,19 @@ package() {
     cd $_pkgname-$pkgver
     make DESTDIR="$pkgdir" install
 
-    install -Dm644 contrib/vim/ftdetect/nginx.vim \
-      "$pkgdir"/usr/share/vim/vimfiles/ftdetect/nginx.vim
-    install -Dm644 contrib/vim/syntax/nginx.vim \
-      "$pkgdir"/usr/share/vim/vimfiles/syntax/nginx.vim
-    install -Dm644 contrib/vim/indent/nginx.vim \
-      "$pkgdir"/usr/share/vim/vimfiles/indent/nginx.vim
-
     sed -e 's|\<user\s\+\w\+;|user html;|g' \
         -e '44s|html|/usr/share/nginx/html|' \
         -e '54s|html|/usr/share/nginx/html|' \
         -i "$pkgdir"/etc/nginx/nginx.conf
+
     rm "$pkgdir"/etc/nginx/*.default
+    rm "$pkgdir"/etc/nginx/mime.types # in mailcap
 
     install -d "$pkgdir"/var/lib/nginx
     install -dm700 "$pkgdir"/var/lib/nginx/proxy
 
-    chmod 750 "$pkgdir"/var/log/nginx
-    chown http:log "$pkgdir"/var/log/nginx
+    chmod 755 "$pkgdir"/var/log/nginx
+    chown root:root "$pkgdir"/var/log/nginx
 
     install -d "$pkgdir"/usr/share/nginx
     mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx
@@ -113,5 +116,10 @@ package() {
 
     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
+      install -Dm644 contrib/vim/$i/nginx.vim \
+        "$pkgdir/usr/share/vim/vimfiles/$i/nginx.vim"
+    done
 }