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 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6 (commit) via 5f1546328e2a495f3cf57232564bbc7dc474df40 (commit) from d2d13b36f49c0def85f58aea89901991dc1000b7 (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 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 9 15:26:54 2017 +0000
sarg: Update to 2.3.10
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5f1546328e2a495f3cf57232564bbc7dc474df40 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jan 9 14:57:24 2017 +0000
lang: Add string for "Guardian"
This is shown in the log section even when the add-on is not installed and was rendered as an empty field
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.en | 1 - langs/en/cgi-bin/en.pl | 1 + lfs/sarg | 10 +++++++--- 3 files changed, 8 insertions(+), 4 deletions(-)
Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 0362802..f2b6eb7 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -707,7 +707,6 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip -WARNING: untranslated string: guardian WARNING: untranslated string: guardian block a host WARNING: untranslated string: guardian block httpd brute-force WARNING: untranslated string: guardian block owncloud brute-force diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0e5b46d..a04d994 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1246,6 +1246,7 @@ 'green interface' => 'Green Interface', 'grouptype' => 'Grouptype:', 'guaranteed bandwith' => 'Guaranteed bandwith', +'guardian' => 'Guardian', 'guest ok' => 'allow guests to access', 'gui settings' => 'GUI Settings', 'gz with key' => 'Only an encrypted archive can be restored on this machine.', diff --git a/lfs/sarg b/lfs/sarg index ce309a1..0d9e821 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -24,7 +24,7 @@
include Config
-VER = 2.3.9 +VER = 2.3.10
THISAPP = sarg-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 2 +PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d6e8b854950f1bebb953e0ea2ca13428 +$(DL_FILE)_MD5 = f3c5f9a55ffea1662f6ec88daa0c49c3
install : $(TARGET)
@@ -77,6 +77,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + # Update gettext Makefile + cd $(DIR_APP) && cp -vf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in + cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/sarg
hooks/post-receive -- IPFire 2.x development tree