[SCM] proftpd-dfsg branch, squeeze, updated. debian/1.3.3a-6-11-gd3ad62c

[Francesco Paolo Lovergine]

The following commit has been merged in the squeeze branch:
commit d3ad62c4e0f47d55719c974414859cf3b632522f
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Jan 8 13:41:35 2013 +0100

    Another fix for patch 3841 and true application of the patch :)

diff --git a/debian/patches/00list b/debian/patches/00list
index 9f522f8..d4d0eb3 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -21,3 +21,4 @@ mod_vroot
 CVE-2011-1137
 3624
 3711
+3841
diff --git a/debian/patches/3841.dpatch b/debian/patches/3841.dpatch
index 8b76905..88560fc 100755
--- a/debian/patches/3841.dpatch
+++ b/debian/patches/3841.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' proftpd-dfsg~/contrib/mod_sftp/fxp.c proftpd-dfsg/contrib/mod_sftp/fxp.c
---- proftpd-dfsg~/contrib/mod_sftp/fxp.c	2013-01-08 12:34:48.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/fxp.c	2013-01-08 12:45:43.000000000 +0100
+--- proftpd-dfsg~/contrib/mod_sftp/fxp.c	2013-01-08 13:25:42.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/fxp.c	2013-01-08 13:25:42.000000000 +0100
 @@ -5341,6 +5341,7 @@
    uint32_t attr_flags, buflen, bufsz, status_code;
    struct fxp_packet *resp;
@@ -28,7 +28,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' proftpd-dfsg~/contrib/mod_sftp/scp.c proftpd-dfsg/contrib/mod_sftp/scp.c
 --- proftpd-dfsg~/contrib/mod_sftp/scp.c	2013-01-08 12:34:48.000000000 +0100
-+++ proftpd-dfsg/contrib/mod_sftp/scp.c	2013-01-08 12:45:43.000000000 +0100
++++ proftpd-dfsg/contrib/mod_sftp/scp.c	2013-01-08 13:25:42.000000000 +0100
 @@ -711,7 +711,7 @@
        if (xerrno == ENOENT) {
          pr_trace_msg(trace_channel, 5, "creating directory '%s'", sp->filename);
@@ -40,7 +40,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
            (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION,
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' proftpd-dfsg~/include/fsio.h proftpd-dfsg/include/fsio.h
 --- proftpd-dfsg~/include/fsio.h	2013-01-08 12:34:48.000000000 +0100
-+++ proftpd-dfsg/include/fsio.h	2013-01-08 12:53:50.000000000 +0100
++++ proftpd-dfsg/include/fsio.h	2013-01-08 13:25:42.000000000 +0100
 @@ -129,6 +129,7 @@
    int (*fchmod)(pr_fh_t *, int, mode_t);
    int (*chown)(pr_fs_t *, const char *, uid_t, gid_t);
@@ -67,7 +67,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  int pr_fsio_access(const char *, int, uid_t, gid_t, array_header *);
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' proftpd-dfsg~/modules/mod_core.c proftpd-dfsg/modules/mod_core.c
 --- proftpd-dfsg~/modules/mod_core.c	2013-01-08 12:34:48.000000000 +0100
-+++ proftpd-dfsg/modules/mod_core.c	2013-01-08 12:45:43.000000000 +0100
++++ proftpd-dfsg/modules/mod_core.c	2013-01-08 13:25:42.000000000 +0100
 @@ -4048,7 +4048,8 @@
      return PR_ERROR(cmd);
    }
@@ -152,7 +152,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' proftpd-dfsg~/src/fsio.c proftpd-dfsg/src/fsio.c
 --- proftpd-dfsg~/src/fsio.c	2013-01-08 12:34:48.000000000 +0100
-+++ proftpd-dfsg/src/fsio.c	2013-01-08 12:50:19.000000000 +0100
++++ proftpd-dfsg/src/fsio.c	2013-01-08 13:35:09.000000000 +0100
 @@ -29,6 +29,7 @@
   */
  
@@ -343,11 +343,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
  int pr_fsio_rmdir(const char *path) {
    int res;
    pr_fs_t *fs;
-@@ -3335,6 +3504,33 @@
- 
+@@ -3336,6 +3505,33 @@
    return res;
  }
-+
+ 
 +int pr_fsio_lchown(const char *name, uid_t uid, gid_t gid) {
 +  int res;
 +  pr_fs_t *fs;
@@ -374,6 +373,25 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
 +
 +  return res;
 +}
- 
++
  int pr_fsio_access(const char *path, int mode, uid_t uid, gid_t gid,
      array_header *suppl_gids) {
+   pr_fs_t *fs;
+@@ -3955,6 +4151,7 @@
+   root_fs->fchmod = sys_fchmod;
+   root_fs->chown = sys_chown;
+   root_fs->fchown = sys_fchown;
++  root_fs->lchown = sys_lchown;
+   root_fs->access = sys_access;
+   root_fs->faccess = sys_faccess;
+   root_fs->utimes = sys_utimes;
+@@ -4036,6 +4233,9 @@
+   if (fs->chown)
+     hooks = pstrcat(p, hooks, *hooks ? ", " : "", "chown(2)", NULL);
+ 
++  if (fs->lchown)
++    hooks = pstrcat(p, hooks, *hooks ? ", " : "", "lchown(2)", NULL);
++
+   if (fs->access)
+     hooks = pstrcat(p, hooks, *hooks ? ", " : "", "access(2)", NULL);
+ 

-- 
ProFTPD core package