diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 18 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 133 | ||||
| -rw-r--r-- | debian/files | 1 | ||||
| -rw-r--r-- | debian/ipmiutil.lintian-overrides | 3 | ||||
| -rw-r--r-- | debian/lrc.config | 1 | ||||
| -rw-r--r-- | debian/patches/0105-typo.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0110-fix_malformed_messages.patch | 66 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 3 |
10 files changed, 159 insertions, 75 deletions
diff --git a/debian/changelog b/debian/changelog index fd5f16b..6bf33a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +ipmiutil (3.2.1-1) unstable; urgency=medium + + * New upstream release. + - Refresh patches: + + debian/patches/0105-typo.patch + * Remove old patches: + - debian/patches/0110-fix_malformed_messages.patch + * Declare compliance with Debian Policy 4.7.2 (No changes needed). + * debian/copyright: + - Add year 2025 to myself. + - Rewrite to make lrc happy. + - Add Upstream-Contact. + * debian/control: + - Change Vcs-Git from git: to https:. + * New debian/ipmiutil.lintian-overrides to override lintian warning. + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 16 Mar 2025 14:16:05 +0100 + ipmiutil (3.1.9-3) unstable; urgency=medium * debian/control: diff --git a/debian/control b/debian/control index cb37133..42d81e1 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,10 @@ Build-Depends: libssl-dev, libtool-bin, openssl -Standards-Version: 4.6.2.0 +Standards-Version: 4.7.2 Rules-Requires-Root: no Homepage: https://sourceforge.net/projects/ipmiutil/ -Vcs-Git: git://git.jff.email/ipmiutil.git +Vcs-Git: https://git.jff.email/cgit/ipmiutil.git Vcs-Browser: https://git.jff.email/cgit/ipmiutil.git Package: ipmiutil diff --git a/debian/copyright b/debian/copyright index d82e408..6f3e1c9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ipmiutil +Upstream-Contact: Andy Cress <arcress@users.sourceforge.net> Source: https://sourceforge.net/projects/ipmiutil/ Files: * @@ -10,8 +11,28 @@ Copyright: 2002-2004 Service Availability(TM) Forum 2010-2017 Andy Cress <arcress@users.sourceforge.net> License: BSD-3-clause +Files: aclocal.m4 +Copyright: 1996-2009 Free Software Foundation, Inc. +License: (FSFULLR and/or GPL-2+) with Libtool exception + +Files: configure +Copyright: 1992-2008 Free Software Foundation, Inc. +License: FSFUL + +Files: install-sh +Copyright: 1994 X Consortium. +License: X11 + +Files: ltmain.sh +Copyright: 1996-2008 Free Software Foundation, Inc. +License: GPL-2+ with Libtool exception + +Files: test/Makefile +Copyright: 1999-2007 Intel Corporation +License: GPL-2+ + Files: debian/* -Copyright: 2014-2023 Jörg Frings-Fürst <debian@jff.email> +Copyright: 2014-2025 Jörg Frings-Fürst <debian@jff.email> License: BSD-3-clause Files: kern/bmcpanic-2.4.* @@ -29,12 +50,16 @@ Copyright: 2002 MontaVista Software Inc. License: GPL-2+ Files: util/AnsiTerm.* -Copyright: 2009 Robert Nelson <robertnelson@users.sourceforge.net> +Copyright: 2009 Robert Nelson <robertnelson@users.sourceforge.net> +License: BSD-2-clause + +Files: util/iseltime.c +Copyright: 2013 Andy Cress License: BSD-2-clause Files: util/md2.h -Copyright: 2003 FreeIPMI Core Team -License: GPL-2+ with OpenSSL exception +Copyright: 2003 FreeIPMI Core Team +License: BSD-4-clause and/or GPL-2+ Files: util/md5.c Copyright: 1999-2002 Aladdin Enterprises @@ -329,3 +354,103 @@ License: Zlib 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. + +License: (FSFULLR and/or GPL-2+) with Libtool exception + GNU Libtool 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. + . + As a special exception to the GNU General Public License, + if you distribute this file as part of a program or library that + is built using GNU Libtool, you may include this file under the + same distribution terms that you use for the rest of that program. + . + GNU Libtool is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with GNU Libtool; see the file COPYING. If not, a copy + can be downloaded from http://www.gnu.org/licenses/gpl.html, or + obtained by writing to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +License: FSFUL + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + +License: gpl-2+ with libtool exception + GNU Libtool 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. + . + As a special exception to the GNU General Public License, + if you distribute this file as part of a program or library that + is built using GNU Libtool, you may include this file under the + same distribution terms that you use for the rest of that program. + . + GNU Libtool is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with GNU Libtool; see the file COPYING. If not, a copy + can be downloaded from http://www.gnu.org/licenses/gpl.html, + or obtained by writing to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +License: bsd-4-clause and/or gpl-2+ + 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, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + . + 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. diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..acc6f2f --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +ipmiutil_3.2.1-1_source.buildinfo utils optional diff --git a/debian/ipmiutil.lintian-overrides b/debian/ipmiutil.lintian-overrides new file mode 100644 index 0000000..d135ea9 --- /dev/null +++ b/debian/ipmiutil.lintian-overrides @@ -0,0 +1,3 @@ +missing-systemd-timer-for-cron-script [etc/cron.daily/ipmiutil] +old-fsf-address-in-copyright-file +space-in-std-shortname-in-dep5-copyright bsd-4-clause and/or gpl-2+ [debian/copyright:428] diff --git a/debian/lrc.config b/debian/lrc.config new file mode 100644 index 0000000..31a467f --- /dev/null +++ b/debian/lrc.config @@ -0,0 +1 @@ +kern/ipmi_kcs.patch diff --git a/debian/patches/0105-typo.patch b/debian/patches/0105-typo.patch index d3934a9..9c7d387 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 -@@ -3819,7 +3819,7 @@ ipmi_lanplus_open(struct ipmi_intf * int +@@ -3822,7 +3822,7 @@ ipmi_lanplus_open(struct ipmi_intf * int if (ipmi_get_auth_capabilities_cmd(intf, &auth_cap)) { lprintf(LOG_INFO, "Error issuing Get Channel " @@ -105,7 +105,7 @@ Index: trunk/util/oem_dell.c =================================================================== --- trunk.orig/util/oem_dell.c +++ trunk/util/oem_dell.c -@@ -5642,7 +5642,7 @@ char * get_dell_evt_desc(uchar *sel_rec, +@@ -5651,7 +5651,7 @@ char * get_dell_evt_desc(uchar *sel_rec, if(code == 0x10) { if((data1 & 0x0f) == 0x03) { diff --git a/debian/patches/0110-fix_malformed_messages.patch b/debian/patches/0110-fix_malformed_messages.patch deleted file mode 100644 index d9c744a..0000000 --- a/debian/patches/0110-fix_malformed_messages.patch +++ /dev/null @@ -1,66 +0,0 @@ -Description: do not abort if sensor command fails -Origin: upstream -Bug: https://github.com/arcress0/ipmiutil/issues/17 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040349 -Forwarded: no -Last-Update: 2023-07-09 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/util/isensor.c -=================================================================== ---- trunk.orig/util/isensor.c -+++ trunk/util/isensor.c -@@ -1332,13 +1332,14 @@ int GetSDR(int r_id, int *r_next, uchar - if (sresp < (thislen+2)) { - /* There are some SDRs that may report the wrong length, and - * return less bytes than they reported, so just truncate. */ -+ fprintf(stderr,"SDR record %x is malformed, length %d is less than minimum %d\n",r_id,sresp,thislen+2); - if (fdebug) printf("sdr[%x] off=%d, expected %d, got %d\n", - r_id,off,thislen+2,sresp); - if (sresp >= 2) thislen = sresp - 2; - else thislen = 0; - reclen = off + thislen; /* truncate, stop reading */ -- fprintf(stderr,"SDR record %x is malformed, length %d is less than minimum %d\n",r_id,sresp,thislen+2); -- rc = ERR_SDR_MALFORMED; -+ /* auto-corrected, so not a fatal error */ -+ // rc = ERR_SDR_MALFORMED; - } - /* successful */ - memcpy(&resp[off],&respchunk[2],thislen); -Index: trunk/doc/ipmiutil.spec -=================================================================== ---- trunk.orig/doc/ipmiutil.spec -+++ trunk/doc/ipmiutil.spec -@@ -210,6 +210,10 @@ rm -rf %{buildroot} - vardir=%{_var}/lib/%{name} - scr_dir=%{_datadir}/%{name} - -+if [ ! -f %{_datadir}/%{name}/ipmiutil.env ]; then -+ cp %{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.env -+fi -+ - # Install right scripts/service files no matter install or upgrade - %if 0%{?req_systemd} - %service_add_post ipmi_port.service ipmiutil_evt.service ipmiutil_asy.service ipmiutil_wdt.service -@@ -217,9 +221,6 @@ scr_dir=%{_datadir}/%{name} - if [ -x /bin/systemctl ] && [ -d %{unit_dir} ]; then - # Replace if exists, append if not. - # Use # as the sed delimiter to prevent handling slash in the path. -- if [ ! -f %{_datadir}/%{name}/ipmiutil.env ]; then -- cp %{_datadir}/%{name}/ipmiutil.env.template %{_datadir}/%{name}/ipmiutil.env -- fi - grep -q 'IINITDIR' %{_datadir}/%{name}/ipmiutil.env \ - && sed -i 's#^IINITDIR=.*#IINITDIR=%{init_dir}#' %{_datadir}/%{name}/ipmiutil.env \ - || echo "IINITDIR=%{init_dir}" >> %{_datadir}/%{name}/ipmiutil.env -@@ -274,8 +275,9 @@ then - # Capture a snapshot of IPMI sensor data once now for later reuse. - sensorout=$vardir/sensor_out.txt - if [ ! -f $sensorout ]; then -- %{_bindir}/ipmiutil sensor -q >$sensorout || : -- if [ $? -ne 0 ]; then -+ IPMIret=1 -+ %{_bindir}/ipmiutil sensor -q >$sensorout && IPMIret=0 -+ if [ $IPMIret -ne 0 ]; then - # remove file if error, try again in ipmi_port on reboot. - rm -f $sensorout - fi diff --git a/debian/patches/series b/debian/patches/series index b8ba109..c8614ec 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -0110-fix_malformed_messages.patch 0105-typo.patch 0700-init.patch 0600-typo-man.patch diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index b082113..6a7a73e 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1 +1,4 @@ ancient-libtool [ltconfig] +ipmiutil source: old-fsf-address-in-copyright-file +ipmiutil source: space-in-std-shortname-in-dep5-copyright +ipmiutil source: tab-in-license-text |