Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 96DDE85146 for ; Wed, 20 Dec 2023 17:05:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AYRKaglZsDUQ for ; Wed, 20 Dec 2023 17:05:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8170A84D47 for ; Wed, 20 Dec 2023 17:05:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7A368FA42; Wed, 20 Dec 2023 17:05:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1703091901216870" MIME-Version: 1.0 Date: Wed, 20 Dec 2023 17:05:01 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20231220170501.7A368FA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1703091901216870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Dec 20 17:05:01 UTC 2023 Modified Files: pkgsrc/net/proftpd: Makefile Makefile.common PLIST distinfo pkgsrc/net/proftpd-ldap: Makefile pkgsrc/net/proftpd-sqlite: Makefile pkgsrc/net/proftpd/patches: patch-Makefile.in patch-contrib_mod__sftp_Makefile.in patch-src_pidfile.c Removed Files: pkgsrc/net/proftpd/patches: patch-Make.rules.in patch-configure.in patch-contrib_mod_tls.c patch-include_pfilter.h patch-modules_mod__auth.c patch-src_main.c patch-src_pfilter.c Log Message: proftpd*: update to 1.3.8b 1.3.8b - Released 19-Dec-2023 -------------------------------- - Issue 1735 - Compiling ProFTPD 1.3.8a mod_sftp, mod_tls using libressl 3.7.3 fails. - Issue 1756 - Build system fails for specific module names. - Issue 1760 - mod_sftp is affected by "Terrapin" Prefix Truncation Attacks in SSH Specification (CVE-2023-48795). 1.3.8a - Released 08-Oct-2023 -------------------------------- - Issue 1581 - mod_sftp fails to handle SFTP requests to truncate files to zero size. - Issue 1584 - mod_sftp improperly handles SFTP WRITE requests for files opened for appending. - Issue 1568 - Build-time detection of Linux POSIX ACL support broken since 1.3.8rc2. - Issue 1590 - Unable to load mod_rewrite as a dynamic module due to incomplete/missing library linker flags. - Issue 1597 - section is allowed to be in , but From directive is not. - Issue 1617 - ExtendedLog SSH, SFTP classes not working as expected. - Issue 1646 - mod_sftp does not handle multiple concurrent open file handles/transfers well for logging. - Issue 1679 - "TLSRequired off" plus Protocols directive causes mod_tls to terminate the session abruptly. - Issue 1689 - mod_tls fails to compile against OpenSSL 3.0.8 due to missing ENGINE_METHOD_ flags. - Issue 1659 - Unknown named connection error when using different SQL backends. - Issue 1697 - mod_sql is not properly closing all named backend connections on session exit. - Issue 1694 - SSH key exchanges fail unexpectedly with "unable to write X bytes of raw data" errors due to small ProFTPD buffer. - Issue 1678 - High session memory usage caused by SFTP outgoing data buffering. - Issue 1683 - Out-of-bounds buffer read when handling FTP commands. - Issue 1712 - SFTP algorithm settings in section not being used. 1.3.8 - Released 04-Dec-2022 -------------------------------- - Issue 1488 - 1.3.8rc4 failing to build mod_sftp with OpenSSL 1.1.0 due to X448 check. - Issue 1494 - 1.3.8rc4 failing to build on Solaris due to missing type declarations. - Issue 1500 - mod_ifsession doesn't change the effect of SFTPMaxChannels. - Issue 1533 - mod_tls module unexpectedly allows TLS handshake after authentication in some configurations. - Issue 1528 - Disable FSCachePolicy by default. - Issue 1539 - Avoid logging "session closed" messages unless there is a corresponding "session opened" log message, to avoid user confusion. - Issue 1550 - Implement support for the CSID FTP command. - Bug 4491 - unable to verify signed data: signature type 'rsa-sha2-512' does not match publickey algorithm 'ssh-rsa'. - Issue 1560 - mod_auth_otp improperly allows keyboard-interactive logins for users lacking OTP entries. 1.3.8rc4 - Released 23-Jul-2022 -------------------------------- - Issue 1434 - mod_sftp should fail on startup when SFTP and TLS are both enabled for a vhost. - Issue 1440 - DelayTable not properly using documented default value. This is a regression caused by the changes for Bug#4020. - Issue 1444 - Support customizing SSH ciphers, digests, key exchanges via SFTPClientMatch. - Issue 1448 - Ensure that mod_sftp algorithms work properly with OpenSSL 3.x. - Issue 1445 - BanOnEvent BadProtocol triggers segfault. - Issue 1439 - SFTP "check-file" implementation computes incorrect results. - Issue 1457 - Implement SFTPHostKeys directive for configuring the SSH host key algorithms. - Issue 1437 - Implement the "curve448-sha512" SSH key exchange algorithm. - Issue 1472 - Include directive broken when using wildcards for directory components. - Bug 4485 - mod_sftp fails to build using OpenSSL 1.0.x: undefined reference to `EVP_MD_CTX_reset'. - Issue 1476 - Reload after omitting explicit ModulePath value causes fatal module load failures. 1.3.8rc3 - Released 23-Apr-2022 -------------------------------- - Issue 1323 - Support SSH hostkey rotation via OpenSSH extensions. - Issue 1325 - NLST does not behave consistently for relative paths. - Bug 3759 - Support AES Galois Counter Mode (AES-GCM) in SSH. Support for the "aes128-gcm@openssh.com" and "aes256-gcm@openssh.com" ciphers has been added to mod_sftp. - Issue 1333 - Implement an LDAPConnectTimeout directive, to configure the timeout used when connecting to LDAP servers. - Issue 1330 - Implement OpenSSH "Encrypt-Then-MAC" (ETM) algorithm extensions. - Issue 1346 - Implement AllowForeignAddress class matching for passive data transfers. - Issue 1353 - Implement support for PCRE2. - Bug 4466 - ProFTPD won't start with several locales. - Issue 1367 - Auth sources providing space-bearing user/group names cause compliance issues with MLSD/MLST responses. - Bug 4467 - DeleteAbortedStores removes successfully transferred files unexpectedly. - Issue 1383 - Omit EPRT/EPSV from FEAT response when denied by configuration. - Issue 1379 - Support uploading to symlinked files. - Issue 1401 - Keepalive socket options should be set using IPPROTO_TCP, not SOL_SOCKET. - Issue 1402 - TCP keepalive SocketOptions should apply to control as well as data connection. - Issue 1396 - ProFTPD always uses the same PassivePorts port for first transfer. - Issue 1410 - mod_sftp needs to handle unknown SSH messages in an RFC-compliant manner, ignoring rather than disconnecting. - Issue 1418 - Improve handling of some globally applied configuration directives. - Issue 1369 - Name-based virtual hosts not working as expected after upgrade from 1.3.7a to 1.3.7b. 1.3.8rc2 - Released 29-Aug-2021 -------------------------------- - Bug 4401 - mod_sftp crashes when handling aes256-ctr OpenSSH-specific key with some old OpenSSL versions. - Issue 1273 - Improve mod_tls log messages for unsupported older TLS protocol requests. - Issue 1284 - Fix memory disclosure to RADIUS servers by mod_radius. - Issue 1282 - Properly handle sections that use interface/device names. - Bug 4315 - mod_ifsession fails to reset directory config lookup after section merges. - Issue 1296 - Support configurations for HELP command. - Issue 1300 - PCRE expressions with capture groups are not being handled properly. - Issue 1307 - AuthUserFile permissions check fails during SIGHUP, causing ProFTPD to stop. - Issue 1286 - Add support for the libidn2 library, over libidn, for e.g. mod_rewrite mappings. - Bug 4443 - Changed the default behavior of mod_tls, such that TLS renegotiations on control/data connections are not requested by default. TLS renegotiations have a long and sordid history; many SSL/TLS libraries no longer implement them, or disable them by default. - Issue 1319 - mod_auth_otp should honor RequireTableEntry semantics for SFTP logins. 1.3.8rc1 - Released 13-Jun-2021 -------------------------------- - Issue 1063 - FTPS data transfers using TLSv1.3 might segfault when session tickets cannot be decrypted. - Issue 1070 - Implement support for Redis 6.x AUTH semantics. - Issue 1068 - Define an OpenSSL API version compatibility macro, currently set to OpenSSL 1.0.0 and later. - Bug 4405 - Memory use-after-free in mod_sftp causes unexpected login/authentication issues. - Bug 4402 - Inappropriate handling of aborted FTP data transfers causes issues for some FTP clients. - Issue 1084 - Implement support for configuring TLSv1.3 ciphersuites. - Issue 1086 - Update TLSRenegotiate to work properly for TLSv1.3 sessions. - Issue 1079 - prxs fails to detect module-specific configure/Makefile, leading to unexpected module load errors. - Issue 1074 - TLS SNI connections to name-based VirtualHosts with TLSCertificateChainFile fail unexpectedly. - Issue 1089 - Deprecate the MultilineRFC2228 directive. - Issue 1067 - Generate new DH parameters for mod_tls, mod_sftp for 1.3.8. - Issue 1101 - Update TLS minimum supported DH parameter size to 2048. - Issue 811 - Support adding custom key/values to RedisLogOnCommand. - Issue 1106 - TLS SNI can cause mod_quotatab to crash due to null pointer dereferences. - Issue 1076 - TLS client-initiated renegotiations are supported unexpectedly. - Issue 1105 - Improper handling of multiple IP addresses, ServerAliases in sections. - Issue 1048 - Support using weak TLS certificates via the new AllowWeakSecurity TLSOption. - Issue 1149 - mod_quotatab_sql failing due to SQL syntax errors. This is a regression caused by Issue #392. - Issue 1061 - Freeing uninitialized memory causes SFTP issues with ed25519 keys. - Issue 1111 - "Corrupted MAC on input" errors using SFTP umac-64@openssh.com digest. - Issue 1171 - PassivePort randomization is broken due to SO_REUSEPORT option. - Issue 1072 - Support configurable certificate settings in Redis SSL/TLS connections. - Issue 369 - Provide function for obtaining memory pool information as e.g. JSON. - Issue 1134 - AuthUserFile-based logins, directory listings are very slow due to unbuffered reads. - Issue 1193 - Improper checking for reused TLS session for data transfers using OpenSSL 1.1.1. - Issue 1168 - Improve error handling of OpenSSH host keys converted to PEM format. - Issue 1179 - TLSRSACertificateKeyFile sanity checks fail unexpectedly for passphrase-protected keys. - Issue 1174 - ftptop segfaults when using libncursesw on Gentoo. - Issue 1204 - Once TLSTimeoutHandshake is reached, internal "timed out" flag never reset. - Issue 1133 - Support include files in mod_wrap2 allow/deny tables. - Issue 1200 - Disconnect SFTP clients that request unsupportable protocol versions. - Issue 1207 - On Gentoo, "./configure --disable-ncurses" fails to link ftptop, due to "undefined reference to symbol 'stdscr'" error. - Issue 1212 - mod_sql_mysql needs to quote table names due to reserved MySQL keywords. - Issue 1175 - Unable to set per-user TLSOptions using mod_ifsession. - Issue 754 - Some mod_snmp counters were not being incremented properly. - Issue 548 - `make install` target should install only, not recompile any code. - Bug 4428 - name resolution does not include all associated IPv6 records. - Issue 1230 - Stack overflow due to unlimited recursion possible when parsing JSON text. - Issue 1232 - Unable to use %{env:FTPS} in a SQLNamedQuery. The fix is to now use %{note:FTPS} instead. - Issue 1170 - Implement support for user/host combination bans in mod_ban. - Issue 1246 - mod_sftp_sql crashes (sigsegv) on NULL key. - Issue 1237 - ftpasswd should default to SHA256, not MD5. - Issue 490 - Support syntax checks on AuthUserFiles, AuthGroupFiles on startup. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 pkgsrc/net/proftpd/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/proftpd/Makefile.common cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/proftpd/PLIST cvs rdiff -u -r1.56 -r1.57 pkgsrc/net/proftpd/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/proftpd-ldap/Makefile cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/proftpd-sqlite/Makefile cvs rdiff -u -r1.3 -r0 pkgsrc/net/proftpd/patches/patch-Make.rules.in \ pkgsrc/net/proftpd/patches/patch-contrib_mod_tls.c \ pkgsrc/net/proftpd/patches/patch-include_pfilter.h \ pkgsrc/net/proftpd/patches/patch-src_pfilter.c cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/proftpd/patches/patch-Makefile.in \ pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in cvs rdiff -u -r1.2 -r0 pkgsrc/net/proftpd/patches/patch-configure.in \ pkgsrc/net/proftpd/patches/patch-src_main.c cvs rdiff -u -r1.1 -r0 pkgsrc/net/proftpd/patches/patch-modules_mod__auth.c cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/proftpd/patches/patch-src_pidfile.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1703091901216870 Content-Disposition: inline Content-Length: 11239 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/proftpd/Makefile diff -u pkgsrc/net/proftpd/Makefile:1.98 pkgsrc/net/proftpd/Makefile:1.99 --- pkgsrc/net/proftpd/Makefile:1.98 Tue Oct 24 22:10:30 2023 +++ pkgsrc/net/proftpd/Makefile Wed Dec 20 17:05:00 2023 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.98 2023/10/24 22:10:30 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2023/12/20 17:05:00 wiz Exp $ -PKGREVISION= 1 .include "../../net/proftpd/Makefile.common" COMMENT= Highly configurable FTP server software @@ -57,9 +56,6 @@ post-install: .for i in NEWS README.md README.LDAP README.modules ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd .endfor -.for i in Configuration.html faq.html license.txt - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd -.endfor ${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \ ${DESTDIR}${PREFIX}/share/examples/proftpd ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \ Index: pkgsrc/net/proftpd/Makefile.common diff -u pkgsrc/net/proftpd/Makefile.common:1.15 pkgsrc/net/proftpd/Makefile.common:1.16 --- pkgsrc/net/proftpd/Makefile.common:1.15 Fri Jul 7 11:44:35 2023 +++ pkgsrc/net/proftpd/Makefile.common Wed Dec 20 17:05:00 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.15 2023/07/07 11:44:35 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.16 2023/12/20 17:05:00 wiz Exp $ # used by net/proftpd/Makefile # used by net/proftpd/Makefile.module -DISTNAME= proftpd-1.3.7f +DISTNAME= proftpd-1.3.8b CATEGORIES= net MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/ Index: pkgsrc/net/proftpd/PLIST diff -u pkgsrc/net/proftpd/PLIST:1.29 pkgsrc/net/proftpd/PLIST:1.30 --- pkgsrc/net/proftpd/PLIST:1.29 Sat Oct 16 19:46:42 2021 +++ pkgsrc/net/proftpd/PLIST Wed Dec 20 17:05:00 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2021/10/16 19:46:42 tm Exp $ +@comment $NetBSD: PLIST,v 1.30 2023/12/20 17:05:00 wiz Exp $ bin/ftpasswd bin/ftpcount bin/ftpdctl @@ -7,9 +7,11 @@ bin/ftpquota bin/ftptop bin/ftpwho bin/prxs +include/proftpd/Make.rules include/proftpd/acconfig.h include/proftpd/ascii.h include/proftpd/auth.h +include/proftpd/base.h include/proftpd/bindings.h include/proftpd/buildstamp.h include/proftpd/ccan-json.h @@ -42,7 +44,6 @@ include/proftpd/inet.h include/proftpd/jot.h include/proftpd/json.h include/proftpd/lastlog.h -include/proftpd/libsupp.h include/proftpd/log.h include/proftpd/logfmt.h include/proftpd/memcache.h @@ -52,6 +53,35 @@ include/proftpd/mod_dnsbl.h include/proftpd/mod_load.h include/proftpd/mod_quotatab.h include/proftpd/mod_sftp.h +include/proftpd/mod_sftp/agent.h +include/proftpd/mod_sftp/auth.h +include/proftpd/mod_sftp/bcrypt.h +include/proftpd/mod_sftp/blacklist.h +include/proftpd/mod_sftp/channel.h +include/proftpd/mod_sftp/cipher.h +include/proftpd/mod_sftp/compress.h +include/proftpd/mod_sftp/crypto.h +include/proftpd/mod_sftp/date.h +include/proftpd/mod_sftp/disconnect.h +include/proftpd/mod_sftp/display.h +include/proftpd/mod_sftp/fxp.h +include/proftpd/mod_sftp/interop.h +include/proftpd/mod_sftp/kbdint.h +include/proftpd/mod_sftp/kex.h +include/proftpd/mod_sftp/keys.h +include/proftpd/mod_sftp/keystore.h +include/proftpd/mod_sftp/mac.h +include/proftpd/mod_sftp/misc.h +include/proftpd/mod_sftp/msg.h +include/proftpd/mod_sftp/packet.h +include/proftpd/mod_sftp/rfc4716.h +include/proftpd/mod_sftp/scp.h +include/proftpd/mod_sftp/service.h +include/proftpd/mod_sftp/session.h +include/proftpd/mod_sftp/ssh2.h +include/proftpd/mod_sftp/tap.h +include/proftpd/mod_sftp/umac.h +include/proftpd/mod_sftp/utf8.h include/proftpd/mod_sql.h include/proftpd/mod_tls.h include/proftpd/mod_wrap2.h @@ -63,7 +93,6 @@ include/proftpd/openbsd-blowfish.h include/proftpd/options.h include/proftpd/os.h include/proftpd/parser.h -include/proftpd/pfilter.h include/proftpd/pidfile.h include/proftpd/pool.h include/proftpd/pr-syslog.h @@ -139,13 +168,10 @@ sbin/ftpscrub sbin/ftpshut sbin/in.proftpd sbin/proftpd -share/doc/proftpd/Configuration.html share/doc/proftpd/NEWS share/doc/proftpd/README.LDAP share/doc/proftpd/README.md share/doc/proftpd/README.modules -share/doc/proftpd/faq.html -share/doc/proftpd/license.txt share/examples/proftpd/anonymous.conf share/examples/proftpd/basic.conf share/examples/proftpd/blacklist.dat Index: pkgsrc/net/proftpd/distinfo diff -u pkgsrc/net/proftpd/distinfo:1.56 pkgsrc/net/proftpd/distinfo:1.57 --- pkgsrc/net/proftpd/distinfo:1.56 Fri Jul 7 11:44:35 2023 +++ pkgsrc/net/proftpd/distinfo Wed Dec 20 17:05:00 2023 @@ -1,19 +1,12 @@ -$NetBSD: distinfo,v 1.56 2023/07/07 11:44:35 jperkin Exp $ +$NetBSD: distinfo,v 1.57 2023/12/20 17:05:00 wiz Exp $ -BLAKE2s (proftpd-1.3.7f.tar.gz) = b424a2ab863b40db77f5535c214ecb0153f115826a8c61bad3454468650f4da6 -SHA512 (proftpd-1.3.7f.tar.gz) = 73e7744b1551085b04ea5b62fa5ccd0bd77949db1c1414669d105d5f61412d2bf1e91118dcd3e9ad62fa52731204866fad2e8eb4342087bc3801b30cd946a67e -Size (proftpd-1.3.7f.tar.gz) = 20433355 bytes -SHA1 (patch-Make.rules.in) = 70a2298915bbf7a88660942730826a1a048e0c1d -SHA1 (patch-Makefile.in) = 9101e11a9c8021d393134c7a010047eecaea4110 -SHA1 (patch-configure.in) = 586e5b574029eefe96eeb49cd6387c79cf21c3fb +BLAKE2s (proftpd-1.3.8b.tar.gz) = 9b720dd369ce8bdee0190f579535cd1e0dca45fe22fc75adcab9951203478853 +SHA512 (proftpd-1.3.8b.tar.gz) = 291a91f220d711fefdbff18ef4e056080ad99c94dc4c71d0651f725932e1f2d9438fb75fbc2017e0f30a9a18a354b2d515788fbd538a80414f8c2d4eaaace396 +Size (proftpd-1.3.8b.tar.gz) = 19752808 bytes +SHA1 (patch-Makefile.in) = 22e48d28356fdf1e4d42f33ca71922a813ecb566 SHA1 (patch-contrib_mod__load_configure.in) = c7da7eded44674bfbc8eb1fb0c27d07b7dd50a24 SHA1 (patch-contrib_mod__load_mod__load.c) = 43fe0cccf6c202a765083313d814f6c44ddcd75a SHA1 (patch-contrib_mod__load_mod__load.h.in) = 37b6d7eaeeb0ec68dfdd48e4bf5c033850c25da4 -SHA1 (patch-contrib_mod__sftp_Makefile.in) = c7b43dadd56096852f6f61b4c33085867defb369 -SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed -SHA1 (patch-include_pfilter.h) = bb9b7daec949e394bfc232d693cef9a8b1599c70 +SHA1 (patch-contrib_mod__sftp_Makefile.in) = cda07c1d8836071f1d86ea07cb1d8d09d036bd43 SHA1 (patch-locale_en__US.po) = 6c8c55130072dccc8cdda18fa2a70a7aab13c328 -SHA1 (patch-modules_mod__auth.c) = b1ff5c3236edabce5016da3230e0bd30ec92db48 -SHA1 (patch-src_main.c) = 29ed3ce2e1cae56299dfe3242cc085e10c3232ad -SHA1 (patch-src_pfilter.c) = 0b658ce0ac0feb769e7a09c62b59a8e8ffafb981 -SHA1 (patch-src_pidfile.c) = 086f19aac04ad13a008abc59b731e99501da4dd2 +SHA1 (patch-src_pidfile.c) = fbe032bf1d9fbe089c44851e4da008d2a1c2945f Index: pkgsrc/net/proftpd-ldap/Makefile diff -u pkgsrc/net/proftpd-ldap/Makefile:1.6 pkgsrc/net/proftpd-ldap/Makefile:1.7 --- pkgsrc/net/proftpd-ldap/Makefile:1.6 Tue Oct 24 22:10:30 2023 +++ pkgsrc/net/proftpd-ldap/Makefile Wed Dec 20 17:05:01 2023 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.6 2023/10/24 22:10:30 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2023/12/20 17:05:01 wiz Exp $ -PKGREVISION= 1 .include "../../net/proftpd/Makefile.module" PROFTPD_MOD= ldap Index: pkgsrc/net/proftpd-sqlite/Makefile diff -u pkgsrc/net/proftpd-sqlite/Makefile:1.23 pkgsrc/net/proftpd-sqlite/Makefile:1.24 --- pkgsrc/net/proftpd-sqlite/Makefile:1.23 Wed Nov 8 13:20:34 2023 +++ pkgsrc/net/proftpd-sqlite/Makefile Wed Dec 20 17:05:01 2023 @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.23 2023/11/08 13:20:34 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2023/12/20 17:05:01 wiz Exp $ -PKGREVISION= 1 .include "../../net/proftpd/Makefile.module" PROFTPD_MOD= sqlite Index: pkgsrc/net/proftpd/patches/patch-Makefile.in diff -u pkgsrc/net/proftpd/patches/patch-Makefile.in:1.2 pkgsrc/net/proftpd/patches/patch-Makefile.in:1.3 --- pkgsrc/net/proftpd/patches/patch-Makefile.in:1.2 Sat Oct 16 19:46:42 2021 +++ pkgsrc/net/proftpd/patches/patch-Makefile.in Wed Dec 20 17:05:00 2023 @@ -1,13 +1,13 @@ -$NetBSD: patch-Makefile.in,v 1.2 2021/10/16 19:46:42 tm Exp $ +$NetBSD: patch-Makefile.in,v 1.3 2023/12/20 17:05:00 wiz Exp $ Make this pkgsrc friendly. Linking ftpdctl does not (seem to) require all the libraries needed for various proftpd modules. It definitely cannot include -lwrap. ---- Makefile.in.orig Tue Jul 21 17:25:51 2020 -+++ Makefile.in Fri Oct 15 09:18:04 2021 -@@ -77,7 +77,7 @@ +--- Makefile.in.orig 2023-12-20 04:36:38.000000000 +0000 ++++ Makefile.in +@@ -83,7 +83,7 @@ ftpcount$(EXEEXT): lib utils $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS) ftpdctl$(EXEEXT): lib src @@ -16,12 +16,12 @@ various proftpd modules. It definitely ftpscrub$(EXEEXT): lib utils $(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSCRUB_OBJS) $(UTILS_LIBS) -@@ -196,7 +196,7 @@ +@@ -203,7 +203,7 @@ install-man: $(DESTDIR)$(mandir) $(DESTD $(INSTALL_MAN) $(top_builddir)/src/proftpd.conf.5 $(DESTDIR)$(mandir)/man5 $(INSTALL_MAN) $(top_builddir)/src/xferlog.5 $(DESTDIR)$(mandir)/man5 -install-all: install-proftpd install-modules install-utils install-conf install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS) +install-all: install-proftpd install-modules install-utils install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS) - install: $(BUILD_BIN) install-all + install: install-all Index: pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in diff -u pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in:1.2 pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in:1.3 --- pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in:1.2 Sat Oct 16 19:46:42 2021 +++ pkgsrc/net/proftpd/patches/patch-contrib_mod__sftp_Makefile.in Wed Dec 20 17:05:00 2023 @@ -1,11 +1,11 @@ -$NetBSD: patch-contrib_mod__sftp_Makefile.in,v 1.2 2021/10/16 19:46:42 tm Exp $ +$NetBSD: patch-contrib_mod__sftp_Makefile.in,v 1.3 2023/12/20 17:05:00 wiz Exp $ Install mod_sftp misc files into examples folder ---- contrib/mod_sftp/Makefile.in.orig Tue Jul 21 17:25:51 2020 -+++ contrib/mod_sftp/Makefile.in Fri Oct 15 09:25:08 2021 -@@ -73,8 +73,9 @@ - $(INSTALL_MAN) $(MODULE_NAME).h $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME).h +--- contrib/mod_sftp/Makefile.in.orig 2023-12-20 04:36:38.000000000 +0000 ++++ contrib/mod_sftp/Makefile.in +@@ -83,8 +83,9 @@ install-headers: $(DESTDIR)$(includedir) + $(RM) $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME)/$(MODULE_NAME).h install-misc: - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem Index: pkgsrc/net/proftpd/patches/patch-src_pidfile.c diff -u pkgsrc/net/proftpd/patches/patch-src_pidfile.c:1.1 pkgsrc/net/proftpd/patches/patch-src_pidfile.c:1.2 --- pkgsrc/net/proftpd/patches/patch-src_pidfile.c:1.1 Sat Oct 16 19:46:42 2021 +++ pkgsrc/net/proftpd/patches/patch-src_pidfile.c Wed Dec 20 17:05:01 2023 @@ -1,6 +1,6 @@ -$NetBSD: patch-src_pidfile.c,v 1.1 2021/10/16 19:46:42 tm Exp $ +$NetBSD: patch-src_pidfile.c,v 1.2 2023/12/20 17:05:01 wiz Exp $ -dprintf is not availble on SunOS (illumos) +dprintf is not available on SunOS (illumos) --- src/pidfile.c.orig Fri Oct 15 10:11:49 2021 +++ src/pidfile.c Fri Oct 15 10:11:58 2021 --_----------=_1703091901216870--