From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 544cc6c7259ca8de4dbf5686bb9b896ccfcd69c6
Date: Mon, 09 Jan 2017 15:29:06 +0000
Message-ID: <20170109152906.9F2A21078E80@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2599055967145035965=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2599055967145035965==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
Date:   Mon Jan 9 15:26:54 2017 +0000

    sarg: Update to 2.3.10
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5f1546328e2a495f3cf57232564bbc7dc474df40
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jan 9 14:57:24 2017 +0000

    lang: Add string for "Guardian"
   =20
    This is shown in the log section even when the add-on is not
    installed and was rendered as an empty field
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)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' =3D> 'Green Interface',
 'grouptype' =3D> 'Grouptype:',
 'guaranteed bandwith' =3D> 'Guaranteed bandwith',
+'guardian' =3D> 'Guardian',
 'guest ok' =3D> 'allow guests to access',
 'gui settings' =3D> 'GUI Settings',
 'gz with key' =3D> 'Only an encrypted archive can be restored on this machin=
e.',
diff --git a/lfs/sarg b/lfs/sarg
index ce309a1..0d9e821 100644
--- a/lfs/sarg
+++ b/lfs/sarg
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.3.9
+VER        =3D 2.3.10
=20
 THISAPP    =3D sarg-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D sarg
-PAK_VER    =3D 2
+PAK_VER    =3D 3
=20
 DEPS       =3D ""
=20
@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D d6e8b854950f1bebb953e0ea2ca13428
+$(DL_FILE)_MD5 =3D f3c5f9a55ffea1662f6ec88daa0c49c3
=20
 install : $(TARGET)
=20
@@ -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=3D/usr \
 		--sysconfdir=3D/etc/sarg


hooks/post-receive
--
IPFire 2.x development tree

--===============2599055967145035965==--