Merge remote-tracking branch 'trikolon/nginx' into next

diff --git a/lfs/nginx b/lfs/nginx
index 2b7e6266d38783b26fd9510a672b11497ed64190..e2f3c4f82eabb41fd6dade7e708014b8e55389a3 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.3.11
+VER        = 1.4.4
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,11 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4d299999bca4d2cecfbe48e51684a345
-
-objects += nginx_tcp_proxy_module.tar.bz2
-nginx_tcp_proxy_module.tar.bz2 = $(DL_FROM)/nginx_tcp_proxy_module.tar.bz2
-nginx_tcp_proxy_module.tar.bz2_MD5 = f07898b5b783ef65d416019b51cb1de8
+$(DL_FILE)_MD5 = 5dfaba1cbeae9087f3949860a02caa9f
 
 install : $(TARGET)
 
@@ -97,12 +93,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-imap --with-imap_ssl_module --with-http_ssl_module \
                --with-http_stub_status_module \
                --with-http_dav_module \
-               --with-http_sub_module \
-               --add-module=nginx_tcp_proxy_module/
+               --with-http_sub_module 
        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)
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)