From nobody Sun Jan 22 17:45:38 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0LHW2N8kz3NGHn; Sun, 22 Jan 2023 17:45:43 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0LHV2dlyz3DYw; Sun, 22 Jan 2023 17:45:42 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: (Authenticated sender: daniel.engberg@pyret.net) by mail.gandi.net (Postfix) with ESMTPA id E23F41C0003; Sun, 22 Jan 2023 17:45:38 +0000 (UTC) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Date: Sun, 22 Jan 2023 18:45:38 +0100 From: Daniel Engberg To: Martin Matuska Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: eb50fece401a - main - ftp/proftpd: Update to 1.3.8 In-Reply-To: <202301221016.30MAGa9g029966@gitrepo.freebsd.org> References: <202301221016.30MAGa9g029966@gitrepo.freebsd.org> Message-ID: X-Sender: diizzy@FreeBSD.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4P0LHV2dlyz3DYw X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29169, ipnet:2001:4b98::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 2023-01-22 11:16, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=eb50fece401afafc7af1eb9f18f7f2e774af18cf > > commit eb50fece401afafc7af1eb9f18f7f2e774af18cf > Author: Martin Matuska > AuthorDate: 2023-01-22 10:15:41 +0000 > Commit: Martin Matuska > CommitDate: 2023-01-22 10:15:41 +0000 > > ftp/proftpd: Update to 1.3.8 > > Update proftpd in distfiles of slave ports, too. > --- > databases/proftpd-mod_sql_tds/distinfo | 6 ++--- > ftp/proftpd/Makefile | 4 ++-- > ftp/proftpd/distinfo | 6 ++--- > ftp/proftpd/files/patch-doc_Configuration.html | 11 --------- > ftp/proftpd/pkg-plist | 32 > +++++++++++++++++++++++++- > security/proftpd-mod_clamav/distinfo | 6 ++--- > 6 files changed, 42 insertions(+), 23 deletions(-) > > diff --git a/databases/proftpd-mod_sql_tds/distinfo > b/databases/proftpd-mod_sql_tds/distinfo > index 9d46581fc619..157516e79f7e 100644 > --- a/databases/proftpd-mod_sql_tds/distinfo > +++ b/databases/proftpd-mod_sql_tds/distinfo > @@ -1,5 +1,5 @@ > -TIMESTAMP = 1630315047 > -SHA256 (proftpd-1.3.7c.tar.gz) = > 7070968b9b6cf614ce7f756c8c1a66c32c1afa4f961784a62301790a801400da > -SIZE (proftpd-1.3.7c.tar.gz) = 20428648 > +TIMESTAMP = 1674382163 > +SHA256 (proftpd-1.3.8.tar.gz) = > f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 > +SIZE (proftpd-1.3.8.tar.gz) = 19744412 > SHA256 (mod_sql_tds-4.13.tar.gz) = > 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08 > SIZE (mod_sql_tds-4.13.tar.gz) = 11688 > diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile > index f8318c206e73..8137d6de797a 100644 > --- a/ftp/proftpd/Makefile > +++ b/ftp/proftpd/Makefile > @@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd > RUN_DEPENDS+= ${LOCALBASE}/sbin/proftpd:ftp/proftpd > .endif > > -PROFTPD_VERSION= 1.3.7c > +PROFTPD_VERSION= 1.3.8 > > CPE_VENDOR= proftpd > CPE_PRODUCT= proftpd > @@ -217,7 +217,7 @@ post-install: > @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} license.txt > ${STAGEDIR}${DOCSDIR} > . if ${PORT_OPTIONS:MHTMLDOCS} > @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/html > - @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} Configuration.html faq.html > ${STAGEDIR}${DOCSDIR}/html > + @cd ${WRKSRC}/doc/ && ${INSTALL_DATA} faq.html > ${STAGEDIR}${DOCSDIR}/html > @${CP} -RP ${WRKSRC}/doc/contrib ${STAGEDIR}${DOCSDIR}/html/contrib > @${CP} -RP ${WRKSRC}/doc/modules ${STAGEDIR}${DOCSDIR}/html/modules > @${CP} -RP ${WRKSRC}/doc/howto ${STAGEDIR}${DOCSDIR}/html/howto > diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo > index a540b7f0acf9..a82c201a7496 100644 > --- a/ftp/proftpd/distinfo > +++ b/ftp/proftpd/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1630315047 > -SHA256 (proftpd-1.3.7c.tar.gz) = > 7070968b9b6cf614ce7f756c8c1a66c32c1afa4f961784a62301790a801400da > -SIZE (proftpd-1.3.7c.tar.gz) = 20428648 > +TIMESTAMP = 1674381181 > +SHA256 (proftpd-1.3.8.tar.gz) = > f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748 > +SIZE (proftpd-1.3.8.tar.gz) = 19744412 > diff --git a/ftp/proftpd/files/patch-doc_Configuration.html > b/ftp/proftpd/files/patch-doc_Configuration.html > deleted file mode 100644 > index 4ae6f7863850..000000000000 > --- a/ftp/proftpd/files/patch-doc_Configuration.html > +++ /dev/null > @@ -1,11 +0,0 @@ > ---- doc/Configuration.html.orig 2020-07-21 17:25:51 UTC > -+++ doc/Configuration.html > -@@ -4349,7 +4349,7 @@ CLASS="SYNOPSIS" > - > - >
- >

-->ftp

-+>ftpd

- >
- >
- >
 diff --git a/ftp/proftpd/pkg-plist b/ftp/proftpd/pkg-plist
> index 7739b551d780..f719ebd09127 100644
> --- a/ftp/proftpd/pkg-plist
> +++ b/ftp/proftpd/pkg-plist
> @@ -45,7 +45,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
> @@ -53,6 +52,37 @@ include/proftpd/mkhome.h
>  include/proftpd/mod_ctrls.h
>  include/proftpd/mod_dnsbl.h
>  include/proftpd/mod_quotatab.h
> +include/proftpd/Make.rules
> +include/proftpd/base.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_sftp.h
>  include/proftpd/mod_snmp.h
>  include/proftpd/mod_sql.h
> diff --git a/security/proftpd-mod_clamav/distinfo
> b/security/proftpd-mod_clamav/distinfo
> index 7f0e5cb35d64..86e000a4d1e8 100644
> --- a/security/proftpd-mod_clamav/distinfo
> +++ b/security/proftpd-mod_clamav/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1630315047
> -SHA256 (proftpd-1.3.7c.tar.gz) =
> 7070968b9b6cf614ce7f756c8c1a66c32c1afa4f961784a62301790a801400da
> -SIZE (proftpd-1.3.7c.tar.gz) = 20428648
> +TIMESTAMP = 1674382108
> +SHA256 (proftpd-1.3.8.tar.gz) =
> f7139e7377a2cb059b8b9b14d76a6df5f440e3181cb15ae890d43bbcae574748
> +SIZE (proftpd-1.3.8.tar.gz) = 19744412
>  SHA256 (mod_clamav-v0.14rc2.tar.gz) =
> 0a865a659541f7ff5c46532c79aac652cdd004f604fb6a874f57dfb95bfe5a1e
>  SIZE (mod_clamav-v0.14rc2.tar.gz) = 19721

Hi,

Can we please migrate to pcre2 (supported by upstream)?

Best regards,
Daniel