X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnginx;h=14b5ca4b3b061eeeccd13c03f85688e6f6d29a34;hb=d5e830fd7e84ccce37eb92d1b3d5acf11396f7a4;hp=2b7e6266d38783b26fd9510a672b11497ed64190;hpb=c1b27582428b8f181a40f1e36a095e23d753422d;p=ipfire-2.x.git

diff --git a/lfs/nginx b/lfs/nginx
index 2b7e6266d3..14b5ca4b3b 100644
--- 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-14  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.13.7
 
 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	   = 6
 
 ###############################################################################
 # Top-level Rules
@@ -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 = 5fcd056b40cb5c47b053fb14a2a89e7d
 
 install : $(TARGET)
 
@@ -79,8 +75,6 @@ $(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/share/nginx/ \
 		--conf-path=/etc/nginx/nginx.conf \
@@ -94,15 +88,26 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--error-log-path=/var/log/nginx/error.log \
 		--user=nobody \
 		--group=nobody \
-		--with-imap --with-imap_ssl_module --with-http_ssl_module \
+		--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)