[Forensics-changes] [rkhunter] 07/08: Fix IPCS command on non-English locales (closes: #767731)

[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 61c2190f93524eb8665928b1e25ee0a9be496b87
Author: Francois Marier <francois at debian.org>
Date:   Fri Nov 7 14:35:51 2014 +1300

    Fix IPCS command on non-English locales (closes: #767731)
---
 debian/changelog                         |  7 +++++++
 debian/patches/20_fix-ipcs-language.diff | 18 ++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 14d1b55..608280a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rkhunter (1.4.2-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix IPCS command on non-English locales (closes: #767731)
+
+ -- Francois Marier <francois at debian.org>  Fri, 07 Nov 2014 14:34:19 +1300
+
 rkhunter (1.4.2-0.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/20_fix-ipcs-language.diff b/debian/patches/20_fix-ipcs-language.diff
new file mode 100644
index 0000000..2bc9dd5
--- /dev/null
+++ b/debian/patches/20_fix-ipcs-language.diff
@@ -0,0 +1,18 @@
+Description: Force english locale for ipcs call
+Author: Francois Marier <francois at debian.org>
+Forwarded: https://sourceforge.net/p/rkhunter/patches/42/
+Last-Update: 2014-11-07
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767731
+Bug: https://sourceforge.net/p/rkhunter/bugs/130/
+
+--- a/files/rkhunter
++++ b/files/rkhunter
+@@ -13964,7 +13964,7 @@ ${FOUND_PROCS}"
+                         touch "${IPCS_TMPFILE}"
+                         FOUND=0; echo $FOUND > "${IPCS_TMPFILE}"
+ 
+-                        if [ `${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
++                        if [ `LANG=C ${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
+                                 ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
+                                         if [ $RKH_SHM_PERMS -eq 666 -a $RKH_SHM_BYTES -ge 1000000 ]; then
+                                                 FOUND=1; echo $FOUND > "${IPCS_TMPFILE}"
diff --git a/debian/patches/series b/debian/patches/series
index 59d35fd..9315ef6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 05_custom_conffile.diff
 10_fix-man.diff
 15_remove-empty-dir.diff
+20_fix-ipcs-language.diff

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