1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
Please review changes against upstream code using SCM,
see the Vcs-* tags in debian/control for its location.
--- makefs-20100306.orig/src/lib/libutil/fparseln.c
+++ makefs-20100306/src/lib/libutil/fparseln.c
@@ -2,7 +2,8 @@
/* $NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $ */
/*
- * Copyright (c) 2009 Thorsten Glaser
+ * Copyright (c) 2009, 2012
+ * Thorsten Glaser <tg@mirbsd.org>
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,6 +34,8 @@
#include <stdlib.h>
#ifdef DEBIAN
+#define MAKEFS_FPARSELN
+#include <bsd/stdio.h>
#include "mbsdtree.h"
#else
#include "util.h"
--- makefs-20100306.orig/src/usr.sbin/makefs/ffs.c
+++ makefs-20100306/src/usr.sbin/makefs/ffs.c
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*
- * Copyright (c) 2009, 2010
+ * Copyright (c) 2009, 2010, 2012
* Thorsten Glaser <tg@mirbsd.org>
* Copyright (c) 1982, 1986, 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -92,6 +92,7 @@ __RCSID("$NetBSD: ffs.c,v 1.44 2009/04/2
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <unistd.h>
#include "makefs.h"
--- makefs-20100306.orig/src/usr.sbin/makefs/mbsdtree.h
+++ makefs-20100306/src/usr.sbin/makefs/mbsdtree.h
@@ -3,7 +3,7 @@
/* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */
/*-
- * Copyright (c) 2009
+ * Copyright (c) 2009, 2012
* Thorsten Glaser <tg@mirbsd.org>
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.
@@ -60,7 +60,7 @@ char *flags_to_string(u_long, const char
int string_to_flags(char **, u_long *, u_long *);
#endif
-#ifdef DEBIAN
+#ifdef MAKEFS_FPARSELN
/*
* fparseln() specific operation flags.
*/
--- makefs-20100306.orig/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c
+++ makefs-20100306/src/usr.sbin/makefs/nbsrc/usr.sbin/mtree/spec.c
@@ -2,7 +2,7 @@
/* $NetBSD: spec.c,v 1.78 2009/09/22 04:38:21 apb Exp $ */
/*-
- * Copyright (c) 2009
+ * Copyright (c) 2009, 2012
* Thorsten Glaser <tg@mirbsd.org>
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -65,10 +65,6 @@
#include "nbtool_config.h"
#endif
-#if defined(__MirBSD__) || defined(DEBIAN)
-#include "mbsdtree.h"
-#endif
-
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
#if 0
@@ -95,6 +91,12 @@ __RCSID("$NetBSD: spec.c,v 1.78 2009/09/
#include <vis.h>
#ifndef DEBIAN
#include <util.h>
+#else
+#define MAKEFS_FPARSELN
+#endif
+
+#if defined(__MirBSD__) || defined(DEBIAN)
+#include "mbsdtree.h"
#endif
#include "extern.h"
|
