SOURCES: proftpd-wtmp.patch - rediff

[glen]

Author: glen                         Date: Tue Jan  8 22:54:10 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- rediff

---- Files affected:
SOURCES:
   proftpd-wtmp.patch (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SOURCES/proftpd-wtmp.patch
diff -u SOURCES/proftpd-wtmp.patch:1.26 SOURCES/proftpd-wtmp.patch:1.27
--- SOURCES/proftpd-wtmp.patch:1.26	Tue Jan  8 21:47:58 2008
+++ SOURCES/proftpd-wtmp.patch	Tue Jan  8 23:54:04 2008
@@ -1,17 +1,5 @@
---- proftpd-1.3.1/src/log.c	2008-01-08 22:33:30.946409026 +0200
-+++ proftpd-1.3.1rc3/src/log.c	2007-02-15 18:54:09.000000000 +0200
-@@ -117,7 +117,7 @@
-     utx.ut_exit.e_exit = 0;
- #endif /* HAVE_UT_UT_EXIT */
-     if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
--      (void) ftruncate(fdx, buf.st_size);
-+      ftruncate(fdx, buf.st_size);
- 
-   } else {
-     pr_log_debug(DEBUG0, "%s fstat(): %s", WTMPX_FILE, strerror(errno));
-diff -ur proftpd-1.3.1rc2/acconfig.h proftpd-1.3.1rc2.wtmpx/acconfig.h
---- proftpd-1.3.1rc2/acconfig.h	2002-12-15 19:05:09.000000000 +0100
-+++ proftpd-1.3.1rc2.wtmpx/acconfig.h	2007-08-20 14:44:18.000000000 +0200
+--- proftpd-1.3.1-wtmp/acconfig.h	2002-12-15 20:05:09.000000000 +0200
++++ proftpd-1.3.1/acconfig.h	2008-01-09 00:43:47.043739566 +0200
 @@ -70,7 +70,7 @@
  #undef HAVE_UT_UT_HOST
  
@@ -21,10 +9,9 @@
  
  #define PF_ARGV_NONE		0
  #define PF_ARGV_NEW		1
-diff -ur proftpd-1.3.1rc2/config.h.in proftpd-1.3.1rc2.wtmpx/config.h.in
---- proftpd-1.3.1rc2/config.h.in	2007-08-20 14:47:10.000000000 +0200
-+++ proftpd-1.3.1rc2.wtmpx/config.h.in	2007-08-20 14:44:18.000000000 +0200
-@@ -119,7 +119,7 @@
+--- proftpd-1.3.1-wtmp/config.h.in	2008-01-09 00:43:32.506904225 +0200
++++ proftpd-1.3.1/config.h.in	2008-01-09 00:43:47.043739566 +0200
+@@ -122,7 +122,7 @@
  #undef HAVE_UT_UT_HOST
  
  /* Define if your struct utmp uses ut_user and not ut_name */
@@ -33,10 +20,9 @@
  
  #define PF_ARGV_NONE		0
  #define PF_ARGV_NEW		1
-diff -ur proftpd-1.3.1rc2/configure.in proftpd-1.3.1rc2.wtmpx/configure.in
---- proftpd-1.3.1rc2/configure.in	2007-08-20 14:47:10.000000000 +0200
-+++ proftpd-1.3.1rc2.wtmpx/configure.in	2007-08-20 14:44:18.000000000 +0200
-@@ -1056,7 +1056,7 @@
+--- proftpd-1.3.1-wtmp/configure.in	2007-05-22 23:54:09.000000000 +0300
++++ proftpd-1.3.1/configure.in	2008-01-09 00:43:47.043739566 +0200
+@@ -1063,7 +1063,7 @@
  AC_CHECK_HEADERS(sys/stat.h errno.h sys/socket.h sys/termios.h sys/termio.h)
  AC_CHECK_HEADERS(sys/statvfs.h sys/un.h sys/vfs.h sys/select.h)
  AC_CHECK_HEADERS(dirent.h ndir.h sys/ndir.h sys/dir.h vmsdir.h)
@@ -45,7 +31,7 @@
  AC_CHECK_HEADERS(regex.h)
  AC_CHECK_HEADER(syslog.h,have_syslog_h="yes",)
  AC_CHECK_HEADERS(curses.h ncurses.h)
-@@ -1119,10 +1119,10 @@
+@@ -1143,10 +1143,10 @@
  
  if test $have_utmp; then
    AC_CACHE_CHECK(whether your struct utmp has ut_user,
@@ -59,7 +45,7 @@
    AC_CACHE_CHECK(whether your struct utmp has ut_host,
    		pr_cv_header_ut_host,
  	AC_EGREP_HEADER([ *ut_host.*;],utmp.h,
-@@ -1133,8 +1133,8 @@
+@@ -1157,8 +1157,8 @@
  	AC_EGREP_HEADER([ *ut_exit.*;],utmp.h,
  			pr_cv_header_ut_exit="yes",
  			pr_cv_header_ut_exit="no"))
@@ -70,7 +56,7 @@
    fi
    if test "$pr_cv_header_ut_host" = "yes"; then
      AC_DEFINE(HAVE_UT_UT_HOST, 1, [If struct utmp has ut_host.])
-@@ -1144,6 +1144,28 @@
+@@ -1168,6 +1168,28 @@
    fi
  fi
  
@@ -99,9 +85,8 @@
  dnl See if various LOG_ macros are defined
  if test "$have_syslog_h" = "yes"; then
    AC_DEFINE(HAVE_SYSLOG_H)
-diff -ur proftpd-1.3.1rc2/src/log.c proftpd-1.3.1rc2.wtmpx/src/log.c
---- proftpd-1.3.1rc2/src/log.c	2006-12-11 20:53:43.000000000 +0100
-+++ proftpd-1.3.1rc2.wtmpx/src/log.c	2007-08-20 14:52:13.000000000 +0200
+--- proftpd-1.3.1-wtmp/src/log.c	2007-09-11 03:49:44.000000000 +0300
++++ proftpd-1.3.1/src/log.c	2008-01-09 00:43:47.043739566 +0200
 @@ -59,119 +59,124 @@
    int res = 0;
    static int fd = -1;
@@ -204,7 +189,7 @@
 +      utx.ut_exit.e_exit = 0;
  #endif /* HAVE_UT_UT_EXIT */
 -    if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
--      ftruncate(fdx, buf.st_size);
+-      (void) ftruncate(fdx, buf.st_size);
  
 -  } else {
 -    pr_log_debug(DEBUG0, "%s fstat(): %s", WTMPX_FILE, strerror(errno));
@@ -310,4 +295,3 @@
    } else {
      pr_log_debug(DEBUG0, "%s fstat(): %s",WTMP_FILE,strerror(errno));
      res = -1;
-Only in proftpd-1.3.1rc2.wtmpx/src: log.c~
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/proftpd-wtmp.patch?r1=1.26&r2=1.27&f=u