[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-75-g19376f5

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 19376f550ff6c8820b98bb8af120995e64de52bd
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Jan 8 14:50:25 2013 +0100

    Added missing declarations in fsio.h

diff --git a/debian/patches/3841 b/debian/patches/3841
index d6fd5ff..1496d3c 100644
--- a/debian/patches/3841
+++ b/debian/patches/3841
@@ -1,7 +1,7 @@
 Index: proftpd-dfsg/contrib/mod_sftp/fxp.c
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/fxp.c	2013-01-08 14:04:43.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/fxp.c	2013-01-08 14:10:11.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_sftp/fxp.c	2013-01-08 14:11:42.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/fxp.c	2013-01-08 14:47:58.000000000 +0100
 @@ -6093,7 +6093,7 @@
    (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
      "creating directory '%s' with mode 0%o", path, (unsigned int) dir_mode);
@@ -13,8 +13,8 @@ Index: proftpd-dfsg/contrib/mod_sftp/fxp.c
      int xerrno = errno;
 Index: proftpd-dfsg/contrib/mod_sftp/scp.c
 ===================================================================
---- proftpd-dfsg.orig/contrib/mod_sftp/scp.c	2013-01-08 14:04:43.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/scp.c	2013-01-08 14:10:11.000000000 +0100
+--- proftpd-dfsg.orig/contrib/mod_sftp/scp.c	2013-01-08 14:11:42.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/scp.c	2013-01-08 14:47:58.000000000 +0100
 @@ -731,7 +731,7 @@
           * recursive directory uploads via SCP?
           */
@@ -26,9 +26,17 @@ Index: proftpd-dfsg/contrib/mod_sftp/scp.c
            (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
 Index: proftpd-dfsg/include/fsio.h
 ===================================================================
---- proftpd-dfsg.orig/include/fsio.h	2013-01-08 14:04:43.000000000 +0100
-+++ proftpd-dfsg/include/fsio.h	2013-01-08 14:10:11.000000000 +0100
-@@ -243,6 +243,7 @@
+--- proftpd-dfsg.orig/include/fsio.h	2013-01-08 14:11:42.000000000 +0100
++++ proftpd-dfsg/include/fsio.h	2013-01-08 14:49:28.000000000 +0100
+@@ -125,6 +125,7 @@
+   int (*fchmod)(pr_fh_t *, int, mode_t);
+   int (*chown)(pr_fs_t *, const char *, uid_t, gid_t);
+   int (*fchown)(pr_fh_t *, int, uid_t, gid_t);
++  int (*lchown)(pr_fs_t *, const char *, uid_t, gid_t);
+   int (*access)(pr_fs_t *, const char *, int, uid_t, gid_t, array_header *);
+   int (*faccess)(pr_fh_t *, int, uid_t, gid_t, array_header *);
+   int (*utimes)(pr_fs_t *, const char *, struct timeval *);
+@@ -243,6 +244,7 @@
  int pr_fsio_rmdir(const char *);
  int pr_fsio_rename(const char *, const char *);
  int pr_fsio_rename_canon(const char *, const char *);
@@ -36,10 +44,18 @@ Index: proftpd-dfsg/include/fsio.h
  int pr_fsio_unlink(const char *);
  int pr_fsio_unlink_canon(const char *);
  pr_fh_t *pr_fsio_open(const char *, int);
+@@ -266,6 +268,7 @@
+ int pr_fsio_fchown(pr_fh_t *, uid_t, gid_t);
+ int pr_fsio_chown_canon(const char *, uid_t, gid_t);
+ int pr_fsio_chroot(const char *);
++int pr_fsio_lchown(const char *, uid_t, gid_t);
+ int pr_fsio_access(const char *, int, uid_t, gid_t, array_header *);
+ int pr_fsio_faccess(pr_fh_t *, int, uid_t, gid_t, array_header *);
+ int pr_fsio_utimes(const char *, struct timeval *);
 Index: proftpd-dfsg/modules/mod_core.c
 ===================================================================
---- proftpd-dfsg.orig/modules/mod_core.c	2013-01-08 14:04:43.000000000 +0100
-+++ proftpd-dfsg/modules/mod_core.c	2013-01-08 14:10:11.000000000 +0100
+--- proftpd-dfsg.orig/modules/mod_core.c	2013-01-08 14:11:42.000000000 +0100
++++ proftpd-dfsg/modules/mod_core.c	2013-01-08 14:47:58.000000000 +0100
 @@ -4617,7 +4617,8 @@
      return PR_ERROR(cmd);
    }
@@ -124,8 +140,8 @@ Index: proftpd-dfsg/modules/mod_core.c
  
 Index: proftpd-dfsg/src/fsio.c
 ===================================================================
---- proftpd-dfsg.orig/src/fsio.c	2013-01-08 14:04:43.000000000 +0100
-+++ proftpd-dfsg/src/fsio.c	2013-01-08 14:11:21.000000000 +0100
+--- proftpd-dfsg.orig/src/fsio.c	2013-01-08 14:11:42.000000000 +0100
++++ proftpd-dfsg/src/fsio.c	2013-01-08 14:47:58.000000000 +0100
 @@ -29,6 +29,7 @@
   */
  

-- 
ProFTPD core package