Refresh/remove patches; Declare compliance with Debian Policy 4.7.2

5 files changed, 14 insertions, 70 deletions

diff --git a/debian/changelog b/debian/changelog
index fd5f16b..c17c909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ipmiutil (3.2.1-1) UNRELEASED; 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).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 16 Mar 2025 13:34:17 +0100
+
 ipmiutil (3.1.9-3) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/control b/debian/control
index cb37133..e8f8746 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ 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
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