From 2c088f61bf4d73964e4d73f09412ec74a52e5518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 9 Aug 2014 11:42:23 +0200 Subject: changes to version 2.9.4 --- debian/README.Debian | 2 +- debian/README.source | 3 +- debian/changelog | 4 +- debian/control | 19 +++++---- debian/copyright | 68 ++++++++++++++++++++++++++--- debian/dirs | 2 +- debian/files | 1 - debian/ipmiutil.ipmi_port.init | 1 + debian/ipmiutil.ipmi_port.service | 1 + debian/ipmiutil.ipmiutil_asy.init | 1 + debian/ipmiutil.ipmiutil_asy.service | 1 + debian/ipmiutil.ipmiutil_evt.init | 1 + debian/ipmiutil.ipmiutil_evt.service | 1 + debian/ipmiutil.ipmiutil_wdt.init | 1 + debian/ipmiutil.ipmiutil_wdt.service | 1 + debian/ipmiutil.lintian-overrides | 4 -- debian/ipmiutil.substvars | 2 - debian/libipmiutil.install | 1 - debian/patches/001-landesk_test.patch | 21 --------- debian/patches/002-build.patch | 37 ---------------- debian/patches/005-init.patch | 80 +++++++++++++++++++++++++++++++++++ debian/patches/series | 3 +- debian/rules | 14 +++--- 23 files changed, 172 insertions(+), 97 deletions(-) delete mode 100644 debian/files create mode 120000 debian/ipmiutil.ipmi_port.init create mode 120000 debian/ipmiutil.ipmi_port.service create mode 120000 debian/ipmiutil.ipmiutil_asy.init create mode 120000 debian/ipmiutil.ipmiutil_asy.service create mode 120000 debian/ipmiutil.ipmiutil_evt.init create mode 120000 debian/ipmiutil.ipmiutil_evt.service create mode 120000 debian/ipmiutil.ipmiutil_wdt.init create mode 120000 debian/ipmiutil.ipmiutil_wdt.service delete mode 100644 debian/ipmiutil.lintian-overrides delete mode 100644 debian/ipmiutil.substvars delete mode 100644 debian/libipmiutil.install delete mode 100644 debian/patches/001-landesk_test.patch delete mode 100644 debian/patches/002-build.patch create mode 100644 debian/patches/005-init.patch (limited to 'debian') diff --git a/debian/README.Debian b/debian/README.Debian index c8059a4..f4058b2 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,6 +1,6 @@ ipmiutil for Debian ------------------- - Please read the README.gz for setup + Please read the README.gz for setup. -- Jörg Frings-Fürst Mon, 26 May 2014 13:11:06 +0200 diff --git a/debian/README.source b/debian/README.source index 61097fc..46283aa 100644 --- a/debian/README.source +++ b/debian/README.source @@ -2,8 +2,7 @@ ipmiutil for Debian ------------------- - configure - parameter enable-landesk=yes does not work + parameter enable-landesk=yes does not work: ipmiapi not found -- Jörg Frings-Fürst Mon, 26 May 2014 13:11:06 +0200 - diff --git a/debian/changelog b/debian/changelog index 66a5d88..5824248 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -ipmiutil (2.9.3-1) unstable; urgency=low +ipmiutil (2.9.4-1) unstable; urgency=low - * Initial release (Closes: #753881) + * Initial release (Closes: #753881). -- Jörg Frings-Fürst Mon, 26 May 2014 13:11:06 +0200 diff --git a/debian/control b/debian/control index ad0a697..4294212 100644 --- a/debian/control +++ b/debian/control @@ -2,22 +2,25 @@ Source: ipmiutil Section: utils Priority: optional Maintainer: Jörg Frings-Fürst -Build-Depends: +Build-Depends: autotools-dev, - debhelper (>= 9), + debhelper (>= 9), dh-autoreconf, dh-systemd (>= 1.5), libfreeipmi-dev (>= 1.1.5) | libopenipmi-dev (>=2.0.18), libssl-dev Standards-Version: 3.9.5 Homepage: https://sourceforge.net/projects/ipmiutil/ -#Vcs-Git: git://git.debian.org/collab-maint/ipmiutil.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/ipmiutil.git;a=summary +Vcs-Git: git://anonscm.debian.org/collab-maint/ipmiutil.git +Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/ipmiutil.git Package: ipmiutil Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: IPMI Management Utilities - ipmiutil is an easy-to-use set of IPMI server management - utilities. It can get/set sensor thresholds, automate - SEL management, do SOL console, etc. +Description: IPMI management utilities + ipmiutil performs a series of common IPMI server management + functions to allow administrators to perform management functions + without a learning curve. It can gather FRU inventory data, + SEL firmware log, sensors, watchdog, power control, health, + monitoring, and has an SOL console. It can write sensor thresholds, + FRU asset tags, and supports a full IPMI configuration save/restore. diff --git a/debian/copyright b/debian/copyright index db951cd..87740a2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,9 +7,24 @@ Copyright: 2002-2004 Service Availability(TM) Forum 1999-2006 Intel Corporation 2003 Sun Microsystems, Inc 2009-2011 Kontron America, Inc - 2014 Jörg Frings-Fürst License: BSD-3-clause +Files: debian/* +Copyright: 2014 Jörg Frings-Fürst +License: BSD-3-clause + +Files: util/AnsiTerm.* +Copyright: 2009 Robert Nelson +License: BSD-2-clause + +Files: util/md2.h +Copyright: 2003 FreeIPMI Core Team +License: GPL-2+ with OpenSSL exception + +Files: util/md5.c +Copyright: 1999-2002 Aladdin Enterprises +License: Zlib + License: BSD-3-clause All rights reserved. . @@ -36,10 +51,6 @@ License: BSD-3-clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: util/AnsiTerm.* -Copyright: 2009 Robert Nelson -License: BSD-2-clause - License: BSD-2-clause All rights reserved. . @@ -64,6 +75,49 @@ License: BSD-2-clause OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: GPL-2+ with OpenSSL exception + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, but + is provided AS IS, WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and + NON-INFRINGEMENT. See the GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + . + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. - - +License: Zlib + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/dirs b/debian/dirs index 5b14e45..9b64c52 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1 +1 @@ -usr/share/ipmiutil +#usr/share/ipmiutil diff --git a/debian/files b/debian/files deleted file mode 100644 index 793f54c..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -ipmiutil_2.9.1_amd64.deb utils optional diff --git a/debian/ipmiutil.ipmi_port.init b/debian/ipmiutil.ipmi_port.init new file mode 120000 index 0000000..2ab7329 --- /dev/null +++ b/debian/ipmiutil.ipmi_port.init @@ -0,0 +1 @@ +../scripts/ipmi_port.sh \ No newline at end of file diff --git a/debian/ipmiutil.ipmi_port.service b/debian/ipmiutil.ipmi_port.service new file mode 120000 index 0000000..f541dda --- /dev/null +++ b/debian/ipmiutil.ipmi_port.service @@ -0,0 +1 @@ +../scripts/ipmi_port.service \ No newline at end of file diff --git a/debian/ipmiutil.ipmiutil_asy.init b/debian/ipmiutil.ipmiutil_asy.init new file mode 120000 index 0000000..b710118 --- /dev/null +++ b/debian/ipmiutil.ipmiutil_asy.init @@ -0,0 +1 @@ +../scripts/ipmiutil_asy \ No newline at end of file diff --git a/debian/ipmiutil.ipmiutil_asy.service b/debian/ipmiutil.ipmiutil_asy.service new file mode 120000 index 0000000..2ffb952 --- /dev/null +++ b/debian/ipmiutil.ipmiutil_asy.service @@ -0,0 +1 @@ +../scripts/ipmiutil_asy.service \ No newline at end of file diff --git a/debian/ipmiutil.ipmiutil_evt.init b/debian/ipmiutil.ipmiutil_evt.init new file mode 120000 index 0000000..192ca21 --- /dev/null +++ b/debian/ipmiutil.ipmiutil_evt.init @@ -0,0 +1 @@ +../scripts/ipmiutil_evt \ No newline at end of file diff --git a/debian/ipmiutil.ipmiutil_evt.service b/debian/ipmiutil.ipmiutil_evt.service new file mode 120000 index 0000000..fda1c39 --- /dev/null +++ b/debian/ipmiutil.ipmiutil_evt.service @@ -0,0 +1 @@ +../scripts/ipmiutil_evt.service \ No newline at end of file diff --git a/debian/ipmiutil.ipmiutil_wdt.init b/debian/ipmiutil.ipmiutil_wdt.init new file mode 120000 index 0000000..73359a6 --- /dev/null +++ b/debian/ipmiutil.ipmiutil_wdt.init @@ -0,0 +1 @@ +../scripts/ipmiutil_wdt \ No newline at end of file diff --git a/debian/ipmiutil.ipmiutil_wdt.service b/debian/ipmiutil.ipmiutil_wdt.service new file mode 120000 index 0000000..644b77d --- /dev/null +++ b/debian/ipmiutil.ipmiutil_wdt.service @@ -0,0 +1 @@ +../scripts/ipmiutil_wdt.service \ No newline at end of file diff --git a/debian/ipmiutil.lintian-overrides b/debian/ipmiutil.lintian-overrides deleted file mode 100644 index 5667e46..0000000 --- a/debian/ipmiutil.lintian-overrides +++ /dev/null @@ -1,4 +0,0 @@ -# The only GPL code in ipmiutil is md2.h, which is excluded -# by default, so ignore unsafe link with openssl warning -ipmiutil: possible-gpl-code-linked-with-openssl - diff --git a/debian/ipmiutil.substvars b/debian/ipmiutil.substvars deleted file mode 100644 index 275a91d..0000000 --- a/debian/ipmiutil.substvars +++ /dev/null @@ -1,2 +0,0 @@ -shlibs:Depends=libc6 (>= 2.15), libssl1.0.0 (>= 1.0.0) -misc:Depends= diff --git a/debian/libipmiutil.install b/debian/libipmiutil.install deleted file mode 100644 index 87ba95c..0000000 --- a/debian/libipmiutil.install +++ /dev/null @@ -1 +0,0 @@ -#usr/lib/*/lib*.so.* 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 -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 -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 +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 diff --git a/debian/rules b/debian/rules index 44ad232..88a9b40 100755 --- a/debian/rules +++ b/debian/rules @@ -5,14 +5,6 @@ #export DH_VERBOSE=1 -# -# Hardening -# -# -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - - - %: dh $@ --with autotools-dev --with systemd @@ -29,3 +21,9 @@ override_dh_installchangelogs: override_dh_installman: dh_installman doc/iseltime.8 dh_installman + +override_dh_installinit: + dh_installinit --name=ipmi_port + dh_installinit --name=ipmiutil_asy + dh_installinit --name=ipmiutil_evt + dh_installinit --name=ipmiutil_wdt -- cgit v1.2.3