slang: revert parallelized build

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

diff --git a/lfs/nginx b/lfs/nginx
index 19cbbc6e257047f2e03ea3a80393c1f360b016d2..f6496196c211d95dde8370d5877cc49ac77c5879 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  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,7 @@
 
 include Config
 
-VER        = 1.3.11
+VER        = 1.15.1
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG      = nginx
-PAK_VER           = 1
+PAK_VER           = 8
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d299999bca4d2cecfbe48e51684a345
+$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9
 
 install : $(TARGET)
 
@@ -75,10 +75,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && tar xvf $(DIR_SRC)/cache/nginx_tcp_proxy_module.tar.bz2 -C $(DIR_APP)  
-       cd $(DIR_APP) && patch -p1 < nginx_tcp_proxy_module/tcp.patch
        cd $(DIR_APP) && ./configure \
-               --prefix=/usr/nginx/ \
+               --prefix=/usr/share/nginx \
                --conf-path=/etc/nginx/nginx.conf \
                --sbin-path=/usr/sbin/nginx \
                --pid-path=/var/run/nginx.pid \
@@ -88,17 +86,28 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --http-fastcgi-temp-path=/var/spool/nginx/fastcgi_temp \
                --http-log-path=/var/log/nginx/access.log \
                --error-log-path=/var/log/nginx/error.log \
-               --user=http \
-               --group=http \
-               --with-imap --with-imap_ssl_module --with-http_ssl_module \
+               --user=nobody \
+               --group=nobody \
+               --with-imap \
+               --with-imap_ssl_module \
+               --with-http_ssl_module \
+               --with-http_gunzip_module \
+               --with-http_gzip_static_module \
+               --with-http_random_index_module \
+               --with-http_secure_link_module \
+               --with-http_degradation_module \
                --with-http_stub_status_module \
                --with-http_dav_module \
                --with-http_sub_module \
-               --add-module=nginx_tcp_proxy_module/
+               --with-pcre
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        mkdir -p /var/log/nginx /var/spool/nginx
        cp /usr/src/config/nginx/nginx /etc/init.d/
-#      chown http:http /var/log/nginx
-#      @rm -rf $(DIR_APP)
+
+       # Backup
+       install -v -m 644 $(DIR_SRC)/config/backup/includes/nginx \
+                /var/ipfire/backup/addons/includes/nginx
+
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)