Sat Oct 16 19:46:42 2021 UTC ()
Update proftpd to 1.3.7c

1.3.7c
  + Fix memory disclosure to RADIUS servers by mod_radius (Issue #1284).
  + PCRE expressions with capture groups were not being handled properly
    (Issue #1300).

1.3.7b
  + Fixed occasional segfaults with FTPS data transfers using TLSv1.3, when
    session tickets cannot be decrypted (Issue #1063).
  + Passive transfers fail unexpectedly due to use of SO_REUSEPORT socket
    option (Issue #1171).
  + Implemented support for Redis 6.x AUTH semantics (Issue #1070).
  + Fixed memory use-after-free issue in mod_sftp which can cause unexpected
    login/authentication issues.
  + Fixed SQL syntax regression for some generated SQL statements
    (Issue #1149).
  + Fixed "Corrupted MAC on inptut" errors when SFTP uses the
    umac-64@openssh.com digest (Issue #1111).

1.3.7a
  + Fix build-time regression when using the --localstatedir configure option.

1.3.7
  + Support the SOURCE_DATE_EPOCH environment variable, for reproducible
    builds (Issue #1038).

1.3.7rc4
  + Implemented support for configuring certificate options for LDAP
    connections using SSL/TLS.
  + Fixed issue with FTPS uploads of large files using TLSv1.3 (Issue #959).
  + Fixed handling of IPv6 addresses in From directives (Issue #682).
  + Added -b and -n command-line options to ftptop.
  + Ignore supplemental groups when run as non-root user (Issue #808).
  + Use re-entrant versions of time functions where available (Issue #983).
  + New Configuration Directives
    BanOptions
      The BanOptions directive is used to tune mod_ban behavior, such as
      creating ban entries that match/apply to all <VirtualHost> sections.
      See doc/contrib/mod_ban.html#BanOptions for more details.
    LDAPUseSASL
      The LDAPUseSASL directive configures a list of SASL authentication
      mechanisms to use, when using the LDAPBindDN to bind to the LDAP
      server.  See doc/contrib/mod_ldap.html#LDAPUseSASL for details.
    LogOptions
      The LogOptions directive is used to modify the default logging format
      for ProFTPD syslog, debug, and module logging.  See
      doc/modules/mod_log.html#LogOptions for more information.
    SQLKeepAlive
      The SQLKeepAlive directive configures a periodic "keepalive" query
      for ensuring the connection between mod_sql and the backend database
      server.  See doc/contrib/mod_sql.html#SQLKeepAlive for more information.
  + Changed Configuration Directives
    LDAPServer
      The LDAPServer directive now supports configuring the trusted CA
      file, client certificate and key files, SSL ciphers, and verification
      policies for LDAP connections.  See doc/contrib/mod_ldap.html#LDAPServer
      for more details.
    TraceOptions
      The TraceOptions directive now supports a "Timestamp" option, for
      disabling inclusion of timestamps in Trace logs.
  + Developer notes
    When MaxLoginAttempts is reach, the POST_CMD_ERR/LOG_CMD_ERR command
    handler phases will now run.  This allows interested modules, such
    as mod_exec and others, to react to these events (Issue #718).

1.3.7rc3
  + Fixed regression in directory listing latency (Issue #863).
  + Fixed use-after-free vulnerability during data transfers (Issue #903).
  + Addressed out-of-bounds read in mod_cap by removing bundled libcap, and
    relying solely on the system-provided libcap (Issue #902).  Note that
    building ProFTPD from source will *not* automatically include the
    mod_cap module, unless the libcap library is available.
  + mod_sftp now supports OpenSSH-specific private host keys (Issue #793).
    Newer versions of OpenSSH ssh-keygen(1) automatically generate private
    keys formatted with this OpenSSH-specific format.
  + mod_sftp now supports Ed25519 keys (Bug #4221).
  + mod_sftp now supports RSA SHA-2 publickey signatures, per RFC 8332
    (Issue #907).
  + mod_tls now honors client-provided SNI as part of the TLS handshake,
    for implementing name-based virtual hosts via TLS SNI.
  + Changed Configuration Directives
    LogFormat %{transfer-port}
      The LogFormat directive supports a %{transfer-port} variable for
      logging the selected data transfer port.
    SFTPOptions NoExtensionNegotiation
      The mod_sftp module now supports SSH extension negotations (RFC 8332).
      If there any issues with this support, it can be disabled using:
        SFTPOptions NoExtensionNegotiation
    SQLAuthTypes bcrypt
      The mod_sql_passwd module now supports bcrypt-encrypted passwords.
      This can be enabled using:
        SQLAuthTypes bcrypt
      in your mod_sql configuration.  See doc/contrib/mod_sql_password.html
      for more information.
    TLSOption IgnoreSNI
      The TLSOption directive now supports an "IgnoreSNI" setting, to
      tell mod_tls to ignore/not use any SNI, provided by the client in the
      TLS handshake, for determining any name-based virtual hosts.  See
      doc/contrib/mod_tls.html#TLSOption for more details.
  + Added API
    FSIO pread(2), pwrite(2) (Issue#317)

1.3.7rc2
  + Fixed pre-authentication remote denial-of-service issue (Issue #846,
    CVE-2019-18217).

1.3.7rc1
  + RootRevoke is now on by default, meaning that once authentication succeeds,
    all root privileges are dropped by default, unless the UserOwner directive
    (which requires root privileges) is used (Bug#4241).
  + The mod_ident module is no longer automatically built by default.
    To include the mod_ident module in the build, it must be explicitly
    requested via --enable-ident or --with-shared=mod_ident.
    This means that configuration files using the IdentLookups directive
    will now want to using an enclosing <IfModule> section, like so:
      <IfModule mod_ident.c>
        IdentLookups off
      </IfModule>
  + The mod_tls module now performs basic sanity checks of configured TLS
    files on startup (Issue#491).
  + The mod_deflate module now supports MODE Z data transfers when TLS
    is used (Issue#505).
  + The mod_xfer module now supports the RANG FTP command; see
    https://tools.ietf.org/html/draft-bryan-ftp-range-08 (Issue#351).
  + The ftpasswd script now supports a --change-home option, for changing
    the home directory of a user in an AuthUserFile (Issue#566).
  + The ftpasswd script supports deleting a user from a group (Issue#620).
  + Refactored the LogFormat handling code so that it is not longer
    duplicated by mod_log, mod_sql, etc.  The new Jot API is the common API
    to be used by modules for LogFormat variables and logging.
  + Generated new DH parameters for mod_sftp, mod_tls.
  + New Configuration Directives
    AuthFileOptions
      The mod_auth_file module supports a configuration directive for disabling
      its requirement for secure permissions on configured
      AuthUserFile/AuthGroupFile.  See
      doc/modules/mod_auth_file.html#AuthFileOptions for information.
    RedisLogOnEvent
      The mod_redis module can be configured to log JSON messages based on
      specified events (Issue#392).  See the
      doc/modules/mod_redis.html#RedisLogOnEvent documentation for details.
    RedisOptions
      The mod_redis module now implements a RedisOptions directive, for tuning
      some of the module behavior (Issue#477).  The
      doc/modules/mod_redis.html#RedisOptions documentation has more details.
    RedisSentinel
      The mod_redis module now supports use of Redis Sentinels (Issue#396);
      see doc/modules/mod_redis.html#RedisSentinel.
  + Changed Configuration Directives
    AllowForeignAddress class-name
      The AllowForeignAddress directive supports a Class name, for finer-grained
      control over which clients are allowed to use foreign/mismatching IP
      addresses for transfers.  See
      doc/modules/mod_core.html#AllowForeignAddress for more information.
    ExecEnviron %b
      The ExecEnviron directive has been fixed to properly resolve the %b
      LogFormat variable (Issue#515).
    RedisServer db-index (Issue#550)
      The mod_redis module can now be configured to select a database index
      via the RedisServer directive (Issue#550).  See the
      doc/modules/mod_redis.html#RedisServer documentation for details.
    RewriteMap idnatrans
      The mod_rewrite module can now support rewriting `idn` to `idna`
      formats (Issue#231).  See the doc/modules/mod_rewrite#RewriteMap for
      details on how to do so.
    RootRevoke on
      The RootRevoke directive is now enabled by default (Bug#4241).  This
      makes for more secure configurations/sessions out-of-the-box.  See
      doc/modules/mod_auth.html#RootRevoke for more information.
    SFTPCiphers, SFTPDigests
      Some weak algorithms are now disabled by default in mod_sftp (Bug#4279).
      These algorithms, if need be, can be explicitly enabled by configuration;
      they are just not enabled automatically.  For list of the algorithms
      affected, see doc/contrib/mod_sftp.html#SFTPCiphers,
      doc/contrib/mod_sftp.html#SFTPDigests.
    SFTPOptions IncludeSFTPTimes
      The SFTOptions directive of mod_sftp now supports an option for explicitly
      including the timestamps of files when SFTP protocol 4 and higher are
      used, even if the SFTP client did not request these timestamps.  This
      works around a bug in the popular Rebex SFTP library; see
      doc/contrib/mod_sftp.html#SFTPOptions for details.
    TLSProtocol TLSv1.3
      The mod_tls module, and its TLSProtocol directive, now support TLSv1.3
      (Issue#536).  See doc/contrib/mod_tls.html#TLSProtocol for more
      information.
    TLSServerCipherPreference
      The TLSServerCipherPreference directive is now enabled by default.
      See doc/contrib/mod_tls.html#TLSServerCipherPrefrence.
    TLSStaplingOptions NoFakeTryLater
      Some TLS clients have trouble with the "fake" OCSP response that mod_tls
      might stable, when the client requested stapled OCSP responses and
      mod_tls is unable to contact the OCSP responder.  Use this option to
      disable such fake responses (Issue#518):
        TLSStaplingOptions NoFakeTryLater
      See doc/contrib/mod_tls.html#TLSStaplingOptions for details.
  + Removed Configuration Directives
    The following directives have been removed:
      GroupPassword
      LoginPasswordPrompt
      TransferPriority


(tm)
diff -r1.92 -r1.93 pkgsrc/net/proftpd/Makefile
diff -r1.12 -r1.13 pkgsrc/net/proftpd/Makefile.common
diff -r1.1 -r1.2 pkgsrc/net/proftpd/Makefile.module
diff -r1.28 -r1.29 pkgsrc/net/proftpd/PLIST
diff -r1.52 -r1.53 pkgsrc/net/proftpd/distinfo
diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-Make.rules.in
diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c
diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-include_pfilter.h
diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-src_pfilter.c
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-Makefile.in
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-configure.in
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_configure.in
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.h.in
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in
diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-src_main.c
diff -r0 -r1.1 pkgsrc/net/proftpd/patches/patch-src_pidfile.c

cvs diff -r1.92 -r1.93 pkgsrc/net/proftpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/proftpd/Makefile 2021/05/24 19:53:36 1.92
+++ pkgsrc/net/proftpd/Makefile 2021/10/16 19:46:41 1.93
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.92 2021/05/24 19:53:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.93 2021/10/16 19:46:41 tm Exp $
2 2
3#PKGREVISION= 2 3#PKGREVISION= 2
4PKGREVISION= 2 
5.include "../../net/proftpd/Makefile.common" 4.include "../../net/proftpd/Makefile.common"
6 5
7COMMENT= Highly configurable FTP server software 6COMMENT= Highly configurable FTP server software
8 7
9MODULES+= \ 8MODULES+= \
10 mod_ban \ 9 mod_ban \
11 mod_copy \ 10 mod_copy \
12 mod_ctrls_admin \ 11 mod_ctrls_admin \
13 mod_deflate \ 12 mod_deflate \
14 mod_dnsbl \ 13 mod_dnsbl \
15 mod_dynmasq \ 14 mod_dynmasq \
16 mod_exec \ 15 mod_exec \
17 mod_ifsession \ 16 mod_ifsession \
@@ -45,26 +44,25 @@ RCD_SCRIPTS= proftpd @@ -45,26 +44,25 @@ RCD_SCRIPTS= proftpd
45REPLACE_PERL+= contrib/ftpasswd 44REPLACE_PERL+= contrib/ftpasswd
46REPLACE_PERL+= contrib/ftpmail 45REPLACE_PERL+= contrib/ftpmail
47REPLACE_PERL+= contrib/ftpquota 46REPLACE_PERL+= contrib/ftpquota
48REPLACE_PERL+= src/prxs.in 47REPLACE_PERL+= src/prxs.in
49 48
50CONF_FILES= ${PREFIX}/share/examples/proftpd/basic.conf \ 49CONF_FILES= ${PREFIX}/share/examples/proftpd/basic.conf \
51 ${PKG_SYSCONFDIR}/proftpd.conf 50 ${PKG_SYSCONFDIR}/proftpd.conf
52 51
53INSTALLATION_DIRS+= lib/proftpd 52INSTALLATION_DIRS+= lib/proftpd
54INSTALLATION_DIRS+= share/doc/proftpd 53INSTALLATION_DIRS+= share/doc/proftpd
55INSTALLATION_DIRS+= share/examples/proftpd 54INSTALLATION_DIRS+= share/examples/proftpd
56 55
57post-install: 56post-install:
58.for i in NEWS README.md README.IPv6 README.LDAP README.PAM README.capabilities \ 57.for i in NEWS README.md README.LDAP README.modules
59 README.classes README.controls README.facl README.modules 
60 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd 58 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd
61.endfor 59.endfor
62.for i in Configuration.html faq.html license.txt 60.for i in Configuration.html faq.html license.txt
63 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd 61 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd
64.endfor 62.endfor
65 ${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \ 63 ${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \
66 ${DESTDIR}${PREFIX}/share/examples/proftpd 64 ${DESTDIR}${PREFIX}/share/examples/proftpd
67 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \ 65 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \
68 ${DESTDIR}${PREFIX}/share/examples/proftpd 66 ${DESTDIR}${PREFIX}/share/examples/proftpd
69 67
70.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/net/proftpd/Makefile.common (expand / switch to unified diff)

--- pkgsrc/net/proftpd/Makefile.common 2020/05/10 14:22:48 1.12
+++ pkgsrc/net/proftpd/Makefile.common 2021/10/16 19:46:41 1.13
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.12 2020/05/10 14:22:48 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.13 2021/10/16 19:46:41 tm Exp $
2 2
3# used by net/proftpd/Makefile 3# used by net/proftpd/Makefile
4# used by net/proftpd/Makefile.module 4# used by net/proftpd/Makefile.module
5 5
6DISTNAME= proftpd-1.3.6c 6DISTNAME= proftpd-1.3.7c
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ 8MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/
9MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/ 9MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/
10MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ 10MASTER_SITES+= ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
11 11
12#PATCH_SITES= https://github.com/proftpd/proftpd/commit/ 12#PATCH_SITES= https://github.com/proftpd/proftpd/commit/
13#PATCH_DIST_STRIP= -p1 13#PATCH_DIST_STRIP= -p1
14# For CVE-2017-7418 14# For CVE-2017-7418
15#PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch 15#PATCHFILES= ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch
16 16
17MAINTAINER= pkgsrc-users@NetBSD.org 17MAINTAINER= pkgsrc-users@NetBSD.org
18HOMEPAGE= http://www.proftpd.org/ 18HOMEPAGE= http://www.proftpd.org/
19LICENSE= gnu-gpl-v2 19LICENSE= gnu-gpl-v2
@@ -26,26 +26,29 @@ USE_LIBTOOL= yes @@ -26,26 +26,29 @@ USE_LIBTOOL= yes
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27GNU_CONFIGURE_STRICT= no # has sub-configures 27GNU_CONFIGURE_STRICT= no # has sub-configures
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
29CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/proftpd 29CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/proftpd
30CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run 30CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run
31CONFIGURE_ARGS+= --disable-sendfile 31CONFIGURE_ARGS+= --disable-sendfile
32CONFIGURE_ARGS+= --disable-strip 32CONFIGURE_ARGS+= --disable-strip
33CONFIGURE_ARGS+= --enable-ctrls 33CONFIGURE_ARGS+= --enable-ctrls
34CONFIGURE_ARGS+= --enable-nls 34CONFIGURE_ARGS+= --enable-nls
35CONFIGURE_ARGS+= --enable-dso 35CONFIGURE_ARGS+= --enable-dso
36CONFIGURE_ENV+= install_group=${ROOT_GROUP} 36CONFIGURE_ENV+= install_group=${ROOT_GROUP}
37CONFIGURE_ENV+= install_user=${ROOT_USER} 37CONFIGURE_ENV+= install_user=${ROOT_USER}
38 38
 39CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
 40CFLAGS.SunOS+= -Du_int64_t=uint64_t -Du_int32_t=uint32_t -Du_int16_t=uint16_t -Du_int8_t=uint8_t
 41
39BUILD_DEFS+= VARBASE 42BUILD_DEFS+= VARBASE
40 43
41CHECK_SHLIBS_SKIP= libexec/proftpd/*.a 44CHECK_SHLIBS_SKIP= libexec/proftpd/*.a
42CHECK_SSP_SKIP= ${CHECK_SHLIBS_SKIP} 45CHECK_SSP_SKIP= ${CHECK_SHLIBS_SKIP}
43 46
44pre-configure: 47pre-configure:
45 cd ${WRKSRC} && ${TOOLS_CMD.autoconf} &&\ 48 cd ${WRKSRC} && ${TOOLS_CMD.autoconf} &&\
46 cd contrib/mod_load && ${TOOLS_CMD.autoconf} 49 cd contrib/mod_load && ${TOOLS_CMD.autoconf}
47 50
48.include "options.mk" 51.include "options.mk"
49 52
50.include "../../devel/gettext-lib/buildlink3.mk" 53.include "../../devel/gettext-lib/buildlink3.mk"
51.include "../../devel/zlib/buildlink3.mk" 54.include "../../devel/zlib/buildlink3.mk"

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/Makefile.module (expand / switch to unified diff)

--- pkgsrc/net/proftpd/Makefile.module 2015/09/25 10:01:37 1.1
+++ pkgsrc/net/proftpd/Makefile.module 2021/10/16 19:46:42 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.module,v 1.1 2015/09/25 10:01:37 wiedi Exp $ 1# $NetBSD: Makefile.module,v 1.2 2021/10/16 19:46:42 tm Exp $
2 2
3# used by net/proftpd-geoip/Makefile 3# used by net/proftpd-geoip/Makefile
4# used by net/proftpd-ldap/Makefile 4# used by net/proftpd-ldap/Makefile
5# used by net/proftpd-memcached/Makefile 5# used by net/proftpd-memcached/Makefile
6# used by net/proftpd-mysql/Makefile 6# used by net/proftpd-mysql/Makefile
7# used by net/proftpd-odbc/Makefile 7# used by net/proftpd-odbc/Makefile
8# used by net/proftpd-postgresql/Makefile 8# used by net/proftpd-postgresql/Makefile
9# used by net/proftpd-sqlite/Makefile 9# used by net/proftpd-sqlite/Makefile
10 10
11.include "../../net/proftpd/Makefile.common" 11.include "../../net/proftpd/Makefile.common"
12 12
13BUILD_TARGET= shared 13BUILD_TARGET= shared
14BUILD_DIRS= modules 14BUILD_DIRS= modules
15INSTALLATION_DIRS+= libexec/proftpd 15INSTALLATION_DIRS+= libexec/proftpd
16 16
17DEPENDS+= proftpd>=${PKGVERSION_NOREV}:../../net/proftpd 17DEPENDS+= proftpd>=${PKGVERSION_NOREV}:../../net/proftpd
18 18
19CPPFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/contrib 19CPPFLAGS+= -I${WRKSRC}/include -I${WRKSRC}/contrib
20 20
21pre-build: 21pre-build:
22 cd ${WRKSRC} && ${MAKE} include/buildstamp.h 22 cd ${WRKSRC} && ${GMAKE} include/buildstamp.h

cvs diff -r1.28 -r1.29 pkgsrc/net/proftpd/PLIST (expand / switch to unified diff)

--- pkgsrc/net/proftpd/PLIST 2019/10/07 19:29:47 1.28
+++ pkgsrc/net/proftpd/PLIST 2021/10/16 19:46:42 1.29
@@ -1,80 +1,86 @@ @@ -1,80 +1,86 @@
1@comment $NetBSD: PLIST,v 1.28 2019/10/07 19:29:47 christos Exp $ 1@comment $NetBSD: PLIST,v 1.29 2021/10/16 19:46:42 tm Exp $
2bin/ftpasswd 2bin/ftpasswd
3bin/ftpcount 3bin/ftpcount
4bin/ftpdctl 4bin/ftpdctl
5bin/ftpmail 5bin/ftpmail
6bin/ftpquota 6bin/ftpquota
7bin/ftptop 7bin/ftptop
8bin/ftpwho 8bin/ftpwho
9bin/prxs 9bin/prxs
 10include/proftpd/acconfig.h
10include/proftpd/ascii.h 11include/proftpd/ascii.h
11include/proftpd/auth.h 12include/proftpd/auth.h
12include/proftpd/bindings.h 13include/proftpd/bindings.h
13include/proftpd/buildstamp.h 14include/proftpd/buildstamp.h
14include/proftpd/ccan-json.h 15include/proftpd/ccan-json.h
15include/proftpd/child.h 16include/proftpd/child.h
16include/proftpd/class.h 17include/proftpd/class.h
17include/proftpd/cmd.h 18include/proftpd/cmd.h
18include/proftpd/compat.h 19include/proftpd/compat.h
19include/proftpd/conf.h 20include/proftpd/conf.h
20include/proftpd/config.h 21include/proftpd/config.h
21include/proftpd/configdb.h 22include/proftpd/configdb.h
22include/proftpd/ctrls.h 23include/proftpd/ctrls.h
23include/proftpd/data.h 24include/proftpd/data.h
24include/proftpd/default_paths.h 25include/proftpd/default_paths.h
25include/proftpd/dirtree.h 26include/proftpd/dirtree.h
26include/proftpd/display.h 27include/proftpd/display.h
27include/proftpd/encode.h 28include/proftpd/encode.h
28include/proftpd/env.h 29include/proftpd/env.h
 30include/proftpd/error.h
29include/proftpd/event.h 31include/proftpd/event.h
30include/proftpd/expr.h 32include/proftpd/expr.h
31include/proftpd/feat.h 33include/proftpd/feat.h
32include/proftpd/filter.h 34include/proftpd/filter.h
33include/proftpd/fsio.h 35include/proftpd/fsio.h
34include/proftpd/ftp.h 36include/proftpd/ftp.h
35include/proftpd/glibc-glob.h 37include/proftpd/glibc-glob.h
36include/proftpd/hanson-tpl.h 38include/proftpd/hanson-tpl.h
37include/proftpd/help.h 39include/proftpd/help.h
38include/proftpd/ident.h 40include/proftpd/ident.h
39include/proftpd/inet.h 41include/proftpd/inet.h
 42include/proftpd/jot.h
40include/proftpd/json.h 43include/proftpd/json.h
41include/proftpd/lastlog.h 44include/proftpd/lastlog.h
42include/proftpd/libsupp.h 45include/proftpd/libsupp.h
43include/proftpd/log.h 46include/proftpd/log.h
44include/proftpd/logfmt.h 47include/proftpd/logfmt.h
45include/proftpd/memcache.h 48include/proftpd/memcache.h
46include/proftpd/mkhome.h 49include/proftpd/mkhome.h
47include/proftpd/mod_ctrls.h 50include/proftpd/mod_ctrls.h
48include/proftpd/mod_dnsbl.h 51include/proftpd/mod_dnsbl.h
49include/proftpd/mod_load.h 52include/proftpd/mod_load.h
50include/proftpd/mod_quotatab.h 53include/proftpd/mod_quotatab.h
51include/proftpd/mod_sftp.h 54include/proftpd/mod_sftp.h
52include/proftpd/mod_sql.h 55include/proftpd/mod_sql.h
53include/proftpd/mod_tls.h 56include/proftpd/mod_tls.h
54include/proftpd/mod_wrap2.h 57include/proftpd/mod_wrap2.h
55include/proftpd/modules.h 58include/proftpd/modules.h
56include/proftpd/netacl.h 59include/proftpd/netacl.h
57include/proftpd/netaddr.h 60include/proftpd/netaddr.h
58include/proftpd/netio.h 61include/proftpd/netio.h
 62include/proftpd/openbsd-blowfish.h
59include/proftpd/options.h 63include/proftpd/options.h
 64include/proftpd/os.h
60include/proftpd/parser.h 65include/proftpd/parser.h
61include/proftpd/pfilter.h 66include/proftpd/pfilter.h
62include/proftpd/pidfile.h 67include/proftpd/pidfile.h
63include/proftpd/pool.h 68include/proftpd/pool.h
64include/proftpd/pr-syslog.h 69include/proftpd/pr-syslog.h
65include/proftpd/privs.h 70include/proftpd/privs.h
66include/proftpd/proctitle.h 71include/proftpd/proctitle.h
67include/proftpd/proftpd.h 72include/proftpd/proftpd.h
 73include/proftpd/random.h
68include/proftpd/redis.h 74include/proftpd/redis.h
69include/proftpd/regexp.h 75include/proftpd/regexp.h
70include/proftpd/response.h 76include/proftpd/response.h
71include/proftpd/rlimit.h 77include/proftpd/rlimit.h
72include/proftpd/scoreboard.h 78include/proftpd/scoreboard.h
73include/proftpd/session.h 79include/proftpd/session.h
74include/proftpd/sets.h 80include/proftpd/sets.h
75include/proftpd/signals.h 81include/proftpd/signals.h
76include/proftpd/stash.h 82include/proftpd/stash.h
77include/proftpd/str.h 83include/proftpd/str.h
78include/proftpd/support.h 84include/proftpd/support.h
79include/proftpd/table.h 85include/proftpd/table.h
80include/proftpd/throttle.h 86include/proftpd/throttle.h
@@ -125,43 +131,38 @@ man/man1/ftptop.1 @@ -125,43 +131,38 @@ man/man1/ftptop.1
125man/man1/ftpwho.1 131man/man1/ftpwho.1
126man/man5/proftpd.conf.5 132man/man5/proftpd.conf.5
127man/man5/xferlog.5 133man/man5/xferlog.5
128man/man8/ftpdctl.8 134man/man8/ftpdctl.8
129man/man8/ftpscrub.8 135man/man8/ftpscrub.8
130man/man8/ftpshut.8 136man/man8/ftpshut.8
131man/man8/proftpd.8 137man/man8/proftpd.8
132sbin/ftpscrub 138sbin/ftpscrub
133sbin/ftpshut 139sbin/ftpshut
134sbin/in.proftpd 140sbin/in.proftpd
135sbin/proftpd 141sbin/proftpd
136share/doc/proftpd/Configuration.html 142share/doc/proftpd/Configuration.html
137share/doc/proftpd/NEWS 143share/doc/proftpd/NEWS
138share/doc/proftpd/README.md 
139share/doc/proftpd/README.IPv6 
140share/doc/proftpd/README.LDAP 144share/doc/proftpd/README.LDAP
141share/doc/proftpd/README.PAM 145share/doc/proftpd/README.md
142share/doc/proftpd/README.capabilities 
143share/doc/proftpd/README.classes 
144share/doc/proftpd/README.controls 
145share/doc/proftpd/README.facl 
146share/doc/proftpd/README.modules 146share/doc/proftpd/README.modules
147share/doc/proftpd/faq.html 147share/doc/proftpd/faq.html
148share/doc/proftpd/license.txt 148share/doc/proftpd/license.txt
149share/examples/proftpd/anonymous.conf 149share/examples/proftpd/anonymous.conf
150share/examples/proftpd/basic.conf 150share/examples/proftpd/basic.conf
151share/examples/proftpd/blacklist.dat 151share/examples/proftpd/blacklist.dat
152share/examples/proftpd/complex-virtual.conf 152share/examples/proftpd/complex-virtual.conf
153share/examples/proftpd/dhparams.pem 153share/examples/proftpd/dhparams.pem
154share/examples/proftpd/ftpasswd 154share/examples/proftpd/ftpasswd
155share/examples/proftpd/mod_sql.conf 155share/examples/proftpd/mod_sql.conf
156share/examples/proftpd/virtual.conf 156share/examples/proftpd/virtual.conf
157share/locale/bg_BG/LC_MESSAGES/proftpd.mo 157share/locale/bg_BG/LC_MESSAGES/proftpd.mo
158share/locale/en_US/LC_MESSAGES/proftpd.mo 158share/locale/en_US/LC_MESSAGES/proftpd.mo
159share/locale/es_ES/LC_MESSAGES/proftpd.mo 159share/locale/es_ES/LC_MESSAGES/proftpd.mo
160share/locale/fr_FR/LC_MESSAGES/proftpd.mo 160share/locale/fr_FR/LC_MESSAGES/proftpd.mo
161share/locale/it_IT/LC_MESSAGES/proftpd.mo 161share/locale/it_IT/LC_MESSAGES/proftpd.mo
162share/locale/ja_JP/LC_MESSAGES/proftpd.mo 162share/locale/ja_JP/LC_MESSAGES/proftpd.mo
163share/locale/ko_KR/LC_MESSAGES/proftpd.mo 163share/locale/ko_KR/LC_MESSAGES/proftpd.mo
164share/locale/ru_RU/LC_MESSAGES/proftpd.mo 164share/locale/ru_RU/LC_MESSAGES/proftpd.mo
165share/locale/zh_CN/LC_MESSAGES/proftpd.mo 165share/locale/zh_CN/LC_MESSAGES/proftpd.mo
166share/locale/zh_TW/LC_MESSAGES/proftpd.mo 166share/locale/zh_TW/LC_MESSAGES/proftpd.mo
167@pkgdir lib/proftpd 167@pkgdir lib/proftpd
 168@pkgdir etc

cvs diff -r1.52 -r1.53 pkgsrc/net/proftpd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/proftpd/distinfo 2021/10/07 14:42:22 1.52
+++ pkgsrc/net/proftpd/distinfo 2021/10/16 19:46:42 1.53
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.52 2021/10/07 14:42:22 nia Exp $ 1$NetBSD: distinfo,v 1.53 2021/10/16 19:46:42 tm Exp $
2 2
3RMD160 (proftpd-1.3.6c.tar.gz) = 0fcb3453fef0c5a25b9605940b5840eacead8f40 3RMD160 (proftpd-1.3.7c.tar.gz) = e51b3c2350d027c60a83552078802c99f09fad1e
4SHA512 (proftpd-1.3.6c.tar.gz) = 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15 4SHA512 (proftpd-1.3.7c.tar.gz) = f9268e521e68cebaf1947cbfe1cc57f282ea09d59410c1722cd9a68c99d643b90b837c1fa840fdb894597c7429b0eb62bc4ac324915ffac04366daa2f104e88d
5Size (proftpd-1.3.6c.tar.gz) = 20271908 bytes 5Size (proftpd-1.3.7c.tar.gz) = 20428648 bytes
6SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812 6SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812
7SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421 7SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
8SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816 8SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816
9SHA1 (patch-contrib_mod__load_configure.in) = 0a72c47bf813ffd2ca8f8188a2d8596ec4d60200 9SHA1 (patch-contrib_mod__load_configure.in) = 0a72c47bf813ffd2ca8f8188a2d8596ec4d60200
10SHA1 (patch-contrib_mod__load_mod__load.c) = c51abd46ffc950b5baec615a0fdaf92c993414e3 10SHA1 (patch-contrib_mod__load_mod__load.c) = c51abd46ffc950b5baec615a0fdaf92c993414e3
11SHA1 (patch-contrib_mod__load_mod__load.h.in) = 83f5592a9c9a2a90ec500bba382326dccf8f05e5 11SHA1 (patch-contrib_mod__load_mod__load.h.in) = 83f5592a9c9a2a90ec500bba382326dccf8f05e5
12SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee 12SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
13SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed 13SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed
14SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c 14SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c
15SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48 15SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48
16SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88 16SHA1 (patch-src_main.c) = c00e1b1830d36d17bea5a10d8e13ec2328d3df88
17SHA1 (patch-src_pfilter.c) = c4447aea0cf84c83f6dd18316b007254c87ac510 17SHA1 (patch-src_pfilter.c) = c4447aea0cf84c83f6dd18316b007254c87ac510

cvs diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-Make.rules.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-Make.rules.in 2019/10/13 19:52:47 1.2
+++ pkgsrc/net/proftpd/patches/patch-Make.rules.in 2021/10/16 19:46:42 1.3
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1--- Make.rules.in.orig 2015-05-27 20:25:54.000000000 -0400 1$NetBSD: patch-Make.rules.in,v 1.3 2021/10/16 19:46:42 tm Exp $
2+++ Make.rules.in 2016-01-25 21:48:47.000000000 -0500 2
3--- Make.rules.in.orig 2017-04-10 02:31:02.000000000 +0000 3Add pfilter objects.
4+++ Make.rules.in 4
5@@ -113,3 +113,6 @@ BUILD_FTPTOP_OBJS=utils/ftptop.o utils/s 5--- Make.rules.in.orig Mon Aug 30 00:22:56 2021
 6+++ Make.rules.in Fri Oct 15 10:32:05 2021
 7@@ -114,3 +114,6 @@
6  8
7 FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o 9 FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
8 BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o 10 BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
9+ 11+
10+OBJS+= pfilter.o 12+OBJS+= pfilter.o
11+BUILD_OBJS+= src/pfilter.o 13+BUILD_OBJS+= src/pfilter.o

cvs diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c 2019/12/19 12:52:28 1.2
+++ pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.c 2021/10/16 19:46:42 1.3
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1$NetBSD: patch-contrib_mod__load_mod__load.c,v 1.2 2019/12/19 12:52:28 nros Exp $ 1$NetBSD: patch-contrib_mod__load_mod__load.c,v 1.3 2021/10/16 19:46:42 tm Exp $
2* solaris and derivates has loadavg in sys/loadavg.h 2
 3Solaris and derivates has loadavg in sys/loadavg.h
 4
3--- contrib/mod_load/mod_load.c.orig 2017-04-10 02:31:02.000000000 +0000 5--- contrib/mod_load/mod_load.c.orig 2017-04-10 02:31:02.000000000 +0000
4+++ contrib/mod_load/mod_load.c 6+++ contrib/mod_load/mod_load.c
5@@ -49,6 +49,10 @@ 7@@ -49,6 +49,10 @@
6 # include <sys/param.h> 8 # include <sys/param.h>
7 #endif 9 #endif
8  10
9+#if defined (HAVE_SYS_LOADAVG_H) 11+#if defined (HAVE_SYS_LOADAVG_H)
10+# include <sys/loadavg.h> 12+# include <sys/loadavg.h>
11+#endif 13+#endif
12+ 14+
13 #ifndef HAVE_GETLOADAVG 15 #ifndef HAVE_GETLOADAVG
14 # if !defined(LDAV_CVT) && defined(LOAD_AVE_CVT) 16 # if !defined(LDAV_CVT) && defined(LOAD_AVE_CVT)
15 # define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0) 17 # define LDAV_CVT(n) (LOAD_AVE_CVT (n) / 100.0)

cvs diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-include_pfilter.h (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-include_pfilter.h 2019/10/13 19:52:47 1.2
+++ pkgsrc/net/proftpd/patches/patch-include_pfilter.h 2021/10/16 19:46:42 1.3
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1--- /dev/null 2016-01-22 17:30:55.000000000 -0500 1$NetBSD: patch-include_pfilter.h,v 1.3 2021/10/16 19:46:42 tm Exp $
2+++ include/pfilter.h 2016-01-22 16:18:33.000000000 -0500 2
3--- include/pfilter.h.orig 2019-10-13 19:47:58.412725364 +0000 3Add packet filter
4+++ include/pfilter.h 4
 5--- /dev/null Fri Oct 15 10:32:05 2021
 6+++ include/pfilter.h Fri Oct 15 10:32:05 2021
5@@ -0,0 +1,3 @@ 7@@ -0,0 +1,3 @@
6+ 8+
7+void pfilter_notify(int); 9+void pfilter_notify(int);
8+void pfilter_init(void); 10+void pfilter_init(void);

cvs diff -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-src_pfilter.c (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-src_pfilter.c 2019/10/13 19:52:47 1.2
+++ pkgsrc/net/proftpd/patches/patch-src_pfilter.c 2021/10/16 19:46:42 1.3
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1--- /dev/null 2016-01-22 17:30:55.000000000 -0500 1$NetBSD: patch-src_pfilter.c,v 1.3 2021/10/16 19:46:42 tm Exp $
2+++ src/pfilter.c 2016-01-22 16:37:55.000000000 -0500 2
3--- src/pfilter.c.orig 2019-10-13 19:47:58.437871822 +0000 3Add pfilter objects.
4+++ src/pfilter.c 4
 5--- /dev/null Fri Oct 15 10:32:05 2021
 6+++ src/pfilter.c Fri Oct 15 10:32:05 2021
5@@ -0,0 +1,41 @@ 7@@ -0,0 +1,41 @@
6+#include "pfilter.h" 8+#include "pfilter.h"
7+#include "conf.h" 9+#include "conf.h"
8+#include "privs.h" 10+#include "privs.h"
9+#ifdef HAVE_BLACKLIST 11+#ifdef HAVE_BLACKLIST
10+#include <blacklist.h> 12+#include <blacklist.h>
11+#endif 13+#endif
12+ 14+
13+static struct blacklist *blstate; 15+static struct blacklist *blstate;
14+ 16+
15+void 17+void
16+pfilter_init(void) 18+pfilter_init(void)
17+{ 19+{

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-Makefile.in 2015/07/13 15:39:27 1.1
+++ pkgsrc/net/proftpd/patches/patch-Makefile.in 2021/10/16 19:46:42 1.2
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-Makefile.in,v 1.1 2015/07/13 15:39:27 he Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2021/10/16 19:46:42 tm Exp $
2 2
3Make this pkgsrc friendly. 3Make this pkgsrc friendly.
4 4
5Linking ftpdctl does not (seem to) require all the libraries needed for 5Linking ftpdctl does not (seem to) require all the libraries needed for
6various proftpd modules. It definitely cannot include -lwrap. 6various proftpd modules. It definitely cannot include -lwrap.
7 7
8--- Makefile.in.orig 2015-05-28 00:25:54.000000000 +0000 8--- Makefile.in.orig Tue Jul 21 17:25:51 2020
9+++ Makefile.in 9+++ Makefile.in Fri Oct 15 09:18:04 2021
10@@ -59,7 +59,7 @@ ftpcount$(EXEEXT): lib utils 10@@ -77,7 +77,7 @@
11 $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS) 11 $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
12  12
13 ftpdctl$(EXEEXT): lib src 13 ftpdctl$(EXEEXT): lib src
14- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS) 14- $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
15+ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(UTILS_LIBS) 15+ $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(UTILS_LIBS)
16  16
17 ftpscrub$(EXEEXT): lib utils 17 ftpscrub$(EXEEXT): lib utils
18 $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSCRUB_OBJS) $(UTILS_LIBS) 18 $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSCRUB_OBJS) $(UTILS_LIBS)
19@@ -178,7 +178,7 @@ install-man: $(DESTDIR)$(mandir) $(DESTD 19@@ -196,7 +196,7 @@
20 $(INSTALL_MAN) $(top_srcdir)/src/proftpd.conf.5 $(DESTDIR)$(mandir)/man5 20 $(INSTALL_MAN) $(top_builddir)/src/proftpd.conf.5 $(DESTDIR)$(mandir)/man5
21 $(INSTALL_MAN) $(top_srcdir)/src/xferlog.5 $(DESTDIR)$(mandir)/man5 21 $(INSTALL_MAN) $(top_builddir)/src/xferlog.5 $(DESTDIR)$(mandir)/man5
22  22
23-install-all: install-proftpd install-modules install-utils install-conf install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS) 23-install-all: install-proftpd install-modules install-utils install-conf install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS)
24+install-all: install-proftpd install-modules install-utils install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS) 24+install-all: install-proftpd install-modules install-utils install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS)
25  25
26 install: all install-all 26 install: $(BUILD_BIN) install-all
27  27

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-configure.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-configure.in 2019/10/13 19:52:47 1.1
+++ pkgsrc/net/proftpd/patches/patch-configure.in 2021/10/16 19:46:42 1.2
@@ -1,17 +1,28 @@ @@ -1,17 +1,28 @@
1$NetBSD: patch-configure.in,v 1.1 2019/10/13 19:52:47 maya Exp $ 1$NetBSD: patch-configure.in,v 1.2 2021/10/16 19:46:42 tm Exp $
2 2
3--- configure.in.orig 2017-04-10 02:31:02.000000000 +0000 3Test if blacklistd supported.
4+++ configure.in 4
5@@ -2836,6 +2836,12 @@ AC_TRY_RUN( 5--- configure.in.orig Tue Jul 21 17:25:51 2020
 6+++ configure.in Fri Oct 15 09:41:18 2021
 7@@ -2800,7 +2800,7 @@
 8 AC_DEFINE(PR_USE_NONBLOCKING_LOG_OPEN, 1, [Define if using nonblocking open of log files])
 9 fi
 10
 11-if test x"$enable_ident" == xyes ; then
 12+if test x"$enable_ident" = xyes ; then
 13 ac_static_modules="mod_ident.o $ac_static_modules"
 14 ac_build_static_modules="modules/mod_ident.o $ac_build_static_modules"
 15 fi
 16@@ -2949,6 +2949,12 @@
6 AC_MSG_RESULT(cross-compiling); AC_DEFINE(HAVE_LU, 1, [Define if you have %lu support]) 17 AC_MSG_RESULT(cross-compiling); AC_DEFINE(HAVE_LU, 1, [Define if you have %lu support])
7 ) 18 )
8  19
9+dnl Test for blacklistd support 20+dnl Test for blacklistd support
10+AC_CHECK_LIB(blacklist, blacklist, 21+AC_CHECK_LIB(blacklist, blacklist,
11+ [AC_DEFINE(HAVE_BLACKLIST, 1, [Define if you have blacklistd support.]) 22+ [AC_DEFINE(HAVE_BLACKLIST, 1, [Define if you have blacklistd support.])
12+ ac_build_addl_libs="$ac_build_addl_libs -lblacklist" 23+ ac_build_addl_libs="$ac_build_addl_libs -lblacklist"
13+ ]) 24+ ])
14+ 25+
15 dnl Add the proftpd support library 26 dnl Add the proftpd support library
16 LIBS="-lsupp $LIBS" 27 LIBS="-lsupp $LIBS"
17  28

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_configure.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-contrib_mod__load_configure.in 2019/12/09 19:22:57 1.1
+++ pkgsrc/net/proftpd/patches/patch-contrib_mod__load_configure.in 2021/10/16 19:46:42 1.2
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-contrib_mod__load_configure.in,v 1.1 2019/12/09 19:22:57 nros Exp $ 1$NetBSD: patch-contrib_mod__load_configure.in,v 1.2 2021/10/16 19:46:42 tm Exp $
2* solaris and derivates has loadavg in sys/loadavg.h 2
3--- contrib/mod_load/configure.in.orig 2019-12-09 18:12:06.479685628 +0000 3Solaris and derivates has loadavg in sys/loadavg.h
4+++ contrib/mod_load/configure.in 4
5@@ -63,7 +63,7 @@ AC_ARG_WITH(libraries, 5--- contrib/mod_load/configure.in.orig Tue Jul 21 17:25:51 2020
 6+++ contrib/mod_load/configure.in Fri Oct 15 09:22:45 2021
 7@@ -63,7 +63,7 @@
6 ]) 8 ])
7  9
8 AC_HEADER_STDC 10 AC_HEADER_STDC
9-AC_CHECK_HEADERS(stdlib.h unistd.h limits.h fcntl.h) 11-AC_CHECK_HEADERS(stdlib.h unistd.h limits.h fcntl.h)
10+AC_CHECK_HEADERS(stdlib.h unistd.h limits.h fcntl.h sys/loadavg.h) 12+AC_CHECK_HEADERS(stdlib.h unistd.h limits.h fcntl.h sys/loadavg.h)
11  13
12 AC_SUBST(LDFLAGS) 14 dnl _Must_ come before AC_FUNC_GETLOADAVG
13  15 AC_CHECK_LIB(kstat, kstat_open)

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.h.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.h.in 2019/12/09 19:22:57 1.1
+++ pkgsrc/net/proftpd/patches/patch-contrib_mod__load_mod__load.h.in 2021/10/16 19:46:42 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-contrib_mod__load_mod__load.h.in,v 1.1 2019/12/09 19:22:57 nros Exp $ 1$NetBSD: patch-contrib_mod__load_mod__load.h.in,v 1.2 2021/10/16 19:46:42 tm Exp $
2* solaris and derivates has loadavg in sys/loadavg.h 2
 3Solaris and derivates has loadavg in sys/loadavg.h
 4
3--- contrib/mod_load/mod_load.h.in.orig 2019-12-09 18:10:43.656037132 +0000 5--- contrib/mod_load/mod_load.h.in.orig 2019-12-09 18:10:43.656037132 +0000
4+++ contrib/mod_load/mod_load.h.in 6+++ contrib/mod_load/mod_load.h.in
5@@ -51,6 +51,9 @@ 7@@ -51,6 +51,9 @@
6 /* Define if you have the <stdlib.h> header file. */ 8 /* Define if you have the <stdlib.h> header file. */
7 #undef HAVE_STDLIB_H 9 #undef HAVE_STDLIB_H
8  10
9+/* Define if you have the <sys/loadavg.h> header file. */ 11+/* Define if you have the <sys/loadavg.h> header file. */
10+#undef HAVE_SYS_LOADAVG_H 12+#undef HAVE_SYS_LOADAVG_H
11+ 13+
12 /* Define if you have the <unistd.h> header file. */ 14 /* Define if you have the <unistd.h> header file. */
13 #undef HAVE_UNISTD_H 15 #undef HAVE_UNISTD_H
14  16

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in 2015/09/25 10:01:37 1.1
+++ pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in 2021/10/16 19:46:42 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-contrib_mod__sftp_Makefile.in,v 1.1 2015/09/25 10:01:37 wiedi Exp $ 1$NetBSD: patch-contrib_mod__sftp_Makefile.in,v 1.2 2021/10/16 19:46:42 tm Exp $
2 2
3Install mod_sftp misc files into examples folder 3Install mod_sftp misc files into examples folder
4 4
5--- contrib/mod_sftp/Makefile.in.orig 2015-05-28 00:25:54.000000000 +0000 5--- contrib/mod_sftp/Makefile.in.orig Tue Jul 21 17:25:51 2020
6+++ contrib/mod_sftp/Makefile.in 6+++ contrib/mod_sftp/Makefile.in Fri Oct 15 09:25:08 2021
7@@ -46,8 +46,9 @@ install: install-misc 7@@ -73,8 +73,9 @@
8 fi 8 $(INSTALL_MAN) $(MODULE_NAME).h $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME).h
9  9
10 install-misc: 10 install-misc:
11- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem  11- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem
12- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat 12- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
13+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/examples/proftpd 13+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/examples/proftpd
14+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(PREFIX)/share/examples/proftpd/dhparams.pem 14+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(PREFIX)/share/examples/proftpd/dhparams.pem
15+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(PREFIX)/share/examples/proftpd/blacklist.dat 15+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(PREFIX)/share/examples/proftpd/blacklist.dat
16  16
17 clean: 17 clean:
18 $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o 18 $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o

cvs diff -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-src_main.c (expand / switch to unified diff)

--- pkgsrc/net/proftpd/patches/patch-src_main.c 2019/10/07 19:29:47 1.1
+++ pkgsrc/net/proftpd/patches/patch-src_main.c 2021/10/16 19:46:42 1.2
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: patch-src_main.c,v 1.1 2019/10/07 19:29:47 christos Exp $ 1$NetBSD: patch-src_main.c,v 1.2 2021/10/16 19:46:42 tm Exp $
2 2
3Add packet filter 3Add packet filter
4 4
5--- src/main.c.orig 2017-04-09 22:31:02.000000000 -0400 5--- src/main.c.orig Tue Jul 21 17:25:51 2020
6+++ src/main.c 2019-10-07 15:09:12.516004304 -0400 6+++ src/main.c Fri Oct 15 09:29:42 2021
7@@ -41,6 +41,7 @@ 7@@ -41,6 +41,7 @@
8 #endif 8 #endif
9  9
10 #include "privs.h" 10 #include "privs.h"
11+#include "pfilter.h" 11+#include "pfilter.h"
12  12
13 int (*cmd_auth_chk)(cmd_rec *); 13 #ifdef PR_USE_OPENSSL
14 void (*cmd_handler)(server_rec *, conn_t *); 14 # include <openssl/opensslv.h>
15@@ -1089,6 +1090,7 @@ 15@@ -1116,6 +1117,7 @@
16 pid_t pid; 16 pid_t pid;
17 sigset_t sig_set; 17 sigset_t sig_set;
18  18
19+ pfilter_init(); 19+ pfilter_init();
20 if (no_fork == FALSE) { 20 if (no_fork == FALSE) {
21  21
22 /* A race condition exists on heavily loaded servers where the parent 22 /* A race condition exists on heavily loaded servers where the parent
23@@ -1206,7 +1208,8 @@ 23@@ -1233,7 +1235,8 @@
24  24
25 /* Reseed pseudo-randoms */ 25 /* Reseed pseudo-randoms */
26 srand((unsigned int) (time(NULL) * getpid())); 26 pr_random_init();
27- 27-
28+#else 28+#else
29+ pfilter_init(); 29+ pfilter_init();
30 #endif /* PR_DEVEL_NO_FORK */ 30 #endif /* PR_DEVEL_NO_FORK */
31  31
32 /* Child is running here */ 32 /* Child is running here */

File Added: pkgsrc/net/proftpd/patches/patch-src_pidfile.c
$NetBSD: patch-src_pidfile.c,v 1.1 2021/10/16 19:46:42 tm Exp $

dprintf is not availble on SunOS (illumos)

--- src/pidfile.c.orig	Fri Oct 15 10:11:49 2021
+++ src/pidfile.c	Fri Oct 15 10:11:58 2021
@@ -29,6 +29,23 @@
 
 static const char *pidfile_path = PR_PID_FILE_PATH;
 
+#if defined(__sun)
+#include <stdarg.h>
+
+int dprintf(int fd, const char *restrict format, ...) {
+    va_list ap;
+    FILE *f = fdopen(fd, "w");
+    if (!f) {
+        return -1;
+    }
+    va_start(ap, format);
+    int result = fprintf(f, format, ap);
+    va_end(ap);
+
+    return result;
+}
+#endif
+
 const char *pr_pidfile_get(void) {
   return pidfile_path;
 }