diff options
Diffstat (limited to 'ftp')
-rw-r--r-- | ftp/R-cran-curl/Makefile | 2 | ||||
-rw-r--r-- | ftp/R-cran-curl/distinfo | 6 | ||||
-rw-r--r-- | ftp/coeurl/Makefile | 1 | ||||
-rw-r--r-- | ftp/curlie/Makefile | 2 | ||||
-rw-r--r-- | ftp/fineftp-server/Makefile | 4 | ||||
-rw-r--r-- | ftp/fineftp-server/files/patch-git-gfc323ccece | 240 | ||||
-rw-r--r-- | ftp/gnustep-ftp/Makefile | 2 | ||||
-rw-r--r-- | ftp/pget/Makefile | 2 | ||||
-rw-r--r-- | ftp/proftpd-mod_vroot/Makefile | 2 | ||||
-rw-r--r-- | ftp/rubygem-curb/Makefile | 2 | ||||
-rw-r--r-- | ftp/rubygem-curb/distinfo | 6 | ||||
-rw-r--r-- | ftp/sftpgo/Makefile | 2 | ||||
-rw-r--r-- | ftp/waiho/Makefile | 2 | ||||
-rw-r--r-- | ftp/wush/Makefile | 2 |
14 files changed, 259 insertions, 16 deletions
diff --git a/ftp/R-cran-curl/Makefile b/ftp/R-cran-curl/Makefile index 6f9a2ea6a0cc..1f427e87b1ca 100644 --- a/ftp/R-cran-curl/Makefile +++ b/ftp/R-cran-curl/Makefile @@ -1,5 +1,5 @@ PORTNAME= curl -DISTVERSION= 6.4.0 +DISTVERSION= 7.0.0 CATEGORIES= ftp DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/ftp/R-cran-curl/distinfo b/ftp/R-cran-curl/distinfo index 69e6cf7f8093..4110e7e11ba7 100644 --- a/ftp/R-cran-curl/distinfo +++ b/ftp/R-cran-curl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751514613 -SHA256 (curl_6.4.0.tar.gz) = 3bb4dbf892d2c3b4449d67553f2b3b31d9fa23c71fa6af0a287930ae8377ecdb -SIZE (curl_6.4.0.tar.gz) = 935843 +TIMESTAMP = 1755793537 +SHA256 (curl_7.0.0.tar.gz) = 5b1633be7bc0ea796e2df5b24b2aec937a17359f2d86207359aa553328824d6b +SIZE (curl_7.0.0.tar.gz) = 731109 diff --git a/ftp/coeurl/Makefile b/ftp/coeurl/Makefile index 2448cc679e8c..4d0c39ba63ec 100644 --- a/ftp/coeurl/Makefile +++ b/ftp/coeurl/Makefile @@ -1,6 +1,7 @@ PORTNAME= coeurl DISTVERSIONPREFIX=v DISTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= ftp www MAINTAINER= adridg@FreeBSD.org diff --git a/ftp/curlie/Makefile b/ftp/curlie/Makefile index b3a0dec311cf..c0b6d54db341 100644 --- a/ftp/curlie/Makefile +++ b/ftp/curlie/Makefile @@ -1,7 +1,7 @@ PORTNAME= curlie DISTVERSIONPREFIX= v DISTVERSION= 1.6.7 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= ftp net www MAINTAINER= 0mp@FreeBSD.org diff --git a/ftp/fineftp-server/Makefile b/ftp/fineftp-server/Makefile index e5d4035afe63..bea14c43ce28 100644 --- a/ftp/fineftp-server/Makefile +++ b/ftp/fineftp-server/Makefile @@ -1,7 +1,7 @@ PORTNAME= fineftp-server DISTVERSIONPREFIX= v DISTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MAINTAINER= yuri@FreeBSD.org @@ -20,6 +20,8 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= eclipse-ecal +PATCH_STRIP= -p1 + CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= FINEFTP_SERVER_BUILD_SAMPLES CMAKE_ARGS= -Dasio_INCLUDE_DIR=${LOCALBASE}/include diff --git a/ftp/fineftp-server/files/patch-git-gfc323ccece b/ftp/fineftp-server/files/patch-git-gfc323ccece new file mode 100644 index 000000000000..c83831ebeb7d --- /dev/null +++ b/ftp/fineftp-server/files/patch-git-gfc323ccece @@ -0,0 +1,240 @@ +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/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile index 3072d8a963fe..bcc1f11bd949 100644 --- a/ftp/gnustep-ftp/Makefile +++ b/ftp/gnustep-ftp/Makefile @@ -1,6 +1,6 @@ PORTNAME= ftp PORTVERSION= 0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ftp gnustep MASTER_SITES= SAVANNAH/gap PKGNAMEPREFIX= gnustep- diff --git a/ftp/pget/Makefile b/ftp/pget/Makefile index 5009775ed68d..2fdf65181026 100644 --- a/ftp/pget/Makefile +++ b/ftp/pget/Makefile @@ -1,7 +1,7 @@ PORTNAME= pget DISTVERSIONPREFIX= v DISTVERSION= 0.2.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= ftp net www MAINTAINER= yuri@FreeBSD.org diff --git a/ftp/proftpd-mod_vroot/Makefile b/ftp/proftpd-mod_vroot/Makefile index d9eea5568096..3dff169c522f 100644 --- a/ftp/proftpd-mod_vroot/Makefile +++ b/ftp/proftpd-mod_vroot/Makefile @@ -4,7 +4,7 @@ PORTREVISION= 3 CATEGORIES= ftp PKGNAMEPREFIX= proftpd- -MAINTAINER= joe@thrallingpenguin.com +MAINTAINER= ports@FreeBSD.org COMMENT= Virtual Chroot ProFTPD module WWW= http://www.castaglia.org/proftpd/modules/mod_vroot.html diff --git a/ftp/rubygem-curb/Makefile b/ftp/rubygem-curb/Makefile index 79fc2354d242..8d29e2e2e8bc 100644 --- a/ftp/rubygem-curb/Makefile +++ b/ftp/rubygem-curb/Makefile @@ -1,5 +1,5 @@ PORTNAME= curb -PORTVERSION= 1.0.9 +PORTVERSION= 1.1.0 CATEGORIES= ftp rubygems MASTER_SITES= RG diff --git a/ftp/rubygem-curb/distinfo b/ftp/rubygem-curb/distinfo index 8fbe72023a61..65b4ea321fe7 100644 --- a/ftp/rubygem-curb/distinfo +++ b/ftp/rubygem-curb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739930336 -SHA256 (rubygem/curb-1.0.9.gem) = 07e5b74a4836103ce186827528f76a22d3991a9b7c45f5c10ee18ee7b03feb0d -SIZE (rubygem/curb-1.0.9.gem) = 97280 +TIMESTAMP = 1753796232 +SHA256 (rubygem/curb-1.1.0.gem) = b38e549f617e3abe57311fa3ad2f9b0af9beb0ba54825e08ee72d3f4d05a6bc5 +SIZE (rubygem/curb-1.1.0.gem) = 97792 diff --git a/ftp/sftpgo/Makefile b/ftp/sftpgo/Makefile index 9b2a322ec35e..d1ba68317aee 100644 --- a/ftp/sftpgo/Makefile +++ b/ftp/sftpgo/Makefile @@ -1,6 +1,6 @@ PORTNAME= sftpgo PORTVERSION= 2.6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ftp www MASTER_SITES= https://github.com/drakkan/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}_v${PORTVERSION}_src_with_deps diff --git a/ftp/waiho/Makefile b/ftp/waiho/Makefile index 3331f1fb7220..51251087544a 100644 --- a/ftp/waiho/Makefile +++ b/ftp/waiho/Makefile @@ -1,6 +1,6 @@ PORTNAME= waiho PORTVERSION= 0.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= ftp gnustep MASTER_SITES= http://www.roard.com/waiho/download/ DISTNAME= Waiho-${PORTVERSION} diff --git a/ftp/wush/Makefile b/ftp/wush/Makefile index fb80055f71dd..25a02eb13944 100644 --- a/ftp/wush/Makefile +++ b/ftp/wush/Makefile @@ -1,7 +1,7 @@ PORTNAME= wush DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp MAINTAINER= ashish@FreeBSD.org |