summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@qadesh.matthew.ath.cx>2008-12-23 18:58:08 +0000
committerMatthew Johnson <mjj29@qadesh.matthew.ath.cx>2008-12-23 18:58:08 +0000
commit099a62644d217c57751e1b640c38837c1f2fa6da (patch)
tree80a6b96f2d7b73ac51b1fb25a39508caa0592750 /debian/patches
parent5aeb8234000964de5016a9e35ab792de737d4940 (diff)
actually, this is already applied
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/00list1
-rw-r--r--debian/patches/30_ipmi_lanplus.dpatch26
2 files changed, 0 insertions, 27 deletions
diff --git a/debian/patches/00list b/debian/patches/00list
index dfc9e30..6c4ed35 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,5 +2,4 @@
20_ipmi_isol.dpatch
20_ipmi_impi.dpatch
20_ipmi_sdr.dpatch
-30_ipmi_lanplus.dpatch
99_readme_typo.dpatch
diff --git a/debian/patches/30_ipmi_lanplus.dpatch b/debian/patches/30_ipmi_lanplus.dpatch
deleted file mode 100644
index 55b9f90..0000000
--- a/debian/patches/30_ipmi_lanplus.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_ipmi_lanplus.dpatch by "Daniel J Blueman" <daniel.blueman@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add null checking to lanplus to fix segv (Closes: #484560)
-
-@DPATCH@
-
---- ./ipmitool-1.8.8/src/plugins/lanplus/lanplus.c 2006-04-21 17:34:30.000000000 +0100
-+++ ./ipmitool-1.8.8-dan/ipmitool-1.8.8/src/plugins/lanplus/lanplus.c 2008-05-30 18:12:02.000000000 +0100
-@@ -2165,6 +2165,8 @@
-
- rsp = ipmi_lanplus_recv_sol(intf); /* Grab the next packet */
-+ if (!rsp)
-+ break;
-
- if (sol_response_acks_packet(rsp, payload))
- break;
-@@ -2456,7 +2458,7 @@
- {
- struct ipmi_rs * rsp = ipmi_lan_poll_recv(intf);
-
-- if(rsp->session.authtype != 0)
-+ if(rsp && rsp->session.authtype != 0)
- {
- ack_sol_packet(intf, rsp);