[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 08f13c697afd752789f3beafea0a9411e91f6aa5
Author: Clint Adams <schizo at debian.org>
Date:   Wed Nov 2 15:00:35 2005 +0000

    Patch from Yann Dirson: port to Solaris 10.  closes: #337063.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-92

diff --git a/configure.ac b/configure.ac
index 85f0477..ac012cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -234,7 +234,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 done
 
 dnl find out how stat() etc are called. On linux systems, we really
-dnl need to wrap __xstat(), on Solaris _stat, on Digital Unix stat() (IIRC)
+dnl need to wrap (IIRC):
+dnl  Linux       : __xstat
+dnl  Solaris <=9 : _stat
+dnl  Solaris 10  : _xstat
+dnl  Digital Unix: stat
 
 :>fakerootconfig.h.tmp
 
@@ -242,7 +246,7 @@ for SEARCH in %stat f%stat l%stat %stat64 f%stat64 l%stat64 %mknod; do
   FUNC=`echo $SEARCH|sed -e 's/.*%//'`
   PRE=`echo $SEARCH|sed -e 's/%.*//'`
   FOUND=
-  for WRAPPED in __${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
+  for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
     AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED)
 dnl
 dnl to unconditionally define only the _* functions, comment out the 2 lines above,
@@ -259,7 +263,7 @@ dnl    FOUND=$WRAPPED
       AC_DEFINE_UNQUOTED(WRAP_${PF}_QUOTE, "$FOUND")
       AC_DEFINE_UNQUOTED(TMP_${PF}, tmp_$FOUND)
       AC_DEFINE_UNQUOTED(NEXT_${PF}_NOARG, next_$FOUND)
-      if test __"${PRE}x${FUNC}" != "${WRAPPED}"; then
+      if test __"${PRE}x${FUNC}" != "${WRAPPED}" && test _"${PRE}x${FUNC}" != "${WRAPPED}" ; then
         DEF_BEGIN=""
       else
         DEF_BEGIN="a,"
diff --git a/debian/changelog b/debian/changelog
index 6480d67..f0687a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 fakeroot (1.5.5) unstable; urgency=low
 
+  Timo Savola:
+
+  * TCP I/O function fix from Toni Timonen.
+
+  Clint Adams:
+
   * Patch from Yann Dirson: cope with Solaris tr.  closes: #337059.
+  * Patch from Yann Dirson: port to Solaris 10.  closes: #337063.
 
  -- Clint Adams <schizo at debian.org>  Wed,  2 Nov 2005 09:48:35 -0500
 
diff --git a/wrapfunc.inp b/wrapfunc.inp
index 04cebaf..58a7828 100644
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -26,7 +26,7 @@ WRAP_FSTAT;int;FSTAT_ARG(int ver, int fd, struct stat *buf);FSTAT_ARG(ver, fd, b
 #ifdef STAT64_SUPPORT
 WRAP_LSTAT64;int;LSTAT64_ARG(int ver, const char *file_name, struct stat64 *buf);LSTAT64_ARG(ver, file_name, buf);LSTAT64
 WRAP_STAT64;int;STAT64_ARG(int ver, const char *file_name, struct stat64 *buf);STAT64_ARG(ver, file_name, buf);STAT64
-WRAP_FSTAT64;int;FSTAT_ARG(int ver, int fd, struct stat64 *buf);FSTAT_ARG(ver, fd, buf);FSTAT64
+WRAP_FSTAT64;int;FSTAT64_ARG(int ver, int fd, struct stat64 *buf);FSTAT64_ARG(ver, fd, buf);FSTAT64
 #endif
 
 WRAP_MKNOD;int;MKNOD_ARG(int ver, const char *pathname, mode_t mode, dev_t XMKNOD_FRTH_ARG dev);MKNOD_ARG(ver, pathname, mode, dev);MKNOD

-- 
fakeroot