Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / lfs / nginx

diff --git a/lfs/nginx b/lfs/nginx
index 0fa6250f388312e0476b65aada795cb923147119..727d414ef11f45700ead9be6c464a160ca3c15f0 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-14  IPFire Team  <info@ipfire.org>                       #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,8 @@
 
 include Config
 
-VER        = 1.13.7
+SUMMARY    = A HTTP server and IMAP/POP3 proxy server
+VER        = 1.19.2
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +33,11 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG      = nginx
-PAK_VER           = 7
+PAK_VER           = 11
+
+DEPS       =
+
+SERVICES   = nginx
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d
+$(DL_FILE)_MD5 = 3dc55f6451ed6f819f1c796f4e5e9617
 
 install : $(TARGET)
 
@@ -76,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure \
-               --prefix=/usr/share/nginx/ \
+               --prefix=/usr/share/nginx \
                --conf-path=/etc/nginx/nginx.conf \
                --sbin-path=/usr/sbin/nginx \
                --pid-path=/var/run/nginx.pid \
@@ -88,8 +93,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --error-log-path=/var/log/nginx/error.log \
                --user=nobody \
                --group=nobody \
-               --with-imap \
-               --with-imap_ssl_module \
+               --with-mail \
+               --with-mail_ssl_module \
                --with-http_ssl_module \
                --with-http_gunzip_module \
                --with-http_gzip_static_module \
@@ -99,7 +104,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-http_stub_status_module \
                --with-http_dav_module \
                --with-http_sub_module \
+               --with-http_v2_module \
                --with-pcre
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        mkdir -p /var/log/nginx /var/spool/nginx