Source: makefs
Source-Version: 20100306-2
Severity: important
Tags: patch

Hi!

The new libbsd 0.4.0 has dropped several obsolete headers that were
producing warning up to now, and dropped some implicit compatibility
inclusions (<stdio.h>), this package will FTBFS once that version is
introduced into the archive, attached is a patch fixing this, although
you might want to fix this in a different way (I'm thinking about the
<bsd/vis.h> part).

You can check for warnings produced on current libbsd 0.3.0 and for
the implicit inclusions use -DLIBBSD_DISABLE_DEPRECATED.

thanks,
guillem
diff -Naur fail/makefs-20100306/debian/rules pass/makefs-20100306/debian/rules
--- fail/makefs-20100306/debian/rules	2012-04-23 21:29:38.000000000 +0200
+++ pass/makefs-20100306/debian/rules	2012-04-13 06:57:37.000000000 +0200
@@ -33,7 +33,7 @@
 DEFS+=	-D'_DIAGASSERT(x)='
 
 # is in libbsd, but not all versions: Debian #547399
-ifeq ($(shell fgrep -c __RCSID /usr/include/bsd/cdefs.h),0)
+ifeq ($(shell fgrep -c __RCSID /usr/include/bsd/sys/cdefs.h),0)
 DEFS+=	-D'__RCSID(x)=__IDSTRING(rcsid,x)'
 endif
 
diff -Naur fail/makefs-20100306/src/usr.sbin/makefs/mbsdtree.h pass/makefs-20100306/src/usr.sbin/makefs/mbsdtree.h
--- fail/makefs-20100306/src/usr.sbin/makefs/mbsdtree.h	2009-07-23 21:32:48.000000000 +0200
+++ pass/makefs-20100306/src/usr.sbin/makefs/mbsdtree.h	2012-04-13 07:13:55.000000000 +0200
@@ -61,6 +61,8 @@
 #endif
 
 #ifdef DEBIAN
+#include <stdio.h>
+
 /*
  * fparseln() specific operation flags.
  */
diff -Naur fail/makefs-20100306/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c pass/makefs-20100306/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c
--- fail/makefs-20100306/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c	2010-03-07 01:17:32.000000000 +0100
+++ pass/makefs-20100306/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c	2012-04-23 21:53:51.000000000 +0200
@@ -92,7 +92,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <vis.h>
+#include <bsd/vis.h>
 #ifndef DEBIAN
 #include <util.h>
 #endif
diff -Naur fail/makefs-20100306/src/usr.sbin/mtree/spec.c pass/makefs-20100306/src/usr.sbin/mtree/spec.c
--- fail/makefs-20100306/src/usr.sbin/mtree/spec.c	2005-04-13 22:30:38.000000000 +0200
+++ pass/makefs-20100306/src/usr.sbin/mtree/spec.c	2012-04-13 07:10:16.000000000 +0200
@@ -47,7 +47,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <vis.h>
+#include <bsd/vis.h>
 #include "mtree.h"
 #include "extern.h"
 

Reply via email to