FreeBSD Bugzilla – Attachment 254859 Details for
Bug 282480
net/kea: Update to 2.7.4
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch v1
kea.diff (text/plain), 15.35 KB, created by
Guido Falsi
on 2024-11-01 22:59:08 UTC
(
hide
)
Description:
patch v1
Filename:
MIME Type:
Creator:
Guido Falsi
Created:
2024-11-01 22:59:08 UTC
Size:
15.35 KB
patch
obsolete
>diff --git a/mail/mailpit/Makefile b/mail/mailpit/Makefile >index 99503218a72e..953fac9c3dfe 100644 >--- a/mail/mailpit/Makefile >+++ b/mail/mailpit/Makefile >@@ -1,6 +1,6 @@ > PORTNAME= mailpit > DISTVERSIONPREFIX= v >-DISTVERSION= 1.21.1 >+DISTVERSION= 1.21.0 > CATEGORIES= mail devel > MASTER_SITES= https://www.madpilot.net/mailpit/:npmcache \ > LOCAL/madpilot/mailpit:npmcache >diff --git a/mail/mailpit/distinfo b/mail/mailpit/distinfo >index db6246a7791e..c36c0c996389 100644 >--- a/mail/mailpit/distinfo >+++ b/mail/mailpit/distinfo >@@ -1,7 +1,7 @@ >-TIMESTAMP = 1730469870 >-SHA256 (go/mail_mailpit/mailpit-v1.21.1/mailpit-npm-cache-1.21.1.tar.zst) = 7c96c3474ce035e7e8fe479dc74cff401b68731e32c88779aee6c2d98733f6c7 >-SIZE (go/mail_mailpit/mailpit-v1.21.1/mailpit-npm-cache-1.21.1.tar.zst) = 27380301 >-SHA256 (go/mail_mailpit/mailpit-v1.21.1/v1.21.1.mod) = e45a7c6211752dfbcf063a971de4aed7097d748df87060a12407f4dc1c74b03a >-SIZE (go/mail_mailpit/mailpit-v1.21.1/v1.21.1.mod) = 2720 >-SHA256 (go/mail_mailpit/mailpit-v1.21.1/v1.21.1.zip) = c3e808338142a01c38a1d8aab7bd4016cba7d27731f6941831c3bec877488a7d >-SIZE (go/mail_mailpit/mailpit-v1.21.1/v1.21.1.zip) = 519072 >+TIMESTAMP = 1729801535 >+SHA256 (go/mail_mailpit/mailpit-v1.21.0/mailpit-npm-cache-1.21.0.tar.zst) = 3a925cced87d0336e447b4024529baf99d43384e6fd0f88981040cfa67593eb4 >+SIZE (go/mail_mailpit/mailpit-v1.21.0/mailpit-npm-cache-1.21.0.tar.zst) = 27366413 >+SHA256 (go/mail_mailpit/mailpit-v1.21.0/v1.21.0.mod) = 8ad35abf8e83c989114b11f1e77f26acc0fadbc6d8eebd8610efdf85b2cc4fa2 >+SIZE (go/mail_mailpit/mailpit-v1.21.0/v1.21.0.mod) = 2720 >+SHA256 (go/mail_mailpit/mailpit-v1.21.0/v1.21.0.zip) = cf577da496a0a7a4c803e6112db3e6e4157ae38648b14d5a50ea58b6baf3d363 >+SIZE (go/mail_mailpit/mailpit-v1.21.0/v1.21.0.zip) = 518310 >diff --git a/net/kea/Makefile b/net/kea/Makefile >index d618befca915..9ffc71fe7d76 100644 >--- a/net/kea/Makefile >+++ b/net/kea/Makefile >@@ -1,6 +1,5 @@ > PORTNAME= kea >-DISTVERSION= 2.6.1 >-PORTREVISION= 1 >+DISTVERSION= 2.7.4 > CATEGORIES= net > MASTER_SITES= ISC/kea/${DISTVERSION} > >diff --git a/net/kea/distinfo b/net/kea/distinfo >index 6ea85f3363f6..ed8ef48f27e8 100644 >--- a/net/kea/distinfo >+++ b/net/kea/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1722440093 >-SHA256 (kea-2.6.1.tar.gz) = d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1 >-SIZE (kea-2.6.1.tar.gz) = 10467190 >+TIMESTAMP = 1730469996 >+SHA256 (kea-2.7.4.tar.gz) = 9104d6eed729f9485df8a7874efbe9d1f05885eaebed8140a9765493fed54ae4 >+SIZE (kea-2.7.4.tar.gz) = 10796314 >diff --git a/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am b/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am >index fc2cb111e705..eb7db1751651 100644 >--- a/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am >+++ b/net/kea/files/patch-src_lib_dhcpsrv_Makefile.am >@@ -1,11 +1,11 @@ >---- src/lib/dhcpsrv/Makefile.am.orig 2019-10-25 12:41:08 UTC >+--- src/lib/dhcpsrv/Makefile.am.orig 2024-10-29 14:14:17 UTC > +++ src/lib/dhcpsrv/Makefile.am >-@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests benchmarks >+@@ -4,7 +4,7 @@ SUBDIRS = . testutils tests > > # DATA_DIR is the directory where to put default CSV files and the DHCPv6 > # server ID file (i.e. the file where the server finds its DUID at startup). > -dhcp_data_dir = @localstatedir@/lib/@PACKAGE@ > +dhcp_data_dir = @localstatedir@/db/@PACKAGE@ >- kea_lfc_location = @prefix@/sbin/kea-lfc >+ kea_lfc_location = @sbindir@/kea-lfc > >- AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\"" >+ AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib >diff --git a/net/kea/files/patch-src_lib_dns_name.cc b/net/kea/files/patch-src_lib_dns_name.cc >deleted file mode 100644 >index a22b2eb3998c..000000000000 >--- a/net/kea/files/patch-src_lib_dns_name.cc >+++ /dev/null >@@ -1,57 +0,0 @@ >---- src/lib/dns/name.cc.orig 2024-07-25 08:50:58 UTC >-+++ src/lib/dns/name.cc >-@@ -303,7 +303,7 @@ Name::Name(const std::string &namestring, bool downcas >- // And get the output >- labelcount_ = offsets.size(); >- isc_throw_assert(labelcount_ > 0 && labelcount_ <= Name::MAX_LABELS); >-- ndata_.assign(ndata.data(), ndata.size()); >-+ ndata_.assign(ndata.data(), ndata.data() + ndata.size()); >- length_ = ndata_.size(); >- offsets_.assign(offsets.begin(), offsets.end()); >- } >-@@ -336,7 +336,7 @@ Name::Name(const char* namedata, size_t data_len, cons >- // Get the output >- labelcount_ = offsets.size(); >- isc_throw_assert(labelcount_ > 0 && labelcount_ <= Name::MAX_LABELS); >-- ndata_.assign(ndata.data(), ndata.size()); >-+ ndata_.assign(ndata.data(), ndata.data() + ndata.size()); >- length_ = ndata_.size(); >- offsets_.assign(offsets.begin(), offsets.end()); >- >-@@ -347,7 +347,7 @@ Name::Name(const char* namedata, size_t data_len, cons >- // Drop the last character of the data (the \0) and append a copy of >- // the origin's data >- ndata_.erase(ndata_.end() - 1); >-- ndata_.append(origin->ndata_); >-+ ndata_.insert(ndata_.end(), origin->ndata_.begin(), origin->ndata_.end()); >- >- // Do a similar thing with offsets. However, we need to move them >- // so they point after the prefix we parsed before. >-@@ -582,7 +582,7 @@ Name::concatenate(const Name& suffix) const { >- >- Name retname; >- retname.ndata_.reserve(length); >-- retname.ndata_.assign(ndata_, 0, length_ - 1); >-+ retname.ndata_.assign(ndata_.data(), ndata_.data() + length_ - 1); >- retname.ndata_.insert(retname.ndata_.end(), >- suffix.ndata_.begin(), suffix.ndata_.end()); >- isc_throw_assert(retname.ndata_.size() == length); >-@@ -622,7 +622,7 @@ Name::reverse() const { >- NameString::const_iterator n0 = ndata_.begin(); >- retname.offsets_.push_back(0); >- while (rit1 != offsets_.rend()) { >-- retname.ndata_.append(n0 + *rit1, n0 + *rit0); >-+ retname.ndata_.insert(retname.ndata_.end(), n0 + *rit1, n0 + *rit0); >- retname.offsets_.push_back(retname.ndata_.size()); >- ++rit0; >- ++rit1; >-@@ -662,7 +662,8 @@ Name::split(const unsigned int first, const unsigned i >- // original name, and append the trailing dot explicitly. >- // >- retname.ndata_.reserve(retname.offsets_.back() + 1); >-- retname.ndata_.assign(ndata_, offsets_[first], retname.offsets_.back()); >-+ auto it = ndata_.data() + offsets_[first]; >-+ retname.ndata_.assign(it, it + retname.offsets_.back()); >- retname.ndata_.push_back(0); >- >- retname.length_ = retname.ndata_.size(); >diff --git a/net/kea/files/patch-src_lib_dns_name.h b/net/kea/files/patch-src_lib_dns_name.h >deleted file mode 100644 >index e83fde6a960d..000000000000 >--- a/net/kea/files/patch-src_lib_dns_name.h >+++ /dev/null >@@ -1,11 +0,0 @@ >---- src/lib/dns/name.h.orig 2024-07-25 08:50:58 UTC >-+++ src/lib/dns/name.h >-@@ -228,7 +228,7 @@ class Name { (private) >- //@{ >- private: >- /// \brief Name data string >-- typedef std::basic_string<uint8_t> NameString; >-+ typedef std::vector<uint8_t> NameString; >- /// \brief Name offsets type >- typedef std::vector<uint8_t> NameOffsets; >- >diff --git a/net/kea/pkg-plist b/net/kea/pkg-plist >index 8077a0d75b96..0b79de0a92fc 100644 >--- a/net/kea/pkg-plist >+++ b/net/kea/pkg-plist >@@ -9,9 +9,8 @@ include/kea/asiodns/logger.h > include/kea/asiolink/addr_utilities.h > include/kea/asiolink/asio_wrapper.h > include/kea/asiolink/asiolink.h >-include/kea/asiolink/botan_boost_tls.h >-include/kea/asiolink/botan_boost_wrapper.h > include/kea/asiolink/botan_tls.h >+include/kea/asiolink/botan_wrapper.h > include/kea/asiolink/common_tls.h > include/kea/asiolink/crypto_tls.h > include/kea/asiolink/dummy_io_cb.h >@@ -62,7 +61,12 @@ include/kea/config/command_mgr.h > include/kea/config/config_log.h > include/kea/config/config_messages.h > include/kea/config/hooked_command_mgr.h >+include/kea/config/http_command_config.h >+include/kea/config/http_command_mgr.h >+include/kea/config/http_command_response_creator.h >+include/kea/config/http_command_response_creator_factory.h > include/kea/config/timeouts.h >+include/kea/config/unix_command_mgr.h > include/kea/config_backend/base_config_backend.h > include/kea/config_backend/base_config_backend_mgr.h > include/kea/config_backend/base_config_backend_pool.h >@@ -220,8 +224,6 @@ include/kea/dhcpsrv/lease_mgr_factory.h > include/kea/dhcpsrv/memfile_lease_limits.h > include/kea/dhcpsrv/memfile_lease_mgr.h > include/kea/dhcpsrv/memfile_lease_storage.h >-%%MYSQL%%include/kea/dhcpsrv/mysql_host_data_source.h >-%%MYSQL%%include/kea/dhcpsrv/mysql_lease_mgr.h > include/kea/dhcpsrv/ncr_generator.h > include/kea/dhcpsrv/network.h > include/kea/dhcpsrv/network_state.h >@@ -241,8 +243,6 @@ include/kea/dhcpsrv/parsers/shared_network_parser.h > include/kea/dhcpsrv/parsers/shared_networks_list_parser.h > include/kea/dhcpsrv/parsers/simple_parser4.h > include/kea/dhcpsrv/parsers/simple_parser6.h >-%%PGSQL%%include/kea/dhcpsrv/pgsql_host_data_source.h >-%%PGSQL%%include/kea/dhcpsrv/pgsql_lease_mgr.h > include/kea/dhcpsrv/pool.h > include/kea/dhcpsrv/random_allocation_state.h > include/kea/dhcpsrv/random_allocator.h >@@ -442,108 +442,108 @@ lib/kea/hooks/libdhcp_ha.a > lib/kea/hooks/libdhcp_ha.so > lib/kea/hooks/libdhcp_lease_cmds.a > lib/kea/hooks/libdhcp_lease_cmds.so >-%%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.a >-%%MYSQL%%lib/kea/hooks/libdhcp_mysql_cb.so >+%%MYSQL%%lib/kea/hooks/libdhcp_mysql.a >+%%MYSQL%%lib/kea/hooks/libdhcp_mysql.so > lib/kea/hooks/libdhcp_perfmon.a > lib/kea/hooks/libdhcp_perfmon.so >-%%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.a >-%%PGSQL%%lib/kea/hooks/libdhcp_pgsql_cb.so >+%%PGSQL%%lib/kea/hooks/libdhcp_pgsql.a >+%%PGSQL%%lib/kea/hooks/libdhcp_pgsql.so > lib/kea/hooks/libdhcp_run_script.a > lib/kea/hooks/libdhcp_run_script.so > lib/kea/hooks/libdhcp_stat_cmds.a > lib/kea/hooks/libdhcp_stat_cmds.so > lib/libkea-asiodns.a > lib/libkea-asiodns.so >-lib/libkea-asiodns.so.48 >-lib/libkea-asiodns.so.48.0.0 >+lib/libkea-asiodns.so.60 >+lib/libkea-asiodns.so.60.0.0 > lib/libkea-asiolink.a > lib/libkea-asiolink.so >-lib/libkea-asiolink.so.71 >-lib/libkea-asiolink.so.71.0.0 >+lib/libkea-asiolink.so.82 >+lib/libkea-asiolink.so.82.0.0 > lib/libkea-cc.a > lib/libkea-cc.so >-lib/libkea-cc.so.68 >-lib/libkea-cc.so.68.0.0 >+lib/libkea-cc.so.79 >+lib/libkea-cc.so.79.0.0 > lib/libkea-cfgclient.a > lib/libkea-cfgclient.so >-lib/libkea-cfgclient.so.65 >-lib/libkea-cfgclient.so.65.0.0 >+lib/libkea-cfgclient.so.78 >+lib/libkea-cfgclient.so.78.0.0 > lib/libkea-cryptolink.a > lib/libkea-cryptolink.so >-lib/libkea-cryptolink.so.50 >-lib/libkea-cryptolink.so.50.0.0 >+lib/libkea-cryptolink.so.61 >+lib/libkea-cryptolink.so.61.0.0 > lib/libkea-d2srv.a > lib/libkea-d2srv.so >-lib/libkea-d2srv.so.46 >-lib/libkea-d2srv.so.46.0.0 >+lib/libkea-d2srv.so.60 >+lib/libkea-d2srv.so.60.0.0 > lib/libkea-database.a > lib/libkea-database.so >-lib/libkea-database.so.61 >-lib/libkea-database.so.61.0.0 >+lib/libkea-database.so.73 >+lib/libkea-database.so.73.0.0 > lib/libkea-dhcp++.a > lib/libkea-dhcp++.so >-lib/libkea-dhcp++.so.90 >-lib/libkea-dhcp++.so.90.0.0 >+lib/libkea-dhcp++.so.104 >+lib/libkea-dhcp++.so.104.0.0 > lib/libkea-dhcp_ddns.a > lib/libkea-dhcp_ddns.so >-lib/libkea-dhcp_ddns.so.56 >-lib/libkea-dhcp_ddns.so.56.0.0 >+lib/libkea-dhcp_ddns.so.66 >+lib/libkea-dhcp_ddns.so.66.0.0 > lib/libkea-dhcpsrv.a > lib/libkea-dhcpsrv.so >-lib/libkea-dhcpsrv.so.109 >-lib/libkea-dhcpsrv.so.109.0.0 >+lib/libkea-dhcpsrv.so.123 >+lib/libkea-dhcpsrv.so.123.0.0 > lib/libkea-dns++.a > lib/libkea-dns++.so >-lib/libkea-dns++.so.56 >-lib/libkea-dns++.so.56.0.0 >+lib/libkea-dns++.so.68 >+lib/libkea-dns++.so.68.0.0 > lib/libkea-eval.a > lib/libkea-eval.so >-lib/libkea-eval.so.69 >-lib/libkea-eval.so.69.0.0 >+lib/libkea-eval.so.81 >+lib/libkea-eval.so.81.0.0 > lib/libkea-exceptions.a > lib/libkea-exceptions.so >-lib/libkea-exceptions.so.33 >-lib/libkea-exceptions.so.33.0.0 >+lib/libkea-exceptions.so.43 >+lib/libkea-exceptions.so.43.0.0 > lib/libkea-hooks.a > lib/libkea-hooks.so >-lib/libkea-hooks.so.98 >-lib/libkea-hooks.so.98.0.0 >+lib/libkea-hooks.so.112 >+lib/libkea-hooks.so.112.0.0 > lib/libkea-http.a > lib/libkea-http.so >-lib/libkea-http.so.71 >-lib/libkea-http.so.71.0.0 >+lib/libkea-http.so.83 >+lib/libkea-http.so.83.0.0 > lib/libkea-log.a > lib/libkea-log.so >-lib/libkea-log.so.61 >-lib/libkea-log.so.61.0.0 >+lib/libkea-log.so.72 >+lib/libkea-log.so.72.0.0 > %%MYSQL%%lib/libkea-mysql.a > %%MYSQL%%lib/libkea-mysql.so >-%%MYSQL%%lib/libkea-mysql.so.70 >-%%MYSQL%%lib/libkea-mysql.so.70.0.0 >+%%MYSQL%%lib/libkea-mysql.so.83 >+%%MYSQL%%lib/libkea-mysql.so.83.0.0 > %%PGSQL%%lib/libkea-pgsql.a > %%PGSQL%%lib/libkea-pgsql.so >-%%PGSQL%%lib/libkea-pgsql.so.70 >-%%PGSQL%%lib/libkea-pgsql.so.70.0.0 >+%%PGSQL%%lib/libkea-pgsql.so.83 >+%%PGSQL%%lib/libkea-pgsql.so.83.0.0 > lib/libkea-process.a > lib/libkea-process.so >-lib/libkea-process.so.72 >-lib/libkea-process.so.72.0.0 >+lib/libkea-process.so.85 >+lib/libkea-process.so.85.0.0 > lib/libkea-stats.a > lib/libkea-stats.so >-lib/libkea-stats.so.41 >-lib/libkea-stats.so.41.0.0 >+lib/libkea-stats.so.51 >+lib/libkea-stats.so.51.0.0 > lib/libkea-tcp.a > lib/libkea-tcp.so >-lib/libkea-tcp.so.18 >-lib/libkea-tcp.so.18.0.0 >+lib/libkea-tcp.so.31 >+lib/libkea-tcp.so.31.0.0 > lib/libkea-util-io.a > lib/libkea-util-io.so >-lib/libkea-util-io.so.0 >-lib/libkea-util-io.so.0.0.1 >+lib/libkea-util-io.so.10 >+lib/libkea-util-io.so.10.0.0 > lib/libkea-util.a > lib/libkea-util.so >-lib/libkea-util.so.84 >-lib/libkea-util.so.84.0.0 >+lib/libkea-util.so.97 >+lib/libkea-util.so.97.0.0 > %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.opt-1.pyc > %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.opt-2.pyc > %%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.pyc >@@ -643,6 +643,8 @@ sbin/keactrl > %%DATADIR%%/api/network6-list.json > %%DATADIR%%/api/network6-subnet-add.json > %%DATADIR%%/api/network6-subnet-del.json >+%%DATADIR%%/api/perfmon-control.json >+%%DATADIR%%/api/perfmon-get-all-durations.json > %%DATADIR%%/api/remote-class4-del.json > %%DATADIR%%/api/remote-class4-get-all.json > %%DATADIR%%/api/remote-class4-get.json >@@ -747,13 +749,16 @@ sbin/keactrl > %%DATADIR%%/api/subnet4-delta-del.json > %%DATADIR%%/api/subnet4-get.json > %%DATADIR%%/api/subnet4-list.json >+%%DATADIR%%/api/subnet4-select-test.json > %%DATADIR%%/api/subnet4-update.json >+%%DATADIR%%/api/subnet4o6-select-test.json > %%DATADIR%%/api/subnet6-add.json > %%DATADIR%%/api/subnet6-del.json > %%DATADIR%%/api/subnet6-delta-add.json > %%DATADIR%%/api/subnet6-delta-del.json > %%DATADIR%%/api/subnet6-get.json > %%DATADIR%%/api/subnet6-list.json >+%%DATADIR%%/api/subnet6-select-test.json > %%DATADIR%%/api/subnet6-update.json > %%DATADIR%%/api/version-get.json > %%DATADIR%%/scripts/admin-utils.sh >@@ -791,7 +796,10 @@ sbin/keactrl > %%DATADIR%%/scripts/mysql/upgrade_019_to_020.sh > %%DATADIR%%/scripts/mysql/upgrade_020_to_021.sh > %%DATADIR%%/scripts/mysql/upgrade_021_to_022.sh >-%%DATADIR%%/scripts/mysql/upgrade_022_to_022.1.sh >+%%DATADIR%%/scripts/mysql/upgrade_022_to_023.sh >+%%DATADIR%%/scripts/mysql/upgrade_023_to_024.sh >+%%DATADIR%%/scripts/mysql/upgrade_024_to_025.sh >+%%DATADIR%%/scripts/mysql/upgrade_025_to_026.sh > %%DATADIR%%/scripts/mysql/wipe_data.sh > %%DATADIR%%/scripts/pgsql/dhcpdb_create.pgsql > %%DATADIR%%/scripts/pgsql/dhcpdb_drop.pgsql >@@ -822,7 +830,10 @@ sbin/keactrl > %%DATADIR%%/scripts/pgsql/upgrade_019_to_020.sh > %%DATADIR%%/scripts/pgsql/upgrade_020_to_021.sh > %%DATADIR%%/scripts/pgsql/upgrade_021_to_022.sh >-%%DATADIR%%/scripts/pgsql/upgrade_022_to_022.1.sh >+%%DATADIR%%/scripts/pgsql/upgrade_022_to_023.sh >+%%DATADIR%%/scripts/pgsql/upgrade_023_to_024.sh >+%%DATADIR%%/scripts/pgsql/upgrade_024_to_025.sh >+%%DATADIR%%/scripts/pgsql/upgrade_025_to_026.sh > %%DATADIR%%/scripts/pgsql/wipe_data.sh > share/man/man8/kea-admin.8.gz > share/man/man8/kea-ctrl-agent.8.gz
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=254859">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 282480
: 254859