--- /dev/null
+--- cpio-2.4.2/rmt.c.ewt Mon Aug 26 21:27:28 1996
++++ cpio-2.4.2/rmt.c Mon Aug 26 21:27:49 1996
+@@ -74,8 +74,12 @@
+ char device[SSIZE];
+ char count[SSIZE], mode[SSIZE], pos[SSIZE], op[SSIZE];
+
++#ifdef __GNU_LIBRARY__
++#include <errno.h>
++#else
+ extern errno;
+ extern char *sys_errlist[];
++#endif
+ char resp[BUFSIZ];
+
+ FILE *debug;
--- /dev/null
+diff -Nru cpio-2.4.2/cpio.texi cpio-2.4.2.new/cpio.texi
+--- cpio-2.4.2/cpio.texi Wed Dec 20 17:29:34 1995
++++ cpio-2.4.2.new/cpio.texi Wed Dec 30 02:59:32 1998
+@@ -9,9 +9,10 @@
+
+ @ifinfo
+ @format
+-START-INFO-DIR-ENTRY
+-* cpio: (cpio). Making tape (or disk) archives.
+-END-INFO-DIR-ENTRY
++@dircategory File utilities:
++@direntry
++* cpio: (cpio) Making tape (or disk) archives.
++@end direntry
+ @end format
+ @end ifinfo
+
+@@ -77,7 +78,7 @@
+ @ifinfo
+ @node Top, Introduction, (dir), (dir)
+ @comment node-name, next, previous, up
+-@top
++@top cpio
+
+ GNU cpio is a tool for creating and extracting archives, or copying
+ files from one place to another. It handles a number of cpio formats as
--- /dev/null
+--- cpio-2.4.2/copyout.c.ewt Wed Apr 23 12:52:01 1997
++++ cpio-2.4.2/copyout.c Wed Apr 23 12:52:19 1997
+@@ -54,7 +54,7 @@
+ else
+ magic_string = "070701";
+ sprintf (ascii_header,
+- "%6s%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
++ "%6s%08lx%08lx%08lx%08lx%08lx%08x%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
+ magic_string,
+ file_hdr->c_ino, file_hdr->c_mode, file_hdr->c_uid,
+ file_hdr->c_gid, file_hdr->c_nlink, file_hdr->c_mtime,
--- /dev/null
+--- cpio-2.4.2/main.c.svr4compat Tue Jun 30 12:22:05 1998
++++ cpio-2.4.2/main.c Tue Jun 30 12:22:34 1998
+@@ -169,6 +169,8 @@
+ case 'c': /* Use the old portable ASCII format. */
+ if (archive_format != arf_unknown)
+ usage (stderr, 2);
++#define SVR4_COMPAT 1
++#define SVR4_COMPAT 1
+ #ifdef SVR4_COMPAT
+ archive_format = arf_newascii; /* -H newc. */
+ #else