aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/6tunnel/pkg-descr2
-rw-r--r--net/Makefile8
-rw-r--r--net/akonadi-calendar/distinfo6
-rw-r--r--net/akonadi-contacts/distinfo6
-rw-r--r--net/akonadi-mime/distinfo6
-rw-r--r--net/akonadi-notes/distinfo6
-rw-r--r--net/akonadi-search/distinfo6
-rw-r--r--net/aoe/Makefile2
-rw-r--r--net/asterisk16/Makefile7
-rw-r--r--net/asterisk16/distinfo6
-rw-r--r--net/asterisk16/files/patch-main_asterisk.exports.in11
-rw-r--r--net/asterisk16/files/patch-res_res__fax__spandsp.c62
-rw-r--r--net/asterisk18/Makefile7
-rw-r--r--net/asterisk18/distinfo6
-rw-r--r--net/asterisk18/files/patch-main_asterisk.exports.in11
-rw-r--r--net/asterisk18/files/patch-res_res__fax__spandsp.c62
-rw-r--r--net/astron/Makefile10
-rw-r--r--net/avahi-app/Makefile2
-rw-r--r--net/avahi-libdns/Makefile2
-rw-r--r--net/binkd/Makefile2
-rw-r--r--net/bird2/Makefile4
-rw-r--r--net/bmon/Makefile2
-rw-r--r--net/bosh-bootloader/Makefile2
-rw-r--r--net/calendarsupport/distinfo6
-rw-r--r--net/ceph14/Makefile15
-rw-r--r--net/ceph14/distinfo10
-rw-r--r--net/ceph14/files/patch-src_librbd_api_Trash.cc180
-rw-r--r--net/ceph14/files/patch-src_test_rgw_CMakeLists.txt27
-rw-r--r--net/ceph14/files/patch-src_tools_rbd_action_Trash.cc22
-rw-r--r--net/ceph14/pkg-message11
-rw-r--r--net/ceph14/pkg-plist9
-rw-r--r--net/charm/Makefile2
-rw-r--r--net/cjdns/Makefile8
-rw-r--r--net/cjdns/files/patch-node__build_builder.js11
-rw-r--r--net/cloudquery/Makefile86
-rw-r--r--net/cloudquery/distinfo174
-rw-r--r--net/corosync2/Makefile2
-rw-r--r--net/corosync3/Makefile2
-rw-r--r--net/cpp-pcp-client/Makefile2
-rw-r--r--net/cpp-pcp-client/distinfo6
-rw-r--r--net/cpp-pcp-client/pkg-plist1
-rw-r--r--net/cppzmq/Makefile2
-rw-r--r--net/cppzmq/distinfo6
-rw-r--r--net/croc/Makefile9
-rw-r--r--net/croc/distinfo16
-rw-r--r--net/cvsup-static/Makefile2
-rw-r--r--net/dante/Makefile2
-rw-r--r--net/dhcpcd-ui/Makefile5
-rw-r--r--net/dhcpcd/Makefile21
-rw-r--r--net/dhcpcd/distinfo6
-rw-r--r--net/dhcpcd/files/dhcpcd.in2
-rw-r--r--net/dhcpcd/pkg-plist8
-rw-r--r--net/dhcperf/Makefile5
-rw-r--r--net/dictd/Makefile1
-rw-r--r--net/dictd/files/pkg-message.in5
-rw-r--r--net/dpdk-20.11/Makefile2
-rw-r--r--net/dpdk/Makefile2
-rw-r--r--net/endlessh/Makefile1
-rw-r--r--net/endlessh/files/pkg-message.in1
-rw-r--r--net/eventviews/distinfo6
-rw-r--r--net/exabgp4/Makefile4
-rw-r--r--net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py11
-rw-r--r--net/fbzmq/Makefile2
-rw-r--r--net/fbzmq/distinfo6
-rw-r--r--net/findomain/Makefile2
-rw-r--r--net/findomain/files/patch-powerpc20
-rw-r--r--net/flower/Makefile2
-rw-r--r--net/fort/Makefile5
-rw-r--r--net/fort/distinfo6
-rw-r--r--net/freeradius-client/Makefile2
-rw-r--r--net/freerdp/Makefile2
-rw-r--r--net/freerdp/distinfo6
-rw-r--r--net/freeswitch/Makefile2
-rw-r--r--net/frp/Makefile65
-rw-r--r--net/frp/distinfo126
-rw-r--r--net/frr7/Makefile2
-rw-r--r--net/frr7/files/patch-yang_frr-zebra.yang.patch68
-rw-r--r--net/fspclient/Makefile2
-rw-r--r--net/gemserv/Makefile2
-rw-r--r--net/gitlab-agent/Makefile12
-rw-r--r--net/gitlab-agent/distinfo18
-rw-r--r--net/grilo-plugins/Makefile10
-rw-r--r--net/grilo-plugins/pkg-plist2
-rw-r--r--net/grilo/pkg-plist1
-rw-r--r--net/gupnp-tools/Makefile3
-rw-r--r--net/gupnp-tools/distinfo6
-rw-r--r--net/gupnp/Makefile3
-rw-r--r--net/haproxy-devel/Makefile4
-rw-r--r--net/haproxy-devel/distinfo6
-rw-r--r--net/haproxy-devel/pkg-plist8
-rw-r--r--net/haproxy/Makefile4
-rw-r--r--net/haproxy/distinfo6
-rw-r--r--net/haproxy/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat78
-rw-r--r--net/haproxy/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se163
-rw-r--r--net/haproxy17/Makefile2
-rw-r--r--net/haproxy18/Makefile2
-rw-r--r--net/haproxy19/Makefile2
-rw-r--r--net/haproxy20/Makefile4
-rw-r--r--net/haproxy20/distinfo6
-rw-r--r--net/haproxy21/Makefile2
-rw-r--r--net/haproxy22/Makefile4
-rw-r--r--net/haproxy22/distinfo6
-rw-r--r--net/haproxy23/Makefile4
-rw-r--r--net/haproxy23/distinfo6
-rw-r--r--net/hostapd-devel/Makefile4
-rw-r--r--net/hostapd-devel/distinfo6
-rw-r--r--net/hostapd-devel/files/patch-src_utils_os__unix.c14
-rw-r--r--net/hping/Makefile2
-rw-r--r--net/ilbc/Makefile2
-rw-r--r--net/incidenceeditor/distinfo6
-rw-r--r--net/intel-ixl-kmod/Makefile2
-rw-r--r--net/irrd-legacy/Makefile81
-rw-r--r--net/irrd-legacy/distinfo3
-rw-r--r--net/irrd-legacy/files/irrd.in27
-rw-r--r--net/irrd-legacy/files/patch-configure19
-rw-r--r--net/irrd-legacy/files/patch-lib_config_config__file.c11
-rw-r--r--net/irrd-legacy/files/patch-lib_mrt_prefix.c21
-rw-r--r--net/irrd-legacy/files/patch-programs_IRRd_database.c16
-rw-r--r--net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c55
-rw-r--r--net/irrd-legacy/pkg-descr3
-rw-r--r--net/irrd/Makefile2
-rw-r--r--net/irrd/distinfo6
-rw-r--r--net/irrd/files/patch-setup.py35
-rw-r--r--net/isc-dhcp44-server/Makefile4
-rw-r--r--net/kalarmcal/distinfo6
-rw-r--r--net/kcalutils/distinfo6
-rw-r--r--net/kdenetwork-filesharing/distinfo6
-rw-r--r--net/kea/Makefile5
-rw-r--r--net/kea/pkg-plist12
-rw-r--r--net/kf5-kcalendarcore/distinfo6
-rw-r--r--net/kf5-kcalendarcore/pkg-plist1
-rw-r--r--net/kf5-kcontacts/distinfo6
-rw-r--r--net/kf5-kdav/distinfo6
-rw-r--r--net/kf5-kholidays/distinfo6
-rw-r--r--net/kf5-kxmlrpcclient/distinfo6
-rw-r--r--net/kf5-syndication/distinfo6
-rw-r--r--net/kget/distinfo6
-rw-r--r--net/kidentitymanagement/distinfo6
-rw-r--r--net/kimap/distinfo6
-rw-r--r--net/kio-gdrive/distinfo6
-rw-r--r--net/kitinerary/Makefile2
-rw-r--r--net/kitinerary/distinfo6
-rw-r--r--net/kldap/distinfo6
-rw-r--r--net/kmailtransport/distinfo6
-rw-r--r--net/kmbox/distinfo6
-rw-r--r--net/kmime/distinfo6
-rw-r--r--net/kontactinterface/distinfo6
-rw-r--r--net/kpimtextedit/distinfo6
-rw-r--r--net/krdc/distinfo6
-rw-r--r--net/krfb/distinfo6
-rw-r--r--net/krill/Makefile2
-rw-r--r--net/ksmtp/distinfo6
-rw-r--r--net/ktnef/distinfo6
-rw-r--r--net/kube-controller-manager/Makefile2
-rw-r--r--net/kube-scheduler/Makefile2
-rw-r--r--net/libexosip2/Makefile6
-rw-r--r--net/libexosip2/distinfo6
-rw-r--r--net/libexosip2/pkg-plist3
-rw-r--r--net/libfabric/Makefile2
-rw-r--r--net/libfabric/distinfo6
-rw-r--r--net/libfabric/pkg-plist2
-rw-r--r--net/libfb/Makefile2
-rw-r--r--net/libgravatar/distinfo6
-rw-r--r--net/libkgapi/distinfo6
-rw-r--r--net/libksieve/distinfo6
-rw-r--r--net/libngtcp2/Makefile4
-rw-r--r--net/libngtcp2/distinfo6
-rw-r--r--net/libnss-cache/Makefile2
-rw-r--r--net/libnss-cache/distinfo6
-rw-r--r--net/libosip2/Makefile4
-rw-r--r--net/libosip2/distinfo6
-rw-r--r--net/libosip2/pkg-plist4
-rw-r--r--net/libpcap/Makefile4
-rw-r--r--net/libpcap/distinfo6
-rw-r--r--net/librdkafka/Makefile2
-rw-r--r--net/librdkafka/distinfo6
-rw-r--r--net/librespeed-cli/Makefile2
-rw-r--r--net/librespeed-go/Makefile2
-rw-r--r--net/libwebsockets/Makefile11
-rw-r--r--net/libwebsockets/distinfo6
-rw-r--r--net/libzmq2/Makefile2
-rw-r--r--net/libzmq3/Makefile2
-rw-r--r--net/libzmq4/Makefile2
-rw-r--r--net/linux-c7-avahi-libs/Makefile2
-rw-r--r--net/linux-c7-openldap/Makefile2
-rw-r--r--net/linux-c7-tcp_wrappers-libs/Makefile2
-rw-r--r--net/mDNSResponder/Makefile1
-rw-r--r--net/mailcommon/distinfo6
-rw-r--r--net/mailimporter/distinfo6
-rw-r--r--net/mediastreamer/Makefile2
-rw-r--r--net/messagelib/distinfo6
-rw-r--r--net/minissdpd/Makefile5
-rw-r--r--net/minissdpd/distinfo6
-rw-r--r--net/mosquitto/Makefile3
-rw-r--r--net/mosquitto/distinfo6
-rw-r--r--net/mpd5/Makefile2
-rw-r--r--net/mpd5/files/patch-l2tp-multihomed183
-rw-r--r--net/mpich/Makefile8
-rw-r--r--net/mpich/files/patch-l0-1.4.160
-rw-r--r--net/mpich2/Makefile2
-rw-r--r--net/mvfst/Makefile11
-rw-r--r--net/mvfst/distinfo6
-rw-r--r--net/nats-server/Makefile2
-rw-r--r--net/nats-server/distinfo6
-rw-r--r--net/nats-streaming-server/Makefile2
-rw-r--r--net/nats-streaming-server/distinfo6
-rw-r--r--net/nbd-server/Makefile4
-rw-r--r--net/nbd-server/distinfo6
-rw-r--r--net/ndisc6/Makefile17
-rw-r--r--net/ndisc6/distinfo6
-rw-r--r--net/ndisc6/pkg-descr2
-rw-r--r--net/netatalk3/Makefile2
-rw-r--r--net/netpipes/Makefile2
-rw-r--r--net/nncp/Makefile2
-rw-r--r--net/nncp/distinfo6
-rw-r--r--net/nss-pam-ldapd/Makefile2
-rw-r--r--net/ntpsec/Makefile5
-rw-r--r--net/ntpsec/distinfo6
-rw-r--r--net/oha/Makefile324
-rw-r--r--net/oha/distinfo878
-rw-r--r--net/oha/files/patch-powerpc62
-rw-r--r--net/onedrive/Makefile10
-rw-r--r--net/onedrive/distinfo6
-rw-r--r--net/ooni-probe-cli/Makefile53
-rw-r--r--net/ooni-probe-cli/distinfo108
-rw-r--r--net/opal/Makefile2
-rw-r--r--net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp153
-rw-r--r--net/openbgpd/Makefile2
-rw-r--r--net/openbgpd6/Makefile2
-rw-r--r--net/openldap24-server/Makefile6
-rw-r--r--net/openldap25-server/Makefile18
-rw-r--r--net/openldap25-server/distinfo6
-rw-r--r--net/openldap25-server/pkg-plist12
-rw-r--r--net/openldap26-client/Makefile7
-rw-r--r--net/openldap26-server/Makefile441
-rw-r--r--net/openldap26-server/distinfo3
-rw-r--r--net/openldap26-server/files/extrapatch-Makefile.in17
-rw-r--r--net/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c15
-rw-r--r--net/openldap26-server/files/patch-ITS7548103
-rw-r--r--net/openldap26-server/files/patch-build__top.mk11
-rw-r--r--net/openldap26-server/files/patch-configure32
-rw-r--r--net/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h24
-rw-r--r--net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile13
-rw-r--r--net/openldap26-server/files/patch-include__ldap_defaults.h11
-rw-r--r--net/openldap26-server/files/patch-libraries__libldap__Makefile.in17
-rw-r--r--net/openldap26-server/files/patch-libraries_libldap_tls__o.c20
-rw-r--r--net/openldap26-server/files/patch-servers_slapd_Makefile.in67
-rw-r--r--net/openldap26-server/files/patch-servers_slapd_daemon.c14
-rw-r--r--net/openldap26-server/files/pkg-deinstall.in32
-rw-r--r--net/openldap26-server/files/pkg-message.client.in15
-rw-r--r--net/openldap26-server/files/pkg-message.in37
-rw-r--r--net/openldap26-server/files/slapd.in217
-rw-r--r--net/openldap26-server/pkg-descr11
-rw-r--r--net/openldap26-server/pkg-descr.client11
-rw-r--r--net/openldap26-server/pkg-plist306
-rw-r--r--net/openldap26-server/pkg-plist.client232
-rw-r--r--net/openmpi/Makefile3
-rw-r--r--net/openntpd/Makefile2
-rw-r--r--net/openradius/Makefile4
-rw-r--r--net/p5-Net-Z3950-ZOOM/Makefile2
-rw-r--r--net/p5-SOAP-Lite/Makefile2
-rw-r--r--net/p5-SOAP/Makefile2
-rw-r--r--net/p5-URI/Makefile2
-rw-r--r--net/p5-URI/distinfo6
-rw-r--r--net/pacemaker1/Makefile2
-rw-r--r--net/pacemaker1/Makefile.common2
-rw-r--r--net/pacemaker2/Makefile2
-rw-r--r--net/pear-Services_Twitter/Makefile3
-rw-r--r--net/pimcommon/distinfo6
-rw-r--r--net/proby/Makefile2
-rw-r--r--net/proxychains-ng/Makefile2
-rw-r--r--net/pwnat/Makefile4
-rw-r--r--net/py-aiocoap/Makefile2
-rw-r--r--net/py-aiocoap/distinfo6
-rw-r--r--net/py-aiohttp-socks/Makefile4
-rw-r--r--net/py-aiohttp-socks/distinfo6
-rw-r--r--net/py-duet/Makefile23
-rw-r--r--net/py-duet/distinfo3
-rw-r--r--net/py-duet/pkg-descr20
-rw-r--r--net/py-eventlet/Makefile2
-rw-r--r--net/py-eventlet/distinfo6
-rw-r--r--net/py-gdown/Makefile7
-rw-r--r--net/py-gdown/distinfo6
-rw-r--r--net/py-ldap/Makefile4
-rw-r--r--net/py-ldap/distinfo6
-rw-r--r--net/py-ldap/files/patch-setup.cfg11
-rw-r--r--net/py-libcloud/Makefile3
-rw-r--r--net/py-libcloud/distinfo6
-rw-r--r--net/py-mpi4py/Makefile2
-rw-r--r--net/py-mpi4py/distinfo6
-rw-r--r--net/py-pypcap/Makefile2
-rw-r--r--net/py-pysendfile/Makefile2
-rw-r--r--net/py-python-socks/Makefile4
-rw-r--r--net/py-python-socks/distinfo6
-rw-r--r--net/py-pytradfri/Makefile2
-rw-r--r--net/py-pytradfri/distinfo6
-rw-r--r--net/py-pyvmomi/Makefile11
-rw-r--r--net/py-pyvmomi/distinfo6
-rw-r--r--net/py-sbws/Makefile43
-rw-r--r--net/py-sbws/distinfo6
-rw-r--r--net/py-smbprotocol/Makefile2
-rw-r--r--net/py-smbprotocol/distinfo6
-rw-r--r--net/py-suds-community/Makefile22
-rw-r--r--net/py-suds-community/distinfo3
-rw-r--r--net/py-suds-community/pkg-descr4
-rw-r--r--net/py-suds-jurko/Makefile25
-rw-r--r--net/py-suds-jurko/files/patch-2to31952
-rw-r--r--net/py-suds-jurko/files/patch-setup.py20
-rw-r--r--net/py-terminado/Makefile2
-rw-r--r--net/py-terminado/distinfo6
-rw-r--r--net/py-wsdd/Makefile3
-rw-r--r--net/py-wsdd/distinfo6
-rw-r--r--net/pyrad/Makefile28
-rw-r--r--net/pyrad/distinfo5
-rw-r--r--net/quiche/Makefile2
-rw-r--r--net/rabbiteer/Makefile2
-rw-r--r--net/rabbitmq-c-devel/Makefile2
-rw-r--r--net/rabbitmq/Makefile2
-rw-r--r--net/rabbitmq/distinfo6
-rw-r--r--net/rabbitmq/pkg-plist160
-rw-r--r--net/rclone-browser/Makefile2
-rw-r--r--net/rclone/Makefile104
-rw-r--r--net/rclone/distinfo210
-rw-r--r--net/realtek-re-kmod/Makefile2
-rw-r--r--net/routinator/Makefile2
-rw-r--r--net/rpki-client/Makefile3
-rw-r--r--net/rpki-client/distinfo10
-rw-r--r--net/rsocket-cpp/Makefile2
-rw-r--r--net/rssguard/Makefile8
-rw-r--r--net/rssguard/distinfo6
-rw-r--r--net/rssguard/files/patch-src_librssguard_miscellaneous_notification.cpp44
-rw-r--r--net/rssguard/pkg-descr4
-rw-r--r--net/rubygem-activestorage613/Makefile29
-rw-r--r--net/rubygem-activestorage613/distinfo3
-rw-r--r--net/rubygem-activestorage613/files/patch-activestorage.gemspec28
-rw-r--r--net/rubygem-activestorage613/pkg-descr14
-rw-r--r--net/rubygem-amq-protocol/Makefile6
-rw-r--r--net/rubygem-fog-azure/Makefile13
-rw-r--r--net/rubygem-fog-google/Makefile2
-rw-r--r--net/rubygem-fog-google/distinfo6
-rw-r--r--net/rubygem-fog-local/Makefile3
-rw-r--r--net/rubygem-gitaly/Makefile6
-rw-r--r--net/rubygem-gitaly/distinfo6
-rw-r--r--net/rubygem-gitaly/files/patch-gitaly.gemspec18
-rw-r--r--net/rubygem-gitlab-fog-azure-rm/Makefile2
-rw-r--r--net/rubygem-gitlab-fog-azure-rm/distinfo6
-rw-r--r--net/rubygem-google-cloud-bigtable-admin-v2/Makefile2
-rw-r--r--net/rubygem-google-cloud-bigtable-admin-v2/distinfo6
-rw-r--r--net/rubygem-google-cloud-bigtable-v2/Makefile2
-rw-r--r--net/rubygem-google-cloud-bigtable-v2/distinfo6
-rw-r--r--net/rubygem-google-cloud-bigtable/Makefile2
-rw-r--r--net/rubygem-google-cloud-bigtable/distinfo6
-rw-r--r--net/rubygem-google-cloud-logging-v2/Makefile2
-rw-r--r--net/rubygem-google-cloud-logging-v2/distinfo6
-rw-r--r--net/rubygem-google-cloud-logging/Makefile2
-rw-r--r--net/rubygem-google-cloud-logging/distinfo6
-rw-r--r--net/rubygem-google-cloud-pubsub-v1/Makefile2
-rw-r--r--net/rubygem-google-cloud-pubsub-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-pubsub/Makefile2
-rw-r--r--net/rubygem-google-cloud-pubsub/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-database-v1/Makefile2
-rw-r--r--net/rubygem-google-cloud-spanner-admin-database-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile2
-rw-r--r--net/rubygem-google-cloud-spanner-admin-instance-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-v1/Makefile2
-rw-r--r--net/rubygem-google-cloud-spanner-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner/Makefile2
-rw-r--r--net/rubygem-google-cloud-spanner/distinfo6
-rw-r--r--net/rubygem-grpc/Makefile4
-rw-r--r--net/rubygem-grpc/distinfo6
-rw-r--r--net/rubygem-grpc124/Makefile2
-rw-r--r--net/rubygem-grpc130/Makefile6
-rw-r--r--net/rubygem-grpc130/files/patch-grpc.gemspec2
-rw-r--r--net/rubygem-grpc142/Makefile30
-rw-r--r--net/rubygem-grpc142/distinfo3
-rw-r--r--net/rubygem-grpc142/files/patch-src_ruby_ext_grpc_extconf.rb51
-rw-r--r--net/rubygem-grpc142/files/patch-src_ruby_lib_grpc.rb11
-rw-r--r--net/rubygem-grpc142/pkg-descr3
-rw-r--r--net/rubygem-ipaddr/Makefile20
-rw-r--r--net/rubygem-ipaddr/distinfo3
-rw-r--r--net/rubygem-ipaddr/pkg-descr4
-rw-r--r--net/rubygem-kas-grpc/Makefile3
-rw-r--r--net/rubygem-kas-grpc/files/patch-kas-grpc.gemspec18
-rw-r--r--net/rubygem-net-protocol/Makefile2
-rw-r--r--net/rubygem-net-protocol/distinfo6
-rw-r--r--net/rubygem-nkf/Makefile2
-rw-r--r--net/rubygem-nkf/distinfo6
-rw-r--r--net/rubygem-oauth/Makefile2
-rw-r--r--net/rubygem-oauth/distinfo6
-rw-r--r--net/rubygem-omniauth-facebook/Makefile2
-rw-r--r--net/rubygem-omniauth-facebook/distinfo6
-rw-r--r--net/rubygem-omniauth-oauth2/Makefile2
-rw-r--r--net/rubygem-omniauth-oauth2/distinfo6
-rw-r--r--net/rubygem-open-uri/Makefile6
-rw-r--r--net/rubygem-open-uri/distinfo6
-rw-r--r--net/rubygem-private_address_check/Makefile3
-rw-r--r--net/rubygem-spamcheck/Makefile3
-rw-r--r--net/rubygem-spamcheck/files/patch-spamcheck.gemspec18
-rw-r--r--net/rubygem-uri/Makefile2
-rw-r--r--net/rubygem-uri/distinfo6
-rw-r--r--net/samba412/Makefile2
-rw-r--r--net/samba413/Makefile6
-rw-r--r--net/samba413/distinfo6
-rw-r--r--net/samba413/pkg-plist1
-rw-r--r--net/samba413/pkg-plist.ad_dc2
-rw-r--r--net/samba413/pkg-plist.python23
-rw-r--r--net/scamper/Makefile4
-rw-r--r--net/scamper/distinfo6
-rw-r--r--net/scamper/pkg-plist4
-rw-r--r--net/sems/Makefile1
-rw-r--r--net/sendsms/Makefile2
-rw-r--r--net/shadowsocks-libev/files/patch-libcork_src_libcork_posix_env.c22
-rw-r--r--net/socat/Makefile24
-rw-r--r--net/socat/distinfo6
-rw-r--r--net/ssldump/Makefile2
-rw-r--r--net/storj/Makefile2
-rw-r--r--net/storj/Makefile.deps18
-rw-r--r--net/storj/distinfo42
-rw-r--r--net/tac_plus4/Makefile2
-rw-r--r--net/tcpdump/Makefile15
-rw-r--r--net/tcpdump/distinfo6
-rw-r--r--net/tcplog_dumper/Makefile2
-rw-r--r--net/tigervnc-server/Makefile.common.mk4
-rw-r--r--net/tigervnc-server/distinfo6
-rw-r--r--net/tigervnc-server/files/patch-unix_vncserver_vncsession.c11
-rw-r--r--net/tigervnc-server/files/vncserver.ports1
-rw-r--r--net/tigervnc-server/pkg-plist1
-rw-r--r--net/tigervnc-viewer/Makefile2
-rw-r--r--net/tigervnc-viewer/pkg-plist1
-rw-r--r--net/tightvnc/Makefile2
-rw-r--r--net/tintin++/files/patch-tintin.h13
-rw-r--r--net/traefik/Makefile2
-rw-r--r--net/traefik/distinfo6
-rw-r--r--net/tramp/Makefile6
-rw-r--r--net/tshark-lite/Makefile2
-rw-r--r--net/tshark/Makefile2
-rw-r--r--net/unison/Makefile2
-rw-r--r--net/unison248/Makefile2
-rw-r--r--net/vde/Makefile2
-rw-r--r--net/vde2/Makefile2
-rw-r--r--net/vether-kmod/Makefile7
-rw-r--r--net/vether-kmod/distinfo6
-rw-r--r--net/wangle/Makefile11
-rw-r--r--net/wangle/distinfo6
-rw-r--r--net/wangle/pkg-plist1
-rw-r--r--net/waypipe/Makefile4
-rw-r--r--net/waypipe/distinfo6
-rw-r--r--net/wayvnc/pkg-descr4
-rw-r--r--net/wireguard-kmod/Makefile3
-rw-r--r--net/wireguard-kmod/distinfo6
-rw-r--r--net/wireguard-kmod/files/patch-compat.h22
-rw-r--r--net/wireguard-tools/Makefile1
-rw-r--r--net/wireguard-tools/files/wireguard_lite.in14
-rw-r--r--net/wireguard-tools/files/wireguard_wgquick.in15
-rw-r--r--net/wireshark-lite/Makefile2
-rw-r--r--net/wireshark/Makefile11
-rw-r--r--net/wireshark/distinfo6
-rw-r--r--net/wireshark/files/extra-patch-doc_CMakeLists.txt79
-rw-r--r--net/wireshark/files/patch-doc_CMakeLists.txt21
-rw-r--r--net/wireshark/files/patch-wsutil_CMakeLists.txt10
-rw-r--r--net/wireshark/pkg-plist148
-rw-r--r--net/wpa_supplicant_gui/Makefile9
-rw-r--r--net/wpa_supplicant_gui/pkg-descr2
-rw-r--r--net/xmlrpc-epi/Makefile2
-rw-r--r--net/xrdp-devel/Makefile2
-rw-r--r--net/yate/Makefile1
-rw-r--r--net/yaz/Makefile3
-rw-r--r--net/yggdrasil/Makefile41
-rw-r--r--net/yggdrasil/distinfo76
-rw-r--r--net/yggdrasil/files/yggdrasil.in28
-rw-r--r--net/zebra-server/Makefile2
-rw-r--r--net/zebra/Makefile2
-rw-r--r--net/zeroconf-ioslave/distinfo6
-rw-r--r--net/zerotier/Makefile2
-rw-r--r--net/zerotier/distinfo6
-rw-r--r--net/zerotier/pkg-message2
476 files changed, 7255 insertions, 2884 deletions
diff --git a/net/6tunnel/pkg-descr b/net/6tunnel/pkg-descr
index 65d24d5b8c70..e47e4ea2b3a9 100644
--- a/net/6tunnel/pkg-descr
+++ b/net/6tunnel/pkg-descr
@@ -3,4 +3,4 @@ applications and vice versa. It can bind to any of your IPv4 (default) or
IPv6 addresses and forward all data to IPv4 or IPv6 (default) host.
It can be used for example as an ipv6-capable IRC proxy.
-WWW: http://toxygen.net/6tunnel/
+WWW: https://github.com/wojtekka/6tunnel
diff --git a/net/Makefile b/net/Makefile
index 38dcfcc5b213..8ada717b8b6c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -283,7 +283,6 @@
SUBDIR += ipsvd
SUBDIR += ipxe
SUBDIR += irrd
- SUBDIR += irrd-legacy
SUBDIR += isboot-kmod
SUBDIR += isc-dhcp44-client
SUBDIR += isc-dhcp44-relay
@@ -551,6 +550,8 @@
SUBDIR += openldap24-server
SUBDIR += openldap25-client
SUBDIR += openldap25-server
+ SUBDIR += openldap26-client
+ SUBDIR += openldap26-server
SUBDIR += openmdns
SUBDIR += openmpi
SUBDIR += openmpi3
@@ -1026,6 +1027,7 @@
SUBDIR += py-confluent-kafka
SUBDIR += py-cymruwhois
SUBDIR += py-dpkt
+ SUBDIR += py-duet
SUBDIR += py-dugong
SUBDIR += py-ec2-cli-tools
SUBDIR += py-errbot
@@ -1135,6 +1137,7 @@
SUBDIR += py-sshtunnel
SUBDIR += py-sshuttle
SUBDIR += py-stomp.py
+ SUBDIR += py-suds-community
SUBDIR += py-suds-jurko
SUBDIR += py-tacacs_plus
SUBDIR += py-terminado
@@ -1212,7 +1215,6 @@
SUBDIR += rubygem-activestorage52
SUBDIR += rubygem-activestorage60
SUBDIR += rubygem-activestorage61
- SUBDIR += rubygem-activestorage613
SUBDIR += rubygem-amazon-ec2
SUBDIR += rubygem-amq-protocol
SUBDIR += rubygem-amqp
@@ -1294,10 +1296,12 @@
SUBDIR += rubygem-grpc
SUBDIR += rubygem-grpc124
SUBDIR += rubygem-grpc130
+ SUBDIR += rubygem-grpc142
SUBDIR += rubygem-hangouts-chat
SUBDIR += rubygem-http-parser
SUBDIR += rubygem-http_parser.rb
SUBDIR += rubygem-httpauth
+ SUBDIR += rubygem-ipaddr
SUBDIR += rubygem-ipaddress
SUBDIR += rubygem-iproto
SUBDIR += rubygem-kas-grpc
diff --git a/net/akonadi-calendar/distinfo b/net/akonadi-calendar/distinfo
index 5c069eb1600d..c54122e382a6 100644
--- a/net/akonadi-calendar/distinfo
+++ b/net/akonadi-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447510
-SHA256 (KDE/release-service/21.08.2/akonadi-calendar-21.08.2.tar.xz) = 4affc8734320f6ffa68da92d54c505d0e90af55d72d1167f66397166325b8c4c
-SIZE (KDE/release-service/21.08.2/akonadi-calendar-21.08.2.tar.xz) = 352816
+TIMESTAMP = 1636032654
+SHA256 (KDE/release-service/21.08.3/akonadi-calendar-21.08.3.tar.xz) = 4c0be997823732c6cb9408b85ebbfb35f4d8044e139aebe320f627f4e33ef49e
+SIZE (KDE/release-service/21.08.3/akonadi-calendar-21.08.3.tar.xz) = 352800
diff --git a/net/akonadi-contacts/distinfo b/net/akonadi-contacts/distinfo
index 4ed19285305f..eb6d3ce7e27d 100644
--- a/net/akonadi-contacts/distinfo
+++ b/net/akonadi-contacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447512
-SHA256 (KDE/release-service/21.08.2/akonadi-contacts-21.08.2.tar.xz) = 6faff8beb673b0434c336b4f6183752337c6312fbc5cfd873b957cc04c60e2aa
-SIZE (KDE/release-service/21.08.2/akonadi-contacts-21.08.2.tar.xz) = 421096
+TIMESTAMP = 1636032656
+SHA256 (KDE/release-service/21.08.3/akonadi-contacts-21.08.3.tar.xz) = 11dd2d592a6f596879f84429d360d4a2b55dd982d0a9e95aad80dc8d9ce4b5c4
+SIZE (KDE/release-service/21.08.3/akonadi-contacts-21.08.3.tar.xz) = 420936
diff --git a/net/akonadi-mime/distinfo b/net/akonadi-mime/distinfo
index 26f7e11dd921..0907d0d81348 100644
--- a/net/akonadi-mime/distinfo
+++ b/net/akonadi-mime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447518
-SHA256 (KDE/release-service/21.08.2/akonadi-mime-21.08.2.tar.xz) = a31b254e82f8096274e2c32a8a0ace98881b2bc36bf7bbe294b18b44bf117b3a
-SIZE (KDE/release-service/21.08.2/akonadi-mime-21.08.2.tar.xz) = 141260
+TIMESTAMP = 1636032664
+SHA256 (KDE/release-service/21.08.3/akonadi-mime-21.08.3.tar.xz) = c4e0ac666a31ea925bc5e98e528b32ab273d4ba5016a0f7dd49c0392127daba5
+SIZE (KDE/release-service/21.08.3/akonadi-mime-21.08.3.tar.xz) = 141232
diff --git a/net/akonadi-notes/distinfo b/net/akonadi-notes/distinfo
index 0562d66efb54..72982c28abb7 100644
--- a/net/akonadi-notes/distinfo
+++ b/net/akonadi-notes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447495
-SHA256 (KDE/release-service/21.08.2/akonadi-notes-21.08.2.tar.xz) = b8d20bcfdb0e2a381b3ca73cc4307754af77f96a7127a871e0146b05547a2964
-SIZE (KDE/release-service/21.08.2/akonadi-notes-21.08.2.tar.xz) = 26408
+TIMESTAMP = 1636032636
+SHA256 (KDE/release-service/21.08.3/akonadi-notes-21.08.3.tar.xz) = d6818c00f8fc1f693b7019d7dba8d1c764e2c0a08ed0064e4f824a4c246c333c
+SIZE (KDE/release-service/21.08.3/akonadi-notes-21.08.3.tar.xz) = 26428
diff --git a/net/akonadi-search/distinfo b/net/akonadi-search/distinfo
index 753a69b64d82..ed4f844cb12d 100644
--- a/net/akonadi-search/distinfo
+++ b/net/akonadi-search/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447500
-SHA256 (KDE/release-service/21.08.2/akonadi-search-21.08.2.tar.xz) = c5c22e2307fb9b9b3e4a3bda47c1a3be15bb078f7a7627f6d90cfc91707237a8
-SIZE (KDE/release-service/21.08.2/akonadi-search-21.08.2.tar.xz) = 97336
+TIMESTAMP = 1636032642
+SHA256 (KDE/release-service/21.08.3/akonadi-search-21.08.3.tar.xz) = a0d263e49296fa1f558fa350003cdd458724f93024082ad96ac97f1048686ebb
+SIZE (KDE/release-service/21.08.3/akonadi-search-21.08.3.tar.xz) = 97344
diff --git a/net/aoe/Makefile b/net/aoe/Makefile
index fa62a1acafcc..192c2c07725b 100644
--- a/net/aoe/Makefile
+++ b/net/aoe/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= net
MASTER_SITES= http://www.son.org/download/
DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION}
-MAINTAINER= fjoe@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= FreeBSD driver for ATA over Ethernet (AoE)
BROKEN_aarch64= fails to compile: redefinition of frame
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index df5b6f2ad4c4..e596a9097467 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,5 +1,6 @@
PORTNAME= asterisk
-PORTVERSION= 16.21.1
+PORTVERSION= 16.22.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -51,8 +52,8 @@ MAKE_ENV= PTHREAD_LIBS="-lpthread" \
MAKE_ARGS+= NOISY_BUILD=yes \
ASTDATADIR=${DATADIR}
-CONFLICTS= ossp-uuid-[0-9]*
-CONFLICTS_BUILD= linuxthreads-*
+CONFLICTS= ossp-uuid
+CONFLICTS_BUILD= linuxthreads
CONFLICTS_INSTALL= asterisk13 asterisk18
OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 4ba4efe408c2..afd23864607a 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1633987207
-SHA256 (asterisk/asterisk-16.21.1.tar.gz) = 21ec7f002b2fc6adee17913a94c3c348b6b25ff4343d8bfb14c3b670928a1af3
-SIZE (asterisk/asterisk-16.21.1.tar.gz) = 27912610
+TIMESTAMP = 1635852015
+SHA256 (asterisk/asterisk-16.22.0.tar.gz) = 46992482762818e096d92654b9ac96d42fa9505ad4bc8e628a683413793ab26f
+SIZE (asterisk/asterisk-16.22.0.tar.gz) = 27925083
SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk16/files/patch-main_asterisk.exports.in b/net/asterisk16/files/patch-main_asterisk.exports.in
deleted file mode 100644
index 23b2fde0de7a..000000000000
--- a/net/asterisk16/files/patch-main_asterisk.exports.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/asterisk.exports.in.orig 2020-07-09 15:39:17 UTC
-+++ main/asterisk.exports.in
-@@ -65,6 +65,8 @@
-
- */
- LINKER_SYMBOL_PREFIX_IO_stdin_used;
-+ LINKER_SYMBOL_PREFIX__progname;
-+ LINKER_SYMBOL_PREFIXenviron;
- local:
- *;
- };
diff --git a/net/asterisk16/files/patch-res_res__fax__spandsp.c b/net/asterisk16/files/patch-res_res__fax__spandsp.c
new file mode 100644
index 000000000000..7efe45d3e616
--- /dev/null
+++ b/net/asterisk16/files/patch-res_res__fax__spandsp.c
@@ -0,0 +1,62 @@
+--- res/res_fax_spandsp.c.orig 2021-11-02 08:40:01 UTC
++++ res/res_fax_spandsp.c
+@@ -167,8 +167,8 @@ struct spandsp_pvt {
+ static int spandsp_v21_new(struct spandsp_pvt *p);
+ static void session_destroy(struct spandsp_pvt *p);
+ static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count);
+-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code);
+-static void spandsp_log(int level, const char *msg);
++static void t30_phase_e_handler(void *data, int completion_code);
++static void spandsp_log(void *user_data, int level, const char *msg);
+ static int update_stats(struct spandsp_pvt *p, int completion_code);
+ static int spandsp_modems(struct ast_fax_session_details *details);
+
+@@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com
+ * This function pulls stats from the spandsp stack and stores them for res_fax
+ * to use later.
+ */
+-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code)
++static void t30_phase_e_handler(void *data, int completion_code)
+ {
+ struct ast_fax_session *s = data;
+ struct spandsp_pvt *p = s->tech_pvt;
++ t30_state_t *t30_state = p->t30_state;
+ char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1];
+ const char *c;
+ t30_stats_t stats;
+@@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state
+ *
+ * \note This function is a callback function called by spandsp.
+ */
+-static void spandsp_log(int level, const char *msg)
++static void spandsp_log(void *user_data, int level, const char *msg)
+ {
+ if (level == SPAN_LOG_ERROR) {
+ ast_log(LOG_ERROR, "%s", msg);
+@@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct
+ level = SPAN_LOG_DEBUG_3;
+ }
+
+- span_log_set_message_handler(state, spandsp_log);
++ span_log_set_message_handler(state, spandsp_log, NULL);
+ span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level);
+ }
+
+@@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as
+ static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details)
+ {
+ t30_set_ecm_capability(t30_state, details->option.ecm);
+- t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
++ t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6);
+ }
+
+ static int spandsp_v21_new(struct spandsp_pvt *p)
+@@ -1256,7 +1257,7 @@ static int load_module(void)
+ }
+
+ /* prevent logging to stderr */
+- span_set_message_handler(NULL);
++ span_set_message_handler(NULL, NULL);
+
+ return AST_MODULE_LOAD_SUCCESS;
+ }
diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile
index a0f0edeb269b..df090509601f 100644
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@@ -1,5 +1,6 @@
PORTNAME= asterisk
-PORTVERSION= 18.7.1
+PORTVERSION= 18.8.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -51,8 +52,8 @@ MAKE_ENV= PTHREAD_LIBS="-lpthread" \
MAKE_ARGS+= NOISY_BUILD=yes \
ASTDATADIR=${DATADIR}
-CONFLICTS= ossp-uuid-[0-9]*
-CONFLICTS_BUILD= linuxthreads-*
+CONFLICTS= ossp-uuid
+CONFLICTS_BUILD= linuxthreads
CONFLICTS_INSTALL= asterisk13 asterisk16
OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO \
diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo
index c8d3cae916e0..29ca6f083a39 100644
--- a/net/asterisk18/distinfo
+++ b/net/asterisk18/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1633987279
-SHA256 (asterisk/asterisk-18.7.1.tar.gz) = 11c8728718b59af74440276ba888484bc9201217719d56436e1e0e85bf533c17
-SIZE (asterisk/asterisk-18.7.1.tar.gz) = 27995503
+TIMESTAMP = 1635852456
+SHA256 (asterisk/asterisk-18.8.0.tar.gz) = 49aa4aab4e518e3409a65c774615e37b620ce332ced4ad6eedaec6e0f37a572f
+SIZE (asterisk/asterisk-18.8.0.tar.gz) = 28007752
SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk18/files/patch-main_asterisk.exports.in b/net/asterisk18/files/patch-main_asterisk.exports.in
deleted file mode 100644
index 23b2fde0de7a..000000000000
--- a/net/asterisk18/files/patch-main_asterisk.exports.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/asterisk.exports.in.orig 2020-07-09 15:39:17 UTC
-+++ main/asterisk.exports.in
-@@ -65,6 +65,8 @@
-
- */
- LINKER_SYMBOL_PREFIX_IO_stdin_used;
-+ LINKER_SYMBOL_PREFIX__progname;
-+ LINKER_SYMBOL_PREFIXenviron;
- local:
- *;
- };
diff --git a/net/asterisk18/files/patch-res_res__fax__spandsp.c b/net/asterisk18/files/patch-res_res__fax__spandsp.c
new file mode 100644
index 000000000000..5ad7b22a40ad
--- /dev/null
+++ b/net/asterisk18/files/patch-res_res__fax__spandsp.c
@@ -0,0 +1,62 @@
+--- res/res_fax_spandsp.c.orig 2021-11-02 08:42:19 UTC
++++ res/res_fax_spandsp.c
+@@ -167,8 +167,8 @@ struct spandsp_pvt {
+ static int spandsp_v21_new(struct spandsp_pvt *p);
+ static void session_destroy(struct spandsp_pvt *p);
+ static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count);
+-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code);
+-static void spandsp_log(int level, const char *msg);
++static void t30_phase_e_handler(void *data, int completion_code);
++static void spandsp_log(void *user_data, int level, const char *msg);
+ static int update_stats(struct spandsp_pvt *p, int completion_code);
+ static int spandsp_modems(struct ast_fax_session_details *details);
+
+@@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com
+ * This function pulls stats from the spandsp stack and stores them for res_fax
+ * to use later.
+ */
+-static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code)
++static void t30_phase_e_handler(void *data, int completion_code)
+ {
+ struct ast_fax_session *s = data;
+ struct spandsp_pvt *p = s->tech_pvt;
++ t30_state_t *t30_state = p->t30_state;
+ char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1];
+ const char *c;
+ t30_stats_t stats;
+@@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state
+ *
+ * \note This function is a callback function called by spandsp.
+ */
+-static void spandsp_log(int level, const char *msg)
++static void spandsp_log(void *user_data, int level, const char *msg)
+ {
+ if (level == SPAN_LOG_ERROR) {
+ ast_log(LOG_ERROR, "%s", msg);
+@@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct
+ level = SPAN_LOG_DEBUG_3;
+ }
+
+- span_log_set_message_handler(state, spandsp_log);
++ span_log_set_message_handler(state, spandsp_log, NULL);
+ span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level);
+ }
+
+@@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as
+ static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details)
+ {
+ t30_set_ecm_capability(t30_state, details->option.ecm);
+- t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
++ t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6);
+ }
+
+ static int spandsp_v21_new(struct spandsp_pvt *p)
+@@ -1256,7 +1257,7 @@ static int load_module(void)
+ }
+
+ /* prevent logging to stderr */
+- span_set_message_handler(NULL);
++ span_set_message_handler(NULL, NULL);
+
+ return AST_MODULE_LOAD_SUCCESS;
+ }
diff --git a/net/astron/Makefile b/net/astron/Makefile
index b5ba0ca1dfd9..d36d045557d9 100644
--- a/net/astron/Makefile
+++ b/net/astron/Makefile
@@ -1,6 +1,6 @@
PORTNAME= astron
PORTVERSION= 0.0.20200521
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= nc@FreeBSD.org
@@ -9,6 +9,7 @@ COMMENT= Server Technology for Realtime Object Networking
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE.md
+BUILD_DEPENDS= boost-libs>0:devel/boost-libs
LIB_DEPENDS= libuv.so:devel/libuv \
libyaml-cpp.so:devel/yaml-cpp
@@ -20,11 +21,4 @@ GH_TAGNAME= c8ba982
PLIST_FILES= bin/astrond
-OPTIONS_DEFINE= SOCI
-OPTIONS_DEFAULT= SOCI
-
-SOCI_DESC= Database support via Soci
-SOCI_LIB_DEPENDS= libsoci_core.so:databases/soci
-SOCI_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Soci
-
.include <bsd.port.mk>
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 256429b9a2ad..60a01d5a579a 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -46,7 +46,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -lintl
INSTALL_TARGET= install-strip
.if ${AVAHI_SLAVE} == no
-CONFLICTS= howl-[0-9]*
+CONFLICTS= howl
DAEMON_CONFIG_FILES= hosts avahi-daemon.conf
.endif
diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile
index b5676ee9a8fe..ce9d003c36f8 100644
--- a/net/avahi-libdns/Makefile
+++ b/net/avahi-libdns/Makefile
@@ -18,6 +18,6 @@ PLIST= ${.CURDIR}/pkg-plist
AVAHI_SLAVE= libdns
AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc
-CONFLICTS= mDNSResponder-[0-9]*
+CONFLICTS= mDNSResponder
.include "${MASTERDIR}/Makefile"
diff --git a/net/binkd/Makefile b/net/binkd/Makefile
index f4785c252858..42f3cf998140 100644
--- a/net/binkd/Makefile
+++ b/net/binkd/Makefile
@@ -6,7 +6,7 @@ PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://happy.kiev.ua/pub/fidosoft/mailer/binkd/
-MAINTAINER= fjoe@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Fidonet TCP/IP mailer
USE_RC_SUBR= binkd
diff --git a/net/bird2/Makefile b/net/bird2/Makefile
index 21a70bcc003e..0ba12f96d705 100644
--- a/net/bird2/Makefile
+++ b/net/bird2/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2
USES= bison cpe gmake ncurses readline
-CONFLICTS= bird-[0-9]*
-CONFLICTS+= bird6-[0-9]*
+CONFLICTS= bird
+CONFLICTS+= bird6
CPE_VENDOR= nic
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index b2c648923d3c..6df16fe57f97 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -12,8 +12,6 @@ LICENSE= MIT
LIB_DEPENDS= libconfuse.so:devel/libconfuse
-CONFLICTS_INSTALL= bmon-*
-
USE_GITHUB= yes
GH_ACCOUNT= tgraf
diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile
index ed178c314fc5..d8af70c20aa4 100644
--- a/net/bosh-bootloader/Makefile
+++ b/net/bosh-bootloader/Makefile
@@ -8,6 +8,8 @@ COMMENT= CLI for standing up CloudFoundry or Concourse on an IAAS
LICENSE= APACHE20
+BROKEN_aarch64= fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
+
USE_GITHUB= yes
GH_TUPLE= cloudfoundry:bosh-bootloader:v${PORTVERSION}
diff --git a/net/calendarsupport/distinfo b/net/calendarsupport/distinfo
index 10b97ee3e905..c4b1b84e53e0 100644
--- a/net/calendarsupport/distinfo
+++ b/net/calendarsupport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447515
-SHA256 (KDE/release-service/21.08.2/calendarsupport-21.08.2.tar.xz) = 3312e1c147259822e834ae22365242d1d64dad5304dc2718eb94a4fb31c1f406
-SIZE (KDE/release-service/21.08.2/calendarsupport-21.08.2.tar.xz) = 764532
+TIMESTAMP = 1636032660
+SHA256 (KDE/release-service/21.08.3/calendarsupport-21.08.3.tar.xz) = de798aca4ce24ea0f94c4fec1554ebc835c5414cd40e2d6c1a00708d3aa22ace
+SIZE (KDE/release-service/21.08.3/calendarsupport-21.08.3.tar.xz) = 764564
diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
index b6439af26986..c0372e8dc7d1 100644
--- a/net/ceph14/Makefile
+++ b/net/ceph14/Makefile
@@ -2,8 +2,7 @@
PORTNAME= ceph
DISTVERSIONPREFIX= v
-DISTVERSION= 14.2.21
-PORTREVISION= 3
+DISTVERSION= 14.2.22
CATEGORIES= net
PKGNAMESUFFIX= 14
@@ -39,7 +38,6 @@ LIB_DEPENDS= \
libtcmalloc.so:devel/google-perftools \
librabbitmq.so:net/rabbitmq-c \
libfmt.so:devel/libfmt
-# libleveldb.so:databases/leveldb \
RUN_DEPENDS= \
bash:shells/bash \
flock:sysutils/flock \
@@ -59,10 +57,11 @@ RUN_DEPENDS= \
${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \
- pkgconfig python:3.7+ readline shebangfix ssl
+ pkgconfig python:3.8-3.9 readline shebangfix ssl
CPE_VENDOR= linuxfoundation
USE_PYTHON= cython py3kplist
USE_OPENLDAP= yes
@@ -86,7 +85,7 @@ GH_TUPLE+= ceph:lua:1fce39c:lua/src/lua
GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
GH_TUPLE+= ceph:rocksdb:4c736f1:rocksdb/src/rocksdb
GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash
-GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd
+GH_TUPLE+= facebook:zstd:b706286:zstd/src/zstd
GH_TUPLE+= ceph:spawn:5f4742f:spawn/src/spawn
OPTIONS_DEFINE= TESTS
@@ -104,12 +103,10 @@ SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
src/ceph-create-keys
-TESTS_DESC= Build test/debug tools (Broken with Clang)
+TESTS_DESC= Build test/debug tools
TESTS_CMAKE_ON= -DWITH_TESTS:BOOL=ON
TESTS_CMAKE_OFF=-DWITH_TESTS:BOOL=OFF
-USE_CXXSTD= gnu++17
-
USE_RC_SUBR= ceph
USE_LDCONFIG= yes
diff --git a/net/ceph14/distinfo b/net/ceph14/distinfo
index ecb5f6a89c8c..1712c725c790 100644
--- a/net/ceph14/distinfo
+++ b/net/ceph14/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1621102521
-SHA256 (ceph-ceph-v14.2.21_GH0.tar.gz) = a21743228d64d096119b2a92e871277bec6c60f7d274069c23e5a7c8da7f194a
-SIZE (ceph-ceph-v14.2.21_GH0.tar.gz) = 21956991
+TIMESTAMP = 1638610434
+SHA256 (ceph-ceph-v14.2.22_GH0.tar.gz) = 28529ed7dad98a94236563d31d019a4cf17eafc5350d2821a9422d4983ecfdf2
+SIZE (ceph-ceph-v14.2.22_GH0.tar.gz) = 21986508
SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214
@@ -27,7 +27,7 @@ SHA256 (ceph-rocksdb-4c736f1_GH0.tar.gz) = 7216de17b5cf49d75ba309175d9fc576a5e08
SIZE (ceph-rocksdb-4c736f1_GH0.tar.gz) = 5468514
SHA256 (ceph-xxHash-1f40c65_GH0.tar.gz) = 809e06b7493ed01f13c7ba972393a5a6d23dd92fd6b884381aa907005e569372
SIZE (ceph-xxHash-1f40c65_GH0.tar.gz) = 25484
-SHA256 (facebook-zstd-f4340f4_GH0.tar.gz) = 0db909a46914eb7800bce044b86fcf595451713e56a2b131ace6f70ff25c1c4d
-SIZE (facebook-zstd-f4340f4_GH0.tar.gz) = 1619022
+SHA256 (facebook-zstd-b706286_GH0.tar.gz) = 955b69b579c4da12cd54e75f2b4dbe58bb71d17ed94574b5451663c5445d1396
+SIZE (facebook-zstd-b706286_GH0.tar.gz) = 1988017
SHA256 (ceph-spawn-5f4742f_GH0.tar.gz) = c8832724cf3dd873db7c10407404b6cef30fa770902ab446f830902fed21603a
SIZE (ceph-spawn-5f4742f_GH0.tar.gz) = 7319
diff --git a/net/ceph14/files/patch-src_librbd_api_Trash.cc b/net/ceph14/files/patch-src_librbd_api_Trash.cc
new file mode 100644
index 000000000000..44a54071009a
--- /dev/null
+++ b/net/ceph14/files/patch-src_librbd_api_Trash.cc
@@ -0,0 +1,180 @@
+diff --git src/librbd/api/Trash.cc src/librbd/api/Trash.cc
+index 52f79632d5..3d539ab1e2 100644
+--- src/librbd/api/Trash.cc
++++ src/librbd/api/Trash.cc
+@@ -24,7 +24,6 @@
+ #include <json_spirit/json_spirit.h>
+ #include "librbd/journal/DisabledPolicy.h"
+ #include "librbd/image/ListWatchersRequest.h"
+-#include <experimental/map>
+
+ #define dout_subsys ceph_subsys_rbd
+ #undef dout_prefix
+@@ -124,48 +123,6 @@ int enable_mirroring(IoCtx &io_ctx, const std::string &image_id) {
+ return 0;
+ }
+
+-int list_trash_image_specs(
+- librados::IoCtx &io_ctx,
+- std::map<std::string, cls::rbd::TrashImageSpec>* trash_image_specs,
+- bool exclude_user_remove_source) {
+- CephContext *cct((CephContext *)io_ctx.cct());
+- ldout(cct, 20) << "list_trash_image_specs " << &io_ctx << dendl;
+-
+- bool more_entries;
+- uint32_t max_read = 1024;
+- std::string last_read;
+- do {
+- std::map<string, cls::rbd::TrashImageSpec> trash_entries;
+- int r = cls_client::trash_list(&io_ctx, last_read, max_read,
+- &trash_entries);
+- if (r < 0 && r != -ENOENT) {
+- lderr(cct) << "error listing rbd trash entries: " << cpp_strerror(r)
+- << dendl;
+- return r;
+- } else if (r == -ENOENT) {
+- break;
+- }
+-
+- if (trash_entries.empty()) {
+- break;
+- }
+-
+- for (const auto &entry : trash_entries) {
+- if (exclude_user_remove_source &&
+- entry.second.source == cls::rbd::TRASH_IMAGE_SOURCE_REMOVING) {
+- continue;
+- }
+-
+- trash_image_specs->insert({entry.first, entry.second});
+- }
+-
+- last_read = trash_entries.rbegin()->first;
+- more_entries = (trash_entries.size() >= max_read);
+- } while (more_entries);
+-
+- return 0;
+-}
+-
+ } // anonymous namespace
+
+ template <typename I>
+@@ -281,37 +238,15 @@ int Trash<I>::move(librados::IoCtx &io_ctx, rbd_trash_image_source_t source,
+ return -EOPNOTSUPP;
+ }
+
+- // search for an interrupted trash move request
+- std::map<std::string, cls::rbd::TrashImageSpec> trash_image_specs;
+- int r = list_trash_image_specs(io_ctx, &trash_image_specs, true);
+- if (r < 0) {
+- return r;
+- }
+-
+- std::experimental::erase_if(
+- trash_image_specs, [image_name](const auto& pair) {
+- const auto& spec = pair.second;
+- return (spec.source != cls::rbd::TRASH_IMAGE_SOURCE_USER ||
+- spec.state != cls::rbd::TRASH_IMAGE_STATE_MOVING ||
+- spec.name != image_name);
+- });
+- if (trash_image_specs.empty()) {
+- return -ENOENT;
+- }
+-
+- image_id = trash_image_specs.begin()->first;
+- ldout(cct, 15) << "derived image id " << image_id << " from existing "
+- << "trash entry" << dendl;
++ // image doesn't exist -- perhaps already in the trash since removing
++ // from the directory is the last step
++ return -ENOENT;
+ } else if (r < 0) {
+ lderr(cct) << "failed to retrieve image id: " << cpp_strerror(r) << dendl;
+ return r;
+ }
+
+- if (image_name.empty() || image_id.empty()) {
+- lderr(cct) << "invalid image name/id" << dendl;
+- return -EINVAL;
+- }
+-
++ ceph_assert(!image_name.empty() && !image_id.empty());
+ return Trash<I>::move(io_ctx, source, image_name, image_id, delay);
+ }
+
+@@ -342,23 +277,41 @@ template <typename I>
+ int Trash<I>::list(IoCtx &io_ctx, vector<trash_image_info_t> &entries,
+ bool exclude_user_remove_source) {
+ CephContext *cct((CephContext *)io_ctx.cct());
+- ldout(cct, 20) << __func__ << " " << &io_ctx << dendl;
++ ldout(cct, 20) << "trash_list " << &io_ctx << dendl;
+
+- std::map<std::string, cls::rbd::TrashImageSpec> trash_image_specs;
+- int r = list_trash_image_specs(io_ctx, &trash_image_specs,
+- exclude_user_remove_source);
+- if (r < 0) {
+- return r;
+- }
++ bool more_entries;
++ uint32_t max_read = 1024;
++ std::string last_read = "";
++ do {
++ map<string, cls::rbd::TrashImageSpec> trash_entries;
++ int r = cls_client::trash_list(&io_ctx, last_read, max_read,
++ &trash_entries);
++ if (r < 0 && r != -ENOENT) {
++ lderr(cct) << "error listing rbd trash entries: " << cpp_strerror(r)
++ << dendl;
++ return r;
++ } else if (r == -ENOENT) {
++ break;
++ }
+
+- entries.reserve(trash_image_specs.size());
+- for (const auto& [image_id, spec] : trash_image_specs) {
+- rbd_trash_image_source_t source =
+- static_cast<rbd_trash_image_source_t>(spec.source);
+- entries.push_back({image_id, spec.name, source,
+- spec.deletion_time.sec(),
+- spec.deferment_end_time.sec()});
+- }
++ if (trash_entries.empty()) {
++ break;
++ }
++
++ for (const auto &entry : trash_entries) {
++ rbd_trash_image_source_t source =
++ static_cast<rbd_trash_image_source_t>(entry.second.source);
++ if (exclude_user_remove_source &&
++ source == RBD_TRASH_IMAGE_SOURCE_REMOVING) {
++ continue;
++ }
++ entries.push_back({entry.first, entry.second.name, source,
++ entry.second.deletion_time.sec(),
++ entry.second.deferment_end_time.sec()});
++ }
++ last_read = trash_entries.rbegin()->first;
++ more_entries = (trash_entries.size() >= max_read);
++ } while (more_entries);
+
+ return 0;
+ }
+@@ -587,12 +540,8 @@ int Trash<I>::remove(IoCtx &io_ctx, const std::string &image_id, bool force,
+ lderr(cct) << "error: deferment time has not expired." << dendl;
+ return -EPERM;
+ }
+- if (trash_spec.state == cls::rbd::TRASH_IMAGE_STATE_MOVING) {
+- lderr(cct) << "error: image is pending moving to the trash."
+- << dendl;
+- return -EUCLEAN;
+- } else if (trash_spec.state != cls::rbd::TRASH_IMAGE_STATE_NORMAL &&
+- trash_spec.state != cls::rbd::TRASH_IMAGE_STATE_REMOVING) {
++ if (trash_spec.state != cls::rbd::TRASH_IMAGE_STATE_NORMAL &&
++ trash_spec.state != cls::rbd::TRASH_IMAGE_STATE_REMOVING) {
+ lderr(cct) << "error: image is pending restoration." << dendl;
+ return -EBUSY;
+ }
+@@ -750,3 +699,4 @@ int Trash<I>::restore(librados::IoCtx &io_ctx,
+ } // namespace librbd
+
+ template class librbd::api::Trash<librbd::ImageCtx>;
++
diff --git a/net/ceph14/files/patch-src_test_rgw_CMakeLists.txt b/net/ceph14/files/patch-src_test_rgw_CMakeLists.txt
deleted file mode 100644
index e48450465768..000000000000
--- a/net/ceph14/files/patch-src_test_rgw_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index 36df883a66..efb6c4b5b8 100644
---- src/test/rgw/CMakeLists.txt
-+++ src/test/rgw/CMakeLists.txt
-@@ -138,14 +138,14 @@ add_executable(unittest_rgw_string test_rgw_string.cc)
- add_ceph_unittest(unittest_rgw_string)
-
- # unitttest_rgw_dmclock_queue
--add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>)
--add_ceph_unittest(unittest_rgw_dmclock_scheduler)
--
--target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
--if(WITH_BOOST_CONTEXT)
-- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
--endif()
-+# add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>)
-+# add_ceph_unittest(unittest_rgw_dmclock_scheduler)
-+#
-+# target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
-+# if(WITH_BOOST_CONTEXT)
-+# target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-+# target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+# endif()
-
- if(WITH_RADOSGW_AMQP_ENDPOINT)
- add_executable(unittest_rgw_amqp test_rgw_amqp.cc)
diff --git a/net/ceph14/files/patch-src_tools_rbd_action_Trash.cc b/net/ceph14/files/patch-src_tools_rbd_action_Trash.cc
new file mode 100644
index 000000000000..65e9942f1c58
--- /dev/null
+++ b/net/ceph14/files/patch-src_tools_rbd_action_Trash.cc
@@ -0,0 +1,22 @@
+diff --git src/tools/rbd/action/Trash.cc src/tools/rbd/action/Trash.cc
+index c4a17e4134..8b8fd8a322 100644
+--- src/tools/rbd/action/Trash.cc
++++ src/tools/rbd/action/Trash.cc
+@@ -12,6 +12,7 @@
+ *
+ */
+
++#include "include/compat.h"
+ #include "tools/rbd/ArgumentTypes.h"
+ #include "tools/rbd/Shell.h"
+ #include "tools/rbd/Utils.h"
+@@ -145,9 +146,6 @@ int execute_remove(const po::variables_map &vm,
+ std::cerr << "rbd: image has snapshots - these must be deleted"
+ << " with 'rbd snap purge' before the image can be removed."
+ << std::endl;
+- } else if (r == -EUCLEAN) {
+- std::cerr << "rbd: error: image not fully moved to trash."
+- << std::endl;
+ } else if (r == -EBUSY) {
+ std::cerr << "rbd: error: image still has watchers"
+ << std::endl
diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message
index e590eda16587..7c2cf9f6901a 100644
--- a/net/ceph14/pkg-message
+++ b/net/ceph14/pkg-message
@@ -6,11 +6,14 @@ It comes with a web based dashboard that cannot be build
into a package but will require the user to install it himself.
To install the dashboard, please execute:
- sudo pkg install npm-node14
+ as root execute:
cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
- sudo -u ceph npm ci
- sudo chown -R ceph:ceph .
- sudo chown -R ceph:ceph /var/lib/ceph
+ pkg install rpm2cpio
+ fetch http://download.ceph.com/rpm-nautilus/el8/noarch/ceph-mgr-dashboard-14.2.22-0.el8.noarch.rpm
+ rpm2cpio ${DISTDIR}/ceph-mgr-dashboard-${DISTVERSION}-0.el7.noarch.rpm | \
+ ( cd ${WRKDIR}/dashboard; cpio -divm )
+ chown -R ceph:ceph .
+ chown -R ceph:ceph /var/lib/ceph
EOM
}
diff --git a/net/ceph14/pkg-plist b/net/ceph14/pkg-plist
index 85bd42f503dd..39a16ca92520 100644
--- a/net/ceph14/pkg-plist
+++ b/net/ceph14/pkg-plist
@@ -54,6 +54,8 @@ bin/rbd-replay
bin/rbd-replay-many
bin/rbdmap
bin/rgw-orphan-list
+bin/rgw-gap-list
+bin/rgw-gap-list-comparator
etc/bash_completion.d/ceph
etc/bash_completion.d/rados
etc/bash_completion.d/radosgw-admin
@@ -162,6 +164,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/deactivate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/listing.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/migrate%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/prepare.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/trigger.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/__pycache__/zap.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -172,6 +175,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/deactivate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/listing.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/main.py
+%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/migrate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/prepare.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/trigger.py
%%PYTHON_SITELIBDIR%%/ceph_volume/devices/lvm/zap.py
@@ -233,6 +237,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_create.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_deactivate.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_listing.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_migrate%%PYTHON_EXT_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_prepare.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_trigger.cpython-%%PYTHON_SUFFIX%%.pyc
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/__pycache__/test_zap.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -242,6 +247,7 @@ lib/librgw_admin_user.so.1.0.0
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_create.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_deactivate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_listing.py
+%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_migrate.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_prepare.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_trigger.py
%%PYTHON_SITELIBDIR%%/ceph_volume/tests/devices/lvm/test_zap.py
@@ -1018,6 +1024,8 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.ts
+%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.spec.ts
+%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-site.service.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.ts
%%DATADIR%%/mgr/dashboard/frontend/src/app/shared/api/role.service.spec.ts
@@ -1381,6 +1389,7 @@ sbin/mount.fuse.ceph
%%DATADIR%%/mgr/dashboard/tests/test_plugin_debug.py
%%DATADIR%%/mgr/dashboard/tests/test_pool.py
%%DATADIR%%/mgr/dashboard/tests/test_prometheus.py
+%%DATADIR%%/mgr/dashboard/tests/test_rbd.py
%%DATADIR%%/mgr/dashboard/tests/test_rbd_mirroring.py
%%DATADIR%%/mgr/dashboard/tests/test_rbd_service.py
%%DATADIR%%/mgr/dashboard/tests/test_rest_client.py
diff --git a/net/charm/Makefile b/net/charm/Makefile
index 7681c7f7f512..64a8c6044886 100644
--- a/net/charm/Makefile
+++ b/net/charm/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= none # No redistribution is allowed, no commercial use: commercial use requires a commercial license
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON= Not clear if it can be built on other architectures
+ONLY_FOR_ARCHS_REASON= not clear if it can be built on other architectures
FETCH_DEPENDS= git:devel/git
BUILD_DEPENDS= bash:shells/bash
diff --git a/net/cjdns/Makefile b/net/cjdns/Makefile
index d796f6e75a8b..c996f1cc1e9c 100644
--- a/net/cjdns/Makefile
+++ b/net/cjdns/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cjdns
DISTVERSIONPREFIX= cjdns-v
DISTVERSION= 21.1
+PORTREVISION= 1
CATEGORIES= net security
MAINTAINER= yuri@FreeBSD.org
@@ -11,12 +12,9 @@ COMMENT= Routing engine designed for security, scalability, speed
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_powerpc64= fails to install: cjdns-cjdns-v20.3/cjdroute: No such file or directory
+BUILD_DEPENDS= bash:shells/bash
-BUILD_DEPENDS= node:www/node \
- bash:shells/bash
-
-USES= gmake python
+USES= gmake nodejs:build python
USE_GITHUB= yes
GH_ACCOUNT= cjdelisle
USE_RC_SUBR= cjdns
diff --git a/net/cjdns/files/patch-node__build_builder.js b/net/cjdns/files/patch-node__build_builder.js
new file mode 100644
index 000000000000..e67ae0da7927
--- /dev/null
+++ b/net/cjdns/files/patch-node__build_builder.js
@@ -0,0 +1,11 @@
+--- node_build/builder.js.orig 2021-10-26 18:19:15 UTC
++++ node_build/builder.js
+@@ -779,7 +779,7 @@ module.exports.configure = function (
+ // if it returns undefined let's just assume 1
+ // workaround, nodejs seems to be broken on openbsd (undefined result after second call)
+ const cpus = Os.cpus();
+- const jobs = Math.floor((typeof cpus === 'undefined' ? 1 : cpus.length) * 1.25);
++ const jobs = Math.floor((cpus == 0 ? 1 : cpus.length) * 1.25);
+
+ const pctx /*:Builder_PreCtx_t*/ = {
+ buildStage: (_x,_y)=>{},
diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile
index 2ba9cae09736..b3e5d8776d95 100644
--- a/net/cloudquery/Makefile
+++ b/net/cloudquery/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cloudquery
DISTVERSIONPREFIX= v
-DISTVERSION= 0.15.6
+DISTVERSION= 0.16.0
CATEGORIES= net
MAINTAINER= nc@FreeBSD.org
@@ -17,7 +17,7 @@ GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT}
GH_TUPLE= \
Masterminds:squirrel:v1.5.0:masterminds_squirrel/vendor/github.com/Masterminds/squirrel \
- Microsoft:go-winio:v0.4.16:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+ Microsoft:go-winio:v0.5.0:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
ProtonMail:go-crypto:04723f9f07d7:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
VividCortex:ewma:v1.2.0:vividcortex_ewma/vendor/github.com/VividCortex/ewma \
acarl005:stripansi:5a71ef0e047d:acarl005_stripansi/vendor/github.com/acarl005/stripansi \
@@ -25,14 +25,15 @@ GH_TUPLE= \
agext:levenshtein:v1.2.3:agext_levenshtein/vendor/github.com/agext/levenshtein \
apparentlymart:go-textseg:v13.0.0:apparentlymart_go_textseg_v13/vendor/github.com/apparentlymart/go-textseg/v13 \
aws:aws-lambda-go:v1.23.0:aws_aws_lambda_go/vendor/github.com/aws/aws-lambda-go \
- cloudquery:cq-provider-sdk:v0.4.5:cloudquery_cq_provider_sdk/vendor/github.com/cloudquery/cq-provider-sdk \
- creasty:defaults:v1.5.1:creasty_defaults/vendor/github.com/creasty/defaults \
+ aws:aws-sdk-go:v1.42.1:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+ cloudquery:cq-provider-sdk:v0.5.1:cloudquery_cq_provider_sdk/vendor/github.com/cloudquery/cq-provider-sdk \
+ creasty:defaults:v1.5.2:creasty_defaults/vendor/github.com/creasty/defaults \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
- doug-martin:goqu:v9.13.0:doug_martin_goqu_v9/vendor/github.com/doug-martin/goqu/v9 \
+ doug-martin:goqu:v9.17.0:doug_martin_goqu_v9/vendor/github.com/doug-martin/goqu/v9 \
emirpasic:gods:v1.12.0:emirpasic_gods/vendor/github.com/emirpasic/gods \
- fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
+ fatih:color:v1.13.0:fatih_color/vendor/github.com/fatih/color \
fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
- georgysavva:scany:v0.2.8:georgysavva_scany/vendor/github.com/georgysavva/scany \
+ georgysavva:scany:v0.2.9:georgysavva_scany/vendor/github.com/georgysavva/scany \
go-git:gcfg:v1.5.0:go_git_gcfg/vendor/github.com/go-git/gcfg \
go-git:go-billy:v5.3.1:go_git_go_billy_v5/vendor/github.com/go-git/go-billy/v5 \
go-git:go-git:v5.4.2:go_git_go_git_v5/vendor/github.com/go-git/go-git/v5 \
@@ -41,71 +42,74 @@ GH_TUPLE= \
go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
gofrs:uuid:v4.0.0:gofrs_uuid/vendor/github.com/gofrs/uuid \
- golang-migrate:migrate:v4.14.0:golang_migrate_migrate_v4/vendor/github.com/golang-migrate/migrate/v4 \
- golang:crypto:38f3c27a63bf:golang_crypto/vendor/golang.org/x/crypto \
- golang:net:4163338589ed:golang_net/vendor/golang.org/x/net \
+ golang-migrate:migrate:v4.15.0:golang_migrate_migrate_v4/vendor/github.com/golang-migrate/migrate/v4 \
+ golang:crypto:a769d52b0f97:golang_crypto/vendor/golang.org/x/crypto \
+ golang:net:04defd469f4e:golang_net/vendor/golang.org/x/net \
golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
- golang:sys:977fb7262007:golang_sys/vendor/golang.org/x/sys \
+ golang:sys:39ccf1dd6fa6:golang_sys/vendor/golang.org/x/sys \
golang:term:7de9c90e9dd1:golang_term/vendor/golang.org/x/term \
golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
- google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \
- google:go-genproto:24207fddd1c3:google_go_genproto/vendor/google.golang.org/genproto \
- google:go-github:v35.1.0:google_go_github_v35/vendor/github.com/google/go-github/v35 \
+ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
+ google:go-cmp:v0.5.6:google_go_cmp/vendor/github.com/google/go-cmp \
+ google:go-genproto:c76a74d43a8e:google_go_genproto/vendor/google.golang.org/genproto \
+ google:go-github:v35.2.0:google_go_github_v35/vendor/github.com/google/go-github/v35 \
google:go-querystring:v1.0.0:google_go_querystring/vendor/github.com/google/go-querystring \
- google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
- grpc:grpc-go:v1.40.0:grpc_grpc_go/vendor/google.golang.org/grpc \
- hashicorp:errwrap:v1.0.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
- hashicorp:go-hclog:v0.16.1:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
- hashicorp:go-multierror:v1.1.0:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
- hashicorp:go-plugin:v1.4.1:hashicorp_go_plugin/vendor/github.com/hashicorp/go-plugin \
+ google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
+ grpc:grpc-go:v1.41.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+ hashicorp:errwrap:v1.1.0:hashicorp_errwrap/vendor/github.com/hashicorp/errwrap \
+ hashicorp:go-hclog:v1.0.0:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
+ hashicorp:go-multierror:v1.1.1:hashicorp_go_multierror/vendor/github.com/hashicorp/go-multierror \
+ hashicorp:go-plugin:v1.4.3:hashicorp_go_plugin/vendor/github.com/hashicorp/go-plugin \
hashicorp:go-version:v1.3.0:hashicorp_go_version/vendor/github.com/hashicorp/go-version \
hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
- hashicorp:hcl:v2.10.0:hashicorp_hcl_v2/vendor/github.com/hashicorp/hcl/v2 \
- hashicorp:yamux:a95892c5f864:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
- huandu:go-sqlbuilder:v1.12.1:huandu_go_sqlbuilder/vendor/github.com/huandu/go-sqlbuilder \
+ hashicorp:hcl:v2.10.1:hashicorp_hcl_v2/vendor/github.com/hashicorp/hcl/v2 \
+ hashicorp:yamux:26ff87cf9493:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
+ huandu:go-sqlbuilder:v1.13.0:huandu_go_sqlbuilder/vendor/github.com/huandu/go-sqlbuilder \
huandu:xstrings:v1.3.2:huandu_xstrings/vendor/github.com/huandu/xstrings \
- iancoleman:strcase:v0.1.3:iancoleman_strcase/vendor/github.com/iancoleman/strcase \
+ iancoleman:strcase:v0.2.0:iancoleman_strcase/vendor/github.com/iancoleman/strcase \
imdario:mergo:v0.3.12:imdario_mergo/vendor/github.com/imdario/mergo \
inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
jackc:chunkreader:v2.0.1:jackc_chunkreader_v2/vendor/github.com/jackc/chunkreader/v2 \
- jackc:pgconn:v1.8.1:jackc_pgconn/vendor/github.com/jackc/pgconn \
+ jackc:pgconn:v1.10.0:jackc_pgconn/vendor/github.com/jackc/pgconn \
jackc:pgerrcode:a0d42d470451:jackc_pgerrcode/vendor/github.com/jackc/pgerrcode \
jackc:pgio:v1.0.0:jackc_pgio/vendor/github.com/jackc/pgio \
jackc:pgpassfile:v1.0.0:jackc_pgpassfile/vendor/github.com/jackc/pgpassfile \
- jackc:pgproto3:v2.0.7:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \
+ jackc:pgproto3:v2.1.1:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \
jackc:pgservicefile:2b9c44734f2b:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \
- jackc:pgtype:v1.7.0:jackc_pgtype/vendor/github.com/jackc/pgtype \
- jackc:pgx:v4.11.0:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \
- jackc:puddle:v1.1.3:jackc_puddle/vendor/github.com/jackc/puddle \
+ jackc:pgtype:v1.8.1:jackc_pgtype/vendor/github.com/jackc/pgtype \
+ jackc:pgx:v4.13.0:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \
+ jackc:puddle:v1.1.4:jackc_puddle/vendor/github.com/jackc/puddle \
jbenet:go-context:d14ea06fba99:jbenet_go_context/vendor/github.com/jbenet/go-context \
+ jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
kevinburke:ssh_config:4977a11b4351:kevinburke_ssh_config/vendor/github.com/kevinburke/ssh_config \
+ kylelemons:godebug:v1.1.0:kylelemons_godebug/vendor/github.com/kylelemons/godebug \
lann:builder:47ae307949d0:lann_builder/vendor/github.com/lann/builder \
lann:ps:62de8c46ede0:lann_ps/vendor/github.com/lann/ps \
- lib:pq:v1.10.1:lib_pq/vendor/github.com/lib/pq \
+ lib:pq:v1.10.3:lib_pq/vendor/github.com/lib/pq \
magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
- mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
- mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+ mattn:go-colorable:v0.1.11:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+ mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
mattn:go-runewidth:v0.0.10:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
mitchellh:go-testing-interface:v1.14.1:mitchellh_go_testing_interface/vendor/github.com/mitchellh/go-testing-interface \
mitchellh:go-wordwrap:v1.0.1:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
mitchellh:hashstructure:v1.1.0:mitchellh_hashstructure/vendor/github.com/mitchellh/hashstructure \
mitchellh:mapstructure:v1.4.1:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
- modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
- modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
+ modern-go:reflect2:v1.0.2:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \
oklog:run:v1.1.0:oklog_run/vendor/github.com/oklog/run \
- pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
+ olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
+ pelletier:go-toml:v1.8.1:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
- protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+ protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
rs:zerolog:v1.20.0:rs_zerolog/vendor/github.com/rs/zerolog \
satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
sergi:go-diff:v1.2.0:sergi_go_diff/vendor/github.com/sergi/go-diff \
spf13:afero:v1.6.0:spf13_afero/vendor/github.com/spf13/afero \
- spf13:cast:v1.4.0:spf13_cast/vendor/github.com/spf13/cast \
+ spf13:cast:v1.4.1:spf13_cast/vendor/github.com/spf13/cast \
spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
spf13:jwalterweatherman:v1.0.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
@@ -113,13 +117,17 @@ GH_TUPLE= \
stretchr:objx:v0.3.0:stretchr_objx/vendor/github.com/stretchr/objx \
stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
- thoas:go-funk:efae847b30ab:thoas_go_funk/vendor/github.com/thoas/go-funk \
+ thoas:go-funk:v0.9.1:thoas_go_funk/vendor/github.com/thoas/go-funk \
+ tidwall:gjson:v1.11.0:tidwall_gjson/vendor/github.com/tidwall/gjson \
+ tidwall:match:v1.1.1:tidwall_match/vendor/github.com/tidwall/match \
+ tidwall:pretty:v1.2.0:tidwall_pretty/vendor/github.com/tidwall/pretty \
+ uber-go:atomic:v1.6.0:uber_go_atomic/vendor/go.uber.org/atomic \
vbauerster:mpb:v6.0.3:vbauerster_mpb_v6/vendor/github.com/vbauerster/mpb/v6 \
vmihailenco:msgpack:v5.3.4:vmihailenco_msgpack_v5/vendor/github.com/vmihailenco/msgpack/v5 \
vmihailenco:tagparser:v2.0.0:vmihailenco_tagparser_v2/vendor/github.com/vmihailenco/tagparser/v2 \
xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
xo:dburl:v0.8.4:xo_dburl/vendor/github.com/xo/dburl \
- zclconf:go-cty:v1.9.0:zclconf_go_cty/vendor/github.com/zclconf/go-cty
+ zclconf:go-cty:v1.9.1:zclconf_go_cty/vendor/github.com/zclconf/go-cty
PLIST_FILES= bin/${PORTNAME}
diff --git a/net/cloudquery/distinfo b/net/cloudquery/distinfo
index 6026609765f5..3dca16d09a90 100644
--- a/net/cloudquery/distinfo
+++ b/net/cloudquery/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1634314156
-SHA256 (cloudquery-cloudquery-v0.15.6_GH0.tar.gz) = 0fe842a4f35c6dbefd676a90a7797fe64d012e49a92309fbcad8af0a0b0076a4
-SIZE (cloudquery-cloudquery-v0.15.6_GH0.tar.gz) = 140465
+TIMESTAMP = 1637953429
+SHA256 (cloudquery-cloudquery-v0.16.0_GH0.tar.gz) = 3b24b38ab7cf5ce032d91e8a7ae1c7d73b3e0962dcf536b3229378770ee17567
+SIZE (cloudquery-cloudquery-v0.16.0_GH0.tar.gz) = 190304
SHA256 (Masterminds-squirrel-v1.5.0_GH0.tar.gz) = 75ffb7555e2cde9fa25622c031b0b72058b5644e6d7eb004238c250957d97c52
SIZE (Masterminds-squirrel-v1.5.0_GH0.tar.gz) = 30302
-SHA256 (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 0cb82f4cdba942af6b545695d694e91b9d9d56bd38555c81744235d7c6f6485d
-SIZE (Microsoft-go-winio-v0.4.16_GH0.tar.gz) = 85568
+SHA256 (Microsoft-go-winio-v0.5.0_GH0.tar.gz) = 82c90c7289b8885d4ecf8f8739399200f69bf7ff0d6ac9715d9f5b0f29a8f49d
+SIZE (Microsoft-go-winio-v0.5.0_GH0.tar.gz) = 88506
SHA256 (ProtonMail-go-crypto-04723f9f07d7_GH0.tar.gz) = 09ca24a9956ebb6a8564ef17ab6b0eab6387938ac608a0c429f75360d3b176f5
SIZE (ProtonMail-go-crypto-04723f9f07d7_GH0.tar.gz) = 308315
SHA256 (VividCortex-ewma-v1.2.0_GH0.tar.gz) = 2f26521a9207b91dfbca3d28e5545bc11cb098888ecf3e9ba8e5936387b06a33
@@ -19,22 +19,24 @@ SHA256 (apparentlymart-go-textseg-v13.0.0_GH0.tar.gz) = 7479ac3309883e2bdb6f5620
SIZE (apparentlymart-go-textseg-v13.0.0_GH0.tar.gz) = 133786
SHA256 (aws-aws-lambda-go-v1.23.0_GH0.tar.gz) = 4776ab2608e5614a0f93461ecf723e3d707d98059838510bb0625a65b73b93e2
SIZE (aws-aws-lambda-go-v1.23.0_GH0.tar.gz) = 87988
-SHA256 (cloudquery-cq-provider-sdk-v0.4.5_GH0.tar.gz) = 505b4da4979f5e6fe3492e3a3e52fabb84da5dca2baf5f06a53cfb67d2802a3f
-SIZE (cloudquery-cq-provider-sdk-v0.4.5_GH0.tar.gz) = 100333
-SHA256 (creasty-defaults-v1.5.1_GH0.tar.gz) = d0834b56252df9dc07f78592d32626a2a1c6c448d5dff992fe4b568007ea6b7b
-SIZE (creasty-defaults-v1.5.1_GH0.tar.gz) = 7469
+SHA256 (aws-aws-sdk-go-v1.42.1_GH0.tar.gz) = f57cbad3f348dda26fa384f5881ae1a4f92e22091da9e135098cebea3ab58de5
+SIZE (aws-aws-sdk-go-v1.42.1_GH0.tar.gz) = 21337461
+SHA256 (cloudquery-cq-provider-sdk-v0.5.1_GH0.tar.gz) = b6f2b4898661c1e1f3ad064da72e503b18dd1c2ad34fa23e25cd144bd4d3da4f
+SIZE (cloudquery-cq-provider-sdk-v0.5.1_GH0.tar.gz) = 130679
+SHA256 (creasty-defaults-v1.5.2_GH0.tar.gz) = 92ab38ad101080f8617a17847106ef7cbe84504c8669808e37564187f3cbf481
+SIZE (creasty-defaults-v1.5.2_GH0.tar.gz) = 7634
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (doug-martin-goqu-v9.13.0_GH0.tar.gz) = 6e3c1ae0a32a51e4f06c22321706aec2df7e25b71d36d5bde681757fdb55a25f
-SIZE (doug-martin-goqu-v9.13.0_GH0.tar.gz) = 3153301
+SHA256 (doug-martin-goqu-v9.17.0_GH0.tar.gz) = bcf246bb5486eda27d893c14c23318b9e7586a86c8a5cfa7dc89bb79969d8b92
+SIZE (doug-martin-goqu-v9.17.0_GH0.tar.gz) = 3161912
SHA256 (emirpasic-gods-v1.12.0_GH0.tar.gz) = 889d06b5f88db9e2dae19a799a35324c4f59305aa5e966dcdb4b637e70607ff9
SIZE (emirpasic-gods-v1.12.0_GH0.tar.gz) = 76825
-SHA256 (fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e
-SIZE (fatih-color-v1.10.0_GH0.tar.gz) = 1267532
+SHA256 (fatih-color-v1.13.0_GH0.tar.gz) = 326ff785bc0cb5171c17be2a65959e83ee7889ba39412ba4c53c062e2df3ffec
+SIZE (fatih-color-v1.13.0_GH0.tar.gz) = 10826
SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
-SHA256 (georgysavva-scany-v0.2.8_GH0.tar.gz) = 0067644591e3a6d5a6b0b0f47e0c54a240f723fc58599ff610d792bb67d99ee8
-SIZE (georgysavva-scany-v0.2.8_GH0.tar.gz) = 28890
+SHA256 (georgysavva-scany-v0.2.9_GH0.tar.gz) = 883166a76b3cec42fcfaee2f50306185e58caeb819c62947558d41e82c45c53f
+SIZE (georgysavva-scany-v0.2.9_GH0.tar.gz) = 30102
SHA256 (go-git-gcfg-v1.5.0_GH0.tar.gz) = 662e46a93aba5ffe383e55597ce5749447e5c8e9409b1452f5790bfd6e1f8a11
SIZE (go-git-gcfg-v1.5.0_GH0.tar.gz) = 28522
SHA256 (go-git-go-billy-v5.3.1_GH0.tar.gz) = 7d715d7cf11f731dc0466bf93903ba7fe6ac70d086bb862fc24e718d9ddc209e
@@ -51,96 +53,102 @@ SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da
SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
SHA256 (gofrs-uuid-v4.0.0_GH0.tar.gz) = 7857a4f0c066d2e43a1b7912458b028b6fa351eb1a1d41b022dd6ac347e96b4f
SIZE (gofrs-uuid-v4.0.0_GH0.tar.gz) = 17824
-SHA256 (golang-migrate-migrate-v4.14.0_GH0.tar.gz) = fdd72511531e73d0f9c94143269d787df338a00720d910dc6132e630e3cae709
-SIZE (golang-migrate-migrate-v4.14.0_GH0.tar.gz) = 160691
-SHA256 (golang-crypto-38f3c27a63bf_GH0.tar.gz) = b55bc13c8a313ed80310a84eb7cceb303532774439493636a89b17c170250e31
-SIZE (golang-crypto-38f3c27a63bf_GH0.tar.gz) = 1731839
-SHA256 (golang-net-4163338589ed_GH0.tar.gz) = a085f41ad052d3ce8a60e01239cb282be8e363252b8207d10cebecda4749732c
-SIZE (golang-net-4163338589ed_GH0.tar.gz) = 1252153
+SHA256 (golang-migrate-migrate-v4.15.0_GH0.tar.gz) = a8980f00810f5d614f467d80a97598c8ff923e760678f54b173fe9def7811c7f
+SIZE (golang-migrate-migrate-v4.15.0_GH0.tar.gz) = 189179
+SHA256 (golang-crypto-a769d52b0f97_GH0.tar.gz) = d93f7b5b85901b88518c3997c20ac1aff1d60ecb127a0427e87da87cc7d593a1
+SIZE (golang-crypto-a769d52b0f97_GH0.tar.gz) = 1731973
+SHA256 (golang-net-04defd469f4e_GH0.tar.gz) = 6009a6f0989341df975799276ff1c49af650d4a4ed3fd6db3501b91eb601810d
+SIZE (golang-net-04defd469f4e_GH0.tar.gz) = 1252122
SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-977fb7262007_GH0.tar.gz) = 11c4dfe83ceae6376054cc95e8f1b303a29985fc407c87cf9e360fd64d7937ce
-SIZE (golang-sys-977fb7262007_GH0.tar.gz) = 1192386
+SHA256 (golang-sys-39ccf1dd6fa6_GH0.tar.gz) = 91b6b5c8e7793ebdcbdf014bc1695bbcf1ea171abdcdb56ca0b3f4a9bc3f60ee
+SIZE (golang-sys-39ccf1dd6fa6_GH0.tar.gz) = 1211355
SHA256 (golang-term-7de9c90e9dd1_GH0.tar.gz) = 73603eaab2ab2bfe05061d64ad09f8ed7469de6964a672398f7bf82cffb4b1da
SIZE (golang-term-7de9c90e9dd1_GH0.tar.gz) = 15239
SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
-SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e
-SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358
-SHA256 (google-go-genproto-24207fddd1c3_GH0.tar.gz) = 830c6c84b395245a8facc1b9941b0cd101eb213775b6531dfe62ba8665eef1ea
-SIZE (google-go-genproto-24207fddd1c3_GH0.tar.gz) = 13508575
-SHA256 (google-go-github-v35.1.0_GH0.tar.gz) = 709aaf8d773749b5b68e2f1c65762e500117be6b63874e38cbaf8e7ee6acee16
-SIZE (google-go-github-v35.1.0_GH0.tar.gz) = 474056
+SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
+SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
+SHA256 (google-go-cmp-v0.5.6_GH0.tar.gz) = cba2118596f694c135b3f3d6fe49b73ca2a7882aa4d7f346e341cb106afce5f1
+SIZE (google-go-cmp-v0.5.6_GH0.tar.gz) = 104421
+SHA256 (google-go-genproto-c76a74d43a8e_GH0.tar.gz) = 982c1d64cae6c6c2d9e2a28f970a904df6452fc29d82b5701b59aacc58a69150
+SIZE (google-go-genproto-c76a74d43a8e_GH0.tar.gz) = 11634919
+SHA256 (google-go-github-v35.2.0_GH0.tar.gz) = c4fbf478e97d7e7a68229d668e7e4580d7b31cd0783fa72b0e9baa59903ca60f
+SIZE (google-go-github-v35.2.0_GH0.tar.gz) = 474316
SHA256 (google-go-querystring-v1.0.0_GH0.tar.gz) = 59fdfd4d740c85c60c35d3e09b587cfa2b435e78178ac4a23950afbece7118ed
SIZE (google-go-querystring-v1.0.0_GH0.tar.gz) = 7529
-SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
-SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
-SHA256 (grpc-grpc-go-v1.40.0_GH0.tar.gz) = baab44655d2ca715630356e6a74b2d27d91c8d40095913cd904bcc68ad332a82
-SIZE (grpc-grpc-go-v1.40.0_GH0.tar.gz) = 1305305
-SHA256 (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 26afc0e5895c6ce87c881c5c02c682ccc9a08174a9c27ca26d4a1e72dbf78128
-SIZE (hashicorp-errwrap-v1.0.0_GH0.tar.gz) = 8346
-SHA256 (hashicorp-go-hclog-v0.16.1_GH0.tar.gz) = 85ea26ef079ec299731bd3894c599e7bf429343ceec6611f9d53b12c762b91cb
-SIZE (hashicorp-go-hclog-v0.16.1_GH0.tar.gz) = 27028
-SHA256 (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 466a1f3596417a35b407d06d2dc2cb87dba46b025af4f77d30f82aa6e0e6d4d4
-SIZE (hashicorp-go-multierror-v1.1.0_GH0.tar.gz) = 12084
-SHA256 (hashicorp-go-plugin-v1.4.1_GH0.tar.gz) = b2d971c9c98ef6f5873ba590fc8b7e65c912802f65f65a95493ae83e07f73a55
-SIZE (hashicorp-go-plugin-v1.4.1_GH0.tar.gz) = 86569
+SHA256 (google-uuid-v1.3.0_GH0.tar.gz) = 7f7f37c47980e0afcc178a9ffc390bec29ed2371919b4c07658eb01791a7f921
+SIZE (google-uuid-v1.3.0_GH0.tar.gz) = 16210
+SHA256 (grpc-grpc-go-v1.41.0_GH0.tar.gz) = f8f254844c4d00cba447457bb26acaa30bafe15be88cb148971c8b48ac40e639
+SIZE (grpc-grpc-go-v1.41.0_GH0.tar.gz) = 1355490
+SHA256 (hashicorp-errwrap-v1.1.0_GH0.tar.gz) = 0d73891a7a179e50a142ac8832db97b17c792d29ae205b0e6aeedde4c43d51a4
+SIZE (hashicorp-errwrap-v1.1.0_GH0.tar.gz) = 8581
+SHA256 (hashicorp-go-hclog-v1.0.0_GH0.tar.gz) = dbcfb5a223e870dd2befdf8a1e346b73f6977fde531a75e19576a2a03c81f02b
+SIZE (hashicorp-go-hclog-v1.0.0_GH0.tar.gz) = 28064
+SHA256 (hashicorp-go-multierror-v1.1.1_GH0.tar.gz) = 8d1bb3377310e8ffe4c7b5672c5de1eaed153402aebd15d6e5b9673c356a065f
+SIZE (hashicorp-go-multierror-v1.1.1_GH0.tar.gz) = 13803
+SHA256 (hashicorp-go-plugin-v1.4.3_GH0.tar.gz) = c69288d4c479ea649232816dae52587ca1751248edc9a34f1a1d46b94bb6e303
+SIZE (hashicorp-go-plugin-v1.4.3_GH0.tar.gz) = 86695
SHA256 (hashicorp-go-version-v1.3.0_GH0.tar.gz) = a459b2d8a3ca4d67fc13869a7869fa6c8aff6491d465b2cbe2842b56df87cfba
SIZE (hashicorp-go-version-v1.3.0_GH0.tar.gz) = 14447
SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
-SHA256 (hashicorp-hcl-v2.10.0_GH0.tar.gz) = e94e242c276c36edeaaaa5771e4bc9095cf9e7a02a24696bc9e5fcdd61abda5c
-SIZE (hashicorp-hcl-v2.10.0_GH0.tar.gz) = 402125
-SHA256 (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 9468ab6cee06cee3e1883a99f5d763bd8d9111e13ce499c5f5f5a705a9979789
-SIZE (hashicorp-yamux-a95892c5f864_GH0.tar.gz) = 24397
-SHA256 (huandu-go-sqlbuilder-v1.12.1_GH0.tar.gz) = a2db71b56ca8b608e999e96ea65b12509b6c5305007c9f240078b88d974a18ac
-SIZE (huandu-go-sqlbuilder-v1.12.1_GH0.tar.gz) = 36591
+SHA256 (hashicorp-hcl-v2.10.1_GH0.tar.gz) = a4b229c76148cff4678e2db8b61a8c85f2d0f9822ee447f25fb908c11ed92a31
+SIZE (hashicorp-hcl-v2.10.1_GH0.tar.gz) = 405355
+SHA256 (hashicorp-yamux-26ff87cf9493_GH0.tar.gz) = 2c9b9f4718266b09aedd28d63bf4cf240df445630e21f755680b35d75a1d1a6c
+SIZE (hashicorp-yamux-26ff87cf9493_GH0.tar.gz) = 25440
+SHA256 (huandu-go-sqlbuilder-v1.13.0_GH0.tar.gz) = 0cea875b0ddeecca477245b169d822b723cba8bb3e497e745af61d55e39690ff
+SIZE (huandu-go-sqlbuilder-v1.13.0_GH0.tar.gz) = 37949
SHA256 (huandu-xstrings-v1.3.2_GH0.tar.gz) = 89eed037724f4a2e85da5217faa6d73ae317d066e0e5fd79670a142b83f5eb1b
SIZE (huandu-xstrings-v1.3.2_GH0.tar.gz) = 17911
-SHA256 (iancoleman-strcase-v0.1.3_GH0.tar.gz) = 93c60b80de0ba86a14654cc647596849e407ce6c580648a9a20f7ed059332f52
-SIZE (iancoleman-strcase-v0.1.3_GH0.tar.gz) = 4845
+SHA256 (iancoleman-strcase-v0.2.0_GH0.tar.gz) = b1afd545eede17416f8bc84bb25f282ab94feffe29aff1bf1c080e755d0d7751
+SIZE (iancoleman-strcase-v0.2.0_GH0.tar.gz) = 4952
SHA256 (imdario-mergo-v0.3.12_GH0.tar.gz) = f0ad95fe47f1a9c15545fe3e8abf4364b8163a0f872ce25d6f6ae85e7c885302
SIZE (imdario-mergo-v0.3.12_GH0.tar.gz) = 22319
SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
SHA256 (jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4
SIZE (jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038
-SHA256 (jackc-pgconn-v1.8.1_GH0.tar.gz) = f99c04e32b9b98db40c97662b20326ccf7af1fc2d4eed8d4f5c87e4591a82b8c
-SIZE (jackc-pgconn-v1.8.1_GH0.tar.gz) = 53272
+SHA256 (jackc-pgconn-v1.10.0_GH0.tar.gz) = c546b6860ec2c14bc6fe04f507091ee26dcd9359f2ecb1273773786fa2e4499c
+SIZE (jackc-pgconn-v1.10.0_GH0.tar.gz) = 53938
SHA256 (jackc-pgerrcode-a0d42d470451_GH0.tar.gz) = 317d00f8de3977be45761387653b3849981b31b354750f4e6af9f040df5c7fb8
SIZE (jackc-pgerrcode-a0d42d470451_GH0.tar.gz) = 8374
SHA256 (jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab
SIZE (jackc-pgio-v1.0.0_GH0.tar.gz) = 1884
SHA256 (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603
SIZE (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254
-SHA256 (jackc-pgproto3-v2.0.7_GH0.tar.gz) = c456e196673b8da00e1e3e0be7c10ef3754f58a86aa360dda316fdfa489e2895
-SIZE (jackc-pgproto3-v2.0.7_GH0.tar.gz) = 17284
+SHA256 (jackc-pgproto3-v2.1.1_GH0.tar.gz) = 3f4658d4580fb68a20344ef5b86b110e7445f272fc950235724937c9ccd68972
+SIZE (jackc-pgproto3-v2.1.1_GH0.tar.gz) = 22321
SHA256 (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = dd6cf77deb2456b1c8e56875ed901a57eb887e63ae5de48f364906131275497e
SIZE (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = 2991
-SHA256 (jackc-pgtype-v1.7.0_GH0.tar.gz) = 1552dbef3b001e6e301d0577efd4ca183d76b711a66c40afebffaa8e19a4df61
-SIZE (jackc-pgtype-v1.7.0_GH0.tar.gz) = 175405
-SHA256 (jackc-pgx-v4.11.0_GH0.tar.gz) = 0f4751015cafcd1eac6e4525c87ce6296f4394465b337bdc51ede8413de5942e
-SIZE (jackc-pgx-v4.11.0_GH0.tar.gz) = 116272
-SHA256 (jackc-puddle-v1.1.3_GH0.tar.gz) = 6ce53fe368d6777b7aee47c2e2e0558d7089d08d23b311f4b84613ba08edc99b
-SIZE (jackc-puddle-v1.1.3_GH0.tar.gz) = 10317
+SHA256 (jackc-pgtype-v1.8.1_GH0.tar.gz) = 521d658abbe3448df9d29dceaf79d5e6a80f94212480d06970e3adc9bdfe9d09
+SIZE (jackc-pgtype-v1.8.1_GH0.tar.gz) = 176070
+SHA256 (jackc-pgx-v4.13.0_GH0.tar.gz) = 8ef46598fbbfeb4ab00ee0fddfe4cfc3bb4596716235987b3e26da033289b3c8
+SIZE (jackc-pgx-v4.13.0_GH0.tar.gz) = 106207
+SHA256 (jackc-puddle-v1.1.4_GH0.tar.gz) = b87fbf5c6c97e1f024ede9a4c5748145a5a20a107def572bbfbc2f57aa251274
+SIZE (jackc-puddle-v1.1.4_GH0.tar.gz) = 10365
SHA256 (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = b5a5c4fe8d73dea7dc838f1c428c5fff0db9b50a2c014208a2761de4e94fa5ba
SIZE (jbenet-go-context-d14ea06fba99_GH0.tar.gz) = 5945
+SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d
+SIZE (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = 128861
SHA256 (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 568ea6be8d237ca16dcd03e2fa5e07461ab596ccff40197ac34dac43f97389ec
SIZE (kevinburke-ssh_config-4977a11b4351_GH0.tar.gz) = 17407
+SHA256 (kylelemons-godebug-v1.1.0_GH0.tar.gz) = 72cc6f274fbd165b7674280f836a6b400e80dbae055919e101920dedf50e79db
+SIZE (kylelemons-godebug-v1.1.0_GH0.tar.gz) = 17637
SHA256 (lann-builder-47ae307949d0_GH0.tar.gz) = 84932a9525df377fc28eb75501fb5385ecf0d08134ac434314578634f741d3b0
SIZE (lann-builder-47ae307949d0_GH0.tar.gz) = 5811
SHA256 (lann-ps-62de8c46ede0_GH0.tar.gz) = 368bddfa4195be5efc255aca58a473ffacfcebf4dca4281f7f109637446db215
SIZE (lann-ps-62de8c46ede0_GH0.tar.gz) = 5527
-SHA256 (lib-pq-v1.10.1_GH0.tar.gz) = bbf8f9796747e3e8645175c4e4c12c39c05938b62f93386ac401bba2abfa6a91
-SIZE (lib-pq-v1.10.1_GH0.tar.gz) = 103789
+SHA256 (lib-pq-v1.10.3_GH0.tar.gz) = 0347779a22066e5f31873b2574236a77a379354aa790979731a0d2eb72a0bfbf
+SIZE (lib-pq-v1.10.3_GH0.tar.gz) = 108002
SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd
SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735
-SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
-SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (mattn-go-colorable-v0.1.11_GH0.tar.gz) = b88eae3c846d3c9bee375bfb72b535b726755a06d8e972c937820aba45d2f5e0
+SIZE (mattn-go-colorable-v0.1.11_GH0.tar.gz) = 9800
+SHA256 (mattn-go-isatty-v0.0.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
+SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710
SHA256 (mattn-go-runewidth-v0.0.10_GH0.tar.gz) = 48cb8654014d9eab1d59088dd1879907de1dab51c2ed3cee8c8254c1708c2d8e
SIZE (mattn-go-runewidth-v0.0.10_GH0.tar.gz) = 16778
SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
@@ -153,22 +161,22 @@ SHA256 (mitchellh-hashstructure-v1.1.0_GH0.tar.gz) = 678ae94c4ca368752704277c0be
SIZE (mitchellh-hashstructure-v1.1.0_GH0.tar.gz) = 7883
SHA256 (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = d936baa5006f7dda1346aff863745a110981f7583a1184e93b9077fa52cd4048
SIZE (mitchellh-mapstructure-v1.4.1_GH0.tar.gz) = 27826
-SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
-SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
-SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
-SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
+SHA256 (modern-go-reflect2-v1.0.2_GH0.tar.gz) = eab313f24c09d512f004d489aeed0d0a485f789abd07e7df411375035174341b
+SIZE (modern-go-reflect2-v1.0.2_GH0.tar.gz) = 14030
SHA256 (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd
SIZE (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631
SHA256 (oklog-run-v1.1.0_GH0.tar.gz) = 00c8e2d2071fca7db49027aaaf1e846fa863c4d8a5be33b49898d828ba88cdb5
SIZE (oklog-run-v1.1.0_GH0.tar.gz) = 7991
-SHA256 (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 1a5a620f680033f17e34148bee8f26d96d8c27ff1d7f56f0fe1c7253595b5244
-SIZE (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 57496
+SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f
+SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568
+SHA256 (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 837b8407fb401deff36961ce32498a1145c5ef4bad0b0060a25e632c14621941
+SIZE (pelletier-go-toml-v1.8.1_GH0.tar.gz) = 98819
SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
-SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
+SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
+SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197
SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) = 44036
SHA256 (rs-zerolog-v1.20.0_GH0.tar.gz) = 9e098068534addb5663bdc51f0a471b69c92b23fee020f23bfd3dceab140869f
@@ -179,8 +187,8 @@ SHA256 (sergi-go-diff-v1.2.0_GH0.tar.gz) = 39590cae996778b7ffdd8eb9e8fc791117f16
SIZE (sergi-go-diff-v1.2.0_GH0.tar.gz) = 1333585
SHA256 (spf13-afero-v1.6.0_GH0.tar.gz) = d1942de010ac7932bd21618aaf478b4f1413980449c061032f18beac7805d068
SIZE (spf13-afero-v1.6.0_GH0.tar.gz) = 62130
-SHA256 (spf13-cast-v1.4.0_GH0.tar.gz) = 56e4ad505597460418e13cecb1c89d607ea5ba668cb2ea7f93947d48a428bbda
-SIZE (spf13-cast-v1.4.0_GH0.tar.gz) = 13365
+SHA256 (spf13-cast-v1.4.1_GH0.tar.gz) = 3d099a48b75a66ac52dbb473c93096076dca752af51087b8d163e15e5de721f8
+SIZE (spf13-cast-v1.4.1_GH0.tar.gz) = 13381
SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
SHA256 (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 2ece12b964e0d230b10851555185d42d3c81b401efda044265ae716eb1d0bc2d
@@ -195,8 +203,16 @@ SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5a
SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
-SHA256 (thoas-go-funk-efae847b30ab_GH0.tar.gz) = 2069089312679a6e903ad377d8e8eb479a4fb33e15d08ef418c196057d638d7f
-SIZE (thoas-go-funk-efae847b30ab_GH0.tar.gz) = 48732
+SHA256 (thoas-go-funk-v0.9.1_GH0.tar.gz) = ef1a79b0308908840cf6f498caeb317664d3270a46a298074d8027cff7fa4964
+SIZE (thoas-go-funk-v0.9.1_GH0.tar.gz) = 49553
+SHA256 (tidwall-gjson-v1.11.0_GH0.tar.gz) = 1aaa24661f86856159d93814d7f277c5f34cabe03e0c7de0c43ed924e312e820
+SIZE (tidwall-gjson-v1.11.0_GH0.tar.gz) = 55187
+SHA256 (tidwall-match-v1.1.1_GH0.tar.gz) = 1fc2ff17ecdd82c7ba739b4f373b9df731a8e42517c70285c8bbf24dd9b3f2f0
+SIZE (tidwall-match-v1.1.1_GH0.tar.gz) = 5931
+SHA256 (tidwall-pretty-v1.2.0_GH0.tar.gz) = fda514a386aff71cf7a4639a8fb8e1133bf8f583eba902b3c844a176401fad7d
+SIZE (tidwall-pretty-v1.2.0_GH0.tar.gz) = 11224
+SHA256 (uber-go-atomic-v1.6.0_GH0.tar.gz) = 34abb632809f28d4106660d0211dfa624968c4d021717a2e16e1c6bf2606f34a
+SIZE (uber-go-atomic-v1.6.0_GH0.tar.gz) = 9678
SHA256 (vbauerster-mpb-v6.0.3_GH0.tar.gz) = 1d28d30706895a5839a51bda5a5f8a158e127bbff6cf7dce30d95ff62e3213bc
SIZE (vbauerster-mpb-v6.0.3_GH0.tar.gz) = 59521
SHA256 (vmihailenco-msgpack-v5.3.4_GH0.tar.gz) = 9972c3d0f882f22153a8d5697f7f1233fe8070fe3457bd98d1bfdce1682d4368
@@ -207,5 +223,5 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215
SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
SHA256 (xo-dburl-v0.8.4_GH0.tar.gz) = ed398461d0cc81485670ae03f577f55a6351cdea83818e5ca27de23d22f32f44
SIZE (xo-dburl-v0.8.4_GH0.tar.gz) = 20021
-SHA256 (zclconf-go-cty-v1.9.0_GH0.tar.gz) = 625c9a783a0addb83d21c944864a4df47364a02e501ea95f5286b27a65de58f5
-SIZE (zclconf-go-cty-v1.9.0_GH0.tar.gz) = 196973
+SHA256 (zclconf-go-cty-v1.9.1_GH0.tar.gz) = cab1a91e7239b6ccb1b3a98e8d05164742d885a126cc3a4d09a54c9f0d527c94
+SIZE (zclconf-go-cty-v1.9.1_GH0.tar.gz) = 197531
diff --git a/net/corosync2/Makefile b/net/corosync2/Makefile
index 4057c419cda8..84497417d023 100644
--- a/net/corosync2/Makefile
+++ b/net/corosync2/Makefile
@@ -4,7 +4,7 @@ PORTVERSION= 2.4.5
PORTREVISION= 1
PKGNAMESUFFIX= 2
-CONFLICTS= corosync3-[0-9]*
+CONFLICTS= corosync3
PORTSCOUT= limit:^2\.[0-9]\.[0-9]
.include "${.CURDIR}/Makefile.common"
diff --git a/net/corosync3/Makefile b/net/corosync3/Makefile
index ff1992d87703..972ccea91fe8 100644
--- a/net/corosync3/Makefile
+++ b/net/corosync3/Makefile
@@ -8,6 +8,6 @@ PKGNAMESUFFIX= 3
LIB_DEPENDS+= libknet.so:devel/kronosnet
-CONFLICTS= corosync2-[0-9]*
+CONFLICTS= corosync2
.include <bsd.port.mk>
diff --git a/net/cpp-pcp-client/Makefile b/net/cpp-pcp-client/Makefile
index dbad9b265aec..6f3421888203 100644
--- a/net/cpp-pcp-client/Makefile
+++ b/net/cpp-pcp-client/Makefile
@@ -1,5 +1,5 @@
PORTNAME= cpp-pcp-client
-PORTVERSION= 1.7.3
+PORTVERSION= 1.7.6
CATEGORIES= net
MAINTAINER= puppet@FreeBSD.org
diff --git a/net/cpp-pcp-client/distinfo b/net/cpp-pcp-client/distinfo
index 430e2a804fce..09a68359075c 100644
--- a/net/cpp-pcp-client/distinfo
+++ b/net/cpp-pcp-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622223390
-SHA256 (puppetlabs-cpp-pcp-client-1.7.3_GH0.tar.gz) = 074b8ac1506c7800964b58fae76f23ee381ca5923fa2e0a1674d81d827f25383
-SIZE (puppetlabs-cpp-pcp-client-1.7.3_GH0.tar.gz) = 2575316
+TIMESTAMP = 1638552290
+SHA256 (puppetlabs-cpp-pcp-client-1.7.6_GH0.tar.gz) = 75c469fc18cffd04ada4310d021178631c064397feb3d36cb397bd57721dd571
+SIZE (puppetlabs-cpp-pcp-client-1.7.6_GH0.tar.gz) = 2570847
diff --git a/net/cpp-pcp-client/pkg-plist b/net/cpp-pcp-client/pkg-plist
index c93d8b9f2937..67b9579abab3 100644
--- a/net/cpp-pcp-client/pkg-plist
+++ b/net/cpp-pcp-client/pkg-plist
@@ -28,5 +28,6 @@ include/cpp-pcp-client/util/thread.hpp
include/cpp-pcp-client/validator/schema.hpp
include/cpp-pcp-client/validator/validator.hpp
include/cpp-pcp-client/valijson/rapidjson_adapter.hpp
+include/cpp-pcp-client/ws_config.hpp
lib/liblibcpp-pcp-client.so
lib/liblibcpp-pcp-client.so.%%PORTVERSION%%
diff --git a/net/cppzmq/Makefile b/net/cppzmq/Makefile
index 9f9ec02159fe..14eddfb83bd1 100644
--- a/net/cppzmq/Makefile
+++ b/net/cppzmq/Makefile
@@ -1,7 +1,7 @@
# Created by: Vasil Dimov <vd@FreeBSD.org>
PORTNAME= cppzmq
-PORTVERSION= 4.7.1
+PORTVERSION= 4.8.1
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/cppzmq/distinfo b/net/cppzmq/distinfo
index 47bec7306aaa..354dfbc7d51f 100644
--- a/net/cppzmq/distinfo
+++ b/net/cppzmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601990007
-SHA256 (zeromq-cppzmq-v4.7.1_GH0.tar.gz) = 9853e0437d834cbed5d3c223bf1d755cadee70e7c964c6e42c4c6783dee5d02c
-SIZE (zeromq-cppzmq-v4.7.1_GH0.tar.gz) = 46075
+TIMESTAMP = 1635843176
+SHA256 (zeromq-cppzmq-v4.8.1_GH0.tar.gz) = 7a23639a45f3a0049e11a188e29aaedd10b2f4845f0000cf3e22d6774ebde0af
+SIZE (zeromq-cppzmq-v4.8.1_GH0.tar.gz) = 46316
diff --git a/net/croc/Makefile b/net/croc/Makefile
index fd78cf0808cb..316d63053368 100644
--- a/net/croc/Makefile
+++ b/net/croc/Makefile
@@ -1,5 +1,5 @@
PORTNAME= croc
-PORTVERSION= 9.4.2
+PORTVERSION= 9.5.0
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= net
@@ -14,17 +14,21 @@ USES= go:modules
USE_GITHUB= yes
GH_ACCOUNT= schollz
-GH_TUPLE= cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
+GH_TUPLE= OneOfOne:xxhash:v1.2.5:oneofone_xxhash/vendor/github.com/OneOfOne/xxhash \
+ cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
cpuguy83:go-md2man:v2.0.1:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
denisbrodbeck:machineid:v1.0.1:denisbrodbeck_machineid/vendor/github.com/denisbrodbeck/machineid \
+ go-check:check:41f04d3bba15:go_check_check/vendor/gopkg.in/check.v1 \
go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
golang:crypto:089bfa567519:golang_crypto/vendor/golang.org/x/crypto \
golang:net:e81a3d93ecf6:golang_net/vendor/golang.org/x/net \
golang:sys:808efd93c36d:golang_sys/vendor/golang.org/x/sys \
golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
+ golang:time:f0f3c7e86c11:golang_time/vendor/golang.org/x/time \
kalafut:imohash:v1.0.2:kalafut_imohash/vendor/github.com/kalafut/imohash \
+ kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
mitchellh:colorstring:d06e56a500db:mitchellh_colorstring/vendor/github.com/mitchellh/colorstring \
pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
@@ -36,6 +40,7 @@ GH_TUPLE= cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash
schollz:pake:v3.0.2:schollz_pake_v3/vendor/github.com/schollz/pake/v3 \
schollz:peerdiscovery:v1.6.9:schollz_peerdiscovery/vendor/github.com/schollz/peerdiscovery \
schollz:progressbar:v3.8.3:schollz_progressbar_v3/vendor/github.com/schollz/progressbar/v3 \
+ spaolacci:murmur3:v1.1.0:spaolacci_murmur3/vendor/github.com/spaolacci/murmur3 \
stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
tscholl2:siec:9bdfc483d499:tscholl2_siec/vendor/github.com/tscholl2/siec \
twmb:murmur3:v1.1.6:twmb_murmur3/vendor/github.com/twmb/murmur3
diff --git a/net/croc/distinfo b/net/croc/distinfo
index 0cdd5542e75b..8d5f40735877 100644
--- a/net/croc/distinfo
+++ b/net/croc/distinfo
@@ -1,6 +1,8 @@
-TIMESTAMP = 1633284482
-SHA256 (schollz-croc-v9.4.2_GH0.tar.gz) = 73d3abb058af18329ffdea4bb77d484b5f8ede9c11010d44781f3e891aa675e0
-SIZE (schollz-croc-v9.4.2_GH0.tar.gz) = 503579
+TIMESTAMP = 1637505425
+SHA256 (schollz-croc-v9.5.0_GH0.tar.gz) = 0e250ecebc72753991a3442e48f9caadfae2467430a81595b79b5443e2ff523b
+SIZE (schollz-croc-v9.5.0_GH0.tar.gz) = 504327
+SHA256 (OneOfOne-xxhash-v1.2.5_GH0.tar.gz) = 8e8f27899a87f465e921ca79b640c96e8e70e17af4cf68e00ff9c728d41158d1
+SIZE (OneOfOne-xxhash-v1.2.5_GH0.tar.gz) = 14109
SHA256 (cespare-xxhash-v1.1.0_GH0.tar.gz) = 9418be390574092f0ca989b9ae2f5450270ead8125a635a100850b28c8c9c495
SIZE (cespare-xxhash-v1.1.0_GH0.tar.gz) = 8200
SHA256 (cpuguy83-go-md2man-v2.0.1_GH0.tar.gz) = 889309ecf43e40d3a76d666b0259dcd71b340ea0fad003784ff3fe0b6c21990e
@@ -9,6 +11,8 @@ SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
SHA256 (denisbrodbeck-machineid-v1.0.1_GH0.tar.gz) = 0a01d2b131419cb2b9f7d910a2c90b824449bd91005b47efb235dc707665337a
SIZE (denisbrodbeck-machineid-v1.0.1_GH0.tar.gz) = 27807
+SHA256 (go-check-check-41f04d3bba15_GH0.tar.gz) = 2d5b1036909b241e44f0d6a7cfa936cf9f875efb4f0af077cd61585c6d0c0432
+SIZE (go-check-check-41f04d3bba15_GH0.tar.gz) = 31614
SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
SHA256 (golang-crypto-089bfa567519_GH0.tar.gz) = 2ed1af12d13ad0cfe08ac49d51dfad4b8d7f5e4693fbddfa3ef53bd80c9555ab
@@ -21,8 +25,12 @@ SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d9007235
SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
+SHA256 (golang-time-f0f3c7e86c11_GH0.tar.gz) = 421890dd6e4b7e8d5ca68cc163c8b3b08436898664534aedfefd8602e11a4e53
+SIZE (golang-time-f0f3c7e86c11_GH0.tar.gz) = 9626
SHA256 (kalafut-imohash-v1.0.2_GH0.tar.gz) = 61aef7ceebc7c5cd2cfa6902c4d0be4df3056bf8b776d03005334218a05b460e
SIZE (kalafut-imohash-v1.0.2_GH0.tar.gz) = 7234
+SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
+SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
SHA256 (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196
SIZE (mattn-go-runewidth-v0.0.13_GH0.tar.gz) = 17353
SHA256 (mitchellh-colorstring-d06e56a500db_GH0.tar.gz) = 2093d564392b9d6b752471ad0506ee20d4f8648cd96c179536fcb17a9b4d4137
@@ -45,6 +53,8 @@ SHA256 (schollz-peerdiscovery-v1.6.9_GH0.tar.gz) = b393923c5ce61c02cb5a7d26c480b
SIZE (schollz-peerdiscovery-v1.6.9_GH0.tar.gz) = 8865
SHA256 (schollz-progressbar-v3.8.3_GH0.tar.gz) = dac4bce864c211474521a9b691bcd2329dab173bf6af4aacf0a3c9535e56707d
SIZE (schollz-progressbar-v3.8.3_GH0.tar.gz) = 603262
+SHA256 (spaolacci-murmur3-v1.1.0_GH0.tar.gz) = 73e99fdaadf177427cefb2aff93e4c35d8b1fcf20a4eac6feab73b5d55a9d243
+SIZE (spaolacci-murmur3-v1.1.0_GH0.tar.gz) = 7391
SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
SHA256 (tscholl2-siec-9bdfc483d499_GH0.tar.gz) = 7ec9a96d85120c1002e281fe9d4bc56b22b721267f2297b1b4acfd3a19df48e1
diff --git a/net/cvsup-static/Makefile b/net/cvsup-static/Makefile
index b829e9502081..2593a24f0a55 100644
--- a/net/cvsup-static/Makefile
+++ b/net/cvsup-static/Makefile
@@ -12,7 +12,7 @@ COMMENT= File distribution system optimized for CVS
ONLY_FOR_ARCHS= amd64
-CONFLICTS_INSTALL= modula3-*
+CONFLICTS_INSTALL= modula3
DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH}
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 5a27fd3a72d7..1dff9ecd87a3 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libminiupnpc.so:net/miniupnpc \
libsasl2.so:security/cyrus-sasl2
-CONFLICTS= socks5-[0-9]*
+CONFLICTS= socks5
USES= libtool localbase
GNU_CONFIGURE= yes
diff --git a/net/dhcpcd-ui/Makefile b/net/dhcpcd-ui/Makefile
index a3c4268c7b66..ed21499a7be5 100644
--- a/net/dhcpcd-ui/Makefile
+++ b/net/dhcpcd-ui/Makefile
@@ -1,10 +1,9 @@
PORTNAME= dhcpcd-ui
PORTVERSION= 0.7.8
CATEGORIES= net
-MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/ \
- https://cflags.cc/roy/dhcpcd/
+MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/
-MAINTAINER= driesm.michiels@gmail.com
+MAINTAINER= driesm@FreeBSD.org
COMMENT= GTK+ / Curses interface to dhcpcd
LICENSE= BSD2CLAUSE
diff --git a/net/dhcpcd/Makefile b/net/dhcpcd/Makefile
index 45222564301b..866acf51dcd3 100644
--- a/net/dhcpcd/Makefile
+++ b/net/dhcpcd/Makefile
@@ -1,32 +1,29 @@
# Created by: Roy Marples <roy@marples.name>
PORTNAME= dhcpcd
-PORTVERSION= 9.4.0
+DISTVERSION= 9.4.1
+PORTREVISION= 2
CATEGORIES= net
-MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/ \
- https://cflags.cc/roy/dhcpcd/
+MASTER_SITES= https://roy.marples.name/downloads/dhcpcd/
-MAINTAINER= driesm.michiels@gmail.com
+MAINTAINER= driesm@FreeBSD.org
COMMENT= DHCP/IPv4LL/IPv6RS/DHCPv6 client
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-CONFLICTS_INSTALL= dhcpcd-devel
-
USES= compiler:c11 cpe tar:xz
-
CPE_VENDOR= dhcpcd_project
-GNU_CONFIGURE= yes
+USE_RC_SUBR= dhcpcd
+
+HAS_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/examples \
+ --prefix=${PREFIX} \
--privsepuser="_dhcp" \
--without-udev
-USE_RC_SUBR= dhcpcd
post-install:
- ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf \
- ${STAGEDIR}${PREFIX}/share/examples/dhcpcd
+ ${MV} ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf ${STAGEDIR}${PREFIX}/etc/dhcpcd.conf.sample
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/dhcpcd
- ${MKDIR} ${STAGEDIR}/var/db/dhcpcd
.include <bsd.port.mk>
diff --git a/net/dhcpcd/distinfo b/net/dhcpcd/distinfo
index c86edfb5895a..d35b52df9df3 100644
--- a/net/dhcpcd/distinfo
+++ b/net/dhcpcd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609632418
-SHA256 (dhcpcd-9.4.0.tar.xz) = 41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
-SIZE (dhcpcd-9.4.0.tar.xz) = 256440
+TIMESTAMP = 1634928253
+SHA256 (dhcpcd-9.4.1.tar.xz) = 819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
+SIZE (dhcpcd-9.4.1.tar.xz) = 257092
diff --git a/net/dhcpcd/files/dhcpcd.in b/net/dhcpcd/files/dhcpcd.in
index 3d6c670f289a..14ca0c29bb96 100644
--- a/net/dhcpcd/files/dhcpcd.in
+++ b/net/dhcpcd/files/dhcpcd.in
@@ -1,7 +1,7 @@
#!/bin/sh
# PROVIDE: dhclient dhcpcd
-# KEYWORD: nojail
+# KEYWORD: nojailvnet
#
. /etc/rc.subr
diff --git a/net/dhcpcd/pkg-plist b/net/dhcpcd/pkg-plist
index 891ce7fabc99..4a2505f079f2 100644
--- a/net/dhcpcd/pkg-plist
+++ b/net/dhcpcd/pkg-plist
@@ -3,13 +3,13 @@ libexec/dhcpcd-hooks/20-resolv.conf
libexec/dhcpcd-hooks/30-hostname
libexec/dhcpcd-hooks/50-ntp.conf
libexec/dhcpcd-run-hooks
-man/man5/dhcpcd.conf.5.gz
-man/man8/dhcpcd-run-hooks.8.gz
-man/man8/dhcpcd.8.gz
sbin/dhcpcd
%%EXAMPLESDIR%%/hooks/10-wpa_supplicant
%%EXAMPLESDIR%%/hooks/15-timezone
%%EXAMPLESDIR%%/hooks/29-lookup-hostname
%%EXAMPLESDIR%%/hooks/50-ypbind
-@sample %%EXAMPLESDIR%%/dhcpcd.conf etc/dhcpcd.conf
+share/man/man5/dhcpcd.conf.5.gz
+share/man/man8/dhcpcd-run-hooks.8.gz
+share/man/man8/dhcpcd.8.gz
+@sample etc/dhcpcd.conf.sample
@dir(_dhcp,_dhcp,) /var/db/dhcpcd
diff --git a/net/dhcperf/Makefile b/net/dhcperf/Makefile
index f165e044cc49..d6aa06a32544 100644
--- a/net/dhcperf/Makefile
+++ b/net/dhcperf/Makefile
@@ -7,12 +7,13 @@ MASTER_SITES= ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-1-freebsd-5.4-i386
MAINTAINER= ports@FreeBSD.org
-COMMENT= DHCPerf delivers accurate performance metrics of Dynamic Host Configuration Protocol service
+COMMENT= Accurate performance metrics for DHCP service
LIB_DEPENDS= libc.so.5:misc/compat5x
ONLY_FOR_ARCHS= i386
-ONLY_FOR_ARCHS_REASON= Rebuild of i386 package provided by Nominum.
+ONLY_FOR_ARCHS_REASON= rebuild of i386 package provided by Nominum
+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-1/
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 4d103e6f841e..82a3ebad9e1f 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dictd
PORTVERSION= 1.13.0
+PORTREVISION= 1
CATEGORIES+= net textproc
MASTER_SITES= SF/dict/dictd/dictd-${PORTVERSION}
diff --git a/net/dictd/files/pkg-message.in b/net/dictd/files/pkg-message.in
index d1fc0a355cef..a87c721da2bd 100644
--- a/net/dictd/files/pkg-message.in
+++ b/net/dictd/files/pkg-message.in
@@ -8,10 +8,7 @@ To invoke dictd on startup, put the following in /etc/rc.conf:
dictd_enable="YES"
-The dict client can be found within %%PORTSDIR%%/textproc/dict
-
-Don't forget to install %%PORTSDIR%%/net/dictd-database
-to run a dictd server without pain.
+The dict client can be found within %%PORTSDIR%%/textproc/dict.
EOM
}
]
diff --git a/net/dpdk-20.11/Makefile b/net/dpdk-20.11/Makefile
index 26be3afd940c..9639010821b7 100644
--- a/net/dpdk-20.11/Makefile
+++ b/net/dpdk-20.11/Makefile
@@ -10,7 +10,7 @@ COMMENT= DPDK: Software libraries for packet processing
LICENSE= BSD3CLAUSE
ONLY_FOR_ARCHS= amd64
-ONLY_FOR_ARCHS_REASON= Only tested on 64-bit x86 hardware
+ONLY_FOR_ARCHS_REASON= only tested on 64-bit x86 hardware
BUILD_DEPENDS= objdump:devel/binutils
LIB_DEPENDS= libjansson.so:devel/jansson
diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile
index 0bb38e20f2e6..29555076a5f1 100644
--- a/net/dpdk/Makefile
+++ b/net/dpdk/Makefile
@@ -9,7 +9,7 @@ COMMENT= DPDK: Software libraries for packet processing
LICENSE= BSD3CLAUSE
ONLY_FOR_ARCHS= amd64
-ONLY_FOR_ARCHS_REASON= Only works on 64-bit x86 hardware
+ONLY_FOR_ARCHS_REASON= only works on 64-bit x86 hardware
LIB_DEPENDS= libjansson.so:devel/jansson
BUILD_DEPENDS= objdump:devel/binutils
diff --git a/net/endlessh/Makefile b/net/endlessh/Makefile
index 66636d3ea333..b21b47922c58 100644
--- a/net/endlessh/Makefile
+++ b/net/endlessh/Makefile
@@ -1,5 +1,6 @@
PORTNAME= endlessh
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= brnrd@FreeBSD.org
diff --git a/net/endlessh/files/pkg-message.in b/net/endlessh/files/pkg-message.in
index 3dea43343029..38b7c0177726 100644
--- a/net/endlessh/files/pkg-message.in
+++ b/net/endlessh/files/pkg-message.in
@@ -29,4 +29,5 @@ to take care of log rotation.
ln -s %%PREFIX%%/etc/endlessh.newsyslog.conf %%PREFIX%%/etc/newsyslog.conf.d/
EOD
+}
]
diff --git a/net/eventviews/distinfo b/net/eventviews/distinfo
index 394d9d8b6570..34c90d669508 100644
--- a/net/eventviews/distinfo
+++ b/net/eventviews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447514
-SHA256 (KDE/release-service/21.08.2/eventviews-21.08.2.tar.xz) = b28f3a6823194a6a64d8e6043ff4c8ec1897e47b3cc4404cda4aceafec842a34
-SIZE (KDE/release-service/21.08.2/eventviews-21.08.2.tar.xz) = 452620
+TIMESTAMP = 1636032659
+SHA256 (KDE/release-service/21.08.3/eventviews-21.08.3.tar.xz) = 86cc394d4fd9956758503d1300150aef1225c53a62b2e354f4e13c15d3e16c21
+SIZE (KDE/release-service/21.08.3/eventviews-21.08.3.tar.xz) = 452628
diff --git a/net/exabgp4/Makefile b/net/exabgp4/Makefile
index f7cbe6df635d..2f85179851a6 100644
--- a/net/exabgp4/Makefile
+++ b/net/exabgp4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= exabgp
PORTVERSION= 4.2.13
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= GH \
ZI
@@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE.txt
USES= python:3.6+ shebangfix
USE_PYTHON= distutils autoplist
-CONFLICTS_INSTALL= exabgp-[0-9]*
+CONFLICTS_INSTALL= exabgp
SUB_FILES= pkg-message
SUB_LIST= PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
diff --git a/net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py b/net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py
new file mode 100644
index 000000000000..2bc959c98d78
--- /dev/null
+++ b/net/exabgp4/files/patch-lib_exabgp_reactor_network_outgoing.py
@@ -0,0 +1,11 @@
+--- lib/exabgp/reactor/network/outgoing.py.orig 2021-03-19 09:29:00 UTC
++++ lib/exabgp/reactor/network/outgoing.py
+@@ -53,6 +53,8 @@ class Outgoing(Connection):
+ connect(self.io, self.peer, self.port, self.afi, self.md5)
+ return None
+ except Exception as exc:
++ self.io.close()
++ self.io = None
+ return exc
+
+ def establish(self):
diff --git a/net/fbzmq/Makefile b/net/fbzmq/Makefile
index ae9723280bc8..33e560a49637 100644
--- a/net/fbzmq/Makefile
+++ b/net/fbzmq/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fbzmq
DISTVERSIONPREFIX= v
-DISTVERSION= 2021.10.04.00
+DISTVERSION= 2021.12.06.00
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/fbzmq/distinfo b/net/fbzmq/distinfo
index f12a06aa8bac..de2695d1fc2f 100644
--- a/net/fbzmq/distinfo
+++ b/net/fbzmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633452827
-SHA256 (facebook-fbzmq-v2021.10.04.00_GH0.tar.gz) = 09378bbfc994fab47889f06aae70070f22c331d9b2a7734cd66be65ede4a9f88
-SIZE (facebook-fbzmq-v2021.10.04.00_GH0.tar.gz) = 201209
+TIMESTAMP = 1638985774
+SHA256 (facebook-fbzmq-v2021.12.06.00_GH0.tar.gz) = f27ee9dd3af4947dc9b1680d4f32ffbcd00a2676c71400e31cb81979c6885a11
+SIZE (facebook-fbzmq-v2021.12.06.00_GH0.tar.gz) = 202119
diff --git a/net/findomain/Makefile b/net/findomain/Makefile
index 35135defe51e..6a7cc4f5d671 100644
--- a/net/findomain/Makefile
+++ b/net/findomain/Makefile
@@ -1,6 +1,6 @@
PORTNAME= findomain
DISTVERSION= 5.0.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net security
MAINTAINER= lcook@FreeBSD.org
diff --git a/net/findomain/files/patch-powerpc b/net/findomain/files/patch-powerpc
new file mode 100644
index 000000000000..0f536b57abf4
--- /dev/null
+++ b/net/findomain/files/patch-powerpc
@@ -0,0 +1,20 @@
+--- cargo-crates/crossbeam-epoch-0.9.5/no_atomic.rs.orig 2021-07-12 16:01:21.814570000 +0200
++++ cargo-crates/crossbeam-epoch-0.9.5/no_atomic.rs 2021-07-12 16:01:34.083879000 +0200
+@@ -30,6 +30,7 @@
+ "mipsel-unknown-none",
+ "mipsisa32r6-unknown-linux-gnu",
+ "mipsisa32r6el-unknown-linux-gnu",
++ "powerpc-unknown-freebsd",
+ "powerpc-unknown-linux-gnu",
+ "powerpc-unknown-linux-gnuspe",
+ "powerpc-unknown-linux-musl",
+--- cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs.orig 2021-07-12 16:01:05.023177000 +0200
++++ cargo-crates/crossbeam-utils-0.8.5/no_atomic.rs 2021-07-12 16:01:16.538869000 +0200
+@@ -30,6 +30,7 @@
+ "mipsel-unknown-none",
+ "mipsisa32r6-unknown-linux-gnu",
+ "mipsisa32r6el-unknown-linux-gnu",
++ "powerpc-unknown-freebsd",
+ "powerpc-unknown-linux-gnu",
+ "powerpc-unknown-linux-gnuspe",
+ "powerpc-unknown-linux-musl",
diff --git a/net/flower/Makefile b/net/flower/Makefile
index 44b68a9cb362..92073bae7ac2 100644
--- a/net/flower/Makefile
+++ b/net/flower/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flower
DISTVERSIONPREFIX= v
DISTVERSION= 0.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net
MAINTAINER= ed@FreeBSD.org
diff --git a/net/fort/Makefile b/net/fort/Makefile
index dd163a3ca597..ee850aea8832 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,5 +1,5 @@
PORTNAME= fort
-DISTVERSION= 1.5.2
+DISTVERSION= 1.5.3
CATEGORIES= net
MAINTAINER= toni@devboks.com
@@ -12,8 +12,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl libjansson.so:devel/jansson \
libxml2.so:textproc/libxml2
RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync
-USES= autoreconf pkgconfig ssl
-USE_GCC= yes
+USES= autoreconf compiler:c11 pkgconfig ssl
USE_GITHUB= yes
USE_RC_SUBR= fort
diff --git a/net/fort/distinfo b/net/fort/distinfo
index 9a35cf2481e2..78a8dec2d000 100644
--- a/net/fort/distinfo
+++ b/net/fort/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634812159
-SHA256 (NICMx-FORT-validator-1.5.2_GH0.tar.gz) = c49b7badcf6dae05b7c9ae9cb3b1514d2b742d868b83f8b8deb0d7ae0a3e6bf2
-SIZE (NICMx-FORT-validator-1.5.2_GH0.tar.gz) = 482094
+TIMESTAMP = 1636471861
+SHA256 (NICMx-FORT-validator-1.5.3_GH0.tar.gz) = a6cfe7a194399e75716d4bb7c39177b6affdcf04e9087a17ec831980d03f71f2
+SIZE (NICMx-FORT-validator-1.5.3_GH0.tar.gz) = 485271
diff --git a/net/freeradius-client/Makefile b/net/freeradius-client/Makefile
index beb03d713eca..4b5761da8a1f 100644
--- a/net/freeradius-client/Makefile
+++ b/net/freeradius-client/Makefile
@@ -15,6 +15,6 @@ INSTALL_TARGET= install-strip
USES= gmake libtool
USE_LDCONFIG= yes
-CONFLICTS= radiusclient-ng-[0-9]*
+CONFLICTS= radiusclient-ng
.include <bsd.port.mk>
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 78d9c1aad02e..08dda79dbb4e 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -1,7 +1,7 @@
# Created by: Alexander Logvinov <avl@FreeBSD.org>
PORTNAME= freerdp
-DISTVERSION= 2.4.0
+DISTVERSION= 2.4.1
CATEGORIES= net comms
MASTER_SITES= https://pub.freerdp.com/releases/ \
https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index 31eb352960c8..74fe2f3f0874 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629080374
-SHA256 (freerdp-2.4.0.tar.gz) = 10ec9b06d74182b354ae288c8e621d94c0fb189b0c3b14a59867ab4c414c08b5
-SIZE (freerdp-2.4.0.tar.gz) = 7244549
+TIMESTAMP = 1635018112
+SHA256 (freerdp-2.4.1.tar.gz) = ef75c87926643a0d0041f6556e343ac037380d4260c64885e7cdd20da0147edf
+SIZE (freerdp-2.4.1.tar.gz) = 7300797
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 13ed899de206..247643828692 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -43,7 +43,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.-release
SHEBANG_FILES= scripts/fsxs.in
-CONFLICTS_BUILD= xmlrpc-c-*
+CONFLICTS_BUILD= xmlrpc-c
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
diff --git a/net/frp/Makefile b/net/frp/Makefile
index f7e183625e73..cf12dbda9e54 100644
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= frp
DISTVERSIONPREFIX= v
-DISTVERSION= 0.37.1
+DISTVERSION= 0.38.0
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
@@ -11,68 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go:modules
-USE_GITHUB= yes
-GH_ACCOUNT= fatedier
-GH_TUPLE= \
- Azure:go-ntlmssp:66371956d46c:azure_go_ntlmssp/vendor/github.com/Azure/go-ntlmssp \
- armon:go-socks5:e75332964ef5:armon_go_socks5/vendor/github.com/armon/go-socks5 \
- beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
- cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
- coreos:go-oidc:v2.2.1:coreos_go_oidc/vendor/github.com/coreos/go-oidc \
- davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
- fatedier:beego:6c6a4f5bd5eb:fatedier_beego/vendor/github.com/fatedier/beego \
- fatedier:golib:1f870741e185:fatedier_golib/vendor/github.com/fatedier/golib \
- fatedier:kcp-go:fe8645b0a904:fatedier_kcp_go/vendor/github.com/fatedier/kcp-go \
- fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
- go-ini:ini:v1.62.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
- go-playground:locales:v0.13.0:go_playground_locales/vendor/github.com/go-playground/locales \
- go-playground:universal-translator:v0.17.0:go_playground_universal_translator/vendor/github.com/go-playground/universal-translator \
- go-playground:validator:v10.6.1:go_playground_validator_v10/vendor/github.com/go-playground/validator/v10 \
- go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
- go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
- go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
- golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
- golang:crypto:5ea612d1eb83:golang_crypto/vendor/golang.org/x/crypto \
- golang:net:89ef3d95e781:golang_net/vendor/golang.org/x/net \
- golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
- golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
- golang:snappy:v0.0.1:golang_snappy/vendor/github.com/golang/snappy \
- golang:sys:59db8d763f22:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
- golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
- google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
- gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \
- gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \
- hashicorp:yamux:259a57b3608c:hashicorp_yamux/vendor/github.com/hashicorp/yamux \
- inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
- klauspost:cpuid:v1.2.0:klauspost_cpuid/vendor/github.com/klauspost/cpuid \
- klauspost:reedsolomon:v1.9.1:klauspost_reedsolomon/vendor/github.com/klauspost/reedsolomon \
- kubernetes:apimachinery:v0.21.2:kubernetes_apimachinery/vendor/k8s.io/apimachinery \
- kubernetes:client-go:v0.21.2:kubernetes_client_go/vendor/k8s.io/client-go \
- leodido:go-urn:v1.2.1:leodido_go_urn/vendor/github.com/leodido/go-urn \
- matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
- nxadm:tail:v1.4.8:nxadm_tail/vendor/github.com/nxadm/tail \
- onsi:ginkgo:v1.16.4:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
- onsi:gomega:v1.13.0:onsi_gomega/vendor/github.com/onsi/gomega \
- pires:go-proxyproto:v0.5.0:pires_go_proxyproto/vendor/github.com/pires/go-proxyproto \
- pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
- pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
- pquerna:cachecontrol:1555304b9b35:pquerna_cachecontrol/vendor/github.com/pquerna/cachecontrol \
- prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
- prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
- prometheus:common:v0.26.0:prometheus_common/vendor/github.com/prometheus/common \
- prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
- protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
- rakyll:statik:v0.1.1:rakyll_statik/vendor/github.com/rakyll/statik \
- rodaine:table:v1.0.1:rodaine_table/vendor/github.com/rodaine/table \
- spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
- spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
- square:go-jose:v2.4.1:square_go_jose/vendor/gopkg.in/square/go-jose.v2 \
- stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
- templexxx:cpufeat:3794dfbfb047:templexxx_cpufeat/vendor/github.com/templexxx/cpufeat \
- templexxx:xor:0af8e873c554:templexxx_xor/vendor/github.com/templexxx/xor \
- tjfoc:gmsm:98aa888b79d8:tjfoc_gmsm/vendor/github.com/tjfoc/gmsm \
- xtaci:lossyconn:8df528c0c9ae:xtaci_lossyconn/vendor/github.com/xtaci/lossyconn
+GO_MODULE= github.com/fatedier/frp
GO_TARGET= ./cmd/frpc ./cmd/frps
USER= nobody
diff --git a/net/frp/distinfo b/net/frp/distinfo
index d72b14f856c1..aa37310ae826 100644
--- a/net/frp/distinfo
+++ b/net/frp/distinfo
@@ -1,121 +1,5 @@
-TIMESTAMP = 1628047312
-SHA256 (fatedier-frp-v0.37.1_GH0.tar.gz) = e2c1f93d504ae3bbe3407aaec43efa5c5f09b6d1a35306b58808c4f36b53f396
-SIZE (fatedier-frp-v0.37.1_GH0.tar.gz) = 1923094
-SHA256 (Azure-go-ntlmssp-66371956d46c_GH0.tar.gz) = 24b46602ef1adae845ec6938550d14ce9a93b4f2171201af0a29da421b611139
-SIZE (Azure-go-ntlmssp-66371956d46c_GH0.tar.gz) = 8131
-SHA256 (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 37f9cad3e321c452ea54824021ecd5b6ef4222c68b25f9c8a66a0c6d8411437e
-SIZE (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 8586
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
-SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
-SHA256 (coreos-go-oidc-v2.2.1_GH0.tar.gz) = e9a5b72b34e4657f526bb85d11b9afc05e84418a430713844a6aa3365b4373d0
-SIZE (coreos-go-oidc-v2.2.1_GH0.tar.gz) = 24136
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (fatedier-beego-6c6a4f5bd5eb_GH0.tar.gz) = eb20eb3691a2e3f0bee9efb2373c09a5ee5338402ef40bfcd9d758d54a901ed1
-SIZE (fatedier-beego-6c6a4f5bd5eb_GH0.tar.gz) = 266428
-SHA256 (fatedier-golib-1f870741e185_GH0.tar.gz) = e5bcb8b5722d4a577c47b24bfb29e3cba063fa59b271811871c5e58e83607bb0
-SIZE (fatedier-golib-1f870741e185_GH0.tar.gz) = 16230
-SHA256 (fatedier-kcp-go-fe8645b0a904_GH0.tar.gz) = e4d065e49917c0f4d9c69e0620fed440bab86454aafb5e5cb5863403c14562cf
-SIZE (fatedier-kcp-go-fe8645b0a904_GH0.tar.gz) = 135805
-SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
-SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
-SHA256 (go-ini-ini-v1.62.0_GH0.tar.gz) = 926ca2ff49018dc5c0991f3a790bc2083a3c52c470167d42f0f0bcd6642ff64e
-SIZE (go-ini-ini-v1.62.0_GH0.tar.gz) = 50314
-SHA256 (go-playground-locales-v0.13.0_GH0.tar.gz) = 046a2f8c6011d050bedc67a34f8c577238abe4db91f3da9dfdd3d74565f08512
-SIZE (go-playground-locales-v0.13.0_GH0.tar.gz) = 4225718
-SHA256 (go-playground-universal-translator-v0.17.0_GH0.tar.gz) = a029ec247ca60b39bbc7d447b845a604a7ad00a8b7e52abea9e362db1b4fae88
-SIZE (go-playground-universal-translator-v0.17.0_GH0.tar.gz) = 36838
-SHA256 (go-playground-validator-v10.6.1_GH0.tar.gz) = 7320367b4d64ab9665dc1c35651dedd77ab5d3b381d58ac3b9bb7472bd7206bd
-SIZE (go-playground-validator-v10.6.1_GH0.tar.gz) = 178351
-SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
-SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
-SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
-SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
-SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
-SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
-SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
-SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
-SHA256 (golang-crypto-5ea612d1eb83_GH0.tar.gz) = ab4d88d6121195632d006705a950adebaf4fa99dd15ea0c508297a17c5d3277e
-SIZE (golang-crypto-5ea612d1eb83_GH0.tar.gz) = 1726242
-SHA256 (golang-net-89ef3d95e781_GH0.tar.gz) = af0ad30ddac9b752cc156b88d8db6a49ac252629b4ce69e7de39b9989f9f7e27
-SIZE (golang-net-89ef3d95e781_GH0.tar.gz) = 1247563
-SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
-SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-snappy-v0.0.1_GH0.tar.gz) = b1d97f47fcb61cb0cdd54bc424eda980c47838effb0ec9e322506514a50fee85
-SIZE (golang-snappy-v0.0.1_GH0.tar.gz) = 62605
-SHA256 (golang-sys-59db8d763f22_GH0.tar.gz) = 6750e53436faf4b1552ec2ad79f3709b631e6111cc392b4620afd58a34d5f755
-SIZE (golang-sys-59db8d763f22_GH0.tar.gz) = 1201561
-SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
-SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
-SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
-SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656
-SHA256 (google-uuid-v1.2.0_GH0.tar.gz) = 53ba896ce398435b3ba4f9375f5d4908b09c79daaa54ecd4e5000b7bef984380
-SIZE (google-uuid-v1.2.0_GH0.tar.gz) = 14158
-SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b
-SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517
-SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84
-SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101
-SHA256 (hashicorp-yamux-259a57b3608c_GH0.tar.gz) = d7da421aeb947b80c4b56aea4120ae1679f4eae88f2d5e70b7e71a4408c21af9
-SIZE (hashicorp-yamux-259a57b3608c_GH0.tar.gz) = 24823
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (klauspost-cpuid-v1.2.0_GH0.tar.gz) = aa29ebcf12669eef96c7c54b551617b90b65c55d126ef0ff9fbacd605e738a67
-SIZE (klauspost-cpuid-v1.2.0_GH0.tar.gz) = 278872
-SHA256 (klauspost-reedsolomon-v1.9.1_GH0.tar.gz) = 3e67fb70380ae949a50159b7347eb24ab9160258b768de9ab32fa7df4d351bea
-SIZE (klauspost-reedsolomon-v1.9.1_GH0.tar.gz) = 159389
-SHA256 (kubernetes-apimachinery-v0.21.2_GH0.tar.gz) = b1dfd57ea84b0a30857d2e8d1784f18220d1873eb82990162415cbfbd2f0de08
-SIZE (kubernetes-apimachinery-v0.21.2_GH0.tar.gz) = 545707
-SHA256 (kubernetes-client-go-v0.21.2_GH0.tar.gz) = ff813230c547be13e291445338c4aca2b6064ea54a3ad55b4a0fd05a077c1c0c
-SIZE (kubernetes-client-go-v0.21.2_GH0.tar.gz) = 928316
-SHA256 (leodido-go-urn-v1.2.1_GH0.tar.gz) = b3d5bf4aa0eca3cf0e228267697b58c6d7bab5f3a154ac0bb0f3dcb7d1b2f2ce
-SIZE (leodido-go-urn-v1.2.1_GH0.tar.gz) = 1102833
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (nxadm-tail-v1.4.8_GH0.tar.gz) = 8208362046819275a0809000dceacbd7b2a7caa07bcd6547dd2ff9b2104fa56c
-SIZE (nxadm-tail-v1.4.8_GH0.tar.gz) = 1255770
-SHA256 (onsi-ginkgo-v1.16.4_GH0.tar.gz) = f4b9e08e035f5521a4572ce7bb534a3ba0d3c90b0a2d1ae84b9359d59b6ca486
-SIZE (onsi-ginkgo-v1.16.4_GH0.tar.gz) = 164036
-SHA256 (onsi-gomega-v1.13.0_GH0.tar.gz) = 4bd0dd71e94ce069628ea705f06701460cf057b026b2b341ee44ab1b30ef9f59
-SIZE (onsi-gomega-v1.13.0_GH0.tar.gz) = 127839
-SHA256 (pires-go-proxyproto-v0.5.0_GH0.tar.gz) = d23df3a6b9eeed9c35b85ba558cdcd57a6867de37f481b2a6df727bebd9aa909
-SIZE (pires-go-proxyproto-v0.5.0_GH0.tar.gz) = 34787
-SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
-SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (pquerna-cachecontrol-1555304b9b35_GH0.tar.gz) = 3611cc14c2de3c0f2df51d98d440673b32f6a906de213098abbdb0bb5eed6919
-SIZE (pquerna-cachecontrol-1555304b9b35_GH0.tar.gz) = 18998
-SHA256 (prometheus-client_golang-v1.11.0_GH0.tar.gz) = a3bc3312bde4182e507042ca0e7ca88aac6656bbf8d516d732e34c3f14bb612a
-SIZE (prometheus-client_golang-v1.11.0_GH0.tar.gz) = 168706
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.26.0_GH0.tar.gz) = 35cfd6f896655c848042802652394cc9da57ef01437f0d78bffb85a467f62a1b
-SIZE (prometheus-common-v0.26.0_GH0.tar.gz) = 116907
-SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
-SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
-SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
-SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
-SHA256 (rakyll-statik-v0.1.1_GH0.tar.gz) = c68ef3120a22bcf5bd5e8391db3507baeefc7047aa6539053229885287d0beb3
-SIZE (rakyll-statik-v0.1.1_GH0.tar.gz) = 78276
-SHA256 (rodaine-table-v1.0.1_GH0.tar.gz) = d885a54d49c5998b8665e8fb80d9eba9312e156a588104757083d47276babcc1
-SIZE (rodaine-table-v1.0.1_GH0.tar.gz) = 6297
-SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa
-SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580
-SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808
-SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796
-SHA256 (square-go-jose-v2.4.1_GH0.tar.gz) = b675a128c23f9181f9779f74631a442bbe93f24e18aef5b161788019c4445dac
-SIZE (square-go-jose-v2.4.1_GH0.tar.gz) = 304063
-SHA256 (stretchr-testify-v1.7.0_GH0.tar.gz) = 560c0984072cb436b17bbce5699b205d5aa2beb58ef7a94530d7724b5739a8d6
-SIZE (stretchr-testify-v1.7.0_GH0.tar.gz) = 91073
-SHA256 (templexxx-cpufeat-3794dfbfb047_GH0.tar.gz) = 2b8fa227849664aa0816beb7ecf87d341e46b549f52d5486de6cb230bc2703ef
-SIZE (templexxx-cpufeat-3794dfbfb047_GH0.tar.gz) = 2833
-SHA256 (templexxx-xor-0af8e873c554_GH0.tar.gz) = 7d96c3c370c160f46c0e091629f19f3f1b24fd6fde2ec1b1b24ef5d9751dfb16
-SIZE (templexxx-xor-0af8e873c554_GH0.tar.gz) = 6426
-SHA256 (tjfoc-gmsm-98aa888b79d8_GH0.tar.gz) = 1a08a9eb73d0f65e3391c1570e1ba04b840124ff80c564c79511a46042c111f0
-SIZE (tjfoc-gmsm-98aa888b79d8_GH0.tar.gz) = 59384
-SHA256 (xtaci-lossyconn-8df528c0c9ae_GH0.tar.gz) = 73c12a93e5a51834890a2308238d72f42742d61159ffbdb58fe728e9a6796b10
-SIZE (xtaci-lossyconn-8df528c0c9ae_GH0.tar.gz) = 5320
+TIMESTAMP = 1636274131
+SHA256 (go/net_frp/frp-v0.38.0/v0.38.0.mod) = 938edacbda2aa53e915845d537a9a446ac3736ecff95b19fa8abbf2f1c7566e2
+SIZE (go/net_frp/frp-v0.38.0/v0.38.0.mod) = 1701
+SHA256 (go/net_frp/frp-v0.38.0/v0.38.0.zip) = 8999b5df0081fd2054f21e7dc3cfab6b35fdb578ce0c9c314cc3f55aae276b2b
+SIZE (go/net_frp/frp-v0.38.0/v0.38.0.zip) = 1329637
diff --git a/net/frr7/Makefile b/net/frr7/Makefile
index ec5061be54f4..245eb1cf956d 100644
--- a/net/frr7/Makefile
+++ b/net/frr7/Makefile
@@ -1,7 +1,7 @@
PORTNAME= frr
PORTVERSION= 7.5.1
DISTVERSIONPREFIX= frr-
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
.if defined(PYTHONTOOLS)
PKGNAMESUFFIX= 7-pythontools
diff --git a/net/frr7/files/patch-yang_frr-zebra.yang.patch b/net/frr7/files/patch-yang_frr-zebra.yang.patch
new file mode 100644
index 000000000000..7ee309e0570b
--- /dev/null
+++ b/net/frr7/files/patch-yang_frr-zebra.yang.patch
@@ -0,0 +1,68 @@
+From 7573cb86a259d3c9ef6eae9dd5d529f8080922cd Mon Sep 17 00:00:00 2001
+From: Igor Ryzhov <iryzhov@nfware.com>
+Date: Thu, 22 Apr 2021 12:48:19 +0300
+Subject: [PATCH] yang: fix zebra module
+
+Fixes: #8521
+Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
+---
+ yang/frr-zebra.yang | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git yang/frr-zebra.yang yang/frr-zebra.yang
+index 2efc45c1464..6b4be659152 100644
+--- yang/frr-zebra.yang
++++ yang/frr-zebra.yang
+@@ -2184,8 +2184,8 @@ module frr-zebra {
+ + "/frr-route-map:match-condition"
+ + "/frr-route-map:condition-value" {
+ case ipv4-prefix-length {
+- when "./condition = 'ipv4-prefix-length' or
+- ./condition = 'ipv4-next-hop-prefix-length'";
++ when "./frr-route-map:condition = 'ipv4-prefix-length' or
++ ./frr-route-map:condition = 'ipv4-next-hop-prefix-length'";
+ leaf ipv4-prefix-length {
+ type uint8 {
+ range "0..32";
+@@ -2193,7 +2193,7 @@ module frr-zebra {
+ }
+ }
+ case ipv6-prefix-length {
+- when "./condition = 'ipv6-prefix-length'";
++ when "./frr-route-map:condition = 'ipv6-prefix-length'";
+ leaf ipv6-prefix-length {
+ type uint8 {
+ range "0..128";
+@@ -2201,13 +2201,13 @@ module frr-zebra {
+ }
+ }
+ case source-protocol {
+- when "./condition = 'source-protocol'";
++ when "./frr-route-map:condition = 'source-protocol'";
+ leaf source-protocol {
+ type frr-route-types:frr-route-types;
+ }
+ }
+ case source-instance {
+- when "./condition = 'source-instance'";
++ when "./frr-route-map:condition = 'source-instance'";
+ leaf source-instance {
+ type uint8 {
+ range "0..255";
+@@ -2222,14 +2222,14 @@ module frr-zebra {
+ + "/frr-route-map:set-action"
+ + "/frr-route-map:action-value" {
+ case source-v4 {
+- when "./action = 'source'";
++ when "./frr-route-map:action = 'source'";
+ leaf source-v4 {
+ description "IPv4 address";
+ type inet:ipv4-address;
+ }
+ }
+ case source-v6 {
+- when "./action = 'source'";
++ when "./frr-route-map:action = 'source'";
+ leaf source-v6 {
+ description "IPv6 address";
+ type inet:ipv6-address;
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index 881aa5c54298..04722889de15 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= SF
MAINTAINER= cy@FreeBSD.org
COMMENT= Ftp-like client for the FSP service
-CONFLICTS_INSTALL= alliance-*
+CONFLICTS_INSTALL= alliance
USES= tar:bzip2 scons
MAKE_ARGS= prefix=${PREFIX}
diff --git a/net/gemserv/Makefile b/net/gemserv/Makefile
index f67d0ad2a1b6..308919909b69 100644
--- a/net/gemserv/Makefile
+++ b/net/gemserv/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gemserv
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= https://git.sr.ht/~int80h/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
DISTFILES= ${PORTNAME}-${DISTVERSIONPREFIX}${PORTVERSION}${EXTRACT_SUFX}
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index c02a0831a871..0ee86878b082 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,7 +1,7 @@
# Created by: Matthias Fechner <mfechner@FreeBSD.org>
PORTNAME= gitlab-agent
-PORTVERSION= 14.3.3
+PORTVERSION= 14.4.0
PORTREVISION= 0
CATEGORIES= net
@@ -19,12 +19,12 @@ USES= go:modules
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org/cluster-integration
# Find the commit hash here: https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/tags
-GL_COMMIT= 80c75d64b933d306966baba139f4b99301bd50a1
+GL_COMMIT= 8b11694dd188b58234e776e3b0bad604145041b3
# for go dependencies
USE_GITHUB= nodefault
# generated with: make gomod-vendor
-# 195dd
+# 194dd
GH_TUPLE= \
Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \
Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \
@@ -92,15 +92,15 @@ GH_TUPLE= \
golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
golang:mock:v1.6.0:golang_mock/vendor/github.com/golang/mock \
golang:mod:v0.4.2:golang_mod/vendor/golang.org/x/mod \
- golang:net:0714010a04ed:golang_net/vendor/golang.org/x/net \
+ golang:net:aaa1db679c0d:golang_net/vendor/golang.org/x/net \
golang:oauth2:6f1e6394065a:golang_oauth2/vendor/golang.org/x/oauth2 \
golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
- golang:sys:e5e7981a1069:golang_sys/vendor/golang.org/x/sys \
+ golang:sys:d867a43fc93e:golang_sys/vendor/golang.org/x/sys \
golang:term:6a3ed077a48d:golang_term/vendor/golang.org/x/term \
golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
golang:time:1f47c861a9ac:golang_time/vendor/golang.org/x/time \
- golang:tools:v0.1.4:golang_tools/vendor/golang.org/x/tools \
+ golang:tools:v0.1.7:golang_tools/vendor/golang.org/x/tools \
golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \
google:go-cmp:v0.5.6:google_go_cmp/vendor/github.com/google/go-cmp \
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index d522cc536eec..e8cefbbc7cbe 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1632235221
+TIMESTAMP = 1634896538
SHA256 (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = ee1ebe2efef498be1c558bf71e143289db2d21e2d42592503ad2d4a989006821
SIZE (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = 20946
SHA256 (Azure-go-autorest-79a63e70c4d8_GH0.tar.gz) = d7156c20c47fcd04edae683e718a1e72dcb9178a3b07e6c18615cee5b1dd67d6
@@ -131,24 +131,24 @@ SHA256 (golang-mock-v1.6.0_GH0.tar.gz) = 470174971c3a63361149a30f5b2d3a716a198af
SIZE (golang-mock-v1.6.0_GH0.tar.gz) = 69251
SHA256 (golang-mod-v0.4.2_GH0.tar.gz) = ce4131eb443ac67ededb139a43bae4fbb2c4b84843936495c6a6de92b8033917
SIZE (golang-mod-v0.4.2_GH0.tar.gz) = 104584
-SHA256 (golang-net-0714010a04ed_GH0.tar.gz) = 62ba863366262fbbc211a65b1301f7fcf75f5f710fd979c27607af49ea51ba21
-SIZE (golang-net-0714010a04ed_GH0.tar.gz) = 1250017
+SHA256 (golang-net-aaa1db679c0d_GH0.tar.gz) = 7215c0c172218c3e51137422a39790f6921cb4e62d01437ff4d59beab48aa966
+SIZE (golang-net-aaa1db679c0d_GH0.tar.gz) = 1253118
SHA256 (golang-oauth2-6f1e6394065a_GH0.tar.gz) = 260cf2761fb6e0aae005d4b40e05fcf34a9269f1dc54dd520debf7c750ff66bf
SIZE (golang-oauth2-6f1e6394065a_GH0.tar.gz) = 84251
SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-e5e7981a1069_GH0.tar.gz) = 7b3cfa7b3f60212105dcfb744f9fa9f5ddbfff29b45347c8a8fa6e7d64ab8455
-SIZE (golang-sys-e5e7981a1069_GH0.tar.gz) = 1202976
+SHA256 (golang-sys-d867a43fc93e_GH0.tar.gz) = 975cb1564c51481d205cb4ee0f311429347ea345d96188a7db5e846deb2e6f10
+SIZE (golang-sys-d867a43fc93e_GH0.tar.gz) = 1203125
SHA256 (golang-term-6a3ed077a48d_GH0.tar.gz) = 6760076add528b90a5e07ad357eef6f11ec03e19eebe66d1b1ef383fd9214e9a
SIZE (golang-term-6a3ed077a48d_GH0.tar.gz) = 15333
SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
SHA256 (golang-time-1f47c861a9ac_GH0.tar.gz) = 2548d6d6813621c77fa36a5783e36939d3f4427d962ba58415645f89fcb70925
SIZE (golang-time-1f47c861a9ac_GH0.tar.gz) = 9533
-SHA256 (golang-tools-v0.1.4_GH0.tar.gz) = a97b750bb373bf051ea26889570b01cfa08380656c766a4856da7c7f55a7c1bd
-SIZE (golang-tools-v0.1.4_GH0.tar.gz) = 2822942
+SHA256 (golang-tools-v0.1.7_GH0.tar.gz) = b88cae9ca14fc3f18ff714c8014929c8c2c63d15805416d49d88b51f201e9fbf
+SIZE (golang-tools-v0.1.7_GH0.tar.gz) = 2884220
SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
SHA256 (google-btree-v1.0.0_GH0.tar.gz) = 9f53e0e1330a4dbe92100d516606791f7196bf828ba93d693ef4d5c1cbd5fe30
@@ -379,8 +379,8 @@ SHA256 (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = c178bcad325857dba29551c16f40707701a
SIZE (uber-jaeger-lib-v2.4.1_GH0.tar.gz) = 38010
SHA256 (xlab-treeprint-v1.0.0_GH0.tar.gz) = 95659f235a30a28fd54e8f7226e8e200ec3344568493d6c2a3efc60667f37c2c
SIZE (xlab-treeprint-v1.0.0_GH0.tar.gz) = 6549
-SHA256 (gitlab-org/cluster-integration-gitlab-agent-80c75d64b933d306966baba139f4b99301bd50a1_GL0.tar.gz) = 1820f159c8aef805a1d3005ec61c4ff2b3bb5e13c1efbec2316cde9c9384b13e
-SIZE (gitlab-org/cluster-integration-gitlab-agent-80c75d64b933d306966baba139f4b99301bd50a1_GL0.tar.gz) = 496028
+SHA256 (gitlab-org/cluster-integration-gitlab-agent-8b11694dd188b58234e776e3b0bad604145041b3_GL0.tar.gz) = 5635340d956b89f47206baed219e5d36e841e05b02e4d6a05a36c5d6565b09fb
+SIZE (gitlab-org/cluster-integration-gitlab-agent-8b11694dd188b58234e776e3b0bad604145041b3_GL0.tar.gz) = 502754
SHA256 (gitlab-org-gitaly-31bbf1c0f7cd100c63f44f52a14575da1579276a_GL0.tar.gz) = ab01d1c8eae20d66f6e2b6fa250d736161903e533e88b6988d95d5772f997308
SIZE (gitlab-org-gitaly-31bbf1c0f7cd100c63f44f52a14575da1579276a_GL0.tar.gz) = 3625365
SHA256 (gitlab-org-labkit-56e2f8af39d9bea0f038a8d2135a1cc89016c62a_GL0.tar.gz) = aa2ff5039452d633f2310b9e497b0f4fc9a9118eed2200f2045305b963893e6b
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 7569a8ed00dc..3a60266fd62b 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -42,4 +42,12 @@ DMAP_DESC= DMAP (DAAP, DPAP & DACP) support with libdmapsharing
DMAP_MESON_YES= enable-dmap
DMAP_LIB_DEPENDS= libdmapsharing-3.0.so:net/libdmapsharing
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MTRACKER}
+PLIST_SUB+= TRACKER="@comment "
+.else
+PLIST_SUB+= TRACKER=""
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/grilo-plugins/pkg-plist b/net/grilo-plugins/pkg-plist
index 4f49bcf2c6a2..36e4333336c9 100644
--- a/net/grilo-plugins/pkg-plist
+++ b/net/grilo-plugins/pkg-plist
@@ -15,7 +15,7 @@ lib/grilo-0.3/libgrlraitv.so
lib/grilo-0.3/libgrlshoutcast.so
lib/grilo-0.3/libgrlthetvdb.so
lib/grilo-0.3/libgrltmdb.so
-lib/grilo-0.3/libgrltracker.so
+%%TRACKER%%lib/grilo-0.3/libgrltracker.so
lib/grilo-0.3/libgrlyoutube.so
libdata/pkgconfig/grilo-plugins-0.3.pc
share/help/C/examples/example-tmdb.c
diff --git a/net/grilo/pkg-plist b/net/grilo/pkg-plist
index 9ac96e1c3cff..b081d1411605 100644
--- a/net/grilo/pkg-plist
+++ b/net/grilo/pkg-plist
@@ -45,6 +45,7 @@ share/gir-1.0/Grl-0.3.gir
share/gir-1.0/GrlNet-0.3.gir
share/gir-1.0/GrlPls-0.3.gir
share/locale/as/LC_MESSAGES/grilo.mo
+share/locale/be/LC_MESSAGES/grilo.mo
share/locale/bg/LC_MESSAGES/grilo.mo
share/locale/bs/LC_MESSAGES/grilo.mo
share/locale/ca/LC_MESSAGES/grilo.mo
diff --git a/net/gupnp-tools/Makefile b/net/gupnp-tools/Makefile
index 29551c476310..dc5650d2d4c7 100644
--- a/net/gupnp-tools/Makefile
+++ b/net/gupnp-tools/Makefile
@@ -1,8 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= gupnp-tools
-PORTVERSION= 0.10.1
-PORTREVISION= 1
+PORTVERSION= 0.10.2
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gupnp-tools/distinfo b/net/gupnp-tools/distinfo
index 1bae5eef7d2c..7c593d50d46b 100644
--- a/net/gupnp-tools/distinfo
+++ b/net/gupnp-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625585420
-SHA256 (gupnp-tools-0.10.1.tar.xz) = 4ea96d167462b3a548efc4fc4ea089fe518d7d29be349d1cce8982b9ffb53b4a
-SIZE (gupnp-tools-0.10.1.tar.xz) = 178164
+TIMESTAMP = 1637519824
+SHA256 (gupnp-tools-0.10.2.tar.xz) = 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c
+SIZE (gupnp-tools-0.10.2.tar.xz) = 181020
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 548dfcd4e3fe..c777360a415a 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -20,13 +20,14 @@ LIB_DEPENDS= libgssdp-1.2.so:net/gssdp \
libuuid.so:misc/e2fsprogs-libuuid
USES= compiler:c11 cpe gnome meson pkgconfig python:run shebangfix tar:xz
-CPE_VENDOR= gnome
USE_GNOME= glib20 introspection:build libxml2
MESON_ARGS= -Dexamples=false -Dgtk_doc=false -Dintrospection=true
USE_CSTD= c11
USE_LDCONFIG= yes
+CPE_VENDOR= gnome
+
SHEBANG_FILES= tools/gupnp-binding-tool-1.2
OPTIONS_DEFINE= VAPI
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 780c44320ea1..0843de3e7be9 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -1,7 +1,7 @@
# Created by: Hugo Saro <hugo@barafranca.com>
PORTNAME= haproxy
-DISTVERSION= 2.5-dev10
+DISTVERSION= 2.5-dev13
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/2.5/src/devel/
PKGNAMESUFFIX= -devel
@@ -13,7 +13,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index d0c716a770bf..1fdd26df2170 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634395612
-SHA256 (haproxy-2.5-dev10.tar.gz) = c0f04264e6d784b0e8c19a4051f6f5e6f2ed65ac3b84705d40465f122f6eaf20
-SIZE (haproxy-2.5-dev10.tar.gz) = 3767461
+TIMESTAMP = 1636222546
+SHA256 (haproxy-2.5-dev13.tar.gz) = 02dcce857697fd90b9fa070c2be26964ced1e32c13361fa0b606c9c9f62775ec
+SIZE (haproxy-2.5-dev13.tar.gz) = 3786531
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index 0d2754938a4b..d856dd2a4783 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -29,8 +29,11 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/gpl.txt
%%PORTDOCS%%%%DOCSDIR%%/haproxy.1
%%PORTDOCS%%%%DOCSDIR%%/internals/acl.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/buffer-api.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/filters.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/htx-api.txt
+%%PORTDOCS%%%%DOCSDIR%%/internals/api/initcalls.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/body-parsing.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/buffer-api.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connect-status.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connection-header.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/connection-scale.txt
@@ -40,15 +43,12 @@ sbin/haproxy
%%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg
%%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/fd-migration.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/filters.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/http-docs.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/http-parsing.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/htx-api.txt
-%%PORTDOCS%%%%DOCSDIR%%/internals/initcalls.txt
%%PORTDOCS%%%%DOCSDIR%%/internals/list.fig
%%PORTDOCS%%%%DOCSDIR%%/internals/list.png
%%PORTDOCS%%%%DOCSDIR%%/internals/listener-states.fig
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 94b3b9ec6195..20fb5b3e1d8a 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -1,7 +1,7 @@
# Created by: Hugo Saro <hugo@barafranca.com>
PORTNAME= haproxy
-DISTVERSION= 2.4.7
+DISTVERSION= 2.4.9
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/2.4/src/
@@ -18,7 +18,7 @@ default_CONFLICTS_INSTALL= haproxy-lua
lua_CONFLICTS_INSTALL= haproxy
lua_PKGNAMESUFFIX= -lua
-CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index a473f0a4c758..cbe087cb50a9 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633352910
-SHA256 (haproxy-2.4.7.tar.gz) = 52af97f72f22ffd8a7a995fafc696291d37818feda50a23caef7dc0622421845
-SIZE (haproxy-2.4.7.tar.gz) = 3594183
+TIMESTAMP = 1637752468
+SHA256 (haproxy-2.4.9.tar.gz) = d56c7fe3c5afedd1b9a19e1b7f8f954feaf50a9c2f205f99891043858b72a763
+SIZE (haproxy-2.4.9.tar.gz) = 3604655
diff --git a/net/haproxy/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat b/net/haproxy/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat
new file mode 100644
index 000000000000..e6f0291f8c89
--- /dev/null
+++ b/net/haproxy/files/patch-0001-CLEANUP-servers-do-not-include-openssl-compat
@@ -0,0 +1,78 @@
+From ce5ca630697a069ffbd81169663e5dbeb554179a Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Wed, 6 Oct 2021 11:23:32 +0200
+Subject: CLEANUP: servers: do not include openssl-compat
+
+This is exactly the same as for listeners, servers only include
+openssl-compat to provide the SSL_CTX type to use as two pointers to
+contexts, and to detect if NPN, ALPN, and cipher suites are supported,
+and save up to 5 pointers in the ssl_ctx struct if not supported. This
+is pointless, as these ones have all been supported for about a decade,
+and including this file comes with a long dependency chain that impacts
+lots of other files. The ctx was made a void*.
+
+Now the build time was significantly reduced, from 9.2 to 8.1 seconds,
+thanks to opensslconf.h being included "only" 456 times instead of 2424
+previously!
+
+The total number of lines of code compiled was reduced by 15%.
+
+(cherry picked from commit 340ef2502eae2a37781e460d3590982c0e437fbd)
+[wt: this is backported to get rid of the painful #ifdef around SSL
+ fields that regularly break backports]
+Signed-off-by: Willy Tarreau <w@1wt.eu>
+---
+ include/haproxy/server-t.h | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
+index 429195388..32b649bf3 100644
+--- include/haproxy/server-t.h
++++ include/haproxy/server-t.h
+@@ -35,9 +35,7 @@
+ #include <haproxy/freq_ctr-t.h>
+ #include <haproxy/listener-t.h>
+ #include <haproxy/obj_type-t.h>
+-#include <haproxy/openssl-compat.h>
+ #include <haproxy/resolvers-t.h>
+-#include <haproxy/ssl_sock-t.h>
+ #include <haproxy/stats-t.h>
+ #include <haproxy/task-t.h>
+ #include <haproxy/thread-t.h>
+@@ -341,7 +339,7 @@ struct server {
+ #ifdef USE_OPENSSL
+ char *sni_expr; /* Temporary variable to store a sample expression for SNI */
+ struct {
+- SSL_CTX *ctx;
++ void *ctx;
+ struct {
+ unsigned char *ptr;
+ int size;
+@@ -353,9 +351,7 @@ struct server {
+ __decl_thread(HA_RWLOCK_T lock); /* lock the cache and SSL_CTX during commit operations */
+
+ char *ciphers; /* cipher suite to use if non-null */
+-#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
+ char *ciphersuites; /* TLS 1.3 cipher suite to use if non-null */
+-#endif
+ int options; /* ssl options */
+ int verify; /* verify method (set of SSL_VERIFY_* flags) */
+ struct tls_version_filter methods; /* ssl methods */
+@@ -363,14 +359,10 @@ struct server {
+ char *ca_file; /* CAfile to use on verify */
+ char *crl_file; /* CRLfile to use on verify */
+ struct sample_expr *sni; /* sample expression for SNI */
+-#ifdef OPENSSL_NPN_NEGOTIATED
+ char *npn_str; /* NPN protocol string */
+ int npn_len; /* NPN protocol string length */
+-#endif
+-#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+ char *alpn_str; /* ALPN protocol string */
+ int alpn_len; /* ALPN protocol string length */
+-#endif
+ } ssl_ctx;
+ #ifdef USE_QUIC
+ struct quic_transport_params quic_params; /* QUIC transport parameters */
+--
+2.28.0
+
diff --git a/net/haproxy/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se b/net/haproxy/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se
new file mode 100644
index 000000000000..8e5064790cba
--- /dev/null
+++ b/net/haproxy/files/patch-0002-CLEANUP-server-always-include-the-storage-for-SSL-se
@@ -0,0 +1,163 @@
+From 6d395b766fd816cf2e7feea3286a689e635e35f9 Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Wed, 6 Oct 2021 14:48:37 +0200
+Subject: CLEANUP: server: always include the storage for SSL settings
+
+The SSL stuff in struct server takes less than 3% of it and requires
+lots of annoying ifdefs in the code just to take care of the cases
+where the field is absent. Let's get rid of this and stop including
+openssl-compat from server.c to detect NPN and ALPN capabilities.
+
+This reduces the total LoC by another 0.4%.
+
+(cherry picked from commit 80527bcb9d51d8506c8e7ef95de9c30d30722719)
+Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
+(cherry picked from commit 5279e61cee28b7012619906048edd2c8a9c89059)
+[wt: backported again to fix backport issues around SSL fields. It
+ previously broke due to the absence of 'CLEANUP: servers: do not
+ include openssl-compat' that was backported now]
+Signed-off-by: Willy Tarreau <w@1wt.eu>
+---
+ include/haproxy/server-t.h | 2 --
+ src/server.c | 21 +++------------------
+ 2 files changed, 3 insertions(+), 20 deletions(-)
+
+diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
+index 32b649bf3..90485f0c4 100644
+--- include/haproxy/server-t.h
++++ include/haproxy/server-t.h
+@@ -336,7 +336,6 @@ struct server {
+ unsigned int init_addr_methods; /* initial address setting, 3-bit per method, ends at 0, enough to store 10 entries */
+ enum srv_log_proto log_proto; /* used proto to emit messages on server lines from ring section */
+
+-#ifdef USE_OPENSSL
+ char *sni_expr; /* Temporary variable to store a sample expression for SNI */
+ struct {
+ void *ctx;
+@@ -367,7 +366,6 @@ struct server {
+ #ifdef USE_QUIC
+ struct quic_transport_params quic_params; /* QUIC transport parameters */
+ struct eb_root cids; /* QUIC connections IDs. */
+-#endif
+ #endif
+ struct resolv_srvrq *srvrq; /* Pointer representing the DNS SRV requeest, if any */
+ struct list srv_rec_item; /* to attach server to a srv record item */
+diff --git a/src/server.c b/src/server.c
+index 54637dc9c..ea3271957 100644
+--- src/server.c
++++ src/server.c
+@@ -1943,7 +1943,6 @@ const char *server_parse_maxconn_change_request(struct server *sv,
+ return NULL;
+ }
+
+-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+ static struct sample_expr *srv_sni_sample_parse_expr(struct server *srv, struct proxy *px,
+ const char *file, int linenum, char **err)
+ {
+@@ -1983,7 +1982,6 @@ static int server_parse_sni_expr(struct server *newsrv, struct proxy *px, char *
+
+ return 0;
+ }
+-#endif
+
+ static void display_parser_err(const char *file, int linenum, char **args, int cur_arg, int err_code, char **err)
+ {
+@@ -2080,14 +2078,11 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
+ if (src->ssl_ctx.methods.max)
+ srv->ssl_ctx.methods.max = src->ssl_ctx.methods.max;
+
+-#ifdef HAVE_SSL_CTX_SET_CIPHERSUITES
+ if (src->ssl_ctx.ciphersuites != NULL)
+ srv->ssl_ctx.ciphersuites = strdup(src->ssl_ctx.ciphersuites);
+-#endif
+ if (src->sni_expr != NULL)
+ srv->sni_expr = strdup(src->sni_expr);
+
+-#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
+ if (src->ssl_ctx.alpn_str) {
+ srv->ssl_ctx.alpn_str = malloc(src->ssl_ctx.alpn_len);
+ if (srv->ssl_ctx.alpn_str) {
+@@ -2096,8 +2091,7 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
+ srv->ssl_ctx.alpn_len = src->ssl_ctx.alpn_len;
+ }
+ }
+-#endif
+-#ifdef OPENSSL_NPN_NEGOTIATED
++
+ if (src->ssl_ctx.npn_str) {
+ srv->ssl_ctx.npn_str = malloc(src->ssl_ctx.npn_len);
+ if (srv->ssl_ctx.npn_str) {
+@@ -2106,7 +2100,6 @@ static void srv_ssl_settings_cpy(struct server *srv, struct server *src)
+ srv->ssl_ctx.npn_len = src->ssl_ctx.npn_len;
+ }
+ }
+-#endif
+ }
+ #endif
+
+@@ -2463,13 +2456,13 @@ static int _srv_parse_tmpl_init(struct server *srv, struct proxy *px)
+
+ srv_settings_cpy(newsrv, srv, 1);
+ srv_prepare_for_resolution(newsrv, srv->hostname);
+-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
++
+ if (newsrv->sni_expr) {
+ newsrv->ssl_ctx.sni = srv_sni_sample_parse_expr(newsrv, px, NULL, 0, NULL);
+ if (!newsrv->ssl_ctx.sni)
+ goto err;
+ }
+-#endif
++
+ /* append to list of servers available to receive an hostname */
+ if (newsrv->srvrq)
+ LIST_APPEND(&newsrv->srvrq->attached_servers, &newsrv->srv_rec_item);
+@@ -2488,9 +2481,7 @@ static int _srv_parse_tmpl_init(struct server *srv, struct proxy *px)
+ err:
+ _srv_parse_set_id_from_prefix(srv, srv->tmpl_info.prefix, srv->tmpl_info.nb_low);
+ if (newsrv) {
+-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+ release_sample_expr(newsrv->ssl_ctx.sni);
+-#endif
+ free_check(&newsrv->agent);
+ free_check(&newsrv->check);
+ LIST_DELETE(&newsrv->global_list);
+@@ -2748,7 +2739,6 @@ static int _srv_parse_kw(struct server *srv, char **args, int *cur_arg,
+ return err_code;
+ }
+
+-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+ /* This function is first intended to be used through parse_server to
+ * initialize a new server on startup.
+ */
+@@ -2767,7 +2757,6 @@ static int _srv_parse_sni_expr_init(char **args, int cur_arg,
+
+ return ret;
+ }
+-#endif
+
+ /* Server initializations finalization.
+ * Initialize health check, agent check and SNI expression if enabled.
+@@ -2780,9 +2769,7 @@ static int _srv_parse_finalize(char **args, int cur_arg,
+ struct server *srv, struct proxy *px,
+ int parse_flags, char **errmsg)
+ {
+-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+ int ret;
+-#endif
+
+ if (srv->do_check && srv->trackit) {
+ memprintf(errmsg, "unable to enable checks and tracking at the same time!");
+@@ -2795,10 +2782,8 @@ static int _srv_parse_finalize(char **args, int cur_arg,
+ return ERR_ALERT | ERR_FATAL;
+ }
+
+-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
+ if ((ret = _srv_parse_sni_expr_init(args, cur_arg, srv, px, errmsg)) != 0)
+ return ret;
+-#endif
+
+ /* A dynamic server is disabled on startup. It must not be counted as
+ * an active backend entry.
+--
+2.28.0
+
diff --git a/net/haproxy17/Makefile b/net/haproxy17/Makefile
index 044b96a7ffab..572b736fb8a9 100644
--- a/net/haproxy17/Makefile
+++ b/net/haproxy17/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB= multi
BROKEN_mips= fails to build: undefined reference to '__sync_sub_and_fetch_4'
BROKEN_mips64= fails to build: undefined reference to '__sync_sub_and_fetch_4'
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy-devel haproxy18 haproxy19 haproxy20 haproxy21
USES= cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy18/Makefile b/net/haproxy18/Makefile
index 5d444f001797..9ab3f2da746e 100644
--- a/net/haproxy18/Makefile
+++ b/net/haproxy18/Makefile
@@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy19 haproxy20 haproxy21
USES= cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy19/Makefile b/net/haproxy19/Makefile
index 67f22562acf6..9a4db6b9ad71 100644
--- a/net/haproxy19/Makefile
+++ b/net/haproxy19/Makefile
@@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy20 haproxy21
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy20/Makefile b/net/haproxy20/Makefile
index 52d777683d83..ae6f803e3670 100644
--- a/net/haproxy20/Makefile
+++ b/net/haproxy20/Makefile
@@ -1,7 +1,7 @@
# Created by: Hugo Saro <hugo@barafranca.com>
PORTNAME= haproxy
-DISTVERSION= 2.0.25
+DISTVERSION= 2.0.26
CATEGORIES= net www
PKGNAMESUFFIX= 20
MASTER_SITES= http://www.haproxy.org/download/2.0/src/
@@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy21
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy20/distinfo b/net/haproxy20/distinfo
index d40b568c6db2..f1931cde43a6 100644
--- a/net/haproxy20/distinfo
+++ b/net/haproxy20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631092751
-SHA256 (haproxy-2.0.25.tar.gz) = 97b0f1e8d786364c9594b087b0c2ad03c575f3e52f6fabd11045cc6d35f2f934
-SIZE (haproxy-2.0.25.tar.gz) = 2707840
+TIMESTAMP = 1638784139
+SHA256 (haproxy-2.0.26.tar.gz) = 13ac74719a8b418cc346495fc7dfcbdd135be18aecb6a5083c801b234ad3dd47
+SIZE (haproxy-2.0.26.tar.gz) = 2713209
diff --git a/net/haproxy21/Makefile b/net/haproxy21/Makefile
index bd43f64d3a25..0715da768e55 100644
--- a/net/haproxy21/Makefile
+++ b/net/haproxy21/Makefile
@@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy22/Makefile b/net/haproxy22/Makefile
index e140b7cb710e..c5b1f0909205 100644
--- a/net/haproxy22/Makefile
+++ b/net/haproxy22/Makefile
@@ -1,7 +1,7 @@
# Created by: Hugo Saro <hugo@barafranca.com>
PORTNAME= haproxy
-DISTVERSION= 2.2.17
+DISTVERSION= 2.2.19
CATEGORIES= net www
PKGNAMESUFFIX= 22
MASTER_SITES= http://www.haproxy.org/download/2.2/src/
@@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-devel-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy-devel haproxy17 haproxy18 haproxy19 haproxy20 haproxy21
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy22/distinfo b/net/haproxy22/distinfo
index 7b39aad8d57c..027c4795d038 100644
--- a/net/haproxy22/distinfo
+++ b/net/haproxy22/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631092817
-SHA256 (haproxy-2.2.17.tar.gz) = 68af4aa3807d9c9f29b976d0ed57fb2e06acf7a185979059584862cc20d85be0
-SIZE (haproxy-2.2.17.tar.gz) = 2933836
+TIMESTAMP = 1638784650
+SHA256 (haproxy-2.2.19.tar.gz) = 972e5a422dec3d9d01eb341eabd57d2d17d0e56e17d95d5c4c28b37b9c8aba12
+SIZE (haproxy-2.2.19.tar.gz) = 2941835
diff --git a/net/haproxy23/Makefile b/net/haproxy23/Makefile
index 92169e95cf0d..6ff80a3560fb 100644
--- a/net/haproxy23/Makefile
+++ b/net/haproxy23/Makefile
@@ -1,7 +1,7 @@
# Created by: Hugo Saro <hugo@barafranca.com>
PORTNAME= haproxy
-DISTVERSION= 2.3.14
+DISTVERSION= 2.3.16
CATEGORIES= net www
PKGNAMESUFFIX= 23
MASTER_SITES= http://www.haproxy.org/download/2.3/src/
@@ -12,7 +12,7 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy-[0-9]* haproxy17-[0-9]* haproxy18-[0-9]* haproxy19-[0-9]* haproxy20-[0-9]* haproxy21-[0-9]*
+CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
diff --git a/net/haproxy23/distinfo b/net/haproxy23/distinfo
index 8d18d0603091..1dc3e3102cdd 100644
--- a/net/haproxy23/distinfo
+++ b/net/haproxy23/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631092883
-SHA256 (haproxy-2.3.14.tar.gz) = 047e5c65a018ea5061d16bb4eeb2f6e96b0d3f6ceb82d7ba96478549bbee062a
-SIZE (haproxy-2.3.14.tar.gz) = 2954299
+TIMESTAMP = 1637752740
+SHA256 (haproxy-2.3.16.tar.gz) = 7a26c8a58dd6be9c7f5e8c89d85b3c8ef4f9825109c0d5fc8ff56b7d6d254320
+SIZE (haproxy-2.3.16.tar.gz) = 2963504
diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile
index 1ee9304a8c6a..e006c6ff86fd 100644
--- a/net/hostapd-devel/Makefile
+++ b/net/hostapd-devel/Makefile
@@ -11,8 +11,8 @@ COMMENT= IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
USE_GITHUB= yes
GH_ACCOUNT= cschuber
GH_PROJECT= hostap
-GH_TAGNAME= b4f7506ff
-COMMIT_DATE= 2021.07.14
+GH_TAGNAME= 14ab4a816
+COMMIT_DATE= 2021.11.26
LICENSE= BSD3CLAUSE
diff --git a/net/hostapd-devel/distinfo b/net/hostapd-devel/distinfo
index 7d0937b9914d..e35b104ace3a 100644
--- a/net/hostapd-devel/distinfo
+++ b/net/hostapd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626898947
-SHA256 (cschuber-hostap-2021.07.14-b4f7506ff_GH0.tar.gz) = 53d221682bd21cf6cc2ec9fa2012e186754960c3aaee8b94262a1cf4076a165c
-SIZE (cschuber-hostap-2021.07.14-b4f7506ff_GH0.tar.gz) = 4789787
+TIMESTAMP = 1638218753
+SHA256 (cschuber-hostap-2021.11.26-14ab4a816_GH0.tar.gz) = e4ff65220bef6724448066f95ee0e76e8952d3ef8852b5338e431cfa91dd0244
+SIZE (cschuber-hostap-2021.11.26-14ab4a816_GH0.tar.gz) = 4825757
diff --git a/net/hostapd-devel/files/patch-src_utils_os__unix.c b/net/hostapd-devel/files/patch-src_utils_os__unix.c
deleted file mode 100644
index cd4f24b681c3..000000000000
--- a/net/hostapd-devel/files/patch-src_utils_os__unix.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/utils/os_unix.c.orig 2021-06-02 14:11:18.000000000 -0700
-+++ src/utils/os_unix.c 2021-06-07 16:07:39.152547000 -0700
-@@ -464,9 +464,9 @@
- int os_fdatasync(FILE *stream)
- {
- if (!fflush(stream)) {
--#ifdef __linux__
-+#if defined __FreeBSD__ || defined __linux__
- return fdatasync(fileno(stream));
--#else /* !__linux__ */
-+#else /* !__linux__ && !__FreeBSD__ */
- #ifdef F_FULLFSYNC
- /* OS X does not implement fdatasync(). */
- return fcntl(fileno(stream), F_FULLFSYNC);
diff --git a/net/hping/Makefile b/net/hping/Makefile
index cdc0a354e691..dfc9a783ef40 100644
--- a/net/hping/Makefile
+++ b/net/hping/Makefile
@@ -12,7 +12,7 @@ DISTNAME= hping2.0.0-rc3
MAINTAINER= ecu@200ok.org
COMMENT= Network auditing tool
-CONFLICTS= hping-devel-[0-9]*
+CONFLICTS= hping-devel
WRKSRC= ${WRKDIR}/hping2-rc3
diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile
index 665b1737af05..4171c365a87a 100644
--- a/net/ilbc/Makefile
+++ b/net/ilbc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://simon.morlat.free.fr/download/1.2.x/source/
MAINTAINER= asm@asm.kiev.ua
COMMENT= Internet Low Bit Rate codec (RFC3951)
-CONFLICTS= libilbc-[0-9]*
+CONFLICTS= libilbc
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/net/incidenceeditor/distinfo b/net/incidenceeditor/distinfo
index 2ff423cdd072..a933031c06fa 100644
--- a/net/incidenceeditor/distinfo
+++ b/net/incidenceeditor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447498
-SHA256 (KDE/release-service/21.08.2/incidenceeditor-21.08.2.tar.xz) = 181d4e32ef7e8c8a83f3fbc5d24c4d3e777ee810ecc9e5de3f8355e2fe1c3f77
-SIZE (KDE/release-service/21.08.2/incidenceeditor-21.08.2.tar.xz) = 545488
+TIMESTAMP = 1636032639
+SHA256 (KDE/release-service/21.08.3/incidenceeditor-21.08.3.tar.xz) = 93b1a062423aac0f114e08e1689f6cef21bae94ff74f2166a7d3ad3f71e9855c
+SIZE (KDE/release-service/21.08.3/incidenceeditor-21.08.3.tar.xz) = 545508
diff --git a/net/intel-ixl-kmod/Makefile b/net/intel-ixl-kmod/Makefile
index 06be63cff9ac..420da77b8317 100644
--- a/net/intel-ixl-kmod/Makefile
+++ b/net/intel-ixl-kmod/Makefile
@@ -51,7 +51,7 @@ MAX_NETMAP_OSVERSION?= 1200500 # Maximum OSVERSION for which NETMAP support wor
PATCH_SITES= https://svnweb.freebsd.org/base/head/sys/dev/ixl/
PATCHFILES= ixl_pf_main.c?view=patch&r1=358698&r2=358697&pathrev=358698:-p4
ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON= Not supported on other architectures, amd64 and powerpc64 only.
+ONLY_FOR_ARCHS_REASON= only supported on amd64 and powerpc64
.endif
.if ${PORT_OPTIONS:MNETMAP_AUTO} && ${OSVERSION} <= ${MAX_NETMAP_OSVERSION}
diff --git a/net/irrd-legacy/Makefile b/net/irrd-legacy/Makefile
deleted file mode 100644
index f527b7747411..000000000000
--- a/net/irrd-legacy/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# Created by: TAKANO Yuji <takano@net-chef.net>
-
-PORTNAME= irrd
-PORTVERSION= 2.3.10
-DISTVERSIONPREFIX= v
-CATEGORIES= net
-PKGNAMESUFFIX= -legacy
-
-MAINTAINER= bofh@FreeBSD.org
-COMMENT= Internet Routing Registry database server
-
-LICENSE= BSD4CLAUSE
-LICENSE_FILE= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}/COPYRIGHT
-
-DEPRECATED= Use net/irrd
-EXPIRATION_DATE=2021-10-27
-BROKEN_FreeBSD_13= ld: error: duplicate symbol: error_buf
-BROKEN_FreeBSD_14= ld: error: duplicate symbol: error_buf
-
-RUN_DEPENDS= wget:ftp/wget
-
-USES= shebangfix
-USE_GITHUB= yes
-USE_RC_SUBR= irrd
-
-GH_ACCOUNT= irrdnet
-GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX}
-
-WRKSRC_SUBDIR= src
-
-IRRD_CONFDIR= ${PREFIX}/etc
-
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= YACC="${YACC}"
-MAKE_JOBS_UNSAFE= yes
-DESTDIRNAME= STAGEDIR
-
-OPTIONS_DEFINE= IPV6
-IPV6_CONFIGURE_ENABLE= ipv6
-
-SHEBANG_FILES= programs/irrdcacher/irrdcacher \
- programs/irrdcacher/ripe2rpsl
-
-PLIST_FILES= etc/irrd.conf.sample \
- man/man8/irrd.8.gz \
- sbin/irr_notify \
- sbin/irr_rpsl_check \
- sbin/irr_rpsl_submit \
- sbin/irrd \
- sbin/irrdcacher \
- sbin/ripe2rpsl
-
-post-patch:
- ${REINPLACE_CMD} -e 's|/etc/irrd.conf|${IRRD_CONFDIR}/irrd.conf|g' \
- ${WRKSRC}/programs/IRRd/irrd.8 \
- ${WRKSRC}/programs/IRRd/main.c \
- ${WRKSRC}/programs/hdr_comm/read_conf.c \
- ${WRKSRC}/programs/irr_notify/main.c \
- ${WRKSRC}/programs/irr_rpsl_check/main.c \
- ${WRKSRC}/programs/irr_rpsl_submit/main.c \
- ${WRKSRC}/programs/irrdcacher/irrdcacher \
- ${WRKSRC}/programs/rps_dist/rpsdist.c
- ${REINPLACE_CMD} -e 's|\($$(DESTDIR)\)|$$(STAGEDIR)\1|g' \
- -e 's|\( -m 755 \)| -s\1|g' \
- -e 's| -o root -g bin||g' \
- ${WRKSRC}/programs/IRRd/Makefile \
- ${WRKSRC}/programs/irr_notify/Makefile \
- ${WRKSRC}/programs/irr_rpsl_check/Makefile \
- ${WRKSRC}/programs/irr_rpsl_submit/Makefile
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher \
- ${STAGEDIR}${PREFIX}/sbin
- ${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl \
- ${STAGEDIR}${PREFIX}/sbin
- ${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample \
- ${STAGEDIR}${IRRD_CONFDIR}
- ${INSTALL_DATA} ${WRKSRC}/programs/IRRd/irrd.8 \
- ${STAGEDIR}${PREFIX}/man/man8
-
-.include <bsd.port.mk>
diff --git a/net/irrd-legacy/distinfo b/net/irrd-legacy/distinfo
deleted file mode 100644
index 473574c6084e..000000000000
--- a/net/irrd-legacy/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1582065766
-SHA256 (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = acc1b6e5b219c617b1a614cfd586901183a184ee91a42c81473724161a63d65a
-SIZE (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = 769512
diff --git a/net/irrd-legacy/files/irrd.in b/net/irrd-legacy/files/irrd.in
deleted file mode 100644
index 7b9def16c9d3..000000000000
--- a/net/irrd-legacy/files/irrd.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: irrd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Define these irrd_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-# /etc/rc.conf.d/irrd
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-irrd_enable="${irrd_enable:-NO}" # Enable irrd
-#irrd_program="%%PREFIX%%/sbin/irrd" # Location of irrd
-irrd_flags="${irrd_flags:--u}" # Flags to irrd program
-
-. /etc/rc.subr
-
-name="irrd"
-rcvar=irrd_enable
-command="%%PREFIX%%/sbin/irrd"
-required_files="%%PREFIX%%/etc/irrd.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/net/irrd-legacy/files/patch-configure b/net/irrd-legacy/files/patch-configure
deleted file mode 100644
index 094af76d68de..000000000000
--- a/net/irrd-legacy/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig 2006-09-12 17:40:55 UTC
-+++ configure
-@@ -2638,7 +2638,6 @@
- THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
- fi
- CRYPT_LIB="-lcrypt"
-- ac_pthrlib="c_r"
- ;;
- linux* )
- CRYPT_LIB="-lcrypt"
-@@ -6011,7 +6010,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <netinet/in.h>
-+#include <netinet6/in6.h>
-
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
diff --git a/net/irrd-legacy/files/patch-lib_config_config__file.c b/net/irrd-legacy/files/patch-lib_config_config__file.c
deleted file mode 100644
index 70891c6d9814..000000000000
--- a/net/irrd-legacy/files/patch-lib_config_config__file.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/config/config_file.c.orig 2015-04-03 11:26:26 UTC
-+++ lib/config/config_file.c
-@@ -772,7 +772,7 @@ config_line_address (uii_connection_t * uii, prefix_t
- Deref_Prefix (prefix);
- return (1);
- }
-- if (prefix_compare2 (UII->prefix, prefix) != 0) {
-+ if ( UII->prefix == NULL || prefix_compare2 (UII->prefix, prefix) != 0) {
- set_uii (UII, UII_ADDR, prefix, 0);
- listen_uii2 (NULL);
- }
diff --git a/net/irrd-legacy/files/patch-lib_mrt_prefix.c b/net/irrd-legacy/files/patch-lib_mrt_prefix.c
deleted file mode 100644
index c76bbd8006dd..000000000000
--- a/net/irrd-legacy/files/patch-lib_mrt_prefix.c
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: lib/mrt/prefix.c
---- lib/mrt/prefix.c.orig 2015-04-03 11:26:26 UTC
-+++ lib/mrt/prefix.c
-@@ -5,7 +5,7 @@
- #include <mrt.h>
- #include <netdb.h>
-
--#ifndef __GLIBC__
-+#if !defined(__GLIBC__) && !defined(__FreeBSD__)
- #ifdef __osf__
-
- /* apparently, OSF's gethostby{name,addr}_r's are different, broken, and
-@@ -29,7 +29,7 @@ struct hostent *gethostbyaddr_r
- For the time being, this part tries to convert Linux glibc 2.X
- gethostXX_r into Solaris's that we use to code MRT. -- masaki
- */
--#if __GLIBC__ >= 2
-+#if __GLIBC__ >= 2 || (defined(__FreeBSD__) && defined(HAVE_GETHOSTBYNAME_R))
- /* Glibc 2.X
-
- int gethostbyname_r (const char *name, struct hostent *result_buf,
diff --git a/net/irrd-legacy/files/patch-programs_IRRd_database.c b/net/irrd-legacy/files/patch-programs_IRRd_database.c
deleted file mode 100644
index 856681484d88..000000000000
--- a/net/irrd-legacy/files/patch-programs_IRRd_database.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- programs/IRRd/database.c.orig 2015-04-03 11:26:26 UTC
-+++ programs/IRRd/database.c
-@@ -59,9 +59,11 @@ void database_clear (irr_database_t *db) {
-
- db->radix_v4 = New_Radix (32);
- db->radix_v6 = New_Radix (128);
-- fclose (db->db_fp);
-
-- db->db_fp = NULL;
-+ if (db->db_fp) {
-+ fclose (db->db_fp);
-+ db->db_fp = NULL;
-+ }
- }
-
-
diff --git a/net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c b/net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c
deleted file mode 100644
index cf68c6dc14ac..000000000000
--- a/net/irrd-legacy/files/patch-programs_IRRd_uii__commands.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- programs/IRRd/uii_commands.c.orig 2015-04-03 11:26:26 UTC
-+++ programs/IRRd/uii_commands.c
-@@ -14,6 +14,8 @@
- #include <ctype.h>
- #include "irrd.h"
-
-+#include <errno.h>
-+
- #include <fcntl.h>
- #ifndef SETPGRP_VOID
- #endif
-@@ -700,6 +702,10 @@ int uii_read_update_file (uii_connection_t *uii, char
-
- void run_cmd (char *cmd, FILE **in, FILE **out) {
- int pin[2], pout[2];
-+ int pid;
-+ int omask, pstat;
-+ pid_t ppid;
-+ extern int errno;
-
- if (in != NULL)
- *in = NULL;
-@@ -713,7 +719,9 @@ void run_cmd (char *cmd, FILE **in, FILE **out) {
- if (out != NULL)
- pipe (pout);
-
-- if (fork() == 0) { /* We're the child */
-+/* if (fork() == 0) { */
-+ pid = fork();
-+ if (pid == 0) { /* We're the child */
- if (in != NULL) {
- close (pin[1]);
- dup2 (pin[0], 0);
-@@ -727,7 +735,7 @@ void run_cmd (char *cmd, FILE **in, FILE **out) {
- close (pout[1]);
- }
-
-- execl("/bin/sh", "sh", "-c", cmd, NULL);
-+ execlp("/bin/sh", "sh", "-c", cmd, NULL);
- _exit(127);
- }
-
-@@ -741,6 +749,12 @@ void run_cmd (char *cmd, FILE **in, FILE **out) {
- close (pin[0]);
- *in = fdopen (pin[1], "w");
- }
-+
-+ omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));
-+ do {
-+ ppid = waitpid(pid, (int *) &pstat, 0);
-+ } while (pid == -1 && errno == EINTR);
-+ (void)sigsetmask(omask);
- }
-
- int kill_irrd (uii_connection_t *uii) {
diff --git a/net/irrd-legacy/pkg-descr b/net/irrd-legacy/pkg-descr
deleted file mode 100644
index fbadf223c414..000000000000
--- a/net/irrd-legacy/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Internet Routing Registry Daemon (IRRd).
-
-WWW: http://www.irrd.net/
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 451af0b06c80..971ccb9e490a 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,7 +1,7 @@
# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
PORTNAME= irrd
-PORTVERSION= 4.0.8
+PORTVERSION= 4.2.2
DISTVERSIONPREFIX= v
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index 671d9f2b528e..5d491b4d2ccb 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585613545
-SHA256 (irrdnet-irrd-v4.0.8_GH0.tar.gz) = dd51d10bfad54bd7272ec90380f29824ae70dc401645e6e3bac9554798f4104b
-SIZE (irrdnet-irrd-v4.0.8_GH0.tar.gz) = 257853
+TIMESTAMP = 1638746490
+SHA256 (irrdnet-irrd-v4.2.2_GH0.tar.gz) = a2993ba60ca762044dad0763a19097666950070a3c24d4de69ffe1784ad0e19c
+SIZE (irrdnet-irrd-v4.2.2_GH0.tar.gz) = 360944
diff --git a/net/irrd/files/patch-setup.py b/net/irrd/files/patch-setup.py
deleted file mode 100644
index 438f915317f2..000000000000
--- a/net/irrd/files/patch-setup.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- setup.py.orig 2019-11-12 12:54:56 UTC
-+++ setup.py
-@@ -23,19 +23,19 @@ setuptools.setup(
- # This list must be kept in sync with requirements.txt version-wise,
- # but should not include packages used for testing, generating docs
- # or packages.
-- 'python-gnupg==0.4.4',
-- 'passlib==1.7.1',
-- 'IPy==1.0.0',
-- 'dataclasses==0.6',
-- 'ordered-set==3.1.1',
-- 'dotted==0.1.8',
-- 'beautifultable==0.7.0',
-- 'PyYAML==5.1',
-- 'psycopg2-binary==2.8.2',
-- 'SQLAlchemy==1.3.3',
-- 'alembic==1.0.10',
-- 'ujson==1.35',
-- 'twisted==19.2.1',
-+ 'python-gnupg>=0.4.3',
-+ 'passlib>=1.7.1',
-+ 'IPy>=1.0.0',
-+ 'dataclasses==0.6; python_version<"3.7"',
-+ 'ordered-set>=3.1.1',
-+ 'dotted>=0.1.8',
-+ 'beautifultable>=0.7.0',
-+ 'PyYAML>=5.1',
-+ 'psycopg2>=2.8.2',
-+ 'SQLAlchemy>=1.2.19',
-+ 'alembic>=1.0.10',
-+ 'ujson>=1.35',
-+ 'twisted>=18.9.0',
- ],
- entry_points={
- 'console_scripts': [
diff --git a/net/isc-dhcp44-server/Makefile b/net/isc-dhcp44-server/Makefile
index 95a7f5f06580..b48a712b2175 100644
--- a/net/isc-dhcp44-server/Makefile
+++ b/net/isc-dhcp44-server/Makefile
@@ -45,10 +45,10 @@ BINLEASES_DESC= Enable support for binary insertion of leases
CONFLICTS= isc-dhcp3?-client-[0-9]* isc-dhcp4[123]-client-[0-9]*
DHCP_PORTREVISION= ${PORTREVISION_CLIENT}
.elif ${SUBSYS} == relay
-CONFLICTS= isc-dhcp3?-relay-[0-9]* isc-dhcp4[123]-relay-[0-9]*
+CONFLICTS= isc-dhcp3?-relay isc-dhcp4[123]-relay
DHCP_PORTREVISION= ${PORTREVISION_RELAY}
.else
-CONFLICTS= isc-dhcp3?-server-[0-9]* isc-dhcp4[123]-server-[0-9]*
+CONFLICTS= isc-dhcp3?-server isc-dhcp4[123]-server
DHCP_PORTREVISION= ${PORTREVISION_SERVER}
.endif
MAKE_JOBS_UNSAFE= yes
diff --git a/net/kalarmcal/distinfo b/net/kalarmcal/distinfo
index aa7b940abe1e..b3ea808496cc 100644
--- a/net/kalarmcal/distinfo
+++ b/net/kalarmcal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447511
-SHA256 (KDE/release-service/21.08.2/kalarmcal-21.08.2.tar.xz) = 30eec408e48cc8ef2a6d0d426cbc037bcfb657827cabf044065fd4b9d657ac75
-SIZE (KDE/release-service/21.08.2/kalarmcal-21.08.2.tar.xz) = 629404
+TIMESTAMP = 1636032656
+SHA256 (KDE/release-service/21.08.3/kalarmcal-21.08.3.tar.xz) = d3f340944fd52f79cfd683dc0c2965c472ecbb2053c042fba9b93ad82fe2f50f
+SIZE (KDE/release-service/21.08.3/kalarmcal-21.08.3.tar.xz) = 629416
diff --git a/net/kcalutils/distinfo b/net/kcalutils/distinfo
index 9572997696bd..90be4b7980bf 100644
--- a/net/kcalutils/distinfo
+++ b/net/kcalutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447503
-SHA256 (KDE/release-service/21.08.2/kcalutils-21.08.2.tar.xz) = dfa9d428501f5a6584f68c10d4210b14cb275d2978cc8d097dabf56fbebe6e4f
-SIZE (KDE/release-service/21.08.2/kcalutils-21.08.2.tar.xz) = 338004
+TIMESTAMP = 1636032645
+SHA256 (KDE/release-service/21.08.3/kcalutils-21.08.3.tar.xz) = 311be30637868b25d64efe42ac8bd67ecb77c73b7866926f70d51814fd4d4050
+SIZE (KDE/release-service/21.08.3/kcalutils-21.08.3.tar.xz) = 338016
diff --git a/net/kdenetwork-filesharing/distinfo b/net/kdenetwork-filesharing/distinfo
index e02f4f477aab..de253167b7d7 100644
--- a/net/kdenetwork-filesharing/distinfo
+++ b/net/kdenetwork-filesharing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447517
-SHA256 (KDE/release-service/21.08.2/kdenetwork-filesharing-21.08.2.tar.xz) = 8cdb0585a44c83c62f3f102530548162ab334fda40b7966e9640adc34381d777
-SIZE (KDE/release-service/21.08.2/kdenetwork-filesharing-21.08.2.tar.xz) = 378676
+TIMESTAMP = 1636032663
+SHA256 (KDE/release-service/21.08.3/kdenetwork-filesharing-21.08.3.tar.xz) = a959d611e5538b63f867d9b781e6e4279d0d2d3868eae3a8d263f51481af83a5
+SIZE (KDE/release-service/21.08.3/kdenetwork-filesharing-21.08.3.tar.xz) = 378680
diff --git a/net/kea/Makefile b/net/kea/Makefile
index 9474d351e67c..73932843da34 100644
--- a/net/kea/Makefile
+++ b/net/kea/Makefile
@@ -39,7 +39,7 @@ PORTDOCS= AUTHORS COPYING ChangeLog README \
CONTRIBUTING.md examples code_of_conduct.md \
platforms.rst
-OPTIONS_DEFINE= DOCS MYSQL PGSQL
+OPTIONS_DEFINE= DOCS MYSQL PGSQL SHELL
OPTIONS_SUB= yes
MYSQL_USES= mysql
MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
@@ -52,5 +52,8 @@ PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE}/bin/pg_config
PGSQL_CONFIGURE_OFF= --without-pgsql
PGSQL_SUB_LIST= REQ_PGSQL=postgresql
PGSQL_SUB_LIST_OFF= REQ_PGSQL=""
+SHELL_DESC= Install kea-shell(8) (Python)
+SHELL_USES= python:3.5+
+SHELL_CONFIGURE_ON= --enable-shell
.include <bsd.port.mk>
diff --git a/net/kea/pkg-plist b/net/kea/pkg-plist
index 94898a71d739..b553dd44c561 100644
--- a/net/kea/pkg-plist
+++ b/net/kea/pkg-plist
@@ -427,6 +427,15 @@ 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
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_conn%%PYTHON_EXT_SUFFIX%%.pyc
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector2%%PYTHON_EXT_SUFFIX%%.pyc
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector3%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/__pycache__/kea_connector3%%PYTHON_EXT_SUFFIX%%.pyc
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_conn.py
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_connector2.py
+%%SHELL%%%%PYTHON_SITELIBDIR%%/kea/kea_connector3.py
lib/libkea-asiodns.a
lib/libkea-asiodns.so
lib/libkea-asiodns.so.13
@@ -531,6 +540,7 @@ sbin/kea-dhcp-ddns
sbin/kea-dhcp4
sbin/kea-dhcp6
sbin/kea-lfc
+%%SHELL%%sbin/kea-shell
sbin/keactrl
%%DATADIR%%/api/build-report.json
%%DATADIR%%/api/cache-clear.json
@@ -763,5 +773,7 @@ sbin/keactrl
%%DATADIR%%/scripts/pgsql/upgrade_6.0_to_6.1.sh
%%DATADIR%%/scripts/pgsql/upgrade_6.1_to_6.2.sh
%%DATADIR%%/scripts/pgsql/wipe_data.sh
+%%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea/__pycache__
+%%SHELL%%@dir %%PYTHON_SITELIBDIR%%/kea
@dir /var/db/kea
@dir /var/run/kea
diff --git a/net/kf5-kcalendarcore/distinfo b/net/kf5-kcalendarcore/distinfo
index ee37b95f1a0e..b247e7d79e0c 100644
--- a/net/kf5-kcalendarcore/distinfo
+++ b/net/kf5-kcalendarcore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633378425
-SHA256 (KDE/frameworks/5.87.0/kcalendarcore-5.87.0.tar.xz) = 166054f2a4975263e83f00110d4345c53ce82bc63b9789618231b9dc1be0e245
-SIZE (KDE/frameworks/5.87.0/kcalendarcore-5.87.0.tar.xz) = 260596
+TIMESTAMP = 1636215860
+SHA256 (KDE/frameworks/5.88.0/kcalendarcore-5.88.0.tar.xz) = 5e13d34179f5e315cf5301286340e52b3dc78d4f48927b7f2f0bbf453f03cc43
+SIZE (KDE/frameworks/5.88.0/kcalendarcore-5.88.0.tar.xz) = 262876
diff --git a/net/kf5-kcalendarcore/pkg-plist b/net/kf5-kcalendarcore/pkg-plist
index dadabe8f7dfc..7ef6b1aa57de 100644
--- a/net/kf5-kcalendarcore/pkg-plist
+++ b/net/kf5-kcalendarcore/pkg-plist
@@ -130,7 +130,6 @@ include/KF5/KCalendarCore/kcalendarcore/vcalformat.h
include/KF5/KCalendarCore/kcalendarcore/visitor.h
include/KF5/kcalcore_version.h
include/KF5/kcalendarcore_version.h
-lib/cmake/KF5CalendarCore/FindLibIcal.cmake
lib/cmake/KF5CalendarCore/KF5CalendarCoreConfig.cmake
lib/cmake/KF5CalendarCore/KF5CalendarCoreConfigVersion.cmake
lib/cmake/KF5CalendarCore/KF5CalendarCoreTargets-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/net/kf5-kcontacts/distinfo b/net/kf5-kcontacts/distinfo
index 0d440b701dca..d0557fd69707 100644
--- a/net/kf5-kcontacts/distinfo
+++ b/net/kf5-kcontacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633378426
-SHA256 (KDE/frameworks/5.87.0/kcontacts-5.87.0.tar.xz) = 9bd17db7b520df1f3a45f26e40312cdf18158e66f610d656cfe214dd768efe0b
-SIZE (KDE/frameworks/5.87.0/kcontacts-5.87.0.tar.xz) = 543840
+TIMESTAMP = 1636215861
+SHA256 (KDE/frameworks/5.88.0/kcontacts-5.88.0.tar.xz) = c5b975c2d935d38807634eb176d872fa45d6bca05136777714f5e729a50e42a0
+SIZE (KDE/frameworks/5.88.0/kcontacts-5.88.0.tar.xz) = 180568
diff --git a/net/kf5-kdav/distinfo b/net/kf5-kdav/distinfo
index 3a0f1e41f3bd..7404e2730fd4 100644
--- a/net/kf5-kdav/distinfo
+++ b/net/kf5-kdav/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633378427
-SHA256 (KDE/frameworks/5.87.0/kdav-5.87.0.tar.xz) = bfccf61a54c7ddf10448ce735ac414ad26c5c39c1f762b0a7f85e2db38786169
-SIZE (KDE/frameworks/5.87.0/kdav-5.87.0.tar.xz) = 61900
+TIMESTAMP = 1636215862
+SHA256 (KDE/frameworks/5.88.0/kdav-5.88.0.tar.xz) = 7cf87774f0d1b9437b113ba0e2495d253d5cd73769c2b2e160a7d3859e3ff2c7
+SIZE (KDE/frameworks/5.88.0/kdav-5.88.0.tar.xz) = 61920
diff --git a/net/kf5-kholidays/distinfo b/net/kf5-kholidays/distinfo
index 0d8330edc350..8d31ebe9b53f 100644
--- a/net/kf5-kholidays/distinfo
+++ b/net/kf5-kholidays/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633378427
-SHA256 (KDE/frameworks/5.87.0/kholidays-5.87.0.tar.xz) = f5bfb0cd8668ceab5494bc72ee59a4e2a97ab735813ba1b70b34735ee70e45b1
-SIZE (KDE/frameworks/5.87.0/kholidays-5.87.0.tar.xz) = 232068
+TIMESTAMP = 1636215863
+SHA256 (KDE/frameworks/5.88.0/kholidays-5.88.0.tar.xz) = 8a97a884a60bcd5bc091a833aeb40ca0c5e203389abd44e3076c1c1553bc803b
+SIZE (KDE/frameworks/5.88.0/kholidays-5.88.0.tar.xz) = 232400
diff --git a/net/kf5-kxmlrpcclient/distinfo b/net/kf5-kxmlrpcclient/distinfo
index 7f708c761acf..e86bd126e554 100644
--- a/net/kf5-kxmlrpcclient/distinfo
+++ b/net/kf5-kxmlrpcclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633378428
-SHA256 (KDE/frameworks/5.87.0/kxmlrpcclient-5.87.0.tar.xz) = a7298f56d5b3997b3765116ec1e3f09e315b21ca004c0d03e0c3894289fe850e
-SIZE (KDE/frameworks/5.87.0/kxmlrpcclient-5.87.0.tar.xz) = 29604
+TIMESTAMP = 1636215864
+SHA256 (KDE/frameworks/5.88.0/kxmlrpcclient-5.88.0.tar.xz) = 679af4618fdb2f24f00de779f4430124bf8e0d8c7f447d05ede037806048800a
+SIZE (KDE/frameworks/5.88.0/kxmlrpcclient-5.88.0.tar.xz) = 29652
diff --git a/net/kf5-syndication/distinfo b/net/kf5-syndication/distinfo
index 92e1e830d00b..0ff0a93cf0e7 100644
--- a/net/kf5-syndication/distinfo
+++ b/net/kf5-syndication/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633378429
-SHA256 (KDE/frameworks/5.87.0/syndication-5.87.0.tar.xz) = 7a21f7c335425421695fcb290a3f5037d8b4c9b946377b7200f3e357f5407af5
-SIZE (KDE/frameworks/5.87.0/syndication-5.87.0.tar.xz) = 508588
+TIMESTAMP = 1636215865
+SHA256 (KDE/frameworks/5.88.0/syndication-5.88.0.tar.xz) = 09008afd3add5f57942d21d50328ffcd013aff9ea942d6b188069bc6a1ae9638
+SIZE (KDE/frameworks/5.88.0/syndication-5.88.0.tar.xz) = 508512
diff --git a/net/kget/distinfo b/net/kget/distinfo
index 0d21579cbc4d..fe5b0fecceec 100644
--- a/net/kget/distinfo
+++ b/net/kget/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447504
-SHA256 (KDE/release-service/21.08.2/kget-21.08.2.tar.xz) = d0c40b968d184f1a45e83dc26ac7e4a2a9761196bc7c3e8cc85d9539ed380086
-SIZE (KDE/release-service/21.08.2/kget-21.08.2.tar.xz) = 5634792
+TIMESTAMP = 1636032647
+SHA256 (KDE/release-service/21.08.3/kget-21.08.3.tar.xz) = 57560be5d018da039ee94e354b1056a430de3e49c7b9b893217f16e3d681ff7e
+SIZE (KDE/release-service/21.08.3/kget-21.08.3.tar.xz) = 5634648
diff --git a/net/kidentitymanagement/distinfo b/net/kidentitymanagement/distinfo
index 6c2b1a65ef95..a37ec9e7dcc7 100644
--- a/net/kidentitymanagement/distinfo
+++ b/net/kidentitymanagement/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447519
-SHA256 (KDE/release-service/21.08.2/kidentitymanagement-21.08.2.tar.xz) = acf09a276fa2b0e126e82bcbde3ff87e3fd4e23b5b95e6c0aaa0ea2038d05c4d
-SIZE (KDE/release-service/21.08.2/kidentitymanagement-21.08.2.tar.xz) = 157344
+TIMESTAMP = 1636032665
+SHA256 (KDE/release-service/21.08.3/kidentitymanagement-21.08.3.tar.xz) = 8b519b6ba948735d07b2922e76d430817f0dd5a499cad03cee60577998e0d001
+SIZE (KDE/release-service/21.08.3/kidentitymanagement-21.08.3.tar.xz) = 157392
diff --git a/net/kimap/distinfo b/net/kimap/distinfo
index ad2f6fdb3958..5e98efe16207 100644
--- a/net/kimap/distinfo
+++ b/net/kimap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447505
-SHA256 (KDE/release-service/21.08.2/kimap-21.08.2.tar.xz) = 5dd42c72f83949293fda98ecb9c2439d4ddd0e9c1a2ecb6af11b83893f49b461
-SIZE (KDE/release-service/21.08.2/kimap-21.08.2.tar.xz) = 127464
+TIMESTAMP = 1636032648
+SHA256 (KDE/release-service/21.08.3/kimap-21.08.3.tar.xz) = 352a028f9f01214d6ad9742de73dcd6d3a4d61e073d7653cbb0b3e50fb9bbc87
+SIZE (KDE/release-service/21.08.3/kimap-21.08.3.tar.xz) = 127416
diff --git a/net/kio-gdrive/distinfo b/net/kio-gdrive/distinfo
index c6960edd35e1..ae9a1a9d355a 100644
--- a/net/kio-gdrive/distinfo
+++ b/net/kio-gdrive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447503
-SHA256 (KDE/release-service/21.08.2/kio-gdrive-21.08.2.tar.xz) = 62b678eb3f90293752c4cbe65ffae5edd485f04cbab53831b4cec7c1192b7055
-SIZE (KDE/release-service/21.08.2/kio-gdrive-21.08.2.tar.xz) = 69760
+TIMESTAMP = 1636032646
+SHA256 (KDE/release-service/21.08.3/kio-gdrive-21.08.3.tar.xz) = 2dbf3f288cd80bb7051284c6f102cdb77cc746078c66809455b860ac270be8c0
+SIZE (KDE/release-service/21.08.3/kio-gdrive-21.08.3.tar.xz) = 69752
diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile
index 2bb5ebd49548..14ffa9143448 100644
--- a/net/kitinerary/Makefile
+++ b/net/kitinerary/Makefile
@@ -1,6 +1,6 @@
PORTNAME= kitinerary
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/net/kitinerary/distinfo b/net/kitinerary/distinfo
index ccd96a6e3a53..adcdedf366bb 100644
--- a/net/kitinerary/distinfo
+++ b/net/kitinerary/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447509
-SHA256 (KDE/release-service/21.08.2/kitinerary-21.08.2.tar.xz) = e3313d0a3cfcfc1a2a84ac33425b09c12b24e9af29eb1aee0bb57d9d4bc241d0
-SIZE (KDE/release-service/21.08.2/kitinerary-21.08.2.tar.xz) = 1844648
+TIMESTAMP = 1636032653
+SHA256 (KDE/release-service/21.08.3/kitinerary-21.08.3.tar.xz) = 6e7d052888b4e8f4b8b81a34917204c6d2326e10af1f56dcaf39d0f204c1d918
+SIZE (KDE/release-service/21.08.3/kitinerary-21.08.3.tar.xz) = 1844012
diff --git a/net/kldap/distinfo b/net/kldap/distinfo
index 4a0c4f963f00..2314e4e5b8ab 100644
--- a/net/kldap/distinfo
+++ b/net/kldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447511
-SHA256 (KDE/release-service/21.08.2/kldap-21.08.2.tar.xz) = 7c7f241675dd768e20f8cd50f74a7c40658efc555af899ee128204cc932589ed
-SIZE (KDE/release-service/21.08.2/kldap-21.08.2.tar.xz) = 171908
+TIMESTAMP = 1636032655
+SHA256 (KDE/release-service/21.08.3/kldap-21.08.3.tar.xz) = a1318c5f4b725b3212bae7caa3249d0896c30710ff1466d85755b3787b9961c9
+SIZE (KDE/release-service/21.08.3/kldap-21.08.3.tar.xz) = 171916
diff --git a/net/kmailtransport/distinfo b/net/kmailtransport/distinfo
index 431b55623015..d5d83a564d9b 100644
--- a/net/kmailtransport/distinfo
+++ b/net/kmailtransport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447514
-SHA256 (KDE/release-service/21.08.2/kmailtransport-21.08.2.tar.xz) = bdaf4c209ebfad53050adf19b804dad958dceabc0ffd03585a2ff905ade2e660
-SIZE (KDE/release-service/21.08.2/kmailtransport-21.08.2.tar.xz) = 172764
+TIMESTAMP = 1636032658
+SHA256 (KDE/release-service/21.08.3/kmailtransport-21.08.3.tar.xz) = 1c32f02ebc8b07f0ecd9af36111bef8e53fd62f463f5cf4ae70501b25c8dc476
+SIZE (KDE/release-service/21.08.3/kmailtransport-21.08.3.tar.xz) = 172708
diff --git a/net/kmbox/distinfo b/net/kmbox/distinfo
index 0fddf24f05ec..376498842564 100644
--- a/net/kmbox/distinfo
+++ b/net/kmbox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447508
-SHA256 (KDE/release-service/21.08.2/kmbox-21.08.2.tar.xz) = fec8bf59803a982589b18c866cd013506bc58ab64ae677105a0aff9499e8bb14
-SIZE (KDE/release-service/21.08.2/kmbox-21.08.2.tar.xz) = 27812
+TIMESTAMP = 1636032652
+SHA256 (KDE/release-service/21.08.3/kmbox-21.08.3.tar.xz) = 32042d5d1ec3df940dbbe0c429285daafc6d00a38c88846d81a417586861b3a5
+SIZE (KDE/release-service/21.08.3/kmbox-21.08.3.tar.xz) = 27792
diff --git a/net/kmime/distinfo b/net/kmime/distinfo
index 9c0076a54366..2b7b49dd4f34 100644
--- a/net/kmime/distinfo
+++ b/net/kmime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447499
-SHA256 (KDE/release-service/21.08.2/kmime-21.08.2.tar.xz) = e47d6ae33a81d7747a9f6ec823f777e379969c6fec03a4e2911b3f734adde0b5
-SIZE (KDE/release-service/21.08.2/kmime-21.08.2.tar.xz) = 155172
+TIMESTAMP = 1636032640
+SHA256 (KDE/release-service/21.08.3/kmime-21.08.3.tar.xz) = 66cfc3fcdffe779ff89fa54955b8d4c2a56caaafe31656508ffe3b48b5b6afae
+SIZE (KDE/release-service/21.08.3/kmime-21.08.3.tar.xz) = 155188
diff --git a/net/kontactinterface/distinfo b/net/kontactinterface/distinfo
index a0fe6988f941..669ceb2b8372 100644
--- a/net/kontactinterface/distinfo
+++ b/net/kontactinterface/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447500
-SHA256 (KDE/release-service/21.08.2/kontactinterface-21.08.2.tar.xz) = 8f5f0b86745273341b9f25bb24eb7bd12fe12894dce0886b47bf940f26655b71
-SIZE (KDE/release-service/21.08.2/kontactinterface-21.08.2.tar.xz) = 39636
+TIMESTAMP = 1636032641
+SHA256 (KDE/release-service/21.08.3/kontactinterface-21.08.3.tar.xz) = 52fd92c560ae1eaed5e9ce4058ade1bccae436ce38f04a682474b86699710489
+SIZE (KDE/release-service/21.08.3/kontactinterface-21.08.3.tar.xz) = 39620
diff --git a/net/kpimtextedit/distinfo b/net/kpimtextedit/distinfo
index a7aa4559a571..4eef22f94b92 100644
--- a/net/kpimtextedit/distinfo
+++ b/net/kpimtextedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447516
-SHA256 (KDE/release-service/21.08.2/kpimtextedit-21.08.2.tar.xz) = f0b0c84c0154259f7eb099e69b645c3c53d8531314e44e8540b02a94d24b876c
-SIZE (KDE/release-service/21.08.2/kpimtextedit-21.08.2.tar.xz) = 204836
+TIMESTAMP = 1636032661
+SHA256 (KDE/release-service/21.08.3/kpimtextedit-21.08.3.tar.xz) = f0383d43f659c095739a1803b5f06144b5574ba0e810feed0baa58b929dc72a1
+SIZE (KDE/release-service/21.08.3/kpimtextedit-21.08.3.tar.xz) = 204960
diff --git a/net/krdc/distinfo b/net/krdc/distinfo
index 4a5cafad9eb1..cab0be17df6c 100644
--- a/net/krdc/distinfo
+++ b/net/krdc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447505
-SHA256 (KDE/release-service/21.08.2/krdc-21.08.2.tar.xz) = 6d593dff61ed091f3188b76f49685ef01c74b6021656169de5a4814cf472377f
-SIZE (KDE/release-service/21.08.2/krdc-21.08.2.tar.xz) = 1582368
+TIMESTAMP = 1636032647
+SHA256 (KDE/release-service/21.08.3/krdc-21.08.3.tar.xz) = a46f93946a40dda92a5af9f9f30707014382cdb5dc2a67ce9dc191b6135e8b49
+SIZE (KDE/release-service/21.08.3/krdc-21.08.3.tar.xz) = 1582296
diff --git a/net/krfb/distinfo b/net/krfb/distinfo
index f97f05cdde04..d08e05a44e7d 100644
--- a/net/krfb/distinfo
+++ b/net/krfb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447506
-SHA256 (KDE/release-service/21.08.2/krfb-21.08.2.tar.xz) = 0b1f4281c5af3eecd257aaabb2824be646e045228e7391a3fa668acb400bc2c2
-SIZE (KDE/release-service/21.08.2/krfb-21.08.2.tar.xz) = 1293912
+TIMESTAMP = 1636032649
+SHA256 (KDE/release-service/21.08.3/krfb-21.08.3.tar.xz) = c432c70c9080c6d317839ea9d0efa75716eac22bb3d28257270ff385f985009f
+SIZE (KDE/release-service/21.08.3/krfb-21.08.3.tar.xz) = 1293896
diff --git a/net/krill/Makefile b/net/krill/Makefile
index 151842d98174..5f826c74b72d 100644
--- a/net/krill/Makefile
+++ b/net/krill/Makefile
@@ -3,7 +3,7 @@
PORTNAME= krill
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= jaap@NLnetLabs.nl
diff --git a/net/ksmtp/distinfo b/net/ksmtp/distinfo
index 5e5f8f3200dc..dddceea9a261 100644
--- a/net/ksmtp/distinfo
+++ b/net/ksmtp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447507
-SHA256 (KDE/release-service/21.08.2/ksmtp-21.08.2.tar.xz) = d00faa4d3d30ccb6e3007c578681403cf7da6fbfcf691b78a25e6d8e87886d21
-SIZE (KDE/release-service/21.08.2/ksmtp-21.08.2.tar.xz) = 47512
+TIMESTAMP = 1636032650
+SHA256 (KDE/release-service/21.08.3/ksmtp-21.08.3.tar.xz) = a060b93620a673d05578ffd93b8faa5b003e5069723fc490e7f3b3877e003f36
+SIZE (KDE/release-service/21.08.3/ksmtp-21.08.3.tar.xz) = 47496
diff --git a/net/ktnef/distinfo b/net/ktnef/distinfo
index 8176d47aab25..dfb615ce4686 100644
--- a/net/ktnef/distinfo
+++ b/net/ktnef/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447496
-SHA256 (KDE/release-service/21.08.2/ktnef-21.08.2.tar.xz) = 17e3e588b3af2bb80f82d85f41e58ffaab9bd5174116820d957854e1d0788416
-SIZE (KDE/release-service/21.08.2/ktnef-21.08.2.tar.xz) = 305684
+TIMESTAMP = 1636032637
+SHA256 (KDE/release-service/21.08.3/ktnef-21.08.3.tar.xz) = 0a6ff64449c9bc67560570572a3db21e7e699d357ee2a5351a65684812f2da6d
+SIZE (KDE/release-service/21.08.3/ktnef-21.08.3.tar.xz) = 305744
diff --git a/net/kube-controller-manager/Makefile b/net/kube-controller-manager/Makefile
index 30baf3048e77..c446b3a68b54 100644
--- a/net/kube-controller-manager/Makefile
+++ b/net/kube-controller-manager/Makefile
@@ -8,6 +8,8 @@ COMMENT= Kubernetes controller manager daemon
LICENSE= APACHE20
+BROKEN_aarch64= fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
+
USES= cpe go
CPE_VENDOR= jenkins
CPE_PRODUCT= kubernetes
diff --git a/net/kube-scheduler/Makefile b/net/kube-scheduler/Makefile
index f314d1de9b5b..f5c934f015b6 100644
--- a/net/kube-scheduler/Makefile
+++ b/net/kube-scheduler/Makefile
@@ -8,6 +8,8 @@ COMMENT= Kubernetes scheduler daemon
LICENSE= APACHE20
+BROKEN_aarch64= fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
+
USES= cpe go
CPE_VENDOR= jenkins
CPE_PRODUCT= kubernetes
diff --git a/net/libexosip2/Makefile b/net/libexosip2/Makefile
index a1b6e3f2a0f4..1d04855702a9 100644
--- a/net/libexosip2/Makefile
+++ b/net/libexosip2/Makefile
@@ -1,7 +1,7 @@
# Created by: Muhammad Moinur Rahman <bd_subzero@yahoo.com>
PORTNAME= libeXosip2
-PORTVERSION= 5.2.1
+PORTVERSION= 5.3.0
CATEGORIES= net
MASTER_SITES= SAVANNAH/exosip
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
@@ -16,11 +16,11 @@ LIB_DEPENDS= libosip2.so:net/libosip2
USES= libtool ssl
USE_LDCONFIG= yes
-CONFLICTS_INSTALL= libeXosip2-legacy-[0-9]*
+CONFLICTS_INSTALL= libeXosip2-legacy
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
-SHLIB_VER= 14
+SHLIB_VER= 15
PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
diff --git a/net/libexosip2/distinfo b/net/libexosip2/distinfo
index ed3d40e6a012..656ac9163d5a 100644
--- a/net/libexosip2/distinfo
+++ b/net/libexosip2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622027152
-SHA256 (libexosip2-5.2.1.tar.gz) = 87256b45a406f3c038e1e75e31372d526820366527c2af3bb89329bafd87ec42
-SIZE (libexosip2-5.2.1.tar.gz) = 644361
+TIMESTAMP = 1638663113
+SHA256 (libexosip2-5.3.0.tar.gz) = 5b7823986431ea5cedc9f095d6964ace966f093b2ae7d0b08404788bfcebc9c2
+SIZE (libexosip2-5.3.0.tar.gz) = 646401
diff --git a/net/libexosip2/pkg-plist b/net/libexosip2/pkg-plist
index e968f5425528..ada4d2af1078 100644
--- a/net/libexosip2/pkg-plist
+++ b/net/libexosip2/pkg-plist
@@ -1,5 +1,6 @@
bin/sip_monitor
bin/sip_reg
+bin/sip_storm
include/eXosip2/eX_call.h
include/eXosip2/eX_message.h
include/eXosip2/eX_options.h
@@ -11,4 +12,4 @@ include/eXosip2/eXosip.h
lib/libeXosip2.a
lib/libeXosip2.so
lib/libeXosip2.so.%%SHLIB_VER%%
-lib/libeXosip2.so.%%SHLIB_VER%%.0.1
+lib/libeXosip2.so.%%SHLIB_VER%%.0.0
diff --git a/net/libfabric/Makefile b/net/libfabric/Makefile
index a06956b2d829..8ac5e0e33c83 100644
--- a/net/libfabric/Makefile
+++ b/net/libfabric/Makefile
@@ -1,6 +1,6 @@
PORTNAME= libfabric
DISTVERSIONPREFIX= v
-DISTVERSION= 1.13.2
+DISTVERSION= 1.14.0
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/libfabric/distinfo b/net/libfabric/distinfo
index dd0c79f91966..d9c8f5bc014e 100644
--- a/net/libfabric/distinfo
+++ b/net/libfabric/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634421605
-SHA256 (ofiwg-libfabric-v1.13.2_GH0.tar.gz) = 04a976cacac12f49301ef1fe8c9dff5200a394e145b368523e7963a4fc701b37
-SIZE (ofiwg-libfabric-v1.13.2_GH0.tar.gz) = 2717049
+TIMESTAMP = 1638170394
+SHA256 (ofiwg-libfabric-v1.14.0_GH0.tar.gz) = 84ca58ce48752c522783b913c7251e54362cb5cf13146ede86a4ac70af52a24f
+SIZE (ofiwg-libfabric-v1.14.0_GH0.tar.gz) = 3162017
diff --git a/net/libfabric/pkg-plist b/net/libfabric/pkg-plist
index 7b70359cc106..34921c8d412f 100644
--- a/net/libfabric/pkg-plist
+++ b/net/libfabric/pkg-plist
@@ -15,7 +15,7 @@ include/rdma/fi_tagged.h
include/rdma/fi_trigger.h
lib/libfabric.so
lib/libfabric.so.1
-lib/libfabric.so.1.16.2
+lib/libfabric.so.1.17.0
libdata/pkgconfig/libfabric.pc
man/man1/fi_info.1.gz
man/man1/fi_pingpong.1.gz
diff --git a/net/libfb/Makefile b/net/libfb/Makefile
index e3b0d8cdc5e1..21f5ae2e318d 100644
--- a/net/libfb/Makefile
+++ b/net/libfb/Makefile
@@ -6,7 +6,7 @@ PORTREVISION= 2
CATEGORIES= net net-mgmt
MASTER_SITES= http://support.red-fone.com/downloads/fonulator/
-MAINTAINER= fjoe@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= FoneBRIDGE configuration library
LIB_DEPENDS= libnet.so:net/libnet
diff --git a/net/libgravatar/distinfo b/net/libgravatar/distinfo
index 6504c9e7bf61..994981db1ee5 100644
--- a/net/libgravatar/distinfo
+++ b/net/libgravatar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447494
-SHA256 (KDE/release-service/21.08.2/libgravatar-21.08.2.tar.xz) = 418358a941a6dd5549cc31a2e6e9bf9ec02ad45634d92dec3acb6601645bee10
-SIZE (KDE/release-service/21.08.2/libgravatar-21.08.2.tar.xz) = 34860
+TIMESTAMP = 1636032635
+SHA256 (KDE/release-service/21.08.3/libgravatar-21.08.3.tar.xz) = 3d5ad62fac06275495a39e602f8a4452123e83d56f905a6bea1bf5ebf2a3225a
+SIZE (KDE/release-service/21.08.3/libgravatar-21.08.3.tar.xz) = 34868
diff --git a/net/libkgapi/distinfo b/net/libkgapi/distinfo
index a464641ffbf5..5ca0847e2690 100644
--- a/net/libkgapi/distinfo
+++ b/net/libkgapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447501
-SHA256 (KDE/release-service/21.08.2/libkgapi-21.08.2.tar.xz) = 40e95815d7c84edc86748c1ea2dbcb1ca187448af2c9a76460f3e3b12352b68d
-SIZE (KDE/release-service/21.08.2/libkgapi-21.08.2.tar.xz) = 247628
+TIMESTAMP = 1636032643
+SHA256 (KDE/release-service/21.08.3/libkgapi-21.08.3.tar.xz) = 3a27cfcb988f469aababfe6b94c72fecc3a641c37e372c00c17d955912593e80
+SIZE (KDE/release-service/21.08.3/libkgapi-21.08.3.tar.xz) = 247684
diff --git a/net/libksieve/distinfo b/net/libksieve/distinfo
index ce7f50bcdfb7..bca3e963d956 100644
--- a/net/libksieve/distinfo
+++ b/net/libksieve/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447513
-SHA256 (KDE/release-service/21.08.2/libksieve-21.08.2.tar.xz) = 1e84e5b584613eb45aff46bdf34dc6277490a07c4b821457c71eb98a8202abcb
-SIZE (KDE/release-service/21.08.2/libksieve-21.08.2.tar.xz) = 569904
+TIMESTAMP = 1636032658
+SHA256 (KDE/release-service/21.08.3/libksieve-21.08.3.tar.xz) = 8702d58742dc53da2f5627b4c8c2b89fd8876334ba87f8f631c50abcbd88d4ea
+SIZE (KDE/release-service/21.08.3/libksieve-21.08.3.tar.xz) = 569836
diff --git a/net/libngtcp2/Makefile b/net/libngtcp2/Makefile
index f114d2785f8c..89cccb53fa2a 100644
--- a/net/libngtcp2/Makefile
+++ b/net/libngtcp2/Makefile
@@ -1,7 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= ngtcp2
-PORTVERSION= 0.1.0.g20210928
+PORTVERSION= 0.1.0.g20211031
CATEGORIES= net
PKGNAMEPREFIX= lib
@@ -19,7 +19,7 @@ INSTALL_TARGET= install-strip
USE_CXXSTD= c++17
USE_LDCONFIG= yes
-GH_TAGNAME= c50e057
+GH_TAGNAME= f91edc4
USE_GITHUB= yes
post-patch:
diff --git a/net/libngtcp2/distinfo b/net/libngtcp2/distinfo
index f39bf5000f4f..51948a6ede54 100644
--- a/net/libngtcp2/distinfo
+++ b/net/libngtcp2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634111652
-SHA256 (ngtcp2-ngtcp2-0.1.0.g20210928-c50e057_GH0.tar.gz) = 0efbea75f25674461c4e0466abbfd76a308f6873f8880caeef8a275357d97350
-SIZE (ngtcp2-ngtcp2-0.1.0.g20210928-c50e057_GH0.tar.gz) = 3259531
+TIMESTAMP = 1635730893
+SHA256 (ngtcp2-ngtcp2-0.1.0.g20211031-f91edc4_GH0.tar.gz) = 3841db69ad27884ba67b4652740d57f6d3e7c52efa0699c9dd18c147db4e529e
+SIZE (ngtcp2-ngtcp2-0.1.0.g20211031-f91edc4_GH0.tar.gz) = 3261129
diff --git a/net/libnss-cache/Makefile b/net/libnss-cache/Makefile
index 0bb73bbc3ce3..0535f7918067 100644
--- a/net/libnss-cache/Makefile
+++ b/net/libnss-cache/Makefile
@@ -1,7 +1,7 @@
# Created by: Kevin Bowling <k@kev009.com>
PORTNAME= libnss-cache
-PORTVERSION= 0.18
+PORTVERSION= 0.20
DISTVERSIONPREFIX= version/
CATEGORIES= net
diff --git a/net/libnss-cache/distinfo b/net/libnss-cache/distinfo
index 53ce3ce4dbb9..28eb434d3ab9 100644
--- a/net/libnss-cache/distinfo
+++ b/net/libnss-cache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612998556
-SHA256 (google-libnss-cache-version-0.18_GH0.tar.gz) = 0f1a91db01083b78a6649b1d4709fed6c30f20d79c5e6dcc114e7fd9f54fff72
-SIZE (google-libnss-cache-version-0.18_GH0.tar.gz) = 19923
+TIMESTAMP = 1637774732
+SHA256 (google-libnss-cache-version-0.20_GH0.tar.gz) = 71324b6035674028a0f39c98aedfbaed94adbcddd72dc1c4ab81308b135dd586
+SIZE (google-libnss-cache-version-0.20_GH0.tar.gz) = 20396
diff --git a/net/libosip2/Makefile b/net/libosip2/Makefile
index 55b61e5c1743..69fad4b9ea6d 100644
--- a/net/libosip2/Makefile
+++ b/net/libosip2/Makefile
@@ -1,5 +1,5 @@
PORTNAME= libosip2
-PORTVERSION= 5.2.1
+PORTVERSION= 5.3.0
CATEGORIES= net
MASTER_SITES= GNU/osip
@@ -14,7 +14,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-trace
INSTALL_TARGET= install-strip
-PLIST_SUB= ABIVER=14
+PLIST_SUB= ABIVER=15
post-patch:
@${REINPLACE_CMD} -e "/^SUBDIRS/s| help | |g" ${WRKSRC}/Makefile.in
diff --git a/net/libosip2/distinfo b/net/libosip2/distinfo
index 313ec864541a..f4a992833fce 100644
--- a/net/libosip2/distinfo
+++ b/net/libosip2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622027064
-SHA256 (libosip2-5.2.1.tar.gz) = ee3784bc8e7774f56ecd0e2ca6e3e11d38b373435115baf1f1aa0ca0bfd02bf2
-SIZE (libosip2-5.2.1.tar.gz) = 721800
+TIMESTAMP = 1638663063
+SHA256 (libosip2-5.3.0.tar.gz) = f4725916c22cf514969efb15c3c207233d64739383f7d42956038b78f6cae8c8
+SIZE (libosip2-5.3.0.tar.gz) = 722152
diff --git a/net/libosip2/pkg-plist b/net/libosip2/pkg-plist
index ea27a309f838..0ee980eb85ab 100644
--- a/net/libosip2/pkg-plist
+++ b/net/libosip2/pkg-plist
@@ -44,9 +44,9 @@ include/osipparser2/sdp_message.h
lib/libosip2.a
lib/libosip2.so
lib/libosip2.so.%%ABIVER%%
-lib/libosip2.so.%%ABIVER%%.0.1
+lib/libosip2.so.%%ABIVER%%.0.0
lib/libosipparser2.a
lib/libosipparser2.so
lib/libosipparser2.so.%%ABIVER%%
-lib/libosipparser2.so.%%ABIVER%%.0.1
+lib/libosipparser2.so.%%ABIVER%%.0.0
libdata/pkgconfig/libosip2.pc
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index 393128878838..c04ddbff131f 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,7 +1,7 @@
# Created by: Bruce M Simpson <bms@FreeBSD.org>
PORTNAME= libpcap
-PORTVERSION= 1.10.0
+PORTVERSION= 1.10.1
CATEGORIES= net
MASTER_SITES= http://www.tcpdump.org/release/
@@ -16,8 +16,8 @@ USES= bison cpe gmake
CPE_VENDOR= tcpdump
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-dbus=no \
--with-pcap=bpf
CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex
diff --git a/net/libpcap/distinfo b/net/libpcap/distinfo
index a533ecf4e328..cb76598c09d7 100644
--- a/net/libpcap/distinfo
+++ b/net/libpcap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609875800
-SHA256 (libpcap-1.10.0.tar.gz) = 8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e
-SIZE (libpcap-1.10.0.tar.gz) = 934559
+TIMESTAMP = 1635952093
+SHA256 (libpcap-1.10.1.tar.gz) = ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4
+SIZE (libpcap-1.10.1.tar.gz) = 935221
diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile
index cbf44f0f0b4c..9ef0d6fc63fc 100644
--- a/net/librdkafka/Makefile
+++ b/net/librdkafka/Makefile
@@ -1,7 +1,7 @@
# Created by: Victor Yagofarov <xnasx@yandex.ru>
PORTNAME= librdkafka
-DISTVERSION= 1.8.0
+DISTVERSION= 1.8.2
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/librdkafka/distinfo b/net/librdkafka/distinfo
index 1e7ca6286ef0..76d73a6ee63c 100644
--- a/net/librdkafka/distinfo
+++ b/net/librdkafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633356391
-SHA256 (edenhill-librdkafka-v1.8.0_GH0.tar.gz) = 93b12f554fa1c8393ce49ab52812a5f63e264d9af6a50fd6e6c318c481838b7f
-SIZE (edenhill-librdkafka-v1.8.0_GH0.tar.gz) = 4092247
+TIMESTAMP = 1635164767
+SHA256 (edenhill-librdkafka-v1.8.2_GH0.tar.gz) = 6a747d293a7a4613bd2897e28e8791476fbe1ae7361f2530a876e0fd483482a6
+SIZE (edenhill-librdkafka-v1.8.2_GH0.tar.gz) = 4097028
diff --git a/net/librespeed-cli/Makefile b/net/librespeed-cli/Makefile
index 7ec8c38cbcdd..d1daa874f18b 100644
--- a/net/librespeed-cli/Makefile
+++ b/net/librespeed-cli/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 1.0.9
CATEGORIES= net www
-MAINTAINER= driesm.michiels@gmail.com
+MAINTAINER= driesm@FreeBSD.org
COMMENT= CLI interface to run librespeed speedtests
LICENSE= LGPL3
diff --git a/net/librespeed-go/Makefile b/net/librespeed-go/Makefile
index 9a4f9c775265..36dbcb3f59ef 100644
--- a/net/librespeed-go/Makefile
+++ b/net/librespeed-go/Makefile
@@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v
DISTVERSION= 1.1.4
CATEGORIES= net www
-MAINTAINER= driesm.michiels@gmail.com
+MAINTAINER= driesm@FreeBSD.org
COMMENT= GO backend for LibreSpeed
LICENSE= LGPL3
diff --git a/net/libwebsockets/Makefile b/net/libwebsockets/Makefile
index 617fddc81948..57b8662eeafb 100644
--- a/net/libwebsockets/Makefile
+++ b/net/libwebsockets/Makefile
@@ -2,11 +2,11 @@
PORTNAME= libwebsockets
DISTVERSIONPREFIX= v
-DISTVERSION= 4.2.1
+DISTVERSION= 4.2.2
CATEGORIES= net devel
MASTER_SITES= https://libwebsockets.org/git/libwebsockets/snapshot/
-MAINTAINER= iblis@hs.ntnu.edu.tw
+MAINTAINER= ports@FreeBSD.org
COMMENT= C library for lightweight websocket clients and servers
LICENSE= MIT
@@ -79,4 +79,11 @@ LIBUV_CMAKE_BOOL= LWS_WITH_LIBUV
BUILDINFO= ${HOSTARCH}-portbld-${OPSYS:tl}-${OSREL:R}
+.include <bsd.port.options.mk>
+
+# Allow usage of LibreSSL via OPENSSL option
+.if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT} == libressl
+CMAKE_ARGS+= -DLWS_OPENSSL_LIBRARIES='${OPENSSLLIB}/libtls.so;${OPENSSLLIB}/libssl.so;${OPENSSLLIB}/libcrypto.so' -DLWS_OPENSSL_INCLUDE_DIRS=${OPENSSLINC}/ssl
+.endif
+
.include <bsd.port.mk>
diff --git a/net/libwebsockets/distinfo b/net/libwebsockets/distinfo
index 86d5065bc40e..381779501270 100644
--- a/net/libwebsockets/distinfo
+++ b/net/libwebsockets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627246669
-SHA256 (libwebsockets-v4.2.1.tar.xz) = 42d67017f91d408cf4c6c2bd761e9ef257973157a9c4ad295e0c05ebfc747246
-SIZE (libwebsockets-v4.2.1.tar.xz) = 12769280
+TIMESTAMP = 1633420177
+SHA256 (libwebsockets-v4.2.2.tar.xz) = 0d8cf2abeea4a6ad24935c60a26120ed864fb263dd95b6abf7d19356b7095410
+SIZE (libwebsockets-v4.2.2.tar.xz) = 12769280
diff --git a/net/libzmq2/Makefile b/net/libzmq2/Makefile
index 7073f29fb08f..36fee0aeb438 100644
--- a/net/libzmq2/Makefile
+++ b/net/libzmq2/Makefile
@@ -19,7 +19,7 @@ USES= libtool pathfix
USE_LDCONFIG= yes
TEST_TARGET= check
-CONFLICTS= libzmq[^2]-[0-9]*
+CONFLICTS= libzmq[^2]
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ON= --enable-debug
diff --git a/net/libzmq3/Makefile b/net/libzmq3/Makefile
index c73d6bdb0c5f..9ef3bba8bb36 100644
--- a/net/libzmq3/Makefile
+++ b/net/libzmq3/Makefile
@@ -11,7 +11,7 @@ COMMENT= ZeroMQ core library (Version 3)
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
-CONFLICTS= zmq-[0-9]* libzmq[^3]-[0-9]*
+CONFLICTS= zmq libzmq[^3]
USES= libtool pathfix
USE_LDCONFIG= yes
diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile
index b0305b3c2122..c642c090cf4d 100644
--- a/net/libzmq4/Makefile
+++ b/net/libzmq4/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake libtool pkgconfig
USE_LDCONFIG= yes
-CONFLICTS= zmq-[0-9]* libzmq[^4]-[0-9]*
+CONFLICTS= zmq libzmq[^4]
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
diff --git a/net/linux-c7-avahi-libs/Makefile b/net/linux-c7-avahi-libs/Makefile
index debef70c4d43..38b175707014 100644
--- a/net/linux-c7-avahi-libs/Makefile
+++ b/net/linux-c7-avahi-libs/Makefile
@@ -17,7 +17,7 @@ USE_LINUX_RPM= yes
LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
-CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
.include <bsd.port.mk>
diff --git a/net/linux-c7-openldap/Makefile b/net/linux-c7-openldap/Makefile
index 771cdddfd964..83850ac5e9b5 100644
--- a/net/linux-c7-openldap/Makefile
+++ b/net/linux-c7-openldap/Makefile
@@ -14,7 +14,7 @@ USE_LDCONFIG= yes
USE_LINUX= cyrus-sasl2 nspr nss
USE_LINUX_RPM= yes
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}
DESCR= ${.CURDIR}/../${PORTNAME}24-server/pkg-descr
OPTIONS_DEFINE= DOCS
diff --git a/net/linux-c7-tcp_wrappers-libs/Makefile b/net/linux-c7-tcp_wrappers-libs/Makefile
index fef563de0d60..9b60c719ec98 100644
--- a/net/linux-c7-tcp_wrappers-libs/Makefile
+++ b/net/linux-c7-tcp_wrappers-libs/Makefile
@@ -17,7 +17,7 @@ USE_LINUX_RPM= yes
LIB_DISTNAMES= ${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSIONFULL}
-CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
+CONFLICTS= linux-c6-${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
OPTIONS_DEFINE= DOCS
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 03f08663f2d0..c60c16752745 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -22,7 +22,6 @@ USE_LDCONFIG= yes
USE_RC_SUBR= mdnsd mdnsresponderposix
CPE_VENDOR= apple
-CPE_PRODUCT= ${PORTNAME:tl}
EXTRA_BIN= mDNSClientPosix mDNSNetMonitor mDNSProxyResponderPosix mDNSResponderPosix
EXTRA_MAN1= dns-sd.1
diff --git a/net/mailcommon/distinfo b/net/mailcommon/distinfo
index c87663321364..70aea46adf38 100644
--- a/net/mailcommon/distinfo
+++ b/net/mailcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447517
-SHA256 (KDE/release-service/21.08.2/mailcommon-21.08.2.tar.xz) = 7f67ff6f21cf7630b40d126bb894f884c281f525db459afd35e9c4e172ff0c34
-SIZE (KDE/release-service/21.08.2/mailcommon-21.08.2.tar.xz) = 737072
+TIMESTAMP = 1636032662
+SHA256 (KDE/release-service/21.08.3/mailcommon-21.08.3.tar.xz) = 292c2ee359f51daa1f91acacd1bf48bfe6e5bf109c0f976468c2107a11baeb6e
+SIZE (KDE/release-service/21.08.3/mailcommon-21.08.3.tar.xz) = 737088
diff --git a/net/mailimporter/distinfo b/net/mailimporter/distinfo
index 908ede1c7111..0e9ebbbc424c 100644
--- a/net/mailimporter/distinfo
+++ b/net/mailimporter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447502
-SHA256 (KDE/release-service/21.08.2/mailimporter-21.08.2.tar.xz) = 87d38324b6af3d001006703f912a5ad74ff0a83bed79d109e421f3afe15ba06d
-SIZE (KDE/release-service/21.08.2/mailimporter-21.08.2.tar.xz) = 558244
+TIMESTAMP = 1636032644
+SHA256 (KDE/release-service/21.08.3/mailimporter-21.08.3.tar.xz) = 4cc8bb67799e1fc208372196783fb50b371afb90ed3fb7aa93fbb0120b217503
+SIZE (KDE/release-service/21.08.3/mailimporter-21.08.3.tar.xz) = 558244
diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index 8296916b6484..98affa033a07 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mediastreamer
PORTVERSION= 2.16.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= https://www.linphone.org/releases/sources/mediastreamer/
diff --git a/net/messagelib/distinfo b/net/messagelib/distinfo
index a940252b447f..1200572fa8f8 100644
--- a/net/messagelib/distinfo
+++ b/net/messagelib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447508
-SHA256 (KDE/release-service/21.08.2/messagelib-21.08.2.tar.xz) = 19fa3efd33cd220cec416f553f944e64127e423d45404412875d9c15c98c5d3f
-SIZE (KDE/release-service/21.08.2/messagelib-21.08.2.tar.xz) = 10842396
+TIMESTAMP = 1636032651
+SHA256 (KDE/release-service/21.08.3/messagelib-21.08.3.tar.xz) = e7ddd8a3ee522a49ac6dfa2dd7055f77033bb331af6cf8445a7ced395fa43561
+SIZE (KDE/release-service/21.08.3/messagelib-21.08.3.tar.xz) = 10789696
diff --git a/net/minissdpd/Makefile b/net/minissdpd/Makefile
index fd3e791758d4..62bb7ab58422 100644
--- a/net/minissdpd/Makefile
+++ b/net/minissdpd/Makefile
@@ -1,7 +1,7 @@
# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
PORTNAME= minissdpd
-PORTVERSION= 1.5.20200928
+PORTVERSION= 1.5.20211105
CATEGORIES= net
MASTER_SITES= http://miniupnp.free.fr/files/ \
LOCAL/ehaupt
@@ -17,7 +17,8 @@ USE_RC_SUBR= minissdpd
CFLAGS+= -D_GNU_SOURCE
-PLIST_FILES= sbin/minissdpd man/man8/minissdpd.8.gz
+PLIST_FILES= man/man8/minissdpd.8.gz \
+ sbin/minissdpd
post-extract:
@${MV} ${WRKSRC}/${PORTNAME}.1 ${WRKSRC}/${PORTNAME}.8
diff --git a/net/minissdpd/distinfo b/net/minissdpd/distinfo
index d2f8c248103c..8b3025fabb0d 100644
--- a/net/minissdpd/distinfo
+++ b/net/minissdpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610394178
-SHA256 (minissdpd-1.5.20200928.tar.gz) = 177ab1907cc0fd20c8cafd13ca8674c7ec1828aa6101da9bb066408ccada7350
-SIZE (minissdpd-1.5.20200928.tar.gz) = 37860
+TIMESTAMP = 1637737193
+SHA256 (minissdpd-1.5.20211105.tar.gz) = a073be9c6d9194feaeccf31cd986c48afd2212426b6594e75166cedff1c461aa
+SIZE (minissdpd-1.5.20211105.tar.gz) = 38870
diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index ffde88c40b68..5ae71a7bf289 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -1,8 +1,7 @@
# Created by: Joseph Benden <joe@thrallingpenguin.com>
PORTNAME= mosquitto
-PORTVERSION= 2.0.10
-PORTREVISION= 2
+PORTVERSION= 2.0.13
CATEGORIES= net
MASTER_SITES= https://mosquitto.org/files/source/
diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo
index fec3d35813f8..c08d9badbe5f 100644
--- a/net/mosquitto/distinfo
+++ b/net/mosquitto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627146562
-SHA256 (mosquitto-2.0.10.tar.gz) = 0188f7b21b91d6d80e992b8d6116ba851468b3bd154030e8a003ed28fb6f4a44
-SIZE (mosquitto-2.0.10.tar.gz) = 759106
+TIMESTAMP = 1636491201
+SHA256 (mosquitto-2.0.13.tar.gz) = 9cf83a558f1588e8798edd8647b1632af88e88ef2cd45054e903c517df5bd2cd
+SIZE (mosquitto-2.0.13.tar.gz) = 786806
diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index 206baa1d9059..9e4ed26ee476 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mpd
DISTVERSION= 5.9
-PORTREVISION= 4
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
PKGNAMESUFFIX= 5
diff --git a/net/mpd5/files/patch-l2tp-multihomed b/net/mpd5/files/patch-l2tp-multihomed
index 477c817b9f29..33ec387c37c4 100644
--- a/net/mpd5/files/patch-l2tp-multihomed
+++ b/net/mpd5/files/patch-l2tp-multihomed
@@ -1,55 +1,7 @@
-Index: src/l2tp.c
-===================================================================
---- src/l2tp.c (revision 2418)
-+++ src/l2tp.c (revision 2420)
-@@ -1415,9 +1415,21 @@ L2tpServerEvent(int type, void *arg)
- tun->self_port = s->self_port;
- tun->alive = 1;
-
-- Log(LG_PHYS, ("Incoming L2TP packet from %s %d",
-- u_addrtoa(&tun->peer_addr, namebuf, sizeof(namebuf)), tun->peer_port));
-+ if (u_addrempty(&tun->self_addr) &&
-+ !GetSockDstAddress(s->sock, &tun->self_addr))
-+ Log(LG_PHYS, ("Incoming L2TP packet from %s %d",
-+ u_addrtoa(&tun->peer_addr, namebuf, sizeof(namebuf)),
-+ tun->peer_port));
-+ else {
-+ char buf3[INET_ADDRSTRLEN];
-
-+ Log(LG_PHYS, ("Incoming L2TP packet from %s %d to %s %d",
-+ u_addrtoa(&tun->peer_addr, namebuf, sizeof(namebuf)),
-+ tun->peer_port,
-+ u_addrtoa(&tun->self_addr, buf3, sizeof(buf3)),
-+ tun->self_port));
-+ }
-+
- /* Examine all L2TP links to get best possible fit tunnel parameters. */
- for (k = 0; k < gNumLinks; k++) {
- Link l2;
-@@ -1552,7 +1564,7 @@ L2tpServerEvent(int type, void *arg)
- }
-
- /* Bind socket to a new port */
-- u_addrtosockaddr(&s->self_addr,s->self_port,&sas);
-+ u_addrtosockaddr(&tun->self_addr,tun->self_port,&sas);
- if (NgSendMsg(csock, namebuf, NGM_KSOCKET_COOKIE,
- NGM_KSOCKET_BIND, &sas, sas.ss_len) == -1) {
- Perror("L2TP: bind");
-@@ -1649,6 +1661,10 @@ L2tpListen(Link l)
- SO_REUSEPORT, &one, sizeof(one)) == -1) {
- Perror("L2TP: setsockopt");
- goto fail;
-+ }
-+ if (u_addrempty(&s->self_addr)) {
-+ int on = 1;
-+ setsockopt(s->sock, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on));
- }
- u_addrtosockaddr(&s->self_addr, s->self_port, &sa);
- if (bind(s->sock, (struct sockaddr *)&sa, sa.ss_len) == -1) {
Index: src/util.c
===================================================================
---- src/util.c (revision 2418)
-+++ src/util.c (revision 2420)
+--- src/util.c (revision 2436)
++++ src/util.c (working copy)
@@ -16,8 +16,9 @@
#include <netdb.h>
#include <tcpd.h>
@@ -61,17 +13,18 @@ Index: src/util.c
#include <net/route.h>
#include <netinet/if_ether.h>
#include <net/ethernet.h>
-@@ -1544,5 +1545,48 @@ IfaceSetFlag(const char *ifname, int value)
- return (-1);
+@@ -1545,4 +1546,52 @@ IfaceSetFlag(const char *ifname, int value)
}
close(s);
-+ return (0);
+ return (0);
+}
+
+/*
-+ * Obtain destination address of SOCK_DGRAM IPv4 UDP socket, if possible.
++ * Obtain some data, peer (source) and destination addresses of SOCK_DGRAM IPv4 UDP request.
+ */
-+int GetSockDstAddress(int sock, struct u_addr *addr)
++ssize_t GetDataAddrs(int sock, void *dbuf, size_t dbufsize,
++ struct sockaddr_storage *peer, socklen_t peer_len,
++ struct u_addr *addr)
+{
+ struct {
+ struct msghdr msg;
@@ -82,43 +35,127 @@ Index: src/util.c
+ char space[CMSG_SPACE(sizeof(struct in_addr))];
+ } buf;
+
-+ char io[1024];
+ struct cmsghdr *p;
+ ssize_t size;
+
+ /* Sanity check */
-+ if (addr->family != AF_INET)
-+ return (0);
++ if (addr->family != AF_INET) {
++ errno = EAFNOSUPPORT;
++ return (-1);
++ }
+
-+ memset(&b, 0, sizeof(b));
++ b.msg.msg_name = peer;
++ b.msg.msg_namelen = peer_len;
+ b.msg.msg_iov = &b.iov;
+ b.msg.msg_iovlen = 1;
+ b.msg.msg_control = &buf;
+ b.msg.msg_controllen = sizeof(buf);
-+ b.iov.iov_base = &io;
-+ b.iov.iov_len = sizeof(io);
++ b.msg.msg_flags = 0;
++
++ b.iov.iov_base = dbuf;
++ b.iov.iov_len = dbufsize;
+
+ if ((size = recvmsg(sock, &b.msg, 0)) < 0) {
+ Perror("%s: recvmsg: %s", __FUNCTION__, strerror(errno));
-+ return (0);
++ return (size);
+ }
+
+ p = CMSG_FIRSTHDR(&b.msg);
-+ if (p && p->cmsg_level == IPPROTO_IP && p->cmsg_type == IP_RECVDSTADDR) {
++ if (p && p->cmsg_level == IPPROTO_IP && p->cmsg_type == IP_RECVDSTADDR)
+ memcpy(&addr->u.ip4, CMSG_DATA(p), sizeof(addr->u.ip4));
-+ return (1);
-+ }
- return (0);
++
++ return (size);
}
Index: src/util.h
===================================================================
---- src/util.h (revision 2418)
-+++ src/util.h (revision 2420)
-@@ -98,6 +98,7 @@ extern u_long GenerateMagic(void);
- extern int GetAnyIpAddress(struct u_addr *ipaddr, const char *ifname);
- extern int GetEther(struct u_addr *addr, struct sockaddr_dl *hwaddr);
- extern int GetPeerEther(struct u_addr *addr, struct sockaddr_dl *hwaddr);
-+extern int GetSockDstAddress(int sock, struct u_addr *addr);
+--- src/util.h (revision 2436)
++++ src/util.h (working copy)
+@@ -101,6 +101,10 @@ extern int GetPeerEther(struct u_addr *addr, struct so
extern void ppp_util_ascify(char *buf, size_t max, const char *bytes, size_t len);
extern int IfaceSetFlag(const char *ifname, int value);
++ssize_t GetDataAddrs(int sock, void *dbuf, size_t dbufsize,
++ struct sockaddr_storage *peer, socklen_t peer_len,
++ struct u_addr *addr);
++
+ #ifndef HAVE_NTOA_R
+ extern char *ether_ntoa_r(const struct ether_addr *n, char *a);
+ #endif
+Index: src/l2tp.c
+===================================================================
+--- src/l2tp.c (revision 2436)
++++ src/l2tp.c (working copy)
+@@ -1374,6 +1374,7 @@ L2tpServerEvent(int type, void *arg)
+ struct ngm_mkpeer mkpeer;
+ struct sockaddr_storage peer_sas;
+ struct sockaddr_storage sas;
++ struct u_addr server_addr;
+ const size_t bufsize = 8192;
+ u_int16_t *buf = NULL;
+ char hook[NG_HOOKSIZ];
+@@ -1393,9 +1394,18 @@ L2tpServerEvent(int type, void *arg)
+ /* Allocate buffer */
+ buf = Malloc(MB_PHYS, bufsize);
+
++ u_addrcopy(&s->self_addr, &server_addr);
++
+ /* Read packet */
+ sas_len = sizeof(peer_sas);
+- if ((len = recvfrom(s->sock, buf, bufsize, 0,
++
++ if (u_addrempty(&s->self_addr)) {
++ if ((len = GetDataAddrs(s->sock, buf, bufsize,
++ &peer_sas, sas_len, &server_addr)) == -1) {
++ Perror("L2TP: GetDataAddrs");
++ goto fail;
++ }
++ } else if ((len = recvfrom(s->sock, buf, bufsize, 0,
+ (struct sockaddr *)&peer_sas, &sas_len)) == -1) {
+ Perror("L2TP: recvfrom");
+ goto fail;
+@@ -1415,9 +1425,23 @@ L2tpServerEvent(int type, void *arg)
+ tun->self_port = s->self_port;
+ tun->alive = 1;
+
+- Log(LG_PHYS, ("Incoming L2TP packet from %s %d",
+- u_addrtoa(&tun->peer_addr, namebuf, sizeof(namebuf)), tun->peer_port));
++ if (u_addrempty(&tun->self_addr))
++ u_addrcopy(&server_addr, &tun->self_addr);
+
++ if (u_addrempty(&tun->self_addr))
++ Log(LG_PHYS, ("Incoming L2TP packet from %s %d",
++ u_addrtoa(&tun->peer_addr, namebuf, sizeof(namebuf)),
++ tun->peer_port));
++ else {
++ char buf3[INET_ADDRSTRLEN];
++
++ Log(LG_PHYS, ("Incoming L2TP packet from %s %d to %s %d",
++ u_addrtoa(&tun->peer_addr, namebuf, sizeof(namebuf)),
++ tun->peer_port,
++ u_addrtoa(&tun->self_addr, buf3, sizeof(buf3)),
++ tun->self_port));
++ }
++
+ /* Examine all L2TP links to get best possible fit tunnel parameters. */
+ for (k = 0; k < gNumLinks; k++) {
+ Link l2;
+@@ -1552,7 +1576,7 @@ L2tpServerEvent(int type, void *arg)
+ }
+
+ /* Bind socket to a new port */
+- u_addrtosockaddr(&s->self_addr,s->self_port,&sas);
++ u_addrtosockaddr(&tun->self_addr,tun->self_port,&sas);
+ if (NgSendMsg(csock, namebuf, NGM_KSOCKET_COOKIE,
+ NGM_KSOCKET_BIND, &sas, sas.ss_len) == -1) {
+ Perror("L2TP: bind");
+@@ -1649,6 +1673,10 @@ L2tpListen(Link l)
+ SO_REUSEPORT, &one, sizeof(one)) == -1) {
+ Perror("L2TP: setsockopt");
+ goto fail;
++ }
++ if (u_addrempty(&s->self_addr)) {
++ int on = 1;
++ setsockopt(s->sock, IPPROTO_IP, IP_RECVDSTADDR, &on, sizeof(on));
+ }
+ u_addrtosockaddr(&s->self_addr, s->self_port, &sa);
+ if (bind(s->sock, (struct sockaddr *)&sa, sa.ss_len) == -1) {
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 60abfe18c3e5..bb7fa8918ee2 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,6 +1,6 @@
PORTNAME= mpich
PORTVERSION= 3.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net parallel
MASTER_SITES= https://www.mpich.org/static/downloads/${DISTVERSION}/
@@ -21,7 +21,7 @@ LIB_DEPENDS= libhwloc.so:devel/hwloc2 \
libepoll-shim.so:devel/libepoll-shim
RUN_DEPENDS= bash:shells/bash
-CONFLICTS= mpd-[0-9]* mpich2-[0-9]*
+CONFLICTS= mpd mpich2
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
USES= compiler:c11 libtool perl5 pkgconfig
@@ -55,9 +55,7 @@ DHYDRA_DESC= Make hydra the default process manager
L0_DESC= oneAPI Level Zero support
L0_LIB_DEPENDS= libze_loader.so:devel/level-zero
-L0_CPPFLAGS= -DZE_IPC_MEMORY_FLAG_TBD=ZE_IPC_MEMORY_FLAG_BIAS_CACHED # 1.4.1
-L0_CONFIGURE_ENV_OFF= ac_cv_header_level_zero_ze_api_h=no \
- ac_cv_lib_ze_loader_zeInit=no
+L0_CONFIGURE_OFF= --without-ze
CONFIGURE_ARGS= --enable-fast="" --with-hwloc-prefix=${LOCALBASE} \
--with-libfabric=${LOCALBASE} \
diff --git a/net/mpich/files/patch-l0-1.4.1 b/net/mpich/files/patch-l0-1.4.1
new file mode 100644
index 000000000000..6f70e435377f
--- /dev/null
+++ b/net/mpich/files/patch-l0-1.4.1
@@ -0,0 +1,60 @@
+https://github.com/pmodels/mpich/pull/5623
++ additional fix from https://github.com/nwchemgit/nwchem/issues/463#issuecomment-960359049
+
+src/gpu/mpl_gpu_ze.c:163:71: error: use of undeclared identifier 'ZE_IPC_MEMORY_FLAG_TBD'
+ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr);
+ ^
+
+--- src/mpi/romio/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC
++++ src/mpi/romio/mpl/src/gpu/mpl_gpu_ze.c
+@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip
+ int mpl_err = MPL_SUCCESS;
+ ze_result_t ret;
+ ret =
+- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr);
++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr);
+ if (ret != ZE_RESULT_SUCCESS) {
+ mpl_err = MPL_ERR_GPU_INTERNAL;
+ goto fn_fail;
+--- src/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC
++++ src/mpl/src/gpu/mpl_gpu_ze.c
+@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip
+ int mpl_err = MPL_SUCCESS;
+ ze_result_t ret;
+ ret =
+- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr);
++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr);
+ if (ret != ZE_RESULT_SUCCESS) {
+ mpl_err = MPL_ERR_GPU_INTERNAL;
+ goto fn_fail;
+@@ -191,6 +191,8 @@ int MPL_gpu_query_pointer_attr(const void *ptr, MPL_po
+ ze_device_handle_t device;
+ memset(&ptr_attr, 0, sizeof(ze_memory_allocation_properties_t));
+ ret = zeMemGetAllocProperties(global_ze_context, ptr, &ptr_attr, &device);
++ attr->type = 0;
++ attr->device = 0;
+ ZE_ERR_CHECK(ret);
+ attr->device = device;
+ switch (ptr_attr.type) {
+--- src/pm/hydra2/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC
++++ src/pm/hydra2/mpl/src/gpu/mpl_gpu_ze.c
+@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip
+ int mpl_err = MPL_SUCCESS;
+ ze_result_t ret;
+ ret =
+- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr);
++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr);
+ if (ret != ZE_RESULT_SUCCESS) {
+ mpl_err = MPL_ERR_GPU_INTERNAL;
+ goto fn_fail;
+--- src/pm/hydra/mpl/src/gpu/mpl_gpu_ze.c.orig 2021-05-25 17:37:05 UTC
++++ src/pm/hydra/mpl/src/gpu/mpl_gpu_ze.c
+@@ -160,7 +160,7 @@ int MPL_gpu_ipc_handle_map(MPL_gpu_ipc_mem_handle_t ip
+ int mpl_err = MPL_SUCCESS;
+ ze_result_t ret;
+ ret =
+- zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, ZE_IPC_MEMORY_FLAG_TBD, ptr);
++ zeMemOpenIpcHandle(global_ze_context, dev_handle, ipc_handle, 0, ptr);
+ if (ret != ZE_RESULT_SUCCESS) {
+ mpl_err = MPL_ERR_GPU_INTERNAL;
+ goto fn_fail;
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 6d6023fa4365..41e64570286c 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -56,7 +56,7 @@ LDFLAGS+= -lpthread -lexecinfo
MAKE_ENV= CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
NO_CCACHE= yes
-CONFLICTS= mpd-[0-9]* mpich-3.*
+CONFLICTS= mpd mpich-3.*
VERSO= 8.0.1
VERSOM= ${VERSO:R:R}
diff --git a/net/mvfst/Makefile b/net/mvfst/Makefile
index 02e1d4f412f8..5edf4d12c67b 100644
--- a/net/mvfst/Makefile
+++ b/net/mvfst/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mvfst
-DISTVERSION= g20210701
-PORTREVISION= 1
+DISTVERSION= g20211107
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
@@ -16,11 +15,13 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libglog.so:devel/glog
USES= cmake compiler:c++17-lang cpe
-CPE_VENDOR= facebook
+USE_LDCONFIG= yes
+
USE_GITHUB= yes
GH_ACCOUNT= facebookincubator
-GH_TAGNAME= 5d78c63965239cf6cfacbdc33f7de9b6e1245a3a
-USE_LDCONFIG= yes
+GH_TAGNAME= 248b2dc39bbd36863bbaa50385e8683428610009
+
+CPE_VENDOR= facebook
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_OFF= BUILD_TESTS
diff --git a/net/mvfst/distinfo b/net/mvfst/distinfo
index 41119433d78c..bffe2d472b02 100644
--- a/net/mvfst/distinfo
+++ b/net/mvfst/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625439876
-SHA256 (facebookincubator-mvfst-g20210701-5d78c63965239cf6cfacbdc33f7de9b6e1245a3a_GH0.tar.gz) = 6f1997b9c9764aea8de18fec4708394180da53e4ab6d867a6d0365cd762a2946
-SIZE (facebookincubator-mvfst-g20210701-5d78c63965239cf6cfacbdc33f7de9b6e1245a3a_GH0.tar.gz) = 879391
+TIMESTAMP = 1636329980
+SHA256 (facebookincubator-mvfst-g20211107-248b2dc39bbd36863bbaa50385e8683428610009_GH0.tar.gz) = 1eb038b69f80a73a615ea99c159b7aa62220c85d8bcad1b44d8f646285eace4c
+SIZE (facebookincubator-mvfst-g20211107-248b2dc39bbd36863bbaa50385e8683428610009_GH0.tar.gz) = 1276961
diff --git a/net/nats-server/Makefile b/net/nats-server/Makefile
index 3a8d87f0f029..32236dd42e1c 100644
--- a/net/nats-server/Makefile
+++ b/net/nats-server/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nats-server
-PORTVERSION= 2.6.2
+PORTVERSION= 2.6.5
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/nats-server/distinfo b/net/nats-server/distinfo
index 65d5815cccb7..b9daac681e48 100644
--- a/net/nats-server/distinfo
+++ b/net/nats-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634654458
-SHA256 (nats-io-nats-server-v2.6.2_GH0.tar.gz) = fbbad2370bc92a548e9a797b941c79b19d7affd5b1db622229afbf043f9932fe
-SIZE (nats-io-nats-server-v2.6.2_GH0.tar.gz) = 2710925
+TIMESTAMP = 1637939080
+SHA256 (nats-io-nats-server-v2.6.5_GH0.tar.gz) = 7d2fed3db144523c4554833412d352f2fba7ddf295dc7be13a3c0739f925eb18
+SIZE (nats-io-nats-server-v2.6.5_GH0.tar.gz) = 2734977
diff --git a/net/nats-streaming-server/Makefile b/net/nats-streaming-server/Makefile
index 36a569c15671..1e8ed0178c37 100644
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nats-streaming-server
-PORTVERSION= 0.23.0
+PORTVERSION= 0.23.2
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/nats-streaming-server/distinfo b/net/nats-streaming-server/distinfo
index d7c7d1f699b7..1399ef8fa8d3 100644
--- a/net/nats-streaming-server/distinfo
+++ b/net/nats-streaming-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634743054
-SHA256 (nats-io-nats-streaming-server-v0.23.0_GH0.tar.gz) = da7bed2ea1eba6cda2b4bcd1b65ee728dde98370e3b91c007b39dc24387b867f
-SIZE (nats-io-nats-streaming-server-v0.23.0_GH0.tar.gz) = 3151573
+TIMESTAMP = 1638718726
+SHA256 (nats-io-nats-streaming-server-v0.23.2_GH0.tar.gz) = 48e0eb7b3bba3e3fa04ce56dac32e79e5d1a137b5ec7dd1b151aa1fde17343d8
+SIZE (nats-io-nats-streaming-server-v0.23.2_GH0.tar.gz) = 3160613
diff --git a/net/nbd-server/Makefile b/net/nbd-server/Makefile
index 7bbc969c7057..cdc658248e5f 100644
--- a/net/nbd-server/Makefile
+++ b/net/nbd-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Christian Laursen <xi@borderworlds.dk>
PORTNAME= nbd
-PORTVERSION= 3.21
+PORTVERSION= 3.23
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF
@@ -13,7 +13,7 @@ COMMENT= Server for the Linux network block device (nbd)
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= cpe gnome pkgconfig
+USES= bison:wrapper cpe gnome pkgconfig
CPE_VENDOR= wouter_verhelst
USE_GNOME= glib20
diff --git a/net/nbd-server/distinfo b/net/nbd-server/distinfo
index d6bfc5fb5698..ee6404861b3b 100644
--- a/net/nbd-server/distinfo
+++ b/net/nbd-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611707005
-SHA256 (nbd-3.21.tar.gz) = 2c7866be37e63756c00ce54a0655e7a00cc76d256f9cf1c995d1dbe8879c5ae1
-SIZE (nbd-3.21.tar.gz) = 1063667
+TIMESTAMP = 1638663024
+SHA256 (nbd-3.23.tar.gz) = 3c969cd9cf83dae9276f999b7ff8e31e32411c8cc751221e698861bc05b8f76c
+SIZE (nbd-3.23.tar.gz) = 1105568
diff --git a/net/ndisc6/Makefile b/net/ndisc6/Makefile
index 4da48df43acd..097140daf529 100644
--- a/net/ndisc6/Makefile
+++ b/net/ndisc6/Makefile
@@ -1,35 +1,34 @@
# Created by: rdenis@simphalempin.com
PORTNAME= ndisc6
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.5
CATEGORIES= net
MASTER_SITES= http://www.remlab.net/files/ndisc6/ \
http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
-MAINTAINER= m.tsatsenko@gmail.com
+MAINTAINER= ports@FreeBSD.org
COMMENT= IPv6 network diagnostic tools
LICENSE= GPLv2
USES= compiler:c11 perl5 tar:bzip2
+USE_RC_SUBR= rdnssd
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var"
+CONFIGURE_ARGS= --disable-suid-install \
+ --localstatedir="${PREFIX}/var"
CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl
MAKE_ENV= CHOWNPROG=:
-LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
+NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
-NLS_USES= gettext
-NLS_LDFLAGS= -lintl
-
-USE_RC_SUBR= rdnssd
+NLS_LDFLAGS= -lintl
PORTDOCS= AUTHORS NEWS README
diff --git a/net/ndisc6/distinfo b/net/ndisc6/distinfo
index 3d27da086875..eac1eb80fd07 100644
--- a/net/ndisc6/distinfo
+++ b/net/ndisc6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547299650
-SHA256 (ndisc6-1.0.4.tar.bz2) = abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f
-SIZE (ndisc6-1.0.4.tar.bz2) = 264071
+TIMESTAMP = 1635021302
+SHA256 (ndisc6-1.0.5.tar.bz2) = 36932f9fc47e2844abcda7550fa1343b3af4b4208dfb61e0c9d9224aad5df351
+SIZE (ndisc6-1.0.5.tar.bz2) = 267126
diff --git a/net/ndisc6/pkg-descr b/net/ndisc6/pkg-descr
index 33a42daefb9f..98b254696689 100644
--- a/net/ndisc6/pkg-descr
+++ b/net/ndisc6/pkg-descr
@@ -2,3 +2,5 @@ ndisc6 is a collection of diagnostic tools for IPv6 networks,
including ICMPv6 Neighbor Discovery tools (rdisc6 and ndisc6),
an UDP, TCP and ICMP-based IPv6 traceroute implementation and
a simplistic bandwidth measurement program (tcpspray6).
+
+WWW: https://www.remlab.net/ndisc6/
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index f378560cea6f..176912f0efc7 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -75,7 +75,7 @@ LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers
SHEBANG_GLOB= afpstats
-CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]*
+CONFLICTS= bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit
.include <bsd.port.pre.mk>
diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile
index e4e0329840cd..7589e41d7c33 100644
--- a/net/netpipes/Makefile
+++ b/net/netpipes/Makefile
@@ -9,7 +9,7 @@ DISTNAME= netpipes-4.2-export
MAINTAINER= doconnor@gsoft.com.au
COMMENT= Group of shell utilities to connect programs to sockets
-CONFLICTS= timelimit-[0-9]*
+CONFLICTS= timelimit
NO_WRKSUBDIR= yes
diff --git a/net/nncp/Makefile b/net/nncp/Makefile
index 904a83e89896..d4436d4e6c27 100644
--- a/net/nncp/Makefile
+++ b/net/nncp/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nncp
-DISTVERSION= 7.7.0
+DISTVERSION= 8.0.2
CATEGORIES= net
MASTER_SITES= http://www.nncpgo.org/download/
diff --git a/net/nncp/distinfo b/net/nncp/distinfo
index 0a9ed1a5ac84..c93fef12fc04 100644
--- a/net/nncp/distinfo
+++ b/net/nncp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632162321
-SHA256 (nncp-7.7.0.tar.xz) = a692a2fc963cb0a45bfd5b7f497a26d0bd7386304f9fa3cd526dc69fca3929ee
-SIZE (nncp-7.7.0.tar.xz) = 1209032
+TIMESTAMP = 1636540407
+SHA256 (nncp-8.0.2.tar.xz) = 84c6fb6c0764df115c51ee424eef4b9c847755224350a6cc484f3ab3c779b9d3
+SIZE (nncp-8.0.2.tar.xz) = 1233252
diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
index 90999086598b..bafd6760861b 100644
--- a/net/nss-pam-ldapd/Makefile
+++ b/net/nss-pam-ldapd/Makefile
@@ -44,7 +44,7 @@ OPTIONS_MULTI_MG1= PAM NSS
PAM_DESC= Build pam_ldap
NSS_DESC= Build nss support
OPTIONS_DEFAULT+= PAM NSS
-CONFLICTS+= nss-pam-ldapd-sasl-[0-9]*
+CONFLICTS+= nss-pam-ldapd-sasl
.endif
USERS= nslcd
diff --git a/net/ntpsec/Makefile b/net/ntpsec/Makefile
index 27f513c2a098..9f88b8aea9a3 100644
--- a/net/ntpsec/Makefile
+++ b/net/ntpsec/Makefile
@@ -1,7 +1,6 @@
PORTNAME= ntpsec
DISTVERSIONPREFIX= NTPsec_
-DISTVERSION= 1_2_0
-PORTREVISION= 2
+DISTVERSION= 1_2_1
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
@@ -22,6 +21,8 @@ CONFLICTS= ntp ntp-devel openntpd
MAKE_ENV= NOSYNC=1 # workaround for the console problem: https://gitlab.com/NTPsec/ntpsec/issues/599
+TEST_TARGET= check
+
OPTIONS_DEFINE= DOCS
DOCS_CONFIGURE_ENABLE= doc
diff --git a/net/ntpsec/distinfo b/net/ntpsec/distinfo
index 00ea2be0fe23..682c6268e786 100644
--- a/net/ntpsec/distinfo
+++ b/net/ntpsec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611163291
-SHA256 (ntpsec-ntpsec-NTPsec_1_2_0_GH0.tar.gz) = 73963f0c696c1af17f00a25b60e3c35aac44d791e73343dc6fbcebba1512134c
-SIZE (ntpsec-ntpsec-NTPsec_1_2_0_GH0.tar.gz) = 2570091
+TIMESTAMP = 1638942957
+SHA256 (ntpsec-ntpsec-NTPsec_1_2_1_GH0.tar.gz) = bbb8fd1b7af365a355b42a2bd4467d8e6f5f8bc68e524e127c37dd2455e51ed4
+SIZE (ntpsec-ntpsec-NTPsec_1_2_1_GH0.tar.gz) = 2624383
diff --git a/net/oha/Makefile b/net/oha/Makefile
index a2fc772ea6c3..4183d6af3282 100644
--- a/net/oha/Makefile
+++ b/net/oha/Makefile
@@ -2,8 +2,8 @@
PORTNAME= oha
DISTVERSIONPREFIX= v
-DISTVERSION= 0.4.4
-PORTREVISION= 6
+DISTVERSION= 0.4.7
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= otis@FreeBSD.org
@@ -15,237 +15,211 @@ USES= cargo ssl
USE_GITHUB= yes
GH_ACCOUNT= hatoo
-CARGO_CRATES= addr2line-0.14.0 \
- adler-0.2.3 \
- ansi_term-0.11.0 \
- anyhow-1.0.34 \
- assert_cmd-1.0.1 \
- async-trait-0.1.41 \
+CARGO_CRATES= ansi_term-0.11.0 \
+ anyhow-1.0.44 \
+ assert_cmd-2.0.2 \
+ async-trait-0.1.51 \
atty-0.2.14 \
- autocfg-0.1.7 \
autocfg-1.0.1 \
- average-0.10.6 \
- backtrace-0.3.54 \
- base64-0.12.3 \
+ average-0.13.1 \
base64-0.13.0 \
- bitflags-1.2.1 \
- block-buffer-0.7.3 \
+ bitflags-1.3.2 \
block-buffer-0.9.0 \
- block-padding-0.1.5 \
+ bstr-0.2.17 \
buf_redux-0.8.4 \
- byte-tools-0.3.1 \
- byte-unit-4.0.9 \
- byteorder-1.3.4 \
- bytes-0.5.6 \
+ bumpalo-3.7.1 \
+ byte-unit-4.0.12 \
+ byteorder-1.4.3 \
+ bytes-1.1.0 \
cassowary-0.3.0 \
- cc-1.0.62 \
- cfg-if-0.1.10 \
+ cc-1.0.71 \
cfg-if-1.0.0 \
clap-2.33.3 \
- cloudabi-0.0.3 \
- cloudabi-0.1.0 \
- conv-0.3.3 \
- core-foundation-0.9.1 \
- core-foundation-sys-0.8.2 \
- cpuid-bool-0.1.2 \
- crossterm-0.18.2 \
- crossterm_winapi-0.6.2 \
- custom_derive-0.1.7 \
- difference-2.0.0 \
- digest-0.8.1 \
+ core-foundation-0.9.2 \
+ core-foundation-sys-0.8.3 \
+ cpufeatures-0.2.1 \
+ crossterm-0.20.0 \
+ crossterm-0.21.0 \
+ crossterm_winapi-0.8.0 \
+ data-encoding-2.3.2 \
+ difflib-0.4.0 \
digest-0.9.0 \
doc-comment-0.3.3 \
- dtoa-0.4.6 \
+ easy-cast-0.4.4 \
+ either-1.6.1 \
enum-as-inner-0.3.3 \
- fake-simd-0.1.2 \
- float-ord-0.2.0 \
- flume-0.9.1 \
+ float-ord-0.3.2 \
+ flume-0.10.9 \
fnv-1.0.7 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
- form_urlencoded-1.0.0 \
- fuchsia-cprng-0.1.1 \
- fuchsia-zircon-0.3.3 \
- fuchsia-zircon-sys-0.3.3 \
- futures-0.3.8 \
- futures-channel-0.3.8 \
- futures-core-0.3.8 \
- futures-executor-0.3.8 \
- futures-io-0.3.8 \
- futures-macro-0.3.8 \
- futures-sink-0.3.8 \
- futures-task-0.3.8 \
- futures-util-0.3.8 \
- generic-array-0.12.3 \
+ form_urlencoded-1.0.1 \
+ futures-0.3.17 \
+ futures-channel-0.3.17 \
+ futures-core-0.3.17 \
+ futures-executor-0.3.17 \
+ futures-io-0.3.17 \
+ futures-macro-0.3.17 \
+ futures-sink-0.3.17 \
+ futures-task-0.3.17 \
+ futures-util-0.3.17 \
generic-array-0.14.4 \
- get-port-3.0.0 \
- getrandom-0.1.15 \
- gimli-0.23.0 \
- h2-0.2.7 \
- hashbrown-0.9.1 \
- headers-0.3.2 \
+ get-port-4.0.0 \
+ getrandom-0.1.16 \
+ getrandom-0.2.3 \
+ h2-0.3.6 \
+ hashbrown-0.11.2 \
+ headers-0.3.4 \
headers-core-0.2.0 \
- heck-0.3.1 \
- hermit-abi-0.1.17 \
+ heck-0.3.3 \
+ hermit-abi-0.1.19 \
hostname-0.3.1 \
- http-0.2.1 \
- http-body-0.3.1 \
- httparse-1.3.4 \
- httpdate-0.3.2 \
- humantime-2.0.1 \
- hyper-0.13.9 \
- idna-0.2.0 \
- indexmap-1.6.0 \
- input_buffer-0.3.1 \
- instant-0.1.8 \
- iovec-0.1.4 \
+ http-0.2.5 \
+ http-body-0.4.3 \
+ httparse-1.5.1 \
+ httpdate-1.0.1 \
+ humantime-2.1.0 \
+ hyper-0.14.13 \
+ idna-0.2.3 \
+ indexmap-1.7.0 \
+ input_buffer-0.4.0 \
+ instant-0.1.11 \
ipconfig-0.2.2 \
- itoa-0.4.6 \
- kernel32-sys-0.2.2 \
+ ipnet-2.3.1 \
+ itertools-0.10.1 \
+ itoa-0.4.8 \
+ js-sys-0.3.55 \
lazy_static-1.4.0 \
- libc-0.2.80 \
- linked-hash-map-0.5.3 \
- lock_api-0.4.2 \
- log-0.4.11 \
+ libc-0.2.103 \
+ libm-0.2.1 \
+ linked-hash-map-0.5.4 \
+ lock_api-0.4.5 \
+ log-0.4.14 \
lru-cache-0.1.2 \
match_cfg-0.1.0 \
- matches-0.1.8 \
- memchr-2.3.4 \
+ matches-0.1.9 \
+ memchr-2.4.1 \
mime-0.3.16 \
mime_guess-2.0.3 \
- miniz_oxide-0.4.3 \
- mio-0.6.22 \
- mio-0.7.6 \
- mio-named-pipes-0.1.7 \
- mio-uds-0.6.8 \
- miow-0.2.1 \
- miow-0.3.6 \
- multipart-0.17.0 \
- native-tls-0.2.6 \
- net2-0.2.35 \
+ mio-0.7.13 \
+ miow-0.3.7 \
+ multipart-0.17.1 \
+ nanorand-0.6.1 \
+ native-tls-0.2.8 \
ntapi-0.3.6 \
num-traits-0.2.14 \
num_cpus-1.13.0 \
- object-0.22.0 \
- once_cell-1.5.2 \
- opaque-debug-0.2.3 \
+ once_cell-1.8.0 \
opaque-debug-0.3.0 \
- openssl-0.10.30 \
- openssl-probe-0.1.2 \
- openssl-sys-0.9.58 \
- parking_lot-0.11.1 \
- parking_lot_core-0.8.0 \
+ openssl-0.10.36 \
+ openssl-probe-0.1.4 \
+ openssl-sys-0.9.67 \
+ parking_lot-0.11.2 \
+ parking_lot_core-0.8.5 \
percent-encoding-2.1.0 \
- pin-project-0.4.27 \
- pin-project-1.0.1 \
- pin-project-internal-0.4.27 \
- pin-project-internal-1.0.1 \
- pin-project-lite-0.1.11 \
+ pin-project-1.0.8 \
+ pin-project-internal-1.0.8 \
+ pin-project-lite-0.2.7 \
pin-utils-0.1.0 \
- pkg-config-0.3.19 \
- ppv-lite86-0.2.10 \
- predicates-1.0.5 \
- predicates-core-1.0.0 \
- predicates-tree-1.0.0 \
+ pkg-config-0.3.20 \
+ ppv-lite86-0.2.14 \
+ predicates-2.0.3 \
+ predicates-core-1.0.2 \
+ predicates-tree-1.0.4 \
proc-macro-error-1.0.4 \
proc-macro-error-attr-1.0.4 \
proc-macro-hack-0.5.19 \
- proc-macro-nested-0.1.6 \
- proc-macro2-1.0.24 \
+ proc-macro-nested-0.1.7 \
+ proc-macro2-1.0.30 \
quick-error-1.2.3 \
- quote-1.0.7 \
- rand-0.6.5 \
+ quote-1.0.10 \
rand-0.7.3 \
- rand_chacha-0.1.1 \
+ rand-0.8.4 \
rand_chacha-0.2.2 \
- rand_core-0.3.1 \
- rand_core-0.4.2 \
+ rand_chacha-0.3.1 \
rand_core-0.5.1 \
- rand_hc-0.1.0 \
+ rand_core-0.6.3 \
rand_hc-0.2.0 \
- rand_isaac-0.1.1 \
- rand_jitter-0.1.4 \
- rand_os-0.1.3 \
- rand_pcg-0.1.2 \
- rand_xorshift-0.1.1 \
- rdrand-0.4.0 \
- redox_syscall-0.1.57 \
+ rand_hc-0.3.1 \
+ redox_syscall-0.2.10 \
+ regex-automata-0.1.10 \
remove_dir_all-0.5.3 \
resolv-conf-0.7.0 \
- rlimit-0.5.3 \
- rustc-demangle-0.1.18 \
+ rlimit-0.6.2 \
ryu-1.0.5 \
safemem-0.3.3 \
schannel-0.1.19 \
scoped-tls-1.0.0 \
scopeguard-1.1.0 \
- security-framework-2.0.0 \
- security-framework-sys-2.0.0 \
- serde-1.0.117 \
- serde_json-1.0.59 \
- serde_urlencoded-0.6.1 \
- sha-1-0.8.2 \
- sha-1-0.9.2 \
- signal-hook-0.1.16 \
- signal-hook-registry-1.2.2 \
- slab-0.4.2 \
- smallvec-1.5.0 \
- socket2-0.3.16 \
- spinning_top-0.2.2 \
+ security-framework-2.4.2 \
+ security-framework-sys-2.4.2 \
+ serde-1.0.130 \
+ serde_json-1.0.68 \
+ serde_urlencoded-0.7.0 \
+ sha-1-0.9.8 \
+ signal-hook-0.3.10 \
+ signal-hook-mio-0.2.1 \
+ signal-hook-registry-1.4.0 \
+ slab-0.4.5 \
+ smallvec-1.7.0 \
+ socket2-0.3.19 \
+ socket2-0.4.2 \
+ spin-0.9.2 \
strsim-0.8.0 \
- structopt-0.3.20 \
- structopt-derive-0.4.13 \
- syn-1.0.48 \
- tempfile-3.1.0 \
+ structopt-0.3.23 \
+ structopt-derive-0.4.16 \
+ syn-1.0.80 \
+ tempfile-3.2.0 \
+ termtree-0.2.1 \
textwrap-0.11.0 \
- thiserror-1.0.22 \
- thiserror-impl-1.0.22 \
- time-0.1.44 \
- tinyvec-1.0.1 \
+ thiserror-1.0.30 \
+ thiserror-impl-1.0.30 \
+ time-0.1.43 \
+ tinyvec-1.5.0 \
tinyvec_macros-0.1.0 \
- tokio-0.2.23 \
- tokio-macros-0.2.6 \
- tokio-native-tls-0.1.0 \
- tokio-tungstenite-0.11.0 \
- tokio-util-0.3.1 \
- tower-service-0.3.0 \
- tracing-0.1.21 \
- tracing-core-0.1.17 \
- tracing-futures-0.2.4 \
- treeline-0.1.0 \
- trust-dns-proto-0.19.6 \
- trust-dns-resolver-0.19.6 \
+ tokio-1.12.0 \
+ tokio-macros-1.5.0 \
+ tokio-native-tls-0.3.0 \
+ tokio-stream-0.1.7 \
+ tokio-tungstenite-0.13.0 \
+ tokio-util-0.6.8 \
+ tower-service-0.3.1 \
+ tracing-0.1.29 \
+ tracing-core-0.1.21 \
+ trust-dns-proto-0.20.3 \
+ trust-dns-resolver-0.20.3 \
try-lock-0.2.3 \
- tui-0.13.0 \
- tungstenite-0.11.1 \
+ tui-0.16.0 \
+ tungstenite-0.12.0 \
twoway-0.1.8 \
- typenum-1.12.0 \
+ typenum-1.14.0 \
unicase-2.6.0 \
- unicode-bidi-0.3.4 \
- unicode-normalization-0.1.15 \
- unicode-segmentation-1.7.0 \
- unicode-width-0.1.8 \
- unicode-xid-0.2.1 \
- url-2.2.0 \
- urlencoding-1.1.1 \
- utf-8-0.7.5 \
- utf8-width-0.1.4 \
- vcpkg-0.2.10 \
+ unicode-bidi-0.3.7 \
+ unicode-normalization-0.1.19 \
+ unicode-segmentation-1.8.0 \
+ unicode-width-0.1.9 \
+ unicode-xid-0.2.2 \
+ url-2.2.2 \
+ utf-8-0.7.6 \
+ utf8-width-0.1.5 \
+ vcpkg-0.2.15 \
vec_map-0.8.2 \
- version_check-0.9.2 \
+ version_check-0.9.3 \
wait-timeout-0.2.0 \
want-0.3.0 \
- warp-0.2.5 \
+ warp-0.3.1 \
wasi-0.9.0+wasi-snapshot-preview1 \
- wasi-0.10.0+wasi-snapshot-preview1 \
+ wasi-0.10.2+wasi-snapshot-preview1 \
+ wasm-bindgen-0.2.78 \
+ wasm-bindgen-backend-0.2.78 \
+ wasm-bindgen-macro-0.2.78 \
+ wasm-bindgen-macro-support-0.2.78 \
+ wasm-bindgen-shared-0.2.78 \
widestring-0.4.3 \
- winapi-0.2.8 \
winapi-0.3.9 \
- winapi-build-0.1.1 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
- winreg-0.6.2 \
- ws2_32-sys-0.2.1
+ winreg-0.6.2
PLIST_FILES= bin/oha
diff --git a/net/oha/distinfo b/net/oha/distinfo
index d1d2831db68a..8f434984f9a5 100644
--- a/net/oha/distinfo
+++ b/net/oha/distinfo
@@ -1,465 +1,413 @@
-TIMESTAMP = 1616155661
-SHA256 (rust/crates/addr2line-0.14.0.tar.gz) = 7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423
-SIZE (rust/crates/addr2line-0.14.0.tar.gz) = 30065
-SHA256 (rust/crates/adler-0.2.3.tar.gz) = ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e
-SIZE (rust/crates/adler-0.2.3.tar.gz) = 12168
-SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
-SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
-SHA256 (rust/crates/anyhow-1.0.34.tar.gz) = bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7
-SIZE (rust/crates/anyhow-1.0.34.tar.gz) = 28632
-SHA256 (rust/crates/assert_cmd-1.0.1.tar.gz) = c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da
-SIZE (rust/crates/assert_cmd-1.0.1.tar.gz) = 24575
-SHA256 (rust/crates/async-trait-0.1.41.tar.gz) = b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0
-SIZE (rust/crates/async-trait-0.1.41.tar.gz) = 24830
-SHA256 (rust/crates/atty-0.2.14.tar.gz) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
-SIZE (rust/crates/atty-0.2.14.tar.gz) = 5470
-SHA256 (rust/crates/autocfg-0.1.7.tar.gz) = 1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2
-SIZE (rust/crates/autocfg-0.1.7.tar.gz) = 12158
-SHA256 (rust/crates/autocfg-1.0.1.tar.gz) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
-SIZE (rust/crates/autocfg-1.0.1.tar.gz) = 12908
-SHA256 (rust/crates/average-0.10.6.tar.gz) = 323c168002ab149ce5258ebaf5177751e7c4d5ebfe87aad8000ca9aee7d3ecda
-SIZE (rust/crates/average-0.10.6.tar.gz) = 20763
-SHA256 (rust/crates/backtrace-0.3.54.tar.gz) = 2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28
-SIZE (rust/crates/backtrace-0.3.54.tar.gz) = 72827
-SHA256 (rust/crates/base64-0.12.3.tar.gz) = 3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff
-SIZE (rust/crates/base64-0.12.3.tar.gz) = 57545
-SHA256 (rust/crates/base64-0.13.0.tar.gz) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
-SIZE (rust/crates/base64-0.13.0.tar.gz) = 62070
-SHA256 (rust/crates/bitflags-1.2.1.tar.gz) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
-SIZE (rust/crates/bitflags-1.2.1.tar.gz) = 16745
-SHA256 (rust/crates/block-buffer-0.7.3.tar.gz) = c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b
-SIZE (rust/crates/block-buffer-0.7.3.tar.gz) = 7179
-SHA256 (rust/crates/block-buffer-0.9.0.tar.gz) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
-SIZE (rust/crates/block-buffer-0.9.0.tar.gz) = 7108
-SHA256 (rust/crates/block-padding-0.1.5.tar.gz) = fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5
-SIZE (rust/crates/block-padding-0.1.5.tar.gz) = 7342
-SHA256 (rust/crates/buf_redux-0.8.4.tar.gz) = b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f
-SIZE (rust/crates/buf_redux-0.8.4.tar.gz) = 26608
-SHA256 (rust/crates/byte-tools-0.3.1.tar.gz) = e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7
-SIZE (rust/crates/byte-tools-0.3.1.tar.gz) = 5526
-SHA256 (rust/crates/byte-unit-4.0.9.tar.gz) = 1c8758c32833faaae35b24a73d332e62d0528e89076ae841c63940e37008b153
-SIZE (rust/crates/byte-unit-4.0.9.tar.gz) = 11009
-SHA256 (rust/crates/byteorder-1.3.4.tar.gz) = 08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de
-SIZE (rust/crates/byteorder-1.3.4.tar.gz) = 21943
-SHA256 (rust/crates/bytes-0.5.6.tar.gz) = 0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38
-SIZE (rust/crates/bytes-0.5.6.tar.gz) = 46291
-SHA256 (rust/crates/cassowary-0.3.0.tar.gz) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
-SIZE (rust/crates/cassowary-0.3.0.tar.gz) = 22876
-SHA256 (rust/crates/cc-1.0.62.tar.gz) = f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40
-SIZE (rust/crates/cc-1.0.62.tar.gz) = 52639
-SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
-SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
-SHA256 (rust/crates/cfg-if-1.0.0.tar.gz) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
-SIZE (rust/crates/cfg-if-1.0.0.tar.gz) = 7934
-SHA256 (rust/crates/clap-2.33.3.tar.gz) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
-SIZE (rust/crates/clap-2.33.3.tar.gz) = 201925
-SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
-SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156
-SHA256 (rust/crates/cloudabi-0.1.0.tar.gz) = 4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467
-SIZE (rust/crates/cloudabi-0.1.0.tar.gz) = 22687
-SHA256 (rust/crates/conv-0.3.3.tar.gz) = 78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299
-SIZE (rust/crates/conv-0.3.3.tar.gz) = 22124
-SHA256 (rust/crates/core-foundation-0.9.1.tar.gz) = 0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62
-SIZE (rust/crates/core-foundation-0.9.1.tar.gz) = 25985
-SHA256 (rust/crates/core-foundation-sys-0.8.2.tar.gz) = ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b
-SIZE (rust/crates/core-foundation-sys-0.8.2.tar.gz) = 17461
-SHA256 (rust/crates/cpuid-bool-0.1.2.tar.gz) = 8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634
-SIZE (rust/crates/cpuid-bool-0.1.2.tar.gz) = 7173
-SHA256 (rust/crates/crossterm-0.18.2.tar.gz) = 4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb
-SIZE (rust/crates/crossterm-0.18.2.tar.gz) = 108404
-SHA256 (rust/crates/crossterm_winapi-0.6.2.tar.gz) = c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db
-SIZE (rust/crates/crossterm_winapi-0.6.2.tar.gz) = 14962
-SHA256 (rust/crates/custom_derive-0.1.7.tar.gz) = ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9
-SIZE (rust/crates/custom_derive-0.1.7.tar.gz) = 10700
-SHA256 (rust/crates/difference-2.0.0.tar.gz) = 524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198
-SIZE (rust/crates/difference-2.0.0.tar.gz) = 147616
-SHA256 (rust/crates/digest-0.8.1.tar.gz) = f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5
-SIZE (rust/crates/digest-0.8.1.tar.gz) = 9449
-SHA256 (rust/crates/digest-0.9.0.tar.gz) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066
-SIZE (rust/crates/digest-0.9.0.tar.gz) = 13247
-SHA256 (rust/crates/doc-comment-0.3.3.tar.gz) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
-SIZE (rust/crates/doc-comment-0.3.3.tar.gz) = 4123
-SHA256 (rust/crates/dtoa-0.4.6.tar.gz) = 134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b
-SIZE (rust/crates/dtoa-0.4.6.tar.gz) = 15979
-SHA256 (rust/crates/enum-as-inner-0.3.3.tar.gz) = 7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595
-SIZE (rust/crates/enum-as-inner-0.3.3.tar.gz) = 11450
-SHA256 (rust/crates/fake-simd-0.1.2.tar.gz) = e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed
-SIZE (rust/crates/fake-simd-0.1.2.tar.gz) = 5398
-SHA256 (rust/crates/float-ord-0.2.0.tar.gz) = 7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e
-SIZE (rust/crates/float-ord-0.2.0.tar.gz) = 7367
-SHA256 (rust/crates/flume-0.9.1.tar.gz) = d9e818efa7776f4dd7df0e542f877f7a5a87bddd6a1a10f59a7732b71ffb9d55
-SIZE (rust/crates/flume-0.9.1.tar.gz) = 59416
-SHA256 (rust/crates/fnv-1.0.7.tar.gz) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
-SIZE (rust/crates/fnv-1.0.7.tar.gz) = 11266
-SHA256 (rust/crates/foreign-types-0.3.2.tar.gz) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
-SIZE (rust/crates/foreign-types-0.3.2.tar.gz) = 7504
-SHA256 (rust/crates/foreign-types-shared-0.1.1.tar.gz) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
-SIZE (rust/crates/foreign-types-shared-0.1.1.tar.gz) = 5672
-SHA256 (rust/crates/form_urlencoded-1.0.0.tar.gz) = ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00
-SIZE (rust/crates/form_urlencoded-1.0.0.tar.gz) = 8412
-SHA256 (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
-SIZE (rust/crates/fuchsia-cprng-0.1.1.tar.gz) = 2950
-SHA256 (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82
-SIZE (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 22565
-SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7
-SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191
-SHA256 (rust/crates/futures-0.3.8.tar.gz) = 9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0
-SIZE (rust/crates/futures-0.3.8.tar.gz) = 40380
-SHA256 (rust/crates/futures-channel-0.3.8.tar.gz) = 4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64
-SIZE (rust/crates/futures-channel-0.3.8.tar.gz) = 29476
-SHA256 (rust/crates/futures-core-0.3.8.tar.gz) = 847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748
-SIZE (rust/crates/futures-core-0.3.8.tar.gz) = 13857
-SHA256 (rust/crates/futures-executor-0.3.8.tar.gz) = 4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65
-SIZE (rust/crates/futures-executor-0.3.8.tar.gz) = 16653
-SHA256 (rust/crates/futures-io-0.3.8.tar.gz) = 611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb
-SIZE (rust/crates/futures-io-0.3.8.tar.gz) = 9131
-SHA256 (rust/crates/futures-macro-0.3.8.tar.gz) = 77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556
-SIZE (rust/crates/futures-macro-0.3.8.tar.gz) = 9766
-SHA256 (rust/crates/futures-sink-0.3.8.tar.gz) = f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d
-SIZE (rust/crates/futures-sink-0.3.8.tar.gz) = 7733
-SHA256 (rust/crates/futures-task-0.3.8.tar.gz) = 7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d
-SIZE (rust/crates/futures-task-0.3.8.tar.gz) = 11118
-SHA256 (rust/crates/futures-util-0.3.8.tar.gz) = d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2
-SIZE (rust/crates/futures-util-0.3.8.tar.gz) = 134020
-SHA256 (rust/crates/generic-array-0.12.3.tar.gz) = c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec
-SIZE (rust/crates/generic-array-0.12.3.tar.gz) = 18017
-SHA256 (rust/crates/generic-array-0.14.4.tar.gz) = 501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817
-SIZE (rust/crates/generic-array-0.14.4.tar.gz) = 28916
-SHA256 (rust/crates/get-port-3.0.0.tar.gz) = ac6c41a39c60ae1fc5bf0e220347ce90fa1e4bb0fcdac65b09bb5f4576bebc84
-SIZE (rust/crates/get-port-3.0.0.tar.gz) = 1763
-SHA256 (rust/crates/getrandom-0.1.15.tar.gz) = fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6
-SIZE (rust/crates/getrandom-0.1.15.tar.gz) = 24786
-SHA256 (rust/crates/gimli-0.23.0.tar.gz) = f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce
-SIZE (rust/crates/gimli-0.23.0.tar.gz) = 702175
-SHA256 (rust/crates/h2-0.2.7.tar.gz) = 5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535
-SIZE (rust/crates/h2-0.2.7.tar.gz) = 156989
-SHA256 (rust/crates/hashbrown-0.9.1.tar.gz) = d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04
-SIZE (rust/crates/hashbrown-0.9.1.tar.gz) = 77734
-SHA256 (rust/crates/headers-0.3.2.tar.gz) = ed18eb2459bf1a09ad2d6b1547840c3e5e62882fa09b9a6a20b1de8e3228848f
-SIZE (rust/crates/headers-0.3.2.tar.gz) = 67402
-SHA256 (rust/crates/headers-core-0.2.0.tar.gz) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
-SIZE (rust/crates/headers-core-0.2.0.tar.gz) = 2380
-SHA256 (rust/crates/heck-0.3.1.tar.gz) = 20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205
-SIZE (rust/crates/heck-0.3.1.tar.gz) = 54666
-SHA256 (rust/crates/hermit-abi-0.1.17.tar.gz) = 5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8
-SIZE (rust/crates/hermit-abi-0.1.17.tar.gz) = 10065
-SHA256 (rust/crates/hostname-0.3.1.tar.gz) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
-SIZE (rust/crates/hostname-0.3.1.tar.gz) = 9272
-SHA256 (rust/crates/http-0.2.1.tar.gz) = 28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9
-SIZE (rust/crates/http-0.2.1.tar.gz) = 102231
-SHA256 (rust/crates/http-body-0.3.1.tar.gz) = 13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b
-SIZE (rust/crates/http-body-0.3.1.tar.gz) = 5394
-SHA256 (rust/crates/httparse-1.3.4.tar.gz) = cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9
-SIZE (rust/crates/httparse-1.3.4.tar.gz) = 23739
-SHA256 (rust/crates/httpdate-0.3.2.tar.gz) = 494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47
-SIZE (rust/crates/httpdate-0.3.2.tar.gz) = 10768
-SHA256 (rust/crates/humantime-2.0.1.tar.gz) = 3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a
-SIZE (rust/crates/humantime-2.0.1.tar.gz) = 17381
-SHA256 (rust/crates/hyper-0.13.9.tar.gz) = f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf
-SIZE (rust/crates/hyper-0.13.9.tar.gz) = 142251
-SHA256 (rust/crates/idna-0.2.0.tar.gz) = 02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9
-SIZE (rust/crates/idna-0.2.0.tar.gz) = 257203
-SHA256 (rust/crates/indexmap-1.6.0.tar.gz) = 55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2
-SIZE (rust/crates/indexmap-1.6.0.tar.gz) = 47565
-SHA256 (rust/crates/input_buffer-0.3.1.tar.gz) = 19a8a95243d5a0398cae618ec29477c6e3cb631152be5c19481f80bc71559754
-SIZE (rust/crates/input_buffer-0.3.1.tar.gz) = 7812
-SHA256 (rust/crates/instant-0.1.8.tar.gz) = cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613
-SIZE (rust/crates/instant-0.1.8.tar.gz) = 5076
-SHA256 (rust/crates/iovec-0.1.4.tar.gz) = b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e
-SIZE (rust/crates/iovec-0.1.4.tar.gz) = 8720
-SHA256 (rust/crates/ipconfig-0.2.2.tar.gz) = f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7
-SIZE (rust/crates/ipconfig-0.2.2.tar.gz) = 23017
-SHA256 (rust/crates/itoa-0.4.6.tar.gz) = dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6
-SIZE (rust/crates/itoa-0.4.6.tar.gz) = 12167
-SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d
-SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537
-SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
-SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
-SHA256 (rust/crates/libc-0.2.80.tar.gz) = 4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614
-SIZE (rust/crates/libc-0.2.80.tar.gz) = 513503
-SHA256 (rust/crates/linked-hash-map-0.5.3.tar.gz) = 8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a
-SIZE (rust/crates/linked-hash-map-0.5.3.tar.gz) = 16130
-SHA256 (rust/crates/lock_api-0.4.2.tar.gz) = dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312
-SIZE (rust/crates/lock_api-0.4.2.tar.gz) = 20375
-SHA256 (rust/crates/log-0.4.11.tar.gz) = 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b
-SIZE (rust/crates/log-0.4.11.tar.gz) = 36276
-SHA256 (rust/crates/lru-cache-0.1.2.tar.gz) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
-SIZE (rust/crates/lru-cache-0.1.2.tar.gz) = 9307
-SHA256 (rust/crates/match_cfg-0.1.0.tar.gz) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
-SIZE (rust/crates/match_cfg-0.1.0.tar.gz) = 7153
-SHA256 (rust/crates/matches-0.1.8.tar.gz) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
-SIZE (rust/crates/matches-0.1.8.tar.gz) = 2216
-SHA256 (rust/crates/memchr-2.3.4.tar.gz) = 0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525
-SIZE (rust/crates/memchr-2.3.4.tar.gz) = 23077
-SHA256 (rust/crates/mime-0.3.16.tar.gz) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
-SIZE (rust/crates/mime-0.3.16.tar.gz) = 15206
-SHA256 (rust/crates/mime_guess-2.0.3.tar.gz) = 2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212
-SIZE (rust/crates/mime_guess-2.0.3.tar.gz) = 27437
-SHA256 (rust/crates/miniz_oxide-0.4.3.tar.gz) = 0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d
-SIZE (rust/crates/miniz_oxide-0.4.3.tar.gz) = 50058
-SHA256 (rust/crates/mio-0.6.22.tar.gz) = fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430
-SIZE (rust/crates/mio-0.6.22.tar.gz) = 102782
-SHA256 (rust/crates/mio-0.7.6.tar.gz) = f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b
-SIZE (rust/crates/mio-0.7.6.tar.gz) = 84093
-SHA256 (rust/crates/mio-named-pipes-0.1.7.tar.gz) = 0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656
-SIZE (rust/crates/mio-named-pipes-0.1.7.tar.gz) = 15140
-SHA256 (rust/crates/mio-uds-0.6.8.tar.gz) = afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0
-SIZE (rust/crates/mio-uds-0.6.8.tar.gz) = 11496
-SHA256 (rust/crates/miow-0.2.1.tar.gz) = 8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919
-SIZE (rust/crates/miow-0.2.1.tar.gz) = 21133
-SHA256 (rust/crates/miow-0.3.6.tar.gz) = 5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897
-SIZE (rust/crates/miow-0.3.6.tar.gz) = 24533
-SHA256 (rust/crates/multipart-0.17.0.tar.gz) = 8209c33c951f07387a8497841122fc6f712165e3f9bda3e6be4645b58188f676
-SIZE (rust/crates/multipart-0.17.0.tar.gz) = 64244
-SHA256 (rust/crates/native-tls-0.2.6.tar.gz) = 6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f
-SIZE (rust/crates/native-tls-0.2.6.tar.gz) = 31552
-SHA256 (rust/crates/net2-0.2.35.tar.gz) = 3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853
-SIZE (rust/crates/net2-0.2.35.tar.gz) = 20660
-SHA256 (rust/crates/ntapi-0.3.6.tar.gz) = 3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44
-SIZE (rust/crates/ntapi-0.3.6.tar.gz) = 127221
-SHA256 (rust/crates/num-traits-0.2.14.tar.gz) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
-SIZE (rust/crates/num-traits-0.2.14.tar.gz) = 45476
-SHA256 (rust/crates/num_cpus-1.13.0.tar.gz) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
-SIZE (rust/crates/num_cpus-1.13.0.tar.gz) = 14704
-SHA256 (rust/crates/object-0.22.0.tar.gz) = 8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397
-SIZE (rust/crates/object-0.22.0.tar.gz) = 181505
-SHA256 (rust/crates/once_cell-1.5.2.tar.gz) = 13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0
-SIZE (rust/crates/once_cell-1.5.2.tar.gz) = 27660
-SHA256 (rust/crates/opaque-debug-0.2.3.tar.gz) = 2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c
-SIZE (rust/crates/opaque-debug-0.2.3.tar.gz) = 5643
-SHA256 (rust/crates/opaque-debug-0.3.0.tar.gz) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
-SIZE (rust/crates/opaque-debug-0.3.0.tar.gz) = 5767
-SHA256 (rust/crates/openssl-0.10.30.tar.gz) = 8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4
-SIZE (rust/crates/openssl-0.10.30.tar.gz) = 191808
-SHA256 (rust/crates/openssl-probe-0.1.2.tar.gz) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de
-SIZE (rust/crates/openssl-probe-0.1.2.tar.gz) = 6427
-SHA256 (rust/crates/openssl-sys-0.9.58.tar.gz) = a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de
-SIZE (rust/crates/openssl-sys-0.9.58.tar.gz) = 47014
-SHA256 (rust/crates/parking_lot-0.11.1.tar.gz) = 6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb
-SIZE (rust/crates/parking_lot-0.11.1.tar.gz) = 39854
-SHA256 (rust/crates/parking_lot_core-0.8.0.tar.gz) = c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b
-SIZE (rust/crates/parking_lot_core-0.8.0.tar.gz) = 33870
-SHA256 (rust/crates/percent-encoding-2.1.0.tar.gz) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
-SIZE (rust/crates/percent-encoding-2.1.0.tar.gz) = 9748
-SHA256 (rust/crates/pin-project-0.4.27.tar.gz) = 2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15
-SIZE (rust/crates/pin-project-0.4.27.tar.gz) = 50964
-SHA256 (rust/crates/pin-project-1.0.1.tar.gz) = ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841
-SIZE (rust/crates/pin-project-1.0.1.tar.gz) = 54113
-SHA256 (rust/crates/pin-project-internal-0.4.27.tar.gz) = 65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895
-SIZE (rust/crates/pin-project-internal-0.4.27.tar.gz) = 29739
-SHA256 (rust/crates/pin-project-internal-1.0.1.tar.gz) = 81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86
-SIZE (rust/crates/pin-project-internal-1.0.1.tar.gz) = 26953
-SHA256 (rust/crates/pin-project-lite-0.1.11.tar.gz) = c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b
-SIZE (rust/crates/pin-project-lite-0.1.11.tar.gz) = 25308
-SHA256 (rust/crates/pin-utils-0.1.0.tar.gz) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
-SIZE (rust/crates/pin-utils-0.1.0.tar.gz) = 7580
-SHA256 (rust/crates/pkg-config-0.3.19.tar.gz) = 3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c
-SIZE (rust/crates/pkg-config-0.3.19.tar.gz) = 15451
-SHA256 (rust/crates/ppv-lite86-0.2.10.tar.gz) = ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857
-SIZE (rust/crates/ppv-lite86-0.2.10.tar.gz) = 20915
-SHA256 (rust/crates/predicates-1.0.5.tar.gz) = 96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a
-SIZE (rust/crates/predicates-1.0.5.tar.gz) = 26097
-SHA256 (rust/crates/predicates-core-1.0.0.tar.gz) = 06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178
-SIZE (rust/crates/predicates-core-1.0.0.tar.gz) = 8066
-SHA256 (rust/crates/predicates-tree-1.0.0.tar.gz) = 8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124
-SIZE (rust/crates/predicates-tree-1.0.0.tar.gz) = 6251
-SHA256 (rust/crates/proc-macro-error-1.0.4.tar.gz) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
-SIZE (rust/crates/proc-macro-error-1.0.4.tar.gz) = 25293
-SHA256 (rust/crates/proc-macro-error-attr-1.0.4.tar.gz) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
-SIZE (rust/crates/proc-macro-error-attr-1.0.4.tar.gz) = 7971
-SHA256 (rust/crates/proc-macro-hack-0.5.19.tar.gz) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
-SIZE (rust/crates/proc-macro-hack-0.5.19.tar.gz) = 15556
-SHA256 (rust/crates/proc-macro-nested-0.1.6.tar.gz) = eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a
-SIZE (rust/crates/proc-macro-nested-0.1.6.tar.gz) = 6498
-SHA256 (rust/crates/proc-macro2-1.0.24.tar.gz) = 1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71
-SIZE (rust/crates/proc-macro2-1.0.24.tar.gz) = 37716
-SHA256 (rust/crates/quick-error-1.2.3.tar.gz) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
-SIZE (rust/crates/quick-error-1.2.3.tar.gz) = 15066
-SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
-SIZE (rust/crates/quote-1.0.7.tar.gz) = 25170
-SHA256 (rust/crates/rand-0.6.5.tar.gz) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca
-SIZE (rust/crates/rand-0.6.5.tar.gz) = 104814
-SHA256 (rust/crates/rand-0.7.3.tar.gz) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
-SIZE (rust/crates/rand-0.7.3.tar.gz) = 112246
-SHA256 (rust/crates/rand_chacha-0.1.1.tar.gz) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef
-SIZE (rust/crates/rand_chacha-0.1.1.tar.gz) = 11703
-SHA256 (rust/crates/rand_chacha-0.2.2.tar.gz) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
-SIZE (rust/crates/rand_chacha-0.2.2.tar.gz) = 13267
-SHA256 (rust/crates/rand_core-0.3.1.tar.gz) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
-SIZE (rust/crates/rand_core-0.3.1.tar.gz) = 15483
-SHA256 (rust/crates/rand_core-0.4.2.tar.gz) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
-SIZE (rust/crates/rand_core-0.4.2.tar.gz) = 20243
-SHA256 (rust/crates/rand_core-0.5.1.tar.gz) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
-SIZE (rust/crates/rand_core-0.5.1.tar.gz) = 21116
-SHA256 (rust/crates/rand_hc-0.1.0.tar.gz) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4
-SIZE (rust/crates/rand_hc-0.1.0.tar.gz) = 11644
-SHA256 (rust/crates/rand_hc-0.2.0.tar.gz) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
-SIZE (rust/crates/rand_hc-0.2.0.tar.gz) = 11670
-SHA256 (rust/crates/rand_isaac-0.1.1.tar.gz) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08
-SIZE (rust/crates/rand_isaac-0.1.1.tar.gz) = 16020
-SHA256 (rust/crates/rand_jitter-0.1.4.tar.gz) = 1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b
-SIZE (rust/crates/rand_jitter-0.1.4.tar.gz) = 18409
-SHA256 (rust/crates/rand_os-0.1.3.tar.gz) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071
-SIZE (rust/crates/rand_os-0.1.3.tar.gz) = 18965
-SHA256 (rust/crates/rand_pcg-0.1.2.tar.gz) = abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44
-SIZE (rust/crates/rand_pcg-0.1.2.tar.gz) = 10844
-SHA256 (rust/crates/rand_xorshift-0.1.1.tar.gz) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c
-SIZE (rust/crates/rand_xorshift-0.1.1.tar.gz) = 8997
-SHA256 (rust/crates/rdrand-0.4.0.tar.gz) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
-SIZE (rust/crates/rdrand-0.4.0.tar.gz) = 6456
-SHA256 (rust/crates/redox_syscall-0.1.57.tar.gz) = 41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce
-SIZE (rust/crates/redox_syscall-0.1.57.tar.gz) = 17087
-SHA256 (rust/crates/remove_dir_all-0.5.3.tar.gz) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
-SIZE (rust/crates/remove_dir_all-0.5.3.tar.gz) = 9184
-SHA256 (rust/crates/resolv-conf-0.7.0.tar.gz) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
-SIZE (rust/crates/resolv-conf-0.7.0.tar.gz) = 17352
-SHA256 (rust/crates/rlimit-0.5.3.tar.gz) = 6e7148757b4951f04391d2b301b2e3597d504c4d2434212d542b73c1a6b3f847
-SIZE (rust/crates/rlimit-0.5.3.tar.gz) = 13385
-SHA256 (rust/crates/rustc-demangle-0.1.18.tar.gz) = 6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232
-SIZE (rust/crates/rustc-demangle-0.1.18.tar.gz) = 19913
-SHA256 (rust/crates/ryu-1.0.5.tar.gz) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
-SIZE (rust/crates/ryu-1.0.5.tar.gz) = 49570
-SHA256 (rust/crates/safemem-0.3.3.tar.gz) = ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072
-SIZE (rust/crates/safemem-0.3.3.tar.gz) = 7778
-SHA256 (rust/crates/schannel-0.1.19.tar.gz) = 8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75
-SIZE (rust/crates/schannel-0.1.19.tar.gz) = 42755
-SHA256 (rust/crates/scoped-tls-1.0.0.tar.gz) = ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2
-SIZE (rust/crates/scoped-tls-1.0.0.tar.gz) = 9146
-SHA256 (rust/crates/scopeguard-1.1.0.tar.gz) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
-SIZE (rust/crates/scopeguard-1.1.0.tar.gz) = 11470
-SHA256 (rust/crates/security-framework-2.0.0.tar.gz) = c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69
-SIZE (rust/crates/security-framework-2.0.0.tar.gz) = 54526
-SHA256 (rust/crates/security-framework-sys-2.0.0.tar.gz) = f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b
-SIZE (rust/crates/security-framework-sys-2.0.0.tar.gz) = 10518
-SHA256 (rust/crates/serde-1.0.117.tar.gz) = b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a
-SIZE (rust/crates/serde-1.0.117.tar.gz) = 74505
-SHA256 (rust/crates/serde_json-1.0.59.tar.gz) = dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95
-SIZE (rust/crates/serde_json-1.0.59.tar.gz) = 114956
-SHA256 (rust/crates/serde_urlencoded-0.6.1.tar.gz) = 9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97
-SIZE (rust/crates/serde_urlencoded-0.6.1.tar.gz) = 12540
-SHA256 (rust/crates/sha-1-0.8.2.tar.gz) = f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df
-SIZE (rust/crates/sha-1-0.8.2.tar.gz) = 12338
-SHA256 (rust/crates/sha-1-0.9.2.tar.gz) = ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c
-SIZE (rust/crates/sha-1-0.9.2.tar.gz) = 13581
-SHA256 (rust/crates/signal-hook-0.1.16.tar.gz) = 604508c1418b99dfe1925ca9224829bb2a8a9a04dda655cc01fcad46f4ab05ed
-SIZE (rust/crates/signal-hook-0.1.16.tar.gz) = 27183
-SHA256 (rust/crates/signal-hook-registry-1.2.2.tar.gz) = ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab
-SIZE (rust/crates/signal-hook-registry-1.2.2.tar.gz) = 18127
-SHA256 (rust/crates/slab-0.4.2.tar.gz) = c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8
-SIZE (rust/crates/slab-0.4.2.tar.gz) = 10136
-SHA256 (rust/crates/smallvec-1.5.0.tar.gz) = 7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85
-SIZE (rust/crates/smallvec-1.5.0.tar.gz) = 26303
-SHA256 (rust/crates/socket2-0.3.16.tar.gz) = 7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d
-SIZE (rust/crates/socket2-0.3.16.tar.gz) = 49461
-SHA256 (rust/crates/spinning_top-0.2.2.tar.gz) = 7e529d73e80d64b5f2631f9035113347c578a1c9c7774b83a2b880788459ab36
-SIZE (rust/crates/spinning_top-0.2.2.tar.gz) = 48735
-SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
-SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309
-SHA256 (rust/crates/structopt-0.3.20.tar.gz) = 126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8
-SIZE (rust/crates/structopt-0.3.20.tar.gz) = 50699
-SHA256 (rust/crates/structopt-derive-0.4.13.tar.gz) = 65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8
-SIZE (rust/crates/structopt-derive-0.4.13.tar.gz) = 20115
-SHA256 (rust/crates/syn-1.0.48.tar.gz) = cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac
-SIZE (rust/crates/syn-1.0.48.tar.gz) = 225747
-SHA256 (rust/crates/tempfile-3.1.0.tar.gz) = 7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9
-SIZE (rust/crates/tempfile-3.1.0.tar.gz) = 25823
-SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
-SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322
-SHA256 (rust/crates/thiserror-1.0.22.tar.gz) = 0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e
-SIZE (rust/crates/thiserror-1.0.22.tar.gz) = 16603
-SHA256 (rust/crates/thiserror-impl-1.0.22.tar.gz) = 9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56
-SIZE (rust/crates/thiserror-impl-1.0.22.tar.gz) = 13289
-SHA256 (rust/crates/time-0.1.44.tar.gz) = 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255
-SIZE (rust/crates/time-0.1.44.tar.gz) = 28885
-SHA256 (rust/crates/tinyvec-1.0.1.tar.gz) = b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575
-SIZE (rust/crates/tinyvec-1.0.1.tar.gz) = 33836
-SHA256 (rust/crates/tinyvec_macros-0.1.0.tar.gz) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
-SIZE (rust/crates/tinyvec_macros-0.1.0.tar.gz) = 1817
-SHA256 (rust/crates/tokio-0.2.23.tar.gz) = a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff
-SIZE (rust/crates/tokio-0.2.23.tar.gz) = 413538
-SHA256 (rust/crates/tokio-macros-0.2.6.tar.gz) = e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a
-SIZE (rust/crates/tokio-macros-0.2.6.tar.gz) = 6460
-SHA256 (rust/crates/tokio-native-tls-0.1.0.tar.gz) = cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069
-SIZE (rust/crates/tokio-native-tls-0.1.0.tar.gz) = 20812
-SHA256 (rust/crates/tokio-tungstenite-0.11.0.tar.gz) = 6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c
-SIZE (rust/crates/tokio-tungstenite-0.11.0.tar.gz) = 30705
-SHA256 (rust/crates/tokio-util-0.3.1.tar.gz) = be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499
-SIZE (rust/crates/tokio-util-0.3.1.tar.gz) = 27233
-SHA256 (rust/crates/tower-service-0.3.0.tar.gz) = e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860
-SIZE (rust/crates/tower-service-0.3.0.tar.gz) = 5321
-SHA256 (rust/crates/tracing-0.1.21.tar.gz) = b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27
-SIZE (rust/crates/tracing-0.1.21.tar.gz) = 65404
-SHA256 (rust/crates/tracing-core-0.1.17.tar.gz) = f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f
-SIZE (rust/crates/tracing-core-0.1.17.tar.gz) = 47774
-SHA256 (rust/crates/tracing-futures-0.2.4.tar.gz) = ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c
-SIZE (rust/crates/tracing-futures-0.2.4.tar.gz) = 10274
-SHA256 (rust/crates/treeline-0.1.0.tar.gz) = a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41
-SIZE (rust/crates/treeline-0.1.0.tar.gz) = 3855
-SHA256 (rust/crates/trust-dns-proto-0.19.6.tar.gz) = 53861fcb288a166aae4c508ae558ed18b53838db728d4d310aad08270a7d4c2b
-SIZE (rust/crates/trust-dns-proto-0.19.6.tar.gz) = 208515
-SHA256 (rust/crates/trust-dns-resolver-0.19.6.tar.gz) = 6759e8efc40465547b0dfce9500d733c65f969a4cbbfbe3ccf68daaa46ef179e
-SIZE (rust/crates/trust-dns-resolver-0.19.6.tar.gz) = 74774
-SHA256 (rust/crates/try-lock-0.2.3.tar.gz) = 59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642
-SIZE (rust/crates/try-lock-0.2.3.tar.gz) = 4158
-SHA256 (rust/crates/tui-0.13.0.tar.gz) = 5d4e6c82bb967df89f20b875fa8835fab5d5622c6a5efa574a1f0b6d0aa6e8f6
-SIZE (rust/crates/tui-0.13.0.tar.gz) = 134742
-SHA256 (rust/crates/tungstenite-0.11.1.tar.gz) = f0308d80d86700c5878b9ef6321f020f29b1bb9d5ff3cab25e75e23f3a492a23
-SIZE (rust/crates/tungstenite-0.11.1.tar.gz) = 53895
-SHA256 (rust/crates/twoway-0.1.8.tar.gz) = 59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1
-SIZE (rust/crates/twoway-0.1.8.tar.gz) = 31774
-SHA256 (rust/crates/typenum-1.12.0.tar.gz) = 373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33
-SIZE (rust/crates/typenum-1.12.0.tar.gz) = 36037
-SHA256 (rust/crates/unicase-2.6.0.tar.gz) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6
-SIZE (rust/crates/unicase-2.6.0.tar.gz) = 23478
-SHA256 (rust/crates/unicode-bidi-0.3.4.tar.gz) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5
-SIZE (rust/crates/unicode-bidi-0.3.4.tar.gz) = 32228
-SHA256 (rust/crates/unicode-normalization-0.1.15.tar.gz) = f1e9a0b71dba18b6fa17c7b3dcf1440bb3522552deb2f84bf47dabd9fb7e5570
-SIZE (rust/crates/unicode-normalization-0.1.15.tar.gz) = 92721
-SHA256 (rust/crates/unicode-segmentation-1.7.0.tar.gz) = db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae
-SIZE (rust/crates/unicode-segmentation-1.7.0.tar.gz) = 93069
-SHA256 (rust/crates/unicode-width-0.1.8.tar.gz) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
-SIZE (rust/crates/unicode-width-0.1.8.tar.gz) = 16732
-SHA256 (rust/crates/unicode-xid-0.2.1.tar.gz) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
-SIZE (rust/crates/unicode-xid-0.2.1.tar.gz) = 14392
-SHA256 (rust/crates/url-2.2.0.tar.gz) = 5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e
-SIZE (rust/crates/url-2.2.0.tar.gz) = 42787
-SHA256 (rust/crates/urlencoding-1.1.1.tar.gz) = c9232eb53352b4442e40d7900465dfc534e8cb2dc8f18656fcb2ac16112b5593
-SIZE (rust/crates/urlencoding-1.1.1.tar.gz) = 3711
-SHA256 (rust/crates/utf-8-0.7.5.tar.gz) = 05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7
-SIZE (rust/crates/utf-8-0.7.5.tar.gz) = 6551
-SHA256 (rust/crates/utf8-width-0.1.4.tar.gz) = 9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa
-SIZE (rust/crates/utf8-width-0.1.4.tar.gz) = 2995
-SHA256 (rust/crates/vcpkg-0.2.10.tar.gz) = 6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c
-SIZE (rust/crates/vcpkg-0.2.10.tar.gz) = 11504
-SHA256 (rust/crates/vec_map-0.8.2.tar.gz) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
-SIZE (rust/crates/vec_map-0.8.2.tar.gz) = 14466
-SHA256 (rust/crates/version_check-0.9.2.tar.gz) = b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed
-SIZE (rust/crates/version_check-0.9.2.tar.gz) = 11979
-SHA256 (rust/crates/wait-timeout-0.2.0.tar.gz) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
-SIZE (rust/crates/wait-timeout-0.2.0.tar.gz) = 12441
-SHA256 (rust/crates/want-0.3.0.tar.gz) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
-SIZE (rust/crates/want-0.3.0.tar.gz) = 6550
-SHA256 (rust/crates/warp-0.2.5.tar.gz) = f41be6df54c97904af01aa23e613d4521eed7ab23537cede692d4058f6449407
-SIZE (rust/crates/warp-0.2.5.tar.gz) = 110850
-SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
-SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.tar.gz) = 31521
-SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.tar.gz) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
-SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.tar.gz) = 26964
-SHA256 (rust/crates/widestring-0.4.3.tar.gz) = c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c
-SIZE (rust/crates/widestring-0.4.3.tar.gz) = 26215
-SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a
-SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145
-SHA256 (rust/crates/winapi-0.3.9.tar.gz) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
-SIZE (rust/crates/winapi-0.3.9.tar.gz) = 1200382
-SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc
-SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669
-SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
-SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
-SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
-SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
-SHA256 (rust/crates/winreg-0.6.2.tar.gz) = b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9
-SIZE (rust/crates/winreg-0.6.2.tar.gz) = 19338
-SHA256 (rust/crates/ws2_32-sys-0.2.1.tar.gz) = d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e
-SIZE (rust/crates/ws2_32-sys-0.2.1.tar.gz) = 4697
-SHA256 (hatoo-oha-v0.4.4_GH0.tar.gz) = e40fa987e0a2ab8f04b00ea90892b0ccdcecbb2e8d2cafc2ca318aa44a7dcf03
-SIZE (hatoo-oha-v0.4.4_GH0.tar.gz) = 1054033
+TIMESTAMP = 1636376495
+SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
+SHA256 (rust/crates/anyhow-1.0.44.crate) = 61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1
+SIZE (rust/crates/anyhow-1.0.44.crate) = 35067
+SHA256 (rust/crates/assert_cmd-2.0.2.crate) = e996dc7940838b7ef1096b882e29ec30a3149a3a443cdc8dba19ed382eca1fe2
+SIZE (rust/crates/assert_cmd-2.0.2.crate) = 29433
+SHA256 (rust/crates/async-trait-0.1.51.crate) = 44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e
+SIZE (rust/crates/async-trait-0.1.51.crate) = 25531
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
+SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
+SHA256 (rust/crates/average-0.13.1.crate) = 843ec791d3f24503bbf72bbd5e49a3ab4dbb4bcd0a8ef6b0c908efa73caa27b1
+SIZE (rust/crates/average-0.13.1.crate) = 22948
+SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
+SIZE (rust/crates/base64-0.13.0.crate) = 62070
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
+SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
+SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223
+SIZE (rust/crates/bstr-0.2.17.crate) = 330350
+SHA256 (rust/crates/buf_redux-0.8.4.crate) = b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f
+SIZE (rust/crates/buf_redux-0.8.4.crate) = 26608
+SHA256 (rust/crates/bumpalo-3.7.1.crate) = d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538
+SIZE (rust/crates/bumpalo-3.7.1.crate) = 78573
+SHA256 (rust/crates/byte-unit-4.0.12.crate) = 063197e6eb4b775b64160dedde7a0986bb2836cce140e9492e9e96f28e18bcd8
+SIZE (rust/crates/byte-unit-4.0.12.crate) = 10873
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bytes-1.1.0.crate) = c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8
+SIZE (rust/crates/bytes-1.1.0.crate) = 49640
+SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
+SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
+SHA256 (rust/crates/cc-1.0.71.crate) = 79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd
+SIZE (rust/crates/cc-1.0.71.crate) = 57452
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/clap-2.33.3.crate) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.crate) = 201925
+SHA256 (rust/crates/core-foundation-0.9.2.crate) = 6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3
+SIZE (rust/crates/core-foundation-0.9.2.crate) = 26857
+SHA256 (rust/crates/core-foundation-sys-0.8.3.crate) = 5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc
+SIZE (rust/crates/core-foundation-sys-0.8.3.crate) = 17519
+SHA256 (rust/crates/cpufeatures-0.2.1.crate) = 95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469
+SIZE (rust/crates/cpufeatures-0.2.1.crate) = 10500
+SHA256 (rust/crates/crossterm-0.20.0.crate) = c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d
+SIZE (rust/crates/crossterm-0.20.0.crate) = 103025
+SHA256 (rust/crates/crossterm-0.21.0.crate) = 486d44227f71a1ef39554c0dc47e44b9f4139927c75043312690c3f476d1d788
+SIZE (rust/crates/crossterm-0.21.0.crate) = 105045
+SHA256 (rust/crates/crossterm_winapi-0.8.0.crate) = 3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507
+SIZE (rust/crates/crossterm_winapi-0.8.0.crate) = 15531
+SHA256 (rust/crates/data-encoding-2.3.2.crate) = 3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57
+SIZE (rust/crates/data-encoding-2.3.2.crate) = 19159
+SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
+SIZE (rust/crates/difflib-0.4.0.crate) = 7638
+SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066
+SIZE (rust/crates/digest-0.9.0.crate) = 13247
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/easy-cast-0.4.4.crate) = 4bd102ee8c418348759919b83b81cdbdc933ffe29740b903df448b4bafaa348e
+SIZE (rust/crates/easy-cast-0.4.4.crate) = 11814
+SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
+SIZE (rust/crates/either-1.6.1.crate) = 13641
+SHA256 (rust/crates/enum-as-inner-0.3.3.crate) = 7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595
+SIZE (rust/crates/enum-as-inner-0.3.3.crate) = 11450
+SHA256 (rust/crates/float-ord-0.3.2.crate) = 8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d
+SIZE (rust/crates/float-ord-0.3.2.crate) = 7683
+SHA256 (rust/crates/flume-0.10.9.crate) = 24c3fd473b3a903a62609e413ed7538f99e10b665ecb502b5e481a95283f8ab4
+SIZE (rust/crates/flume-0.10.9.crate) = 64304
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/form_urlencoded-1.0.1.crate) = 5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191
+SIZE (rust/crates/form_urlencoded-1.0.1.crate) = 8773
+SHA256 (rust/crates/futures-0.3.17.crate) = a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca
+SIZE (rust/crates/futures-0.3.17.crate) = 47388
+SHA256 (rust/crates/futures-channel-0.3.17.crate) = 5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888
+SIZE (rust/crates/futures-channel-0.3.17.crate) = 31765
+SHA256 (rust/crates/futures-core-0.3.17.crate) = 88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d
+SIZE (rust/crates/futures-core-0.3.17.crate) = 14478
+SHA256 (rust/crates/futures-executor-0.3.17.crate) = 45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c
+SIZE (rust/crates/futures-executor-0.3.17.crate) = 17102
+SHA256 (rust/crates/futures-io-0.3.17.crate) = 522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377
+SIZE (rust/crates/futures-io-0.3.17.crate) = 9050
+SHA256 (rust/crates/futures-macro-0.3.17.crate) = 18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb
+SIZE (rust/crates/futures-macro-0.3.17.crate) = 11830
+SHA256 (rust/crates/futures-sink-0.3.17.crate) = 36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11
+SIZE (rust/crates/futures-sink-0.3.17.crate) = 7663
+SHA256 (rust/crates/futures-task-0.3.17.crate) = 1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99
+SIZE (rust/crates/futures-task-0.3.17.crate) = 11712
+SHA256 (rust/crates/futures-util-0.3.17.crate) = 36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481
+SIZE (rust/crates/futures-util-0.3.17.crate) = 147679
+SHA256 (rust/crates/generic-array-0.14.4.crate) = 501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817
+SIZE (rust/crates/generic-array-0.14.4.crate) = 28916
+SHA256 (rust/crates/get-port-4.0.0.crate) = 888123007db34fbff15b5a347d46364dfbad531d6cb43de52cc0b62558f570e2
+SIZE (rust/crates/get-port-4.0.0.crate) = 2659
+SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
+SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
+SHA256 (rust/crates/getrandom-0.2.3.crate) = 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753
+SIZE (rust/crates/getrandom-0.2.3.crate) = 26261
+SHA256 (rust/crates/h2-0.3.6.crate) = 6c06815895acec637cd6ed6e9662c935b866d20a106f8361892893a7d9234964
+SIZE (rust/crates/h2-0.3.6.crate) = 158838
+SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
+SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
+SHA256 (rust/crates/headers-0.3.4.crate) = f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855
+SIZE (rust/crates/headers-0.3.4.crate) = 67384
+SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
+SIZE (rust/crates/headers-core-0.2.0.crate) = 2380
+SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c
+SIZE (rust/crates/heck-0.3.3.crate) = 10260
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
+SIZE (rust/crates/hostname-0.3.1.crate) = 9272
+SHA256 (rust/crates/http-0.2.5.crate) = 1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b
+SIZE (rust/crates/http-0.2.5.crate) = 106297
+SHA256 (rust/crates/http-body-0.4.3.crate) = 399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5
+SIZE (rust/crates/http-body-0.4.3.crate) = 7660
+SHA256 (rust/crates/httparse-1.5.1.crate) = acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503
+SIZE (rust/crates/httparse-1.5.1.crate) = 26758
+SHA256 (rust/crates/httpdate-1.0.1.crate) = 6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440
+SIZE (rust/crates/httpdate-1.0.1.crate) = 10293
+SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
+SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/hyper-0.14.13.crate) = 15d1cfb9e4f68655fa04c01f59edb405b6074a0f7118ea881e5026e4a1cd8593
+SIZE (rust/crates/hyper-0.14.13.crate) = 171435
+SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
+SIZE (rust/crates/idna-0.2.3.crate) = 271023
+SHA256 (rust/crates/indexmap-1.7.0.crate) = bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5
+SIZE (rust/crates/indexmap-1.7.0.crate) = 50363
+SHA256 (rust/crates/input_buffer-0.4.0.crate) = f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413
+SIZE (rust/crates/input_buffer-0.4.0.crate) = 7771
+SHA256 (rust/crates/instant-0.1.11.crate) = 716d3d89f35ac6a34fd0eed635395f4c3b76fa889338a4632e5231a8684216bd
+SIZE (rust/crates/instant-0.1.11.crate) = 5408
+SHA256 (rust/crates/ipconfig-0.2.2.crate) = f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7
+SIZE (rust/crates/ipconfig-0.2.2.crate) = 23017
+SHA256 (rust/crates/ipnet-2.3.1.crate) = 68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9
+SIZE (rust/crates/ipnet-2.3.1.crate) = 24932
+SHA256 (rust/crates/itertools-0.10.1.crate) = 69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf
+SIZE (rust/crates/itertools-0.10.1.crate) = 116219
+SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
+SIZE (rust/crates/itoa-0.4.8.crate) = 11926
+SHA256 (rust/crates/js-sys-0.3.55.crate) = 7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84
+SIZE (rust/crates/js-sys-0.3.55.crate) = 70499
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/libc-0.2.103.crate) = dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6
+SIZE (rust/crates/libc-0.2.103.crate) = 540563
+SHA256 (rust/crates/libm-0.2.1.crate) = c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a
+SIZE (rust/crates/libm-0.2.1.crate) = 111906
+SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3
+SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166
+SHA256 (rust/crates/lock_api-0.4.5.crate) = 712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109
+SIZE (rust/crates/lock_api-0.4.5.crate) = 25199
+SHA256 (rust/crates/log-0.4.14.crate) = 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710
+SIZE (rust/crates/log-0.4.14.crate) = 34582
+SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
+SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
+SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
+SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
+SHA256 (rust/crates/matches-0.1.9.crate) = a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f
+SIZE (rust/crates/matches-0.1.9.crate) = 2246
+SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
+SIZE (rust/crates/memchr-2.4.1.crate) = 64977
+SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
+SIZE (rust/crates/mime-0.3.16.crate) = 15206
+SHA256 (rust/crates/mime_guess-2.0.3.crate) = 2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212
+SIZE (rust/crates/mime_guess-2.0.3.crate) = 27437
+SHA256 (rust/crates/mio-0.7.13.crate) = 8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16
+SIZE (rust/crates/mio-0.7.13.crate) = 87027
+SHA256 (rust/crates/miow-0.3.7.crate) = b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21
+SIZE (rust/crates/miow-0.3.7.crate) = 24563
+SHA256 (rust/crates/multipart-0.17.1.crate) = d050aeedc89243f5347c3e237e3e13dc76fbe4ae3742a57b94dc14f69acf76d4
+SIZE (rust/crates/multipart-0.17.1.crate) = 64638
+SHA256 (rust/crates/nanorand-0.6.1.crate) = 729eb334247daa1803e0a094d0a5c55711b85571179f5ec6e53eccfdf7008958
+SIZE (rust/crates/nanorand-0.6.1.crate) = 11009
+SHA256 (rust/crates/native-tls-0.2.8.crate) = 48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d
+SIZE (rust/crates/native-tls-0.2.8.crate) = 24956
+SHA256 (rust/crates/ntapi-0.3.6.crate) = 3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44
+SIZE (rust/crates/ntapi-0.3.6.crate) = 127221
+SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
+SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
+SHA256 (rust/crates/num_cpus-1.13.0.crate) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
+SIZE (rust/crates/num_cpus-1.13.0.crate) = 14704
+SHA256 (rust/crates/once_cell-1.8.0.crate) = 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
+SIZE (rust/crates/once_cell-1.8.0.crate) = 28925
+SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
+SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
+SHA256 (rust/crates/openssl-0.10.36.crate) = 8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a
+SIZE (rust/crates/openssl-0.10.36.crate) = 206367
+SHA256 (rust/crates/openssl-probe-0.1.4.crate) = 28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a
+SIZE (rust/crates/openssl-probe-0.1.4.crate) = 7066
+SHA256 (rust/crates/openssl-sys-0.9.67.crate) = 69df2d8dfc6ce3aaf44b40dec6f487d5a886516cf6879c49e98e0710f310a058
+SIZE (rust/crates/openssl-sys-0.9.67.crate) = 54600
+SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
+SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
+SHA256 (rust/crates/parking_lot_core-0.8.5.crate) = d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216
+SIZE (rust/crates/parking_lot_core-0.8.5.crate) = 32466
+SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
+SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
+SHA256 (rust/crates/pin-project-1.0.8.crate) = 576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08
+SIZE (rust/crates/pin-project-1.0.8.crate) = 54991
+SHA256 (rust/crates/pin-project-internal-1.0.8.crate) = 6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389
+SIZE (rust/crates/pin-project-internal-1.0.8.crate) = 27941
+SHA256 (rust/crates/pin-project-lite-0.2.7.crate) = 8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443
+SIZE (rust/crates/pin-project-lite-0.2.7.crate) = 27212
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.20.crate) = 7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb
+SIZE (rust/crates/pkg-config-0.3.20.crate) = 15395
+SHA256 (rust/crates/ppv-lite86-0.2.14.crate) = c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741
+SIZE (rust/crates/ppv-lite86-0.2.14.crate) = 21543
+SHA256 (rust/crates/predicates-2.0.3.crate) = 5c6ce811d0b2e103743eec01db1c50612221f173084ce2f7941053e94b6bb474
+SIZE (rust/crates/predicates-2.0.3.crate) = 29239
+SHA256 (rust/crates/predicates-core-1.0.2.crate) = 57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451
+SIZE (rust/crates/predicates-core-1.0.2.crate) = 8185
+SHA256 (rust/crates/predicates-tree-1.0.4.crate) = 338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7
+SIZE (rust/crates/predicates-tree-1.0.4.crate) = 7682
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro-hack-0.5.19.crate) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
+SIZE (rust/crates/proc-macro-hack-0.5.19.crate) = 15556
+SHA256 (rust/crates/proc-macro-nested-0.1.7.crate) = bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086
+SIZE (rust/crates/proc-macro-nested-0.1.7.crate) = 6495
+SHA256 (rust/crates/proc-macro2-1.0.30.crate) = edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70
+SIZE (rust/crates/proc-macro2-1.0.30.crate) = 39155
+SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
+SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
+SHA256 (rust/crates/quote-1.0.10.crate) = 38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05
+SIZE (rust/crates/quote-1.0.10.crate) = 29960
+SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
+SIZE (rust/crates/rand-0.7.3.crate) = 112246
+SHA256 (rust/crates/rand-0.8.4.crate) = 2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8
+SIZE (rust/crates/rand-0.8.4.crate) = 87406
+SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
+SIZE (rust/crates/rand_chacha-0.2.2.crate) = 13267
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
+SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
+SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
+SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
+SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
+SHA256 (rust/crates/rand_hc-0.3.1.crate) = d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7
+SIZE (rust/crates/rand_hc-0.3.1.crate) = 11891
+SHA256 (rust/crates/redox_syscall-0.2.10.crate) = 8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff
+SIZE (rust/crates/redox_syscall-0.2.10.crate) = 23582
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/resolv-conf-0.7.0.crate) = 52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00
+SIZE (rust/crates/resolv-conf-0.7.0.crate) = 17352
+SHA256 (rust/crates/rlimit-0.6.2.crate) = cc0bf25554376fd362f54332b8410a625c71f15445bca32ffdfdf4ec9ac91726
+SIZE (rust/crates/rlimit-0.6.2.crate) = 15223
+SHA256 (rust/crates/ryu-1.0.5.crate) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
+SIZE (rust/crates/ryu-1.0.5.crate) = 49570
+SHA256 (rust/crates/safemem-0.3.3.crate) = ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072
+SIZE (rust/crates/safemem-0.3.3.crate) = 7778
+SHA256 (rust/crates/schannel-0.1.19.crate) = 8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75
+SIZE (rust/crates/schannel-0.1.19.crate) = 42755
+SHA256 (rust/crates/scoped-tls-1.0.0.crate) = ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2
+SIZE (rust/crates/scoped-tls-1.0.0.crate) = 9146
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/security-framework-2.4.2.crate) = 525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87
+SIZE (rust/crates/security-framework-2.4.2.crate) = 64857
+SHA256 (rust/crates/security-framework-sys-2.4.2.crate) = a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e
+SIZE (rust/crates/security-framework-sys-2.4.2.crate) = 12821
+SHA256 (rust/crates/serde-1.0.130.crate) = f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913
+SIZE (rust/crates/serde-1.0.130.crate) = 75305
+SHA256 (rust/crates/serde_json-1.0.68.crate) = 0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8
+SIZE (rust/crates/serde_json-1.0.68.crate) = 114986
+SHA256 (rust/crates/serde_urlencoded-0.7.0.crate) = edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9
+SIZE (rust/crates/serde_urlencoded-0.7.0.crate) = 12489
+SHA256 (rust/crates/sha-1-0.9.8.crate) = 99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6
+SIZE (rust/crates/sha-1-0.9.8.crate) = 14029
+SHA256 (rust/crates/signal-hook-0.3.10.crate) = 9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1
+SIZE (rust/crates/signal-hook-0.3.10.crate) = 48491
+SHA256 (rust/crates/signal-hook-mio-0.2.1.crate) = 29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4
+SIZE (rust/crates/signal-hook-mio-0.2.1.crate) = 8893
+SHA256 (rust/crates/signal-hook-registry-1.4.0.crate) = e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0
+SIZE (rust/crates/signal-hook-registry-1.4.0.crate) = 17912
+SHA256 (rust/crates/slab-0.4.5.crate) = 9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5
+SIZE (rust/crates/slab-0.4.5.crate) = 15888
+SHA256 (rust/crates/smallvec-1.7.0.crate) = 1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309
+SIZE (rust/crates/smallvec-1.7.0.crate) = 27459
+SHA256 (rust/crates/socket2-0.3.19.crate) = 122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e
+SIZE (rust/crates/socket2-0.3.19.crate) = 33782
+SHA256 (rust/crates/socket2-0.4.2.crate) = 5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516
+SIZE (rust/crates/socket2-0.4.2.crate) = 41721
+SHA256 (rust/crates/spin-0.9.2.crate) = 511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5
+SIZE (rust/crates/spin-0.9.2.crate) = 28755
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/structopt-0.3.23.crate) = bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa
+SIZE (rust/crates/structopt-0.3.23.crate) = 52029
+SHA256 (rust/crates/structopt-derive-0.4.16.crate) = 134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba
+SIZE (rust/crates/structopt-derive-0.4.16.crate) = 20996
+SHA256 (rust/crates/syn-1.0.80.crate) = d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194
+SIZE (rust/crates/syn-1.0.80.crate) = 234102
+SHA256 (rust/crates/tempfile-3.2.0.crate) = dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22
+SIZE (rust/crates/tempfile-3.2.0.crate) = 25892
+SHA256 (rust/crates/termtree-0.2.1.crate) = 78fbf2dd23e79c28ccfa2472d3e6b3b189866ffef1aeb91f17c2d968b6586378
+SIZE (rust/crates/termtree-0.2.1.crate) = 6375
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/thiserror-1.0.30.crate) = 854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417
+SIZE (rust/crates/thiserror-1.0.30.crate) = 17748
+SHA256 (rust/crates/thiserror-impl-1.0.30.crate) = aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b
+SIZE (rust/crates/thiserror-impl-1.0.30.crate) = 15230
+SHA256 (rust/crates/time-0.1.43.crate) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438
+SIZE (rust/crates/time-0.1.43.crate) = 28653
+SHA256 (rust/crates/tinyvec-1.5.0.crate) = f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7
+SIZE (rust/crates/tinyvec-1.5.0.crate) = 42745
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.12.0.crate) = c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc
+SIZE (rust/crates/tokio-1.12.0.crate) = 522732
+SHA256 (rust/crates/tokio-macros-1.5.0.crate) = b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd
+SIZE (rust/crates/tokio-macros-1.5.0.crate) = 8582
+SHA256 (rust/crates/tokio-native-tls-0.3.0.crate) = f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b
+SIZE (rust/crates/tokio-native-tls-0.3.0.crate) = 20759
+SHA256 (rust/crates/tokio-stream-0.1.7.crate) = 7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f
+SIZE (rust/crates/tokio-stream-0.1.7.crate) = 30323
+SHA256 (rust/crates/tokio-tungstenite-0.13.0.crate) = e1a5f475f1b9d077ea1017ecbc60890fda8e54942d680ca0b1d2b47cfa2d861b
+SIZE (rust/crates/tokio-tungstenite-0.13.0.crate) = 30189
+SHA256 (rust/crates/tokio-util-0.6.8.crate) = 08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd
+SIZE (rust/crates/tokio-util-0.6.8.crate) = 74116
+SHA256 (rust/crates/tower-service-0.3.1.crate) = 360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6
+SIZE (rust/crates/tower-service-0.3.1.crate) = 6299
+SHA256 (rust/crates/tracing-0.1.29.crate) = 375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105
+SIZE (rust/crates/tracing-0.1.29.crate) = 72444
+SHA256 (rust/crates/tracing-core-0.1.21.crate) = 1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4
+SIZE (rust/crates/tracing-core-0.1.21.crate) = 50683
+SHA256 (rust/crates/trust-dns-proto-0.20.3.crate) = ad0d7f5db438199a6e2609debe3f69f808d074e0a2888ee0bccb45fe234d03f4
+SIZE (rust/crates/trust-dns-proto-0.20.3.crate) = 245383
+SHA256 (rust/crates/trust-dns-resolver-0.20.3.crate) = f6ad17b608a64bd0735e67bde16b0636f8aa8591f831a25d18443ed00a699770
+SIZE (rust/crates/trust-dns-resolver-0.20.3.crate) = 77051
+SHA256 (rust/crates/try-lock-0.2.3.crate) = 59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642
+SIZE (rust/crates/try-lock-0.2.3.crate) = 4158
+SHA256 (rust/crates/tui-0.16.0.crate) = 39c8ce4e27049eed97cfa363a5048b09d995e209994634a0efc26a14ab6c0c23
+SIZE (rust/crates/tui-0.16.0.crate) = 142363
+SHA256 (rust/crates/tungstenite-0.12.0.crate) = 8ada8297e8d70872fa9a551d93250a9f407beb9f37ef86494eb20012a2ff7c24
+SIZE (rust/crates/tungstenite-0.12.0.crate) = 54287
+SHA256 (rust/crates/twoway-0.1.8.crate) = 59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1
+SIZE (rust/crates/twoway-0.1.8.crate) = 31774
+SHA256 (rust/crates/typenum-1.14.0.crate) = b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec
+SIZE (rust/crates/typenum-1.14.0.crate) = 40518
+SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6
+SIZE (rust/crates/unicase-2.6.0.crate) = 23478
+SHA256 (rust/crates/unicode-bidi-0.3.7.crate) = 1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f
+SIZE (rust/crates/unicode-bidi-0.3.7.crate) = 33759
+SHA256 (rust/crates/unicode-normalization-0.1.19.crate) = d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9
+SIZE (rust/crates/unicode-normalization-0.1.19.crate) = 107353
+SHA256 (rust/crates/unicode-segmentation-1.8.0.crate) = 8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b
+SIZE (rust/crates/unicode-segmentation-1.8.0.crate) = 94011
+SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973
+SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745
+SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
+SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
+SHA256 (rust/crates/url-2.2.2.crate) = a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c
+SIZE (rust/crates/url-2.2.2.crate) = 68555
+SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9
+SIZE (rust/crates/utf-8-0.7.6.crate) = 10422
+SHA256 (rust/crates/utf8-width-0.1.5.crate) = 7cf7d77f457ef8dfa11e4cd5933c5ddb5dc52a94664071951219a97710f0a32b
+SIZE (rust/crates/utf8-width-0.1.5.crate) = 2941
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/version_check-0.9.3.crate) = 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe
+SIZE (rust/crates/version_check-0.9.3.crate) = 12547
+SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
+SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
+SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
+SIZE (rust/crates/want-0.3.0.crate) = 6550
+SHA256 (rust/crates/warp-0.3.1.crate) = 332d47745e9a0c38636dbd454729b147d16bd1ed08ae67b3ab281c4506771054
+SIZE (rust/crates/warp-0.3.1.crate) = 112030
+SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
+SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
+SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
+SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
+SHA256 (rust/crates/wasm-bindgen-0.2.78.crate) = 632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce
+SIZE (rust/crates/wasm-bindgen-0.2.78.crate) = 162111
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.78.crate) = a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b
+SIZE (rust/crates/wasm-bindgen-backend-0.2.78.crate) = 25576
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.78.crate) = d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9
+SIZE (rust/crates/wasm-bindgen-macro-0.2.78.crate) = 11700
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.78.crate) = 7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.78.crate) = 17858
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.78.crate) = 0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc
+SIZE (rust/crates/wasm-bindgen-shared-0.2.78.crate) = 7206
+SHA256 (rust/crates/widestring-0.4.3.crate) = c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c
+SIZE (rust/crates/widestring-0.4.3.crate) = 26215
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/winreg-0.6.2.crate) = b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9
+SIZE (rust/crates/winreg-0.6.2.crate) = 19338
+SHA256 (hatoo-oha-v0.4.7_GH0.tar.gz) = 92cb24c6c6730f774f043c6b62197d7364a6f75c964621bf8b14961c81de0c1a
+SIZE (hatoo-oha-v0.4.7_GH0.tar.gz) = 1053177
diff --git a/net/oha/files/patch-powerpc b/net/oha/files/patch-powerpc
deleted file mode 100644
index bf4ee6beada4..000000000000
--- a/net/oha/files/patch-powerpc
+++ /dev/null
@@ -1,62 +0,0 @@
---- cargo-crates/libc-0.2.80/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC
-+++ cargo-crates/libc-0.2.80/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1486,6 +1486,9 @@ cfg_if! {
- } else if #[cfg(target_arch = "powerpc64")] {
- mod powerpc64;
- pub use self::powerpc64::*;
-+ } else if #[cfg(target_arch = "powerpc")] {
-+ mod powerpc;
-+ pub use self::powerpc::*;
- } else {
- // Unknown target_arch
- }
---- cargo-crates/libc-0.2.80/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC
-+++ cargo-crates/libc-0.2.80/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
-@@ -0,0 +1,47 @@
-+pub type c_char = u8;
-+pub type c_long = i32;
-+pub type c_ulong = u32;
-+pub type wchar_t = i32;
-+pub type time_t = i64;
-+pub type suseconds_t = i32;
-+pub type register_t = i32;
-+
-+s! {
-+ pub struct stat {
-+ pub st_dev: ::dev_t,
-+ pub st_ino: ::ino_t,
-+ pub st_mode: ::mode_t,
-+ pub st_nlink: ::nlink_t,
-+ pub st_uid: ::uid_t,
-+ pub st_gid: ::gid_t,
-+ pub st_rdev: ::dev_t,
-+ pub st_atime: ::time_t,
-+ pub st_atime_nsec: ::c_long,
-+ pub st_mtime: ::time_t,
-+ pub st_mtime_nsec: ::c_long,
-+ pub st_ctime: ::time_t,
-+ pub st_ctime_nsec: ::c_long,
-+ pub st_size: ::off_t,
-+ pub st_blocks: ::blkcnt_t,
-+ pub st_blksize: ::blksize_t,
-+ pub st_flags: ::fflags_t,
-+ pub st_gen: u32,
-+ pub st_lspare: i32,
-+ pub st_birthtime: ::time_t,
-+ pub st_birthtime_nsec: ::c_long,
-+ }
-+}
-+
-+// should be pub(crate), but that requires Rust 1.18.0
-+cfg_if! {
-+ if #[cfg(libc_const_size_of)] {
-+ #[doc(hidden)]
-+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
-+ } else {
-+ #[doc(hidden)]
-+ pub const _ALIGNBYTES: usize = 4 - 1;
-+ }
-+}
-+
-+pub const MAP_32BIT: ::c_int = 0x00080000;
-+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
diff --git a/net/onedrive/Makefile b/net/onedrive/Makefile
index 54839b3280e4..6899fdeb4b61 100644
--- a/net/onedrive/Makefile
+++ b/net/onedrive/Makefile
@@ -1,6 +1,6 @@
PORTNAME= onedrive
DISTVERSIONPREFIX= v
-DISTVERSION= 2.4.12
+DISTVERSION= 2.4.14
CATEGORIES= net
MAINTAINER= hiroo.ono+freebsd@gmail.com
@@ -46,4 +46,10 @@ post-extract:
post-install:
${INSTALL} -d -m 0775 ${STAGEDIR}${ONEDRIVE_LOGDIR}
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} >= 1400042)
+CONFIGURE_ARGS+= DCFLAGS=-L=-Wl,-z,nostart-stop-gc
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/onedrive/distinfo b/net/onedrive/distinfo
index e4678ba23c60..50f0b01b77db 100644
--- a/net/onedrive/distinfo
+++ b/net/onedrive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623530759
-SHA256 (abraunegg-onedrive-v2.4.12_GH0.tar.gz) = 4f6aa46fc28e859b63c0a2c190f66c3286ec0bde3f54f77af0ddea6b62bba37a
-SIZE (abraunegg-onedrive-v2.4.12_GH0.tar.gz) = 1034187
+TIMESTAMP = 1637887291
+SHA256 (abraunegg-onedrive-v2.4.14_GH0.tar.gz) = 32c6835ddd2b8c6febc1ec904380cc88a92e7fecfacff8ac4cc6271805c4214f
+SIZE (abraunegg-onedrive-v2.4.14_GH0.tar.gz) = 1130968
diff --git a/net/ooni-probe-cli/Makefile b/net/ooni-probe-cli/Makefile
index 5b64bfe92bea..d8af146a7644 100644
--- a/net/ooni-probe-cli/Makefile
+++ b/net/ooni-probe-cli/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ooni-probe-cli
DISTVERSIONPREFIX= v
-DISTVERSION= 3.9.2
+DISTVERSION= 3.10.1
CATEGORIES= net www benchmarks
MAINTAINER= egypcio@FreeBSD.org
@@ -21,24 +21,31 @@ GO_TARGET= ./cmd/ooniprobe
GH_ACCOUNT= ooni
GH_PROJECT= probe-cli
GH_TUPLE= AlecAivazis:survey:v1.8.8:alecaivazis_survey/vendor/gopkg.in/AlecAivazis/survey.v1 \
+ FiloSottile:age:v1.0.0-rc.1:filosottile_age/vendor/filippo.io/age \
alecthomas:kingpin:v2.2.6:alecthomas_kingpin/vendor/github.com/alecthomas/kingpin \
alecthomas:template:fb15b899a751:alecthomas_template/vendor/github.com/alecthomas/template \
alecthomas:units:ff826a37aa15:alecthomas_units/vendor/github.com/alecthomas/units \
apex:log:v1.9.0:apex_log/vendor/github.com/apex/log \
+ armon:go-socks5:e75332964ef5:armon_go_socks5/vendor/github.com/armon/go-socks5 \
cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
creack:goselect:v0.1.2:creack_goselect/vendor/github.com/creack/goselect \
cretz:bine:v0.1.0:cretz_bine/vendor/github.com/cretz/bine \
dchest:siphash:v1.2.2:dchest_siphash/vendor/github.com/dchest/siphash \
dsnet:compress:v0.0.1:dsnet_compress/vendor/github.com/dsnet/compress \
fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
+ fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
go-gorp:gorp:v1.7.2:go_gorp_gorp/vendor/gopkg.in/gorp.v1 \
go-mgo:mgo:a6b53ec6cb22:go_mgo_mgo/vendor/gopkg.in/mgo.v2 \
- golang:crypto:0c34fe9e7dc2:golang_crypto/vendor/golang.org/x/crypto \
- golang:net:cb1fcc7394e5:golang_net/vendor/golang.org/x/net \
- golang:sys:4fbd30eecc44:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
+ go-task:slim-sprig:348f09dbbbc0:go_task_slim_sprig/vendor/github.com/go-task/slim-sprig \
+ go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
+ golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \
+ golang:mod:v0.5.0:golang_mod/vendor/golang.org/x/mod \
+ golang:net:60bc85c4be6d:golang_net/vendor/golang.org/x/net \
+ golang:sys:bfb29a6856f2:golang_sys/vendor/golang.org/x/sys \
+ golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
+ golang:tools:v0.1.5:golang_tools/vendor/golang.org/x/tools \
golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
- google:go-cmp:v0.5.2:google_go_cmp/vendor/github.com/google/go-cmp \
+ google:go-cmp:v0.5.5:google_go_cmp/vendor/github.com/google/go-cmp \
google:martian:v3.1.0:google_martian_v3/vendor/github.com/google/martian/v3 \
google:shlex:e7afc7fbc510:google_shlex/vendor/github.com/google/shlex \
google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
@@ -46,40 +53,38 @@ GH_TUPLE= AlecAivazis:survey:v1.8.8:alecaivazis_survey/vendor/gopkg.in/AlecAivaz
hexops:gotextdiff:v1.0.3:hexops_gotextdiff/vendor/github.com/hexops/gotextdiff \
iancoleman:strcase:v0.1.3:iancoleman_strcase/vendor/github.com/iancoleman/strcase \
kballard:go-shellquote:95032a82bc51:kballard_go_shellquote/vendor/github.com/kballard/go-shellquote \
- lucas-clemente:quic-go:v0.20.0:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
+ lucas-clemente:quic-go:v0.23.0:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
marten-seemann:qpack:v0.2.1:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
- marten-seemann:qtls-go1-15:v0.1.4:marten_seemann_qtls_go1_15/vendor/github.com/marten-seemann/qtls-go1-15 \
- marten-seemann:qtls-go1-16:v0.1.3:marten_seemann_qtls_go1_16/vendor/github.com/marten-seemann/qtls-go1-16 \
+ marten-seemann:qtls-go1-16:v0.1.4:marten_seemann_qtls_go1_16/vendor/github.com/marten-seemann/qtls-go1-16 \
+ marten-seemann:qtls-go1-17:v0.1.0:marten_seemann_qtls_go1_17/vendor/github.com/marten-seemann/qtls-go1-17 \
mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
- mattn:go-sqlite3:v1.14.6:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+ mattn:go-sqlite3:v1.14.7:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
mgutz:ansi:d51e80ef957d:mgutz_ansi/vendor/github.com/mgutz/ansi \
- miekg:dns:v1.1.41:miekg_dns/vendor/github.com/miekg/dns \
- montanaflynn:stats:v0.6.5:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
- ooni:probe-assets:90ed7b6dff90:ooni_probe_assets/vendor/github.com/ooni/probe-assets \
- ooni:psiphon:v0.6.0:ooni_psiphon/vendor/github.com/ooni/psiphon \
+ miekg:dns:v1.1.42:miekg_dns/vendor/github.com/miekg/dns \
+ mitchellh:go-wordwrap:v1.0.1:mitchellh_go_wordwrap/vendor/github.com/mitchellh/go-wordwrap \
+ montanaflynn:stats:v0.6.6:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
+ nxadm:tail:v1.4.8:nxadm_tail/vendor/github.com/nxadm/tail \
+ onsi:ginkgo:v1.16.4:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
+ ooni:probe-assets:v0.3.1:ooni_probe_assets/vendor/github.com/ooni/probe-assets \
+ ooni:psiphon:v0.8.0:ooni_psiphon/vendor/github.com/ooni/psiphon \
oschwald:geoip2-golang:v1.5.0:oschwald_geoip2_golang/vendor/github.com/oschwald/geoip2-golang \
oschwald:maxminddb-golang:v1.8.0:oschwald_maxminddb_golang/vendor/github.com/oschwald/maxminddb-golang \
pborman:getopt:v2.1.0:pborman_getopt_v2/vendor/github.com/pborman/getopt \
pion:stun:v0.3.5:pion_stun/vendor/github.com/pion/stun \
pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
rogpeppe:go-internal:v1.8.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
- rubenv:sql-migrate:f84234893558:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \
+ rubenv:sql-migrate:a32ed26c37ea:rubenv_sql_migrate/vendor/github.com/rubenv/sql-migrate \
sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
- uber-go:atomic:v1.5.0:uber_go_atomic/vendor/go.uber.org/atomic \
- uber-go:multierr:v1.3.0:uber_go_multierr/vendor/go.uber.org/multierr \
- uber-go:tools:2cfd321de3ee:uber_go_tools/vendor/go.uber.org/tools \
- uber-go:zap:v1.13.0:uber_go_zap/vendor/go.uber.org/zap \
upper:db:v3.8.0:upper_db/vendor/upper.io/db.v3 \
- wader:filtertransport:bdd9e61eee78:wader_filtertransport/vendor/github.com/wader/filtertransport \
- zach-klippenstein:goregen:795b5e3961ea:zach_klippenstein_goregen/vendor/github.com/zach-klippenstein/goregen
+ ziutek:mymysql:v1.5.4:ziutek_mymysql/vendor/github.com/ziutek/mymysql
GH_TUPLE+= shuLhan:go-bindata:v3.3.0:shuLhan_go_bindata/vendor/github.com/shuLhan/go-bindata \
torbsd:goptlib:v1.1.0:torbsd_goptlib/vendor/git.torproject.org/pluggable-transports/goptlib.git
-GL_TUPLE= yawning:bsaes:26d1add596b6d800bdeeb3bc3b2c7b316c056b6d:yawning_bsaes/vendor/git.schwanenlied.me/yawning/bsaes.git \
- yawning:obfs4:f638c33f6c6f697498150d5f0dfbf26453759262:yawning_obfs4/vendor/gitlab.com/yawning/obfs4.git \
- yawning:utls:ad258eb64575fd468dbd2f93ef229df5f7fe72b4:yawning_utls/vendor/gitlab.com/yawning/utls.git
+GL_TUPLE= yawning:bsaes:0a714cd429ec754482b4001e918db30cd2094405:yawning_bsaes/vendor/gitlab.com/yawning/bsaes.git \
+ yawning:obfs4:e330d1b7024b4ab04f7d96cc1afc61325744fafc:yawning_obfs4/vendor/gitlab.com/yawning/obfs4.git \
+ yawning:utls:f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca:yawning_utls/vendor/gitlab.com/yawning/utls.git
PLIST_FILES= bin/ooniprobe
diff --git a/net/ooni-probe-cli/distinfo b/net/ooni-probe-cli/distinfo
index faa303649e48..aba600372305 100644
--- a/net/ooni-probe-cli/distinfo
+++ b/net/ooni-probe-cli/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1618780969
-SHA256 (ooni-probe-cli-v3.9.2_GH0.tar.gz) = d34dc096dfdebceaa027716fdf675eb9ab7f0085defb4235f52685d064bd5afa
-SIZE (ooni-probe-cli-v3.9.2_GH0.tar.gz) = 615097
+TIMESTAMP = 1635784832
+SHA256 (ooni-probe-cli-v3.10.1_GH0.tar.gz) = 2b81c14133f39ac91c4ea6761be7a27d768cd88989b52ae72376d1d7b69de322
+SIZE (ooni-probe-cli-v3.10.1_GH0.tar.gz) = 620040
SHA256 (AlecAivazis-survey-v1.8.8_GH0.tar.gz) = 72bafc1b6ac0090dfe914540914030e30f464ef3c6822c64f7b6dcf7ddb910a2
SIZE (AlecAivazis-survey-v1.8.8_GH0.tar.gz) = 982826
+SHA256 (FiloSottile-age-v1.0.0-rc.1_GH0.tar.gz) = 2ef0839b0e2e79435c037662c67df675b4ebc50d7bf001079d24b0bdf1d0c098
+SIZE (FiloSottile-age-v1.0.0-rc.1_GH0.tar.gz) = 46998
SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
@@ -11,6 +13,8 @@ SHA256 (alecthomas-units-ff826a37aa15_GH0.tar.gz) = 7dcb75a984e2af8f0dd14d91c398
SIZE (alecthomas-units-ff826a37aa15_GH0.tar.gz) = 5046
SHA256 (apex-log-v1.9.0_GH0.tar.gz) = 6171253fb8b022d5151a5b4b9847bcd6f2cdc2fd7180a741090626d73d311890
SIZE (apex-log-v1.9.0_GH0.tar.gz) = 31978
+SHA256 (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 37f9cad3e321c452ea54824021ecd5b6ef4222c68b25f9c8a66a0c6d8411437e
+SIZE (armon-go-socks5-e75332964ef5_GH0.tar.gz) = 8586
SHA256 (cheekybits-genny-v1.0.0_GH0.tar.gz) = 6982bf513333fb3ee3e6e0633500a3800fb6a3d6beb9e6c6084a96c85a49dd73
SIZE (cheekybits-genny-v1.0.0_GH0.tar.gz) = 15585
SHA256 (creack-goselect-v0.1.2_GH0.tar.gz) = ca13d87a2bc62ec12b90606ed1738c32be924d2153a9c4a5c7cd3ea999559f6f
@@ -23,22 +27,32 @@ SHA256 (dsnet-compress-v0.0.1_GH0.tar.gz) = 345332d6a147f052cf4a34edb5187b323f06
SIZE (dsnet-compress-v0.0.1_GH0.tar.gz) = 9962544
SHA256 (fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e
SIZE (fatih-color-v1.10.0_GH0.tar.gz) = 1267532
+SHA256 (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 4f888b1cb132026227826751d156c0a2958e7d492e5e38386cde8848ef494dcb
+SIZE (fsnotify-fsnotify-v1.4.9_GH0.tar.gz) = 31900
SHA256 (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 63488c583d4bf25eb03f8224eef5934158da81650063a96b53ff4f50b9ff5409
SIZE (go-gorp-gorp-v1.7.2_GH0.tar.gz) = 36726
SHA256 (go-mgo-mgo-a6b53ec6cb22_GH0.tar.gz) = e3373369ed1eefc88cb2ee55fa8fcb30c988b6979eaf6db0889d1520b83f302c
SIZE (go-mgo-mgo-a6b53ec6cb22_GH0.tar.gz) = 376779
-SHA256 (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = deab6194c4b5d5ceefa40e8c7fc82a4288ff6e8577cdbde406e781c62624f491
-SIZE (golang-crypto-0c34fe9e7dc2_GH0.tar.gz) = 1726075
-SHA256 (golang-net-cb1fcc7394e5_GH0.tar.gz) = 6c15c5444cdb4d55ae445600debe6f46d06b73b5d244d0a864cf168ce4068b06
-SIZE (golang-net-cb1fcc7394e5_GH0.tar.gz) = 1250463
-SHA256 (golang-sys-4fbd30eecc44_GH0.tar.gz) = 96855d444f699c91ec2e45a88440e6fdc79ee90a11f71d4845e0ee162769f4b0
-SIZE (golang-sys-4fbd30eecc44_GH0.tar.gz) = 1218721
-SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
-SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127
+SHA256 (go-task-slim-sprig-348f09dbbbc0_GH0.tar.gz) = c52607aad259efae7f725eadf0493933c206d36b776df117f94f6b2eeb4fd8b1
+SIZE (go-task-slim-sprig-348f09dbbbc0_GH0.tar.gz) = 40034
+SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
+SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
+SHA256 (golang-crypto-32db794688a5_GH0.tar.gz) = c971927593630ecfa6531da54a579bf04186c354e365975cd86ea0e4c2c82fb7
+SIZE (golang-crypto-32db794688a5_GH0.tar.gz) = 1732714
+SHA256 (golang-mod-v0.5.0_GH0.tar.gz) = 9176aaaa49f9441047cc8768025e30af94048656f8261fe683ca11729dbdf7c7
+SIZE (golang-mod-v0.5.0_GH0.tar.gz) = 111977
+SHA256 (golang-net-60bc85c4be6d_GH0.tar.gz) = 5a32e5f6bd1baeddef7d84165d704c13b99cddf29d44c4025dfa213d82e3b846
+SIZE (golang-net-60bc85c4be6d_GH0.tar.gz) = 1252997
+SHA256 (golang-sys-bfb29a6856f2_GH0.tar.gz) = 7c9bf5307619702f90e97f542b04bfc4776305ff8ed730e21b76283d691e01ce
+SIZE (golang-sys-bfb29a6856f2_GH0.tar.gz) = 1209082
+SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
+SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
+SHA256 (golang-tools-v0.1.5_GH0.tar.gz) = fe47ea2bae87d8612ec8202c7fcf9ec7d125fbf236a36f1417d93295dbc3a855
+SIZE (golang-tools-v0.1.5_GH0.tar.gz) = 2843361
SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
-SHA256 (google-go-cmp-v0.5.2_GH0.tar.gz) = 76e0c4238e7fec1490ef2c8b4719a024ade7f4b8778965acb888566535ee9dd5
-SIZE (google-go-cmp-v0.5.2_GH0.tar.gz) = 99769
+SHA256 (google-go-cmp-v0.5.5_GH0.tar.gz) = 8f1a0041f484812ae219e7548a13d5269c947cfcdea6031d40cdc85cd0663b3e
+SIZE (google-go-cmp-v0.5.5_GH0.tar.gz) = 102358
SHA256 (google-martian-v3.1.0_GH0.tar.gz) = 8d978f1a3b496cdfba23a08ec0d167787cbab1c4534accaac171db92f53594ba
SIZE (google-martian-v3.1.0_GH0.tar.gz) = 133278
SHA256 (google-shlex-e7afc7fbc510_GH0.tar.gz) = 87f77e98720add261add169e386cbdcc894e2635dca299bc4119dc417ea321ca
@@ -53,30 +67,36 @@ SHA256 (iancoleman-strcase-v0.1.3_GH0.tar.gz) = 93c60b80de0ba86a14654cc647596849
SIZE (iancoleman-strcase-v0.1.3_GH0.tar.gz) = 4845
SHA256 (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = dde336eb697f7f9c26cf6d1467f75b6cf559262c1b0b110d28fff29790f76bc5
SIZE (kballard-go-shellquote-95032a82bc51_GH0.tar.gz) = 4328
-SHA256 (lucas-clemente-quic-go-v0.20.0_GH0.tar.gz) = 0c3efa44c6bc37db7c25417e561e709d8845a61335d2e4c149b7bb5240c38e52
-SIZE (lucas-clemente-quic-go-v0.20.0_GH0.tar.gz) = 502238
+SHA256 (lucas-clemente-quic-go-v0.23.0_GH0.tar.gz) = 38e6a2aaf8b3db598ceadfd55ae0e923cde2004336e3ba3bdad365d27be5fa14
+SIZE (lucas-clemente-quic-go-v0.23.0_GH0.tar.gz) = 520167
SHA256 (marten-seemann-qpack-v0.2.1_GH0.tar.gz) = 4d8ee343223e2433119fce12d53e90d70e04953bff80a00aae8fa3b7dd888134
SIZE (marten-seemann-qpack-v0.2.1_GH0.tar.gz) = 42738
-SHA256 (marten-seemann-qtls-go1-15-v0.1.4_GH0.tar.gz) = 6d5541d060470ebbe802bf39feb1656570da31a7ed904f5374f6a33ae82e0858
-SIZE (marten-seemann-qtls-go1-15-v0.1.4_GH0.tar.gz) = 413712
-SHA256 (marten-seemann-qtls-go1-16-v0.1.3_GH0.tar.gz) = 4e33e5efceb9fc506d7ca00e30bc4603f44b000eb6c5bd3642750a3634e8348c
-SIZE (marten-seemann-qtls-go1-16-v0.1.3_GH0.tar.gz) = 415393
+SHA256 (marten-seemann-qtls-go1-16-v0.1.4_GH0.tar.gz) = e6166cfc140acb6cfc11526444640e31ed47cf8b9c31f5812904a7735ecd8aa6
+SIZE (marten-seemann-qtls-go1-16-v0.1.4_GH0.tar.gz) = 415515
+SHA256 (marten-seemann-qtls-go1-17-v0.1.0_GH0.tar.gz) = e1c22bac3a614f31b0ca5d32c2a5aeee9b5032f3b23b8951810c21e990ed3997
+SIZE (marten-seemann-qtls-go1-17-v0.1.0_GH0.tar.gz) = 421611
SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571
SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
-SHA256 (mattn-go-sqlite3-v1.14.6_GH0.tar.gz) = c92f80d9d5c16e305955cb5a6885a8d931926e9b489857560364148fd225b690
-SIZE (mattn-go-sqlite3-v1.14.6_GH0.tar.gz) = 2367133
+SHA256 (mattn-go-sqlite3-v1.14.7_GH0.tar.gz) = ed9922998dc82553a7cc5889747b123fc216a15036e7c3e1bdeea1acb68bc584
+SIZE (mattn-go-sqlite3-v1.14.7_GH0.tar.gz) = 2391718
SHA256 (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 91cc2a4b9179dca81b3169ad32d4ef854d043c268251abf9a004bf7606fe3222
SIZE (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 5097
-SHA256 (miekg-dns-v1.1.41_GH0.tar.gz) = c807ee900b039dfb117b86548702459f4902cf18020b41797d337ec33d9eeee8
-SIZE (miekg-dns-v1.1.41_GH0.tar.gz) = 199522
-SHA256 (montanaflynn-stats-v0.6.5_GH0.tar.gz) = b72fa6f3cc91628ef4b9ba77f8e78d4554e4a72e0273ee0b9921408ec18b4376
-SIZE (montanaflynn-stats-v0.6.5_GH0.tar.gz) = 48726
-SHA256 (ooni-probe-assets-90ed7b6dff90_GH0.tar.gz) = 9d2069bfa899b260775bf47e4e05d90e48037cc9d57e0aaf5cafcee9be3594fe
-SIZE (ooni-probe-assets-90ed7b6dff90_GH0.tar.gz) = 6794203
-SHA256 (ooni-psiphon-v0.6.0_GH0.tar.gz) = 988fbe37f9afef0f3c717a7f8c4e1964802eedb3d8e8fb7b86ba75dacbc9fe83
-SIZE (ooni-psiphon-v0.6.0_GH0.tar.gz) = 9677597
+SHA256 (miekg-dns-v1.1.42_GH0.tar.gz) = 167b2c2c9cb96d07c97db2c46286914fb74d09be5b02d7149f4918782d675ccb
+SIZE (miekg-dns-v1.1.42_GH0.tar.gz) = 200831
+SHA256 (mitchellh-go-wordwrap-v1.0.1_GH0.tar.gz) = 56dc8d3883c765d9791a3698a55c66935b2978ac60e0e3c7c8799b182dd22bb5
+SIZE (mitchellh-go-wordwrap-v1.0.1_GH0.tar.gz) = 2921
+SHA256 (montanaflynn-stats-v0.6.6_GH0.tar.gz) = e45b39a63dad14a526d7fd0f5ef0f38e10c302a008175dbbe157cc6295520140
+SIZE (montanaflynn-stats-v0.6.6_GH0.tar.gz) = 48880
+SHA256 (nxadm-tail-v1.4.8_GH0.tar.gz) = 8208362046819275a0809000dceacbd7b2a7caa07bcd6547dd2ff9b2104fa56c
+SIZE (nxadm-tail-v1.4.8_GH0.tar.gz) = 1255770
+SHA256 (onsi-ginkgo-v1.16.4_GH0.tar.gz) = f4b9e08e035f5521a4572ce7bb534a3ba0d3c90b0a2d1ae84b9359d59b6ca486
+SIZE (onsi-ginkgo-v1.16.4_GH0.tar.gz) = 164036
+SHA256 (ooni-probe-assets-v0.3.1_GH0.tar.gz) = 9a29ce6b6277b3578b5f3ea8130e3cf247f0fcb619007f16e5288e9b159267b9
+SIZE (ooni-probe-assets-v0.3.1_GH0.tar.gz) = 6967956
+SHA256 (ooni-psiphon-v0.8.0_GH0.tar.gz) = 372e80393d4f30e81ec0a09cd808bc4e89957033a47c26689f73889c8e63da00
+SIZE (ooni-psiphon-v0.8.0_GH0.tar.gz) = 9688127
SHA256 (oschwald-geoip2-golang-v1.5.0_GH0.tar.gz) = d63758fa83c0dbe54195f32d97be69e6240ecd0663812068c1c3fd0335c4bb4b
SIZE (oschwald-geoip2-golang-v1.5.0_GH0.tar.gz) = 9599
SHA256 (oschwald-maxminddb-golang-v1.8.0_GH0.tar.gz) = bb215e75bc25e25ccd733225ccc2f2144ab10a76d616f13232d5cd873b983986
@@ -89,31 +109,21 @@ SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf1
SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
SHA256 (rogpeppe-go-internal-v1.8.0_GH0.tar.gz) = a423c3d03d47d263d7ff1c90ba3911c9025bb7f060b5a46af8229e00962df8ed
SIZE (rogpeppe-go-internal-v1.8.0_GH0.tar.gz) = 129034
-SHA256 (rubenv-sql-migrate-f84234893558_GH0.tar.gz) = 8ef8beea39758a6b6675d4cce081ff8c439d6369945b80a6c391efd86e9b1d07
-SIZE (rubenv-sql-migrate-f84234893558_GH0.tar.gz) = 42915
+SHA256 (rubenv-sql-migrate-a32ed26c37ea_GH0.tar.gz) = f4701c6e8215b30d4781b4982211a9ea282374d14b0ab16277507a1a98eaf666
+SIZE (rubenv-sql-migrate-a32ed26c37ea_GH0.tar.gz) = 36996
SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b629ecfad317d468a981e23e0c9c6ca
SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392
-SHA256 (uber-go-atomic-v1.5.0_GH0.tar.gz) = 3b003515efb86c67aced0ce9e954cca50964ee0afe83e5a63dfe43aa58347290
-SIZE (uber-go-atomic-v1.5.0_GH0.tar.gz) = 9365
-SHA256 (uber-go-multierr-v1.3.0_GH0.tar.gz) = 54bba1d61d996b98ccdf1d353e0fc66bbff599fe202719d1f55e490e127be574
-SIZE (uber-go-multierr-v1.3.0_GH0.tar.gz) = 11537
-SHA256 (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = a7d91d3ddea6d8a83240af46436e02d65b835b60bcb85ad1c5bc6aebad32f567
-SIZE (uber-go-tools-2cfd321de3ee_GH0.tar.gz) = 11054
-SHA256 (uber-go-zap-v1.13.0_GH0.tar.gz) = dcadd2fc1a93124b594e2fd951456bb1727f922f5ef005e388273851d0607ae7
-SIZE (uber-go-zap-v1.13.0_GH0.tar.gz) = 122949
SHA256 (upper-db-v3.8.0_GH0.tar.gz) = def9b759922b41f341cdcd4fcc7b101c045994e0dbf34347c8b30bc5b7d46363
SIZE (upper-db-v3.8.0_GH0.tar.gz) = 163401
-SHA256 (wader-filtertransport-bdd9e61eee78_GH0.tar.gz) = f36a15286843066a712038ac6e6dc59199696b15acf8f97d66126d0a027a1baf
-SIZE (wader-filtertransport-bdd9e61eee78_GH0.tar.gz) = 4918
-SHA256 (zach-klippenstein-goregen-795b5e3961ea_GH0.tar.gz) = c53548807995457314c17e7bc18d29e3ccee86bded0393a328a9f198a5aa69e2
-SIZE (zach-klippenstein-goregen-795b5e3961ea_GH0.tar.gz) = 14618
+SHA256 (ziutek-mymysql-v1.5.4_GH0.tar.gz) = 111b478d6190786ee098af3f365be0e33ed59e30ec4a2a9066b714515089f062
+SIZE (ziutek-mymysql-v1.5.4_GH0.tar.gz) = 61564
SHA256 (shuLhan-go-bindata-v3.3.0_GH0.tar.gz) = e5d8070b84e4b9c443531d37076acc0a9e02ba3317bf7b67ca03bc2d25d2a0ce
SIZE (shuLhan-go-bindata-v3.3.0_GH0.tar.gz) = 26204
SHA256 (torbsd-goptlib-v1.1.0_GH0.tar.gz) = ff908e532019a0d16adc8505214d8e6f49ffaf5b7bf2dcecfb9ca61307d001f0
SIZE (torbsd-goptlib-v1.1.0_GH0.tar.gz) = 29395
-SHA256 (yawning-bsaes-26d1add596b6d800bdeeb3bc3b2c7b316c056b6d_GL0.tar.gz) = 9959ced1e18935122cd719b552600fcf41e97f20d7bade2675a7e763e3386dcc
-SIZE (yawning-bsaes-26d1add596b6d800bdeeb3bc3b2c7b316c056b6d_GL0.tar.gz) = 18868
-SHA256 (yawning-obfs4-f638c33f6c6f697498150d5f0dfbf26453759262_GL0.tar.gz) = 85b6b22fbbff4f9beeea19c868f59a9695503c2f22012907093e27031ba9b1d6
-SIZE (yawning-obfs4-f638c33f6c6f697498150d5f0dfbf26453759262_GL0.tar.gz) = 139583
-SHA256 (yawning-utls-ad258eb64575fd468dbd2f93ef229df5f7fe72b4_GL0.tar.gz) = 9e2d08350387048d1833cefa69567cb3b0137fff3befaa66efa2fad48f99553e
-SIZE (yawning-utls-ad258eb64575fd468dbd2f93ef229df5f7fe72b4_GL0.tar.gz) = 560538
+SHA256 (yawning-bsaes-0a714cd429ec754482b4001e918db30cd2094405_GL0.tar.gz) = 6cf841b466d554afa7a0f8cea516ac0e2c017c045af5315c0fe0331395f49631
+SIZE (yawning-bsaes-0a714cd429ec754482b4001e918db30cd2094405_GL0.tar.gz) = 18759
+SHA256 (yawning-obfs4-e330d1b7024b4ab04f7d96cc1afc61325744fafc_GL0.tar.gz) = 47affd3f44a687a85becfbadbf7759b153e39f5ef4e38c5bc35ea31d17702fe6
+SIZE (yawning-obfs4-e330d1b7024b4ab04f7d96cc1afc61325744fafc_GL0.tar.gz) = 139604
+SHA256 (yawning-utls-f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca_GL0.tar.gz) = 73e937e4f256f6ba730b1d3771e377fbe0761c481e1429fda645f5174dad0d14
+SIZE (yawning-utls-f1bcf4b40e4596d0ccd1dbf8f3a9f4922f9759ca_GL0.tar.gz) = 562805
diff --git a/net/opal/Makefile b/net/opal/Makefile
index b63dc9ffce3b..7533159ed87e 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -2,7 +2,7 @@
PORTNAME= opal
PORTVERSION= 3.10.10
-PORTREVISION= 28
+PORTREVISION= 29
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp b/net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp
new file mode 100644
index 000000000000..7e74990ce577
--- /dev/null
+++ b/net/opal/files/patch-plugins_fax_fax__spandsp_spandsp__fax.cpp
@@ -0,0 +1,153 @@
+--- plugins/fax/fax_spandsp/spandsp_fax.cpp.orig 2013-02-20 02:18:10 UTC
++++ plugins/fax/fax_spandsp/spandsp_fax.cpp
+@@ -82,7 +82,7 @@ static PluginCodec_LogFunction LogFunction;
+ LogFunction(level, __FILE__, __LINE__, "FaxCodec", strm.str().c_str()); \
+ } else (void)0
+
+-static void SpanDSP_Message(int level, const char *text)
++static void SpanDSP_Message(void *user_data, int level, const char *text)
+ {
+ if (*text != '\0' && LogFunction != NULL) {
+ if (level >= SPAN_LOG_DEBUG)
+@@ -117,7 +117,7 @@ static void SpanDSP_Message(int level, const char *tex
+
+ static void InitLogging(logging_state_t * logging, const std::string & tag)
+ {
+- span_log_set_message_handler(logging, SpanDSP_Message);
++ span_log_set_message_handler(logging, SpanDSP_Message, NULL);
+
+ int level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_DEBUG;
+
+@@ -807,7 +807,7 @@ class MyStats : private t30_stats_t (public)
+ strm << "-1 (In progress)";
+ strm << "\n"
+ "Bit Rate=" << stats.bit_rate << "\n"
+- "Encoding=" << stats.encoding << ' ' << CompressionNames[stats.encoding&3] << "\n"
++ "Encoding=" << stats.compression << ' ' << CompressionNames[stats.compression&3] << "\n"
+ "Error Correction=" << stats.error_correcting_mode << "\n"
+ "Tx Pages=" << (stats.m_receiving ? -1 : stats.pages_tx) << "\n"
+ "Rx Pages=" << (stats.m_receiving ? stats.pages_rx : -1) << "\n"
+@@ -839,25 +839,27 @@ class FaxTIFF : public FaxSpanDSP
+ char m_phase;
+
+ protected:
++ t30_state_t * m_t30State;
++
+ FaxTIFF()
+ : m_receiving(false)
+ , m_stationIdentifer("-")
+- , m_supported_image_sizes(T30_SUPPORT_US_LETTER_LENGTH |
+- T30_SUPPORT_US_LEGAL_LENGTH |
+- T30_SUPPORT_UNLIMITED_LENGTH |
+- T30_SUPPORT_A4_LENGTH |
+- T30_SUPPORT_B4_LENGTH |
+- T30_SUPPORT_215MM_WIDTH |
+- T30_SUPPORT_255MM_WIDTH |
+- T30_SUPPORT_303MM_WIDTH)
+- , m_supported_resolutions(T30_SUPPORT_STANDARD_RESOLUTION |
+- T30_SUPPORT_FINE_RESOLUTION |
+- T30_SUPPORT_SUPERFINE_RESOLUTION |
+- T30_SUPPORT_R8_RESOLUTION |
+- T30_SUPPORT_R16_RESOLUTION)
+- , m_supported_compressions(T30_SUPPORT_T4_1D_COMPRESSION |
+- T30_SUPPORT_T4_2D_COMPRESSION |
+- T30_SUPPORT_T6_COMPRESSION)
++ , m_supported_image_sizes(T4_SUPPORT_LENGTH_US_LETTER |
++ T4_SUPPORT_LENGTH_US_LEGAL |
++ T4_SUPPORT_LENGTH_UNLIMITED |
++ T4_SUPPORT_LENGTH_A4 |
++ T4_SUPPORT_LENGTH_B4 |
++ T4_SUPPORT_WIDTH_215MM |
++ T4_SUPPORT_WIDTH_255MM |
++ T4_SUPPORT_WIDTH_303MM)
++ , m_supported_resolutions(T4_RESOLUTION_R8_STANDARD |
++ T4_RESOLUTION_R8_FINE |
++ T4_RESOLUTION_R8_SUPERFINE |
++ T4_RESOLUTION_200_400 |
++ T4_RESOLUTION_400_400)
++ , m_supported_compressions(T4_COMPRESSION_T4_1D |
++ T4_COMPRESSION_T4_2D |
++ T4_COMPRESSION_T6)
+ , m_phase('A')
+ {
+ }
+@@ -932,6 +934,7 @@ class FaxTIFF : public FaxSpanDSP
+ PTRACE(3, m_tag << " Set transmit TIFF file to \"" << m_tiffFileName << '"');
+ }
+
++ m_t30State = t30state;
+ t30_set_phase_b_handler(t30state, PhaseB, this);
+ t30_set_phase_d_handler(t30state, PhaseD, this);
+ t30_set_phase_e_handler(t30state, PhaseE, this);
+@@ -948,7 +951,7 @@ class FaxTIFF : public FaxSpanDSP
+
+ t30_set_supported_modems(t30state, m_supported_modems);
+ t30_set_supported_image_sizes(t30state, m_supported_image_sizes);
+- t30_set_supported_resolutions(t30state, m_supported_resolutions);
++ t30_set_supported_bilevel_resolutions(t30state, m_supported_resolutions);
+ t30_set_supported_compressions(t30state, m_supported_compressions);
+ t30_set_ecm_capability(t30state, m_useECM);
+
+@@ -983,50 +986,50 @@ class FaxTIFF : public FaxSpanDSP
+ bool IsReceiving() const { return m_receiving; }
+
+
+- static int PhaseB(t30_state_t * t30state, void * user_data, int result)
++ static int PhaseB(void * user_data, int result)
+ {
+ if (user_data != NULL)
+- ((FaxTIFF *)user_data)->PhaseB(t30state, result);
++ ((FaxTIFF *)user_data)->PhaseB(result);
+ return T30_ERR_OK;
+ }
+
+- static int PhaseD(t30_state_t * t30state, void * user_data, int result)
++ static int PhaseD(void * user_data, int result)
+ {
+ if (user_data != NULL)
+- ((FaxTIFF *)user_data)->PhaseD(t30state, result);
++ ((FaxTIFF *)user_data)->PhaseD(result);
+ return T30_ERR_OK;
+ }
+
+- static void PhaseE(t30_state_t * t30state, void * user_data, int result)
++ static void PhaseE(void * user_data, int result)
+ {
+ if (user_data != NULL)
+- ((FaxTIFF *)user_data)->PhaseE(t30state, result);
++ ((FaxTIFF *)user_data)->PhaseE(result);
+ }
+
+
+ private:
+- void PhaseB(t30_state_t * t30state, int)
++ void PhaseB(int)
+ {
+ m_phase = 'B';
+ PTRACE(3, m_tag << " SpanDSP entered Phase B:\n"
+- << MyStats(t30state, m_completed, m_receiving, m_phase));
++ << MyStats(this->m_t30State, m_completed, m_receiving, m_phase));
+ }
+
+- void PhaseD(t30_state_t * t30state, int)
++ void PhaseD(int)
+ {
+ m_phase = 'D';
+ PTRACE(3, m_tag << " SpanDSP entered Phase D:\n"
+- << MyStats(t30state, m_completed, m_receiving, m_phase));
++ << MyStats(this->m_t30State, m_completed, m_receiving, m_phase));
+ }
+
+- void PhaseE(t30_state_t * t30state, int result)
++ void PhaseE(int result)
+ {
+ if (result >= 0)
+ m_completed = true; // Finished, exit codec loops
+
+ m_phase = 'E';
+ PTRACE(3, m_tag << " SpanDSP entered Phase E:\n"
+- << MyStats(t30state, m_completed, m_receiving, m_phase));
++ << MyStats(this->m_t30State, m_completed, m_receiving, m_phase));
+ }
+ };
+
diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 075784cf4028..1f2907862146 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${FILESDIR}/COPYING
USES= tar:tgz uidfix
USE_RC_SUBR= ${PORTNAME}
-CONFLICTS= zebra-[0-9]* quagga-[0-9]*
+CONFLICTS= zebra quagga
NO_WRKSUBDIR= yes
PLIST_FILES= sbin/bgpctl sbin/bgpd man/man5/bgpd.conf.5.gz \
diff --git a/net/openbgpd6/Makefile b/net/openbgpd6/Makefile
index 19c49e5ac094..fd6725ab3e0b 100644
--- a/net/openbgpd6/Makefile
+++ b/net/openbgpd6/Makefile
@@ -20,7 +20,7 @@ SUB_FILES= pkg-message
USERS= _bgpd
GROUPS= _bgpd
-CONFLICTS= zebra-[0-9]* quagga-[0-9]*
+CONFLICTS= zebra quagga
OPTIONS_DEFINE= IPV6LLPEER
OPTIONS_DEFAULT= IPV6LLPEER
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 08572e8bc96f..c6cea5eddb8a 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -35,9 +35,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
.if defined(CLIENT_ONLY)
-CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client-* ${PORTNAME}-client-*
+CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-client ${PORTNAME}-client
.else
-CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server-* ${PORTNAME}-server-*
+CONFLICTS_INSTALL= ${PORTNAME}2[0-3][5-9]-server ${PORTNAME}-server
.endif
GNU_CONFIGURE= yes
@@ -50,7 +50,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif
PORTREVISION_CLIENT= 4
-PORTREVISION_SERVER= 6
+PORTREVISION_SERVER= 7
OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_SHLIB_MINOR= 11.7
OPENLDAP_MAJOR= ${DISTVERSION:R}
diff --git a/net/openldap25-server/Makefile b/net/openldap25-server/Makefile
index 5aae0f0cee2a..4734709e76ab 100644
--- a/net/openldap25-server/Makefile
+++ b/net/openldap25-server/Makefile
@@ -1,7 +1,7 @@
# Created by: Xin LI <delphij@FreeBSD.org>
PORTNAME= openldap
-DISTVERSION= 2.5.8
+DISTVERSION= 2.5.9
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
@@ -38,17 +38,17 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= cpe gmake libtool:keepla localbase ssl tar:tgz
.if defined(CLIENT_ONLY)
-CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-client-* ${PORTNAME}-client-*
+CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-client ${PORTNAME}-client
.else
-CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server-* ${PORTNAME}-server-*
+CONFLICTS_INSTALL= ${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
.endif
GNU_CONFIGURE= yes
-PORTREVISION_CLIENT= 1
+PORTREVISION_CLIENT= 0
PORTREVISION_SERVER= 1
OPENLDAP_SHLIB_MAJOR= 0
-OPENLDAP_SHLIB_MINOR= 1.3
+OPENLDAP_SHLIB_MINOR= 1.4
OPENLDAP_MAJOR= ${DISTVERSION:R}
OPTIONS_DEFINE= DEBUG
@@ -103,6 +103,7 @@ OPTIONS_GROUP_OVLYS+= TRANSLUCENT
OPTIONS_GROUP_OVLYS+= UNIQUE
OPTIONS_GROUP_OVLYS+= VALSORT
+OPTIONS_DEFINE+= GSSAPI
OPTIONS_DEFINE+= DYNACL ACI
OPTIONS_DEFINE+= RLOOKUPS SLP SLAPI
OPTIONS_DEFINE+= PBKDF2
@@ -192,10 +193,11 @@ DNSSRV_CONFIGURE_ENABLE= dnssrv=mod
DYNACL_CONFIGURE_ENABLE= dynacl
DYNGROUP_CONFIGURE_ENABLE= dyngroup=mod
DYNLIST_CONFIGURE_ENABLE= dynlist=mod
+GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
HOMEDIR_CONFIGURE_ENABLE= homedir=mod
LLOADD_CONFIGURE_ENABLE= balancer=mod
LLOADD_LIB_DEPENDS= libevent.so:devel/libevent
-MDB_CONFIGURE_ENABLE= mdb=mod
+MDB_CONFIGURE_ENABLE= mdb=yes
MEMBEROF_CONFIGURE_ENABLE= memberof=mod
OTP_CONFIGURE_ENABLE= otp=mod
PASSWD_CONFIGURE_ENABLE= passwd=mod
@@ -205,7 +207,7 @@ PERL_USES= perl5
PPOLICY_CONFIGURE_ENABLE= ppolicy=mod
PROXYCACHE_CONFIGURE_ENABLE= proxycache=mod
REFINT_CONFIGURE_ENABLE= refint=mod
-RELAY_CONFIGURE_ENABLE= relay=mod
+RELAY_CONFIGURE_ENABLE= relay=yes
REMOTEAUTH_CONFIGURE_ENABLE= remoteauth=mod
RETCODE_CONFIGURE_ENABLE= retcode=mod
RLOOKUPS_CONFIGURE_ENABLE= rlookups
@@ -220,7 +222,7 @@ SQL_CONFIGURE_ENABLE= sql=mod
SQL_LDFLAGS= -L${LOCALBASE}/lib
SQL_LIB_DEPENDS= libodbc.so:databases/unixODBC
SSSVLV_CONFIGURE_ENABLE= sssvlv=mod
-SYNCPROV_CONFIGURE_ENABLE= syncprov=mod
+SYNCPROV_CONFIGURE_ENABLE= syncprov=yes
TRANSLUCENT_CONFIGURE_ENABLE= translucent=mod
UNIQUE_CONFIGURE_ENABLE= unique=mod
VALSORT_CONFIGURE_ENABLE= valsort=mod
diff --git a/net/openldap25-server/distinfo b/net/openldap25-server/distinfo
index ad2f668e0fd7..b242b4a29f57 100644
--- a/net/openldap25-server/distinfo
+++ b/net/openldap25-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634448382
-SHA256 (openldap-2.5.8.tgz) = 366ea1c3b24202de4481978b632128c0cfe4148d4ae13cabf93a1f38c56472dc
-SIZE (openldap-2.5.8.tgz) = 6437833
+TIMESTAMP = 1636786433
+SHA256 (openldap-2.5.9.tgz) = c08e12f4ca5803d5d9f9948c70ad3491282cda3c17ec8b655dcbcb2364e6fb9e
+SIZE (openldap-2.5.9.tgz) = 6438837
diff --git a/net/openldap25-server/pkg-plist b/net/openldap25-server/pkg-plist
index 818928f2a447..4bdf2cce7dc1 100644
--- a/net/openldap25-server/pkg-plist
+++ b/net/openldap25-server/pkg-plist
@@ -119,10 +119,6 @@
%%LLOADD%%libexec/%%PORTNAME%%/lloadd-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
%%LLOADD%%libexec/%%PORTNAME%%/lloadd.la
%%LLOADD%%libexec/%%PORTNAME%%/lloadd.so
-%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%MDB%%libexec/openldap/back_mdb.la
-%%MDB%%libexec/openldap/back_mdb.so
%%MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
%%MEMBEROF%%libexec/openldap/memberof-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%MEMBEROF%%libexec/openldap/memberof.la
@@ -161,10 +157,6 @@
%%REFINT%%libexec/openldap/refint-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%REFINT%%libexec/openldap/refint.la
%%REFINT%%libexec/openldap/refint.so
-%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%RELAY%%libexec/openldap/back_relay.la
-%%RELAY%%libexec/openldap/back_relay.so
%%REMOTEAUTH%%libexec/openldap/remoteauth-%%OPENLDAP_MAJOR%%.so.0
%%REMOTEAUTH%%libexec/openldap/remoteauth-%%OPENLDAP_MAJOR%%.so.0.%%SHLIB_MINOR%%
%%REMOTEAUTH%%libexec/openldap/remoteauth.la
@@ -208,10 +200,6 @@
%%SSSVLV%%libexec/openldap/sssvlv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%SSSVLV%%libexec/openldap/sssvlv.la
%%SSSVLV%%libexec/openldap/sssvlv.so
-%%SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%SYNCPROV%%libexec/openldap/syncprov-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-%%SYNCPROV%%libexec/openldap/syncprov.la
-%%SYNCPROV%%libexec/openldap/syncprov.so
%%TRACE%%libexec/openldap/trace.la
%%TRACE%%libexec/openldap/trace.so
%%TRACE%%libexec/openldap/trace.so.0
diff --git a/net/openldap26-client/Makefile b/net/openldap26-client/Makefile
new file mode 100644
index 000000000000..b3d237883d5e
--- /dev/null
+++ b/net/openldap26-client/Makefile
@@ -0,0 +1,7 @@
+# Created by: Xin LI <delphij@FreeBSD.org>
+
+CLIENT_ONLY= yes
+
+MASTERDIR= ${.CURDIR}/../openldap26-server
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/openldap26-server/Makefile b/net/openldap26-server/Makefile
new file mode 100644
index 000000000000..58bf40274bfe
--- /dev/null
+++ b/net/openldap26-server/Makefile
@@ -0,0 +1,441 @@
+# Created by: Xin LI <delphij@FreeBSD.org>
+
+PORTNAME= openldap
+DISTVERSION= 2.6.0
+PORTREVISION= ${OPENLDAP_PORTREVISION}
+CATEGORIES= net databases
+MASTER_SITES= https://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ \
+ http://gpl.savoirfairelinux.net/pub/mirrors/openldap/%SUBDIR%/ \
+ http://repository.linagora.org/OpenLDAP/%SUBDIR%/ \
+ http://mirror.eu.oneandone.net/software/openldap/%SUBDIR%/ \
+ ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
+ https://mirror-hk.koddos.net/OpenLDAP/%SUBDIR%/ \
+ ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
+ https://mirror.koddos.net/OpenLDAP/%SUBDIR%/ \
+ https://mirror.lyrahosting.com/OpenLDAP/%SUBDIR%/ \
+ ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
+ http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/
+MASTER_SITE_SUBDIR= openldap-release
+.if defined(CLIENT_ONLY)
+PKGNAMESUFFIX= 26-client
+.else
+PKGNAMESUFFIX= 26-server
+.endif
+
+MAINTAINER= delphij@FreeBSD.org
+.if defined(CLIENT_ONLY)
+COMMENT= Open source LDAP client implementation
+.else
+COMMENT= Open source LDAP server implementation
+.endif
+
+LICENSE= OPENLDAP
+LICENSE_NAME= OpenLDAP Public License
+LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+# :keepla because port uses lt_dlopen
+USES= cpe gmake libtool:keepla localbase ssl tar:tgz
+
+.if defined(CLIENT_ONLY)
+CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-client ${PORTNAME}-client
+.else
+CONFLICTS_INSTALL= ${PORTNAME}2[0-57-9]-server ${PORTNAME}-server
+.endif
+
+GNU_CONFIGURE= yes
+
+PORTREVISION_CLIENT= 0
+PORTREVISION_SERVER= 0
+OPENLDAP_SHLIB_MAJOR= 2
+OPENLDAP_SHLIB_MINOR= 0.200
+
+OPTIONS_DEFINE= DEBUG
+OPTIONS_DEFAULT+= DEBUG
+
+.if defined(CLIENT_ONLY)
+OPTIONS_DEFINE+= DOCS FETCH
+
+FETCH_BUILD_DEPENDS= autoconf>0:devel/autoconf
+FETCH_CONFIGURE_WITH= fetch
+.else
+OPTIONS_GROUP= BKNDS OVLYS
+BKNDS_DESC= OpenLDAP backends
+BKNDS_DEFAULTS= ASYNCMETA DNSSRV MDB PASSWD RELAY SOCK
+OPTIONS_GROUP_BKNDS+= ${BKNDS_DEFAULTS}
+OPTIONS_GROUP_BKNDS+= PERL SQL
+
+OVLYS_DESC= OpenLDAP overlays
+OPTIONS_GROUP_OVLYS+= ACCESSLOG
+OPTIONS_GROUP_OVLYS+= ADDPARTIAL
+OPTIONS_GROUP_OVLYS+= ALLOP
+OPTIONS_GROUP_OVLYS+= AUTOCA
+OPTIONS_GROUP_OVLYS+= AUDITLOG
+OPTIONS_GROUP_OVLYS+= AUTOGROUP
+OPTIONS_GROUP_OVLYS+= CLOAK
+OPTIONS_GROUP_OVLYS+= COLLECT
+OPTIONS_GROUP_OVLYS+= CONSTRAINT
+OPTIONS_GROUP_OVLYS+= DDS
+OPTIONS_GROUP_OVLYS+= DENYOP
+OPTIONS_GROUP_OVLYS+= DEREF
+OPTIONS_GROUP_OVLYS+= DYNGROUP
+OPTIONS_GROUP_OVLYS+= DYNLIST
+OPTIONS_GROUP_OVLYS+= HOMEDIR
+OPTIONS_GROUP_OVLYS+= LASTBIND
+OPTIONS_GROUP_OVLYS+= LASTMOD
+OPTIONS_GROUP_OVLYS+= MEMBEROF
+OPTIONS_GROUP_OVLYS+= NOPS
+OPTIONS_GROUP_OVLYS+= OTP
+OPTIONS_GROUP_OVLYS+= PROXYCACHE
+OPTIONS_GROUP_OVLYS+= PPOLICY
+OPTIONS_GROUP_OVLYS+= REFINT
+OPTIONS_GROUP_OVLYS+= REMOTEAUTH
+OPTIONS_GROUP_OVLYS+= RETCODE
+OPTIONS_GROUP_OVLYS+= RWM
+OPTIONS_GROUP_OVLYS+= SEQMOD
+OPTIONS_GROUP_OVLYS+= SHA2
+OPTIONS_GROUP_OVLYS+= SMBPWD
+OPTIONS_GROUP_OVLYS+= SSSVLV
+OPTIONS_GROUP_OVLYS+= SYNCPROV
+OPTIONS_GROUP_OVLYS+= TRACE
+OPTIONS_GROUP_OVLYS+= TRANSLUCENT
+OPTIONS_GROUP_OVLYS+= UNIQUE
+OPTIONS_GROUP_OVLYS+= VALSORT
+
+OPTIONS_DEFINE+= GSSAPI
+OPTIONS_DEFINE+= DYNACL ACI
+OPTIONS_DEFINE+= RLOOKUPS SLP SLAPI
+OPTIONS_DEFINE+= PBKDF2
+OPTIONS_DEFINE+= OUTLOOK
+OPTIONS_DEFINE+= ARGON2
+OPTIONS_DEFINE+= LLOADD
+
+OPTIONS_DEFAULT+= ${BKNDS_DEFAULTS}
+OPTIONS_DEFAULT+= ${OPTIONS_GROUP_OVLYS}
+OPTIONS_DEFAULT+= ARGON2 LLOADD
+
+OPTIONS_SUB= yes
+
+ACI_DESC= Per-object ACI (experimental)
+ARGON2_DESC= Argon2 password hashing module
+DYNACL_DESC= Run-time loadable ACL (experimental)
+FETCH_DESC= Enable fetch(3) support
+GSSAPI_DESC= With GSSAPI support
+LLOADD_DESC= Enable load balancer
+OUTLOOK_DESC= Force caseIgnoreOrderingMatch on name attribute (experimental)
+RLOOKUPS_DESC= With reverse lookups of client hostnames
+SLAPI_DESC= With Netscape SLAPI plugin API (experimental)
+SLP_DESC= With SLPv2 (RFC 2608) support
+
+ASYNCMETA_DESC= With asynchronous metadirectory backend
+DNSSRV_DESC= With Dnssrv backend
+MDB_DESC= With Memory-Mapped DB backend
+SQL_DESC= With SQL backend
+PASSWD_DESC= With Passwd backend
+PERL_DESC= With Perl backend
+RELAY_DESC= With Relay backend
+SOCK_DESC= With Sock backend
+
+ACCESSLOG_DESC= With In-Directory Access Logging overlay
+AUDITLOG_DESC= With Audit Logging overlay
+AUTOCA_DESC= With Automatic Certificate Authority overlay
+COLLECT_DESC= With Collect overy Services overlay
+CONSTRAINT_DESC= With Attribute Constraint overlay
+DDS_DESC= With Dynamic Directory Services overlay
+DEREF_DESC= With Dereference overlay
+DYNGROUP_DESC= With Dynamic Group overlay
+DYNLIST_DESC= With Dynamic List overlay
+HOMEDIR_DESC= With Home Directory Management overlay
+MEMBEROF_DESC= With Reverse Group Membership overlay
+NOPS_DESC= With nops overlay
+OTP_DESC= With OTP 2-factor authentication overlay
+PPOLICY_DESC= With Password Policy overlay
+PROXYCACHE_DESC= With Proxy Cache overlay
+REFINT_DESC= With Referential Integrity overlay
+REMOTEAUTH_DESC= With Deferred Authentication overlay
+RETCODE_DESC= With Return Code testing overlay
+RWM_DESC= With Rewrite/Remap overlay
+SEQMOD_DESC= With Sequential Modify overlay
+SSSVLV_DESC= With ServerSideSort/VLV overlay
+SYNCPROV_DESC= With Syncrepl Provider overlay
+TRANSLUCENT_DESC= With Translucent Proxy overlay
+UNIQUE_DESC= With attribute Uniqueness overlay
+VALSORT_DESC= With Value Sorting overlay
+
+ADDPARTIAL_DESC= With addpartial overlay (experimental)
+ALLOP_DESC= With allop overlay (experimental)
+AUTOGROUP_DESC= With autogroup overlay (experimental)
+CLOAK_DESC= With cloak overlay (experimental)
+DENYOP_DESC= With denyop overlay (experimental)
+LASTBIND_DESC= With lastbind overlay
+LASTMOD_DESC= With lastmod overlay (experimental)
+TRACE_DESC= With Trace overlay
+
+PBKDF2_DESC= With PBKDF2 hash password support
+SHA2_DESC= With SHA2 Password hashes overlay
+SMBPWD_DESC= With Samba Password hashes overlay
+
+ACCESSLOG_CONFIGURE_ENABLE= accesslog=mod
+ACI_CONFIGURE_ENABLE= aci
+ARGON2_CONFIGURE_ENABLE= argon2
+ARGON2_CONFIGURE_WITH= argon2=libsodium
+ARGON2_LIB_DEPENDS= libsodium.so:security/libsodium
+ASYNCMETA_CONFIGURE_ENABLE= asyncmeta=mod
+AUDITLOG_CONFIGURE_ENABLE= auditlog=mod
+AUTOCA_CONFIGURE_ENABLE= autoca=mod
+COLLECT_CONFIGURE_ENABLE= collect=mod
+CONSTRAINT_CONFIGURE_ENABLE= constraint=mod
+DDS_CONFIGURE_ENABLE= dds=mod
+DEBUG_CONFIGURE_ENABLE= debug
+DEREF_CONFIGURE_ENABLE= deref=mod
+DNSSRV_CONFIGURE_ENABLE= dnssrv=mod
+DYNACL_CONFIGURE_ENABLE= dynacl
+DYNGROUP_CONFIGURE_ENABLE= dyngroup=mod
+DYNLIST_CONFIGURE_ENABLE= dynlist=mod
+GSSAPI_RUN_DEPENDS= cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
+HOMEDIR_CONFIGURE_ENABLE= homedir=mod
+LLOADD_CONFIGURE_ENABLE= balancer=mod
+LLOADD_LIB_DEPENDS= libevent.so:devel/libevent
+MDB_CONFIGURE_ENABLE= mdb=yes
+MEMBEROF_CONFIGURE_ENABLE= memberof=mod
+OTP_CONFIGURE_ENABLE= otp=mod
+PASSWD_CONFIGURE_ENABLE= passwd=mod
+PERL_CONFIGURE_ENABLE= perl=mod
+PERL_CONFIGURE_ENV= PERLBIN="${PERL}"
+PERL_USES= perl5
+PPOLICY_CONFIGURE_ENABLE= ppolicy=mod
+PROXYCACHE_CONFIGURE_ENABLE= proxycache=mod
+REFINT_CONFIGURE_ENABLE= refint=mod
+RELAY_CONFIGURE_ENABLE= relay=yes
+REMOTEAUTH_CONFIGURE_ENABLE= remoteauth=mod
+RETCODE_CONFIGURE_ENABLE= retcode=mod
+RLOOKUPS_CONFIGURE_ENABLE= rlookups
+RWM_CONFIGURE_ENABLE= rwm=mod
+SEQMOD_CONFIGURE_ENABLE= seqmod=mod
+SLAPI_CONFIGURE_ENABLE= slapi
+SLAPI_USE= LDCONFIG
+SLP_CONFIGURE_ENABLE= slp
+SLP_LIB_DEPENDS= libslp.so:net/openslp
+SOCK_CONFIGURE_ENABLE= sock=mod
+SQL_CONFIGURE_ENABLE= sql=mod
+SQL_LDFLAGS= -L${LOCALBASE}/lib
+SQL_LIB_DEPENDS= libodbc.so:databases/unixODBC
+SSSVLV_CONFIGURE_ENABLE= sssvlv=mod
+SYNCPROV_CONFIGURE_ENABLE= syncprov=yes
+TRANSLUCENT_CONFIGURE_ENABLE= translucent=mod
+UNIQUE_CONFIGURE_ENABLE= unique=mod
+VALSORT_CONFIGURE_ENABLE= valsort=mod
+
+# Force using caseIgnoreOrderingMatch on 'name' attribute.
+# This may be a violation of RFC 4519 2.18 definition.
+# See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html
+OUTLOOK_EXTRA_PATCHES= ${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c
+.endif
+
+CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g'
+
+.include <bsd.port.options.mk>
+
+.if defined(CLIENT_ONLY)
+OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT}
+OPENLDAP_PKGFILESUFX= .client
+
+PORTDOCS= CHANGES drafts rfc
+
+CONFIGURE_ARGS+= --disable-slapd \
+ --disable-monitor \
+ --disable-relay \
+ --disable-syncprov
+USE_LDCONFIG= yes
+.else
+OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
+OPENLDAP_PKGFILESUFX=
+
+LIB_DEPENDS+= libicudata.so:devel/icu \
+ libldap.so:net/openldap26-client \
+ libltdl.so:devel/libltdl
+
+SUB_LIST+= RC_DIR=${PREFIX} \
+ LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+ DATABASEDIR=${DATABASEDIR}
+
+USERS= ldap
+GROUPS= ldap
+LDAP_USER?= ldap
+LDAP_GROUP?= ldap
+USE_LDCONFIG= ${PREFIX}/libexec/openldap
+SUB_FILES+= pkg-deinstall
+USE_RC_SUBR= slapd
+
+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
+
+LDFLAGS+= -L${LOCALBASE}/lib
+
+SED_MODULES= -e 's,mandir = \$$(exec_prefix)/share/man,mandir = $$(exec_prefix)/man,' \
+ -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' \
+ -e 's/\# *\(modulepath\)/\1/'
+
+CONFIGURE_ARGS+= --enable-modules \
+ --localstatedir=${LOCALSTATEDIR} \
+ --enable-crypt \
+ --enable-ldap=mod \
+ --enable-meta=mod \
+ --enable-null=mod
+.endif
+
+LDAP_RUN_DIR?= /var/run/openldap
+LOCALSTATEDIR?= /var/db
+DATABASEDIR?= ${LOCALSTATEDIR}/openldap-data
+BACKUPDIR?= /var/backups/openldap
+
+DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
+PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
+
+SUB_FILES+= pkg-message${OPENLDAP_PKGFILESUFX}
+PKGMESSAGE= ${WRKSRC}/pkg-message${OPENLDAP_PKGFILESUFX}
+
+SUB_LIST+= LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+ LDAP_USER=${LDAP_USER} \
+ LDAP_GROUP=${LDAP_GROUP} \
+ BACKUPDIR=${BACKUPDIR} \
+ DATABASEDIR=${DATABASEDIR} \
+ PORTNAME=${PORTNAME} \
+ PKGNAME=${PKGNAME} \
+ PKGNAMESUFFIX=${PKGNAMESUFFIX}
+
+CONFIGURE_ARGS+= --with-threads=posix \
+ --with-tls=openssl \
+ --enable-dynamic
+
+LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2
+CONFIGURE_ARGS+= --with-cyrus-sasl --enable-spasswd
+MAKE_ENV+= STRIP=${STRIP}
+
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
+
+PLIST_SUB+= ${SUB_LIST}
+PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
+PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
+
+.if ${PORT_OPTIONS:MFETCH} && (defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base)
+BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported
+. endif
+
+.if ${PORT_OPTIONS:MADDPARTIAL}
+CONTRIB_MODULES+= slapd-modules/addpartial
+CONTRIB_CLEANFILES+= addpartial.a
+.endif
+.if ${PORT_OPTIONS:MALLOP}
+CONTRIB_MODULES+= slapd-modules/allop
+CONTRIB_CLEANFILES+= allop.a
+.endif
+.if ${PORT_OPTIONS:MAUTOGROUP}
+CONTRIB_MODULES+= slapd-modules/autogroup
+CONTRIB_CLEANFILES+= autogroup.a
+.endif
+.if ${PORT_OPTIONS:MCLOAK}
+CONTRIB_MODULES+= slapd-modules/cloak
+CONTRIB_CLEANFILES+= cloak.a
+.endif
+.if ${PORT_OPTIONS:MDENYOP}
+CONTRIB_MODULES+= slapd-modules/denyop
+CONTRIB_CLEANFILES+= denyop.a
+.endif
+.if ${PORT_OPTIONS:MLASTBIND}
+CONTRIB_MODULES+= slapd-modules/lastbind
+CONTRIB_CLEANFILES+= lastbind.a
+.endif
+.if ${PORT_OPTIONS:MLASTMOD}
+CONTRIB_MODULES+= slapd-modules/lastmod
+CONTRIB_CLEANFILES+= lastmod.a
+.endif
+.if ${PORT_OPTIONS:MNOPS}
+CONTRIB_MODULES+= slapd-modules/nops
+CONTRIB_CLEANFILES+= nops.a
+.endif
+.if ${PORT_OPTIONS:MTRACE}
+CONTRIB_MODULES+= slapd-modules/trace
+CONTRIB_CLEANFILES+= trace.a
+.endif
+.if ${PORT_OPTIONS:MSHA2}
+CONTRIB_MODULES+= slapd-modules/passwd/sha2
+CONTRIB_CLEANFILES+= pw-sha2.a
+.endif
+.if ${PORT_OPTIONS:MPBKDF2}
+CONTRIB_MODULES+= slapd-modules/passwd/pbkdf2
+CONTRIB_CLEANFILES+= pw-pbkdf2.a
+.endif
+.if ${PORT_OPTIONS:MSMBPWD}
+CONTRIB_MODULES+= slapd-modules/smbk5pwd
+CONTRIB_CLEANFILES+= smbk5pwd.a
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|%LOCALSTATEDIR%/run/|${LDAP_RUN_DIR}/|g' \
+ ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
+ @${REINPLACE_CMD} -e 's|^OPT =.*|OPT = ${CFLAGS}|g' \
+ -e 's|^CC =.*|CC = ${CC}|g' \
+ ${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \
+ ${WRKSRC}/contrib/slapd-modules/*/*/Makefile
+.if defined(CONFIGURE_SED)
+ @${REINPLACE_CMD} -E ${CONFIGURE_SED} \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.endif
+
+pre-configure-FETCH-on:
+ @(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf)
+
+.if !defined(CLIENT_ONLY)
+test: build
+ @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
+
+post-build:
+.for module in ${CONTRIB_MODULES}
+ @(cd ${BUILD_WRKSRC}/contrib/${module} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} prefix="${PREFIX}" all)
+.endfor
+.endif
+
+pre-install:
+.if !defined(CLIENT_ONLY)
+ ${MKDIR} ${STAGEDIR}${DATABASEDIR}
+.endif
+
+post-install:
+.if defined(CLIENT_ONLY)
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
+ for dir in drafts rfc; do \
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
+ ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
+ done
+ for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapvc ldapwhoami; do\
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \
+ done
+ for library in lber ldap; do \
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}.so.${OPENLDAP_SHLIB_MAJOR}; \
+ done
+.else
+ ${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
+.for module in ${CONTRIB_MODULES}
+ (cd ${WRKSRC}/contrib/${module} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} prefix="${PREFIX}" install)
+.endfor
+.for cleanfile in ${CONTRIB_CLEANFILES}
+ ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/${cleanfile}
+.endfor
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/slapd
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openldap
+.endif # defined(CLIENT_ONLY)
+
+post-install-SLAPI-on:
+ for library in slapi; do \
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}.so.${OPENLDAP_SHLIB_MAJOR}; \
+ done
+
+.include <bsd.port.mk>
diff --git a/net/openldap26-server/distinfo b/net/openldap26-server/distinfo
new file mode 100644
index 000000000000..7b248d91931d
--- /dev/null
+++ b/net/openldap26-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1636858185
+SHA256 (openldap-2.6.0.tgz) = b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f
+SIZE (openldap-2.6.0.tgz) = 6433764
diff --git a/net/openldap26-server/files/extrapatch-Makefile.in b/net/openldap26-server/files/extrapatch-Makefile.in
new file mode 100644
index 000000000000..b1de5e09f0db
--- /dev/null
+++ b/net/openldap26-server/files/extrapatch-Makefile.in
@@ -0,0 +1,17 @@
+--- Makefile.in.orig Mon Apr 7 22:23:24 2003
++++ Makefile.in Thu Jul 10 17:43:35 2003
+@@ -13,9 +13,11 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
+
+-SUBDIRS= include libraries clients servers tests doc
+-CLEANDIRS=
+-INSTALLDIRS=
++SUBDIRS=
++ALLDIRS= include libraries clients servers tests doc
++CLEANDIRS= include libraries clients servers tests doc
++DEPENDDIRS= include libraries clients servers tests doc
++INSTALLDIRS= servers doc
+
+ makefiles: FORCE
+ ./config.status
diff --git a/net/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c b/net/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
new file mode 100644
index 000000000000..508bc5be8202
--- /dev/null
+++ b/net/openldap26-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
@@ -0,0 +1,15 @@
+#
+# This patch is obtained from:
+#
+# http://www.openldap.org/lists/openldap-technical/201212/msg00055.html
+#
+--- servers/slapd/schema_prep.c.orig 2014-09-18 18:48:49.000000000 -0700
++++ servers/slapd/schema_prep.c 2015-03-31 17:26:23.439844478 -0700
+@@ -908,6 +908,7 @@
+ "DESC 'RFC4519: common supertype of name attributes' "
+ "EQUALITY caseIgnoreMatch "
+ "SUBSTR caseIgnoreSubstringsMatch "
++ "ORDERING caseIgnoreOrderingMatch "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )",
+ NULL, SLAP_AT_ABSTRACT,
+ NULL, NULL,
diff --git a/net/openldap26-server/files/patch-ITS7548 b/net/openldap26-server/files/patch-ITS7548
new file mode 100644
index 000000000000..edfd3cc80667
--- /dev/null
+++ b/net/openldap26-server/files/patch-ITS7548
@@ -0,0 +1,103 @@
+--- build/man.mk.orig 2021-07-27 17:44:47 UTC
++++ build/man.mk
+@@ -18,10 +18,12 @@
+
+ MANDIR=$(mandir)/man$(MANSECT)
+ TMP_SUFFIX=tmp
++ifeq ($(strip $(PAGES)),)
++PAGES=`cd $(srcdir); echo *.$(MANSECT)`
++endif
+
+ all-common:
+- PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
+- for page in $$PAGES; do \
++ for page in ${PAGES}; do \
+ $(SED) -e "s%LDVERSION%$(VERSION)%" \
+ -e 's%ETCDIR%$(sysconfdir)%g' \
+ -e 's%LOCALSTATEDIR%$(localstatedir)%' \
+@@ -39,8 +41,7 @@ all-common:
+
+ install-common:
+ -$(MKDIR) $(DESTDIR)$(MANDIR)
+- PAGES=`cd $(srcdir); echo *.$(MANSECT)`; \
+- for page in $$PAGES; do \
++ for page in ${PAGES}; do \
+ echo "installing $$page in $(DESTDIR)$(MANDIR)"; \
+ $(RM) $(DESTDIR)$(MANDIR)/$$page; \
+ $(INSTALL) $(INSTALLFLAGS) -m 644 $$page.$(TMP_SUFFIX) $(DESTDIR)$(MANDIR)/$$page; \
+--- doc/man/Makefile.in.orig 2021-07-27 17:44:47 UTC
++++ doc/man/Makefile.in
+@@ -13,4 +13,10 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
+
+-SUBDIRS= man1 man3 man5 man8
++BUILD_SRV = @BUILD_SLAPD@
++
++ifeq (${BUILD_SRV},no)
++ SUBDIRS= man1 man3 man5
++else
++ SUBDIRS= man5 man8
++endif
+--- doc/man/man5/Makefile.in.orig 2021-07-27 17:44:47 UTC
++++ doc/man/man5/Makefile.in
+@@ -14,3 +14,59 @@
+ ## <http://www.OpenLDAP.org/license.html>.
+
+ MANSECT=5
++
++BUILD_SRV = @BUILD_SLAPD@
++
++ifeq (${BUILD_SRV},no)
++PAGES= ldap.conf.${MANSECT} \
++ ldif.${MANSECT}
++else
++PAGES= lloadd.conf.${MANSECT} \
++ slapd-asyncmeta.${MANSECT} \
++ slapd-config.${MANSECT} \
++ slapd-dnssrv.${MANSECT} \
++ slapd-ldap.${MANSECT} \
++ slapd-ldif.${MANSECT} \
++ slapd-mdb.${MANSECT} \
++ slapd-meta.${MANSECT} \
++ slapd-monitor.${MANSECT} \
++ slapd-ndb.${MANSECT} \
++ slapd-null.${MANSECT} \
++ slapd-passwd.${MANSECT} \
++ slapd-perl.${MANSECT} \
++ slapd-relay.${MANSECT} \
++ slapd-sock.${MANSECT} \
++ slapd-sql.${MANSECT} \
++ slapd-wt.${MANSECT} \
++ slapd.access.${MANSECT} \
++ slapd.backends.${MANSECT} \
++ slapd.conf.${MANSECT} \
++ slapd.overlays.${MANSECT} \
++ slapd.plugin.${MANSECT} \
++ slapo-accesslog.${MANSECT} \
++ slapo-auditlog.${MANSECT} \
++ slapo-autoca.${MANSECT} \
++ slapo-chain.${MANSECT} \
++ slapo-collect.${MANSECT} \
++ slapo-constraint.${MANSECT} \
++ slapo-dds.${MANSECT} \
++ slapo-deref.${MANSECT} \
++ slapo-dyngroup.${MANSECT} \
++ slapo-dynlist.${MANSECT} \
++ slapo-homedir.${MANSECT} \
++ slapo-memberof.${MANSECT} \
++ slapo-otp.${MANSECT} \
++ slapo-pbind.${MANSECT} \
++ slapo-pcache.${MANSECT} \
++ slapo-ppolicy.${MANSECT} \
++ slapo-refint.${MANSECT} \
++ slapo-remoteauth.${MANSECT} \
++ slapo-retcode.${MANSECT} \
++ slapo-rwm.${MANSECT} \
++ slapo-sssvlv.${MANSECT} \
++ slapo-syncprov.${MANSECT} \
++ slapo-translucent.${MANSECT} \
++ slapo-unique.${MANSECT} \
++ slapo-valsort.${MANSECT} \
++ slappw-argon2.${MANSECT}
++endif
diff --git a/net/openldap26-server/files/patch-build__top.mk b/net/openldap26-server/files/patch-build__top.mk
new file mode 100644
index 000000000000..7468883924a0
--- /dev/null
+++ b/net/openldap26-server/files/patch-build__top.mk
@@ -0,0 +1,11 @@
+--- build/top.mk.orig 2021-07-27 17:44:47 UTC
++++ build/top.mk
+@@ -60,8 +60,6 @@ INSTALL_PROGRAM = $(INSTALL)
+ INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_SCRIPT = $(INSTALL)
+
+-STRIP_OPTS = -s
+-
+ LINT = lint
+ 5LINT = 5lint
+
diff --git a/net/openldap26-server/files/patch-configure b/net/openldap26-server/files/patch-configure
new file mode 100644
index 000000000000..97d8af90e78e
--- /dev/null
+++ b/net/openldap26-server/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig 2021-07-27 17:44:47 UTC
++++ configure
+@@ -16827,9 +16827,9 @@ $as_echo "#define HAVE_UUID_TO_STR 1" >>confdefs.h
+ fi
+
+ if test $have_uuid = no ; then
+- for ac_header in uuid/uuid.h
++ for ac_header in xxuuid/uuid.h
+ do :
+- ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
++ ac_fn_c_check_header_mongrel "$LINENO" "xxuuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
+ if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_UUID_UUID_H 1
+@@ -22127,7 +22127,7 @@ if ${ac_cv_lib_iodbc_SQLDriverConnect+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liodbc $LIBS"
++LIBS="-liodbc $LIBS $LTHREAD_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -22175,7 +22175,7 @@ if ${ac_cv_lib_odbc_SQLDriverConnect+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lodbc $LIBS"
++LIBS="-lodbc $LIBS $LTHREAD_LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
diff --git a/net/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h b/net/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
new file mode 100644
index 000000000000..e03f4ba2b873
--- /dev/null
+++ b/net/openldap26-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
@@ -0,0 +1,24 @@
+--- contrib/slapd-modules/passwd/sha2/sha2.h.orig 2021-07-27 17:44:47 UTC
++++ contrib/slapd-modules/passwd/sha2/sha2.h
+@@ -142,6 +142,21 @@ typedef struct _SHA512_CTX {
+
+ typedef SHA512_CTX SHA384_CTX;
+
++#define SHA256_Init _sha2_SHA256_Init
++#define SHA256_Update _sha2_SHA256_Update
++#define SHA256_Final _sha2_SHA256_Final
++#define SHA256_End _sha2_SHA256_End
++#define SHA256_Data _sha2_SHA256_Data
++#define SHA384_Init _sha2_SHA384_Init
++#define SHA384_Update _sha2_SHA384_Update
++#define SHA384_Final _sha2_SHA384_Final
++#define SHA384_End _sha2_SHA384_End
++#define SHA384_Data _sha2_SHA384_Data
++#define SHA512_Init _sha2_SHA512_Init
++#define SHA512_Update _sha2_SHA512_Update
++#define SHA512_Final _sha2_SHA512_Final
++#define SHA512_End _sha2_SHA512_End
++#define SHA512_Data _sha2_SHA512_Data
+
+ /*** SHA-256/384/512 Function Prototypes ******************************/
+ /* avoid symbol clash with other crypto libs */
diff --git a/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile b/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
new file mode 100644
index 000000000000..1f2d56dc866e
--- /dev/null
+++ b/net/openldap26-server/files/patch-contrib_slapd-modules_smbk5pwd_Makefile
@@ -0,0 +1,13 @@
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2021-06-03 18:40:31 UTC
++++ contrib/slapd-modules/smbk5pwd/Makefile
+@@ -21,8 +21,8 @@ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r
+ SSL_INC =
+ SSL_LIB = -lcrypto
+
+-HEIMDAL_INC = -I/usr/heimdal/include
+-HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
++HEIMDAL_INC = -I/usr/include
++HEIMDAL_LIB = -L/usr/lib -lkrb5 -lkadm5srv
+
+ LIBTOOL = $(LDAP_BUILD)/libtool
+ CC = gcc
diff --git a/net/openldap26-server/files/patch-include__ldap_defaults.h b/net/openldap26-server/files/patch-include__ldap_defaults.h
new file mode 100644
index 000000000000..b14af6f6ab27
--- /dev/null
+++ b/net/openldap26-server/files/patch-include__ldap_defaults.h
@@ -0,0 +1,11 @@
+--- include/ldap_defaults.h.orig 2021-07-27 17:44:47 UTC
++++ include/ldap_defaults.h
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+
+ /*
+ * SLAPD DEFINITIONS
diff --git a/net/openldap26-server/files/patch-libraries__libldap__Makefile.in b/net/openldap26-server/files/patch-libraries__libldap__Makefile.in
new file mode 100644
index 000000000000..551b567191b2
--- /dev/null
+++ b/net/openldap26-server/files/patch-libraries__libldap__Makefile.in
@@ -0,0 +1,17 @@
+--- libraries/libldap/Makefile.in.orig 2021-07-27 17:44:47 UTC
++++ libraries/libldap/Makefile.in
+@@ -86,13 +86,6 @@ install-local: $(CFFILES) FORCE
+ $(LTFINISH) $(DESTDIR)$(libdir)
+ -$(MKDIR) $(DESTDIR)$(sysconfdir)
+ @for i in $(CFFILES); do \
+- if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+- echo "installing $$i in $(sysconfdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
+- else \
+- echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+- fi; \
+- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
++ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.sample; \
+ done
+
diff --git a/net/openldap26-server/files/patch-libraries_libldap_tls__o.c b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c
new file mode 100644
index 000000000000..3c9bccd4dc15
--- /dev/null
+++ b/net/openldap26-server/files/patch-libraries_libldap_tls__o.c
@@ -0,0 +1,20 @@
+--- libraries/libldap/tls_o.c.orig 2021-07-27 17:44:47 UTC
++++ libraries/libldap/tls_o.c
+@@ -275,7 +275,7 @@ tlso_ctx_free ( tls_ctx *ctx )
+ SSL_CTX_free( c );
+ }
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000
++#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(OPENSSL_NO_TLS1_3)
+ static char *
+ tlso_stecpy( char *dst, const char *src, const char *end )
+ {
+@@ -411,7 +411,7 @@ tlso_ctx_init( struct ldapoptions *lo, struct ldaptls
+ }
+
+ if ( lo->ldo_tls_ciphersuite ) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000
++#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(OPENSSL_NO_TLS1_3)
+ tlso_ctx_cipher13( ctx, lt->lt_ciphersuite );
+ #endif
+ if ( !SSL_CTX_set_cipher_list( ctx, lt->lt_ciphersuite ) )
diff --git a/net/openldap26-server/files/patch-servers_slapd_Makefile.in b/net/openldap26-server/files/patch-servers_slapd_Makefile.in
new file mode 100644
index 000000000000..d4d16458b30b
--- /dev/null
+++ b/net/openldap26-server/files/patch-servers_slapd_Makefile.in
@@ -0,0 +1,67 @@
+--- servers/slapd/Makefile.in.orig 2021-07-27 17:44:47 UTC
++++ servers/slapd/Makefile.in
+@@ -374,7 +374,6 @@ install-local-srv: install-slapd install-tools \
+
+ install-slapd: FORCE
+ -$(MKDIR) $(DESTDIR)$(libexecdir)
+- -$(MKDIR) $(DESTDIR)$(localstatedir)/run
+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
+ slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
+ @for i in $(SUBDIRS); do \
+@@ -413,48 +412,27 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_o
+ touch all-cffiles
+
+ install-schema: FORCE
+- @if test -d $(DESTDIR)$(schemadir) ; then \
+- echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \
+- mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \
+- fi
+ $(MKDIR) $(DESTDIR)$(schemadir)
+ @SD=$(DESTDIR)$(schemadir) ; \
+- files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \
++ files=`cd $(srcdir)/schema ; echo README *.ldif` ; \
+ for i in $$files ; do \
+ echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
+ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
++ done ; \
++ files=`cd $(srcdir)/schema ; echo *.schema` ; \
++ for i in $$files ; do \
++ echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
++ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.sample ; \
+ done
+
+ install-conf: FORCE
+ @-$(MKDIR) $(DESTDIR)$(sysconfdir)
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
+- if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
+- echo "installing slapd.conf in $(sysconfdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf; \
+- else \
+- echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \
+- fi
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif.default
+- if test ! -f $(DESTDIR)$(sysconfdir)/slapd.ldif; then \
+- echo "installing slapd.ldif in $(sysconfdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif; \
+- else \
+- echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.ldif" ; \
+- fi
+- if test -n "$(systemdsystemunitdir)" && test ! -f $(DESTDIR)$(systemdsystemunitdir)/slapd.service; then \
+- $(MKDIR) $(DESTDIR)$(systemdsystemunitdir); \
+- echo "installing slapd.service in $(systemdsystemunitdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.service.tmp $(DESTDIR)$(systemdsystemunitdir)/slapd.service"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.service.tmp $(DESTDIR)$(systemdsystemunitdir)/slapd.service; \
+- fi
++ $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.sample
++ $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif.sample
+
+ install-db-config: FORCE
+ @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+- $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+ $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+ $(DESTDIR)$(sysconfdir)/DB_CONFIG.example
+
diff --git a/net/openldap26-server/files/patch-servers_slapd_daemon.c b/net/openldap26-server/files/patch-servers_slapd_daemon.c
new file mode 100644
index 000000000000..6e6228b2e629
--- /dev/null
+++ b/net/openldap26-server/files/patch-servers_slapd_daemon.c
@@ -0,0 +1,14 @@
+--- servers/slapd/daemon.c.orig 2021-08-18 17:11:41 UTC
++++ servers/slapd/daemon.c
+@@ -228,10 +228,9 @@ static slap_daemon_st *slap_daemon;
+ } while (0)
+
+ /* a kqueue fd obtained before a fork can't be used in child process.
+- * close it and reacquire it.
++ * reacquire it.
+ */
+ # define SLAP_SOCK_INIT2() do { \
+- close(slap_daemon[0].sd_kq); \
+ slap_daemon[0].sd_kq = kqueue(); \
+ } while (0)
+
diff --git a/net/openldap26-server/files/pkg-deinstall.in b/net/openldap26-server/files/pkg-deinstall.in
new file mode 100644
index 000000000000..1557b33873af
--- /dev/null
+++ b/net/openldap26-server/files/pkg-deinstall.in
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+ECHO_CMD=echo
+
+if [ -f "%%PREFIX%%/etc/openldap/slapd.conf" ]; then
+ DBDIR=`awk '$1 == "directory" {print $2}' "%%PREFIX%%/etc/openldap/slapd.conf"`
+fi
+
+case $2 in
+POST-DEINSTALL)
+ ${ECHO_CMD}
+ ${ECHO_CMD} "The OpenLDAP server package has been deleted."
+ ${ECHO_CMD} "If you're *not* upgrading and won't be using"
+ ${ECHO_CMD} "it any longer, you may want to issue the"
+ ${ECHO_CMD} "following commands:"
+ ${ECHO_CMD}
+ if ([ "${DBDIR}" ] && [ -d "${DBDIR}" ]) || ([ ! "${DBDIR}" ] && [ -d %%DATABASEDIR%% ]); then
+ ${ECHO_CMD} "- to delete the OpenLDAP database permanently (losing all data):"
+ if [ "${DBDIR}" ] && [ -d "${DBDIR}" ]; then
+ ${ECHO_CMD} " rm -Rf ${DBDIR}"
+ else
+ ${ECHO_CMD} " rm -Rf %%DATABASEDIR%%"
+ fi
+ ${ECHO_CMD}
+ fi
+ ${ECHO_CMD} "- to remove the OpenLDAP user:"
+ ${ECHO_CMD} " pw userdel ldap"
+ ${ECHO_CMD}
+ ${ECHO_CMD} "If you are upgrading, don't forget to restart slapd."
+ ${ECHO_CMD}
+ ;;
+esac
diff --git a/net/openldap26-server/files/pkg-message.client.in b/net/openldap26-server/files/pkg-message.client.in
new file mode 100644
index 000000000000..1ae2cf27dd22
--- /dev/null
+++ b/net/openldap26-server/files/pkg-message.client.in
@@ -0,0 +1,15 @@
+[
+{ type: install
+ message: <<EOM
+The OpenLDAP client package has been successfully installed.
+
+Edit
+ %%PREFIX%%/etc/openldap/ldap.conf
+to change the system-wide client defaults.
+
+Try `man ldap.conf' and visit the OpenLDAP FAQ-O-Matic at
+ http://www.OpenLDAP.org/faq/index.cgi?file=3
+for more information.
+EOM
+}
+]
diff --git a/net/openldap26-server/files/pkg-message.in b/net/openldap26-server/files/pkg-message.in
new file mode 100644
index 000000000000..d07531c959ce
--- /dev/null
+++ b/net/openldap26-server/files/pkg-message.in
@@ -0,0 +1,37 @@
+[
+{ type: install
+ message: <<EOM
+The OpenLDAP server package has been successfully installed.
+
+In order to run the LDAP server, you need to edit
+ %%PREFIX%%/etc/openldap/slapd.conf
+to suit your needs and add the following lines to /etc/rc.conf:
+ slapd_enable="YES"
+ slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
+ slapd_sockets="/var/run/openldap/ldapi"
+
+Then start the server with
+ %%PREFIX%%/etc/rc.d/slapd start
+or reboot.
+
+Try `man slapd' and the online manual at
+ http://www.OpenLDAP.org/doc/
+for more information.
+
+slapd runs under a non-privileged user id (by default `ldap'),
+see %%PREFIX%%/etc/rc.d/slapd for more information.
+
+PLEASE NOTE:
+
+Upgrading from %%PORTNAME%%%%PKGNAMESUFFIX%% 2.4 to 2.5 requires a full dump
+and reimport of database.
+
+Starting from %%PORTNAME%%%%PKGNAMESUFFIX%% 2.4.59_3, automatic data dumps
+are saved at %%BACKUPDIR%% when shutting down slapd.
+
+Please refer to OpenLDAP Software 2.5 Administrator's Guide at
+ https://www.openldap.org/doc/admin25/appendix-upgrading.html
+for additional upgrade instructions.
+EOM
+}
+]
diff --git a/net/openldap26-server/files/slapd.in b/net/openldap26-server/files/slapd.in
new file mode 100644
index 000000000000..620c2f4d255c
--- /dev/null
+++ b/net/openldap26-server/files/slapd.in
@@ -0,0 +1,217 @@
+#!/bin/sh
+
+# PROVIDE: slapd
+# REQUIRE: FILESYSTEMS ldconfig netif
+# BEFORE: SERVERS kdc
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable slapd:
+#
+#slapd_enable="YES"
+#slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
+#slapd_sockets="/var/run/openldap/ldapi"
+#
+# See slapd(8) for more flags
+#
+# The `-u' and `-g' flags are automatically extracted from slapd_owner,
+# by default slapd runs under the non-privileged user id `ldap'. If you
+# want to run slapd as root, override this in /etc/rc.conf with
+#
+#slapd_owner="DEFAULT"
+#
+# To use the cn=config style configuration add the following
+# line to /etc/rc.conf:
+#
+#slapd_cn_config="YES"
+#
+# To specify alternative Kerberos 5 Key Table, add the following
+# rc.conf(5) configuration:
+#
+#slapd_krb5_ktname="/path/to/ldap.keytab"
+#
+#slapd_autobackup_enable="YES"
+# To enable automatic backup of OpenLDAP data after successful shutdown
+# in the form of LDIF.
+#
+#slapd_autobackup_num="8"
+# How many automatic backups should this script keep.
+#
+#slapd_autobackup_compress="YES"
+# Compress backup data with zstd (if present) or gzip.
+#
+#slapd_autobackup_name="backup"
+# Name to be used for backups
+
+. /etc/rc.subr
+
+name="slapd"
+rcvar=slapd_enable
+
+# read settings, set defaults
+load_rc_config ${name}
+
+: ${slapd_enable="NO"}
+if [ -n "${slapd_args+set}" ]; then
+ warn "slapd_args is deprecated, use slapd_flags"
+ : ${slapd_flags="$slapd_args"}
+fi
+: ${slapd_owner="%%LDAP_USER%%:%%LDAP_GROUP%%"}
+: ${slapd_sockets_mode="666"}
+: ${slapd_cn_config="NO"}
+: ${slapd_autobackup_enable="YES"}
+: ${slapd_autobackup_num="8"}
+: ${slapd_autobackup_compress="YES"}
+: ${slapd_autobackup_name="backup"}
+
+command="%%PREFIX%%/libexec/slapd"
+pidfile="%%LDAP_RUN_DIR%%/slapd.pid"
+
+# set required_dirs, required_files and DATABASEDIR
+if checkyesno slapd_cn_config; then
+ required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
+ required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
+ DATABASEDIR=`grep olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
+else
+ required_files="%%PREFIX%%/etc/openldap/slapd.conf"
+ DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`
+fi
+
+start_precmd=start_precmd
+start_postcmd=start_postcmd
+stop_postcmd=stop_postcmd
+
+# extract user and group, adjust ownership of directories and database
+
+start_precmd()
+{
+ local slapd_ownername slapd_groupname
+
+ mkdir -p %%LDAP_RUN_DIR%%
+
+ case "$slapd_owner" in
+ ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
+ ;;
+ *)
+ local DBDIR
+ for DBDIR in ${DATABASEDIR}; do
+ if [ ! -d "${DBDIR}" ]; then
+ mkdir -p "${DBDIR}"
+ [ -f "%%PREFIX%%/etc/openldap/DB_CONFIG.example" ] && cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG"
+ fi
+ chown -RL "$slapd_owner" "${DBDIR}"
+ chmod 700 "${DBDIR}"
+ done
+ chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
+
+ if checkyesno slapd_cn_config; then
+ chown -R $slapd_owner "%%PREFIX%%/etc/openldap/slapd.d"
+ else
+ chown $slapd_owner "%%PREFIX%%/etc/openldap/slapd.conf"
+ fi
+
+ slapd_ownername="${slapd_owner%:*}"
+ slapd_groupname="${slapd_owner#*:}"
+
+ if [ -n "$slapd_ownername" ]; then
+ rc_flags="$rc_flags -u $slapd_ownername"
+ fi
+ if [ -n "$slapd_groupname" ]; then
+ rc_flags="$rc_flags -g $slapd_groupname"
+ fi
+ if [ -n "${slapd_krb5_ktname}" ]; then
+ export KRB5_KTNAME=${slapd_krb5_ktname}
+ fi
+ ;;
+ esac
+ echo -n "Performing sanity check on slap configuration: "
+
+ if ${command} -Tt -u >/dev/null 2>&1; then
+ echo "OK"
+ else
+ echo "FAILED"
+ return 1
+ fi
+}
+
+# adjust ownership of created unix sockets
+
+start_postcmd()
+{
+ local socket seconds
+
+ for socket in $slapd_sockets; do
+ for seconds in 1 2 3 4 5; do
+ [ -e "$socket" ] && break
+ sleep 1
+ done
+ if [ -S "$socket" ]; then
+ case "$slapd_owner" in
+ ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
+ ;;
+ *)
+ chown "$slapd_owner" "$socket"
+ ;;
+ esac
+ chmod "$slapd_sockets_mode" "$socket"
+ else
+ warn "slapd: Can't find socket $socket"
+ fi
+ done
+}
+
+stop_postcmd()
+{
+ local compress_program compress_suffix
+
+ if checkyesno slapd_autobackup_enable; then
+ if checkyesno slapd_autobackup_compress; then
+ if [ -x /usr/bin/zstd ]; then
+ compress_program="/usr/bin/zstd"
+ compress_suffix=".zstd"
+ else
+ compress_program="/usr/bin/gzip"
+ compress_suffix=".gz"
+ fi
+ else
+ compress_program="cat"
+ compress_suffix=""
+ fi
+
+ umask 077
+ mkdir -p %%BACKUPDIR%%
+ chmod 700 %%BACKUPDIR%%
+
+ n=0
+ while [ ${n} -lt ${slapd_autobackup_num} ]; do
+ backup_file="%%BACKUPDIR%%/${slapd_autobackup_name}.ldif.${n}${compress_suffix}"
+ if [ ! -e "${backup_file}" -o -f "${backup_file}" ]; then
+ break
+ fi
+ n=$(( ${n} + 1 ))
+ done
+ if [ -f "${backup_file}" ]; then
+ n=$(( ${n} + 1 ))
+ while [ ${n} -lt ${slapd_autobackup_num} ]; do
+ next_backup_file="%%BACKUPDIR%%/${slapd_autobackup_name}.ldif.${n}${compress_suffix}"
+ if [ -f "${next_backup_file}" ]; then
+ [ "${next_backup_file}" -ot "${backup_file}" ] && \
+ backup_file=${next_backup_file}
+ elif [ ! -e "${next_backup_file}" ]; then
+ backup_file=${next_backup_file}
+ break
+ fi
+ n=$(( ${n} + 1 ))
+ done
+ fi
+ if [ -e "${backup_file}" -a ! -f "${backup_file}" ]; then
+ err 1 "Unable to backup OpenLDAP data"
+ else
+ info "Backing up OpenLDAP data to ${backup_file}"
+ fi
+
+ %%PREFIX%%/sbin/slapcat | ${compress_program} > ${backup_file}
+ fi
+}
+
+run_rc_command "$1"
diff --git a/net/openldap26-server/pkg-descr b/net/openldap26-server/pkg-descr
new file mode 100644
index 000000000000..db27ddbb4d89
--- /dev/null
+++ b/net/openldap26-server/pkg-descr
@@ -0,0 +1,11 @@
+OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
+clients, utilities and development tools.
+
+This package includes the following major components:
+
+ * slapd - a stand-alone LDAP directory server
+ * LDIF tools - data conversion tools for use with slapd
+
+This is the latest stable release of OpenLDAP Software for general use.
+
+WWW: https://www.OpenLDAP.org/
diff --git a/net/openldap26-server/pkg-descr.client b/net/openldap26-server/pkg-descr.client
new file mode 100644
index 000000000000..b03b496a52f2
--- /dev/null
+++ b/net/openldap26-server/pkg-descr.client
@@ -0,0 +1,11 @@
+OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
+clients, utilities and development tools.
+
+This package includes the following major components:
+
+ * -lldap - a LDAP client library
+ * -llber - a lightweight BER/DER encoding/decoding library
+ * LDAP tools - A collection of command line LDAP utilities
+ * documentation - man pages for all components
+
+WWW: https://www.OpenLDAP.org/
diff --git a/net/openldap26-server/pkg-plist b/net/openldap26-server/pkg-plist
new file mode 100644
index 000000000000..b2ac7fe3c422
--- /dev/null
+++ b/net/openldap26-server/pkg-plist
@@ -0,0 +1,306 @@
+%%ETCDIR%%/schema/README
+%%ETCDIR%%/schema/collective.ldif
+@sample %%ETCDIR%%/schema/collective.schema.sample
+%%ETCDIR%%/schema/corba.ldif
+@sample %%ETCDIR%%/schema/corba.schema.sample
+%%ETCDIR%%/schema/core.ldif
+@sample %%ETCDIR%%/schema/core.schema.sample
+%%ETCDIR%%/schema/cosine.ldif
+@sample %%ETCDIR%%/schema/cosine.schema.sample
+%%ETCDIR%%/schema/dsee.ldif
+@sample %%ETCDIR%%/schema/dsee.schema.sample
+%%ETCDIR%%/schema/msuser.ldif
+@sample %%ETCDIR%%/schema/msuser.schema.sample
+%%ETCDIR%%/schema/namedobject.ldif
+@sample %%ETCDIR%%/schema/namedobject.schema.sample
+%%ETCDIR%%/schema/duaconf.ldif
+@sample %%ETCDIR%%/schema/duaconf.schema.sample
+%%ETCDIR%%/schema/dyngroup.ldif
+@sample %%ETCDIR%%/schema/dyngroup.schema.sample
+%%ETCDIR%%/schema/inetorgperson.ldif
+@sample %%ETCDIR%%/schema/inetorgperson.schema.sample
+%%ETCDIR%%/schema/java.ldif
+@sample %%ETCDIR%%/schema/java.schema.sample
+%%ETCDIR%%/schema/misc.ldif
+@sample %%ETCDIR%%/schema/misc.schema.sample
+%%ETCDIR%%/schema/nis.ldif
+@sample %%ETCDIR%%/schema/nis.schema.sample
+%%ETCDIR%%/schema/openldap.ldif
+@sample %%ETCDIR%%/schema/openldap.schema.sample
+%%ETCDIR%%/schema/pmi.ldif
+@sample %%ETCDIR%%/schema/pmi.schema.sample
+@sample %%ETCDIR%%/slapd.conf.sample
+@sample %%ETCDIR%%/slapd.ldif.sample
+%%ACCESSLOG%%libexec/openldap/accesslog.so.%%SHLIB_MAJOR%%
+%%ACCESSLOG%%libexec/openldap/accesslog.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%ACCESSLOG%%libexec/openldap/accesslog.la
+%%ACCESSLOG%%libexec/openldap/accesslog.so
+%%ADDPARTIAL%%libexec/openldap/addpartial.la
+%%ADDPARTIAL%%libexec/openldap/addpartial.so
+%%ADDPARTIAL%%libexec/openldap/addpartial.so.0
+%%ADDPARTIAL%%libexec/openldap/addpartial.so.0.0.0
+%%ALLOP%%libexec/openldap/allop.la
+%%ALLOP%%libexec/openldap/allop.so
+%%ALLOP%%libexec/openldap/allop.so.0
+%%ALLOP%%libexec/openldap/allop.so.0.0.0
+%%ALLOP%%man/man5/slapo-allop.5.gz
+%%ARGON2%%libexec/openldap/argon2.so.%%SHLIB_MAJOR%%
+%%ARGON2%%libexec/openldap/argon2.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%ARGON2%%libexec/openldap/argon2.la
+%%ARGON2%%libexec/openldap/argon2.so
+%%ASYNCMETA%%libexec/openldap/back_asyncmeta.so.%%SHLIB_MAJOR%%
+%%ASYNCMETA%%libexec/openldap/back_asyncmeta.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%ASYNCMETA%%libexec/openldap/back_asyncmeta.la
+%%ASYNCMETA%%libexec/openldap/back_asyncmeta.so
+%%AUDITLOG%%libexec/openldap/auditlog.so.%%SHLIB_MAJOR%%
+%%AUDITLOG%%libexec/openldap/auditlog.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%AUDITLOG%%libexec/openldap/auditlog.la
+%%AUDITLOG%%libexec/openldap/auditlog.so
+%%AUTOCA%%libexec/openldap/autoca.so.%%SHLIB_MAJOR%%
+%%AUTOCA%%libexec/openldap/autoca.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%AUTOCA%%libexec/openldap/autoca.la
+%%AUTOCA%%libexec/openldap/autoca.so
+%%AUTOGROUP%%libexec/openldap/autogroup.la
+%%AUTOGROUP%%libexec/openldap/autogroup.so
+%%AUTOGROUP%%libexec/openldap/autogroup.so.0
+%%AUTOGROUP%%libexec/openldap/autogroup.so.0.0.0
+%%CLOAK%%libexec/openldap/cloak.la
+%%CLOAK%%libexec/openldap/cloak.so
+%%CLOAK%%libexec/openldap/cloak.so.0
+%%CLOAK%%libexec/openldap/cloak.so.0.0.0
+%%CLOAK%%man/man5/slapo-cloak.5.gz
+%%COLLECT%%libexec/openldap/collect.so.%%SHLIB_MAJOR%%
+%%COLLECT%%libexec/openldap/collect.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%COLLECT%%libexec/openldap/collect.la
+%%COLLECT%%libexec/openldap/collect.so
+%%CONSTRAINT%%libexec/openldap/constraint.so.%%SHLIB_MAJOR%%
+%%CONSTRAINT%%libexec/openldap/constraint.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%CONSTRAINT%%libexec/openldap/constraint.la
+%%CONSTRAINT%%libexec/openldap/constraint.so
+%%DDS%%libexec/openldap/dds.so.%%SHLIB_MAJOR%%
+%%DDS%%libexec/openldap/dds.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%DDS%%libexec/openldap/dds.la
+%%DDS%%libexec/openldap/dds.so
+%%DENYOP%%libexec/openldap/denyop.la
+%%DENYOP%%libexec/openldap/denyop.so
+%%DENYOP%%libexec/openldap/denyop.so.0
+%%DENYOP%%libexec/openldap/denyop.so.0.0.0
+%%DEREF%%libexec/openldap/deref.so.%%SHLIB_MAJOR%%
+%%DEREF%%libexec/openldap/deref.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%DEREF%%libexec/openldap/deref.la
+%%DEREF%%libexec/openldap/deref.so
+%%DNSSRV%%libexec/openldap/back_dnssrv.so.%%SHLIB_MAJOR%%
+%%DNSSRV%%libexec/openldap/back_dnssrv.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%DNSSRV%%libexec/openldap/back_dnssrv.la
+%%DNSSRV%%libexec/openldap/back_dnssrv.so
+%%DYNGROUP%%libexec/openldap/dyngroup.so.%%SHLIB_MAJOR%%
+%%DYNGROUP%%libexec/openldap/dyngroup.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%DYNGROUP%%libexec/openldap/dyngroup.la
+%%DYNGROUP%%libexec/openldap/dyngroup.so
+%%DYNLIST%%libexec/openldap/dynlist.so.%%SHLIB_MAJOR%%
+%%DYNLIST%%libexec/openldap/dynlist.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%DYNLIST%%libexec/openldap/dynlist.la
+%%DYNLIST%%libexec/openldap/dynlist.so
+%%HOMEDIR%%libexec/openldap/homedir.so.%%SHLIB_MAJOR%%
+%%HOMEDIR%%libexec/openldap/homedir.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%HOMEDIR%%libexec/openldap/homedir.la
+%%HOMEDIR%%libexec/openldap/homedir.so
+%%LASTBIND%%libexec/openldap/lastbind.la
+%%LASTBIND%%libexec/openldap/lastbind.so
+%%LASTBIND%%libexec/openldap/lastbind.so.0
+%%LASTBIND%%libexec/openldap/lastbind.so.0.0.0
+%%LASTBIND%%man/man5/slapo-lastbind.5.gz
+%%LASTMOD%%libexec/openldap/lastmod.la
+%%LASTMOD%%libexec/openldap/lastmod.so
+%%LASTMOD%%libexec/openldap/lastmod.so.0
+%%LASTMOD%%libexec/openldap/lastmod.so.0.0.0
+%%LASTMOD%%man/man5/slapo-lastmod.5.gz
+%%LLOADD%%libexec/%%PORTNAME%%/lloadd.so.%%SHLIB_MAJOR%%
+%%LLOADD%%libexec/%%PORTNAME%%/lloadd.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%LLOADD%%libexec/%%PORTNAME%%/lloadd.la
+%%LLOADD%%libexec/%%PORTNAME%%/lloadd.so
+%%MEMBEROF%%libexec/openldap/memberof.so.%%SHLIB_MAJOR%%
+%%MEMBEROF%%libexec/openldap/memberof.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%MEMBEROF%%libexec/openldap/memberof.la
+%%MEMBEROF%%libexec/openldap/memberof.so
+%%NOPS%%libexec/openldap/nops.la
+%%NOPS%%libexec/openldap/nops.so
+%%NOPS%%libexec/openldap/nops.so.0
+%%NOPS%%libexec/openldap/nops.so.0.0.0
+%%NOPS%%man/man5/slapo-nops.5.gz
+%%OTP%%libexec/openldap/otp.so.%%SHLIB_MAJOR%%
+%%OTP%%libexec/openldap/otp.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%OTP%%libexec/openldap/otp.la
+%%OTP%%libexec/openldap/otp.so
+%%PASSWD%%libexec/openldap/back_passwd.so.%%SHLIB_MAJOR%%
+%%PASSWD%%libexec/openldap/back_passwd.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%PASSWD%%libexec/openldap/back_passwd.la
+%%PASSWD%%libexec/openldap/back_passwd.so
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.la
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.%%SHLIB_MAJOR%%
+%%PBKDF2%%libexec/openldap/pw-pbkdf2.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%PBKDF2%%man/man5/slapd-pw-pbkdf2.5.gz
+%%PERL%%libexec/openldap/back_perl.so.%%SHLIB_MAJOR%%
+%%PERL%%libexec/openldap/back_perl.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%PERL%%libexec/openldap/back_perl.la
+%%PERL%%libexec/openldap/back_perl.so
+%%PPOLICY%%libexec/openldap/ppolicy.so.%%SHLIB_MAJOR%%
+%%PPOLICY%%libexec/openldap/ppolicy.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%PPOLICY%%libexec/openldap/ppolicy.la
+%%PPOLICY%%libexec/openldap/ppolicy.so
+%%PROXYCACHE%%libexec/openldap/pcache.so.%%SHLIB_MAJOR%%
+%%PROXYCACHE%%libexec/openldap/pcache.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%PROXYCACHE%%libexec/openldap/pcache.la
+%%PROXYCACHE%%libexec/openldap/pcache.so
+%%REFINT%%libexec/openldap/refint.so.%%SHLIB_MAJOR%%
+%%REFINT%%libexec/openldap/refint.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%REFINT%%libexec/openldap/refint.la
+%%REFINT%%libexec/openldap/refint.so
+%%REMOTEAUTH%%libexec/openldap/remoteauth.so.%%SHLIB_MAJOR%%
+%%REMOTEAUTH%%libexec/openldap/remoteauth.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%REMOTEAUTH%%libexec/openldap/remoteauth.la
+%%REMOTEAUTH%%libexec/openldap/remoteauth.so
+%%RETCODE%%libexec/openldap/retcode.so.%%SHLIB_MAJOR%%
+%%RETCODE%%libexec/openldap/retcode.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%RETCODE%%libexec/openldap/retcode.la
+%%RETCODE%%libexec/openldap/retcode.so
+%%RWM%%libexec/openldap/rwm.so.%%SHLIB_MAJOR%%
+%%RWM%%libexec/openldap/rwm.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%RWM%%libexec/openldap/rwm.la
+%%RWM%%libexec/openldap/rwm.so
+%%SEQMOD%%libexec/openldap/seqmod.so.%%SHLIB_MAJOR%%
+%%SEQMOD%%libexec/openldap/seqmod.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%SEQMOD%%libexec/openldap/seqmod.la
+%%SEQMOD%%libexec/openldap/seqmod.so
+%%SHA2%%libexec/openldap/pw-sha2.la
+%%SHA2%%libexec/openldap/pw-sha2.so
+%%SHA2%%libexec/openldap/pw-sha2.so.0
+%%SHA2%%libexec/openldap/pw-sha2.so.0.0.0
+%%SHA2%%man/man5/slapd-pw-sha2.5.gz
+%%SLAPI%%lib/libslapi.so.%%SHLIB_MAJOR%%
+%%SLAPI%%lib/libslapi.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%SLAPI%%lib/libslapi.a
+%%SLAPI%%lib/libslapi.la
+%%SLAPI%%lib/libslapi.so
+%%SMBPWD%%libexec/openldap/smbk5pwd.la
+%%SMBPWD%%libexec/openldap/smbk5pwd.so
+%%SMBPWD%%libexec/openldap/smbk5pwd.so.0
+%%SMBPWD%%libexec/openldap/smbk5pwd.so.0.0.0
+%%SMBPWD%%man/man5/slapo-smbk5pwd.5.gz
+%%SOCK%%libexec/openldap/back_sock.so.%%SHLIB_MAJOR%%
+%%SOCK%%libexec/openldap/back_sock.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%SOCK%%libexec/openldap/back_sock.la
+%%SOCK%%libexec/openldap/back_sock.so
+%%SQL%%libexec/openldap/back_sql.so.%%SHLIB_MAJOR%%
+%%SQL%%libexec/openldap/back_sql.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%SQL%%libexec/openldap/back_sql.la
+%%SQL%%libexec/openldap/back_sql.so
+%%SSSVLV%%libexec/openldap/sssvlv.so.%%SHLIB_MAJOR%%
+%%SSSVLV%%libexec/openldap/sssvlv.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%SSSVLV%%libexec/openldap/sssvlv.la
+%%SSSVLV%%libexec/openldap/sssvlv.so
+%%TRACE%%libexec/openldap/trace.la
+%%TRACE%%libexec/openldap/trace.so
+%%TRACE%%libexec/openldap/trace.so.0
+%%TRACE%%libexec/openldap/trace.so.0.0.0
+%%TRANSLUCENT%%libexec/openldap/translucent.so.%%SHLIB_MAJOR%%
+%%TRANSLUCENT%%libexec/openldap/translucent.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%TRANSLUCENT%%libexec/openldap/translucent.la
+%%TRANSLUCENT%%libexec/openldap/translucent.so
+%%UNIQUE%%libexec/openldap/unique.so.%%SHLIB_MAJOR%%
+%%UNIQUE%%libexec/openldap/unique.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%UNIQUE%%libexec/openldap/unique.la
+%%UNIQUE%%libexec/openldap/unique.so
+%%VALSORT%%libexec/openldap/valsort.so.%%SHLIB_MAJOR%%
+%%VALSORT%%libexec/openldap/valsort.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+%%VALSORT%%libexec/openldap/valsort.la
+%%VALSORT%%libexec/openldap/valsort.so
+libexec/openldap/back_ldap.so.%%SHLIB_MAJOR%%
+libexec/openldap/back_ldap.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+libexec/openldap/back_ldap.la
+libexec/openldap/back_ldap.so
+libexec/openldap/back_meta.so.%%SHLIB_MAJOR%%
+libexec/openldap/back_meta.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+libexec/openldap/back_meta.la
+libexec/openldap/back_meta.so
+libexec/openldap/back_null.so.%%SHLIB_MAJOR%%
+libexec/openldap/back_null.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+libexec/openldap/back_null.la
+libexec/openldap/back_null.so
+libexec/slapd
+man/man5/lloadd.conf.5.gz
+man/man5/slapd-asyncmeta.5.gz
+man/man5/slapd-config.5.gz
+man/man5/slapd-dnssrv.5.gz
+man/man5/slapd-ldap.5.gz
+man/man5/slapd-ldif.5.gz
+man/man5/slapd-mdb.5.gz
+man/man5/slapd-meta.5.gz
+man/man5/slapd-monitor.5.gz
+man/man5/slapd-ndb.5.gz
+man/man5/slapd-null.5.gz
+man/man5/slapd-passwd.5.gz
+man/man5/slapd-perl.5.gz
+man/man5/slapd-relay.5.gz
+man/man5/slapd-sock.5.gz
+man/man5/slapd-sql.5.gz
+man/man5/slapd-wt.5.gz
+man/man5/slapd.access.5.gz
+man/man5/slapd.backends.5.gz
+man/man5/slapd.conf.5.gz
+man/man5/slapd.overlays.5.gz
+man/man5/slapd.plugin.5.gz
+man/man5/slapo-accesslog.5.gz
+man/man5/slapo-auditlog.5.gz
+man/man5/slapo-autoca.5.gz
+man/man5/slapo-chain.5.gz
+man/man5/slapo-collect.5.gz
+man/man5/slapo-constraint.5.gz
+man/man5/slapo-dds.5.gz
+man/man5/slapo-deref.5.gz
+man/man5/slapo-dyngroup.5.gz
+man/man5/slapo-dynlist.5.gz
+man/man5/slapo-homedir.5.gz
+man/man5/slapo-memberof.5.gz
+man/man5/slapo-otp.5.gz
+man/man5/slapo-pbind.5.gz
+man/man5/slapo-pcache.5.gz
+man/man5/slapo-ppolicy.5.gz
+man/man5/slapo-refint.5.gz
+man/man5/slapo-remoteauth.5.gz
+man/man5/slapo-retcode.5.gz
+man/man5/slapo-rwm.5.gz
+man/man5/slapo-sock.5.gz
+man/man5/slapo-sssvlv.5.gz
+man/man5/slapo-syncprov.5.gz
+man/man5/slapo-translucent.5.gz
+man/man5/slapo-unique.5.gz
+man/man5/slapo-valsort.5.gz
+man/man5/slappw-argon2.5.gz
+man/man8/lloadd.8.gz
+man/man8/slapacl.8.gz
+man/man8/slapadd.8.gz
+man/man8/slapauth.8.gz
+man/man8/slapcat.8.gz
+man/man8/slapd.8.gz
+man/man8/slapdn.8.gz
+man/man8/slapindex.8.gz
+man/man8/slapmodify.8.gz
+man/man8/slappasswd.8.gz
+man/man8/slapschema.8.gz
+man/man8/slaptest.8.gz
+sbin/slapacl
+sbin/slapadd
+sbin/slapauth
+sbin/slapcat
+sbin/slapdn
+sbin/slapindex
+sbin/slapmodify
+sbin/slappasswd
+sbin/slapschema
+sbin/slaptest
+@dir %%ETCDIR%%/schema
+@dir libexec/openldap
+@dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%LDAP_RUN_DIR%%
+@dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%DATABASEDIR%%
diff --git a/net/openldap26-server/pkg-plist.client b/net/openldap26-server/pkg-plist.client
new file mode 100644
index 000000000000..ef837dbad451
--- /dev/null
+++ b/net/openldap26-server/pkg-plist.client
@@ -0,0 +1,232 @@
+bin/ldapadd
+bin/ldapcompare
+bin/ldapdelete
+bin/ldapexop
+bin/ldapmodify
+bin/ldapmodrdn
+bin/ldappasswd
+bin/ldapsearch
+bin/ldapurl
+bin/ldapvc
+bin/ldapwhoami
+@dir %%ETCDIR%%
+@sample %%ETCDIR%%/ldap.conf.sample
+include/lber.h
+include/lber_types.h
+include/ldap.h
+include/ldap_cdefs.h
+include/ldap_features.h
+include/ldap_schema.h
+include/ldap_utf8.h
+include/ldif.h
+include/openldap.h
+include/slapi-plugin.h
+lib/liblber.so.%%SHLIB_MAJOR%%
+lib/liblber.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+lib/liblber.a
+lib/liblber.la
+lib/liblber.so
+lib/libldap.so.%%SHLIB_MAJOR%%
+lib/libldap.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+lib/libldap.a
+lib/libldap.la
+lib/libldap.so
+libdata/pkgconfig/lber.pc
+libdata/pkgconfig/ldap.pc
+man/man1/ldapadd.1.gz
+man/man1/ldapcompare.1.gz
+man/man1/ldapdelete.1.gz
+man/man1/ldapexop.1.gz
+man/man1/ldapmodify.1.gz
+man/man1/ldapmodrdn.1.gz
+man/man1/ldappasswd.1.gz
+man/man1/ldapsearch.1.gz
+man/man1/ldapurl.1.gz
+man/man1/ldapvc.1.gz
+man/man1/ldapwhoami.1.gz
+man/man3/ber_alloc_t.3.gz
+man/man3/ber_bvarray_add.3.gz
+man/man3/ber_bvarray_free.3.gz
+man/man3/ber_bvdup.3.gz
+man/man3/ber_bvecadd.3.gz
+man/man3/ber_bvecfree.3.gz
+man/man3/ber_bvfree.3.gz
+man/man3/ber_bvstr.3.gz
+man/man3/ber_bvstrdup.3.gz
+man/man3/ber_dupbv.3.gz
+man/man3/ber_first_element.3.gz
+man/man3/ber_flush.3.gz
+man/man3/ber_free.3.gz
+man/man3/ber_get_bitstring.3.gz
+man/man3/ber_get_boolean.3.gz
+man/man3/ber_get_enum.3.gz
+man/man3/ber_get_int.3.gz
+man/man3/ber_get_next.3.gz
+man/man3/ber_get_null.3.gz
+man/man3/ber_get_stringa.3.gz
+man/man3/ber_get_stringb.3.gz
+man/man3/ber_next_element.3.gz
+man/man3/ber_peek_tag.3.gz
+man/man3/ber_printf.3.gz
+man/man3/ber_put_enum.3.gz
+man/man3/ber_put_int.3.gz
+man/man3/ber_put_null.3.gz
+man/man3/ber_put_ostring.3.gz
+man/man3/ber_put_seq.3.gz
+man/man3/ber_put_set.3.gz
+man/man3/ber_put_string.3.gz
+man/man3/ber_scanf.3.gz
+man/man3/ber_skip_tag.3.gz
+man/man3/ber_start_set.3.gz
+man/man3/ber_str2bv.3.gz
+man/man3/lber-decode.3.gz
+man/man3/lber-encode.3.gz
+man/man3/lber-memory.3.gz
+man/man3/lber-sockbuf.3.gz
+man/man3/lber-types.3.gz
+man/man3/ld_errno.3.gz
+man/man3/ldap.3.gz
+man/man3/ldap_abandon.3.gz
+man/man3/ldap_abandon_ext.3.gz
+man/man3/ldap_add.3.gz
+man/man3/ldap_add_ext.3.gz
+man/man3/ldap_add_ext_s.3.gz
+man/man3/ldap_add_s.3.gz
+man/man3/ldap_attributetype2name.3.gz
+man/man3/ldap_attributetype2str.3.gz
+man/man3/ldap_attributetype_free.3.gz
+man/man3/ldap_bind.3.gz
+man/man3/ldap_bind_s.3.gz
+man/man3/ldap_compare.3.gz
+man/man3/ldap_compare_ext.3.gz
+man/man3/ldap_compare_ext_s.3.gz
+man/man3/ldap_compare_s.3.gz
+man/man3/ldap_control_create.3.gz
+man/man3/ldap_control_dup.3.gz
+man/man3/ldap_control_find.3.gz
+man/man3/ldap_control_free.3.gz
+man/man3/ldap_controls.3.gz
+man/man3/ldap_controls_dup.3.gz
+man/man3/ldap_controls_free.3.gz
+man/man3/ldap_count_entries.3.gz
+man/man3/ldap_count_messages.3.gz
+man/man3/ldap_count_references.3.gz
+man/man3/ldap_count_values.3.gz
+man/man3/ldap_count_values_len.3.gz
+man/man3/ldap_dcedn2dn.3.gz
+man/man3/ldap_delete.3.gz
+man/man3/ldap_delete_ext.3.gz
+man/man3/ldap_delete_ext_s.3.gz
+man/man3/ldap_delete_s.3.gz
+man/man3/ldap_destroy.3.gz
+man/man3/ldap_dn2ad_canonical.3.gz
+man/man3/ldap_dn2dcedn.3.gz
+man/man3/ldap_dn2str.3.gz
+man/man3/ldap_dn2ufn.3.gz
+man/man3/ldap_dnfree.3.gz
+man/man3/ldap_dup.3.gz
+man/man3/ldap_err2string.3.gz
+man/man3/ldap_errlist.3.gz
+man/man3/ldap_error.3.gz
+man/man3/ldap_explode_dn.3.gz
+man/man3/ldap_explode_rdn.3.gz
+man/man3/ldap_extended_operation.3.gz
+man/man3/ldap_extended_operation_s.3.gz
+man/man3/ldap_first_attribute.3.gz
+man/man3/ldap_first_entry.3.gz
+man/man3/ldap_first_message.3.gz
+man/man3/ldap_first_reference.3.gz
+man/man3/ldap_free_urldesc.3.gz
+man/man3/ldap_get_attribute_ber.3.gz
+man/man3/ldap_get_dn.3.gz
+man/man3/ldap_get_option.3.gz
+man/man3/ldap_get_values.3.gz
+man/man3/ldap_get_values_len.3.gz
+man/man3/ldap_init.3.gz
+man/man3/ldap_init_fd.3.gz
+man/man3/ldap_initialize.3.gz
+man/man3/ldap_install_tls.3.gz
+man/man3/ldap_is_ldap_url.3.gz
+man/man3/ldap_matchingrule2name.3.gz
+man/man3/ldap_matchingrule2str.3.gz
+man/man3/ldap_matchingrule_free.3.gz
+man/man3/ldap_memalloc.3.gz
+man/man3/ldap_memcalloc.3.gz
+man/man3/ldap_memfree.3.gz
+man/man3/ldap_memory.3.gz
+man/man3/ldap_memrealloc.3.gz
+man/man3/ldap_memvfree.3.gz
+man/man3/ldap_modify.3.gz
+man/man3/ldap_modify_ext.3.gz
+man/man3/ldap_modify_ext_s.3.gz
+man/man3/ldap_modify_s.3.gz
+man/man3/ldap_modrdn.3.gz
+man/man3/ldap_modrdn2.3.gz
+man/man3/ldap_modrdn2_s.3.gz
+man/man3/ldap_modrdn_s.3.gz
+man/man3/ldap_mods_free.3.gz
+man/man3/ldap_msgfree.3.gz
+man/man3/ldap_msgid.3.gz
+man/man3/ldap_msgtype.3.gz
+man/man3/ldap_next_attribute.3.gz
+man/man3/ldap_next_entry.3.gz
+man/man3/ldap_next_message.3.gz
+man/man3/ldap_next_reference.3.gz
+man/man3/ldap_objectclass2name.3.gz
+man/man3/ldap_objectclass2str.3.gz
+man/man3/ldap_objectclass_free.3.gz
+man/man3/ldap_open.3.gz
+man/man3/ldap_parse_extended_result.3.gz
+man/man3/ldap_parse_intermediate.3.gz
+man/man3/ldap_parse_reference.3.gz
+man/man3/ldap_parse_result.3.gz
+man/man3/ldap_parse_sasl_bind_result.3.gz
+man/man3/ldap_parse_sort_control.3.gz
+man/man3/ldap_parse_vlv_control.3.gz
+man/man3/ldap_perror.3.gz
+man/man3/ldap_rename.3.gz
+man/man3/ldap_rename_s.3.gz
+man/man3/ldap_result.3.gz
+man/man3/ldap_result2error.3.gz
+man/man3/ldap_sasl_bind.3.gz
+man/man3/ldap_sasl_bind_s.3.gz
+man/man3/ldap_schema.3.gz
+man/man3/ldap_scherr2str.3.gz
+man/man3/ldap_search.3.gz
+man/man3/ldap_search_ext.3.gz
+man/man3/ldap_search_ext_s.3.gz
+man/man3/ldap_search_s.3.gz
+man/man3/ldap_search_st.3.gz
+man/man3/ldap_set_option.3.gz
+man/man3/ldap_set_rebind_proc.3.gz
+man/man3/ldap_set_urllist_proc.3.gz
+man/man3/ldap_simple_bind.3.gz
+man/man3/ldap_simple_bind_s.3.gz
+man/man3/ldap_sort.3.gz
+man/man3/ldap_sort_entries.3.gz
+man/man3/ldap_sort_strcasecmp.3.gz
+man/man3/ldap_sort_values.3.gz
+man/man3/ldap_start_tls.3.gz
+man/man3/ldap_start_tls_s.3.gz
+man/man3/ldap_str2attributetype.3.gz
+man/man3/ldap_str2dn.3.gz
+man/man3/ldap_str2matchingrule.3.gz
+man/man3/ldap_str2objectclass.3.gz
+man/man3/ldap_str2syntax.3.gz
+man/man3/ldap_strdup.3.gz
+man/man3/ldap_sync.3.gz
+man/man3/ldap_syntax2name.3.gz
+man/man3/ldap_syntax2str.3.gz
+man/man3/ldap_syntax_free.3.gz
+man/man3/ldap_tls.3.gz
+man/man3/ldap_tls_inplace.3.gz
+man/man3/ldap_unbind.3.gz
+man/man3/ldap_unbind_ext.3.gz
+man/man3/ldap_unbind_ext_s.3.gz
+man/man3/ldap_unbind_s.3.gz
+man/man3/ldap_url.3.gz
+man/man3/ldap_url_parse.3.gz
+man/man3/ldap_value_free.3.gz
+man/man3/ldap_value_free_len.3.gz
+man/man5/ldap.conf.5.gz
+man/man5/ldif.5.gz
diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index ec9cac64cece..782dc2075ebe 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -9,8 +9,6 @@ COMMENT= High Performance Message Passing Library
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_sparc64= fails to compile on sparc64
-
LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 \
libltdl.so:devel/libltdl \
libevent.so:devel/libevent \
@@ -37,6 +35,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}/${MPIDIR} \
--program-prefix= \
--with-hwloc=external \
--with-libltdl \
+ --without-ofi \
--enable-mpi-fortran=usempi \
--enable-mpi-cxx \
--enable-cxx-exceptions \
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 48c840f8a321..815186834b6f 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openntpd
PORTVERSION= 6.8p1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= net
MASTER_SITES= OPENBSD/OpenNTPD
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 21243b96dd45..475e54f06174 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LOGFILE?= /var/log/openradius.log
-CONFLICTS= freeradius-[0-9]* gnu-radius-[0-9]* radiusd-cistron-[0-9]* \
- freeradius-mysql-[0-9]*
+CONFLICTS= freeradius gnu-radius radiusd-cistron \
+ freeradius-mysql
CC?= gcc
CXX?= g++
diff --git a/net/p5-Net-Z3950-ZOOM/Makefile b/net/p5-Net-Z3950-ZOOM/Makefile
index cf5a3a6b547b..8657f96bcc90 100644
--- a/net/p5-Net-Z3950-ZOOM/Makefile
+++ b/net/p5-Net-Z3950-ZOOM/Makefile
@@ -17,6 +17,6 @@ RUN_DEPENDS= p5-MARC-Record>=1.38:textproc/p5-MARC-Record
USES= perl5
USE_PERL5= configure
-CONFLICTS= p5-Net-Z3950-[0-9]*
+CONFLICTS= p5-Net-Z3950
.include <bsd.port.mk>
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 86b13a385959..01caeb9dd749 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -28,7 +28,7 @@ TEST_DEPENDS= p5-Test-MockObject>=0:devel/p5-Test-MockObject \
p5-Test-Warn>=0:devel/p5-Test-Warn \
p5-Test-XML>=0:devel/p5-Test-XML
-CONFLICTS_INSTALL= p5-SOAP-Lite-0.60* p5-SOAP-[0-9]*
+CONFLICTS_INSTALL= p5-SOAP-Lite-0.60* p5-SOAP
CONFIGURE_ARGS= --noprompt
INSTALL_TARGET= pure_install
diff --git a/net/p5-SOAP/Makefile b/net/p5-SOAP/Makefile
index b977a9a3fe8d..3b0f838e2500 100644
--- a/net/p5-SOAP/Makefile
+++ b/net/p5-SOAP/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser \
p5-libwww>=0:www/p5-libwww
-CONFLICTS= p5-SOAP-Lite-[0-9]*
+CONFLICTS= p5-SOAP-Lite
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index 42c0b3cf9900..8ab242f023f3 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -1,7 +1,7 @@
# Created by: ache
PORTNAME= URI
-PORTVERSION= 5.09
+PORTVERSION= 5.10
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/net/p5-URI/distinfo b/net/p5-URI/distinfo
index 60fa2931c0a3..c98692de61c1 100644
--- a/net/p5-URI/distinfo
+++ b/net/p5-URI/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622038086
-SHA256 (URI-5.09.tar.gz) = 03e63ada499d2645c435a57551f041f3943970492baa3b3338246dab6f1fae0a
-SIZE (URI-5.09.tar.gz) = 108897
+TIMESTAMP = 1635205693
+SHA256 (URI-5.10.tar.gz) = 16325d5e308c7b7ab623d1bf944e1354c5f2245afcfadb8eed1e2cae9a0bd0b5
+SIZE (URI-5.10.tar.gz) = 109471
diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile
index 3f3eaf5c20b4..33515935dd60 100644
--- a/net/pacemaker1/Makefile
+++ b/net/pacemaker1/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX= 1
.include "${.CURDIR}/Makefile.common"
-CONFLICTS+= pacemaker2-[0-9]*
+CONFLICTS+= pacemaker2
SHEBANG_FILES+= cts/cts \
cts/lxc_autogen.sh.in \
diff --git a/net/pacemaker1/Makefile.common b/net/pacemaker1/Makefile.common
index baf0dcc9fabb..8eac3a113c4e 100644
--- a/net/pacemaker1/Makefile.common
+++ b/net/pacemaker1/Makefile.common
@@ -22,7 +22,7 @@ RUN_DEPENDS= bash:shells/bash \
getopt>=0:misc/getopt \
ocf-tester:net-mgmt/resource-agents
-CONFLICTS= heartbeat-[0-9]*
+CONFLICTS= heartbeat
USERS= hacluster
GROUPS= haclient
diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
index 205c8f40470f..9c57a01021eb 100644
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX= 2
CONFIGURE_ARGS+= --with-noarch-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-CONFLICTS+= pacemaker1-[0-9]*
+CONFLICTS+= pacemaker1
LIB_DEPENDS+= libffi.so:devel/libffi \
libgmp.so:math/gmp \
diff --git a/net/pear-Services_Twitter/Makefile b/net/pear-Services_Twitter/Makefile
index 4dbbfee7abc4..5e0a7cfee29f 100644
--- a/net/pear-Services_Twitter/Makefile
+++ b/net/pear-Services_Twitter/Makefile
@@ -11,7 +11,8 @@ BUILD_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
RUN_DEPENDS= ${PEARDIR}/HTTP/Request2.php:www/pear-HTTP_Request2@${PHP_FLAVOR}
USES= cpe pear php
-CPE_VENDOR= services_twitter_group
USE_PHP= json simplexml mbstring
+CPE_VENDOR= services_twitter_group
+
.include <bsd.port.mk>
diff --git a/net/pimcommon/distinfo b/net/pimcommon/distinfo
index 59502ba2fcd9..fee39f053d04 100644
--- a/net/pimcommon/distinfo
+++ b/net/pimcommon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633447497
-SHA256 (KDE/release-service/21.08.2/pimcommon-21.08.2.tar.xz) = 8f8324fda5dbc3edf62f2e48f8b92e23a4972c447dcb199d6910f59f6f5f971c
-SIZE (KDE/release-service/21.08.2/pimcommon-21.08.2.tar.xz) = 368772
+TIMESTAMP = 1636032639
+SHA256 (KDE/release-service/21.08.3/pimcommon-21.08.3.tar.xz) = 748c9286f95c4d602c839514f9949d7984ce9a3f7c1a040fe41973e9ae4e44c2
+SIZE (KDE/release-service/21.08.3/pimcommon-21.08.3.tar.xz) = 368900
diff --git a/net/proby/Makefile b/net/proby/Makefile
index 6b1575f8828a..b5463e4d9d60 100644
--- a/net/proby/Makefile
+++ b/net/proby/Makefile
@@ -1,7 +1,7 @@
PORTNAME= proby
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/proxychains-ng/Makefile b/net/proxychains-ng/Makefile
index 2545c7015d7e..2fe87fad4c69 100644
--- a/net/proxychains-ng/Makefile
+++ b/net/proxychains-ng/Makefile
@@ -17,7 +17,7 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-CONFLICTS= proxychains-[0-9]*
+CONFLICTS= proxychains
PORTDOCS= AUTHORS README TODO
OPTIONS_DEFINE= DOCS
diff --git a/net/pwnat/Makefile b/net/pwnat/Makefile
index c0bd9a82b5fd..c4b597640430 100644
--- a/net/pwnat/Makefile
+++ b/net/pwnat/Makefile
@@ -7,8 +7,8 @@ COMMENT= NAT punching tool based on udptunnel
LICENSE= GPLv3
-ONLY_FOR_ARCHS= amd64 i386 powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON= Fails to patch while running in embedded systems
+ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 powerpc64le
+ONLY_FOR_ARCHS_REASON= fails to patch while running on embedded systems
USES= gmake
USE_RC_SUBR= ${PORTNAME}
diff --git a/net/py-aiocoap/Makefile b/net/py-aiocoap/Makefile
index d0f831fc3e5d..b7da7d9c92db 100644
--- a/net/py-aiocoap/Makefile
+++ b/net/py-aiocoap/Makefile
@@ -1,5 +1,5 @@
PORTNAME= aiocoap
-DISTVERSION= 0.4.1
+DISTVERSION= 0.4.3
CATEGORIES= net
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-aiocoap/distinfo b/net/py-aiocoap/distinfo
index d9b1c744bbbd..56c87f767188 100644
--- a/net/py-aiocoap/distinfo
+++ b/net/py-aiocoap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625430383
-SHA256 (aiocoap-0.4.1.tar.gz) = c47c9d19a98699f27707186871b7c84f4a7016fe4fbb5bd300f809ae456f8a55
-SIZE (aiocoap-0.4.1.tar.gz) = 201617
+TIMESTAMP = 1638104522
+SHA256 (aiocoap-0.4.3.tar.gz) = ac261b0a4425ddedc23deb4b5c8b5ad8a0911041d26bf567e33b459666adc1fc
+SIZE (aiocoap-0.4.3.tar.gz) = 210162
diff --git a/net/py-aiohttp-socks/Makefile b/net/py-aiohttp-socks/Makefile
index 40c4ab3481f7..a32fca8b5e33 100644
--- a/net/py-aiohttp-socks/Makefile
+++ b/net/py-aiohttp-socks/Makefile
@@ -1,7 +1,7 @@
# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
PORTNAME= aiohttp-socks
-PORTVERSION= 0.6.0
+PORTVERSION= 0.7.1
DISTVERSIONPREFIX= v
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=2.3.2:www/py-aiohttp@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}python-socks>=1.0.1:net/py-python-socks@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}python-socks>=2.0.0:net/py-python-socks@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}trio>0:net/py-trio@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}trio>0:net/py-trio@${PY_FLAVOR}
diff --git a/net/py-aiohttp-socks/distinfo b/net/py-aiohttp-socks/distinfo
index 62460900cc96..0e9499d651a8 100644
--- a/net/py-aiohttp-socks/distinfo
+++ b/net/py-aiohttp-socks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614609051
-SHA256 (romis2012-aiohttp-socks-v0.6.0_GH0.tar.gz) = 7d3fc71f6c992d134cc1ebdfecb2cb2531a06fba529b38d8120a1085372563d6
-SIZE (romis2012-aiohttp-socks-v0.6.0_GH0.tar.gz) = 19789
+TIMESTAMP = 1637691938
+SHA256 (romis2012-aiohttp-socks-v0.7.1_GH0.tar.gz) = e0ae127e9bb0fc0445bbf5c4609f7be51d5ed6a514fafbb18955c70d8c004148
+SIZE (romis2012-aiohttp-socks-v0.7.1_GH0.tar.gz) = 19813
diff --git a/net/py-duet/Makefile b/net/py-duet/Makefile
new file mode 100644
index 000000000000..9875568eec9e
--- /dev/null
+++ b/net/py-duet/Makefile
@@ -0,0 +1,23 @@
+PORTNAME= duet
+PORTVERSION= 0.2.3
+CATEGORIES= net python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= yuri@FreeBSD.org
+COMMENT= Simple future-based async library for python
+
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
+
+USES= python:3.7+ # 3.6 requires extra-dependencies
+USE_PYTHON= distutils autoplist
+
+NO_ARCH= yes
+
+do-test:
+ @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
+
+.include <bsd.port.mk>
diff --git a/net/py-duet/distinfo b/net/py-duet/distinfo
new file mode 100644
index 000000000000..d284c3b8d876
--- /dev/null
+++ b/net/py-duet/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1636931993
+SHA256 (duet-0.2.3.tar.gz) = 256d79280c2ac771855cac1a979df0def555dc1b0bef678c5ce718b0cc16f220
+SIZE (duet-0.2.3.tar.gz) = 23365
diff --git a/net/py-duet/pkg-descr b/net/py-duet/pkg-descr
new file mode 100644
index 000000000000..ed86162ca671
--- /dev/null
+++ b/net/py-duet/pkg-descr
@@ -0,0 +1,20 @@
+Duet takes inspiration from the amazing trio library and the structured
+concurrency approach to async programming that it uses. However, duet differs
+from trio in two major ways:
+* Instead of a full-blown implementation of asynchronous IO, duet relies on the
+ Future interface for parallelism, and provides a way to run async/await
+ coroutines around those Futures. This is useful if you are using an API that
+ returns futures, such as RPC libraries like gRPC. The standard Future
+ interface does not implement __await__ directly, so Future instances must be
+ wrapped in duet.AwaitableFuture.
+
+* duet is re-entrant. At the top level, you run async code by calling
+ duet.run(foo). Inside foo suppose you call a function that has not yet been
+ fully refactored to be asynchronous, but itself calls duet.run(bar). Most
+ async libraries, including trio and asyncio, will raise an exception if you
+ try to "re-enter" the event loop in this way, but duet allows it. We have
+ found that this can simplify the process of refactoring code to be
+ asynchronous because you don't have to completely separate the sync and async
+ parts of your codebase all at once.
+
+WWW: https://github.com/google/duet
diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index b57a0f555065..f4f85fd4ce6a 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -1,7 +1,7 @@
# Created by: Gea-Suan Lin <gslin@gslin.org>
PORTNAME= eventlet
-PORTVERSION= 0.32.0
+PORTVERSION= 0.33.0
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-eventlet/distinfo b/net/py-eventlet/distinfo
index 4bd5b919fe09..aa4edcb347e8 100644
--- a/net/py-eventlet/distinfo
+++ b/net/py-eventlet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632037192
-SHA256 (eventlet-0.32.0.tar.gz) = 2f0bb8ed0dc0ab21d683975d5d8ab3c054d588ce61def9faf7a465ee363e839b
-SIZE (eventlet-0.32.0.tar.gz) = 412769
+TIMESTAMP = 1637519896
+SHA256 (eventlet-0.33.0.tar.gz) = 80144f489c1bb273a51b6f96ff9785a382d2866b9bab1f5bd748385019f4141f
+SIZE (eventlet-0.33.0.tar.gz) = 414929
diff --git a/net/py-gdown/Makefile b/net/py-gdown/Makefile
index b73f1a43414d..295aa5674bf3 100644
--- a/net/py-gdown/Makefile
+++ b/net/py-gdown/Makefile
@@ -1,7 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= gdown
-PORTVERSION= 3.15.0
+PORTVERSION= 4.2.0
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,8 +12,9 @@ COMMENT= Google Drive direct download of big files
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filelock>=0:sysutils/py-filelock@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.12.0:www/py-requests@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}filelock>=0:sysutils/py-filelock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}tqdm>=0:misc/py-tqdm@${PY_FLAVOR}
diff --git a/net/py-gdown/distinfo b/net/py-gdown/distinfo
index bed8c37a1bd5..5fbd6d77c111 100644
--- a/net/py-gdown/distinfo
+++ b/net/py-gdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634111792
-SHA256 (gdown-3.15.0.tar.gz) = eb0cfb3f74e3fc85c7895da5dc5a4db5a987829b3fd7506316667f401507681f
-SIZE (gdown-3.15.0.tar.gz) = 10705
+TIMESTAMP = 1635181087
+SHA256 (gdown-4.2.0.tar.gz) = bd871c125242a9d3691aa74f360b6b5268a58c13991bb2405fdb3ec3028307dc
+SIZE (gdown-4.2.0.tar.gz) = 13653
diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile
index 45a8c076a985..28d553f79431 100644
--- a/net/py-ldap/Makefile
+++ b/net/py-ldap/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ldap
-DISTVERSION= 3.3.1
-PORTREVISION= 1
+DISTVERSION= 3.4.0
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \
USES= python:3.6+
USE_PYTHON= autoplist distutils
USE_OPENLDAP= yes
-WANT_OPENLDAP_VER= 24
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
diff --git a/net/py-ldap/distinfo b/net/py-ldap/distinfo
index b1a81a9d6679..eec34c140c1a 100644
--- a/net/py-ldap/distinfo
+++ b/net/py-ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610448499
-SHA256 (python-ldap-3.3.1.tar.gz) = 4711cacf013e298754abd70058ccc995758177fb425f1c2d30e71adfc1d00aa5
-SIZE (python-ldap-3.3.1.tar.gz) = 379810
+TIMESTAMP = 1638441029
+SHA256 (python-ldap-3.4.0.tar.gz) = 60464c8fc25e71e0fd40449a24eae482dcd0fb7fcf823e7de627a6525b3e0d12
+SIZE (python-ldap-3.4.0.tar.gz) = 376169
diff --git a/net/py-ldap/files/patch-setup.cfg b/net/py-ldap/files/patch-setup.cfg
new file mode 100644
index 000000000000..9f2d026245dc
--- /dev/null
+++ b/net/py-ldap/files/patch-setup.cfg
@@ -0,0 +1,11 @@
+--- setup.cfg.orig 2020-06-29 14:13:36 UTC
++++ setup.cfg
+@@ -5,7 +5,7 @@ license_file = LICENCE
+ defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
+ extra_compile_args =
+ extra_objects =
+-libs = ldap_r lber
++libs = ldap lber
+
+ [install]
+ compile = 1
diff --git a/net/py-libcloud/Makefile b/net/py-libcloud/Makefile
index c4edb3e13e87..82e395497af6 100644
--- a/net/py-libcloud/Makefile
+++ b/net/py-libcloud/Makefile
@@ -1,7 +1,7 @@
# Created by: Greg Larkin <glarkin@FreeBSD.org>
PORTNAME= libcloud
-PORTVERSION= 3.3.1
+PORTVERSION= 3.4.1
CATEGORIES= net python
MASTER_SITES= APACHE/${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,6 +14,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR}
NO_ARCH= yes
diff --git a/net/py-libcloud/distinfo b/net/py-libcloud/distinfo
index 9c48d300c8e1..6ad6e8913908 100644
--- a/net/py-libcloud/distinfo
+++ b/net/py-libcloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611667025
-SHA256 (apache-libcloud-3.3.1.tar.bz2) = 71f15f355c42963b15d316d5142be7663bcc5a969453e9d24c81133ea998aa1d
-SIZE (apache-libcloud-3.3.1.tar.bz2) = 1795663
+TIMESTAMP = 1637986892
+SHA256 (apache-libcloud-3.4.1.tar.bz2) = 5cd4905ce2a6016c52ba359ba774fce513c06cbd4cc10bf855c49bd080ab7d2e
+SIZE (apache-libcloud-3.4.1.tar.bz2) = 1851322
diff --git a/net/py-mpi4py/Makefile b/net/py-mpi4py/Makefile
index 62be23a202b4..048b0e0c6468 100644
--- a/net/py-mpi4py/Makefile
+++ b/net/py-mpi4py/Makefile
@@ -1,5 +1,5 @@
PORTNAME= mpi4py
-DISTVERSION= 3.1.1
+DISTVERSION= 3.1.2
CATEGORIES= net parallel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-mpi4py/distinfo b/net/py-mpi4py/distinfo
index bd0385b75a95..d99a32f36f9b 100644
--- a/net/py-mpi4py/distinfo
+++ b/net/py-mpi4py/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634880315
-SHA256 (mpi4py-3.1.1.tar.gz) = e11f8587a3b93bb24c8526addec664b586b965d83c0882b884c14dc3fd6b9f5c
-SIZE (mpi4py-3.1.1.tar.gz) = 2448674
+TIMESTAMP = 1636612962
+SHA256 (mpi4py-3.1.2.tar.gz) = 40dd546bece8f63e1131c3ceaa7c18f8e8e93191a762cd446a8cfcf7f9cce770
+SIZE (mpi4py-3.1.2.tar.gz) = 2456588
diff --git a/net/py-pypcap/Makefile b/net/py-pypcap/Makefile
index da073e9c4e30..df176bd56131 100644
--- a/net/py-pypcap/Makefile
+++ b/net/py-pypcap/Makefile
@@ -21,6 +21,6 @@ pre-configure:
cd ${WRKSRC} && cython-${PYTHON_VER} pcap.pyx
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pcap*.so
+ ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
.include <bsd.port.mk>
diff --git a/net/py-pysendfile/Makefile b/net/py-pysendfile/Makefile
index 0414902c7f53..846cbcccd6a5 100644
--- a/net/py-pysendfile/Makefile
+++ b/net/py-pysendfile/Makefile
@@ -13,7 +13,7 @@ COMMENT= Python interface to sendfile(2)
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-CONFLICTS_INSTALL= py*-sendfile-[0-9]*
+CONFLICTS_INSTALL= py*-sendfile
USES= python:3.6+
USE_PYTHON= distutils autoplist
diff --git a/net/py-python-socks/Makefile b/net/py-python-socks/Makefile
index 799921b55f15..6f9fcdb6e81f 100644
--- a/net/py-python-socks/Makefile
+++ b/net/py-python-socks/Makefile
@@ -1,7 +1,7 @@
# Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
PORTNAME= python-socks
-PORTVERSION= 1.2.4
+PORTVERSION= 2.0.0
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -19,4 +19,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.0.1:devel/py-asyncio@${PY_FLAVOR}
USES= python:3.6+
USE_PYTHON= autoplist distutils
+NO_ARCH= yes
+
.include <bsd.port.mk>
diff --git a/net/py-python-socks/distinfo b/net/py-python-socks/distinfo
index d4912ad3b5fe..74e945fd2666 100644
--- a/net/py-python-socks/distinfo
+++ b/net/py-python-socks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617693621
-SHA256 (python-socks-1.2.4.tar.gz) = 7d0ef2578cead9f762b71317d25a6c118fabaf79535555e75b3e102f5158ddd8
-SIZE (python-socks-1.2.4.tar.gz) = 20547
+TIMESTAMP = 1637680072
+SHA256 (python-socks-2.0.0.tar.gz) = 7944dad882846ac73e5f79e180c841e3895ee058e16855b7e8fff24f4cd0b90b
+SIZE (python-socks-2.0.0.tar.gz) = 24735
diff --git a/net/py-pytradfri/Makefile b/net/py-pytradfri/Makefile
index 0a06bad2945d..d62c25bc8edb 100644
--- a/net/py-pytradfri/Makefile
+++ b/net/py-pytradfri/Makefile
@@ -1,5 +1,5 @@
PORTNAME= pytradfri
-DISTVERSION= 7.1.0
+DISTVERSION= 7.2.1
CATEGORIES= net
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-pytradfri/distinfo b/net/py-pytradfri/distinfo
index 7a881e35915d..9ddc14b1a6f2 100644
--- a/net/py-pytradfri/distinfo
+++ b/net/py-pytradfri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634831612
-SHA256 (pytradfri-7.1.0.tar.gz) = a861c8af4970bdf7cfa2ef32c3809c726b4cdc2c7c3e1b2d34d1506f588a6491
-SIZE (pytradfri-7.1.0.tar.gz) = 28228
+TIMESTAMP = 1638566975
+SHA256 (pytradfri-7.2.1.tar.gz) = 50a345b2bdd3d29f1ae5d1a6b3d9d91f2438da3506a586dd4bd0849c5020711a
+SIZE (pytradfri-7.2.1.tar.gz) = 28813
diff --git a/net/py-pyvmomi/Makefile b/net/py-pyvmomi/Makefile
index ee02731d7d6f..f79fd65d7940 100644
--- a/net/py-pyvmomi/Makefile
+++ b/net/py-pyvmomi/Makefile
@@ -1,18 +1,21 @@
# Created by: Bartek Rutkowski robak@FreeBSD.org
PORTNAME= pyvmomi
-DISTVERSION= 6.5
-PORTREVISION= 1
+DISTVERSION= 7.0.3
CATEGORIES= net python
-MASTER_SITES= CHEESESHOP/source/p/${PORTNAME}
MAINTAINER= robak@FreeBSD.org
COMMENT= Python SDK for the VMware vSphere API of ESX, ESXi, and vCenter
+USE_GITHUB= yes
+GH_ACCOUNT= vmware
+GH_PROJECT= ${PORTNAME}
+GH_TAGNAME= v${PORTVERSION}
+
LICENSE= APACHE20
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six@${PY_FLAVOR}
USES= python:3.6+
USE_PYTHON= autoplist distutils concurrent optsuffix
diff --git a/net/py-pyvmomi/distinfo b/net/py-pyvmomi/distinfo
index 5110bfb6f616..4d8ccbf7e39d 100644
--- a/net/py-pyvmomi/distinfo
+++ b/net/py-pyvmomi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479291270
-SHA256 (pyvmomi-6.5.tar.gz) = fa6a31c747a7d7042a2ad90e7895cab824ba036dcf26ff2f84374e150eac6dfa
-SIZE (pyvmomi-6.5.tar.gz) = 250996
+TIMESTAMP = 1637315472
+SHA256 (vmware-pyvmomi-7.0.3-v7.0.3_GH0.tar.gz) = 45e1f3a158e9a47d6e9e7fb7d4d2244637b1af9e1349829be7637d8351ced77a
+SIZE (vmware-pyvmomi-7.0.3-v7.0.3_GH0.tar.gz) = 595354
diff --git a/net/py-sbws/Makefile b/net/py-sbws/Makefile
index 1490f3cd1540..35e1017305ef 100644
--- a/net/py-sbws/Makefile
+++ b/net/py-sbws/Makefile
@@ -1,5 +1,5 @@
PORTNAME= sbws
-PORTVERSION= 1.1.0
+PORTVERSION= 1.3.0
DISTVERSIONPREFIX= v
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -8,25 +8,54 @@ MAINTAINER= egypcio@FreeBSD.org
COMMENT= Tor network bandwidth scanner
LICENSE= CC0-1.0
-LICENSE_FILE= ${WRKSRC}/LICENSE.md
+LICENSE_FILE= ${WRKSRC}/LICENSE.rst
# pysocks: indirect dependency via requests[socks]
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=1.6.8:net/py-pysocks@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}stem>=1.7.0:security/py-stem@${PY_FLAVOR} \
- tor:security/tor
+ ${PYTHON_PKGNAMEPREFIX}psutil>=5.5:sysutils/py-psutil@${PY_FLAVOR} \
+ tor:security/tor \
+ obfs4proxy:security/obfs4proxy-tor
-USES= cpe python:3.5+ shebangfix
-USE_GITHUB= yes
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flake8-docstrings>=0:devel/py-flake8-docstrings@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \
+ bash:shells/bash
+
+USES= cpe python:3.6+ shebangfix
+USE_GITLAB= yes
USE_PYTHON= autoplist distutils concurrent flavors
+PLIST_FILES= "@sample ${PREFIX}/etc/sbws.ini.sample"
+
CPE_VENDOR= torproject
-GH_ACCOUNT= torproject
+GL_SITE= https://gitlab.torproject.org/tpo
+GL_ACCOUNT= network-health
+GL_PROJECT= sbws
+GL_COMMIT= 25aa5b232ca26729e1bf30a7c5a54fd22f5c3eeb
SHEBANG_FILES= setup.py \
scripts/tools/get-per-relay-budget.py \
scripts/tools/sbws-http-server.py \
scripts/tools/scale-v3bw-with-budget.py \
- tests/integration/net/wait.py
+ tests/integration/stop_chutney.sh \
+ tests/integration/start_chutney.sh \
+ tests/integration/run.sh
+
+NO_ARCH= yes
+
+do-test:
+ cd ${WRKSRC} && \
+ ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/docs/source/examples/sbws.example.ini \
+ ${STAGEDIR}${PREFIX}/etc/sbws.ini.sample
.include <bsd.port.mk>
diff --git a/net/py-sbws/distinfo b/net/py-sbws/distinfo
index ea53257a091f..bdee2f3e42ca 100644
--- a/net/py-sbws/distinfo
+++ b/net/py-sbws/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555083391
-SHA256 (torproject-sbws-v1.1.0_GH0.tar.gz) = 95ea0164e61dacec6c8758499f9c2194c0a3f907036c2a159e3234e1d5b3d1cf
-SIZE (torproject-sbws-v1.1.0_GH0.tar.gz) = 1186563
+TIMESTAMP = 1635670376
+SHA256 (network-health-sbws-25aa5b232ca26729e1bf30a7c5a54fd22f5c3eeb_GL0.tar.gz) = fdea5d6522dffe129f9f56f79d81dc7a680dc73e69ceb8a8fad3728fde1c3351
+SIZE (network-health-sbws-25aa5b232ca26729e1bf30a7c5a54fd22f5c3eeb_GL0.tar.gz) = 4640815
diff --git a/net/py-smbprotocol/Makefile b/net/py-smbprotocol/Makefile
index 1df95d16aeb5..722cf6e854dc 100644
--- a/net/py-smbprotocol/Makefile
+++ b/net/py-smbprotocol/Makefile
@@ -1,7 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= smbprotocol
-PORTVERSION= 1.7.0
+PORTVERSION= 1.8.3
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-smbprotocol/distinfo b/net/py-smbprotocol/distinfo
index bc33161e5058..882de4946a65 100644
--- a/net/py-smbprotocol/distinfo
+++ b/net/py-smbprotocol/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632664360
-SHA256 (smbprotocol-1.7.0.tar.gz) = 4202c4286068a972b61d13f1b48d3b3272f583c77c7475e43ac88a7346b3cda9
-SIZE (smbprotocol-1.7.0.tar.gz) = 116458
+TIMESTAMP = 1637519898
+SHA256 (smbprotocol-1.8.3.tar.gz) = c0de5949dff27c89bd94a39eb5d39e96bf800706f2b1fa3f214d86fe2100e78c
+SIZE (smbprotocol-1.8.3.tar.gz) = 118110
diff --git a/net/py-suds-community/Makefile b/net/py-suds-community/Makefile
new file mode 100644
index 000000000000..4b0ad656372d
--- /dev/null
+++ b/net/py-suds-community/Makefile
@@ -0,0 +1,22 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+
+PORTNAME= suds-community
+PORTVERSION= 1.0.0
+CATEGORIES= net python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Lightweight SOAP client (community fork)
+
+LICENSE= LGPL3
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+
+USES= python:3.6+
+USE_PYTHON= autoplist concurrent distutils
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/net/py-suds-community/distinfo b/net/py-suds-community/distinfo
new file mode 100644
index 000000000000..58aa058f2ea6
--- /dev/null
+++ b/net/py-suds-community/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1635730999
+SHA256 (suds-community-1.0.0.tar.gz) = 8998fb0b242e4393feffc0a7352577ce282839fcf5f67287be854fc460ea0c6b
+SIZE (suds-community-1.0.0.tar.gz) = 282894
diff --git a/net/py-suds-community/pkg-descr b/net/py-suds-community/pkg-descr
new file mode 100644
index 000000000000..5c2c23dc7f84
--- /dev/null
+++ b/net/py-suds-community/pkg-descr
@@ -0,0 +1,4 @@
+Suds is a lightweight SOAP-based web service client for Python licensed under
+LGPL. This is a community fork of the jurko fork.
+
+WWW: https://github.com/suds-community/suds
diff --git a/net/py-suds-jurko/Makefile b/net/py-suds-jurko/Makefile
index 34d36af5bfc9..5178c657a084 100644
--- a/net/py-suds-jurko/Makefile
+++ b/net/py-suds-jurko/Makefile
@@ -2,7 +2,7 @@
PORTNAME= suds-jurko
PORTVERSION= 0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -20,27 +20,6 @@ USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
-post-patch:
- # Move the tests into the main package so
- # they are processed by 2to3 so we can test Python 3
- @${MV} ${WRKSRC}/tests ${WRKSRC}/suds/tests
- # Compensate for the package/module name change
- @${REINPLACE_CMD} -e 's|import tests|import suds.tests|g' \
- ${WRKSRC}/suds/tests/test_argument_parser.py \
- ${WRKSRC}/suds/tests/test_date_time.py \
- ${WRKSRC}/suds/tests/test_input_parameters.py \
- ${WRKSRC}/suds/tests/test_reply_handling.py \
- ${WRKSRC}/suds/tests/test_request_construction.py \
- ${WRKSRC}/suds/tests/test_suds.py \
- ${WRKSRC}/suds/tests/test_timezone.py
- @${REINPLACE_CMD} -e 's|tests.|suds.tests.|g' \
- ${WRKSRC}/suds/tests/conftest.py \
- ${WRKSRC}/suds/tests/test_reply_handling.py \
- ${WRKSRC}/suds/tests/test_suds.py \
- ${WRKSRC}/suds/tests/test_request_construction.py \
- ${WRKSRC}/suds/tests/test_input_parameters.py \
- ${WRKSRC}/suds/tests/test_argument_parser.py
-
# lambda: foo needed due to wanting to exclude parametrized tests
# https://github.com/pytest-dev/pytest/issues/5881
# https://github.com/pytest-dev/pytest/issues/6177
@@ -59,6 +38,6 @@ do-test:
and not (lambda: locals)()()['test_choice_containing_an_empty_sequence[test_args_required0]'] \
and not (lambda: locals)()()['test_choice_explicitly_marked_as_optional[choice0]'] \
and not test_sending_unicode_data" \
- build/lib/suds/tests
+ build/lib/tests
.include <bsd.port.mk>
diff --git a/net/py-suds-jurko/files/patch-2to3 b/net/py-suds-jurko/files/patch-2to3
new file mode 100644
index 000000000000..d220b27c4300
--- /dev/null
+++ b/net/py-suds-jurko/files/patch-2to3
@@ -0,0 +1,1952 @@
+--- suds/bindings/binding.py.orig 2021-09-20 17:08:56 UTC
++++ suds/bindings/binding.py
+@@ -88,7 +88,7 @@ class Binding:
+ @return: A collection of parameter definitions
+ @rtype: [I{pdef},..]
+ """
+- raise Exception, 'not implemented'
++ raise Exception('not implemented')
+
+ def get_message(self, method, args, kwargs):
+ """
+@@ -286,7 +286,7 @@ class Binding:
+ @return: The XML content for the <body/>
+ @rtype: [L{Element},..]
+ """
+- raise Exception, 'not implemented'
++ raise Exception('not implemented')
+
+ def headercontent(self, method):
+ """
+@@ -339,7 +339,7 @@ class Binding:
+ @return: The body content.
+ @rtype: [L{Element},...]
+ """
+- raise Exception, 'not implemented'
++ raise Exception('not implemented')
+
+ def body(self, content):
+ """
+--- suds/client.py.orig 2021-09-20 17:08:56 UTC
++++ suds/client.py
+@@ -37,12 +37,12 @@ from suds.transport import TransportError, Request
+ from suds.transport.https import HttpAuthenticated
+ from suds.umx.basic import Basic as UmxBasic
+ from suds.wsdl import Definitions
+-import sudsobject
++from . import sudsobject
+
+-from cookielib import CookieJar
++from http.cookiejar import CookieJar
+ from copy import deepcopy
+-import httplib
+-from urlparse import urlparse
++import http.client
++from urllib.parse import urlparse
+
+ from logging import getLogger
+ log = getLogger(__name__)
+@@ -181,7 +181,7 @@ class Client(UnicodeMixin):
+ if ( suds.__build__ ):
+ s.append(' build: %s' % suds.__build__)
+ for sd in self.sd:
+- s.append('\n\n%s' % unicode(sd))
++ s.append('\n\n%s' % str(sd))
+ return ''.join(s)
+
+
+@@ -223,7 +223,7 @@ class Factory:
+ else:
+ try:
+ result = self.builder.build(type)
+- except Exception, e:
++ except Exception as e:
+ log.error("create '%s' failed", name, exc_info=True)
+ raise BuildError(name, e)
+ timer.stop()
+@@ -312,20 +312,20 @@ class ServiceSelector:
+ """
+ service = None
+ if not len(self.__services):
+- raise Exception, 'No services defined'
++ raise Exception('No services defined')
+ if isinstance(name, int):
+ try:
+ service = self.__services[name]
+ name = service.name
+ except IndexError:
+- raise ServiceNotFound, 'at [%d]' % name
++ raise ServiceNotFound('at [%d]' % name)
+ else:
+ for s in self.__services:
+ if name == s.name:
+ service = s
+ break
+ if service is None:
+- raise ServiceNotFound, name
++ raise ServiceNotFound(name)
+ return PortSelector(self.__client, service.ports, name)
+
+ def __ds(self):
+@@ -413,13 +413,13 @@ class PortSelector:
+ """
+ port = None
+ if not len(self.__ports):
+- raise Exception, 'No ports defined: %s' % self.__qn
++ raise Exception('No ports defined: %s' % self.__qn)
+ if isinstance(name, int):
+ qn = '%s[%d]' % (self.__qn, name)
+ try:
+ port = self.__ports[name]
+ except IndexError:
+- raise PortNotFound, qn
++ raise PortNotFound(qn)
+ else:
+ qn = '.'.join((self.__qn, name))
+ for p in self.__ports:
+@@ -427,7 +427,7 @@ class PortSelector:
+ port = p
+ break
+ if port is None:
+- raise PortNotFound, qn
++ raise PortNotFound(qn)
+ qn = '.'.join((self.__qn, port.name))
+ return MethodSelector(self.__client, port.methods, qn)
+
+@@ -488,7 +488,7 @@ class MethodSelector:
+ m = self.__methods.get(name)
+ if m is None:
+ qn = '.'.join((self.__qn, name))
+- raise MethodNotFound, qn
++ raise MethodNotFound(qn)
+ return Method(self.__client, m)
+
+
+@@ -519,10 +519,10 @@ class Method:
+ client = clientclass(self.client, self.method)
+ try:
+ return client.invoke(args, kwargs)
+- except WebFault, e:
++ except WebFault as e:
+ if self.faults():
+ raise
+- return (httplib.INTERNAL_SERVER_ERROR, e)
++ return (http.client.INTERNAL_SERVER_ERROR, e)
+
+ def faults(self):
+ """ get faults option """
+@@ -613,7 +613,7 @@ class SoapClient:
+ reply = self.options.transport.send(request)
+ timer.stop()
+ metrics.log.debug('waited %s on server reply', timer)
+- except TransportError, e:
++ except TransportError as e:
+ content = e.fp and e.fp.read() or ''
+ return self.process_reply(reply=content, status=e.httpcode,
+ description=tostr(e), original_soapenv=original_soapenv)
+@@ -623,12 +623,12 @@ class SoapClient:
+ def process_reply(self, reply, status=None, description=None,
+ original_soapenv=None):
+ if status is None:
+- status = httplib.OK
+- if status in (httplib.ACCEPTED, httplib.NO_CONTENT):
++ status = http.client.OK
++ if status in (http.client.ACCEPTED, http.client.NO_CONTENT):
+ return
+ failed = True
+ try:
+- if status == httplib.OK:
++ if status == http.client.OK:
+ log.debug('HTTP succeeded:\n%s', reply)
+ else:
+ log.debug('HTTP failed - %d - %s:\n%s', status, description,
+@@ -657,19 +657,19 @@ class SoapClient:
+ # An INSTANCE MUST use a "500 Internal Server Error" HTTP status
+ # code if the response message is a SOAP Fault.
+ replyroot = None
+- if status in (httplib.OK, httplib.INTERNAL_SERVER_ERROR):
++ if status in (http.client.OK, http.client.INTERNAL_SERVER_ERROR):
+ replyroot = _parse(reply)
+ plugins.message.parsed(reply=replyroot)
+ fault = self.get_fault(replyroot)
+ if fault:
+- if status != httplib.INTERNAL_SERVER_ERROR:
++ if status != http.client.INTERNAL_SERVER_ERROR:
+ log.warn("Web service reported a SOAP processing "
+ "fault using an unexpected HTTP status code %d. "
+ "Reporting as an internal server error.", status)
+ if self.options.faults:
+ raise WebFault(fault, replyroot)
+- return (httplib.INTERNAL_SERVER_ERROR, fault)
+- if status != httplib.OK:
++ return (http.client.INTERNAL_SERVER_ERROR, fault)
++ if status != http.client.OK:
+ if self.options.faults:
+ # (todo)
+ # Use a more specific exception class here.
+@@ -688,7 +688,7 @@ class SoapClient:
+ failed = False
+ if self.options.faults:
+ return result
+- return (httplib.OK, result)
++ return (http.client.OK, result)
+ finally:
+ if failed and original_soapenv:
+ log.error(original_soapenv)
+@@ -717,7 +717,7 @@ class SoapClient:
+ @rtype: dict
+ """
+ action = self.method.soap.action
+- if isinstance(action, unicode):
++ if isinstance(action, str):
+ action = action.encode('utf-8')
+ stock = {'Content-Type':'text/xml; charset=utf-8', 'SOAPAction':action}
+ result = dict(stock, **self.options.headers)
+@@ -742,7 +742,7 @@ class SimClient(SoapClient):
+ @classmethod
+ def simulation(cls, kwargs):
+ """ get whether loopback has been specified in the I{kwargs}. """
+- return kwargs.has_key(SimClient.injkey)
++ return SimClient.injkey in kwargs
+
+ def invoke(self, args, kwargs):
+ """
+--- suds/mx/__init__.py.orig 2021-09-20 17:08:56 UTC
++++ suds/mx/__init__.py
+@@ -43,7 +43,7 @@ class Content(Object):
+ Object.__init__(self)
+ self.tag = tag
+ self.value = value
+- for k,v in kwargs.items():
++ for k,v in list(kwargs.items()):
+ setattr(self, k, v)
+
+ def __getattr__(self, name):
+@@ -52,8 +52,7 @@ class Content(Object):
+ v = None
+ setattr(self, name, v)
+ else:
+- raise AttributeError, \
+- 'Content has no attribute %s' % name
++ raise AttributeError('Content has no attribute %s' % name)
+ else:
+ v = self.__dict__[name]
+ return v
+--- suds/mx/literal.py.orig 2021-09-20 17:08:56 UTC
++++ suds/mx/literal.py
+@@ -131,9 +131,8 @@ class Typed(Core):
+ if current == content.type:
+ self.resolver.pop()
+ else:
+- raise Exception, \
+- 'content (end) mismatch: top=(%s) cont=(%s)' % \
+- (current, content)
++ raise Exception('content (end) mismatch: top=(%s) cont=(%s)' % \
++ (current, content))
+
+ def node(self, content):
+ #
+--- suds/plugin.py.orig 2021-09-20 17:08:56 UTC
++++ suds/plugin.py
+@@ -205,7 +205,7 @@ class PluginContainer:
+ plugins.append(p)
+ return PluginDomain(ctx, plugins)
+ else:
+- raise Exception, 'plugin domain (%s), invalid' % name
++ raise Exception('plugin domain (%s), invalid' % name)
+
+
+ class PluginDomain:
+@@ -252,6 +252,6 @@ class Method:
+ method = getattr(plugin, self.name, None)
+ if method and callable(method):
+ method(ctx)
+- except Exception, pe:
++ except Exception as pe:
+ log.exception(pe)
+ return ctx
+--- suds/properties.py.orig 2021-09-20 17:08:56 UTC
++++ suds/properties.py
+@@ -67,23 +67,23 @@ class Link(object):
+ """
+ if pA in pB.links or \
+ pB in pA.links:
+- raise Exception, 'Already linked'
++ raise Exception('Already linked')
+ dA = pA.domains()
+ dB = pB.domains()
+ for d in dA:
+ if d in dB:
+- raise Exception, 'Duplicate domain "%s" found' % d
++ raise Exception('Duplicate domain "%s" found' % d)
+ for d in dB:
+ if d in dA:
+- raise Exception, 'Duplicate domain "%s" found' % d
+- kA = pA.keys()
+- kB = pB.keys()
++ raise Exception('Duplicate domain "%s" found' % d)
++ kA = list(pA.keys())
++ kB = list(pB.keys())
+ for k in kA:
+ if k in kB:
+- raise Exception, 'Duplicate key %s found' % k
++ raise Exception('Duplicate key %s found' % k)
+ for k in kB:
+ if k in kA:
+- raise Exception, 'Duplicate key %s found' % k
++ raise Exception('Duplicate key %s found' % k)
+ return self
+
+ def teardown(self):
+@@ -177,7 +177,7 @@ class Definition:
+ if len(self.classes) and \
+ not isinstance(value, self.classes):
+ msg = '"%s" must be: %s' % (self.name, self.classes)
+- raise AttributeError,msg
++ raise AttributeError(msg)
+
+
+ def __repr__(self):
+@@ -251,7 +251,7 @@ class Properties:
+ """
+ if isinstance(other, Properties):
+ other = other.defined
+- for n,v in other.items():
++ for n,v in list(other.items()):
+ self.set(n, v)
+ return self
+
+@@ -372,7 +372,7 @@ class Properties:
+ history = []
+ history.append(self)
+ keys = set()
+- keys.update(self.definitions.keys())
++ keys.update(list(self.definitions.keys()))
+ for x in self.links:
+ if x in history:
+ continue
+@@ -408,7 +408,7 @@ class Properties:
+ @return: self
+ @rtype: L{Properties}
+ """
+- for d in self.definitions.values():
++ for d in list(self.definitions.values()):
+ self.defined[d.name] = d.default
+ return self
+
+@@ -434,10 +434,10 @@ class Properties:
+ def str(self, history):
+ s = []
+ s.append('Definitions:')
+- for d in self.definitions.values():
++ for d in list(self.definitions.values()):
+ s.append('\t%s' % repr(d))
+ s.append('Content:')
+- for d in self.defined.items():
++ for d in list(self.defined.items()):
+ s.append('\t%s' % str(d))
+ if self not in history:
+ history.append(self)
+--- suds/servicedefinition.py.orig 2021-09-20 17:08:56 UTC
++++ suds/servicedefinition.py
+@@ -80,7 +80,7 @@ class ServiceDefinition(UnicodeMixin):
+ timer.start()
+ for port in self.service.ports:
+ p = self.findport(port)
+- for op in port.binding.operations.values():
++ for op in list(port.binding.operations.values()):
+ m = p[0].method(op.name)
+ binding = m.binding.input
+ method = (m.name, binding.param_defs(m))
+@@ -138,7 +138,7 @@ class ServiceDefinition(UnicodeMixin):
+
+ def publictypes(self):
+ """Get all public types."""
+- for t in self.wsdl.schema.types.values():
++ for t in list(self.wsdl.schema.types.values()):
+ if t in self.params: continue
+ if t in self.types: continue
+ item = (t, t)
+@@ -152,7 +152,7 @@ class ServiceDefinition(UnicodeMixin):
+ WSDL document.
+ """
+ used = [ns[0] for ns in self.prefixes]
+- used += [ns[0] for ns in self.wsdl.root.nsprefixes.items()]
++ used += [ns[0] for ns in list(self.wsdl.root.nsprefixes.items())]
+ for n in range(0,1024):
+ p = 'ns%d'%n
+ if p not in used:
+@@ -235,6 +235,6 @@ class ServiceDefinition(UnicodeMixin):
+ def __unicode__(self):
+ try:
+ return self.description()
+- except Exception, e:
++ except Exception as e:
+ log.exception(e)
+ return tostr(e)
+--- suds/store.py.orig 2021-09-20 17:08:56 UTC
++++ suds/store.py
+@@ -566,7 +566,7 @@ class DocumentStore:
+ protocol, location = self.__split(url)
+ content = self.__find(location)
+ if protocol == 'suds' and content is None:
+- raise Exception, 'location "%s" not in document store' % location
++ raise Exception('location "%s" not in document store' % location)
+ return content
+
+ def __find(self, location):
+--- suds/sudsobject.py.orig 2021-09-20 17:08:56 UTC
++++ suds/sudsobject.py
+@@ -110,7 +110,7 @@ class Factory:
+ inst = subclass()
+ else:
+ inst = Object()
+- for a in dict.items():
++ for a in list(dict.items()):
+ setattr(inst, a[0], a[1])
+ return inst
+
+@@ -146,7 +146,7 @@ class Object(UnicodeMixin):
+ self.__keylist__.remove(name)
+ except:
+ cls = self.__class__.__name__
+- raise AttributeError, "%s has no attribute '%s'" % (cls, name)
++ raise AttributeError("%s has no attribute '%s'" % (cls, name))
+
+ def __getitem__(self, name):
+ if isinstance(name, int):
+@@ -179,7 +179,7 @@ class Iter:
+ self.keylist = self.__keylist(sobject)
+ self.index = 0
+
+- def next(self):
++ def __next__(self):
+ keylist = self.keylist
+ nkeys = len(self.keylist)
+ while self.index < nkeys:
+@@ -271,7 +271,7 @@ class Printer:
+ if len(object) == 0:
+ return '<empty>'
+ return self.print_collection(object, h, n+2)
+- if isinstance(object, basestring):
++ if isinstance(object, str):
+ return '"%s"' % tostr(object)
+ return '%s' % tostr(object)
+
+@@ -325,7 +325,7 @@ class Printer:
+ s.append('\n')
+ s.append(self.indent(n))
+ s.append('{')
+- for item in d.items():
++ for item in list(d.items()):
+ s.append('\n')
+ s.append(self.indent(n+1))
+ if isinstance(item[1], (list,tuple)):
+--- suds/transport/http.py.orig 2021-09-20 17:08:56 UTC
++++ suds/transport/http.py
+@@ -22,12 +22,12 @@ from suds.properties import Unskin
+ from suds.transport import *
+
+ import base64
+-from cookielib import CookieJar
+-import httplib
++from http.cookiejar import CookieJar
++import http.client
+ import socket
+ import sys
+-import urllib2
+-from urlparse import urlparse
++import urllib.request, urllib.error, urllib.parse
++from urllib.parse import urlparse
+
+ from logging import getLogger
+ log = getLogger(__name__)
+@@ -62,10 +62,10 @@ class HttpTransport(Transport):
+ try:
+ url = self.__get_request_url(request)
+ log.debug('opening (%s)', url)
+- u2request = urllib2.Request(url)
++ u2request = urllib.request.Request(url)
+ self.proxy = self.options.proxy
+ return self.u2open(u2request)
+- except urllib2.HTTPError, e:
++ except urllib.error.HTTPError as e:
+ raise TransportError(str(e), e.code, e.fp)
+
+ def send(self, request):
+@@ -74,7 +74,7 @@ class HttpTransport(Transport):
+ msg = request.message
+ headers = request.headers
+ try:
+- u2request = urllib2.Request(url, msg, headers)
++ u2request = urllib.request.Request(url, msg, headers)
+ self.addcookies(u2request)
+ self.proxy = self.options.proxy
+ request.headers.update(u2request.headers)
+@@ -85,10 +85,10 @@ class HttpTransport(Transport):
+ headers = fp.headers.dict
+ else:
+ headers = fp.headers
+- result = Reply(httplib.OK, headers, fp.read())
++ result = Reply(http.client.OK, headers, fp.read())
+ log.debug('received:\n%s', result)
+- except urllib2.HTTPError, e:
+- if e.code in (httplib.ACCEPTED, httplib.NO_CONTENT):
++ except urllib.error.HTTPError as e:
++ if e.code in (http.client.ACCEPTED, http.client.NO_CONTENT):
+ result = None
+ else:
+ raise TransportError(e.msg, e.code, e.fp)
+@@ -140,7 +140,7 @@ class HttpTransport(Transport):
+
+ """
+ if self.urlopener is None:
+- return urllib2.build_opener(*self.u2handlers())
++ return urllib.request.build_opener(*self.u2handlers())
+ return self.urlopener
+
+ def u2handlers(self):
+@@ -152,7 +152,7 @@ class HttpTransport(Transport):
+
+ """
+ handlers = []
+- handlers.append(urllib2.ProxyHandler(self.proxy))
++ handlers.append(urllib.request.ProxyHandler(self.proxy))
+ return handlers
+
+ def u2ver(self):
+@@ -165,7 +165,7 @@ class HttpTransport(Transport):
+ try:
+ part = urllib2.__version__.split('.', 1)
+ return float('.'.join(part))
+- except Exception, e:
++ except Exception as e:
+ log.exception(e)
+ return 0
+
+--- suds/umx/__init__.py.orig 2021-09-20 17:08:56 UTC
++++ suds/umx/__init__.py
+@@ -40,7 +40,7 @@ class Content(Object):
+ self.node = node
+ self.data = None
+ self.text = None
+- for k,v in kwargs.items():
++ for k,v in list(kwargs.items()):
+ setattr(self, k, v)
+
+ def __getattr__(self, name):
+@@ -49,8 +49,7 @@ class Content(Object):
+ v = None
+ setattr(self, name, v)
+ else:
+- raise AttributeError, \
+- 'Content has no attribute %s' % name
++ raise AttributeError('Content has no attribute %s' % name)
+ else:
+ v = self.__dict__[name]
+ return v
+--- suds/wsdl.py.orig 2021-09-20 17:08:56 UTC
++++ suds/wsdl.py
+@@ -31,8 +31,8 @@ from suds.sudsobject import Object, Facade, Metadata
+ from suds.reader import DocumentReader
+
+ import re
+-import soaparray
+-from urlparse import urljoin
++from . import soaparray
++from urllib.parse import urljoin
+
+ from logging import getLogger
+ log = getLogger(__name__)
+@@ -232,7 +232,7 @@ class Definitions(WObject):
+ for p in service.ports:
+ binding = p.binding
+ ptype = p.binding.type
+- operations = p.binding.type.operations.values()
++ operations = list(p.binding.type.operations.values())
+ for name in [op.name for op in operations]:
+ m = Facade('Method')
+ m.name = name
+@@ -249,8 +249,8 @@ class Definitions(WObject):
+
+ def set_wrapped(self):
+ """ set (wrapped|bare) flag on messages """
+- for b in self.bindings.values():
+- for op in b.operations.values():
++ for b in list(self.bindings.values()):
++ for op in list(b.operations.values()):
+ for body in (op.soap.input.body, op.soap.output.body):
+ body.wrapped = False
+ if not self.options.unwrap:
+@@ -482,7 +482,7 @@ class PortType(NamedObject):
+ @param definitions: A definitions object.
+ @type definitions: L{Definitions}
+ """
+- for op in self.operations.values():
++ for op in list(self.operations.values()):
+ if op.input is None:
+ op.input = Message(Element('no-input'), definitions)
+ else:
+@@ -505,7 +505,7 @@ class PortType(NamedObject):
+ qref = qualify(f.message, self.root, definitions.tns)
+ msg = definitions.messages.get(qref)
+ if msg is None:
+- raise Exception, "msg '%s', not-found" % f.message
++ raise Exception("msg '%s', not-found" % f.message)
+ f.message = msg
+
+ def operation(self, name):
+@@ -519,7 +519,7 @@ class PortType(NamedObject):
+ """
+ try:
+ return self.operations[name]
+- except Exception, e:
++ except Exception as e:
+ raise MethodNotFound(name)
+
+ def __gt__(self, other):
+@@ -654,7 +654,7 @@ class Binding(NamedObject):
+ @type definitions: L{Definitions}
+ """
+ self.resolveport(definitions)
+- for op in self.operations.values():
++ for op in list(self.operations.values()):
+ self.resolvesoapbody(definitions, op)
+ self.resolveheaders(definitions, op)
+ self.resolvefaults(definitions, op)
+@@ -683,8 +683,7 @@ class Binding(NamedObject):
+ """
+ ptop = self.type.operation(op.name)
+ if ptop is None:
+- raise Exception, \
+- "operation '%s' not defined in portType" % op.name
++ raise Exception("operation '%s' not defined in portType" % op.name)
+ soap = op.soap
+ parts = soap.input.body.parts
+ if len(parts):
+@@ -720,15 +719,14 @@ class Binding(NamedObject):
+ ref = qualify(mn, self.root, definitions.tns)
+ message = definitions.messages.get(ref)
+ if message is None:
+- raise Exception, "message'%s', not-found" % mn
++ raise Exception("message'%s', not-found" % mn)
+ pn = header.part
+ for p in message.parts:
+ if p.name == pn:
+ header.part = p
+ break
+ if pn == header.part:
+- raise Exception, \
+- "message '%s' has not part named '%s'" % (ref, pn)
++ raise Exception("message '%s' has not part named '%s'" % (ref, pn))
+
+ def resolvefaults(self, definitions, op):
+ """
+@@ -741,8 +739,7 @@ class Binding(NamedObject):
+ """
+ ptop = self.type.operation(op.name)
+ if ptop is None:
+- raise Exception, \
+- "operation '%s' not defined in portType" % op.name
++ raise Exception("operation '%s' not defined in portType" % op.name)
+ soap = op.soap
+ for fault in soap.faults:
+ for f in ptop.faults:
+@@ -751,8 +748,7 @@ class Binding(NamedObject):
+ continue
+ if hasattr(fault, 'parts'):
+ continue
+- raise Exception, \
+- "fault '%s' not defined in portType '%s'" % (fault.name, self.type.name)
++ raise Exception("fault '%s' not defined in portType '%s'" % (fault.name, self.type.name))
+
+ def operation(self, name):
+ """
+@@ -854,7 +850,7 @@ class Service(NamedObject):
+ @type names: [str,..]
+ """
+ for p in self.ports:
+- for m in p.methods.values():
++ for m in list(p.methods.values()):
+ if names is None or m.name in names:
+ m.location = url
+
+--- suds/xsd/deplist.py.orig 2021-09-20 17:08:56 UTC
++++ suds/xsd/deplist.py
+@@ -77,7 +77,7 @@ class DepList:
+ while len(self.stack):
+ try:
+ top = self.top()
+- ref = top[1].next()
++ ref = next(top[1])
+ refd = self.index.get(ref)
+ if refd is None:
+ log.debug('"%s" not found, skipped', Repr(ref))
+@@ -137,4 +137,4 @@ if __name__ == '__main__':
+ x = ('x', ())
+ L = DepList()
+ L.add(c, e, d, b, f, a, x)
+- print [x[0] for x in L.sort()]
++ print([x[0] for x in L.sort()])
+--- suds/xsd/query.py.orig 2021-09-20 17:08:56 UTC
++++ suds/xsd/query.py
+@@ -54,7 +54,7 @@ class Query(Object):
+ @return: The item matching the search criteria.
+ @rtype: L{sxbase.SchemaObject}
+ """
+- raise Exception, 'not-implemented by subclass'
++ raise Exception('not-implemented by subclass')
+
+ def filter(self, result):
+ """
+--- suds/xsd/sxbasic.py.orig 2021-09-20 17:08:56 UTC
++++ suds/xsd/sxbasic.py
+@@ -26,7 +26,7 @@ from suds.xsd.query import *
+ from suds.sax import Namespace
+ from suds.transport import TransportError
+ from suds.reader import DocumentReader
+-from urlparse import urljoin
++from urllib.parse import urljoin
+
+ from logging import getLogger
+ log = getLogger(__name__)
+@@ -667,7 +667,7 @@ class Include(SchemaObject):
+ root.set(TNS, tns)
+ else:
+ if self.schema.tns[1] != tns:
+- raise Exception, '%s mismatch' % TNS
++ raise Exception('%s mismatch' % TNS)
+
+
+ def description(self):
+--- tests/external/axis1.py.orig 2021-09-20 17:08:56 UTC
++++ tests/external/axis1.py
+@@ -36,34 +36,34 @@ credentials = dict(username='jortel', password='abc123
+ class MyInitPlugin(InitPlugin):
+
+ def initialized(self, context):
+- print 'PLUGIN (init): initialized: ctx=%s' % context.__dict__
++ print('PLUGIN (init): initialized: ctx=%s' % context.__dict__)
+
+
+ class MyDocumentPlugin(DocumentPlugin):
+
+ def loaded(self, context):
+- print 'PLUGIN (document): loaded: ctx=%s' % context.__dict__
++ print('PLUGIN (document): loaded: ctx=%s' % context.__dict__)
+
+ def parsed(self, context):
+- print 'PLUGIN (document): parsed: ctx=%s' % context.__dict__
++ print('PLUGIN (document): parsed: ctx=%s' % context.__dict__)
+
+
+ class MyMessagePlugin(MessagePlugin):
+
+ def marshalled(self, context):
+- print 'PLUGIN (message): marshalled: ctx=%s' % context.__dict__
++ print('PLUGIN (message): marshalled: ctx=%s' % context.__dict__)
+
+ def sending(self, context):
+- print 'PLUGIN (message): sending: ctx=%s' % context.__dict__
++ print('PLUGIN (message): sending: ctx=%s' % context.__dict__)
+
+ def received(self, context):
+- print 'PLUGIN (message): received: ctx=%s' % context.__dict__
++ print('PLUGIN (message): received: ctx=%s' % context.__dict__)
+
+ def parsed(self, context):
+- print 'PLUGIN (message): parsed: ctx=%s' % context.__dict__
++ print('PLUGIN (message): parsed: ctx=%s' % context.__dict__)
+
+ def unmarshalled(self, context):
+- print 'PLUGIN: (massage): unmarshalled: ctx=%s' % context.__dict__
++ print('PLUGIN: (massage): unmarshalled: ctx=%s' % context.__dict__)
+
+
+ myplugins = (
+@@ -75,27 +75,27 @@ myplugins = (
+
+ def start(url):
+ global errors
+- print '\n________________________________________________________________\n'
+- print 'Test @ ( %s )\nerrors = %d\n' % (url, errors)
++ print('\n________________________________________________________________\n')
++ print('Test @ ( %s )\nerrors = %d\n' % (url, errors))
+
+ try:
+ url = 'http://localhost:8081/axis/services/basic-rpc-encoded?wsdl'
+ start(url)
+ t = HttpAuthenticated(**credentials)
+ client = Client(url, transport=t, cache=None, plugins=myplugins)
+- print client
++ print(client)
+ #
+ # create a name object using the wsdl
+ #
+- print 'create name'
++ print('create name')
+ name = client.factory.create('ns0:Name')
+- name.first = u'jeff'+unichr(1234)
++ name.first = 'jeff'+chr(1234)
+ name.last = 'ortel'
+- print name
++ print(name)
+ #
+ # create a phone object using the wsdl
+ #
+- print 'create phone'
++ print('create phone')
+ phoneA = client.factory.create('ns0:Phone')
+ phoneA.npa = 410
+ phoneA.nxx = 555
+@@ -119,18 +119,18 @@ try:
+ # create a person object using the wsdl
+ #
+ person = client.factory.create('ns0:Person')
+- print '{empty} person=\n%s' % person
++ print('{empty} person=\n%s' % person)
+ person.name = name
+ person.age = 43
+ person.phone = [phoneA,phoneB,phoneC]
+ person.pets = [dog]
+- print 'person=\n%s' % person
++ print('person=\n%s' % person)
+ #
+ # add the person (using the webservice)
+ #
+- print 'addPersion()'
++ print('addPersion()')
+ result = client.service.addPerson(person)
+- print '\nreply(\n%s\n)\n' % str(result)
++ print('\nreply(\n%s\n)\n' % str(result))
+
+ #
+ # Async
+@@ -159,22 +159,22 @@ try:
+ ap.age = person.age
+ ap.phone = person.phone
+ ap.pets = person.pets
+- print 'AnotherPerson\n%s' % ap
++ print('AnotherPerson\n%s' % ap)
+ #
+ # update the person's name (using the webservice)
+ #
+- print 'updatePersion()'
++ print('updatePersion()')
+ result = client.service.updatePerson(ap, newname)
+- print '\nreply(\n%s\n)\n' % str(result)
++ print('\nreply(\n%s\n)\n' % str(result))
+ result = client.service.updatePerson(ap, None)
+- print '\nreply(\n%s\n)\n' % str(result)
+-except WebFault, f:
++ print('\nreply(\n%s\n)\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+@@ -182,19 +182,19 @@ try:
+ start(url)
+ t = HttpAuthenticated(**credentials)
+ client = Client(url, transport=t, cache=None)
+- print client
++ print(client)
+ #
+ # create a name object as dict
+ #
+- print 'create name'
++ print('create name')
+ name = {}
+ name['first'] = 'Elmer'
+ name['last'] = 'Fudd'
+- print name
++ print(name)
+ #
+ # create a phone as dict
+ #
+- print 'create phone'
++ print('create phone')
+ phoneA = {}
+ phoneA['npa'] = 410
+ phoneA['nxx'] = 555
+@@ -219,133 +219,133 @@ try:
+ # create a person as dict
+ #
+ person = {}
+- print '{empty} person=\n%s' % person
++ print('{empty} person=\n%s' % person)
+ person['name'] = name
+ person['age'] = 43
+ person['phone'] = [phoneA,phoneB, phoneC]
+ person['pets'] = [dog]
+- print 'person=\n%s' % person
++ print('person=\n%s' % person)
+ #
+ # add the person (using the webservice)
+ #
+- print 'addPersion()'
++ print('addPersion()')
+ result = client.service.addPerson(person)
+- print '\nreply(\n%s\n)\n' % str(result)
+-except WebFault, f:
++ print('\nreply(\n%s\n)\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print "echo(' this is cool ')"
++ print("echo(' this is cool ')")
+ result = client.service.echo('this is cool')
+- print '\nreply( "%s" )\n' % str(result)
+- print 'echo(None)'
++ print('\nreply( "%s" )\n' % str(result))
++ print('echo(None)')
+ result = client.service.echo(None)
+- print '\nreply( "%s" )\n' % str(result)
+-except WebFault, f:
++ print('\nreply( "%s" )\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print 'hello()'
++ print('hello()')
+ result = client.service.hello()
+- print '\nreply( %s )\n' % str(result)
+-except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print 'testVoid()'
++ print('testVoid()')
+ result = client.service.getVoid()
+- print '\nreply( %s )\n' % str(result)
+-except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print '** new style arrays **'
++ print('** new style arrays **')
+ words = ['my', 'dog', 'likes', 'steak']
+ result = client.service.printList(words)
+- print '\nreply( %s )\n' % str(result)
++ print('\nreply( %s )\n' % str(result))
+
+- print '** old style arrays **'
++ print('** old style arrays **')
+ array = client.factory.create('ArrayOf_xsd_string')
+- print 'ArrayOf_xsd_string=\n%s' % array
++ print('ArrayOf_xsd_string=\n%s' % array)
+ array.item = ['my', 'dog', 'likes', 'steak']
+ result = client.service.printList(array)
+- print '\nreply( %s )\n' % str(result)
+-except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ s = 'hello'
+ for n in range(0, 3):
+- print 'getList(%s, %d)' % (s, n)
++ print('getList(%s, %d)' % (s, n))
+ result = client.service.getList(s, n)
+- print '\nreply( %s )\n' % str(result)
++ print('\nreply( %s )\n' % str(result))
+ assert ( isinstance(result, list) and len(result) == n )
+-except WebFault, f:
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print 'testExceptions()'
++ print('testExceptions()')
+ result = client.service.throwException()
+- print '\nreply( %s )\n' % tostr(result)
++ print('\nreply( %s )\n' % tostr(result))
+ raise Exception('Fault expected and not raised')
+-except WebFault, f:
+- print f
+- print f.fault
+-except Exception, e:
++except WebFault as f:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://localhost:8081/axis/services/basic-rpc-encoded?wsdl'
+ start(url)
+ client = Client(url, faults=False, **credentials)
+- print 'testExceptions()'
++ print('testExceptions()')
+ result = client.service.throwException()
+- print '\nreply( %s )\n' % str(result)
+-except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+-print '\nFinished: errors=%d' % errors
++print('\nFinished: errors=%d' % errors)
+--- tests/external/axis2.py.orig 2021-09-20 17:08:56 UTC
++++ tests/external/axis2.py
+@@ -24,7 +24,7 @@ from datetime import datetime
+
+ errors = 0
+ url = 'http://localhost:8080/axis2/services/BasicService?wsdl'
+-print 'url=%s' % url
++print('url=%s' % url)
+
+ #
+ # create a service client using the wsdl.
+@@ -34,25 +34,25 @@ client = Client(url)
+ #
+ # print the service (introspection)
+ #
+-print client
++print(client)
+
+-print 'printList()'
+-print client.service.printList(['a','b'])
++print('printList()')
++print(client.service.printList(['a','b']))
+
+ #
+ # create a name object using the wsdl
+ #
+-print 'create name'
++print('create name')
+ name = client.factory.create('ns2:Name')
+-name.first = u'jeff'+unichr(1234)
++name.first = 'jeff'+chr(1234)
+ name.last = 'ortel'
+
+-print name
++print(name)
+
+ #
+ # create a phone object using the wsdl
+ #
+-print 'create phone'
++print('create phone')
+ phoneA = client.factory.create('ns2:Phone')
+ phoneA.npa = 410
+ phoneA.nxx = 822
+@@ -67,10 +67,10 @@ phoneB.number = 4406
+ # create a dog
+ #
+ dog = client.factory.create('ns2:Dog')
+-print dog
++print(dog)
+ dog.name = 'Chance'
+ dog.trained = True
+-print dog
++print(dog)
+
+ #
+ # create a person object using the wsdl
+@@ -80,7 +80,7 @@ person = client.factory.create('ns2:Person')
+ #
+ # inspect empty person
+ #
+-print '{empty} person=\n%s' % person
++print('{empty} person=\n%s' % person)
+
+ person.name = name
+ person.age = None
+@@ -92,14 +92,14 @@ person.pets.append(dog)
+ #
+ # inspect person
+ #
+-print 'person=\n%s' % person
++print('person=\n%s' % person)
+
+ #
+ # add the person (using the webservice)
+ #
+-print 'addPersion()'
++print('addPersion()')
+ result = client.service.addPerson(person)
+-print '\nreply(\n%s\n)\n' % result.encode('utf-8')
++print('\nreply(\n%s\n)\n' % result.encode('utf-8'))
+
+ #
+ # create a new name object used to update the person
+@@ -111,96 +111,96 @@ newname.last = None
+ #
+ # update the person's name (using the webservice) and print return person object
+ #
+-print 'updatePersion()'
++print('updatePersion()')
+ result = client.service.updatePerson(person, newname)
+-print '\nreply(\n%s\n)\n' % str(result)
++print('\nreply(\n%s\n)\n' % str(result))
+ result = client.service.updatePerson(person, None)
+-print '\nreply(\n%s\n)\n' % str(result)
++print('\nreply(\n%s\n)\n' % str(result))
+
+
+ #
+ # invoke the echo service
+ #
+-print 'echo()'
++print('echo()')
+ client.service.echo(None)
+ result = client.service.echo('this is cool')
+-print '\nreply( %s )\n' % str(result)
++print('\nreply( %s )\n' % str(result))
+
+-print 'echo() with {none}'
++print('echo() with {none}')
+ result = client.service.echo(None)
+-print '\nreply( %s )\n' % str(result)
++print('\nreply( %s )\n' % str(result))
+
+ #
+ # invoke the hello service
+ #
+-print 'hello()'
++print('hello()')
+ result = client.service.hello()
+-print '\nreply( %s )\n' % str(result)
++print('\nreply( %s )\n' % str(result))
+
+ #
+ # invoke the testVoid service
+ #
+ try:
+- print 'getVoid()'
++ print('getVoid()')
+ result = client.service.getVoid()
+- print '\nreply( %s )\n' % str(result)
+-except Exception, e:
+- print e
++ print('\nreply( %s )\n' % str(result))
++except Exception as e:
++ print(e)
+
+ #
+ # test list args
+ #
+-print 'getList(list)'
++print('getList(list)')
+ mylist = ['my', 'dog', 'likes', 'steak']
+ result = client.service.printList(mylist)
+-print '\nreply( %s )\n' % str(result)
++print('\nreply( %s )\n' % str(result))
+ # tuple
+-print 'testListArgs(tuple)'
++print('testListArgs(tuple)')
+ mylist = ('my', 'dog', 'likes', 'steak')
+ result = client.service.printList(mylist)
+-print '\nreply( %s )\n' % str(result)
++print('\nreply( %s )\n' % str(result))
+
+ #
+ # test list returned
+ #
+ for n in range(0, 3):
+- print 'getList(str, %d)' % n
++ print('getList(str, %d)' % n)
+ result = client.service.getList('hello', n)
+- print '\nreply( %s )\n' % str(result)
++ print('\nreply( %s )\n' % str(result))
+ assert ( isinstance(result, list) and len(result) == n )
+
+-print 'addPet()'
++print('addPet()')
+ dog = client.factory.create('ns2:Dog')
+ dog.name = 'Chance'
+ dog.trained = True
+-print dog
++print(dog)
+ try:
+ result = client.service.addPet(person, dog)
+- print '\nreply( %s )\n' % str(result)
+-except Exception, e:
+- print e
++ print('\nreply( %s )\n' % str(result))
++except Exception as e:
++ print(e)
+
+-print '___________________ E X C E P T I O N S __________________________'
++print('___________________ E X C E P T I O N S __________________________')
+
+ #
+ # test exceptions
+ #
+ try:
+- print 'throwException() faults=True'
++ print('throwException() faults=True')
+ result = client.service.throwException()
+- print '\nreply( %s )\n' % tostr(result)
+-except Exception, e:
+- print e
++ print('\nreply( %s )\n' % tostr(result))
++except Exception as e:
++ print(e)
+
+ #
+ # test faults
+ #
+ try:
+- print 'throwException() faults=False'
++ print('throwException() faults=False')
+ client.set_options(faults=False)
+ result = client.service.throwException()
+- print '\nreply( %s )\n' % tostr(result)
+-except Exception, e:
+- print e
++ print('\nreply( %s )\n' % tostr(result))
++except Exception as e:
++ print(e)
+
+-print '\nfinished: errors=%d' % errors
++print('\nfinished: errors=%d' % errors)
+--- tests/external/jasper.py.orig 2021-09-20 17:08:56 UTC
++++ tests/external/jasper.py
+@@ -26,22 +26,22 @@ errors = 0
+
+
+ def start(url):
+- print '\n________________________________________________________________\n'
+- print 'Test @ ( %s )' % url
++ print('\n________________________________________________________________\n')
++ print('Test @ ( %s )' % url)
+
+ try:
+ url = 'http://localhost:9090/jasperserver-pro/services/repository?wsdl'
+ start(url)
+ client = Client(url, username='jeff', password='ortel')
+- print client
+- print client.service.list('')
+-except WebFault, f:
++ print(client)
++ print(client.service.list(''))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+-print '\nFinished: errors = %d' % errors
++print('\nFinished: errors = %d' % errors)
+--- tests/external/public.py.orig 2021-09-20 17:08:56 UTC
++++ tests/external/public.py
+@@ -28,151 +28,151 @@ errors = 0
+
+ def start(url):
+ global errors
+- print '\n________________________________________________________________\n'
+- print 'Test @ ( %s ) %d' % (url, errors)
++ print('\n________________________________________________________________\n')
++ print('Test @ ( %s ) %d' % (url, errors))
+
+ try:
+ url = 'http://mssoapinterop.org/asmx/simple.asmx?WSDL'
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+ # string
+ input = "42"
+ d = dict(inputString=input)
+ result = client.service.echoString(**d)
+- print 'echoString() = %s' % result
++ print('echoString() = %s' % result)
+ assert result == input
+ # int
+ input = 42
+ result = client.service.echoInteger(input)
+- print 'echoInteger() = %s' % result
++ print('echoInteger() = %s' % result)
+ assert result == input
+ # float
+ input = 4.2
+ result = client.service.echoFloat(input)
+- print 'echoFloat() = %s' % result
++ print('echoFloat() = %s' % result)
+ assert result == input
+ # suds 0.3.8+
+ result = client.service.echoIntegerArray([])
+- print 'echoIntegerArray() = %s' % result
++ print('echoIntegerArray() = %s' % result)
+ assert result is None
+ input = [1,2,3,4]
+ result = client.service.echoIntegerArray(input)
+- print 'echoIntegerArray() = %s' % result
++ print('echoIntegerArray() = %s' % result)
+ assert result == input
+ result = client.service.echoIntegerArray(inputIntegerArray=input)
+- print 'echoIntegerArray() = %s' % result
++ print('echoIntegerArray() = %s' % result)
+ assert result == input
+-except WebFault, f:
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://jira.atlassian.com/rpc/soap/jirasoapservice-v2?wsdl'
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+ token = client.service.login('soaptester', 'soaptester')
+- print 'token="%s"' % token
++ print('token="%s"' % token)
+ user = client.service.getUser(token, 'soaptester')
+- print 'user="%s"' % user
+-except WebFault, f:
++ print('user="%s"' % user)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://jira.atlassian.com/rpc/soap/jirasoapservice-v2?wsdl'
+ start(url+' ** cloned **')
+ client = Client(url).clone()
+- print '**clone**\n%s' % client
++ print('**clone**\n%s' % client)
+ token = client.service.login('soaptester', 'soaptester')
+- print '**clone** token="%s"' % token
++ print('**clone** token="%s"' % token)
+ user = client.service.getUser(token, 'soaptester')
+- print '**clone** user="%s"' % user
+-except WebFault, f:
++ print('**clone** user="%s"' % user)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = ' http://www.boyzoid.com/comp/randomQuote.cfc?wsdl '
+ start(url)
+ client = Client(url)
+- print client
+- print client.service.getQuote(False)
+-except WebFault, f:
++ print(client)
++ print(client.service.getQuote(False))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://www.zenfolio.com/zf/api/zfapi.asmx?wsdl'
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+ #client.setport(0)
+ group = client.factory.create('Group')
+- print 'Group:\n%s' % group
+- print 'LoadGroupHierarchy("demo")'
++ print('Group:\n%s' % group)
++ print('LoadGroupHierarchy("demo")')
+ groupHierarchy = client.service.LoadGroupHierarchy("demo")
+- print 'result:\n%s' % groupHierarchy
+-except WebFault, f:
++ print('result:\n%s' % groupHierarchy)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://cert.synxis.com/interface/ChannelConnect.asmx?WSDL'
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+ #client.setport(0)
+ tpa = client.factory.create('ns1:TPA_Extensions')
+- print client.service.Ping(tpa, "hello")
+-except WebFault, f:
++ print(client.service.Ping(tpa, "hello"))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'https://sec.neurofuzz-software.com/paos/genSSHA-SOAP.php?wsdl'
+ start(url)
+ client = Client(url)
+- print client
+- print client.service.genSSHA('hello', 'sha1')
+-except WebFault, f:
++ print(client)
++ print(client.service.genSSHA('hello', 'sha1'))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+@@ -180,79 +180,79 @@ try:
+ start(url)
+ client = Client(url)
+ #print client.factory.resolver.schema
+- print client
+- print 'Logon()'
++ print(client)
++ print('Logon()')
+ reply = client.service.Logon('testuser','test')
+- print reply
+-except WebFault, f:
++ print(reply)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://soa.ebrev.info/service.wsdl'
+ start(url)
+ client = Client(url)
+- print client
+-except WebFault, f:
++ print(client)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = 'http://arcweb.esri.com/services/v2/MapImage.wsdl'
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+ env = client.factory.create('ns2:Envelope')
+- print env
++ print(env)
+ options = client.factory.create('ns4:MapImageOptions')
+- print options
+-except WebFault, f:
++ print(options)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = "http://www.thomas-bayer.com/axis2/services/BLZService?wsdl"
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+ #client.setport(0)
+- print client.service.getBank("76251020")
+-except WebFault, f:
++ print(client.service.getBank("76251020"))
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ url = "http://arcweb.esri.com/services/v2/RouteFinder.wsdl"
+ start(url)
+ client = Client(url)
+- print client
+-except WebFault, f:
++ print(client)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ timer = metrics.Timer()
+@@ -264,19 +264,19 @@ try:
+ client = Client(url)
+ #client.setport(0)
+ timer.stop()
+- print 'create client: %s' % timer
++ print('create client: %s' % timer)
+ timer.start()
+ s = str(client)
+ timer.stop()
+- print 'str(client): %s' % timer
+- print 'client:\n%s' % s
+-except WebFault, f:
++ print('str(client): %s' % timer)
++ print('client:\n%s' % s)
++except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+-except Exception, e:
++ print(f)
++ print(f.fault)
++except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+-print '\nFinished: errors = %d' % errors
++print('\nFinished: errors = %d' % errors)
+--- tests/external/rhq.py.orig 2021-09-20 17:08:56 UTC
++++ tests/external/rhq.py
+@@ -32,8 +32,8 @@ errors = 0
+
+ def start(url):
+ global errors
+- print '\n________________________________________________________________\n'
+- print 'Test @ ( %s ) %d' % (url, errors)
++ print('\n________________________________________________________________\n')
++ print('Test @ ( %s ) %d' % (url, errors))
+
+
+ def rhqTest():
+@@ -43,7 +43,7 @@ def rhqTest():
+ url = 'http://localhost.localdomain:7080/rhq-rhq-enterprise-server-ejb3/WebservicesManagerBean?wsdl'
+ start(url)
+ client = Client(url)
+- print client
++ print(client)
+
+ try:
+
+@@ -51,7 +51,7 @@ def rhqTest():
+ # create name
+ #
+ name = client.factory.create('name')
+- name.first = u'Jeff'+unichr(1234)
++ name.first = 'Jeff'+chr(1234)
+ name.last = 'Ortel &amp;lt; Company'
+ #
+ # create a phone object using the wsdl
+@@ -77,22 +77,22 @@ def rhqTest():
+ # create a person object using the wsdl
+ #
+ person = client.factory.create('person')
+- print person
++ print(person)
+ person.name = name
+ person.age = 43
+ person.phone.append(phoneA)
+ person.phone.append(phoneB)
+ person.pet.append(dog)
+ person.pet.append(cat)
+- print person
++ print(person)
+ #
+ # addPerson()
+ #
+- print 'addPersion()'
++ print('addPersion()')
+ result = client.service.addPerson(person)
+ sent = client.last_sent()
+ rcvd = client.last_received()
+- print '\nreply(\n%s\n)\n' % result
++ print('\nreply(\n%s\n)\n' % result)
+ #
+ # create a new name object used to update the person
+ #
+@@ -102,110 +102,110 @@ def rhqTest():
+ #
+ # update the person's name (using the webservice)
+ #
+- print 'updatePersion()'
++ print('updatePersion()')
+ result = client.service.updatePerson(person, newname)
+- print '\nreply(\n%s\n)\n' % str(result)
++ print('\nreply(\n%s\n)\n' % str(result))
+ result = client.service.updatePerson(person, None)
+- print '\nreply(\n%s\n)\n' % str(result)
+- except WebFault, f:
++ print('\nreply(\n%s\n)\n' % str(result))
++ except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+- except Exception, e:
++ print(f)
++ print(f.fault)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print "echo('this is cool')"
++ print("echo('this is cool')")
+ result = client.service.echo('this is cool')
+- print '\nreply( %s )\n' % str(result)
+- print 'echo(None)'
++ print('\nreply( %s )\n' % str(result))
++ print('echo(None)')
+ result = client.service.echo(None)
+- print '\nreply( %s )\n' % str(result)
+- except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++ except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+- except Exception, e:
++ print(f)
++ print(f.fault)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print 'hello()'
++ print('hello()')
+ result = client.service.hello()
+- print '\nreply( %s )\n' % str(result)
+- except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++ except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+- except Exception, e:
++ print(f)
++ print(f.fault)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print 'testVoid()'
++ print('testVoid()')
+ result = client.service.testVoid()
+- print '\nreply( %s )\n' % str(result)
+- except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++ except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+- except Exception, e:
++ print(f)
++ print(f.fault)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ mylist = ['my', 'dog', 'likes', 'steak']
+- print 'testListArgs(%s)' % mylist
++ print('testListArgs(%s)' % mylist)
+ result = client.service.testListArg(mylist)
+- print '\nreply( %s )\n' % str(result)
+- except WebFault, f:
++ print('\nreply( %s )\n' % str(result))
++ except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+- except Exception, e:
++ print(f)
++ print(f.fault)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+ s = 'hello'
+ for n in range(0, 3):
+- print 'getList(%s, %d)' % (s, n)
++ print('getList(%s, %d)' % (s, n))
+ result = client.service.getList(s, n)
+- print '\nreply( %s )\n' % str(result)
++ print('\nreply( %s )\n' % str(result))
+ if len(result) != n:
+ errors += 1
+- print 'expected (%d), reply (%d)' % (n, len(result))
+- except WebFault, f:
++ print('expected (%d), reply (%d)' % (n, len(result)))
++ except WebFault as f:
+ errors += 1
+- print f
+- print f.fault
+- except Exception, e:
++ print(f)
++ print(f.fault)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+ try:
+- print 'testExceptions()'
++ print('testExceptions()')
+ result = client.service.testExceptions()
+- print '\nreply( %s )\n' % tostr(result)
++ print('\nreply( %s )\n' % tostr(result))
+ raise Exception('Fault expected and not raised')
+- except WebFault, f:
+- print f
+- print f.fault
+- print f.document
+- except Exception, e:
++ except WebFault as f:
++ print(f)
++ print(f.fault)
++ print(f.document)
++ except Exception as e:
+ errors += 1
+- print e
++ print(e)
+ tb.print_exc()
+
+
+ if __name__ == '__main__':
+ errors = 0
+ rhqTest()
+- print '\nFinished: errors=%d' % errors
++ print('\nFinished: errors=%d' % errors)
+--- tests/external/saxenc.py.orig 2021-09-20 17:08:56 UTC
++++ tests/external/saxenc.py
+@@ -26,30 +26,30 @@ def basic():
+ p = Parser()
+ d = p.parse(string=xml)
+ a = d.root()
+- print 'A(parsed)=\n%s' % a
++ print('A(parsed)=\n%s' % a)
+ assert str(a) == xml
+ b = Element('a')
+ b.setText('Me &&amp; &lt;b>my</b> shadow\'s <i>dog</i> love to \'play\' and sing "la,la,la";')
+- print 'B(encoded)=\n%s' % b
++ print('B(encoded)=\n%s' % b)
+ assert str(b) == xml
+- print 'A(text-decoded)=\n%s' % a.getText()
+- print 'B(text-decoded)=\n%s' % b.getText()
++ print('A(text-decoded)=\n%s' % a.getText())
++ print('B(text-decoded)=\n%s' % b.getText())
+ assert a.getText() == b.getText()
+- print 'test pruning'
++ print('test pruning')
+ j = Element('A')
+ j.set('n', 1)
+ j.append(Element('B'))
+- print j
++ print(j)
+ j.prune()
+- print j
++ print(j)
+
+ def cdata():
+ xml = '<a><![CDATA[<b>This is my &amp;&lt;tag&gt;</b>]]></a>'
+ p = Parser()
+ d = p.parse(string=xml)
+- print d
++ print(d)
+ a = d.root()
+- print a.getText()
++ print(a.getText())
+
+ if __name__ == '__main__':
+ #basic()
diff --git a/net/py-suds-jurko/files/patch-setup.py b/net/py-suds-jurko/files/patch-setup.py
new file mode 100644
index 000000000000..bc6ef4ccb236
--- /dev/null
+++ b/net/py-suds-jurko/files/patch-setup.py
@@ -0,0 +1,20 @@
+--- setup.py.orig 2021-09-20 17:08:56 UTC
++++ setup.py
+@@ -91,17 +91,6 @@ if sys.version_info >= (2, 5):
+ # distutils.setup() 'obsoletes' parameter not introduced until Python 2.5.
+ extra_setup_params["obsoletes"] = ["suds"]
+
+-if sys.version_info >= (3, 0):
+- extra_setup_params["use_2to3"] = True
+-
+- # Teach Python's urllib lib2to3 fixer that the old urllib2.__version__
+- # data member is now stored in the urllib.request module.
+- import lib2to3.fixes.fix_urllib
+- for x in lib2to3.fixes.fix_urllib.MAPPING["urllib2"]:
+- if x[0] == "urllib.request":
+- x[1].append("__version__")
+- break;
+-
+ # Wrap long_description at 72 characters since PKG-INFO package distribution
+ # metadata file stores this text with an 8 space indentation.
+ long_description = """
diff --git a/net/py-terminado/Makefile b/net/py-terminado/Makefile
index 9aff33c3b61e..a773d13a8dc8 100644
--- a/net/py-terminado/Makefile
+++ b/net/py-terminado/Makefile
@@ -1,5 +1,5 @@
PORTNAME= terminado
-PORTVERSION= 0.8.3
+PORTVERSION= 0.12.1
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-terminado/distinfo b/net/py-terminado/distinfo
index ea01d3ccc16e..1e26563bd069 100644
--- a/net/py-terminado/distinfo
+++ b/net/py-terminado/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579873239
-SHA256 (terminado-0.8.3.tar.gz) = 4804a774f802306a7d9af7322193c5390f1da0abb429e082a10ef1d46e6fb2c2
-SIZE (terminado-0.8.3.tar.gz) = 21165
+TIMESTAMP = 1637494950
+SHA256 (terminado-0.12.1.tar.gz) = b20fd93cc57c1678c799799d117874367cc07a3d2d55be95205b1a88fa08393f
+SIZE (terminado-0.12.1.tar.gz) = 14513
diff --git a/net/py-wsdd/Makefile b/net/py-wsdd/Makefile
index 59df60f377fc..2ef9868efb5e 100644
--- a/net/py-wsdd/Makefile
+++ b/net/py-wsdd/Makefile
@@ -1,7 +1,6 @@
PORTNAME= wsdd
DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.4
-PORTREVISION= 2
+DISTVERSION= 0.7.0
CATEGORIES= net python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-wsdd/distinfo b/net/py-wsdd/distinfo
index 8b2aca7cf612..33ed57ceb722 100644
--- a/net/py-wsdd/distinfo
+++ b/net/py-wsdd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613207932
-SHA256 (christgau-wsdd-v0.6.4_GH0.tar.gz) = bb8bc6411b70be68369c53bf75827ac77f16a5bf5606de6536dd7e6d6ce4c2be
-SIZE (christgau-wsdd-v0.6.4_GH0.tar.gz) = 28574
+TIMESTAMP = 1638665024
+SHA256 (christgau-wsdd-v0.7.0_GH0.tar.gz) = b406901e41454a40773be5ba13be067613e1170d0b701f5c07b9b1b7807928bc
+SIZE (christgau-wsdd-v0.7.0_GH0.tar.gz) = 30155
diff --git a/net/pyrad/Makefile b/net/pyrad/Makefile
index 44ad123387ec..89aa758a4efa 100644
--- a/net/pyrad/Makefile
+++ b/net/pyrad/Makefile
@@ -1,34 +1,44 @@
# Created by: Blaz Zupan <blaz@si.FreeBSD.org>
PORTNAME= pyrad
-PORTVERSION= 2.0
-PORTREVISION= 1
+DISTVERSION= 2.4
CATEGORIES= net python
-MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= steve@energistic.com
COMMENT= Python implementation of RADIUS client
+LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.0b1:devel/py-nose@${PY_FLAVOR}
+
USES= cpe python:3.6+
-USE_PYTHON= distutils autoplist
+USE_GITHUB= yes
+GH_ACCOUNT= pyradius
+USE_PYTHON= autoplist concurrent distutils
CPE_VENDOR= pyrad_project
+TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
+
+NO_ARCH= yes
+
PORTEXAMPLES= *
OPTIONS_DEFINE= EXAMPLES
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e 's|zip_safe=True|zip_safe=False|' \
${WRKSRC}/setup.py
-.if ${PORT_OPTIONS:MEXAMPLES}
-post-install:
+post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
(cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
+
+do-test:
+ @cd ${WRKSRC} && ${SETENV} ${TESTENV} ${PYTHON_CMD} -m nose -v
.include <bsd.port.mk>
diff --git a/net/pyrad/distinfo b/net/pyrad/distinfo
index 554a8ddfa47b..56a25bf82aaa 100644
--- a/net/pyrad/distinfo
+++ b/net/pyrad/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pyrad-2.0.tar.gz) = 6bdac1af328aceb4383c39986356b6bb8a880157c3fd95eefc28643526718999
-SIZE (pyrad-2.0.tar.gz) = 38388
+TIMESTAMP = 1635956882
+SHA256 (pyradius-pyrad-2.4_GH0.tar.gz) = aa3312a68c0a0d60fd2222df7ad0d22089c269bc8430dd840f4648431fa02c59
+SIZE (pyradius-pyrad-2.4_GH0.tar.gz) = 54431
diff --git a/net/quiche/Makefile b/net/quiche/Makefile
index 3f3c4dd7b54f..3fa94078345b 100644
--- a/net/quiche/Makefile
+++ b/net/quiche/Makefile
@@ -1,6 +1,6 @@
PORTNAME= quiche
PORTVERSION= 0.9.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= junho.choi@gmail.com
diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile
index c810d0c7c82a..cf832a3a0dec 100644
--- a/net/rabbiteer/Makefile
+++ b/net/rabbiteer/Makefile
@@ -1,6 +1,6 @@
PORTNAME= rabbiteer
DISTVERSION= 1.4.1
-PORTREVISION= 33
+PORTREVISION= 34
CATEGORIES= net
MAINTAINER= dch@FreeBSD.org
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index 654514170d93..aca8cc4ba2b7 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-MIT
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR}
-CONFLICTS= rabbitmq-c-[0-9]*
+CONFLICTS= rabbitmq-c
USES= cmake pathfix python ssl
USE_GITHUB= yes
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index 08b2790c78bb..e4d32722cbf1 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,7 +1,7 @@
# Created by: Phillip Neumann <pneumann@gmail.com>
PORTNAME= rabbitmq
-DISTVERSION= 3.9.5
+DISTVERSION= 3.9.11
CATEGORIES= net
MASTER_SITES= https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/
DISTNAME= ${PORTNAME}-server-${PORTVERSION}
diff --git a/net/rabbitmq/distinfo b/net/rabbitmq/distinfo
index 4e421db9b28e..bb61fd1a23b8 100644
--- a/net/rabbitmq/distinfo
+++ b/net/rabbitmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630317951
-SHA256 (rabbitmq-server-3.9.5.tar.xz) = 5523f819030d1fb570ff4a38c052e77c21699051a9b6a6e401c414e85865daf2
-SIZE (rabbitmq-server-3.9.5.tar.xz) = 3453660
+TIMESTAMP = 1638657809
+SHA256 (rabbitmq-server-3.9.11.tar.xz) = 88908f27293f2d86dc94c70567f26afc1849fc7c1e174510a6c3c0fca1d3f547
+SIZE (rabbitmq-server-3.9.11.tar.xz) = 4755696
diff --git a/net/rabbitmq/pkg-plist b/net/rabbitmq/pkg-plist
index 9b76ae9411aa..d89ccc4da9ea 100644
--- a/net/rabbitmq/pkg-plist
+++ b/net/rabbitmq/pkg-plist
@@ -34,6 +34,7 @@ lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-diagnostics
lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-plugins
lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-queues
lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-streams
+lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-tanzu
lib/rabbitmq_server-%%VERSION%%/escript/rabbitmq-upgrade
lib/rabbitmq_server-%%VERSION%%/escript/rabbitmqctl
lib/rabbitmq_server-%%VERSION%%/plugins/README
@@ -90,14 +91,14 @@ lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%/include/amqp_cli
lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%/include/amqp_client_internal.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%/include/amqp_gen_consumer_spec.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%/include/rabbit_routing_prefixes.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten.app
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten_detect.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten_detector.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten_emitter.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten_sink.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.6/ebin/aten_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten.app
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten_detect.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten_detector.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten_emitter.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten_sink.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/aten-0.5.7/ebin/aten_sup.beam
lib/rabbitmq_server-%%VERSION%%/plugins/base64url-1.0.1/ebin/base64url.app
lib/rabbitmq_server-%%VERSION%%/plugins/base64url-1.0.1/ebin/base64url.beam
lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-2.8.0/ebin/cowboy.app
@@ -365,21 +366,21 @@ lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_parser.beam
lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_to_json.beam
lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_to_term.beam
lib/rabbitmq_server-%%VERSION%%/plugins/jsx-3.1.0/ebin/jsx_verify.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli.app
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_application.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_escriptize.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_help.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_inet.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_lib.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_mnesia.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_plugin.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_port.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_process.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_store.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/ebin/observer_cli_system.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.6.2/include/observer_cli.hrl
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli.app
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_application.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_escriptize.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_help.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_inet.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_lib.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_mnesia.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_plugin.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_port.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_process.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_store.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/ebin/observer_cli_system.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/observer_cli-1.7.1/include/observer_cli.hrl
lib/rabbitmq_server-%%VERSION%%/plugins/osiris-0.1.0/ebin/osiris.app
lib/rabbitmq_server-%%VERSION%%/plugins/osiris-0.1.0/ebin/osiris.beam
lib/rabbitmq_server-%%VERSION%%/plugins/osiris-0.1.0/ebin/osiris_app.beam
@@ -432,43 +433,43 @@ lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/ebin/quantile.b
lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/ebin/quantile_estimator.app
lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/ebin/quantile_estimator.beam
lib/rabbitmq_server-%%VERSION%%/plugins/quantile_estimator-0.2.1/include/quantile_estimator.hrl
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra.app
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_bench.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_counters.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_dbg.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_directory.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_env.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_file_handle.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_flru.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_leaderboard.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_lib.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_meta.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_pre_init.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_reader.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_segment.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_segment_writer.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_snapshot.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_wal.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_log_wal_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_machine.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_machine_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_machine_simple.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_metrics_ets.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_monitors.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_server.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_server_proc.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_server_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_server_sup_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_snapshot.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_system.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_system_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.0/ebin/ra_systems_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra.app
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_bench.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_counters.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_dbg.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_directory.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_env.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_file_handle.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_flru.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_leaderboard.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_lib.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_meta.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_pre_init.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_reader.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_segment.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_segment_writer.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_snapshot.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_wal.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_log_wal_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_machine.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_machine_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_machine_simple.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_metrics_ets.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_monitors.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_server.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_server_proc.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_server_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_server_sup_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_snapshot.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_system.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_system_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ra-2.0.3/ebin/ra_systems_sup.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/amqqueue.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/amqqueue_v1.beam
lib/rabbitmq_server-%%VERSION%%/plugins/rabbit-%%VERSION%%/ebin/background_gc.beam
@@ -1295,25 +1296,25 @@ lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/pencil.cur
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/stomp.js
lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%/priv/temp-queue.html
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch.app
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch.appup
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_acceptor.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_acceptors_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_app.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_conns_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_conns_sup_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_crc32c.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_embedded_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_listener_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_protocol.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_proxy_header.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_server.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_server_proxy.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_ssl.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_sup.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_tcp.beam
-lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.0.0/ebin/ranch_transport.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.app
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.appup
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_acceptor.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_acceptors_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_app.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_conns_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_conns_sup_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_crc32c.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_embedded_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_listener_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_protocol.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_proxy_header.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_server.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_server_proxy.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_ssl.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_sup.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_tcp.beam
+lib/rabbitmq_server-%%VERSION%%/plugins/ranch-2.1.0/ebin/ranch_transport.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.1/ebin/recon.app
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.1/ebin/recon.beam
lib/rabbitmq_server-%%VERSION%%/plugins/recon-2.5.1/ebin/recon_alloc.beam
@@ -1368,6 +1369,7 @@ lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-queues
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-streams
+lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-tanzu
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-upgrade
lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
man/man5/rabbitmq-env.conf.5.gz
diff --git a/net/rclone-browser/Makefile b/net/rclone-browser/Makefile
index 8da819f97e3d..84f9bd9e138b 100644
--- a/net/rclone-browser/Makefile
+++ b/net/rclone-browser/Makefile
@@ -2,7 +2,7 @@ PORTNAME= rclone-browser
DISTVERSION= 1.8.0
CATEGORIES= net
-MAINTAINER= driesm.michiels@gmail.com
+MAINTAINER= driesm@FreeBSD.org
COMMENT= Simple cross platform GUI for rclone
LICENSE= MIT
diff --git a/net/rclone/Makefile b/net/rclone/Makefile
index 5468f5900b01..03bcc5238753 100644
--- a/net/rclone/Makefile
+++ b/net/rclone/Makefile
@@ -1,6 +1,6 @@
PORTNAME= rclone
DISTVERSIONPREFIX= v
-DISTVERSION= 1.56.0
+DISTVERSION= 1.57.0
CATEGORIES= net
MAINTAINER= brad@facefault.org
@@ -13,67 +13,67 @@ USES= cpe go:modules
USE_GITHUB= yes
GH_ACCOUNT= ncw
GH_TUPLE= Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
- Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
- Azure:go-autorest:79a63e70c4d8:azure_go_autorest_adal \
+ Azure:azure-storage-blob-go:v0.14.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
+ Azure:go-autorest:82fc42f340ce:azure_go_autorest_adal \
Azure:go-autorest:b3a0b30a7423:azure_go_autorest_date \
Azure:go-autorest:logger/v0.2.1:azure_go_autorest_logger \
Azure:go-autorest:tracing/v0.6.0:azure_go_autorest_tracing \
Azure:go-autorest:v14.2.0:azure_go_autorest/vendor/github.com/Azure/go-autorest \
Azure:go-ntlmssp:66371956d46c:azure_go_ntlmssp/vendor/github.com/Azure/go-ntlmssp \
- Microsoft:go-winio:v0.4.17:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
- StackExchange:wmi:fe8f1750fd46:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
+ Microsoft:go-winio:v0.5.0:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+ StackExchange:wmi:v1.2.1:stackexchange_wmi/vendor/github.com/StackExchange/wmi \
Unknwon:goconfig:df7de6a44db8:unknwon_goconfig/vendor/github.com/Unknwon/goconfig \
a8m:tree:ce3525c5c2ef:a8m_tree/vendor/github.com/a8m/tree \
aalpar:deheap:9a0c2883bd56:aalpar_deheap/vendor/github.com/aalpar/deheap \
abbot:go-http-auth:v0.4.0:abbot_go_http_auth/vendor/github.com/abbot/go-http-auth \
anacrolix:dms:v1.2.2:anacrolix_dms/vendor/github.com/anacrolix/dms \
+ artyom:mtab:74b6fd01d416:artyom_mtab/vendor/github.com/artyom/mtab \
atotto:clipboard:v0.1.4:atotto_clipboard/vendor/github.com/atotto/clipboard \
- aws:aws-sdk-go:v1.38.22:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+ aws:aws-sdk-go:v1.40.27:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
bazil:fuse:fb710f7dfd05:bazil_fuse/vendor/bazil.org/fuse \
beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
billziss-gh:cgofuse:v1.5.0:billziss_gh_cgofuse/vendor/github.com/billziss-gh/cgofuse \
btcsuite:btcutil:a53e38424cce:btcsuite_btcutil/vendor/github.com/btcsuite/btcutil \
buengese:sgzip:v0.1.1:buengese_sgzip/vendor/github.com/buengese/sgzip \
- calebcase:tmpfile:v1.0.2:calebcase_tmpfile/vendor/github.com/calebcase/tmpfile \
+ calebcase:tmpfile:v1.0.3:calebcase_tmpfile/vendor/github.com/calebcase/tmpfile \
census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
colinmarc:hdfs:v2.2.0:colinmarc_hdfs_v2/vendor/github.com/colinmarc/hdfs/v2 \
coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \
- coreos:go-systemd:95778dfbb74e:coreos_go_systemd/vendor/github.com/coreos/go-systemd \
- coreos:pkg:399ea9e2e55f:coreos_pkg/vendor/github.com/coreos/pkg \
- cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
+ coreos:go-systemd:d3cd4ed1dbcf:coreos_go_systemd/vendor/github.com/coreos/go-systemd \
+ cpuguy83:go-md2man:v2.0.1:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
dop251:scsu:8fadfb689669:dop251_scsu/vendor/github.com/dop251/scsu \
- dropbox:dropbox-sdk-go-unofficial:41fdcdae8a53:dropbox_dropbox_sdk_go_unofficial/vendor/github.com/dropbox/dropbox-sdk-go-unofficial \
- etcd-io:bbolt:v1.3.5:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
- form3tech-oss:jwt-go:v3.2.2:form3tech_oss_jwt_go/vendor/github.com/form3tech-oss/jwt-go \
- gabriel-vasile:mimetype:v1.2.0:gabriel_vasile_mimetype/vendor/github.com/gabriel-vasile/mimetype \
- go-chi:chi:v5.0.2:go_chi_chi_v5/vendor/github.com/go-chi/chi/v5 \
+ dropbox:dropbox-sdk-go-unofficial:v6.0.3:dropbox_dropbox_sdk_go_unofficial_v6/vendor/github.com/dropbox/dropbox-sdk-go-unofficial \
+ etcd-io:bbolt:v1.3.6:etcd_io_bbolt/vendor/go.etcd.io/bbolt \
+ form3tech-oss:jwt-go:v3.2.5:form3tech_oss_jwt_go/vendor/github.com/form3tech-oss/jwt-go \
+ gabriel-vasile:mimetype:v1.3.1:gabriel_vasile_mimetype/vendor/github.com/gabriel-vasile/mimetype \
+ go-chi:chi:v5.0.3:go_chi_chi_v5/vendor/github.com/go-chi/chi/v5 \
go-ole:go-ole:v1.2.5:go_ole_go_ole/vendor/github.com/go-ole/go-ole \
go-yaml:yaml:496545a6307b:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \
golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
- golang:crypto:83a5a9bb288b:golang_crypto/vendor/golang.org/x/crypto \
+ golang:crypto:32db794688a5:golang_crypto/vendor/golang.org/x/crypto \
golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
- golang:net:e915ea6b2b7d:golang_net/vendor/golang.org/x/net \
- golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \
+ golang:net:60bc85c4be6d:golang_net/vendor/golang.org/x/net \
+ golang:oauth2:2bc19b11175f:golang_oauth2/vendor/golang.org/x/oauth2 \
golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
- golang:sys:09eb48e85fd7:golang_sys/vendor/golang.org/x/sys \
- golang:term:72f3dc4e9b72:golang_term/vendor/golang.org/x/term \
- golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
- golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
- google:go-genproto:9910b6c460de:google_go_genproto/vendor/google.golang.org/genproto \
+ golang:sys:41cdb8703e55:golang_sys/vendor/golang.org/x/sys \
+ golang:term:6886f2dfbf5b:golang_term/vendor/golang.org/x/term \
+ golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
+ golang:time:1f47c861a9ac:golang_time/vendor/golang.org/x/time \
+ google:go-genproto:43fce44e7af1:google_go_genproto/vendor/google.golang.org/genproto \
google:go-querystring:v1.1.0:google_go_querystring/vendor/github.com/google/go-querystring \
- google:uuid:v1.2.0:google_uuid/vendor/github.com/google/uuid \
+ google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
- googleapis:google-api-go-client:v0.44.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
- googleapis:google-cloud-go:v0.81.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
- grpc:grpc-go:v1.37.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+ googleapis:google-api-go-client:v0.54.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+ googleapis:google-cloud-go:v0.93.3:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+ grpc:grpc-go:v1.40.0:grpc_grpc_go/vendor/google.golang.org/grpc \
hanwen:go-fuse:v2.1.0:hanwen_go_fuse_v2/vendor/github.com/hanwen/go-fuse/v2 \
hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
- iguanesolutions:go-systemd:v5.0.0:iguanesolutions_go_systemd_v5/vendor/github.com/iguanesolutions/go-systemd/v5 \
+ iguanesolutions:go-systemd:v5.1.0:iguanesolutions_go_systemd_v5/vendor/github.com/iguanesolutions/go-systemd/v5 \
inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
jcmturner:aescts:v2.0.0:jcmturner_aescts_v2/vendor/github.com/jcmturner/aescts \
jcmturner:dnsutils:v2.0.0:jcmturner_dnsutils_v2/vendor/github.com/jcmturner/dnsutils \
@@ -81,56 +81,54 @@ GH_TUPLE= Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.c
jcmturner:goidentity:v6.0.1:jcmturner_goidentity_v6/vendor/github.com/jcmturner/goidentity \
jcmturner:gokrb5:v8.4.2:jcmturner_gokrb5_v8/vendor/github.com/jcmturner/gokrb5 \
jcmturner:rpc:v2.0.3:jcmturner_rpc_v2/vendor/github.com/jcmturner/rpc \
- jlaffaye:ftp:5d4190119067:jlaffaye_ftp/vendor/github.com/jlaffaye/ftp \
jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
jzelinskie:whirlpool:0675e54bb004:jzelinskie_whirlpool/vendor/github.com/jzelinskie/whirlpool \
- kardianos:osext:2bc1f35cddc0:kardianos_osext/vendor/github.com/kardianos/osext \
- klauspost:compress:v1.12.1:klauspost_compress/vendor/github.com/klauspost/compress \
+ klauspost:compress:v1.13.4:klauspost_compress/vendor/github.com/klauspost/compress \
koofr:go-httpclient:93aa7c75b348:koofr_go_httpclient/vendor/github.com/koofr/go-httpclient \
koofr:go-koofrclient:8e5366da203a:koofr_go_koofrclient/vendor/github.com/koofr/go-koofrclient \
kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \
mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
mattn:go-ieproxy:v0.0.1:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
- mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
- mattn:go-runewidth:v0.0.12:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+ mattn:go-isatty:v0.0.13:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+ mattn:go-runewidth:v0.0.13:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
ncw:go-acd:fe55f33415b1:ncw_go_acd/vendor/github.com/ncw/go-acd \
- ncw:swift:v2.0.0:ncw_swift_v2/vendor/github.com/ncw/swift/v2 \
- nsf:termbox-go:2ff630277754:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
+ ncw:swift:v2.0.1:ncw_swift_v2/vendor/github.com/ncw/swift/v2 \
+ nsf:termbox-go:v1.1.1:nsf_termbox_go/vendor/github.com/nsf/termbox-go \
patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
pengsrc:go-shared:1999055a4a14:pengsrc_go_shared/vendor/github.com/pengsrc/go-shared \
pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
- pkg:sftp:2b80967078b8:pkg_sftp/vendor/github.com/pkg/sftp \
+ pkg:sftp:v1.13.2:pkg_sftp/vendor/github.com/pkg/sftp \
pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
- prometheus:client_golang:v1.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+ prometheus:client_golang:v1.11.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
- prometheus:common:v0.20.0:prometheus_common/vendor/github.com/prometheus/common \
- prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
- protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+ prometheus:common:v0.30.0:prometheus_common/vendor/github.com/prometheus/common \
+ prometheus:procfs:v0.7.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
+ protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
putdotio:go-putio:16d982cac2b8:putdotio_go_putio_putio/vendor/github.com/putdotio/go-putio \
- rfjakob:eme:v1.1.1:rfjakob_eme/vendor/github.com/rfjakob/eme \
+ rclone:ftp:v1.0.0-210902f:rclone_ftp/vendor/github.com/jlaffaye/ftp \
+ rfjakob:eme:v1.1.2:rfjakob_eme/vendor/github.com/rfjakob/eme \
rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
russross:blackfriday:v2.1.0:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
- sevlyar:go-daemon:v0.1.5:sevlyar_go_daemon/vendor/github.com/sevlyar/go-daemon \
- shirou:gopsutil:v3.21.3:shirou_gopsutil_v3/vendor/github.com/shirou/gopsutil \
+ shirou:gopsutil:v3.21.8:shirou_gopsutil_v3/vendor/github.com/shirou/gopsutil \
sirupsen:logrus:v1.8.1:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
skratchdot:open-golang:eef842397966:skratchdot_open_golang/vendor/github.com/skratchdot/open-golang \
- spacemonkeygo:monkit:v3.0.11:spacemonkeygo_monkit_v3/vendor/github.com/spacemonkeygo/monkit/v3 \
- spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \
+ spacemonkeygo:monkit:v3.0.15:spacemonkeygo_monkit_v3/vendor/github.com/spacemonkeygo/monkit/v3 \
+ spf13:cobra:v1.2.1:spf13_cobra/vendor/github.com/spf13/cobra \
spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \
- storj:common:eabb53ea1332:storj_common/vendor/storj.io/common \
- storj:drpc:v0.0.20:storj_drpc/vendor/storj.io/drpc \
+ storj:common:4667d2cafb27:storj_common/vendor/storj.io/common \
+ storj:drpc:v0.0.24:storj_drpc/vendor/storj.io/drpc \
storj:uplink:v1.4.6:storj_uplink/vendor/storj.io/uplink \
stretchr:testify:v1.7.0:stretchr_testify/vendor/github.com/stretchr/testify \
t3rm1n4l:go-mega:ffad7fcb44b8:t3rm1n4l_go_mega/vendor/github.com/t3rm1n4l/go-mega \
- tklauser:go-sysconf:v0.3.5:tklauser_go_sysconf/vendor/github.com/tklauser/go-sysconf \
- tklauser:numcpus:v0.2.2:tklauser_numcpus/vendor/github.com/tklauser/numcpus \
- uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \
- uber-go:multierr:v1.6.0:uber_go_multierr/vendor/go.uber.org/multierr \
- uber-go:zap:v1.16.0:uber_go_zap/vendor/go.uber.org/zap \
+ tklauser:go-sysconf:v0.3.9:tklauser_go_sysconf/vendor/github.com/tklauser/go-sysconf \
+ tklauser:numcpus:v0.3.0:tklauser_numcpus/vendor/github.com/tklauser/numcpus \
+ uber-go:atomic:v1.9.0:uber_go_atomic/vendor/go.uber.org/atomic \
+ uber-go:multierr:v1.7.0:uber_go_multierr/vendor/go.uber.org/multierr \
+ uber-go:zap:v1.19.0:uber_go_zap/vendor/go.uber.org/zap \
vivint:infectious:25a574ae18a3:vivint_infectious/vendor/github.com/vivint/infectious \
- xanzy:ssh-agent:v0.3.0:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
+ xanzy:ssh-agent:v0.3.1:xanzy_ssh_agent/vendor/github.com/xanzy/ssh-agent \
youmark:pkcs8:1326539a0a0a:youmark_pkcs8/vendor/github.com/youmark/pkcs8 \
yunify:qingstor-sdk-go:v3.2.0:yunify_qingstor_sdk_go_v3/vendor/github.com/yunify/qingstor-sdk-go/v3 \