[Forensics-changes] [rkhunter] 20/23: Use $(hostname) instead of $(hostname -f) in emails (LP: 973490)

[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 56134e493cb39c6acfc53a692a737952f5168298
Author: Francois Marier <francois at debian.org>
Date:   Sun Apr 26 01:59:34 2015 +1200

    Use $(hostname) instead of $(hostname -f) in emails (LP: 973490)
---
 debian/changelog   | 1 +
 debian/cron.daily  | 2 +-
 debian/cron.weekly | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64d99d1..e76e384 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ rkhunter (1.4.2-1) unstable; urgency=medium
   * Fix blank line in package description
   * Update hash algorithm in package description
   * Remove trailing whitespace in /etc/default/rkhunter (closes: #771620)
+  * Use $(hostname) instead of $(hostname -f) in emails (LP: 973490)
 
  -- Francois Marier <francois at debian.org>  Sat, 25 Apr 2015 23:44:41 +1200
 
diff --git a/debian/cron.daily b/debian/cron.daily
old mode 100644
new mode 100755
index 7e579c1..d32ceab
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -27,7 +27,7 @@ case "$CRON_DAILY_RUN" in
         /usr/bin/nice -n $NICE $RKHUNTER --cronjob --report-warnings-only --appendlog > $OUTFILE
         if [ -s "$OUTFILE" -a -n "$REPORT_EMAIL" ]; then
           (
-            echo "Subject: [rkhunter] $(hostname -f) - Daily report"
+            echo "Subject: [rkhunter] $(hostname) - Daily report"
             echo "To: $REPORT_EMAIL"
             echo ""
             cat $OUTFILE
diff --git a/debian/cron.weekly b/debian/cron.weekly
old mode 100644
new mode 100755
index f2a3f3c..6976920
--- a/debian/cron.weekly
+++ b/debian/cron.weekly
@@ -21,7 +21,7 @@ case "$CRON_DB_UPDATE" in
                 case "$DB_UPDATE_EMAIL" in
                     [YyTt]*)
                         (
-                        echo "Subject: [rkhunter] $(hostname -f) - Weekly database update"
+                        echo "Subject: [rkhunter] $(hostname) - Weekly database update"
                         echo "To: $REPORT_EMAIL"
                         echo ""
                         $RKHUNTER --versioncheck --nocolors --appendlog
@@ -36,7 +36,7 @@ case "$CRON_DB_UPDATE" in
 
                 if [ -s "$OUTFILE" ]; then
                     (
-                    echo "Subject: [rkhunter] $(hostname -f) - Weekly rkhunter database update"
+                    echo "Subject: [rkhunter] $(hostname) - Weekly rkhunter database update"
                     echo "To: $REPORT_EMAIL"
                     echo ""
                     cat $OUTFILE

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