- updated for 2.6

Changed files:
    cpio-gethostname_is_in_libc_aka_no_libnsl.patch -> 1.2
    cpio-info.patch -> 1.4

diff --git a/cpio-gethostname_is_in_libc_aka_no_libnsl.patch b/cpio-gethostname_is_in_libc_aka_no_libnsl.patch
index 70698089f3c4d8a6b60874b2e80a9d60f152b197..0b9d5786e7feefaaaa232028876d10f34dbcd974 100644 (file)
--- a/cpio-gethostname_is_in_libc_aka_no_libnsl.patch
+++ b/cpio-gethostname_is_in_libc_aka_no_libnsl.patch
@@ -1,12 +1,25 @@
-diff -uNr cpio-2.4.2/configure.in cpio-2.4.2.new/configure.in
---- cpio-2.4.2/configure.in    Wed Dec 20 17:28:29 1995
-+++ cpio-2.4.2.new/configure.in        Mon Aug 21 01:20:15 2000
-@@ -62,6 +62,7 @@
+--- cpio-2.6/configure.ac.orig 2004-12-20 11:46:30.000000000 +0100
++++ cpio-2.6/configure.ac      2005-01-09 02:12:13.121894584 +0100
+@@ -95,8 +95,8 @@
+ AC_CHECK_FUNCS(lchown endpwent endgrent)
  AC_FUNC_VPRINTF
  AC_FUNC_ALLOCA
- AC_HEADER_DIRENT
 -AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"])
-+AC_CHECK_FUNC(gethostname, ,
-+AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"],) )
- AC_CHECK_LIB(socket, setsockopt, [LIBS="$LIBS -lsocket"])
- AC_OUTPUT(Makefile)
+-AC_CHECK_LIB(socket, setsockopt, [LIBS="$LIBS -lsocket"])
++AC_CHECK_FUNC(gethostname,,[AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"])])
++AC_CHECK_FUNC(setsockopt,,[AC_CHECK_LIB(socket, setsockopt, [LIBS="$LIBS -lsocket"])])
+ 
+ # Gettext.
+ AM_GNU_GETTEXT([external], [need-ngettext])
+@@ -104,10 +104,9 @@
+ 
+ # Initialize the test suite.
+ AC_CONFIG_TESTDIR(tests)
+-AC_CONFIG_FILES([tests/Makefile tests/atlocal]) # FIXME: tests/preset?
+ AM_MISSING_PROG([AUTOM4TE], [autom4te])
+ 
+-AC_CONFIG_FILES([Makefile
++AC_CONFIG_FILES([Makefile tests/Makefile tests/atlocal
+  doc/Makefile
+  headers/Makefile
+  lib/Makefile

diff --git a/cpio-info.patch b/cpio-info.patch
index 2b34f7cb1f8026c382fba9fed37f2b4b211dfee9..6efa48365f1aad4643c40aabfd13358bbb898db8 100644 (file)
--- a/cpio-info.patch
+++ b/cpio-info.patch
@@ -1,6 +1,5 @@
-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
+--- cpio-2.6.orig/doc/cpio.texi        Wed Dec 20 17:29:34 1995
++++ cpio-2.6/doc/cpio.texi     Wed Dec 30 02:59:32 1998
 @@ -9,9 +9,10 @@
  
  @ifinfo