From 7cfe507d6f9a57e13452dc219d0a87df0f081d74 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 16 Aug 2010 15:32:12 +0200 Subject: [PATCH] ipmiutil: Updated (1.9.3 -> 2.6.8) (see note!) Note: Also removed package .conf file because the freeipmi related tweaks made the build fail! --- monitor/ipmiutil/ipmiutil.conf | 22 --------------------- monitor/ipmiutil/ipmiutil.desc | 6 +++--- monitor/ipmiutil/no-gzip-manpages.patch | 18 +++++++++-------- monitor/ipmiutil/string_h.patch | 26 ------------------------- 4 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 monitor/ipmiutil/ipmiutil.conf delete mode 100644 monitor/ipmiutil/string_h.patch diff --git a/monitor/ipmiutil/ipmiutil.conf b/monitor/ipmiutil/ipmiutil.conf deleted file mode 100644 index a490c8d2e..000000000 --- a/monitor/ipmiutil/ipmiutil.conf +++ /dev/null @@ -1,22 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../ipmiutil/ipmiutil.conf -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# 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; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -# freeipmi support -if pkginstalled freeipmi ; then - pkgprefix -t freeipmi - var_append CPPFLAGS ' ' "-DHAVE_GNU" - var_append LDFLAGS ' ' "-lfreeipmi" - var_append LDFLAGS ' ' "-L$root$( pkgprefix libdir freeipmi )" - export CPPFLAGS LDFLAGS -fi diff --git a/monitor/ipmiutil/ipmiutil.desc b/monitor/ipmiutil/ipmiutil.desc index 0794a8125..b5c772651 100644 --- a/monitor/ipmiutil/ipmiutil.desc +++ b/monitor/ipmiutil/ipmiutil.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../ipmiutil/ipmiutil.desc -[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] Copyright (C) 2007 - 2010 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -30,7 +30,7 @@ [L] BSD [S] Stable -[V] 1.9.3 +[V] 2.6.8 [P] X -----5---9 800.000 -[D] 2737558870 ipmiutil-1.9.3.tar.gz http://dl.sourceforge.net/sourceforge/ipmiutil/ +[D] 2243415237 ipmiutil-2.6.8.tar.gz http://dl.sourceforge.net/sourceforge/ipmiutil/ diff --git a/monitor/ipmiutil/no-gzip-manpages.patch b/monitor/ipmiutil/no-gzip-manpages.patch index c2b976278..09640b062 100644 --- a/monitor/ipmiutil/no-gzip-manpages.patch +++ b/monitor/ipmiutil/no-gzip-manpages.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../ipmiutil/no-gzip-manpages.patch -# Copyright (C) 2007 The OpenSDE Project +# Copyright (C) 2007 - 2010 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,11 +14,13 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./doc/Makefile.orig 2007-04-06 22:50:32.000000000 +0200 -+++ ./doc/Makefile 2007-04-06 22:50:48.000000000 +0200 -@@ -46,5 +46,4 @@ - ${INSTALL_SCRIPT} checksel ${datato} - ${INSTALL_SCRIPT} wdt.sh ${datato} - ${INSTALL_SCRIPT} ipmi_if.sh ${datato} -- cd ${DESTDIR}${mandir}/man8; gzip -f *.8 +Description: Do not gzip all available man pages + +--- ipmiutil-2.6.8/doc/Makefile.orig 2010-08-16 14:40:23.760171932 +0200 ++++ ipmiutil-2.6.8/doc/Makefile 2010-08-16 14:40:34.076006988 +0200 +@@ -67,5 +67,4 @@ + ${INSTALL_SCRIPT} ipmi_port.sh ${initto}/ipmi_port + for f in ${sbinfls}; do \ + ${INSTALL_SCRIPT} $$f ${sbinto}; done +- cd ${manto}; gzip -f *.8 diff --git a/monitor/ipmiutil/string_h.patch b/monitor/ipmiutil/string_h.patch deleted file mode 100644 index 4205de361..000000000 --- a/monitor/ipmiutil/string_h.patch +++ /dev/null @@ -1,26 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../ipmiutil/string_h.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./util/ipmilanplus.c.orig 2007-04-06 23:26:06.000000000 +0200 -+++ ./util/ipmilanplus.c 2007-04-06 23:26:30.000000000 +0200 -@@ -8,6 +8,7 @@ - */ - #include - #include -+#include - - // #define DEBUG 1 - #ifndef HAVE_LANPLUS