summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/001-landesk_test.patch21
-rw-r--r--debian/patches/002-build.patch37
-rw-r--r--debian/patches/005-init.patch80
-rw-r--r--debian/patches/series3
4 files changed, 81 insertions, 60 deletions
diff --git a/debian/patches/001-landesk_test.patch b/debian/patches/001-landesk_test.patch
deleted file mode 100644
index 150dce8..0000000
--- a/debian/patches/001-landesk_test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: remove ifdef TEST & endif
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2014-06-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/util/ipmild.c
-===================================================================
---- trunk.orig/util/ipmild.c 2014-05-26 14:23:52.000000000 +0200
-+++ trunk/util/ipmild.c 2014-05-26 19:07:45.000000000 +0200
-@@ -87,9 +87,9 @@
- extern FILE *fperr; /*defined in ipmicmd.c*/
- extern FILE *fpdbg; /*defined in ipmicmd.c*/
- extern ipmi_cmd_t ipmi_cmds[NCMDS];
--#ifdef TEST
-+//#ifdef TEST
- static int ipmi_fd = -1;
--#endif
-+//#endif
-
- int ipmi_open_ld(char fdebugcmd)
- {
diff --git a/debian/patches/002-build.patch b/debian/patches/002-build.patch
deleted file mode 100644
index dc1799e..0000000
--- a/debian/patches/002-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: add @INS_LIB@ to Makefiles
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2014-06-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/util/Makefile.am
-===================================================================
---- trunk.orig/util/Makefile.am 2014-03-31 16:10:19.000000000 +0200
-+++ trunk/util/Makefile.am 2014-05-26 19:11:11.998725060 +0200
-@@ -189,9 +189,9 @@
- @INS_LIB@ cp -f isensor.h ievents.h $(DESTDIR)$(extradir)
- @INS_LIB@ cp -f Makefile.sample $(DESTDIR)$(extradir)/Makefile
- @INS_LIB@ cp -f $(DEV_LIB) $(DESTDIR)$(LIBDIR)
-- if [ "x$(SHRLINK)" != "x" ]; then \
-+ @INS_LIB@ if [ "x$(SHRLINK)" != "x" ]; then \
- @INS_LIB@ cp -f $(SHR_LIB) $(DESTDIR)$(LIBDIR) ; \
-- fi
-+ @INS_LIB@ fi
-
- clean-generic:
- rm -f $(DEV_LIB) $(EXTRA_PROGRAMS) $(OLDPROGS) $(TESTPROGS) $(SHRLINK)
-Index: trunk/util/Makefile.in
-===================================================================
---- trunk.orig/util/Makefile.in 2014-03-31 16:10:24.000000000 +0200
-+++ trunk/util/Makefile.in 2014-05-26 19:11:25.698992815 +0200
-@@ -752,9 +752,9 @@
- @INS_LIB@ cp -f isensor.h ievents.h $(DESTDIR)$(extradir)
- @INS_LIB@ cp -f Makefile.sample $(DESTDIR)$(extradir)/Makefile
- @INS_LIB@ cp -f $(DEV_LIB) $(DESTDIR)$(LIBDIR)
-- if [ "x$(SHRLINK)" != "x" ]; then \
-+ @INS_LIB@ if [ "x$(SHRLINK)" != "x" ]; then \
- @INS_LIB@ cp -f $(SHR_LIB) $(DESTDIR)$(LIBDIR) ; \
-- fi
-+ @INS_LIB@ fi
-
- clean-generic:
- rm -f $(DEV_LIB) $(EXTRA_PROGRAMS) $(OLDPROGS) $(TESTPROGS) $(SHRLINK)
diff --git a/debian/patches/005-init.patch b/debian/patches/005-init.patch
new file mode 100644
index 0000000..d6131e4
--- /dev/null
+++ b/debian/patches/005-init.patch
@@ -0,0 +1,80 @@
+Description: include lsb/init-functions
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-08-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/scripts/ipmi_port.sh
+===================================================================
+--- trunk.orig/scripts/ipmi_port.sh 2014-08-09 11:00:23.096102828 +0200
++++ trunk/scripts/ipmi_port.sh 2014-08-09 11:00:40.716468044 +0200
+@@ -25,6 +25,7 @@
+ #. /etc/init.d/functions
+ #fi
+
++
+ name=ipmi_port
+ progdir=/usr/sbin
+ prog="$progdir/$name"
+@@ -46,6 +47,8 @@
+ echo $p
+ }
+
++. /lib/lsb/init-functions
++
+ start()
+ {
+ echo -n $"Starting $name: "
+Index: trunk/scripts/ipmiutil_asy
+===================================================================
+--- trunk.orig/scripts/ipmiutil_asy 2014-08-09 11:00:23.096102828 +0200
++++ trunk/scripts/ipmiutil_asy 2014-08-09 11:00:23.088102663 +0200
+@@ -37,6 +37,8 @@
+ echo $p
+ }
+
++. /lib/lsb/init-functions
++
+ start()
+ {
+ echo -n $"Starting $dname: "
+Index: trunk/scripts/ipmiutil_wdt
+===================================================================
+--- trunk.orig/scripts/ipmiutil_wdt 2014-08-09 11:00:23.096102828 +0200
++++ trunk/scripts/ipmiutil_wdt 2014-08-09 11:00:23.088102663 +0200
+@@ -33,6 +33,8 @@
+ #tmpcron=/tmp/wdtcron.$$
+ # tmpcron2=/tmp/wdtcron2.$$
+
++. /lib/lsb/init-functions
++
+ start() {
+ echo -n $"Starting $prog: "
+ echo
+@@ -137,10 +139,13 @@
+ restart)
+ restart
+ ;;
++ force-reload)
++ restart
++ ;;
+ reload)
+ restart
+ ;;
+ *)
+- echo $"Usage: $0 {start|stop|status|restart|reload}"
++ echo $"Usage: $0 {start|stop|status|restart|reload|restart}"
+ exit 1
+ esac
+Index: trunk/scripts/ipmiutil_evt
+===================================================================
+--- trunk.orig/scripts/ipmiutil_evt 2014-08-09 11:00:23.096102828 +0200
++++ trunk/scripts/ipmiutil_evt 2014-08-09 11:00:23.092102746 +0200
+@@ -40,6 +40,8 @@
+ echo $p
+ }
+
++. /lib/lsb/init-functions
++
+ start()
+ {
+ echo -n $"Starting $name: "
diff --git a/debian/patches/series b/debian/patches/series
index 5084afc..9f3fe5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
+005-init.patch
003-typo-man.patch
-001-landesk_test.patch
-002-build.patch