nginx: Update to 1.8.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/backup/includes/nginx b/config/backup/includes/nginx
index db8e6ed4dc961ced93345c591deaa5aa14d603b3..a367b8ef6d01a5755e87c11d545bf45cca057288 100644 (file)
--- a/config/backup/includes/nginx
+++ b/config/backup/includes/nginx
@@ -1 +1 @@
-/etc/nginx/nginx.conf
+/etc/nginx

diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx
index 5ecb241552c056e3042b3d25ff7b7b8a47f8d8ad..3560e45b92c040d964c9f78c831d2c6ae3f3193d 100644 (file)
--- a/config/rootfiles/packages/nginx
+++ b/config/rootfiles/packages/nginx
@@ -20,5 +20,6 @@ usr/share/nginx
 usr/share/nginx/html
 usr/share/nginx/html/50x.html
 usr/share/nginx/html/index.html
+var/ipfire/backup/addons/includes/nginx
 var/log/nginx
 var/spool/nginx

diff --git a/lfs/nginx b/lfs/nginx
index 63d36985ca5e4a6402c5c284baf15b0536203231..d27e4de2d32d8bee9ce96c58931d94381dadbeb3 100644 (file)
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.2
+VER        = 1.8.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           = 4
+PAK_VER           = 5
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d1b55031ae6e4bce37f8776b94d8b930
+$(DL_FILE)_MD5 = 2e91695074dbdfbf1bcec0ada9fda462
 
 install : $(TARGET)
 
@@ -88,13 +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 
+               --with-http_sub_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)

diff --git a/src/paks/nginx/uninstall.sh b/src/paks/nginx/uninstall.sh
index ded53f042176bcf0eaf99f7c40c874d37e046045..7c7bfe8b8c8c9969f0c08be43ba12ed31f06f1fb 100644 (file)
--- a/src/paks/nginx/uninstall.sh
+++ b/src/paks/nginx/uninstall.sh
@@ -23,6 +23,7 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+extract_backup_includes
 make_backup ${NAME}
 remove_files