Bug#40927: libc6: Another NMU for ARM

[Jim Pick <jim@jimpick.com>]

Package: libc6
Version: 2.1.1-12.3
Severity: normal

Hi,

I had to make another NMU for ARM.  My last one (the second), purported 
to fix the alignment issues for tftp on ARM, but I made a typo.  So here's 
a replacement debian/patches/arm-tftp.dpatch.

Cheers,

 - Jim


#! /bin/sh -e

# All lines beginning with `# DPATCH:' are a description of the patch.
# DP: A small patch to correct an alignment problem in the tftp struct
# DP: which affects ARM.

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 -p1 < $0;;
    -unpatch) patch -d "$2" -f -R -p1 < $0;;
    *)
	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
	exit 1
esac
exit 0


diff -urN glibc-2.1.1.backup/inet/arpa/tftp.h glibc-2.1.1/inet/arpa/tftp.h
--- glibc-2.1.1.backup/inet/arpa/tftp.h	Mon May 17 17:22:52 1999
+++ glibc-2.1.1/inet/arpa/tftp.h	Thu Jul  1 13:21:08 1999
@@ -56,7 +56,7 @@
 		unsigned short	tu_block;	/* block # */
 		short	tu_code;		/* error code */
 		char	tu_stuff[1];		/* request packet stuff */
-	} th_u __attribute__ ((__packed__));
+	} __attribute__ ((__packed__)) th_u;
 	char	th_data[1];			/* data or error string */
 } __attribute__ ((__packed__));