Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6319084D2A for ; Fri, 7 Jul 2023 11:44:37 +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 vQsf67QF-_sq for ; Fri, 7 Jul 2023 11:44:36 +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 5EB0F84D60 for ; Fri, 7 Jul 2023 11:44:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4E0CCFBDB; Fri, 7 Jul 2023 11:44:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168873027628380" MIME-Version: 1.0 Date: Fri, 7 Jul 2023 11:44:36 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/net/proftpd To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20230707114436.4E0CCFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_168873027628380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri Jul 7 11:44:36 UTC 2023 Modified Files: pkgsrc/net/proftpd: Makefile Makefile.common distinfo Added Files: pkgsrc/net/proftpd/patches: patch-locale_en__US.po Log Message: proftpd: Update to 1.3.7f, and fix msgfmt. 1.3.7f ------- 1.3.7e ------- + Ensure that mod_sftp algorithms work properly when OpenSSL 3.x is used. 1.3.7d ------- + Improved consistency/support for name-based virtual hosts. + Fixed crashes due to very long lines in AuthGroupFiles (Issue #1321). To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 pkgsrc/net/proftpd/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/proftpd/Makefile.common cvs rdiff -u -r1.55 -r1.56 pkgsrc/net/proftpd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/net/proftpd/patches/patch-locale_en__US.po Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168873027628380 Content-Disposition: inline Content-Length: 3766 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.96 pkgsrc/net/proftpd/Makefile:1.97 --- pkgsrc/net/proftpd/Makefile:1.96 Mon Sep 19 17:36:25 2022 +++ pkgsrc/net/proftpd/Makefile Fri Jul 7 11:44:35 2023 @@ -1,7 +1,5 @@ -# $NetBSD: Makefile,v 1.96 2022/09/19 17:36:25 nia Exp $ +# $NetBSD: Makefile,v 1.97 2023/07/07 11:44:35 jperkin Exp $ -#PKGREVISION= 2 -PKGREVISION= 1 .include "../../net/proftpd/Makefile.common" COMMENT= Highly configurable FTP server software Index: pkgsrc/net/proftpd/Makefile.common diff -u pkgsrc/net/proftpd/Makefile.common:1.14 pkgsrc/net/proftpd/Makefile.common:1.15 --- pkgsrc/net/proftpd/Makefile.common:1.14 Mon Sep 19 17:36:25 2022 +++ pkgsrc/net/proftpd/Makefile.common Fri Jul 7 11:44:35 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.14 2022/09/19 17:36:25 nia Exp $ +# $NetBSD: Makefile.common,v 1.15 2023/07/07 11:44:35 jperkin Exp $ # used by net/proftpd/Makefile # used by net/proftpd/Makefile.module -DISTNAME= proftpd-1.3.7c +DISTNAME= proftpd-1.3.7f CATEGORIES= net MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ MASTER_SITES+= ftp://ftp.servus.at/ProFTPD/distrib/source/ Index: pkgsrc/net/proftpd/distinfo diff -u pkgsrc/net/proftpd/distinfo:1.55 pkgsrc/net/proftpd/distinfo:1.56 --- pkgsrc/net/proftpd/distinfo:1.55 Tue Oct 26 11:06:31 2021 +++ pkgsrc/net/proftpd/distinfo Fri Jul 7 11:44:35 2023 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.55 2021/10/26 11:06:31 nia Exp $ +$NetBSD: distinfo,v 1.56 2023/07/07 11:44:35 jperkin Exp $ -BLAKE2s (proftpd-1.3.7c.tar.gz) = 388a5b7c4d8bd4ec8bf024071083c485a4b92fa6221ddaf0c05a30c0fafa38ea -SHA512 (proftpd-1.3.7c.tar.gz) = f9268e521e68cebaf1947cbfe1cc57f282ea09d59410c1722cd9a68c99d643b90b837c1fa840fdb894597c7429b0eb62bc4ac324915ffac04366daa2f104e88d -Size (proftpd-1.3.7c.tar.gz) = 20428648 bytes +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 @@ -12,6 +12,7 @@ SHA1 (patch-contrib_mod__load_mod__load. SHA1 (patch-contrib_mod__sftp_Makefile.in) = c7b43dadd56096852f6f61b4c33085867defb369 SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed SHA1 (patch-include_pfilter.h) = bb9b7daec949e394bfc232d693cef9a8b1599c70 +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 Added files: Index: pkgsrc/net/proftpd/patches/patch-locale_en__US.po diff -u /dev/null pkgsrc/net/proftpd/patches/patch-locale_en__US.po:1.1 --- /dev/null Fri Jul 7 11:44:36 2023 +++ pkgsrc/net/proftpd/patches/patch-locale_en__US.po Fri Jul 7 11:44:36 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-locale_en__US.po,v 1.1 2023/07/07 11:44:36 jperkin Exp $ + +msgfmt: present charset "CHARSET" is not a portable encoding name + +--- locale/en_US.po.orig 2022-12-04 19:10:58.000000000 +0000 ++++ locale/en_US.po +@@ -14,7 +14,7 @@ msgstr "" + "Language-Team: LANGUAGE \n" + "Language: \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=CHARSET\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + + #: ../contrib/mod_auth_otp/mod_auth_otp.c:799 --_----------=_168873027628380--