diff options
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/coeurl/Makefile | 2 | ||||
| -rw-r--r-- | ftp/curl/Makefile | 26 | ||||
| -rw-r--r-- | ftp/curl/distinfo | 6 | ||||
| -rw-r--r-- | ftp/curl/files/extra-patch-gssapi | 11 | ||||
| -rw-r--r-- | ftp/curl/pkg-plist | 15 | ||||
| -rw-r--r-- | ftp/curlie/Makefile | 2 | ||||
| -rw-r--r-- | ftp/fineftp-server/Makefile | 3 | ||||
| -rw-r--r-- | ftp/fineftp-server/distinfo | 6 | ||||
| -rw-r--r-- | ftp/fineftp-server/files/patch-git-gfc323ccece | 240 | ||||
| -rw-r--r-- | ftp/fineftp-server/pkg-plist | 2 | ||||
| -rw-r--r-- | ftp/freebsd-ftpd/Makefile | 5 | ||||
| -rw-r--r-- | ftp/freebsd-ftpd/distinfo | 6 | ||||
| -rw-r--r-- | ftp/freebsd-ftpd/files/ftpd.in | 25 | ||||
| -rw-r--r-- | ftp/net2ftp/Makefile | 3 | ||||
| -rw-r--r-- | ftp/pget/Makefile | 2 | ||||
| -rw-r--r-- | ftp/py-pycurl/Makefile | 2 | ||||
| -rw-r--r-- | ftp/py-pycurl/distinfo | 6 | ||||
| -rw-r--r-- | ftp/py-pyftpdlib/Makefile | 4 | ||||
| -rw-r--r-- | ftp/quftp/Makefile | 1 | ||||
| -rw-r--r-- | ftp/rubygem-curb/Makefile | 2 | ||||
| -rw-r--r-- | ftp/rubygem-curb/distinfo | 6 | ||||
| -rw-r--r-- | ftp/rubygem-net-ftp/Makefile | 2 | ||||
| -rw-r--r-- | ftp/rubygem-net-ftp/distinfo | 6 | ||||
| -rw-r--r-- | ftp/termscp/Makefile | 2 | ||||
| -rw-r--r-- | ftp/unftp/Makefile | 2 |
25 files changed, 85 insertions, 302 deletions
diff --git a/ftp/coeurl/Makefile b/ftp/coeurl/Makefile index 4d0c39ba63ec..f84c915aca25 100644 --- a/ftp/coeurl/Makefile +++ b/ftp/coeurl/Makefile @@ -1,7 +1,7 @@ PORTNAME= coeurl DISTVERSIONPREFIX=v DISTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp www MAINTAINER= adridg@FreeBSD.org diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile index ab70abcb307a..25ddc01a4a81 100644 --- a/ftp/curl/Makefile +++ b/ftp/curl/Makefile @@ -1,5 +1,5 @@ PORTNAME= curl -PORTVERSION= 8.15.0 +PORTVERSION= 8.17.0 CATEGORIES= ftp net www MASTER_SITES= https://curl.se/download/ \ https://github.com/curl/curl/releases/download/curl-${PORTVERSION:S|.|_|g}/ @@ -28,9 +28,9 @@ CONFIGURE_ARGS= --disable-unity \ --enable-openssl-auto-load-config \ --enable-progress-meter \ --enable-ssls-export \ + --with-ca-path=/etc/ssl/certs \ --with-zsh-functions-dir=${LOCALBASE}/share/zsh/site-functions \ --without-ca-bundle \ - --without-ca-path \ --without-fish-functions-dir CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func_SSLv2_client_method=no @@ -50,9 +50,9 @@ OPTIONS_SINGLE= GSSAPI RESOLV OPTIONS_GROUP_COMPRESSION= BROTLI ZSTD OPTIONS_GROUP_PROTOCOL= DICT FTP GOPHER HTTP HTTP2 IMAP IPFS LDAP LDAPS LIBSSH LIBSSH2 MQTT POP3 RTSP SMB SMTP TELNET TFTP WEBSOCKET OPTIONS_RADIO_SSL= GNUTLS OPENSSL WOLFSSL -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE +OPTIONS_SINGLE_GSSAPI= GSSAPI_MIT GSSAPI_NONE # GSSAPI_BASE OPTIONS_SINGLE_RESOLV= CARES THREADED_RESOLVER -OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES GSSAPI_${${SSL_DEFAULT} == base :?BASE :NONE} DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS LIBSSH2 MQTT NTLM OPENSSL POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP WEBSOCKET ZSTD +OPTIONS_DEFAULT=ALTSVC BROTLI COOKIES GSSAPI_NONE DICT FTP GOPHER HTTP HTTP2 IDN IMAP IPFS LIBSSH2 MQTT NTLM OPENSSL POP3 PROXY PSL RTSP SMB SMTP STATIC TELNET TFTP THREADED_RESOLVER TLS_SRP WEBSOCKET ZSTD OPTIONS_SUB= yes ALTSVC_DESC= HTTP Alternative Services support COOKIES_DESC= Cookies support @@ -92,22 +92,15 @@ CURL_DEBUG_CONFIGURE_ENABLE= curldebug DEBUG_CONFIGURE_ENABLE= debug DICT_CONFIGURE_ENABLE= dict FTP_CONFIGURE_ENABLE= ftp -GNUTLS_CONFIGURE_ON= --with-ca-fallback GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libnettle.so:security/nettle GOPHER_CONFIGURE_ENABLE=gopher -GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} -GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} -GSSAPI_BASE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gssapi -GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} -GSSAPI_BASE_LIBS= ${GSSAPILIBS} -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} -GSSAPI_HEIMDAL_CPPFLAGS=${GSSAPICPPFLAGS} -GSSAPI_HEIMDAL_LDFLAGS= ${GSSAPILDFLAGS} -GSSAPI_HEIMDAL_LIBS= ${GSSAPILIBS} -GSSAPI_HEIMDAL_USES= gssapi:heimdal +#GSSAPI_BASE_CONFIGURE_ON= --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +#GSSAPI_BASE_CPPFLAGS= ${GSSAPICPPFLAGS} +#GSSAPI_BASE_LDFLAGS= ${GSSAPILDFLAGS} +#GSSAPI_BASE_LIBS= ${GSSAPILIBS} +#GSSAPI_BASE_USES= gssapi GSSAPI_MIT_CONFIGURE_ON=--with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_CPPFLAGS= ${GSSAPICPPFLAGS} GSSAPI_MIT_LDFLAGS= ${GSSAPILDFLAGS} @@ -134,7 +127,6 @@ LIBUV_CONFIGURE_WITH= libuv LIBUV_LIB_DEPENDS= libuv.so:devel/libuv MQTT_CONFIGURE_ENABLE= mqtt NTLM_CONFIGURE_ENABLE= ntlm -OPENSSL_CONFIGURE_ON= --with-ca-fallback OPENSSL_CONFIGURE_WITH= openssl=${OPENSSLBASE} OPENSSL_CPPFLAGS= -I${OPENSSLINC} OPENSSL_LDFLAGS= -L${OPENSSLLIB} diff --git a/ftp/curl/distinfo b/ftp/curl/distinfo index 9c77b812f353..6d63f4c39edc 100644 --- a/ftp/curl/distinfo +++ b/ftp/curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753265702 -SHA256 (curl-8.15.0.tar.xz) = 6cd0a8a5b126ddfda61c94dc2c3fc53481ba7a35461cf7c5ab66aa9d6775b609 -SIZE (curl-8.15.0.tar.xz) = 2773156 +TIMESTAMP = 1762586706 +SHA256 (curl-8.17.0.tar.xz) = 955f6e729ad6b3566260e8fef68620e76ba3c31acf0a18524416a185acf77992 +SIZE (curl-8.17.0.tar.xz) = 2797000 diff --git a/ftp/curl/files/extra-patch-gssapi b/ftp/curl/files/extra-patch-gssapi deleted file mode 100644 index d2b90d46c80f..000000000000 --- a/ftp/curl/files/extra-patch-gssapi +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2024-12-11 07:08:12 UTC -+++ configure -@@ -26210,7 +26210,7 @@ printf "%s\n" "found" >&6; } - if test -n "$gnu_gss"; then - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE gss" - elif test "x$not_mit" = "x1"; then -- LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE heimdal-gssapi" -+ LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE" - else - LIBCURL_PC_REQUIRES_PRIVATE="$LIBCURL_PC_REQUIRES_PRIVATE mit-krb5-gssapi" - fi diff --git a/ftp/curl/pkg-plist b/ftp/curl/pkg-plist index 118ad32a83f4..09a9b8eb4c98 100644 --- a/ftp/curl/pkg-plist +++ b/ftp/curl/pkg-plist @@ -137,7 +137,6 @@ share/aclocal/libcurl.m4 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ghiper.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/headerapi.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hiperfifo.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/href_extractor.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hsts-preload.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltidy.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/htmltitle.cpp @@ -172,6 +171,7 @@ share/aclocal/libcurl.m4 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ipv6.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keepalive.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/localport.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/log_failed_transfers.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/maxconnects.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-app.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multi-debugcallback.c @@ -232,6 +232,7 @@ share/aclocal/libcurl.m4 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/urlapi.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/usercertinmem.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket-cb.c +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket-updown.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/websocket.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xmlstream.c share/man/man1/curl-config.1.gz @@ -314,6 +315,11 @@ share/man/man3/CURLINFO_TOTAL_TIME.3.gz share/man/man3/CURLINFO_TOTAL_TIME_T.3.gz share/man/man3/CURLINFO_USED_PROXY.3.gz share/man/man3/CURLINFO_XFER_ID.3.gz +share/man/man3/CURLMINFO_XFERS_ADDED.3.gz +share/man/man3/CURLMINFO_XFERS_CURRENT.3.gz +share/man/man3/CURLMINFO_XFERS_DONE.3.gz +share/man/man3/CURLMINFO_XFERS_PENDING.3.gz +share/man/man3/CURLMINFO_XFERS_RUNNING.3.gz share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3.gz share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3.gz share/man/man3/CURLMOPT_MAXCONNECTS.3.gz @@ -321,6 +327,9 @@ share/man/man3/CURLMOPT_MAX_CONCURRENT_STREAMS.3.gz share/man/man3/CURLMOPT_MAX_HOST_CONNECTIONS.3.gz share/man/man3/CURLMOPT_MAX_PIPELINE_LENGTH.3.gz share/man/man3/CURLMOPT_MAX_TOTAL_CONNECTIONS.3.gz +share/man/man3/CURLMOPT_NETWORK_CHANGED.3.gz +share/man/man3/CURLMOPT_NOTIFYDATA.3.gz +share/man/man3/CURLMOPT_NOTIFYFUNCTION.3.gz share/man/man3/CURLMOPT_PIPELINING.3.gz share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3.gz share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3.gz @@ -695,8 +704,11 @@ share/man/man3/curl_multi_assign.3.gz share/man/man3/curl_multi_cleanup.3.gz share/man/man3/curl_multi_fdset.3.gz share/man/man3/curl_multi_get_handles.3.gz +share/man/man3/curl_multi_get_offt.3.gz share/man/man3/curl_multi_info_read.3.gz share/man/man3/curl_multi_init.3.gz +share/man/man3/curl_multi_notify_disable.3.gz +share/man/man3/curl_multi_notify_enable.3.gz share/man/man3/curl_multi_perform.3.gz share/man/man3/curl_multi_poll.3.gz share/man/man3/curl_multi_remove_handle.3.gz @@ -731,6 +743,7 @@ share/man/man3/curl_version_info.3.gz share/man/man3/curl_ws_meta.3.gz share/man/man3/curl_ws_recv.3.gz share/man/man3/curl_ws_send.3.gz +share/man/man3/curl_ws_start_frame.3.gz share/man/man3/libcurl-easy.3.gz share/man/man3/libcurl-env-dbg.3.gz share/man/man3/libcurl-env.3.gz diff --git a/ftp/curlie/Makefile b/ftp/curlie/Makefile index 364bf9f341d2..b81008737dd6 100644 --- a/ftp/curlie/Makefile +++ b/ftp/curlie/Makefile @@ -1,7 +1,7 @@ PORTNAME= curlie DISTVERSIONPREFIX= v DISTVERSION= 1.6.7 -PORTREVISION= 30 +PORTREVISION= 33 CATEGORIES= ftp net www MAINTAINER= 0mp@FreeBSD.org diff --git a/ftp/fineftp-server/Makefile b/ftp/fineftp-server/Makefile index bea14c43ce28..755faa3249b6 100644 --- a/ftp/fineftp-server/Makefile +++ b/ftp/fineftp-server/Makefile @@ -1,7 +1,6 @@ PORTNAME= fineftp-server DISTVERSIONPREFIX= v -DISTVERSION= 1.5.0 -PORTREVISION= 2 +DISTVERSION= 1.5.1 CATEGORIES= ftp MAINTAINER= yuri@FreeBSD.org diff --git a/ftp/fineftp-server/distinfo b/ftp/fineftp-server/distinfo index c220552aaa58..ee2d884fdaeb 100644 --- a/ftp/fineftp-server/distinfo +++ b/ftp/fineftp-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737089948 -SHA256 (eclipse-ecal-fineftp-server-v1.5.0_GH0.tar.gz) = 7d586a36ef16c84a903aa7b2e093db3073c97bca2b36f4cdb17555e0b554e483 -SIZE (eclipse-ecal-fineftp-server-v1.5.0_GH0.tar.gz) = 46625 +TIMESTAMP = 1762664998 +SHA256 (eclipse-ecal-fineftp-server-v1.5.1_GH0.tar.gz) = 93b0f9ef7007136be1ba83b3d80b059b79a361fe0af8bbadbf6df1bacfcf203e +SIZE (eclipse-ecal-fineftp-server-v1.5.1_GH0.tar.gz) = 46600 diff --git a/ftp/fineftp-server/files/patch-git-gfc323ccece b/ftp/fineftp-server/files/patch-git-gfc323ccece deleted file mode 100644 index c83831ebeb7d..000000000000 --- a/ftp/fineftp-server/files/patch-git-gfc323ccece +++ /dev/null @@ -1,240 +0,0 @@ -From fc323ccece40626a9bf67b7e1983ff2addd00fe4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fred=20Helmesj=C3=B6?= <helmesjo@gmail.com> -Date: Thu, 3 Apr 2025 08:12:05 +0200 -Subject: [PATCH] Added compatibility with asio 1.33 and up (#77) - -Mostly replaced deprecated 'io_service' with 'io_context'. The deprecated API was removed with asio 1.33. ---- - fineftp-server/src/ftp_session.cpp | 36 +++++++++++++++--------------- - fineftp-server/src/ftp_session.h | 8 +++---- - fineftp-server/src/server_impl.cpp | 10 ++++----- - fineftp-server/src/server_impl.h | 2 +- - 4 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/fineftp-server/src/ftp_session.cpp b/fineftp-server/src/ftp_session.cpp -index 109d293..ae67095 100755 ---- a/fineftp-server/src/ftp_session.cpp -+++ b/fineftp-server/src/ftp_session.cpp -@@ -44,18 +44,18 @@ - namespace fineftp - { - -- FtpSession::FtpSession(asio::io_service& io_service, const UserDatabase& user_database, const std::function<void()>& completion_handler, std::ostream& output, std::ostream& error) -+ FtpSession::FtpSession(asio::io_context& io_context, const UserDatabase& user_database, const std::function<void()>& completion_handler, std::ostream& output, std::ostream& error) - : completion_handler_ (completion_handler) - , user_database_ (user_database) -- , io_service_ (io_service) -- , command_strand_ (io_service) -- , command_socket_ (io_service) -+ , io_context_ (io_context) -+ , command_strand_ (io_context) -+ , command_socket_ (io_context) - , data_type_binary_ (false) - , shutdown_requested_ (false) - , ftp_working_directory_("/") -- , data_acceptor_ (io_service) -- , data_socket_strand_ (io_service) -- , timer_ (io_service) -+ , data_acceptor_ (io_context) -+ , data_socket_strand_ (io_context) -+ , timer_ (io_context) - , output_(output) - , error_(error) - { -@@ -96,7 +96,7 @@ namespace fineftp - command_socket_.set_option(asio::ip::tcp::no_delay(true), ec); - if (ec) error_ << "Unable to set socket option tcp::no_delay: " << ec.message() << std::endl; - -- command_strand_.post([me = shared_from_this()]() { me->readFtpCommand(); }); -+ asio::post(command_strand_, [me = shared_from_this()]() { me->readFtpCommand(); }); - sendFtpMessage(FtpMessage(FtpReplyCode::SERVICE_READY_FOR_NEW_USER, "Welcome to fineFTP Server")); - } - -@@ -116,7 +116,7 @@ namespace fineftp - - void FtpSession::sendRawFtpMessage(const std::string& raw_message) - { -- command_strand_.post([me = shared_from_this(), raw_message]() -+ asio::post(command_strand_, [me = shared_from_this(), raw_message]() - { - const bool write_in_progress = !me->command_output_queue_.empty(); - me->command_output_queue_.push_back(raw_message); -@@ -188,7 +188,7 @@ namespace fineftp - me->data_acceptor_.close(ec_); - } - -- me->data_socket_strand_.post([me]() -+ asio::post(me->data_socket_strand_, [me]() - { - auto data_socket = me->data_socket_weakptr_.lock(); - if (data_socket) -@@ -449,7 +449,7 @@ namespace fineftp - } - { - asio::error_code ec; -- data_acceptor_.listen(asio::socket_base::max_connections, ec); -+ data_acceptor_.listen(asio::socket_base::max_listen_connections, ec); - if (ec) - { - error_ << "Error listening on data acceptor: " << ec.message() << std::endl; -@@ -1205,7 +1205,7 @@ namespace fineftp - - void FtpSession::sendDirectoryListing(const std::map<std::string, Filesystem::FileStatus>& directory_content) - { -- auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_service_); -+ auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_context_); - - data_acceptor_.async_accept(*data_socket - , data_socket_strand_.wrap([data_socket, directory_content, me = shared_from_this()](auto ec) -@@ -1248,7 +1248,7 @@ namespace fineftp - - void FtpSession::sendNameList(const std::map<std::string, Filesystem::FileStatus>& directory_content) - { -- auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_service_); -+ auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_context_); - - data_acceptor_.async_accept(*data_socket - , data_socket_strand_.wrap([data_socket, directory_content, me = shared_from_this()](auto ec) -@@ -1283,7 +1283,7 @@ namespace fineftp - - void FtpSession::sendFile(const std::shared_ptr<ReadableFile>& file) - { -- auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_service_); -+ auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_context_); - - data_acceptor_.async_accept(*data_socket - , data_socket_strand_.wrap([data_socket, file, me = shared_from_this()](auto ec) -@@ -1352,7 +1352,7 @@ namespace fineftp - - void FtpSession::addDataToBufferAndSend(const std::shared_ptr<std::vector<char>>& data, const std::shared_ptr<asio::ip::tcp::socket>& data_socket) - { -- data_socket_strand_.post([me = shared_from_this(), data, data_socket]() -+ asio::post(data_socket_strand_, [me = shared_from_this(), data, data_socket]() - { - const bool write_in_progress = (!me->data_buffer_.empty()); - -@@ -1367,7 +1367,7 @@ namespace fineftp - - void FtpSession::writeDataToSocket(const std::shared_ptr<asio::ip::tcp::socket>& data_socket) - { -- data_socket_strand_.post( -+ asio::post(data_socket_strand_, - [me = shared_from_this(), data_socket]() - { - auto data = me->data_buffer_.front(); -@@ -1417,7 +1417,7 @@ namespace fineftp - - void FtpSession::receiveFile(const std::shared_ptr<WriteableFile>& file) - { -- auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_service_); -+ auto data_socket = std::make_shared<asio::ip::tcp::socket>(io_context_); - - data_acceptor_.async_accept(*data_socket - , data_socket_strand_.wrap([data_socket, file, me = shared_from_this()](auto ec) -@@ -1469,7 +1469,7 @@ namespace fineftp - - void FtpSession::endDataReceiving(const std::shared_ptr<WriteableFile>& file, const std::shared_ptr<asio::ip::tcp::socket>& data_socket) - { -- data_socket_strand_.post([me = shared_from_this(), file, data_socket]() -+ asio::post(data_socket_strand_, [me = shared_from_this(), file, data_socket]() - { - file->close(); - me->sendFtpMessage(FtpReplyCode::CLOSING_DATA_CONNECTION, "Done"); -diff --git a/fineftp-server/src/ftp_session.h b/fineftp-server/src/ftp_session.h -index a448b9d..2d585b4 100755 ---- a/fineftp-server/src/ftp_session.h -+++ b/fineftp-server/src/ftp_session.h -@@ -33,7 +33,7 @@ namespace fineftp - // Public API - //////////////////////////////////////////////////////// - public: -- FtpSession(asio::io_service& io_service, const UserDatabase& user_database, const std::function<void()>& completion_handler, std::ostream& output, std::ostream& error); -+ FtpSession(asio::io_context& io_context, const UserDatabase& user_database, const std::function<void()>& completion_handler, std::ostream& output, std::ostream& error); - - // Copy (disabled, as we are inheriting from shared_from_this) - FtpSession(const FtpSession&) = delete; -@@ -182,11 +182,11 @@ namespace fineftp - std::shared_ptr<FtpUser> logged_in_user_; - - // "Global" io service -- asio::io_service& io_service_; -+ asio::io_context& io_context_; - - // Command Socket. - // Note that the command_strand_ is used to serialize access to all of the 9 member variables following it. -- asio::io_service::strand command_strand_; -+ asio::io_context::strand command_strand_; - asio::ip::tcp::socket command_socket_; - asio::streambuf command_input_stream_; - std::deque<std::string> command_output_queue_; -@@ -204,7 +204,7 @@ namespace fineftp - asio::ip::tcp::acceptor data_acceptor_; - - // Note that the data_socket_strand_ is used to serialize access to the 2 member variables following it. -- asio::io_service::strand data_socket_strand_; -+ asio::io_context::strand data_socket_strand_; - std::weak_ptr<asio::ip::tcp::socket> data_socket_weakptr_; - std::deque<std::shared_ptr<std::vector<char>>> data_buffer_; - -diff --git a/fineftp-server/src/server_impl.cpp b/fineftp-server/src/server_impl.cpp -index dd1e00c..d7c7726 100644 ---- a/fineftp-server/src/server_impl.cpp -+++ b/fineftp-server/src/server_impl.cpp -@@ -20,7 +20,7 @@ namespace fineftp - : ftp_users_ (output, error) - , port_ (port) - , address_ (address) -- , acceptor_ (io_service_) -+ , acceptor_ (io_context_) - , open_connection_count_(0) - , output_ (output) - , error_ (error) -@@ -43,7 +43,7 @@ namespace fineftp - - bool FtpServerImpl::start(size_t thread_count) - { -- auto ftp_session = std::make_shared<FtpSession>(io_service_, ftp_users_, [this]() { open_connection_count_--; }, output_, error_); -+ auto ftp_session = std::make_shared<FtpSession>(io_context_, ftp_users_, [this]() { open_connection_count_--; }, output_, error_); - - // set up the acceptor to listen on the tcp port - asio::error_code make_address_ec; -@@ -108,7 +108,7 @@ namespace fineftp - - for (size_t i = 0; i < thread_count; i++) - { -- thread_pool_.emplace_back([this] {io_service_.run(); }); -+ thread_pool_.emplace_back([this] {io_context_.run(); }); - } - - return true; -@@ -116,7 +116,7 @@ namespace fineftp - - void FtpServerImpl::stop() - { -- io_service_.stop(); -+ io_context_.stop(); - for (std::thread& thread : thread_pool_) - { - thread.join(); -@@ -140,7 +140,7 @@ namespace fineftp - - ftp_session->start(); - -- auto new_session = std::make_shared<FtpSession>(io_service_, ftp_users_, [this]() { open_connection_count_--; }, output_, error_); -+ auto new_session = std::make_shared<FtpSession>(io_context_, ftp_users_, [this]() { open_connection_count_--; }, output_, error_); - - acceptor_.async_accept(new_session->getSocket() - , [this, new_session](auto ec) -diff --git a/fineftp-server/src/server_impl.h b/fineftp-server/src/server_impl.h -index 7f1c0d5..6e19cf5 100644 ---- a/fineftp-server/src/server_impl.h -+++ b/fineftp-server/src/server_impl.h -@@ -55,7 +55,7 @@ namespace fineftp - const std::string address_; - - std::vector<std::thread> thread_pool_; -- asio::io_service io_service_; -+ asio::io_context io_context_; - asio::ip::tcp::acceptor acceptor_; - - std::atomic<int> open_connection_count_; diff --git a/ftp/fineftp-server/pkg-plist b/ftp/fineftp-server/pkg-plist index e2cb7085614d..7b9e83f6d58c 100644 --- a/ftp/fineftp-server/pkg-plist +++ b/ftp/fineftp-server/pkg-plist @@ -8,4 +8,4 @@ lib/cmake/fineftp/fineftpTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/fineftp/fineftpTargets.cmake lib/libfineftp-server.so lib/libfineftp-server.so.1 -lib/libfineftp-server.so.1.5.0 +lib/libfineftp-server.so.1.5.1 diff --git a/ftp/freebsd-ftpd/Makefile b/ftp/freebsd-ftpd/Makefile index b90e54050f72..0aefa27362f4 100644 --- a/ftp/freebsd-ftpd/Makefile +++ b/ftp/freebsd-ftpd/Makefile @@ -1,6 +1,7 @@ PORTNAME= freebsd-ftpd DISTVERSIONPREFIX= v -DISTVERSION= 20240719 +DISTVERSION= 20250929 +PORTREVISION= 1 CATEGORIES= ftp MAINTAINER= cy@FreeBSD.org @@ -11,9 +12,9 @@ LICENSE= BSD3CLAUSE USE_GITHUB= yes GH_ACCOUNT= cschuber -GH_TAGNAME= d716943 USES= uidfix +USE_RC_SUBR= ftpd MAKE_ARGS+= BINOWN=${BINOWN} BINMODE=${BINMODE} MAKE_ENV+= MAKESYSPATH=/usr/src/share/mk \ diff --git a/ftp/freebsd-ftpd/distinfo b/ftp/freebsd-ftpd/distinfo index 03f17dc89d6f..e3d6a9a68de8 100644 --- a/ftp/freebsd-ftpd/distinfo +++ b/ftp/freebsd-ftpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1721400461 -SHA256 (cschuber-freebsd-ftpd-v20240719-d716943_GH0.tar.gz) = 88c66f275f3a80ce3323dd69d034477dd2dd63ef9b0dd05079b9ef805b104abc -SIZE (cschuber-freebsd-ftpd-v20240719-d716943_GH0.tar.gz) = 47896 +TIMESTAMP = 1759186092 +SHA256 (cschuber-freebsd-ftpd-v20250929_GH0.tar.gz) = 29d63dea3ba762ee39e5b75efff8a3c926c6420b4d0d80658d445e101c3e03a8 +SIZE (cschuber-freebsd-ftpd-v20250929_GH0.tar.gz) = 48009 diff --git a/ftp/freebsd-ftpd/files/ftpd.in b/ftp/freebsd-ftpd/files/ftpd.in new file mode 100644 index 000000000000..ef830b02f817 --- /dev/null +++ b/ftp/freebsd-ftpd/files/ftpd.in @@ -0,0 +1,25 @@ +#!/bin/sh + +# PROVIDE: ftpd +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf to run freebsd-ftpd +# as a standalone daemon: +# +# ftpd_enable (bool): Run freebsd-ftpd FTP server (or NO). +# ftpd_flags (str): Use this for flags OTHER than -D + +. /etc/rc.subr + +load_rc_config $name + +name="ftpd" +rcvar="ftpd_enable" + +: ${ftpd_enable=NO} + +command="/usr/local/libexec/${name}" +command_args="-D" + +run_rc_command "$1" diff --git a/ftp/net2ftp/Makefile b/ftp/net2ftp/Makefile index 491db1e3bc35..7e7ed388d52e 100644 --- a/ftp/net2ftp/Makefile +++ b/ftp/net2ftp/Makefile @@ -11,6 +11,9 @@ WWW= https://www.net2ftp.com/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +BROKEN= Unfetchable +EXPIRATION_DATE=2025-12-31 + USES= cpe php zip .if !defined(WITHOUT_PHP_DEPENDS) USE_PHP= ftp mysqli session zlib diff --git a/ftp/pget/Makefile b/ftp/pget/Makefile index 035b0db9df76..8d36358458bc 100644 --- a/ftp/pget/Makefile +++ b/ftp/pget/Makefile @@ -1,7 +1,7 @@ PORTNAME= pget DISTVERSIONPREFIX= v DISTVERSION= 0.2.1 -PORTREVISION= 15 +PORTREVISION= 18 CATEGORIES= ftp net www MAINTAINER= yuri@FreeBSD.org diff --git a/ftp/py-pycurl/Makefile b/ftp/py-pycurl/Makefile index c9b06a9c3e51..7b68a46b3ef4 100644 --- a/ftp/py-pycurl/Makefile +++ b/ftp/py-pycurl/Makefile @@ -1,5 +1,5 @@ PORTNAME= pycurl -PORTVERSION= 7.45.6 +PORTVERSION= 7.45.7 CATEGORIES= ftp python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/ftp/py-pycurl/distinfo b/ftp/py-pycurl/distinfo index e8718988aa71..f368d429e703 100644 --- a/ftp/py-pycurl/distinfo +++ b/ftp/py-pycurl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742070438 -SHA256 (pycurl-7.45.6.tar.gz) = 2b73e66b22719ea48ac08a93fc88e57ef36d46d03cb09d972063c9aa86bb74e6 -SIZE (pycurl-7.45.6.tar.gz) = 239470 +TIMESTAMP = 1759816696 +SHA256 (pycurl-7.45.7.tar.gz) = 9d43013002eab2fd6d0dcc671cd1e9149e2fc1c56d5e796fad94d076d6cb69ef +SIZE (pycurl-7.45.7.tar.gz) = 241098 diff --git a/ftp/py-pyftpdlib/Makefile b/ftp/py-pyftpdlib/Makefile index 369dec4951ac..0239b4f5a45d 100644 --- a/ftp/py-pyftpdlib/Makefile +++ b/ftp/py-pyftpdlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyftpdlib PORTVERSION= 1.5.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,7 +22,7 @@ SENDFILE_DESC= Enable sendfile(2) support OPENSSL_DESC= Enable FTP over SSL/TLS (RFC4217) SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile@${PY_FLAVOR} -OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} +OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyopenssl>0:security/py-pyopenssl@${PY_FLAVOR} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} PORTEXAMPLES= * diff --git a/ftp/quftp/Makefile b/ftp/quftp/Makefile index 34389c637515..fea1fb22009a 100644 --- a/ftp/quftp/Makefile +++ b/ftp/quftp/Makefile @@ -14,6 +14,7 @@ USES= ncurses readline GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +CPPFLAGS+= -DWANT_OBSOLETE_TYPEDEFS LDFLAGS+= -lpthread PLIST_FILES= bin/quftp share/man/man1/quftp.1.gz diff --git a/ftp/rubygem-curb/Makefile b/ftp/rubygem-curb/Makefile index 8d29e2e2e8bc..38a20cf484e4 100644 --- a/ftp/rubygem-curb/Makefile +++ b/ftp/rubygem-curb/Makefile @@ -1,5 +1,5 @@ PORTNAME= curb -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.2 CATEGORIES= ftp rubygems MASTER_SITES= RG diff --git a/ftp/rubygem-curb/distinfo b/ftp/rubygem-curb/distinfo index 65b4ea321fe7..34c2bdafcb34 100644 --- a/ftp/rubygem-curb/distinfo +++ b/ftp/rubygem-curb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753796232 -SHA256 (rubygem/curb-1.1.0.gem) = b38e549f617e3abe57311fa3ad2f9b0af9beb0ba54825e08ee72d3f4d05a6bc5 -SIZE (rubygem/curb-1.1.0.gem) = 97792 +TIMESTAMP = 1759817012 +SHA256 (rubygem/curb-1.2.2.gem) = 64ebccac50bd682bedb58a8b5456295c46a4eed67e84111f2d79041e1b6bacc7 +SIZE (rubygem/curb-1.2.2.gem) = 117248 diff --git a/ftp/rubygem-net-ftp/Makefile b/ftp/rubygem-net-ftp/Makefile index 5adfe9704712..8d1fcba4a1da 100644 --- a/ftp/rubygem-net-ftp/Makefile +++ b/ftp/rubygem-net-ftp/Makefile @@ -1,5 +1,5 @@ PORTNAME= net-ftp -PORTVERSION= 0.3.8 +PORTVERSION= 0.3.9 CATEGORIES= ftp rubygems MASTER_SITES= RG diff --git a/ftp/rubygem-net-ftp/distinfo b/ftp/rubygem-net-ftp/distinfo index 0303c078a6f7..d11e93024512 100644 --- a/ftp/rubygem-net-ftp/distinfo +++ b/ftp/rubygem-net-ftp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728632718 -SHA256 (rubygem/net-ftp-0.3.8.gem) = 28d63e407a7edb9739c320a4faaec515e43e963815248d06418aba322478874f -SIZE (rubygem/net-ftp-0.3.8.gem) = 19968 +TIMESTAMP = 1762587432 +SHA256 (rubygem/net-ftp-0.3.9.gem) = 307817ccf7f428f79d083f7e36dbb46a9d1d375e0d23027824de1866f0b13b65 +SIZE (rubygem/net-ftp-0.3.9.gem) = 19968 diff --git a/ftp/termscp/Makefile b/ftp/termscp/Makefile index 75990069cc4d..0b990c893404 100644 --- a/ftp/termscp/Makefile +++ b/ftp/termscp/Makefile @@ -1,7 +1,7 @@ PORTNAME= termscp DISTVERSIONPREFIX= v DISTVERSION= 0.10.0 -PORTREVISION= 25 +PORTREVISION= 27 CATEGORIES= ftp MAINTAINER= sec.research.2005@gmail.com diff --git a/ftp/unftp/Makefile b/ftp/unftp/Makefile index 284188c866fc..b330a15c1632 100644 --- a/ftp/unftp/Makefile +++ b/ftp/unftp/Makefile @@ -1,7 +1,7 @@ PORTNAME= unftp DISTVERSIONPREFIX= v DISTVERSION= 0.15.1 -PORTREVISION= 6 +PORTREVISION= 8 CATEGORIES= ftp MAINTAINER= yuri@FreeBSD.org |
