summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-10-24 16:59:34 +0200
committerJörg Frings-Fürst <debian@jff.email>2022-10-24 16:59:34 +0200
commita7b66c0fa9157793df9c4aaeb33b87067cfb38a5 (patch)
tree2ab920c5614cfbc9f0f9259c0d7b46d49554bd76
parent9b6379c37fccb665b167933d5e6a3365b2328c96 (diff)
parent0708fa294f7eb42a529f6f4cabc1abd73359a2b7 (diff)
Merge branch 'release/debian/3.1.8-3'debian/3.1.8-3
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0105-typo.patch2
-rw-r--r--debian/patches/0705-crontab.patch4
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 4bee817..924156c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ipmiutil (3.1.8-3) unstable; urgency=medium
+
+ * debian/patches/0705-crontab.patch: Fix overwrite binary (Closes: #1022240).
+
+ -- Jörg Frings-Fürst <debian@jff.email> Mon, 24 Oct 2022 12:39:41 +0200
+
ipmiutil (3.1.8-2) unstable; urgency=medium
* debian/patches/0700-init.patch (Closes: #1020558):
diff --git a/debian/patches/0105-typo.patch b/debian/patches/0105-typo.patch
index 178ae2d..70c9875 100644
--- a/debian/patches/0105-typo.patch
+++ b/debian/patches/0105-typo.patch
@@ -54,7 +54,7 @@ Index: trunk/lib/lanplus/lanplus.c
===================================================================
--- trunk.orig/lib/lanplus/lanplus.c
+++ trunk/lib/lanplus/lanplus.c
-@@ -3809,7 +3809,7 @@ ipmi_lanplus_open(struct ipmi_intf * int
+@@ -3819,7 +3819,7 @@ ipmi_lanplus_open(struct ipmi_intf * int
if (ipmi_get_auth_capabilities_cmd(intf, &auth_cap))
{
lprintf(LOG_INFO, "Error issuing Get Channel "
diff --git a/debian/patches/0705-crontab.patch b/debian/patches/0705-crontab.patch
index f19523e..ecf5854 100644
--- a/debian/patches/0705-crontab.patch
+++ b/debian/patches/0705-crontab.patch
@@ -1,7 +1,7 @@
Description: Prevent watchdog to send minutly emails and log entries
Author: Harry Coin <hcoin@quietfountain.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmiutil/+bug/1535408
-Last-Update: 2016-05-15
+Last-Update: 2022-10-24
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/scripts/ipmiutil_wdt
@@ -14,7 +14,7 @@ Index: trunk/scripts/ipmiutil_wdt
cat - <<%%% >$wdtcron
-* * * * * root $prog -r >/dev/null
+MAILTO=''
-+* * * * * root $prog -r > $prog.lastrun 2&>1
++* * * * * root $prog -r >/dev/null 2&>1
%%%
# make crond re-read the /etc/cron.d
$restart_cron >>$wdtlog