d/copyright: Rewrite to make lrc happy

5 files changed, 96 insertions, 117 deletions

diff --git a/debian/changelog b/debian/changelog
index 62c9912..40f385c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
 ipmitool (1.8.19-8) UNRELEASED; urgency=medium
 
   * New debian/patches/0130-chassis_bootparam.patch (Closes: #1099886).
+  * Remove unused patches:
+    - patches/0120-Fix_Unsupported_Parameter_lookup.patch
+    - patches/0125-Do_not_require_IANA_PEN_registry_file.patch
   * Declare compliance with Debian Policy 4.7.2 (No changes needed).
   * debian/control:
     - Change Vcs-Git from git: to https:.
   * debian/copyright:
     - Add year 2025 to myself.
+    - Rewrite to make lrc happy.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Fri, 21 Mar 2025 09:11:20 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 8ebc44f..02698e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://codeberg.org/IPMITool/ipmitool
 Upstream-Contact: Duncan Laurie <duncan@iceblink.org>
 
@@ -39,6 +39,97 @@ Copyright: 2003-2005 Duncan Laurie <duncan@iceblink.org>
            2014-2025 Jörg Frings-Fürst <debian@jff.email>
 License: BSD-3-clause
 
+Files: src/plugins/lan/md5.c
+       src/plugins/lan/md5.h
+Copyright: 1999-2002 Aladdin Enterprises
+License: Zlib
+
+Files: src/plugins/free/free.c
+Copyright: 2003      Sun Microsystems, Inc.  All Rights Reserved.
+License: BSD-3-Clause-No-Nuclear-Warranty
+
+Files: contrib/ipmievd.init.suse
+Copyright: 1995-2005 Kurt Garloff, SUSE / Novell Inc.
+License: LGPL-2.1+
+
+Files: INSTALL
+Copyright: 1994-2013 Free Software Foundation, Inc.
+License: FSFAP
+
+License: FSFAP
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.  This file is offered as-is,
+ without warranty of any kind.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
+
+License: BSD-3-Clause-No-Nuclear-Warranty
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ . 
+ Redistribution of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ . 
+ Redistribution in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ . 
+ Neither the name of Sun Microsystems, Inc. or the names of
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ . 
+ This software is provided "AS IS," without a warranty of any kind.
+ ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ You acknowledge that this software is not designed or intended for use
+ in the design, construction, operation or maintenance of any nuclear
+ facility.
+
+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.
+
 License: BSD-3-clause
  All rights reserved.
  .
diff --git a/debian/patches/0100-fix_buf_overflow.patch b/debian/patches/0100-fix_buf_overflow.patch
index 1651487..d7b3184 100644
--- a/debian/patches/0100-fix_buf_overflow.patch
+++ b/debian/patches/0100-fix_buf_overflow.patch
@@ -1,7 +1,6 @@
 Description: fix buffer overflow
  based on 101_fix_buf_overflow from Leo Iannacone <l3on@ubuntu.com> 
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Bug: TSOL buffer overflow
 Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/633054
 Forwarded: https://sourceforge.net/p/ipmitool/patches/100/
 Last-Update: 2014-12-01
diff --git a/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch b/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch
deleted file mode 100644
index 1179a99..0000000
--- a/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix unsupported LAN parameter lookup command returns an error
-Author: Daniel Van Allen <dvanallen@google.com>
-Origin: https://github.com/Cray-HPE/ipmitool/commit/b7c0d66cd6b9eaf45648f6b2651b6ef5158de811
-Bug: https://github.com/ipmitool/ipmitool/issues/388
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061770
-Forwarded: not-needed
-Last-Update: 2024-07-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/lib/ipmi_lanp.c
-===================================================================
---- trunk.orig/lib/ipmi_lanp.c
-+++ trunk/lib/ipmi_lanp.c
-@@ -236,8 +236,12 @@ get_lan_param_select(struct ipmi_intf *i
- 		/* We treat them as valid but empty response */
- 		p->data = NULL;
- 		p->data_len = 0;
--		rc = p;
--		/* fall through */
-+		lprintf(LOG_INFO, "Get LAN Parameter '%s' command unsupported: %s",
-+			p->desc,
-+			specific_val2str(rsp->ccode,
-+			                 get_lan_cc_vals,
-+			                 completion_code_vals));
-+		return p;
- 	default:
- 		/* other completion codes are treated as error */
- 		lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed: %s",
diff --git a/debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch b/debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch
deleted file mode 100644
index 9a58fc1..0000000
--- a/debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: Fix IANA PEN registry open failed: No such file or directory
-Author: Vincent Fazio <vfazio@gmail.com>
-Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
-Bug: https://github.com/ipmitool/ipmitool/pull/382
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040186
-Forwarded: not-needed
-Last-Update: 2024-07-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/lib/ipmi_main.c
-===================================================================
---- trunk.orig/lib/ipmi_main.c
-+++ trunk/lib/ipmi_main.c
-@@ -853,10 +853,7 @@ ipmi_main(int argc, char ** argv,
- 	}
- 
- 	/* load the IANA PEN registry */
--	if (ipmi_oem_info_init()) {
--		lprintf(LOG_ERR, "Failed to initialize the OEM info dictionary");
--		goto out_free;
--	}
-+	ipmi_oem_info_init();
- 
- 	/* run OEM setup if found */
- 	if (oemtype &&
-Index: trunk/lib/ipmi_strings.c
-===================================================================
---- trunk.orig/lib/ipmi_strings.c
-+++ trunk/lib/ipmi_strings.c
-@@ -1719,39 +1719,30 @@ out:
- 	return rc;
- }
- 
--int ipmi_oem_info_init()
-+void ipmi_oem_info_init()
- {
- 	oem_valstr_list_t terminator = { { -1, NULL}, NULL }; /* Terminator */
- 	oem_valstr_list_t *oemlist = &terminator;
- 	bool free_strings = true;
--	size_t count;
--	int rc = -4;
-+	int count;
- 
- 	lprintf(LOG_INFO, "Loading IANA PEN Registry...");
- 
- 	if (ipmi_oem_info) {
- 		lprintf(LOG_INFO, "IANA PEN Registry is already loaded");
--		rc = 0;
- 		goto out;
- 	}
- 
--	if (!(count = oem_info_list_load(&oemlist))) {
--		/*
--		 * We can't identify OEMs without a loaded registry.
--		 * Set the pointer to dummy and return.
--		 */
--		ipmi_oem_info = ipmi_oem_info_dummy;
--		goto out;
-+	if ((count = oem_info_list_load(&oemlist)) < 1) {
-+		lprintf(LOG_WARN, "Failed to load entries from IANA PEN Registry");
-+		count = 0;
- 	}
- 
- 	/* In the array was allocated, don't free the strings at cleanup */
- 	free_strings = !oem_info_init_from_list(oemlist, count);
- 
--	rc = IPMI_CC_OK;
--
- out:
- 	oem_info_list_free(&oemlist, free_strings);
--	return rc;
- }
- 
- void ipmi_oem_info_free()
-Index: trunk/include/ipmitool/ipmi_strings.h
-===================================================================
---- trunk.orig/include/ipmitool/ipmi_strings.h
-+++ trunk/include/ipmitool/ipmi_strings.h
-@@ -59,7 +59,7 @@ extern const struct valstr ipmi_integrit
- extern const struct valstr ipmi_encryption_algorithms[];
- extern const struct valstr ipmi_user_enable_status_vals[];
- extern const struct valstr *ipmi_oem_info;
--int ipmi_oem_info_init();
-+void ipmi_oem_info_init();
- void ipmi_oem_info_free();
- 
- extern const struct valstr picmg_frucontrol_vals[];