#! /bin/sh -e

# All lines beginning with `# DP:' are a description of the patch.
# DP: Description: Protect stub headers that include Linux headers from multiple
#                  inclussion.  This will permit to add warnings or errors in
#                  some Linux headers to ensure they're not included directly.
# DP: Dpatch author: Robert Millan
# DP: Upstream status: Debian-specific
# DP: Date: 2005-11-15

PATCHLEVEL=1

if [ $# -ne 2 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
    -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
    *)
	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
	exit 1
esac
exit 0

# append the patch here and adjust the -p? flag in the patch calls.
diff -ur libc.old/sysdeps/unix/sysv/linux/net/ppp-comp.h libc/sysdeps/unix/sysv/linux/net/ppp-comp.h
--- libc.old/sysdeps/unix/sysv/linux/net/ppp-comp.h	1996-10-09 01:39:17.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/net/ppp-comp.h	2005-08-21 17:44:33.000000000 +0200
@@ -1 +1,4 @@
+#ifndef _NET_PPP_COMP_H
+#define _NET_PPP_COMP_H 1
 #include <linux/ppp-comp.h>
+#endif
diff -ur libc.old/sysdeps/unix/sysv/linux/nfs/nfs.h libc/sysdeps/unix/sysv/linux/nfs/nfs.h
--- libc.old/sysdeps/unix/sysv/linux/nfs/nfs.h	1995-10-16 02:37:46.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/nfs/nfs.h	2005-08-21 17:37:15.000000000 +0200
@@ -1 +1,4 @@
+#ifndef _NFS_NFS_H
+#define _NFS_NFS_H 1
 #include <linux/nfs.h>
+#endif
diff -ur libc.old/sysdeps/unix/sysv/linux/sys/soundcard.h libc/sysdeps/unix/sysv/linux/sys/soundcard.h
--- libc.old/sysdeps/unix/sysv/linux/sys/soundcard.h	1996-10-09 01:39:20.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sys/soundcard.h	2005-08-21 17:37:15.000000000 +0200
@@ -1 +1,4 @@
+#ifndef _SYS_SOUNDCARD_H
+#define _SYS_SOUNDCARD_H 1
 #include <linux/soundcard.h>
+#endif
diff -ur libc.old/sysdeps/unix/sysv/linux/sys/ultrasound.h libc/sysdeps/unix/sysv/linux/sys/ultrasound.h
--- libc.old/sysdeps/unix/sysv/linux/sys/ultrasound.h	1997-12-04 01:10:44.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sys/ultrasound.h	2005-08-21 17:37:15.000000000 +0200
@@ -1 +1,4 @@
+#ifndef _SYS_ULTRASOUND_H
+#define _SYS_ULTRASOUND_H 1
 #include <linux/ultrasound.h>
+#endif
diff -ur libc.old/sysdeps/unix/sysv/linux/sys/vt.h libc/sysdeps/unix/sysv/linux/sys/vt.h
--- libc.old/sysdeps/unix/sysv/linux/sys/vt.h	1996-09-27 05:44:24.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sys/vt.h	2005-08-21 17:37:15.000000000 +0200
@@ -1 +1,4 @@
+#ifndef _SYS_VT_H
+#define _SYS_VT_H 1
 #include <linux/vt.h>
+#endif