Bug#444595: Diff of the NMU
I have just done an NMU of nictools-pci to fix the long standing bugs.
Please find attached the diff of the NMU.
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' aurel32@debian.org | aurelien@aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
diff -u nictools-pci-1.3.8/alta-diag.c nictools-pci-1.3.8/alta-diag.c
--- nictools-pci-1.3.8/alta-diag.c
+++ nictools-pci-1.3.8/alta-diag.c
@@ -84,7 +84,7 @@
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
diff -u nictools-pci-1.3.8/myson-diag.c nictools-pci-1.3.8/myson-diag.c
--- nictools-pci-1.3.8/myson-diag.c
+++ nictools-pci-1.3.8/myson-diag.c
@@ -83,7 +83,7 @@
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
diff -u nictools-pci-1.3.8/natsemi-diag.c nictools-pci-1.3.8/natsemi-diag.c
--- nictools-pci-1.3.8/natsemi-diag.c
+++ nictools-pci-1.3.8/natsemi-diag.c
@@ -92,7 +92,7 @@
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
diff -u nictools-pci-1.3.8/pcnet-diag.c nictools-pci-1.3.8/pcnet-diag.c
--- nictools-pci-1.3.8/pcnet-diag.c
+++ nictools-pci-1.3.8/pcnet-diag.c
@@ -88,7 +88,7 @@
#include <errno.h>
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h>
diff -u nictools-pci-1.3.8/tulip-diag.c nictools-pci-1.3.8/tulip-diag.c
--- nictools-pci-1.3.8/tulip-diag.c
+++ nictools-pci-1.3.8/tulip-diag.c
@@ -91,7 +91,7 @@
#include <ctype.h>
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
diff -u nictools-pci-1.3.8/via-diag.c nictools-pci-1.3.8/via-diag.c
--- nictools-pci-1.3.8/via-diag.c
+++ nictools-pci-1.3.8/via-diag.c
@@ -92,7 +92,7 @@
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
diff -u nictools-pci-1.3.8/debian/changelog nictools-pci-1.3.8/debian/changelog
--- nictools-pci-1.3.8/debian/changelog
+++ nictools-pci-1.3.8/debian/changelog
@@ -1,3 +1,15 @@
+nictools-pci (1.3.8-1.1) unstable; urgency=low
+
+ * Non-maintainer upload from the Zürich BSP.
+ * Use patch from Micha Lenk to fix FTBFS: provide linux macros
+ set_unaligned() and get_unaligned() in new file unaligned.h
+ previously provided by package linux-libc-dev (closes: #428936).
+ * Add armel and armeb to the list of supported architectures
+ (closes: #408787).
+ * Fix a typo in rtl8139-diag(8) (closes: #444595).
+
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 12 Jan 2008 00:57:52 +0100
+
nictools-pci (1.3.8-1) unstable; urgency=low
* New Upstream: rtl8139-diag v2.13
diff -u nictools-pci-1.3.8/debian/man/rtl8139-diag.8 nictools-pci-1.3.8/debian/man/rtl8139-diag.8
--- nictools-pci-1.3.8/debian/man/rtl8139-diag.8
+++ nictools-pci-1.3.8/debian/man/rtl8139-diag.8
@@ -6,7 +6,7 @@
.RI [ options ]
.SH DESCRIPTION
\fBrtl8139-diag\fP is a program that you can use to diagnose problems with ethernet cards
-based on the Realtek 8129 oder 8139 chip series.
+based on the Realtek 8129 or 8139 chip series.
.SH OPTIONS
These programs follow the usual GNU command line syntax, with long
options starting with two dashes (`-').
only in patch2:
unchanged:
--- nictools-pci-1.3.8.orig/unaligned.h
+++ nictools-pci-1.3.8/unaligned.h
@@ -0,0 +1,37 @@
+/**
+ * These lines of codes were obtained from Debian package linux-kernel-headers
+ * and adapted by Micha Lenk <micha@lenk.info> to meet the needs of
+ * nictools-pci. The package linux-kernel-headers in turn obtained the sources
+ * via BitKeeper from: bk://linux.bkbits.net/linux-2.5, and kernel.org mirrors
+ * under the terms of the GPL license.
+ */
+
+#ifndef __UNALIGNED_H
+#define __UNALIGNED_H
+
+/**
+ * get_unaligned - get value from possibly mis-aligned location
+ * @ptr: pointer to value
+ *
+ * This macro should be used for accessing values larger in size than
+ * single bytes at locations that are expected to be improperly aligned,
+ * e.g. retrieving a u16 value from a location not u16-aligned.
+ *
+ * Note that unaligned accesses can be very expensive on some architectures.
+ */
+#define get_unaligned(ptr) (*(ptr))
+
+/**
+ * put_unaligned - put value to a possibly mis-aligned location
+ * @val: value to place
+ * @ptr: pointer to location
+ *
+ * This macro should be used for placing values larger in size than
+ * single bytes at locations that are expected to be improperly aligned,
+ * e.g. writing a u16 value to a location not u16-aligned.
+ *
+ * Note that unaligned accesses can be very expensive on some architectures.
+ */
+#define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+
+#endif
only in patch2:
unchanged:
--- nictools-pci-1.3.8.orig/ns820-diag.c
+++ nictools-pci-1.3.8/ns820-diag.c
@@ -85,7 +85,7 @@
/* The following are required only with unaligned field accesses. */
#include <asm/types.h>
-#include <asm/unaligned.h>
+#include "unaligned.h"
#if defined(__linux__) && __GNU_LIBRARY__ == 1
#include <asm/io.h> /* Newer libraries use <sys/io.h> instead. */
Reply to: