[Forensics-changes] [rkhunter] 02/02: Fix updates under a non-English locale (closes: #791486)

[Francois Marier]

This is an automated email from the git hooks/post-receive script.

francois pushed a commit to branch master
in repository rkhunter.

commit 11aa2ce95ea6bee345d7cba61fe8a600a9c839f6
Author: Francois Marier <francois at debian.org>
Date:   Fri Aug 21 23:23:42 2015 -0700

    Fix updates under a non-English locale (closes: #791486)
---
 debian/changelog                            |  3 +++
 debian/patches/30_fix-lang-update-grep.diff | 16 ++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 163662a..1304ca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ rkhunter (1.4.2-4) unstable; urgency=medium
   [ Gavin Porter ]
   * Remove full path from maintainer script
 
+  [ Francois Marier ]
+  * Fix updates under a non-English locale (closes: #791486)
+
  -- Francois Marier <francois at debian.org>  Fri, 21 Aug 2015 23:13:23 -0700
 
 rkhunter (1.4.2-3) unstable; urgency=medium
diff --git a/debian/patches/30_fix-lang-update-grep.diff b/debian/patches/30_fix-lang-update-grep.diff
new file mode 100644
index 0000000..a6f9720
--- /dev/null
+++ b/debian/patches/30_fix-lang-update-grep.diff
@@ -0,0 +1,16 @@
+Description: Fix for grepping binary files during updates
+Author: Craig Small <csmall at debian.org>
+Forwarded: no
+Last-Update: 2015-08-21
+
+--- a/files/rkhunter
++++ b/files/rkhunter
+@@ -7416,7 +7416,7 @@ do_i18n_update() {
+ 			fi
+ 
+ 			if [ -s "${DB_PATH}/i18n/${LANGFILE}" ]; then
+-				PROG_VERS=`grep ${GREP_OPT} '^[Vv]ersion:[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' "${DB_PATH}/i18n/${LANGFILE}" 2>/dev/null | tail ${TAIL_OPT}1 | cut -d: -f2`
++				PROG_VERS=`grep ${GREP_OPT} -a '^[Vv]ersion:[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' "${DB_PATH}/i18n/${LANGFILE}" 2>/dev/null | tail ${TAIL_OPT}1 | cut -d: -f2`
+ 
+ 				if [ -z "${PROG_VERS}" ]; then
+ 					PROG_VERS=0
diff --git a/debian/patches/series b/debian/patches/series
index 9315ef6..dfc7957 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 10_fix-man.diff
 15_remove-empty-dir.diff
 20_fix-ipcs-language.diff
+30_fix-lang-update-grep.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/rkhunter.git