Bug#874301: libgtop2: diff for NMU version 2.38.0-4.1

2019-09-22 Thread dai 
Control: reopen -1
Control: found -1 2.40.0-1

Dear maintainer,

> +libgtop2 (2.38.0-4.1) unstable; urgency=medium

> +  * Fix FTBFS on kFreeBSD: strlcpy undefined (Closes: #874301)
> +- d/p/05_kfreebsd_strlcpy.patch: use strlcpy of FreeBSD's libc.
> +- d/rules: add -lbsd to LDFLAGS if kFreeBSD.

This NMU can be applied to 2.40.0 as it is.
-- 
Regards,
dai

GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E


signature.asc
Description: PGP signature

Bug#874301: libgtop2: diff for NMU version 2.38.0-4.1

2019-08-14 Thread dai 
Control: tags -1 + pending

Dear maintainer,

I've prepared an NMU for libgtop2 (versioned as 2.38.0-4.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
-- 
Regards,
dai

GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -Nru libgtop2-2.38.0/debian/changelog libgtop2-2.38.0/debian/changelog
--- libgtop2-2.38.0/debian/changelog	2018-12-28 12:58:54.0 +0900
+++ libgtop2-2.38.0/debian/changelog	2019-08-10 21:46:38.0 +0900
@@ -1,3 +1,13 @@
+libgtop2 (2.38.0-4.1) unstable; urgency=medium
+
+  [ HIGUCHI Daisuke (VDR dai) ]
+  * Non-maintainer upload.
+  * Fix FTBFS on kFreeBSD: strlcpy undefined (Closes: #874301)
+- d/p/05_kfreebsd_strlcpy.patch: use strlcpy of FreeBSD's libc.
+- d/rules: add -lbsd to LDFLAGS if kFreeBSD.
+
+ -- HIGUCHI Daisuke (VDR dai)   Sat, 10 Aug 2019 21:46:38 +0900
+
 libgtop2 (2.38.0-4) unstable; urgency=medium
 
   [ Andrea Azzarone ]
diff -Nru libgtop2-2.38.0/debian/patches/05_kfreebsd_strlcpy.patch libgtop2-2.38.0/debian/patches/05_kfreebsd_strlcpy.patch
--- libgtop2-2.38.0/debian/patches/05_kfreebsd_strlcpy.patch	1970-01-01 09:00:00.0 +0900
+++ libgtop2-2.38.0/debian/patches/05_kfreebsd_strlcpy.patch	2019-08-10 21:46:24.0 +0900
@@ -0,0 +1,20 @@
+Description: use strlcpy of FreeBSD's libc
+Author: HIGUCHI Daisuke (VDR dai) 
+Bug-Debian: https://bugs.debian.org/874301
+Last-Update: 2019-08-10
+
+Index: libgtop2-2.38.0/sysdeps/freebsd/netload.c
+===
+--- libgtop2-2.38.0.orig/sysdeps/freebsd/netload.c
 libgtop2-2.38.0/sysdeps/freebsd/netload.c
+@@ -36,6 +36,10 @@
+ #include 
+ #include 
+ 
++#ifdef __FreeBSD__
++#include 
++#endif
++
+ static const unsigned long _glibtop_sysdeps_netload =
+ (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
+ (1L << GLIBTOP_NETLOAD_MTU) +
diff -Nru libgtop2-2.38.0/debian/patches/series libgtop2-2.38.0/debian/patches/series
--- libgtop2-2.38.0/debian/patches/series	2018-12-28 12:58:54.0 +0900
+++ libgtop2-2.38.0/debian/patches/series	2019-08-10 21:46:31.0 +0900
@@ -1,3 +1,4 @@
 03_kfreebsd_installdirs.patch
 04_kfreebsd_version.patch
 mountlist-ignore-snap-squashfs.patch
+05_kfreebsd_strlcpy.patch
diff -Nru libgtop2-2.38.0/debian/rules libgtop2-2.38.0/debian/rules
--- libgtop2-2.38.0/debian/rules	2018-12-28 12:58:54.0 +0900
+++ libgtop2-2.38.0/debian/rules	2019-08-10 21:44:29.0 +0900
@@ -7,6 +7,7 @@
 
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
+LDFLAGS += -lbsd
 endif
 
 %:


signature.asc
Description: PGP signature