sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ftp/proftpd to 1.3.7a

Browse source
This commit is contained in:
Martin Matuska 2021-01-09 13:52:20 +00:00
parent 391acded85
commit 23c8cf4bcc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=560864
10 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
databases/proftpd-mod_sql_tds/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1593951153 TIMESTAMP = 1610199261
SHA256 (proftpd-1.3.6d.tar.gz) = c338e2e25d1b6f51d397af154a0124fc42eee6b7ff99a2d976777d6b2f97c096 SHA256 (proftpd-1.3.7a.tar.gz) = 8b7bbf9757988935352d9dec5ebf96b6a1e6b63a6cdac2e93202ac6c42c4cd96
SIZE (proftpd-1.3.6d.tar.gz) = 20277407 SIZE (proftpd-1.3.7a.tar.gz) = 20414571
SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
SIZE (mod_sql_tds-4.13.tar.gz) = 11688 SIZE (mod_sql_tds-4.13.tar.gz) = 11688

6
ftp/proftpd-mod_vroot/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1593951192 TIMESTAMP = 1610199579
SHA256 (proftpd-1.3.6d.tar.gz) = c338e2e25d1b6f51d397af154a0124fc42eee6b7ff99a2d976777d6b2f97c096 SHA256 (proftpd-1.3.7a.tar.gz) = 8b7bbf9757988935352d9dec5ebf96b6a1e6b63a6cdac2e93202ac6c42c4cd96
SIZE (proftpd-1.3.6d.tar.gz) = 20277407 SIZE (proftpd-1.3.7a.tar.gz) = 20414571
SHA256 (proftpd-mod_vroot-0.9.5.tar.gz) = 148384a33ee388bbb5dda36a09a944b2c528e1d46dc47e4d3aaedc37b14439be SHA256 (proftpd-mod_vroot-0.9.5.tar.gz) = 148384a33ee388bbb5dda36a09a944b2c528e1d46dc47e4d3aaedc37b14439be
SIZE (proftpd-mod_vroot-0.9.5.tar.gz) = 95664 SIZE (proftpd-mod_vroot-0.9.5.tar.gz) = 95664

5
ftp/proftpd/Makefile
View file

@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd
RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd
.endif .endif
PROFTPD_VERSION= 1.3.6d PROFTPD_VERSION= 1.3.7a
.if defined(_BUILDING_PROFTPD_MODULE) .if defined(_BUILDING_PROFTPD_MODULE)
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
@ -202,7 +202,8 @@ post-configure:
.if defined(_BUILDING_PROFTPD_MODULE) .if defined(_BUILDING_PROFTPD_MODULE)
pre-build: pre-build:
@cd ${WRKSRC} && ${MAKE} include/buildstamp.h @cd ${WRKSRC} && ${MAKE_CMD} include/buildstamp.h
pre-install: pre-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/proftpd

6
ftp/proftpd/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1593672290 TIMESTAMP = 1610198036
SHA256 (proftpd-1.3.6d.tar.gz) = c338e2e25d1b6f51d397af154a0124fc42eee6b7ff99a2d976777d6b2f97c096 SHA256 (proftpd-1.3.7a.tar.gz) = 8b7bbf9757988935352d9dec5ebf96b6a1e6b63a6cdac2e93202ac6c42c4cd96
SIZE (proftpd-1.3.6d.tar.gz) = 20277407 SIZE (proftpd-1.3.7a.tar.gz) = 20414571

14
ftp/proftpd/files/patch-contrib_mod__sftp_Makefile.in
View file

@ -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 +++ contrib/mod_sftp/Makefile.in
@@ -60,8 +60,9 @@ install: install-misc @@ -73,8 +73,9 @@ install-headers: $(DESTDIR)$(includedir)/proftpd
fi $(INSTALL_MAN) $(MODULE_NAME).h $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME).h
install-misc: 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 $(top_srcdir)/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)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(sysconfdir)/proftpd + $(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 $(top_srcdir)/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)/blacklist.dat $(DESTDIR)$(sysconfdir)/proftpd/blacklist.dat.sample
clean: clean:
$(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o

11
ftp/proftpd/files/patch-doc_Configuration.html
View file

@ -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 +++ doc/Configuration.html
@@ -4359,7 +4359,7 @@ CLASS="SYNOPSIS" @@ -4349,7 +4349,7 @@ CLASS="SYNOPSIS"
></DT ></DT
><DD ><DD
><P ><P
@ -9,10 +9,3 @@
></DD ></DD
><DT ><DT
><PRE ><PRE
@@ -35399,4 +35399,4 @@ CLASS="LITERALLAYOUT"
></TABLE
></BODY
></HTML
->
\ No newline at end of file
+>

16
ftp/proftpd/files/patch-sample-configurations_basic.conf
View file

@ -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 +++ sample-configurations/basic.conf
@@ -1,3 +1,7 @@ @@ -1,3 +1,7 @@
+# +#
@ -61,7 +61,12 @@
- DisplayChdir .message - DisplayChdir .message
+ ### We want clients to be able to login with "anonymous" as well as "ftp" + ### We want clients to be able to login with "anonymous" as well as "ftp"
+ # UserAlias anonymous ftp + # UserAlias anonymous ftp
+
- # Limit WRITE everywhere in the anonymous chroot
- <Limit WRITE>
- DenyAll
- </Limit>
-</Anonymous>
+ ### Limit the maximum number of anonymous logins + ### Limit the maximum number of anonymous logins
+ # MaxClients 10 + # MaxClients 10
+ +
@ -75,9 +80,4 @@
+ # DenyAll + # DenyAll
+ # </Limit> + # </Limit>
+#</Anonymous> +#</Anonymous>
+
- # Limit WRITE everywhere in the anonymous chroot
- <Limit WRITE>
- DenyAll
- </Limit>
-</Anonymous>

6
ftp/proftpd/files/patch-src_fsio.c
View file

@ -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 +++ 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 # define NFS_SUPER_MAGIC 0x6969
#endif #endif
@ -11,7 +11,7 @@
typedef struct fsopendir fsopendir_t; typedef struct fsopendir fsopendir_t;
struct fsopendir { 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; return res;
} }

6
ftp/proftpd/pkg-plist
View file

@ -10,6 +10,7 @@ etc/PROFTPD-MIB.txt
@sample etc/proftpd.conf.sample @sample etc/proftpd.conf.sample
@sample etc/proftpd/dhparams.pem.sample @sample etc/proftpd/dhparams.pem.sample
@sample etc/proftpd/blacklist.dat.sample @sample etc/proftpd/blacklist.dat.sample
include/proftpd/acconfig.h
include/proftpd/ascii.h include/proftpd/ascii.h
include/proftpd/auth.h include/proftpd/auth.h
include/proftpd/bindings.h include/proftpd/bindings.h
@ -29,6 +30,7 @@ include/proftpd/dirtree.h
include/proftpd/display.h include/proftpd/display.h
include/proftpd/encode.h include/proftpd/encode.h
include/proftpd/env.h include/proftpd/env.h
include/proftpd/error.h
include/proftpd/event.h include/proftpd/event.h
include/proftpd/expr.h include/proftpd/expr.h
include/proftpd/feat.h include/proftpd/feat.h
@ -40,6 +42,7 @@ include/proftpd/hanson-tpl.h
include/proftpd/help.h include/proftpd/help.h
include/proftpd/ident.h include/proftpd/ident.h
include/proftpd/inet.h include/proftpd/inet.h
include/proftpd/jot.h
include/proftpd/json.h include/proftpd/json.h
include/proftpd/lastlog.h include/proftpd/lastlog.h
include/proftpd/libsupp.h include/proftpd/libsupp.h
@ -59,7 +62,9 @@ include/proftpd/modules.h
include/proftpd/netacl.h include/proftpd/netacl.h
include/proftpd/netaddr.h include/proftpd/netaddr.h
include/proftpd/netio.h include/proftpd/netio.h
include/proftpd/openbsd-blowfish.h
include/proftpd/options.h include/proftpd/options.h
include/proftpd/os.h
include/proftpd/parser.h include/proftpd/parser.h
include/proftpd/pidfile.h include/proftpd/pidfile.h
include/proftpd/pool.h include/proftpd/pool.h
@ -67,6 +72,7 @@ include/proftpd/pr-syslog.h
include/proftpd/privs.h include/proftpd/privs.h
include/proftpd/proctitle.h include/proftpd/proctitle.h
include/proftpd/proftpd.h include/proftpd/proftpd.h
include/proftpd/random.h
include/proftpd/redis.h include/proftpd/redis.h
include/proftpd/regexp.h include/proftpd/regexp.h
include/proftpd/response.h include/proftpd/response.h

6
security/proftpd-mod_clamav/distinfo
View file

@ -1,5 +1,5 @@
TIMESTAMP = 1593951146 TIMESTAMP = 1610199369
SHA256 (proftpd-1.3.6d.tar.gz) = c338e2e25d1b6f51d397af154a0124fc42eee6b7ff99a2d976777d6b2f97c096 SHA256 (proftpd-1.3.7a.tar.gz) = 8b7bbf9757988935352d9dec5ebf96b6a1e6b63a6cdac2e93202ac6c42c4cd96
SIZE (proftpd-1.3.6d.tar.gz) = 20277407 SIZE (proftpd-1.3.7a.tar.gz) = 20414571
SHA256 (mod_clamav-v0.14rc2.tar.gz) = 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e SHA256 (mod_clamav-v0.14rc2.tar.gz) = 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e
SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721 SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721