X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fnginx;h=ef13eefb466bc7a93eaa1a46d9074df3989c22cc;hb=da0b8e4fb9bf2d0d2a3e9d5c70da8eb7805d2955;hp=63d36985ca5e4a6402c5c284baf15b0536203231;hpb=15b470a79da5c3fa119920e051386421a3fa317f;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/nginx b/lfs/nginx
index 63d36985ca..ef13eefb46 100644
--- 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.6.2
+SUMMARY    = A HTTP server and IMAP/POP3 proxy server
+VER        = 1.22.1
 
 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	   = 4
+PAK_VER	   = 14
+
+DEPS       =
+
+SERVICES   = nginx
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d1b55031ae6e4bce37f8776b94d8b930
+$(DL_FILE)_BLAKE2 = 253cd4c53ed0e6d3da8ca0f0ab3b2c46f6c7222c4f6fedd05302dd05efee31869d25a33947cca3ca526899cbdfcea96754be34e15643ebd77da24175319edb46
 
 install : $(TARGET)
 
@@ -50,13 +55,13 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 dist:
 	$(PAK)
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -65,8 +70,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -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,13 +93,28 @@ $(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-mail \
+		--with-mail_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 
+		--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
 	cp /usr/src/config/nginx/nginx /etc/init.d/
+
+	# Backup
+	install -v -m 644 $(DIR_SRC)/config/backup/includes/nginx \
+		 /var/ipfire/backup/addons/includes/nginx
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)