Update ftp/proftpd to 1.3.7a

4 files changed, 20 insertions, 27 deletions

diff --git a/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in b/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in
index 200cdf3a667e..ea361d9d8a18 100644
--- a/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in
+++ b/ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in
@@ -1,14 +1,14 @@
---- contrib/mod_sftp/Makefile.in.orig	2017-04-10 02:31:02 UTC
+--- contrib/mod_sftp/Makefile.in.orig	2020-07-21 17:25:51 UTC
 +++ contrib/mod_sftp/Makefile.in
-@@ -60,8 +60,9 @@ install: install-misc
- 	fi
+@@ -73,8 +73,9 @@ install-headers: $(DESTDIR)$(includedir)/proftpd
+ 	$(INSTALL_MAN) $(MODULE_NAME).h $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME).h
  
  install-misc:
--	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem 
--	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
 +	$(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/proftpd
-+	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/proftpd/dhparams.pem.sample
-+	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample
++	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/proftpd/dhparams.pem.sample
++	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample
  
  clean:
  	$(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o
diff --git a/ftp/proftpd/files/patch-doc_Configuration.html b/ftp/proftpd/files/patch-doc_Configuration.html
index c2152d21a6f4..4ae6f7863850 100644
--- a/ftp/proftpd/files/patch-doc_Configuration.html
+++ b/ftp/proftpd/files/patch-doc_Configuration.html
@@ -1,6 +1,6 @@
---- doc/Configuration.html.orig	2017-04-10 02:31:02 UTC
+--- doc/Configuration.html.orig	2020-07-21 17:25:51 UTC
 +++ doc/Configuration.html
-@@ -4359,7 +4359,7 @@ CLASS="SYNOPSIS"
+@@ -4349,7 +4349,7 @@ CLASS="SYNOPSIS"
  ></DT
  ><DD
  ><P
@@ -9,10 +9,3 @@
  ></DD
  ><DT
  ><PRE
-@@ -35399,4 +35399,4 @@ CLASS="LITERALLAYOUT"
- ></TABLE
- ></BODY
- ></HTML
-->
-\ No newline at end of file
-+>
diff --git a/ftp/proftpd/files/patch-sample-configurations_basic.conf b/ftp/proftpd/files/patch-sample-configurations_basic.conf
index d690121164a5..41544e20efb0 100644
--- a/ftp/proftpd/files/patch-sample-configurations_basic.conf
+++ b/ftp/proftpd/files/patch-sample-configurations_basic.conf
@@ -1,4 +1,4 @@
---- sample-configurations/basic.conf.orig	2017-04-10 02:31:02 UTC
+--- sample-configurations/basic.conf.orig	2020-07-21 17:25:51 UTC
 +++ sample-configurations/basic.conf
 @@ -1,3 +1,7 @@
 +#
@@ -61,7 +61,12 @@
 -  DisplayChdir			.message
 +  ### We want clients to be able to login with "anonymous" as well as "ftp"
 +  # UserAlias			anonymous ftp
-+
+ 
+-  # Limit WRITE everywhere in the anonymous chroot
+-  <Limit WRITE>
+-    DenyAll
+-  </Limit>
+-</Anonymous>
 +  ### Limit the maximum number of anonymous logins
 +  # MaxClients			10
 +
@@ -75,9 +80,4 @@
 +  #   DenyAll
 +  # </Limit>
 +#</Anonymous>
- 
--  # Limit WRITE everywhere in the anonymous chroot
--  <Limit WRITE>
--    DenyAll
--  </Limit>
--</Anonymous>
++
diff --git a/ftp/proftpd/files/patch-src_fsio.c b/ftp/proftpd/files/patch-src_fsio.c
index 2aeaf9b705fa..b8e32595d001 100644
--- a/ftp/proftpd/files/patch-src_fsio.c
+++ b/ftp/proftpd/files/patch-src_fsio.c
@@ -1,6 +1,6 @@
---- src/fsio.c.orig	2017-04-10 02:31:02 UTC
+--- src/fsio.c.orig	2020-07-21 17:25:51 UTC
 +++ src/fsio.c
-@@ -69,6 +69,10 @@ static size_t copy_iter_count = 0;
+@@ -70,6 +70,10 @@ static size_t copy_iter_count = 0;
  # define NFS_SUPER_MAGIC	0x6969
  #endif
  
@@ -11,7 +11,7 @@
  typedef struct fsopendir fsopendir_t;
  
  struct fsopendir {
-@@ -1041,7 +1045,30 @@ static int sys_fsetxattr(pool *p, pr_fh_
+@@ -1109,7 +1113,30 @@ static int sys_fsetxattr(pool *p, pr_fh_t *fh, int fd,
    return res;
  }