This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 0c265f57175644c55431490a2aa10b860eabc26d (commit) from de2ee80d4ffb0d3d6a219223d1a2e0c85e6ad8c9 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0c265f57175644c55431490a2aa10b860eabc26d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 28 10:46:21 2016 +0100
nginx: Update to 1.8.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/nginx | 2 +- config/rootfiles/packages/nginx | 1 + lfs/nginx | 23 ++++++++++++++++++----- src/paks/nginx/uninstall.sh | 1 + 4 files changed, 21 insertions(+), 6 deletions(-)
Difference in files: diff --git a/config/backup/includes/nginx b/config/backup/includes/nginx index db8e6ed..a367b8e 100644 --- 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 5ecb241..3560e45 100644 --- 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 63d3698..d27e4de 100644 --- 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 ded53f0..7c7bfe8 100644 --- 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
hooks/post-receive -- IPFire 2.x development tree