[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#988083: unblock: micro-evtd/3.4-6



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package micro-evtd

[ Reason ]

One-line patch to fix FTBFS (#987631). Also taking the opportunity to update the Maintainer field; I hope that's OK.

[ Impact ]

The package currently in bullseye (same as buster) works, however it FTBFS with bullseye's glibc.

[ Tests ]

There are no automated tests. I have been running the updated daemon for a few days, and I tested an installation with the updated udeb (using a d-i daily image).

[ Risks ]

I built the package on buster with and without the patch, to see what would change. The disassembly (objdump -d) was the same before and after, so I think I can be confident the header was not actually used and the patch should not change its behaviour.

However, the package had not been rebuilt since before buster was released, so there could be unknown risks arising from rebuilding with the newer toolchain.

[ Checklist ]

 [✔] all changes are documented in the d/changelog
 [✔] I reviewed all changes and I approve them
 [✔] attach debdiff against the package in testing

[ Other info ]

Very low popcon. The package provides hardware support for a specific subset of armel/orion5x NAS devices with few remaining users.

The package builds a udeb. I tested an installation using a daily d-i image that includes the update.

unblock micro-evtd/3.4-6

thanks,
Ryan
diff -Nru micro-evtd-3.4/debian/changelog micro-evtd-3.4/debian/changelog
--- micro-evtd-3.4/debian/changelog	2019-01-03 21:12:25.000000000 -0800
+++ micro-evtd-3.4/debian/changelog	2021-05-03 20:22:09.000000000 -0700
@@ -1,3 +1,18 @@
+micro-evtd (3.4-6) unstable; urgency=medium
+
+  [ Ryan Tandy ]
+  * Fix FTBFS with glibc 2.30 (Closes: #987631)
+  * Remove myself as Maintainer, and move Roger Shimizu from Uploaders to
+    Maintainer, with his agreement.
+
+  [ Roger Shimizu ]
+  * debian/control:
+    - Update to use my debian address.
+  * debian/patches:
+    - Add ticket number to patch 0007.
+
+ -- Roger Shimizu <rosh@debian.org>  Tue, 04 May 2021 12:22:09 +0900
+
 micro-evtd (3.4-5) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff -Nru micro-evtd-3.4/debian/control micro-evtd-3.4/debian/control
--- micro-evtd-3.4/debian/control	2019-01-03 21:12:25.000000000 -0800
+++ micro-evtd-3.4/debian/control	2021-05-03 20:22:09.000000000 -0700
@@ -1,9 +1,8 @@
 Source: micro-evtd
 Section: utils
 Priority: optional
-Maintainer: Ryan Tandy <ryan@nardis.ca>
+Maintainer: Roger Shimizu <rosh@debian.org>
 Build-Depends: debhelper (>= 10)
-Uploaders: Roger Shimizu <rogershimizu@gmail.com>
 Standards-Version: 3.9.8
 Homepage: http://www.sourceforge.net/projects/ppc-evtd
 Vcs-Browser: https://salsa.debian.org/debian/micro-evtd
diff -Nru micro-evtd-3.4/debian/patches/0007-Fix-FTBFS-with-glibc-2.30.patch micro-evtd-3.4/debian/patches/0007-Fix-FTBFS-with-glibc-2.30.patch
--- micro-evtd-3.4/debian/patches/0007-Fix-FTBFS-with-glibc-2.30.patch	1969-12-31 16:00:00.000000000 -0800
+++ micro-evtd-3.4/debian/patches/0007-Fix-FTBFS-with-glibc-2.30.patch	2021-05-03 20:22:09.000000000 -0700
@@ -0,0 +1,21 @@
+From: Ryan Tandy <ryan@nardis.ca>
+Date: Sat, 1 May 2021 10:57:36 -0700
+Subject: Fix FTBFS with glibc 2.30
+
+Closes: #987631
+---
+ src/micro-evtd.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/micro-evtd.c b/src/micro-evtd.c
+index c8d6909..da91549 100644
+--- a/src/micro-evtd.c
++++ b/src/micro-evtd.c
+@@ -46,7 +46,6 @@
+ #include <sys/sem.h>
+ #include <sys/file.h>
+ 
+-#include <sys/io.h>
+ #include <syslog.h>
+ 
+ #include <sys/resource.h>
diff -Nru micro-evtd-3.4/debian/patches/series micro-evtd-3.4/debian/patches/series
--- micro-evtd-3.4/debian/patches/series	2019-01-03 21:12:25.000000000 -0800
+++ micro-evtd-3.4/debian/patches/series	2021-05-03 20:22:09.000000000 -0700
@@ -4,3 +4,4 @@
 0004-fix-typo-in-manpages.patch
 0005-Check-for-mmap-returning-MAP_FAILED.patch
 0006-Match-default-temperature-configuration-to-the-confi.patch
+0007-Fix-FTBFS-with-glibc-2.30.patch

Reply to: