From nobody Mon Nov 27 11:58:01 2023 X-Original-To: dev-commits-ports-branches@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 4Sf3xj3ytxz52n5x; Mon, 27 Nov 2023 11:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sf3xj399fz4JWD; Mon, 27 Nov 2023 11:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701086281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBtgqs0zW+vowtWGYruudfHLyoKLWZVWcBIVUAMQ/PA=; b=p7bgTQ5ARmKxMggtuG6cLTC3oglXWAXfBiEyta7zZa2j9D1OdIseJ0+ImsTDNWfINdm9GH HYvNyRWPKqNKJV9ASELay6ZXUfK4tV3PjLPyekwikK2Sk29xnUSq/Srm8lAgthIVc6Vv8F 9cVE+ork/x4VAuuAVfheh/ATdC7sLbRcJeQqDnot3lpWCxuSfQtCwD6hLAesF0S3Y7CiO+ sWSKxnN7hQPd6yo5a1DDIkayfhuJcoKwEpfDHjUEsCcZkhJ0+of4kzRyESHPlP4dbZ+8KE uy7f7fq2bg+O1ETFxEETWLiJyVDMCu060NF8wSOsTkWRBASYhB7/6nPtjCwfRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701086281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBtgqs0zW+vowtWGYruudfHLyoKLWZVWcBIVUAMQ/PA=; b=v2vpYb2IDluux3QEryBaJqMBOLhSSLtanIJ714A0SoSEUn6xZ0DqRhmXtXG/bhwxev8/tx I4eNCuNtvVoQ+ROgLDUNWk47ipDj9fkeQaYZchq9WHiJpMouS+uXy54kFnANEtmaYjc6ED QcfbSVxAHCzhEQ0ryD5MRXWeP7gDKQjMjvZS5gA3JP6/8zsRFlQsAqKyA9OFHakww8V2On c+SqoPe9FtumKZ16bfhupto8ITXgvDJKXdxczdOnGxsxjC1WwcI2RtfXPcMrhZUUN2wrXJ d2cmt0FSIgsBDehJrpUngZgqJIPACkI9yFpR4bNACYL4+wAjFM6WQR781WOiGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701086281; a=rsa-sha256; cv=none; b=g+6FpzuRYUcgSuzO+uJrLQcalpQhSsmZ8QIxbr4EDwu84/AObLnnGONg1tzia11JeTpNKH MzvplB9wWavzGh9iIuZIZRV3lbqnWqqP7KBZMVH39Uk9FfP/2RuaLfCQ/gJLLITvNwDc6L bPioNRnAP1W4LaFkUta1oNPTyL8lbXrckcmc33sJZt1bnyF8Aqr4Lw8lwIpQsZNo1uAl2l b66F+G7JhsnGdt8/+RplAuWPzQ5XkxFhP628mMwkV1XWB9hPW+Z7NeysWzJb6FTjd7irFK I6920WSQnzgH8adQwYxGzmS21uqaRFuw6Qr7c27cqov6Qm4aTHf8FlBTovP0KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sf3xj1x27zdLw; Mon, 27 Nov 2023 11:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARBw148045620; Mon, 27 Nov 2023 11:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARBw1sc045617; Mon, 27 Nov 2023 11:58:01 GMT (envelope-from git) Date: Mon, 27 Nov 2023 11:58:01 GMT Message-Id: <202311271158.3ARBw1sc045617@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: f64cda5f9efc - 2023Q4 - ftp/tnftpd: Update to 20231001 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: f64cda5f9efca2dbd58bd7c1f1c67dbe5a67130f Auto-Submitted: auto-generated The branch 2023Q4 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=f64cda5f9efca2dbd58bd7c1f1c67dbe5a67130f commit f64cda5f9efca2dbd58bd7c1f1c67dbe5a67130f Author: Rudolf Čejka AuthorDate: 2023-11-27 11:18:20 +0000 Commit: Nuno Teixeira CommitDate: 2023-11-27 11:56:32 +0000 ftp/tnftpd: Update to 20231001 While I'm here: - Switch to DISTVERSION as suggested by Porters Handbook - Make use of NetBSD's CDN and add a few additional mirrors - Add WWW url - Add license: [1] tnftpd contains a mix of BSD2CLAUSE (mostly the NetBSD derived code) and BSD3CLAUSE (inherited from the orignal UCB BSD code). tnftpd was previously BSD4CLAUSE but that was fixed in the upstream code a while ago so I changed the COPYING to reflect that. It's no more restrictive than BSD3CLAUSE now. ChangeLog: * Release as "tnftpd 20231001". * Always use $YACC even without --enable-maintainer-mode. * Update to NetBSD-ftpd 20230930: * Fix uninitialized memory usage in count_users(). * Fix pam_set_item() call with proper struct passed as PAM_SOCKADDR. * Build fixes: * Check for inet_net_pton() in -lresolv (for glibc). * Improve configure's display of make variables. * Remove deprecated autoconf macros. * Security fixes: * CVE-2020-7468: Improve error handling when switching UID/GID. * Prevent MLSD and MLST before authentication succeeds. * Update to NetBSD-ftpd 20230922: * Treat failed chdir/chroot for guest and chroot accounts as fatal. Also treat failed set{e,}(u,g}id calls as fatal. Addresses CVE-2020-7468, via FreeBSD. * Improve seteuid error handling, per suggestion by Simon Josefsson. * Add missing check_login checks for MLST and MLSD. * Sync libnetbsd replacements with NetBSD upstream: * Replace fgetln() with tools/compat implementation that handles embedded NULs. * Fix inet_net_pton() to avoid integer overflow in bits. * Fix inet_ntop() to set errno when returning NULL. * Fix inet_pton() to improve hex formatting. * Fix sl_add() to not update size unless realloc() succeeds. * Improve portability on NetBSD by providing own setprogname() and getprogname(), instead of defining global __progname. * Update example ftpusers to use example DNS and IP addresses. * Build fixes: * Improve configure's display of detected features. * Enable more POSIX extensions. * Only replace glob() if required GLOB_ flags aren't available. * Only replace fts_open() if required FTS_ flags aren't available. Suggested by: [1] Luke Mewburn PR: 274209 MFH: 2023Q4 (cherry picked from commit 6845ef2aab7355c7f106d1cc207db69e5780ade4) --- ftp/tnftpd/Makefile | 12 ++++++++++-- ftp/tnftpd/distinfo | 6 +++--- ftp/tnftpd/files/patch-ls_ls.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/ftp/tnftpd/Makefile b/ftp/tnftpd/Makefile index 602bd58a5f58..dc002c6811a2 100644 --- a/ftp/tnftpd/Makefile +++ b/ftp/tnftpd/Makefile @@ -1,10 +1,18 @@ PORTNAME= tnftpd -PORTVERSION= 20200704 +DISTVERSION= 20231001 CATEGORIES= ftp -MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/ +MASTER_SITES= https://cdn.netbsd.org/pub/NetBSD/misc/tnftp/ \ + https://ftp.uni-erlangen.de/netbsd/misc/tnftp/ \ + https://ftp.jaist.ac.jp/pub/NetBSD/misc/tnftp/ \ + https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/ MAINTAINER= cejkar@fit.vutbr.cz COMMENT= Enhanced FTP server from NetBSD +WWW= https://ftp.netbsd.org/pub/NetBSD/misc/tnftp/ + +LICENSE= BSD2CLAUSE BSD3CLAUSE +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYING USES= autoreconf libtool GNU_CONFIGURE= yes diff --git a/ftp/tnftpd/distinfo b/ftp/tnftpd/distinfo index dfad197f3094..b09601a4e7dd 100644 --- a/ftp/tnftpd/distinfo +++ b/ftp/tnftpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597924555 -SHA256 (tnftpd-20200704.tar.gz) = 92de915e1b4b7e4bd403daac5d89ce67fa73e49e8dda18e230fa86ee98e26ab7 -SIZE (tnftpd-20200704.tar.gz) = 529105 +TIMESTAMP = 1700838023 +SHA256 (tnftpd-20231001.tar.gz) = 24a51bd2e5818ddb8c2479df9c8175a78dd8a5ef49ee3ab09f5f39c35069826e +SIZE (tnftpd-20231001.tar.gz) = 536802 diff --git a/ftp/tnftpd/files/patch-ls_ls.c b/ftp/tnftpd/files/patch-ls_ls.c new file mode 100644 index 000000000000..5ee7a98adff8 --- /dev/null +++ b/ftp/tnftpd/files/patch-ls_ls.c @@ -0,0 +1,35 @@ +Looking at FreeBSD's manual page, it appears that FreeBSD 5.2 changed +the signature of the comparison function: + + FTS * fts_open(char * const *path_argv, int options, + int (*compar)(const FTSENT * const *, const FTSENT * const *)); + +--- ls/ls.c.orig 2009-03-01 22:58:20 UTC ++++ ls/ls.c +@@ -73,7 +73,14 @@ static void display(FTSENT *, FTSENT *); + #include "extern.h" + + static void display(FTSENT *, FTSENT *); ++ ++/* workaround FreeBSD changing fts_open()'s compar signature */ ++#if defined(__FreeBSD__) && defined(USE_FTS_H) ++static int mastercmp(const FTSENT * const *, const FTSENT * const *); ++#else + static int mastercmp(const FTSENT **, const FTSENT **); ++#endif ++ + static void traverse(int, char **, int); + + static void (*printfcn)(DISPLAY *); +@@ -595,7 +602,11 @@ static int + * All other levels use the sort function. Error entries remain unsorted. + */ + static int ++#if defined(__FreeBSD__) && defined(USE_FTS_H) ++mastercmp(const FTSENT * const *a, const FTSENT * const *b) ++#else + mastercmp(const FTSENT **a, const FTSENT **b) ++#endif + { + int a_info, b_info; +