aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/Makefile50
-rw-r--r--net/Sockets/Makefile2
-rw-r--r--net/adasockets/Makefile28
-rw-r--r--net/adasockets/distinfo3
-rw-r--r--net/adasockets/files/adasockets.gpr11
-rw-r--r--net/adasockets/files/patch-src_Makefile.in11
-rw-r--r--net/adasockets/files/patch-src_adasockets.pc.in10
-rw-r--r--net/adasockets/pkg-descr7
-rw-r--r--net/adasockets/pkg-plist29
-rw-r--r--net/akonadi-calendar/distinfo6
-rw-r--r--net/akonadi-calendar/pkg-plist91
-rw-r--r--net/akonadi-contacts/distinfo6
-rw-r--r--net/akonadi-contacts/pkg-plist162
-rw-r--r--net/akonadi-mime/distinfo6
-rw-r--r--net/akonadi-mime/pkg-plist72
-rw-r--r--net/akonadi-notes/distinfo6
-rw-r--r--net/akonadi-notes/pkg-plist11
-rw-r--r--net/akonadi-search/distinfo6
-rw-r--r--net/akonadi-search/pkg-plist23
-rw-r--r--net/anet/Makefile59
-rw-r--r--net/anet/distinfo3
-rw-r--r--net/anet/files/patch-src_anet-sockets-inet.adb74
-rw-r--r--net/anet/pkg-descr20
-rw-r--r--net/anet/pkg-plist82
-rw-r--r--net/apinger/Makefile2
-rw-r--r--net/aquantia-atlantic-kmod/Makefile5
-rw-r--r--net/aquantia-atlantic-kmod/files/patch-aq__main.c82
-rw-r--r--net/aquantia-atlantic-kmod/files/patch-aq__ring.c23
-rw-r--r--net/arataga/Makefile2
-rw-r--r--net/asterisk-chan_sccp/Makefile2
-rw-r--r--net/asterisk16/Makefile16
-rw-r--r--net/asterisk16/distinfo10
-rw-r--r--net/asterisk16/files/asterisk.in4
-rw-r--r--net/asterisk16/files/patch-build__tools_make__xml__documentation11
-rw-r--r--net/asterisk16/files/patch-configure49
-rw-r--r--net/asterisk16/files/patch-main_term.c10
-rw-r--r--net/asterisk16/files/patch-menuselect_configure11
-rw-r--r--net/asterisk16/files/patch-res_res__fax__spandsp.c62
-rw-r--r--net/asterisk16/files/patch-third-party_pjproject_Makefile20
-rw-r--r--net/asterisk16/pkg-message4
-rw-r--r--net/asterisk18/Makefile18
-rw-r--r--net/asterisk18/distinfo10
-rw-r--r--net/asterisk18/files/asterisk.in4
-rw-r--r--net/asterisk18/files/patch-build__tools_make__xml__documentation11
-rw-r--r--net/asterisk18/files/patch-configure49
-rw-r--r--net/asterisk18/files/patch-main_term.c10
-rw-r--r--net/asterisk18/files/patch-menuselect_configure11
-rw-r--r--net/asterisk18/files/patch-res_res__fax__spandsp.c62
-rw-r--r--net/asterisk18/files/patch-third-party_pjproject_Makefile20
-rw-r--r--net/asterisk18/pkg-message4
-rw-r--r--net/asterisk18/pkg-plist3
-rw-r--r--net/axa/Makefile4
-rw-r--r--net/bctoolbox/Makefile21
-rw-r--r--net/bctoolbox/distinfo6
-rw-r--r--net/bctoolbox/files/patch-src-CMakeLists.txt4
-rw-r--r--net/bctoolbox/files/patch-src-utils-port.c4
-rw-r--r--net/bctoolbox/pkg-descr5
-rw-r--r--net/bctoolbox/pkg-plist24
-rw-r--r--net/belle-sip/Makefile31
-rw-r--r--net/belle-sip/distinfo8
-rw-r--r--net/belle-sip/files/patch-src-belle_sip_headers_impl.c19
-rw-r--r--net/belle-sip/files/patch-src_belle__sip__internal.h4
-rw-r--r--net/belle-sip/files/patch-src_dns.c10
-rw-r--r--net/belle-sip/files/patch-src_dns_dns.c29
-rw-r--r--net/belle-sip/pkg-plist13
-rw-r--r--net/bird2/Makefile7
-rw-r--r--net/bird2/distinfo6
-rw-r--r--net/bird2/files/patch-Makefile.in18
-rw-r--r--net/bird2/files/patch-proto_babel_babel.c24
-rw-r--r--net/bosh-bootloader/Makefile2
-rw-r--r--net/bosh-cli/Makefile2
-rw-r--r--net/bredbandskollen/Makefile10
-rw-r--r--net/bredbandskollen/files/extra-src_framework_socketreceiver.h12
-rw-r--r--net/bwping/Makefile2
-rw-r--r--net/bwping/distinfo6
-rw-r--r--net/calendarsupport/distinfo6
-rw-r--r--net/calendarsupport/pkg-plist116
-rw-r--r--net/ceph14/Makefile8
-rw-r--r--net/ceph14/pkg-message33
-rw-r--r--net/cf/Makefile1
-rw-r--r--net/clash/Makefile6
-rw-r--r--net/clash/distinfo10
-rw-r--r--net/clash/files/patch-listener_redir_tcp__freebsd.go4
-rw-r--r--net/cloudflared/Makefile7
-rw-r--r--net/cloudflared/distinfo6
-rw-r--r--net/cloudquery/Makefile1
-rw-r--r--net/concourse-fly/Makefile1
-rw-r--r--net/courier-authlib-ldap/Makefile2
-rw-r--r--net/cpp-pcp-client/Makefile1
-rw-r--r--net/croc/Makefile22
-rw-r--r--net/croc/distinfo42
-rw-r--r--net/czmq/Makefile2
-rw-r--r--net/dpdk-20.11/Makefile2
-rw-r--r--net/dpdk-20.11/distinfo6
-rw-r--r--net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h6
-rw-r--r--net/dpdk-20.11/pkg-plist56
-rw-r--r--net/dpdk/Makefile2
-rw-r--r--net/dpdk/distinfo6
-rw-r--r--net/dpdk/files/patch-examples_meson.build15
-rw-r--r--net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c27
-rw-r--r--net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h38
-rw-r--r--net/dpdk/files/patch-meson.build11
-rw-r--r--net/dpdk/pkg-plist2
-rw-r--r--net/dpinger/Makefile2
-rw-r--r--net/dpinger/distinfo6
-rw-r--r--net/drive/Makefile24
-rw-r--r--net/drive/distinfo46
-rw-r--r--net/dtcp/Makefile2
-rw-r--r--net/dtcp/files/patch-dtcpc.rb43
-rw-r--r--net/dtcp/files/patch-dtcps.rb54
-rw-r--r--net/endlessh/Makefile2
-rw-r--r--net/eternalterminal/Makefile5
-rw-r--r--net/eternalterminal/distinfo6
-rw-r--r--net/evans/Makefile1
-rw-r--r--net/eventviews/distinfo6
-rw-r--r--net/eventviews/pkg-plist84
-rw-r--r--net/fb303/Makefile8
-rw-r--r--net/fb303/distinfo6
-rw-r--r--net/fb303/pkg-plist1
-rw-r--r--net/fbzmq/Makefile2
-rw-r--r--net/fbzmq/distinfo6
-rw-r--r--net/findomain/Makefile2
-rw-r--r--net/foreman-proxy/Makefile38
-rw-r--r--net/foreman-proxy/distinfo6
-rw-r--r--net/foreman-proxy/files/patch-bin-smart-proxy2
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example24
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example8
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example12
-rw-r--r--net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example8
-rw-r--r--net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example9
-rw-r--r--net/foreman-proxy/files/patch-lib_proxy_http__download.rb20
-rw-r--r--net/foreman-proxy/pkg-message2
-rw-r--r--net/foreman-proxy/pkg-plist89
-rw-r--r--net/fort/Makefile1
-rw-r--r--net/fpc-ldap/Makefile2
-rw-r--r--net/fping/Makefile2
-rw-r--r--net/fping/files/patch-fping.c23
-rw-r--r--net/freerdp/Makefile24
-rw-r--r--net/freerdp/distinfo6
-rw-r--r--net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h11
-rw-r--r--net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c11
-rw-r--r--net/freerdp/pkg-plist4
-rw-r--r--net/frp/Makefile3
-rw-r--r--net/frp/distinfo10
-rw-r--r--net/frr7/Makefile2
-rw-r--r--net/gamenetworkingsockets/Makefile2
-rw-r--r--net/gdrive/Makefile1
-rw-r--r--net/gemserv/Makefile2
-rw-r--r--net/geoipupdate/Makefile5
-rw-r--r--net/geoipupdate/distinfo10
-rw-r--r--net/gerbera/Makefile5
-rw-r--r--net/gerbera/distinfo6
-rw-r--r--net/gerbera/pkg-plist13
-rw-r--r--net/gfbgraph/Makefile1
-rw-r--r--net/gitlab-agent/Makefile17
-rw-r--r--net/gitlab-agent/distinfo10
-rw-r--r--net/gitup/Makefile6
-rw-r--r--net/gitup/distinfo8
-rw-r--r--net/glflow/Makefile2
-rw-r--r--net/glib-networking/Makefile3
-rw-r--r--net/glib-networking/distinfo6
-rw-r--r--net/glib-networking/pkg-plist1
-rw-r--r--net/glusterfs/Makefile1
-rw-r--r--net/gmid/Makefile3
-rw-r--r--net/gmid/distinfo6
-rw-r--r--net/gmid/pkg-plist2
-rw-r--r--net/gnome-connections/Makefile27
-rw-r--r--net/gnome-connections/distinfo3
-rw-r--r--net/gnome-connections/pkg-descr13
-rw-r--r--net/gnome-connections/pkg-plist142
-rw-r--r--net/gnome-nettool/Makefile13
-rw-r--r--net/gnome-nettool/distinfo5
-rw-r--r--net/gnome-nettool/files/patch-data_meson.build20
-rw-r--r--net/gnome-nettool/files/patch-src_info.c6
-rw-r--r--net/gnome-nettool/files/patch-src_netstat.c6
-rw-r--r--net/gnome-nettool/files/patch-src_nettool.c10
-rw-r--r--net/gnome-nettool/pkg-plist56
-rw-r--r--net/gnome-online-accounts/Makefile2
-rw-r--r--net/gnome-online-accounts/distinfo6
-rw-r--r--net/gnome-online-miners/Makefile1
-rw-r--r--net/gnu-dico/Makefile1
-rw-r--r--net/go-bapu/Makefile1
-rw-r--r--net/go-cs/Makefile2
-rw-r--r--net/gobgp/Makefile55
-rw-r--r--net/gobgp/distinfo84
-rw-r--r--net/gogoc/Makefile51
-rw-r--r--net/gogoc/distinfo2
-rw-r--r--net/gogoc/files/gogoc.in32
-rw-r--r--net/gogoc/files/patch-env190
-rw-r--r--net/gogoc/files/patch-freebsd.sh10
-rw-r--r--net/gogoc/files/patch-icmp_echo_engine.c11
-rw-r--r--net/gogoc/pkg-descr9
-rw-r--r--net/gogoc/pkg-plist6
-rw-r--r--net/google-cloud-sdk-app-engine-go/Makefile50
-rw-r--r--net/google-cloud-sdk-app-engine-go/distinfo3
-rw-r--r--net/google-cloud-sdk-app-engine-go/files/app-engine-go.snapshot.json29
-rw-r--r--net/google-cloud-sdk-app-engine-go/pkg-descr7
-rw-r--r--net/goreplay/Makefile1
-rw-r--r--net/gorss/Makefile37
-rw-r--r--net/gorss/Makefile.deps21
-rw-r--r--net/gorss/distinfo41
-rw-r--r--net/gorss/pkg-descr3
-rw-r--r--net/gq/Makefile2
-rw-r--r--net/grilo-plugins/Makefile5
-rw-r--r--net/grilo/Makefile1
-rw-r--r--net/grive2/Makefile1
-rw-r--r--net/grpcox/Makefile1
-rw-r--r--net/grpcui/Makefile26
-rw-r--r--net/grpcui/distinfo52
-rw-r--r--net/grpcurl/Makefile3
-rw-r--r--net/grpcurl/distinfo6
-rw-r--r--net/gscloud/Makefile1
-rw-r--r--net/gscloud/distinfo6
-rw-r--r--net/gssdp/Makefile10
-rw-r--r--net/gssdp/distinfo6
-rw-r--r--net/gssdp/pkg-plist28
-rw-r--r--net/gssdp14/Makefile40
-rw-r--r--net/gssdp14/distinfo3
-rw-r--r--net/gssdp14/files/patch-libgssdp-gssdp-client.h12
-rw-r--r--net/gssdp14/files/patch-libgssdp-gssdp-resource-group.h10
-rw-r--r--net/gssdp14/pkg-descr3
-rw-r--r--net/gssdp14/pkg-plist15
-rw-r--r--net/gstreamer1-plugins-libmms/Makefile2
-rw-r--r--net/gstreamer1-plugins-srtp/Makefile2
-rw-r--r--net/gtk-vnc/Makefile16
-rw-r--r--net/gtk-vnc/distinfo6
-rw-r--r--net/gtk-vnc/pkg-plist4
-rw-r--r--net/gupnp-av/Makefile2
-rw-r--r--net/gupnp-av/distinfo6
-rw-r--r--net/gupnp-av/pkg-plist2
-rw-r--r--net/gupnp-dlna/Makefile11
-rw-r--r--net/gupnp-igd/Makefile10
-rw-r--r--net/gupnp-tools/Makefile12
-rw-r--r--net/gupnp-tools/distinfo6
-rw-r--r--net/gupnp-tools/pkg-plist26
-rw-r--r--net/gupnp-ui/Makefile6
-rw-r--r--net/gupnp/Makefile16
-rw-r--r--net/gupnp/distinfo6
-rw-r--r--net/gupnp/pkg-plist59
-rw-r--r--net/gupnp14/Makefile50
-rw-r--r--net/gupnp14/distinfo3
-rw-r--r--net/gupnp14/files/patch-libgupnp-gupnp-control-point.c11
-rw-r--r--net/gupnp14/pkg-descr13
-rw-r--r--net/gupnp14/pkg-plist30
-rw-r--r--net/haproxy-devel/Makefile43
-rw-r--r--net/haproxy-devel/distinfo6
-rw-r--r--net/haproxy-devel/files/patch-include-haproxy-atomic.h11
-rw-r--r--net/haproxy-devel/pkg-plist13
-rw-r--r--net/haproxy/Makefile8
-rw-r--r--net/haproxy/distinfo6
-rw-r--r--net/haproxy/pkg-plist10
-rw-r--r--net/haproxy17/Makefile2
-rw-r--r--net/haproxy18/Makefile2
-rw-r--r--net/haproxy19/Makefile61
-rw-r--r--net/haproxy19/distinfo3
-rw-r--r--net/haproxy19/files/patch-include-common-hathreads.h11
-rw-r--r--net/haproxy19/pkg-plist104
-rw-r--r--net/haproxy20/Makefile6
-rw-r--r--net/haproxy20/distinfo6
-rw-r--r--net/haproxy21/distinfo3
-rw-r--r--net/haproxy21/files/haproxy.in130
-rw-r--r--net/haproxy21/files/patch-include-common-hathreads.h11
-rw-r--r--net/haproxy21/pkg-descr6
-rw-r--r--net/haproxy22/Makefile6
-rw-r--r--net/haproxy22/distinfo6
-rw-r--r--net/haproxy23/Makefile6
-rw-r--r--net/haproxy23/distinfo6
-rw-r--r--net/haproxy24/Makefile6
-rw-r--r--net/haproxy24/distinfo6
-rw-r--r--net/haproxy25/Makefile (renamed from net/haproxy21/Makefile)53
-rw-r--r--net/haproxy25/distinfo3
-rw-r--r--net/haproxy25/files/haproxy.in (renamed from net/haproxy19/files/haproxy.in)0
-rw-r--r--net/haproxy25/files/patch-src_cpuset.c14
-rw-r--r--net/haproxy25/pkg-descr (renamed from net/haproxy19/pkg-descr)0
-rw-r--r--net/haproxy25/pkg-plist (renamed from net/haproxy21/pkg-plist)23
-rw-r--r--net/hblock/Makefile2
-rw-r--r--net/hblock/distinfo6
-rw-r--r--net/hostapd-devel/Makefile4
-rw-r--r--net/hostapd-devel/distinfo6
-rw-r--r--net/hostapd-devel/files/patch-src-l2_packet-l2_packet_freebsd.c37
-rw-r--r--net/hostapd-devel/files/patch-src_drivers_driver__bsd.c59
-rw-r--r--net/hostapd/Makefile1
-rw-r--r--net/hostapd/files/patch-src-l2_packet-l2_packet_freebsd.c37
-rw-r--r--net/hostapd/files/patch-src_drivers_driver__bsd.c59
-rw-r--r--net/hostapd/files/patch-src_utils_os.h17
-rw-r--r--net/hostapd29/Makefile47
-rw-r--r--net/hostapd29/distinfo9
-rw-r--r--net/hostapd29/files/config316
-rw-r--r--net/hostapd29/files/hostapd.in39
-rw-r--r--net/hostapd29/files/patch-src-l2_packet-l2_packet_freebsd.c14
-rw-r--r--net/hostapd29/files/patch-src_common_dhcp.h25
-rw-r--r--net/hostapd29/files/patch-src_drivers_driver__bsd.c60
-rw-r--r--net/hostapd29/files/patch-src_utils_os.h (renamed from net/hostapd-devel/files/patch-src_utils_os.h)0
-rw-r--r--net/hostapd29/files/patch-src_utils_os__unix.c18
-rw-r--r--net/hostapd29/files/patch-src_wps_wps__upnp.c20
-rw-r--r--net/hostapd29/pkg-descr12
-rw-r--r--net/hostapd29/pkg-message10
-rw-r--r--net/hping/Makefile52
-rw-r--r--net/hping/distinfo2
-rw-r--r--net/hping/files/extra-patch-sendip.c33
-rw-r--r--net/hping/files/patch-Makefile.in33
-rw-r--r--net/hping/files/patch-bytesex.h17
-rw-r--r--net/hping/files/patch-configure10
-rw-r--r--net/hping/pkg-descr21
-rw-r--r--net/htpdate/Makefile3
-rw-r--r--net/htpdate/distinfo6
-rw-r--r--net/incidenceeditor/distinfo6
-rw-r--r--net/incidenceeditor/pkg-plist42
-rw-r--r--net/inlets/Makefile54
-rw-r--r--net/inlets/distinfo71
-rw-r--r--net/inlets/pkg-descr5
-rw-r--r--net/intel-em-kmod/files/patch-devclass30
-rw-r--r--net/intel-ix-kmod/Makefile1
-rw-r--r--net/intel-ix-kmod/files/patch-if__ix.c15
-rw-r--r--net/intel-ixl-kmod/files/patch-if__ixl.c15
-rw-r--r--net/iodine/Makefile2
-rw-r--r--net/ip2location/Makefile3
-rw-r--r--net/ip2location/distinfo6
-rw-r--r--net/ip2location/files/patch-memleak369
-rw-r--r--net/ip2location/pkg-plist11
-rw-r--r--net/ip2proxy/Makefile4
-rw-r--r--net/ip2proxy/distinfo6
-rw-r--r--net/ipinfo-cli/Makefile7
-rw-r--r--net/ipinfo-cli/distinfo14
-rw-r--r--net/ipxe/Makefile10
-rw-r--r--net/ipxe/distinfo6
-rw-r--r--net/irrd/Makefile96
-rw-r--r--net/irrd/distinfo6
-rw-r--r--net/irrd/files/irrd4.in4
-rw-r--r--net/isboot-kmod/files/patch-ibft.c74
-rw-r--r--net/isboot-kmod/files/patch-isboot.c17
-rw-r--r--net/isboot-kmod/files/patch-iscsi.c226
-rw-r--r--net/iwnet/Makefile34
-rw-r--r--net/iwnet/distinfo3
-rw-r--r--net/iwnet/files/patch-src_CMakeLists.txt25
-rw-r--r--net/iwnet/pkg-descr12
-rw-r--r--net/iwnet/pkg-plist53
-rw-r--r--net/jotta-cli/Makefile2
-rw-r--r--net/jotta-cli/distinfo8
-rw-r--r--net/k6/Makefile5
-rw-r--r--net/k6/distinfo10
-rw-r--r--net/kafka/Makefile2
-rw-r--r--net/kafka/distinfo6
-rw-r--r--net/kafka/pkg-plist25
-rw-r--r--net/kalarmcal/Makefile28
-rw-r--r--net/kalarmcal/distinfo3
-rw-r--r--net/kalarmcal/pkg-plist142
-rw-r--r--net/kamailio/Makefile23
-rw-r--r--net/kamailio/distinfo6
-rw-r--r--net/kamailio/files/patch-src_Makefile.defs29
-rw-r--r--net/kamailio/files/patch-src_core_ip__addr.h13
-rw-r--r--net/kamailio/files/patch-src_modules_websocket_ws__frame.c11
-rw-r--r--net/kamailio/pkg-plist4
-rw-r--r--net/kcalutils/distinfo6
-rw-r--r--net/kcalutils/pkg-plist8
-rw-r--r--net/kdenetwork-filesharing/distinfo6
-rw-r--r--net/kdenetwork-filesharing/pkg-plist4
-rw-r--r--net/kea/Makefile3
-rw-r--r--net/kea/distinfo6
-rw-r--r--net/kea/pkg-plist12
-rw-r--r--net/kf5-kcalendarcore/distinfo6
-rw-r--r--net/kf5-kcalendarcore/pkg-plist2
-rw-r--r--net/kf5-kcontacts/distinfo6
-rw-r--r--net/kf5-kcontacts/pkg-plist6
-rw-r--r--net/kf5-kdav/distinfo6
-rw-r--r--net/kf5-kdav/pkg-plist86
-rw-r--r--net/kf5-kholidays/distinfo6
-rw-r--r--net/kf5-kholidays/pkg-descr2
-rw-r--r--net/kf5-kholidays/pkg-plist2
-rw-r--r--net/kf5-kxmlrpcclient/distinfo6
-rw-r--r--net/kf5-kxmlrpcclient/pkg-plist3
-rw-r--r--net/kf5-syndication/distinfo6
-rw-r--r--net/kf5-syndication/pkg-descr2
-rw-r--r--net/kf5-syndication/pkg-plist2
-rw-r--r--net/kget/distinfo6
-rw-r--r--net/kget/pkg-plist194
-rw-r--r--net/kidentitymanagement/distinfo6
-rw-r--r--net/kidentitymanagement/pkg-plist19
-rw-r--r--net/kimap/distinfo6
-rw-r--r--net/kimap/pkg-plist7
-rw-r--r--net/kio-gdrive/distinfo6
-rw-r--r--net/kio-gdrive/pkg-descr4
-rw-r--r--net/kio-gdrive/pkg-plist2
-rw-r--r--net/kippo/Makefile2
-rw-r--r--net/kissd/Makefile3
-rw-r--r--net/kitinerary/Makefile2
-rw-r--r--net/kitinerary/distinfo6
-rw-r--r--net/kitinerary/pkg-plist10
-rw-r--r--net/kldap/distinfo6
-rw-r--r--net/kldap/pkg-plist2
-rw-r--r--net/kmailtransport/distinfo6
-rw-r--r--net/kmailtransport/pkg-plist88
-rw-r--r--net/kmbox/distinfo6
-rw-r--r--net/kmbox/pkg-plist6
-rw-r--r--net/kmime/distinfo6
-rw-r--r--net/kmime/pkg-plist2
-rw-r--r--net/kontactinterface/distinfo6
-rw-r--r--net/kontactinterface/pkg-plist6
-rw-r--r--net/kpimtextedit/distinfo6
-rw-r--r--net/kpimtextedit/pkg-plist3
-rw-r--r--net/krdc/distinfo6
-rw-r--r--net/krdc/pkg-plist4
-rw-r--r--net/krfb/distinfo6
-rw-r--r--net/krfb/pkg-plist6
-rw-r--r--net/krill/Makefile213
-rw-r--r--net/krill/distinfo418
-rw-r--r--net/krill/files/patch-Cargo.toml12
-rw-r--r--net/krill/pkg-plist2
-rw-r--r--net/ksmtp/distinfo6
-rw-r--r--net/ksmtp/pkg-plist2
-rw-r--r--net/ktnef/distinfo6
-rw-r--r--net/ktnef/pkg-plist6
-rw-r--r--net/kube-controller-manager/Makefile1
-rw-r--r--net/kube-scheduler/Makefile1
-rw-r--r--net/libarcus/Makefile7
-rw-r--r--net/libarcus/distinfo6
-rw-r--r--net/libarcus/files/patch-CMakeLists.txt36
-rw-r--r--net/libarcus/files/patch-cmake_FindSIP.cmake32
-rw-r--r--net/libarcus/files/patch-protobuf15
-rw-r--r--net/libcmis/Makefile2
-rw-r--r--net/libdaq/Makefile2
-rw-r--r--net/libdaq/distinfo6
-rw-r--r--net/libdmapsharing/Makefile3
-rw-r--r--net/libdnet/Makefile2
-rw-r--r--net/libdnet/files/patch-python-Makefile.am11
-rw-r--r--net/libfabric/Makefile7
-rw-r--r--net/libfabric/distinfo6
-rw-r--r--net/libgnetwork/Makefile34
-rw-r--r--net/libgnetwork/distinfo2
-rw-r--r--net/libgnetwork/files/patch-Makefile.in11
-rw-r--r--net/libgnetwork/files/patch-data_Makefile.in10
-rw-r--r--net/libgnetwork/files/patch-libgnetwork_gnetwork-tcp-connection.c20
-rw-r--r--net/libgnetwork/pkg-descr11
-rw-r--r--net/libgnetwork/pkg-plist75
-rw-r--r--net/libgravatar/distinfo6
-rw-r--r--net/libgravatar/pkg-plist35
-rw-r--r--net/libgrss/Makefile1
-rw-r--r--net/libgweather/Makefile2
-rw-r--r--net/libgweather4/Makefile33
-rw-r--r--net/libgweather4/distinfo3
-rw-r--r--net/libgweather4/pkg-descr9
-rw-r--r--net/libgweather4/pkg-plist378
-rw-r--r--net/libkgapi/distinfo6
-rw-r--r--net/libkgapi/pkg-plist2
-rw-r--r--net/libksieve/distinfo6
-rw-r--r--net/libksieve/pkg-plist99
-rw-r--r--net/liblinphone/Makefile57
-rw-r--r--net/liblinphone/distinfo6
-rw-r--r--net/liblinphone/files/patch-cmake-FindIntl.cmake11
-rw-r--r--net/liblinphone/files/patch-cmake_Findjsoncpp.cmake58
-rw-r--r--net/liblinphone/files/patch-coreapi__presence.c6
-rw-r--r--net/liblinphone/files/patch-coreapi_linphonecore.c52
-rw-r--r--net/liblinphone/files/patch-src_core_paths_paths-linux.cpp19
-rw-r--r--net/liblinphone/files/patch-src_core_paths_paths.cpp11
-rw-r--r--net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp15
-rw-r--r--net/liblinphone/files/patch-src_utils_utils.cpp54
-rw-r--r--net/liblinphone/files/patch-wrappers-cpp-genwrapper.py11
-rw-r--r--net/liblinphone/pkg-plist95
-rw-r--r--net/libmateweather/Makefile1
-rw-r--r--net/libmdf/Makefile5
-rw-r--r--net/libmdf/distinfo6
-rw-r--r--net/libmdf/pkg-descr4
-rw-r--r--net/libmdf/pkg-plist2
-rw-r--r--net/libnatpmp/Makefile6
-rw-r--r--net/libnatpmp/distinfo4
-rw-r--r--net/libnfs/MANIFEST9
-rw-r--r--net/libnfs/Makefile15
-rw-r--r--net/libnfs/distinfo6
-rw-r--r--net/libnfs/files/patch-include_nfsc_libnfs-zdr.h10
-rw-r--r--net/libnfs/files/patch-include_nfsc_libnfs.h11
-rw-r--r--net/libnfs/pkg-plist1
-rw-r--r--net/libngtcp2/Makefile11
-rw-r--r--net/libngtcp2/distinfo6
-rw-r--r--net/libngtcp2/files/patch-Makefile.in13
-rw-r--r--net/libngtcp2/files/patch-configure.ac11
-rw-r--r--net/libngtcp2/pkg-plist4
-rw-r--r--net/libnpupnp/Makefile8
-rw-r--r--net/libnpupnp/distinfo6
-rw-r--r--net/libnpupnp/pkg-plist2
-rw-r--r--net/libnss-cache/Makefile10
-rw-r--r--net/libnss-cache/distinfo6
-rw-r--r--net/librespeed-cli/Makefile1
-rw-r--r--net/librespeed-go/Makefile1
-rw-r--r--net/librsync/pkg-plist4
-rw-r--r--net/libslirp/Makefile4
-rw-r--r--net/libslirp/distinfo6
-rw-r--r--net/libslirp/pkg-plist2
-rw-r--r--net/libwebsockets/Makefile1
-rw-r--r--net/libyang/pkg-plist4
-rw-r--r--net/libzmq2/Makefile2
-rw-r--r--net/libzmq3/Makefile2
-rw-r--r--net/libzmq4/Makefile2
-rw-r--r--net/liferea/Makefile1
-rw-r--r--net/liveMedia/Makefile2
-rw-r--r--net/liveMedia/distinfo6
-rw-r--r--net/liveMedia/pkg-plist1
-rw-r--r--net/luasocket/Makefile41
-rw-r--r--net/luasocket/distinfo6
-rw-r--r--net/luasocket/files/patch-Makefile30
-rw-r--r--net/luasocket/files/patch-fnames283
-rw-r--r--net/luasocket/pkg-descr11
-rw-r--r--net/madonctl/Makefile4
-rw-r--r--net/madonctl/distinfo6
-rw-r--r--net/mailcommon/distinfo6
-rw-r--r--net/mailcommon/pkg-plist219
-rw-r--r--net/mailimporter/distinfo6
-rw-r--r--net/mailimporter/pkg-plist128
-rw-r--r--net/mcjoin/Makefile2
-rw-r--r--net/mcjoin/distinfo6
-rw-r--r--net/mediastreamer/Makefile97
-rw-r--r--net/mediastreamer/distinfo6
-rw-r--r--net/mediastreamer/files/patch-00-9790349139
-rw-r--r--net/mediastreamer/files/patch-CMakeLists.txt11
-rw-r--r--net/mediastreamer/files/patch-src-CMakeLists.txt22
-rw-r--r--net/mediastreamer/files/patch-src-base-msfactory.c20
-rw-r--r--net/mediastreamer/files/patch-src__audiofilters__oss.c244
-rw-r--r--net/mediastreamer/files/patch-src__utils__dsptools.c4
-rw-r--r--net/mediastreamer/files/patch-src_videofilters_mkv.cpp11
-rw-r--r--net/mediastreamer/pkg-plist28
-rw-r--r--net/megacmd/Makefile8
-rw-r--r--net/megacmd/distinfo10
-rw-r--r--net/megacmd/files/patch-configure.ac19
-rw-r--r--net/megacmd/pkg-plist10
-rw-r--r--net/messagelib/distinfo6
-rw-r--r--net/messagelib/pkg-plist1018
-rw-r--r--net/microsocks/Makefile4
-rw-r--r--net/microsocks/distinfo6
-rw-r--r--net/microsocks/files/microsocks.in64
-rw-r--r--net/minidlna/Makefile2
-rw-r--r--net/minidlna/pkg-descr2
-rw-r--r--net/miniupnpc/Makefile6
-rw-r--r--net/miniupnpc/distinfo6
-rw-r--r--net/miniupnpc/files/patch-Makefile44
-rw-r--r--net/miniupnpc/files/patch-setup.py10
-rw-r--r--net/mobile-broadband-provider-info/Makefile2
-rw-r--r--net/mobile-broadband-provider-info/distinfo6
-rw-r--r--net/mosh/Makefile2
-rw-r--r--net/mosquitto/pkg-plist22
-rw-r--r--net/motsognir/Makefile5
-rw-r--r--net/motsognir/distinfo6
-rw-r--r--net/mpd5/Makefile13
-rw-r--r--net/mpd5/files/patch-fixparent15
-rw-r--r--net/mpd5/files/patch-nat.c13
-rw-r--r--net/mpich2/Makefile189
-rw-r--r--net/mpich2/distinfo2
-rw-r--r--net/mpich2/files/patch-Makefile.in11
-rw-r--r--net/mpich2/files/patch-configure47
-rw-r--r--net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in47
-rw-r--r--net/mpich2/files/patch-src_mpi_romio_configure18
-rw-r--r--net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in19
-rw-r--r--net/mpich2/files/patch-src_openpa_Makefile.in11
-rw-r--r--net/mpich2/files/patch-src_openpa_configure11
-rw-r--r--net/mpich2/files/patch-test_mpi_configure30
-rw-r--r--net/mpich2/files/pkg-message.in7
-rw-r--r--net/mpich2/pkg-descr8
-rw-r--r--net/mpich2/pkg-plist863
-rw-r--r--net/mpifx/Makefile4
-rw-r--r--net/mpifx/distinfo6
-rw-r--r--net/mpifx/pkg-plist1
-rw-r--r--net/mtr/Makefile3
-rw-r--r--net/mtr/distinfo6
-rw-r--r--net/mvfst/Makefile16
-rw-r--r--net/mvfst/distinfo6
-rw-r--r--net/mvfst/pkg-plist11
-rw-r--r--net/nats-nkeys/Makefile28
-rw-r--r--net/nats-nkeys/distinfo5
-rw-r--r--net/nats-nkeys/pkg-descr17
-rw-r--r--net/nats-nsc/Makefile76
-rw-r--r--net/nats-nsc/distinfo97
-rw-r--r--net/nats-nsc/pkg-descr5
-rw-r--r--net/nats-server/Makefile21
-rw-r--r--net/nats-server/distinfo26
-rw-r--r--net/nats-server/files/nats.sh.in23
-rw-r--r--net/nats-streaming-server/Makefile31
-rw-r--r--net/nats-streaming-server/distinfo56
-rw-r--r--net/nats-top/Makefile22
-rw-r--r--net/nats-top/distinfo42
-rw-r--r--net/natscli/Makefile71
-rw-r--r--net/natscli/distinfo89
-rw-r--r--net/natscli/pkg-descr16
-rw-r--r--net/nbd-server/Makefile5
-rw-r--r--net/nbd-server/distinfo6
-rw-r--r--net/nbdkit/Makefile4
-rw-r--r--net/nc/Makefile2
-rw-r--r--net/ndpi/Makefile11
-rw-r--r--net/ndpi/distinfo6
-rw-r--r--net/ndpi/files/patch-autogen.sh62
-rw-r--r--net/ndpi/files/patch-example_Makefile.in39
-rw-r--r--net/ndpi/files/patch-tests_dga_Makefile.in26
-rw-r--r--net/ndpi/files/patch-tests_unit_Makefile.in26
-rw-r--r--net/nemesis/Makefile26
-rw-r--r--net/nemesis/distinfo3
-rw-r--r--net/nemesis/files/patch-src_nemesis-proto__igmp.c13
-rw-r--r--net/nemesis/pkg-descr6
-rw-r--r--net/nemesis/pkg-plist13
-rw-r--r--net/netatalk3/Makefile4
-rw-r--r--net/netatalk3/distinfo6
-rw-r--r--net/netatalk3/files/patch-config_Makefile.in18
-rw-r--r--net/netatalk3/files/patch-etc_afpd_Makefile.in10
-rw-r--r--net/netatalk3/files/patch-etc_afpd_directory.h11
-rw-r--r--net/netatalk3/files/patch-etc_netatalk_Makefile.in11
-rw-r--r--net/netatalk3/files/patch-etc_uams_openssl__compat.h6
-rw-r--r--net/netatalk3/files/patch-libatalk_adouble_ad__open.c84
-rw-r--r--net/netatalk3/files/patch-libatalk_vfs_extattr.c4
-rw-r--r--net/nethogs/pkg-descr4
-rw-r--r--net/nfstrace/Makefile23
-rw-r--r--net/nfstrace/distinfo3
-rw-r--r--net/nfstrace/pkg-descr9
-rw-r--r--net/nfstrace/pkg-plist20
-rw-r--r--net/nmsg/Makefile2
-rw-r--r--net/nncp/Makefile3
-rw-r--r--net/nncp/distinfo6
-rw-r--r--net/nncp/pkg-plist1
-rw-r--r--net/ns3/Makefile1
-rw-r--r--net/nsq/Makefile1
-rw-r--r--net/nss-pam-ldapd/Makefile3
-rw-r--r--net/nss-pam-ldapd/distinfo6
-rw-r--r--net/nsscache/Makefile2
-rw-r--r--net/nsscache/distinfo6
-rw-r--r--net/ntopng/Makefile7
-rw-r--r--net/ntopng/distinfo6
-rw-r--r--net/ntopng/files/patch-Makefile.in19
-rw-r--r--net/ntopng/files/patch-configure.ac.in22
-rw-r--r--net/ntopng/files/patch-configure.seed76
-rw-r--r--net/ntopng/pkg-plist218
-rw-r--r--net/ntp/Makefile2
-rw-r--r--net/ntp/files/patch-ntpd_ntpd.c52
-rw-r--r--net/ntpsec/Makefile4
-rw-r--r--net/ntpsec/distinfo6
-rw-r--r--net/ntpsec/files/patch-ntpclients_ntpviz.py10
-rw-r--r--net/ntpsec/files/patch-wscript14
-rw-r--r--net/oha/Makefile193
-rw-r--r--net/oha/distinfo384
-rw-r--r--net/onedrive/Makefile10
-rw-r--r--net/onedrive/distinfo6
-rw-r--r--net/onedrive/files/patch-Makefile.in12
-rw-r--r--net/ooni-mini/Makefile1
-rw-r--r--net/ooni-probe-cli/Makefile136
-rw-r--r--net/ooni-probe-cli/distinfo224
-rw-r--r--net/openldap24-server/Makefile7
-rw-r--r--net/openldap25-server/Makefile6
-rw-r--r--net/openldap25-server/distinfo6
-rw-r--r--net/openldap26-server/Makefile4
-rw-r--r--net/openldap26-server/distinfo6
-rw-r--r--net/openldap26-server/files/patch-include__ldap_defaults.h8
-rw-r--r--net/openldap26-server/files/patch-libraries_libldap_tls__o.c6
-rw-r--r--net/openmpi/Makefile2
-rw-r--r--net/openmpi/distinfo6
-rw-r--r--net/openmpi/files/patch-ompi_mca_sharedfp_sm_sharedfp__sm.h10
-rw-r--r--net/openmpi/pkg-plist6
-rw-r--r--net/openntpd/Makefile2
-rw-r--r--net/opensips31/Makefile2
-rw-r--r--net/openvswitch/Makefile4
-rw-r--r--net/openvswitch/distinfo6
-rw-r--r--net/openvswitch/pkg-plist12
-rw-r--r--net/ortp/Makefile16
-rw-r--r--net/ortp/distinfo6
-rw-r--r--net/ortp/pkg-plist12
-rw-r--r--net/p5-Daemon-Generic/Makefile2
-rw-r--r--net/p5-Geo-IPfree/Makefile5
-rw-r--r--net/p5-Geo-IPfree/distinfo6
-rw-r--r--net/p5-Geo-IPfree/pkg-plist1
-rw-r--r--net/p5-IP-Country/Makefile2
-rw-r--r--net/p5-MaxMind-DB-Reader-XS/Makefile3
-rw-r--r--net/p5-MaxMind-DB-Reader-XS/distinfo6
-rw-r--r--net/p5-Net-AMQP-RabbitMQ/Makefile2
-rw-r--r--net/p5-Net-AMQP-RabbitMQ/distinfo6
-rw-r--r--net/p5-Net-APNs-Extended/Makefile5
-rw-r--r--net/p5-Net-APNs-Extended/distinfo5
-rw-r--r--net/p5-Net-APNs-Extended/pkg-plist1
-rw-r--r--net/p5-Net-ARP/Makefile4
-rw-r--r--net/p5-Net-ARP/distinfo6
-rw-r--r--net/p5-Net-ARP/files/patch-ppport.h10
-rw-r--r--net/p5-Net-ARP/files/patch-send_packet_bsd.c28
-rw-r--r--net/p5-Net-Amazon-Signature-V3/Makefile2
-rw-r--r--net/p5-Net-Amazon-Signature-V3/distinfo5
-rw-r--r--net/p5-Net-Amazon-Signature-V4/Makefile3
-rw-r--r--net/p5-Net-Amazon-Signature-V4/distinfo6
-rw-r--r--net/p5-Net-GitHub/Makefile2
-rw-r--r--net/p5-Net-GitHub/distinfo6
-rw-r--r--net/p5-Net-Gnats/files/patch-perl53652
-rw-r--r--net/p5-Net-Google-Analytics/Makefile15
-rw-r--r--net/p5-Net-Google-Analytics/distinfo5
-rw-r--r--net/p5-Net-HTTP/Makefile2
-rw-r--r--net/p5-Net-HTTP/distinfo6
-rw-r--r--net/p5-Net-OpenSSH/Makefile2
-rw-r--r--net/p5-Net-OpenSSH/distinfo6
-rw-r--r--net/p5-Net-SIP/Makefile2
-rw-r--r--net/p5-Net-SIP/distinfo6
-rw-r--r--net/p5-Net-SSH2/Makefile4
-rw-r--r--net/p5-Net-STOMP-Client/Makefile4
-rw-r--r--net/p5-Net-STOMP-Client/distinfo6
-rw-r--r--net/p5-Net-Telnet/Makefile4
-rw-r--r--net/p5-Net-Telnet/distinfo5
-rw-r--r--net/p5-Net-Whois-RIPE/Makefile2
-rw-r--r--net/p5-Net-Whois-Raw/Makefile2
-rw-r--r--net/p5-Net-Whois-Raw/distinfo6
-rw-r--r--net/p5-Net/Makefile2
-rw-r--r--net/p5-Net/distinfo6
-rw-r--r--net/p5-POSIX-getpeername/Makefile7
-rw-r--r--net/p5-POSIX-getpeername/pkg-plist2
-rw-r--r--net/p5-Server-Starter/Makefile6
-rw-r--r--net/p5-Server-Starter/distinfo6
-rw-r--r--net/p5-Server-Starter/pkg-plist2
-rw-r--r--net/p5-Socket/Makefile2
-rw-r--r--net/p5-Socket/distinfo6
-rw-r--r--net/p5-URI-Fast/Makefile2
-rw-r--r--net/p5-URI-Template/Makefile2
-rw-r--r--net/p5-VM-EC2/Makefile2
-rw-r--r--net/pacemaker1/Makefile2
-rw-r--r--net/pacemaker1/Makefile.common4
-rw-r--r--net/pacemaker2/Makefile1
-rw-r--r--net/packetdrill/Makefile4
-rw-r--r--net/packetdrill/distinfo6
-rw-r--r--net/pear-Auth_RADIUS/Makefile3
-rw-r--r--net/pecl-amqp/Makefile6
-rw-r--r--net/pecl-mosquitto/Makefile5
-rw-r--r--net/pecl-rdkafka/Makefile3
-rw-r--r--net/pecl-rdkafka/distinfo6
-rw-r--r--net/pecl-xmlrpc/Makefile7
-rw-r--r--net/pecl-xmlrpc/distinfo6
-rw-r--r--net/pecl-zmq/Makefile5
-rw-r--r--net/pfinger/Makefile21
-rw-r--r--net/pfinger/distinfo2
-rw-r--r--net/pfinger/files/patch-src__configfile.c11
-rw-r--r--net/pfinger/files/patch-src__utmplib.c10
-rw-r--r--net/pfinger/pkg-descr14
-rw-r--r--net/pfinger/pkg-plist7
-rw-r--r--net/php73-xmlrpc/Makefile9
-rw-r--r--net/php73-xmlrpc/files/patch-config.m423
-rw-r--r--net/php82-ldap/Makefile (renamed from net/php73-ldap/Makefile)4
-rw-r--r--net/php82-soap/Makefile (renamed from net/php73-soap/Makefile)4
-rw-r--r--net/php82-sockets/Makefile (renamed from net/php73-sockets/Makefile)4
-rw-r--r--net/php82-sockets/files/patch-conversions.c14
-rw-r--r--net/phpldapadmin/Makefile12
-rw-r--r--net/phpldapadmin/files/patch-htdocs_collapse.php11
-rw-r--r--net/phpldapadmin/files/patch-htdocs_draw__tree__node.php11
-rw-r--r--net/phpldapadmin/files/patch-htdocs_expand.php11
-rw-r--r--net/phpldapadmin/files/patch-htdocs_refresh.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_Attribute.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_AttributeFactory.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_BinaryAttribute.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_DateAttribute.php10
-rw-r--r--net/phpldapadmin/files/patch-lib_DnAttribute.php10
-rw-r--r--net/phpldapadmin/files/patch-lib_GidAttribute.php10
-rw-r--r--net/phpldapadmin/files/patch-lib_MultiLineAttribute.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_ObjectClassAttribute.php10
-rw-r--r--net/phpldapadmin/files/patch-lib_PageRender.php31
-rw-r--r--net/phpldapadmin/files/patch-lib_PasswordAttribute.php10
-rw-r--r--net/phpldapadmin/files/patch-lib_SelectionAttribute.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_ShadowAttribute.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_Tree.php11
-rw-r--r--net/phpldapadmin/files/patch-lib_Visitor.php43
-rw-r--r--net/phpldapadmin/files/patch-lib_common.php13
-rw-r--r--net/phpldapadmin/files/patch-lib_ds__ldap.php38
-rw-r--r--net/phpldapadmin/files/patch-lib_ds__ldap__pla.php29
-rw-r--r--net/phpldapadmin/files/patch-lib_functions.php31
-rw-r--r--net/phpldapadmin/files/patch-lib_xmlTemplates.php11
-rw-r--r--net/phpldapadmin/files/patch-tools_po_Makefile (renamed from net/phpldapadmin/files/patch-tools__po__Makefile)2
-rw-r--r--net/pichi/Makefile1
-rw-r--r--net/pimcommon/distinfo6
-rw-r--r--net/pimcommon/pkg-plist256
-rw-r--r--net/pjsip/Makefile5
-rw-r--r--net/pjsip/distinfo6
-rw-r--r--net/pjsip/files/patch-Makefile11
-rw-r--r--net/pjsip/files/patch-aconfigure10
-rw-r--r--net/pkt-gen/Makefile26
-rw-r--r--net/pkt-gen/distinfo6
-rw-r--r--net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c11
-rw-r--r--net/pkt-gen/files/patch-include_ctrs.h36
-rw-r--r--net/pkt-gen/files/patch-pkt-gen_GNUmakefile13
-rw-r--r--net/pkt-gen/files/patch-pkt-gen_pkt-gen.c599
-rw-r--r--net/pktanon/Makefile2
-rw-r--r--net/plugdaemon/Makefile2
-rw-r--r--net/pptpclient/Makefile4
-rw-r--r--net/proby/Makefile2
-rw-r--r--net/proxychains-ng/Makefile20
-rw-r--r--net/proxychains-ng/distinfo8
-rw-r--r--net/proxychains-ng/files/patch-src_daemon_sblist.h11
-rw-r--r--net/proxychains-ng/pkg-descr2
-rw-r--r--net/py-aiohttp-socks/Makefile3
-rw-r--r--net/py-amqplib/files/patch-2to369
-rw-r--r--net/py-cloudscraper/Makefile2
-rw-r--r--net/py-cloudscraper/distinfo6
-rw-r--r--net/py-cymruwhois/pkg-descr4
-rw-r--r--net/py-duet/Makefile4
-rw-r--r--net/py-duet/distinfo6
-rw-r--r--net/py-dugong/Makefile2
-rw-r--r--net/py-errbot/Makefile45
-rw-r--r--net/py-errbot/distinfo6
-rw-r--r--net/py-errbot/files/patch-setup.py78
-rw-r--r--net/py-eventlet/Makefile8
-rw-r--r--net/py-eventlet/distinfo6
-rw-r--r--net/py-gdown/Makefile2
-rw-r--r--net/py-gdown/distinfo6
-rw-r--r--net/py-geopy/Makefile15
-rw-r--r--net/py-gspread/Makefile4
-rw-r--r--net/py-gspread/distinfo6
-rw-r--r--net/py-h11/Makefile2
-rw-r--r--net/py-h11/distinfo6
-rw-r--r--net/py-ifaddr/Makefile2
-rw-r--r--net/py-impacket/files/patch-2to36561
-rw-r--r--net/py-impacket/files/patch-setup.py8
-rw-r--r--net/py-iptools/pkg-descr2
-rw-r--r--net/py-ldap0/Makefile4
-rw-r--r--net/py-ldap0/distinfo6
-rw-r--r--net/py-libcloud/Makefile2
-rw-r--r--net/py-libcloud/distinfo6
-rw-r--r--net/py-libdnet/Makefile6
-rw-r--r--net/py-magic-wormhole/Makefile2
-rw-r--r--net/py-matrix-synapse-ldap3/Makefile8
-rw-r--r--net/py-matrix-synapse-ldap3/distinfo6
-rw-r--r--net/py-matrix-synapse-ldap3/files/setup.py3
-rw-r--r--net/py-msrplib/files/patch-2to369
-rw-r--r--net/py-netaddr/Makefile10
-rw-r--r--net/py-netif/Makefile13
-rw-r--r--net/py-netif/distinfo6
-rw-r--r--net/py-oauth2/Makefile13
-rw-r--r--net/py-paho-mqtt/Makefile4
-rw-r--r--net/py-paho-mqtt/distinfo6
-rw-r--r--net/py-pcapy-ng/Makefile32
-rw-r--r--net/py-pcapy-ng/distinfo3
-rw-r--r--net/py-pcapy-ng/pkg-descr9
-rw-r--r--net/py-pcapy/files/patch-setup.py20
-rw-r--r--net/py-port-for/Makefile2
-rw-r--r--net/py-pynsq/Makefile10
-rw-r--r--net/py-pynsq/distinfo6
-rw-r--r--net/py-pyroute2.core/Makefile2
-rw-r--r--net/py-pyroute2.core/distinfo6
-rw-r--r--net/py-pyroute2.ethtool/Makefile2
-rw-r--r--net/py-pyroute2.ethtool/distinfo6
-rw-r--r--net/py-pyroute2.ipset/Makefile2
-rw-r--r--net/py-pyroute2.ipset/distinfo6
-rw-r--r--net/py-pyroute2.minimal/Makefile2
-rw-r--r--net/py-pyroute2.minimal/distinfo6
-rw-r--r--net/py-pyroute2.ndb/Makefile2
-rw-r--r--net/py-pyroute2.ndb/distinfo6
-rw-r--r--net/py-pyroute2.nftables/Makefile2
-rw-r--r--net/py-pyroute2.nftables/distinfo6
-rw-r--r--net/py-pyroute2.nslink/Makefile2
-rw-r--r--net/py-pyroute2.nslink/distinfo6
-rw-r--r--net/py-pyroute2.protocols/Makefile2
-rw-r--r--net/py-pyroute2.protocols/distinfo6
-rw-r--r--net/py-pyroute2/Makefile2
-rw-r--r--net/py-pyroute2/distinfo6
-rw-r--r--net/py-pyroute2/files/patch-setup.cfg12
-rw-r--r--net/py-pysendfile/Makefile2
-rw-r--r--net/py-pyshark/Makefile3
-rw-r--r--net/py-pyshark/distinfo6
-rw-r--r--net/py-pyshark/files/patch-pyshark-config.ini2
-rw-r--r--net/py-python-barbicanclient/Makefile2
-rw-r--r--net/py-python-barbicanclient/distinfo6
-rw-r--r--net/py-python-cinderclient/Makefile18
-rw-r--r--net/py-python-cinderclient/distinfo6
-rw-r--r--net/py-python-designateclient/Makefile4
-rw-r--r--net/py-python-designateclient/distinfo6
-rw-r--r--net/py-python-glanceclient/Makefile7
-rw-r--r--net/py-python-glanceclient/distinfo6
-rw-r--r--net/py-python-glanceclient/files/patch-requirements.txt11
-rw-r--r--net/py-python-heatclient/Makefile2
-rw-r--r--net/py-python-heatclient/distinfo6
-rw-r--r--net/py-python-keystoneclient/Makefile11
-rw-r--r--net/py-python-keystoneclient/distinfo6
-rw-r--r--net/py-python-neutronclient/Makefile8
-rw-r--r--net/py-python-neutronclient/distinfo6
-rw-r--r--net/py-python-novaclient/Makefile9
-rw-r--r--net/py-python-novaclient/distinfo6
-rw-r--r--net/py-python-openstackclient/Makefile16
-rw-r--r--net/py-python-openstackclient/distinfo6
-rw-r--r--net/py-python-socks/Makefile2
-rw-r--r--net/py-pytradfri/Makefile2
-rw-r--r--net/py-pytradfri/distinfo6
-rw-r--r--net/py-pyzmq/Makefile3
-rw-r--r--net/py-qt5-network/Makefile29
-rw-r--r--net/py-qt5-network/pkg-descr4
-rw-r--r--net/py-qt5-network/pkg-plist45
-rw-r--r--net/py-qt5-networkauth/Makefile46
-rw-r--r--net/py-qt5-networkauth/distinfo6
-rw-r--r--net/py-qt5-networkauth/pkg-plist9
-rw-r--r--net/py-s4cmd/Makefile23
-rw-r--r--net/py-s4cmd/distinfo3
-rw-r--r--net/py-s4cmd/pkg-descr15
-rw-r--r--net/py-shodan/Makefile2
-rw-r--r--net/py-shodan/distinfo6
-rw-r--r--net/py-siosocks/Makefile8
-rw-r--r--net/py-smart-open/Makefile4
-rw-r--r--net/py-smart-open/distinfo6
-rw-r--r--net/py-smbprotocol/Makefile2
-rw-r--r--net/py-smbprotocol/distinfo6
-rw-r--r--net/py-socksio/Makefile20
-rw-r--r--net/py-socksio/distinfo3
-rw-r--r--net/py-socksio/pkg-descr9
-rw-r--r--net/py-softlayer/Makefile6
-rw-r--r--net/py-softlayer/distinfo6
-rw-r--r--net/py-softlayer/files/patch-setup.py11
-rw-r--r--net/py-sshuttle/Makefile9
-rw-r--r--net/py-sshuttle/distinfo6
-rw-r--r--net/py-stomp.py/files/patch-2to313
-rw-r--r--net/py-suds-community/distinfo3
-rw-r--r--net/py-suds-jurko/Makefile43
-rw-r--r--net/py-suds-jurko/distinfo3
-rw-r--r--net/py-suds-jurko/files/patch-2to31952
-rw-r--r--net/py-suds-jurko/files/patch-setup.cfg14
-rw-r--r--net/py-suds-jurko/files/patch-setup.py20
-rw-r--r--net/py-suds-jurko/files/patch-tests_indirect__parametrize.py23
-rw-r--r--net/py-suds-jurko/pkg-descr6
-rw-r--r--net/py-suds/Makefile (renamed from net/py-suds-community/Makefile)8
-rw-r--r--net/py-suds/distinfo3
-rw-r--r--net/py-suds/pkg-descr (renamed from net/py-suds-community/pkg-descr)0
-rw-r--r--net/py-tofu/files/patch-2to3300
-rw-r--r--net/py-transip/Makefile3
-rw-r--r--net/py-transip/files/patch-setup.py11
-rw-r--r--net/py-trio/Makefile2
-rw-r--r--net/py-trio/distinfo6
-rw-r--r--net/py-tweepy/Makefile31
-rw-r--r--net/py-tweepy/distinfo6
-rw-r--r--net/py-twitter-tools/Makefile7
-rw-r--r--net/py-twitter-tools/distinfo6
-rw-r--r--net/py-twitter-tools/files/patch-setup.py34
-rw-r--r--net/py-url-normalize/Makefile22
-rw-r--r--net/py-url-normalize/distinfo3
-rw-r--r--net/py-url-normalize/pkg-descr15
-rw-r--r--net/py-urlextract/Makefile2
-rw-r--r--net/py-urlextract/distinfo6
-rw-r--r--net/py-urllib3/Makefile30
-rw-r--r--net/py-urllib3/distinfo6
-rw-r--r--net/py-wsproto/Makefile12
-rw-r--r--net/py-wsproto/distinfo6
-rw-r--r--net/qt5-network/files/patch-src_network_ssl_qsslcertificate__openssl.cpp6
-rw-r--r--net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp10
-rw-r--r--net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl__p.h2
-rw-r--r--net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp2
-rw-r--r--net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp34
-rw-r--r--net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h8
-rw-r--r--net/queso/Makefile35
-rw-r--r--net/queso/distinfo2
-rw-r--r--net/queso/files/patch-configure19
-rw-r--r--net/queso/files/patch-tcpip.c81
-rw-r--r--net/queso/pkg-descr21
-rw-r--r--net/queso/pkg-plist3
-rw-r--r--net/quiche/Makefile113
-rw-r--r--net/quiche/distinfo186
-rw-r--r--net/quiche/files/patch-deps_boringssl_src_crypto_cpu-aarch64-linux.c4
-rw-r--r--net/rabbiteer/Makefile2
-rw-r--r--net/rabbitmq/Makefile2
-rw-r--r--net/rabbitmq/distinfo6
-rw-r--r--net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs11
-rw-r--r--net/rabbitmq/pkg-plist319
-rw-r--r--net/rclone/Makefile79
-rw-r--r--net/rclone/distinfo150
-rw-r--r--net/realtek-re-kmod/files/patch-if__re.c129
-rw-r--r--net/realtek-re-kmod/files/patch-optional-dash4
-rw-r--r--net/relayd/Makefile12
-rw-r--r--net/relayd/files/patch-relayd_Makefile12
-rw-r--r--net/relayd/files/patch-relayd_relay.c18
-rw-r--r--net/relayd/files/patch-relayd_relayd.h11
-rw-r--r--net/remmina/Makefile48
-rw-r--r--net/remmina/distinfo6
-rw-r--r--net/remmina/pkg-plist104
-rw-r--r--net/rospo/Makefile33
-rw-r--r--net/rospo/distinfo32
-rw-r--r--net/routinator/Makefile258
-rw-r--r--net/routinator/distinfo462
-rw-r--r--net/rpki-client/Makefile6
-rw-r--r--net/rpki-client/distinfo10
-rw-r--r--net/rsocket-cpp/Makefile1
-rw-r--r--net/rssguard/Makefile12
-rw-r--r--net/rssguard/distinfo6
-rw-r--r--net/rssguard/pkg-plist4
-rw-r--r--net/rsync/Makefile75
-rw-r--r--net/rsync/distinfo10
-rw-r--r--net/rsync/files/patch-io.c27
-rw-r--r--net/rsync/pkg-message8
-rw-r--r--net/rsync/pkg-plist1
-rw-r--r--net/rubygem-activestorage52/Makefile2
-rw-r--r--net/rubygem-activestorage52/distinfo6
-rw-r--r--net/rubygem-activestorage60/Makefile4
-rw-r--r--net/rubygem-activestorage60/distinfo6
-rw-r--r--net/rubygem-activestorage61/Makefile4
-rw-r--r--net/rubygem-activestorage61/distinfo6
-rw-r--r--net/rubygem-activestorage70/Makefile2
-rw-r--r--net/rubygem-activestorage70/distinfo6
-rw-r--r--net/rubygem-amqp-utils/files/patch-gemspec34
-rw-r--r--net/rubygem-asset_sync/Makefile2
-rw-r--r--net/rubygem-asset_sync/distinfo6
-rw-r--r--net/rubygem-fog-aws/Makefile5
-rw-r--r--net/rubygem-fog-aws/distinfo6
-rw-r--r--net/rubygem-fog-brightbox/Makefile2
-rw-r--r--net/rubygem-fog-brightbox/distinfo6
-rw-r--r--net/rubygem-fog-google/Makefile5
-rw-r--r--net/rubygem-fog-google/distinfo6
-rw-r--r--net/rubygem-fog-local/Makefile3
-rw-r--r--net/rubygem-fog-local/distinfo6
-rw-r--r--net/rubygem-fog-ovirt/Makefile2
-rw-r--r--net/rubygem-fog-ovirt/distinfo6
-rw-r--r--net/rubygem-fog-vsphere/Makefile2
-rw-r--r--net/rubygem-fog-vsphere/distinfo6
-rw-r--r--net/rubygem-fog-vsphere/files/patch-gemspec18
-rw-r--r--net/rubygem-gitaly/Makefile5
-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-gitlab-omniauth-openid-connect/Makefile2
-rw-r--r--net/rubygem-gitlab-omniauth-openid-connect/distinfo6
-rw-r--r--net/rubygem-google-cloud-bigquery/Makefile3
-rw-r--r--net/rubygem-google-cloud-bigquery/files/patch-gemspec11
-rw-r--r--net/rubygem-google-cloud-bigtable-admin-v2/Makefile4
-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-env/Makefile4
-rw-r--r--net/rubygem-google-cloud-env/distinfo6
-rw-r--r--net/rubygem-google-cloud-env/pkg-descr2
-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-pubsub-v1/Makefile4
-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/Makefile4
-rw-r--r--net/rubygem-google-cloud-spanner-admin-database-v1/distinfo6
-rw-r--r--net/rubygem-google-cloud-spanner-admin-instance-v1/Makefile4
-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-google-cloud-storage/Makefile2
-rw-r--r--net/rubygem-google-cloud-storage/distinfo6
-rw-r--r--net/rubygem-grpc/Makefile4
-rw-r--r--net/rubygem-grpc/distinfo6
-rw-r--r--net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb26
-rw-r--r--net/rubygem-grpc142/Makefile3
-rw-r--r--net/rubygem-ipaddr/Makefile2
-rw-r--r--net/rubygem-ipaddr/distinfo6
-rw-r--r--net/rubygem-kas-grpc/files/patch-kas-grpc.gemspec21
-rw-r--r--net/rubygem-net-ldap/Makefile2
-rw-r--r--net/rubygem-net-ldap/distinfo6
-rw-r--r--net/rubygem-net-protocol/Makefile5
-rw-r--r--net/rubygem-net-protocol/distinfo6
-rw-r--r--net/rubygem-no_proxy_fix/Makefile19
-rw-r--r--net/rubygem-no_proxy_fix/distinfo3
-rw-r--r--net/rubygem-no_proxy_fix/pkg-descr4
-rw-r--r--net/rubygem-oauth/Makefile2
-rw-r--r--net/rubygem-oauth/distinfo6
-rw-r--r--net/rubygem-oauth2/Makefile9
-rw-r--r--net/rubygem-oauth2/distinfo6
-rw-r--r--net/rubygem-oauth21/Makefile28
-rw-r--r--net/rubygem-oauth21/distinfo3
-rw-r--r--net/rubygem-oauth21/pkg-descr6
-rw-r--r--net/rubygem-octokit/Makefile6
-rw-r--r--net/rubygem-octokit/distinfo6
-rw-r--r--net/rubygem-omniauth-oauth2/Makefile4
-rw-r--r--net/rubygem-omniauth-oauth2/distinfo6
-rw-r--r--net/rubygem-opennebula/Makefile2
-rw-r--r--net/rubygem-opennebula/distinfo6
-rw-r--r--net/rubygem-orchestrator_client/Makefile2
-rw-r--r--net/rubygem-orchestrator_client/distinfo6
-rw-r--r--net/rubygem-ovirt-engine-sdk/Makefile1
-rw-r--r--net/rubygem-pcaprub/Makefile2
-rw-r--r--net/rubygem-pcaprub/distinfo6
-rw-r--r--net/rubygem-serverengine/Makefile2
-rw-r--r--net/rubygem-serverengine/distinfo6
-rw-r--r--net/rubygem-spamcheck/files/patch-spamcheck.gemspec21
-rw-r--r--net/rubygem-t/files/patch-gemspec23
-rw-r--r--net/rubygem-train-core/Makefile2
-rw-r--r--net/rubygem-train-core/distinfo6
-rw-r--r--net/rubygem-train/Makefile2
-rw-r--r--net/rubygem-train/distinfo6
-rw-r--r--net/rubygem-train/files/patch-gemspec24
-rw-r--r--net/rubygem-tweetstream/files/patch-gemspec20
-rw-r--r--net/rubygem-twitter-stream/files/patch-gemspec24
-rw-r--r--net/rubygem-twitter/files/patch-gemspec28
-rw-r--r--net/rubygem-whois/Makefile2
-rw-r--r--net/rubygem-whois/distinfo6
-rw-r--r--net/s5cmd/Makefile6
-rw-r--r--net/s5cmd/distinfo6
-rw-r--r--net/sakisafecli/Makefile24
-rw-r--r--net/sakisafecli/distinfo3
-rw-r--r--net/sakisafecli/pkg-descr3
-rw-r--r--net/sakisafecli/pkg-plist3
-rw-r--r--net/samba412/Makefile3
-rw-r--r--net/samba413/Makefile5
-rw-r--r--net/samba413/distinfo6
-rw-r--r--net/sbd/Makefile2
-rw-r--r--net/scapy/Makefile4
-rw-r--r--net/seaweedfs/Makefile1
-rw-r--r--net/sflowtool/Makefile13
-rw-r--r--net/sflowtool/distinfo6
-rw-r--r--net/shadowsocks-libev/Makefile2
-rw-r--r--net/sie-nmsg/Makefile2
-rw-r--r--net/slackcat/Makefile23
-rw-r--r--net/slackcat/distinfo5
-rw-r--r--net/slackcat/pkg-descr3
-rw-r--r--net/sofia-sip/Makefile6
-rw-r--r--net/sofia-sip/distinfo6
-rw-r--r--net/spoofer/Makefile2
-rw-r--r--net/sslh/Makefile28
-rw-r--r--net/sslh/distinfo6
-rw-r--r--net/sslh/pkg-descr23
-rw-r--r--net/ssvnc/Makefile51
-rw-r--r--net/ssvnc/distinfo2
-rw-r--r--net/ssvnc/files/patch-Makefile57
-rw-r--r--net/ssvnc/files/patch-vncstorepw_Makefile45
-rw-r--r--net/ssvnc/files/patch-vncstorepw_ultravnc__dsm__helper.c199
-rw-r--r--net/ssvnc/files/patch-wr__tool8
-rw-r--r--net/ssvnc/pkg-descr15
-rw-r--r--net/ssvnc/pkg-message12
-rw-r--r--net/ssvnc/pkg-plist21
-rw-r--r--net/storj/Makefile7
-rw-r--r--net/storj/Makefile.deps47
-rw-r--r--net/storj/distinfo100
-rw-r--r--net/storj/pkg-plist2
-rw-r--r--net/syncthing/Makefile13
-rw-r--r--net/syncthing/distinfo6
-rw-r--r--net/tacacs/Makefile58
-rw-r--r--net/tacacs/distinfo6
-rw-r--r--net/tacacs/pkg-plist205
-rw-r--r--net/tcpkali/Makefile3
-rw-r--r--net/tcpkali/distinfo6
-rw-r--r--net/tcpsg/Makefile2
-rw-r--r--net/tcpslice/Makefile11
-rw-r--r--net/tcpslice/distinfo6
-rw-r--r--net/tcptestsuite/Makefile8
-rw-r--r--net/tcptestsuite/distinfo6
-rw-r--r--net/tcptestsuite/files/tcptestsuite_atf_test4278
-rw-r--r--net/tcptestsuite/pkg-plist89
-rw-r--r--net/tcpwatch/files/patch-2to3193
-rw-r--r--net/termshark/Makefile1
-rw-r--r--net/thcrut/Makefile2
-rw-r--r--net/tigervnc-server/Makefile2
-rw-r--r--net/tigervnc-server/pkg-plist12
-rw-r--r--net/tigervnc-viewer/pkg-plist2
-rw-r--r--net/tightvnc/Makefile2
-rw-r--r--net/tightvnc/files/patch-Xvnc__programs__Xserver__hw__xfree86__common__compiler.h2
-rw-r--r--net/tintin++/Makefile2
-rw-r--r--net/tintin++/distinfo6
-rw-r--r--net/traefik/Makefile2
-rw-r--r--net/traefik/distinfo6
-rw-r--r--net/tunneller/Makefile1
-rw-r--r--net/uget/Makefile2
-rw-r--r--net/unison/Makefile6
-rw-r--r--net/unison/distinfo6
-rw-r--r--net/unison/files/patch-Makefile.OCaml19
-rw-r--r--net/unison/pkg-plist4
-rw-r--r--net/unison251/Makefile109
-rw-r--r--net/unison251/distinfo3
-rw-r--r--net/unison251/files/patch-Makefile.OCaml46
-rw-r--r--net/unison251/files/patch-fsmonitor_linux_Makefile20
-rw-r--r--net/unison251/files/unison.desktop.in12
-rw-r--r--net/unison251/pkg-descr11
-rw-r--r--net/unison251/pkg-message8
-rw-r--r--net/unison251/pkg-message.nox117
-rw-r--r--net/unison251/pkg-plist7
-rw-r--r--net/unix2tcp/Makefile2
-rw-r--r--net/urlendec/Makefile2
-rw-r--r--net/v2ray/Makefile1
-rw-r--r--net/vde2/Makefile2
-rw-r--r--net/vinagre/Makefile6
-rw-r--r--net/vnstat/Makefile5
-rw-r--r--net/vnstat/distinfo6
-rw-r--r--net/vnstat/pkg-descr1
-rw-r--r--net/wangle/Makefile2
-rw-r--r--net/wangle/distinfo6
-rw-r--r--net/wangle/pkg-plist1
-rw-r--r--net/wifibox-alpine/Makefile274
-rw-r--r--net/wifibox-alpine/distinfo53
-rw-r--r--net/wifibox-alpine/flavors.mk3
-rw-r--r--net/wifibox-alpine/pkg-descr9
-rw-r--r--net/wifibox-alpine/pkg-plist (renamed from net/wifibox/pkg-plist)26
-rw-r--r--net/wifibox-core/Makefile58
-rw-r--r--net/wifibox-core/distinfo3
-rw-r--r--net/wifibox-core/pkg-descr4
-rw-r--r--net/wifibox-core/pkg-plist11
-rw-r--r--net/wifibox/Makefile45
-rw-r--r--net/wifibox/distinfo7
-rw-r--r--net/wifibox/pkg-message10
-rw-r--r--net/wireguard-go/Makefile9
-rw-r--r--net/wireguard-go/distinfo18
-rw-r--r--net/wireguard-kmod/Makefile2
-rw-r--r--net/wireguard-kmod/distinfo6
-rw-r--r--net/wireproxy/Makefile20
-rw-r--r--net/wireproxy/distinfo5
-rw-r--r--net/wireproxy/pkg-descr6
-rw-r--r--net/wireshark/Makefile19
-rw-r--r--net/wireshark/distinfo6
-rw-r--r--net/wireshark/pkg-plist50
-rw-r--r--net/wlvncc/Makefile12
-rw-r--r--net/wlvncc/distinfo6
-rw-r--r--net/wpa_supplicant_gui/Makefile3
-rw-r--r--net/wpa_supplicant_gui/distinfo6
-rw-r--r--net/wping/Makefile2
-rw-r--r--net/xmlrpc-c/Makefile35
-rw-r--r--net/xmlrpc-c/distinfo6
-rw-r--r--net/xmlrpc-c/pkg-plist38
-rw-r--r--net/xprobe/Makefile2
-rw-r--r--net/xrdp-devel/Makefile13
-rw-r--r--net/xrdp-devel/distinfo12
-rw-r--r--net/xrdp-devel/pkg-plist8
-rw-r--r--net/xrdp/Makefile15
-rw-r--r--net/xrdp/distinfo10
-rw-r--r--net/yaz/Makefile11
-rw-r--r--net/yggdrasil/Makefile19
-rw-r--r--net/yggdrasil/distinfo38
-rw-r--r--net/zebra-server/Makefile2
-rw-r--r--net/zeroconf-ioslave/distinfo6
-rw-r--r--net/zeroconf-ioslave/pkg-plist1
-rw-r--r--net/zerotier/Makefile4
-rw-r--r--net/zerotier/distinfo6
1210 files changed, 23312 insertions, 15437 deletions
diff --git a/net/Makefile b/net/Makefile
index 3e31076f3f2e..0be6ab909265 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -7,7 +7,6 @@
SUBDIR += R-cran-twitteR
SUBDIR += Sockets
SUBDIR += activemq
- SUBDIR += adasockets
SUBDIR += addrwatch
SUBDIR += afpfs-ng
SUBDIR += aget
@@ -17,7 +16,6 @@
SUBDIR += akonadi-notes
SUBDIR += akonadi-search
SUBDIR += aluminum
- SUBDIR += anet
SUBDIR += aoe
SUBDIR += apache-commons-net
SUBDIR += apinger
@@ -191,6 +189,7 @@
SUBDIR += gmid
SUBDIR += gnet2
SUBDIR += gnetcat
+ SUBDIR += gnome-connections
SUBDIR += gnome-nettool
SUBDIR += gnome-online-accounts
SUBDIR += gnome-online-miners
@@ -200,11 +199,10 @@
SUBDIR += go-cs
SUBDIR += gobgp
SUBDIR += gofish
- SUBDIR += gogoc
SUBDIR += google-cloud-sdk
- SUBDIR += google-cloud-sdk-app-engine-go
SUBDIR += gopher
SUBDIR += goreplay
+ SUBDIR += gorss
SUBDIR += gotthard
SUBDIR += gq
SUBDIR += graphpath
@@ -220,6 +218,7 @@
SUBDIR += gsocket
SUBDIR += gspoof
SUBDIR += gssdp
+ SUBDIR += gssdp14
SUBDIR += gstreamer1-plugins-libmms
SUBDIR += gstreamer1-plugins-srtp
SUBDIR += gtk-vnc
@@ -230,6 +229,7 @@
SUBDIR += gupnp-igd
SUBDIR += gupnp-tools
SUBDIR += gupnp-ui
+ SUBDIR += gupnp14
SUBDIR += gutenfetch
SUBDIR += gwhois
SUBDIR += h323plus
@@ -238,19 +238,18 @@
SUBDIR += haproxy-devel
SUBDIR += haproxy17
SUBDIR += haproxy18
- SUBDIR += haproxy19
SUBDIR += haproxy20
- SUBDIR += haproxy21
SUBDIR += haproxy22
SUBDIR += haproxy23
SUBDIR += haproxy24
+ SUBDIR += haproxy25
SUBDIR += hblock
SUBDIR += hexinject
SUBDIR += hlmaster
SUBDIR += honeyd
SUBDIR += hostapd
SUBDIR += hostapd-devel
- SUBDIR += hping
+ SUBDIR += hostapd29
SUBDIR += hping3
SUBDIR += hsflowd
SUBDIR += htpdate
@@ -269,7 +268,6 @@
SUBDIR += ilbc
SUBDIR += imapproxy
SUBDIR += incidenceeditor
- SUBDIR += inlets
SUBDIR += intel-em-kmod
SUBDIR += intel-ix-kmod
SUBDIR += intel-ixl-kmod
@@ -289,6 +287,7 @@
SUBDIR += isc-dhcp44-relay
SUBDIR += isc-dhcp44-server
SUBDIR += istgt
+ SUBDIR += iwnet
SUBDIR += java-beepcore
SUBDIR += jcifs
SUBDIR += jgroups
@@ -302,7 +301,6 @@
SUBDIR += jwhois
SUBDIR += k6
SUBDIR += kafka
- SUBDIR += kalarmcal
SUBDIR += kamailio
SUBDIR += kcalutils
SUBDIR += kcat
@@ -366,10 +364,10 @@
SUBDIR += libfabric
SUBDIR += libfb
SUBDIR += libfixbuf
- SUBDIR += libgnetwork
SUBDIR += libgravatar
SUBDIR += libgrss
SUBDIR += libgweather
+ SUBDIR += libgweather4
SUBDIR += libilbc
SUBDIR += libiscsi
SUBDIR += libkgapi
@@ -470,7 +468,6 @@
SUBDIR += mpd-l2tp-ipv6pd-client
SUBDIR += mpd5
SUBDIR += mpich
- SUBDIR += mpich2
SUBDIR += mpifx
SUBDIR += mping
SUBDIR += mptsd
@@ -484,9 +481,12 @@
SUBDIR += nakenchat
SUBDIR += nanomsg
SUBDIR += nast
+ SUBDIR += nats-nkeys
+ SUBDIR += nats-nsc
SUBDIR += nats-server
SUBDIR += nats-streaming-server
SUBDIR += nats-top
+ SUBDIR += natscli
SUBDIR += nbd-server
SUBDIR += nbdkit
SUBDIR += nc
@@ -495,6 +495,7 @@
SUBDIR += ndpi
SUBDIR += ndproxy
SUBDIR += neatvnc
+ SUBDIR += nemesis
SUBDIR += nepenthes
SUBDIR += net6
SUBDIR += netatalk3
@@ -510,6 +511,7 @@
SUBDIR += netwib
SUBDIR += nfs-ganesha-kmod
SUBDIR += nfsshell
+ SUBDIR += nfstrace
SUBDIR += ng_mikrotik_eoip
SUBDIR += ngrep
SUBDIR += nifmon
@@ -976,11 +978,6 @@
SUBDIR += pecl-xmlrpc
SUBDIR += pecl-zmq
SUBDIR += pen
- SUBDIR += pfinger
- SUBDIR += php73-ldap
- SUBDIR += php73-soap
- SUBDIR += php73-sockets
- SUBDIR += php73-xmlrpc
SUBDIR += php74-ldap
SUBDIR += php74-soap
SUBDIR += php74-sockets
@@ -991,6 +988,9 @@
SUBDIR += php81-ldap
SUBDIR += php81-soap
SUBDIR += php81-sockets
+ SUBDIR += php82-ldap
+ SUBDIR += php82-soap
+ SUBDIR += php82-sockets
SUBDIR += phpldapadmin
SUBDIR += pichi
SUBDIR += pimcommon
@@ -1075,6 +1075,7 @@
SUBDIR += py-paho-mqtt
SUBDIR += py-pamqp
SUBDIR += py-pcapy
+ SUBDIR += py-pcapy-ng
SUBDIR += py-port-for
SUBDIR += py-portend
SUBDIR += py-pyenet
@@ -1117,7 +1118,6 @@
SUBDIR += py-pyu2f
SUBDIR += py-pyvmomi
SUBDIR += py-pyzmq
- SUBDIR += py-qt5-network
SUBDIR += py-qt5-networkauth
SUBDIR += py-rabbitpy
SUBDIR += py-radix
@@ -1127,6 +1127,7 @@
SUBDIR += py-ripe.atlas.tools
SUBDIR += py-s3cmd
SUBDIR += py-s3transfer
+ SUBDIR += py-s4cmd
SUBDIR += py-saltyrtc.server
SUBDIR += py-sbws
SUBDIR += py-shodan
@@ -1136,13 +1137,13 @@
SUBDIR += py-smbprotocol
SUBDIR += py-soap2py
SUBDIR += py-socketio-client
+ SUBDIR += py-socksio
SUBDIR += py-softlayer
SUBDIR += py-speedtest-cli
SUBDIR += py-sshtunnel
SUBDIR += py-sshuttle
SUBDIR += py-stomp.py
- SUBDIR += py-suds-community
- SUBDIR += py-suds-jurko
+ SUBDIR += py-suds
SUBDIR += py-tacacs_plus
SUBDIR += py-terminado
SUBDIR += py-tofu
@@ -1154,6 +1155,7 @@
SUBDIR += py-txrestapi
SUBDIR += py-uritemplate
SUBDIR += py-uritools
+ SUBDIR += py-url-normalize
SUBDIR += py-urlextract
SUBDIR += py-urllib3
SUBDIR += py-whois
@@ -1169,7 +1171,6 @@
SUBDIR += qt5-network
SUBDIR += qt5-networkauth
SUBDIR += quagga
- SUBDIR += queso
SUBDIR += quiche
SUBDIR += quiterss
SUBDIR += quoted
@@ -1319,8 +1320,10 @@
SUBDIR += rubygem-netrc
SUBDIR += rubygem-network_interface
SUBDIR += rubygem-nkf
+ SUBDIR += rubygem-no_proxy_fix
SUBDIR += rubygem-oauth
SUBDIR += rubygem-oauth2
+ SUBDIR += rubygem-oauth21
SUBDIR += rubygem-octokit
SUBDIR += rubygem-octopress-deploy
SUBDIR += rubygem-omniauth-auth0
@@ -1391,6 +1394,7 @@
SUBDIR += ryu
SUBDIR += s5cmd
SUBDIR += sacc
+ SUBDIR += sakisafecli
SUBDIR += samba412
SUBDIR += samba413
SUBDIR += samplicator
@@ -1422,6 +1426,7 @@
SUBDIR += sipsak
SUBDIR += skstream
SUBDIR += sl2tps
+ SUBDIR += slackcat
SUBDIR += smb4k
SUBDIR += smcroute
SUBDIR += smm++
@@ -1449,7 +1454,6 @@
SUBDIR += ssldump
SUBDIR += sslh
SUBDIR += ssspl
- SUBDIR += ssvnc
SUBDIR += stone
SUBDIR += storj
SUBDIR += stund
@@ -1533,6 +1537,7 @@
SUBDIR += unison232
SUBDIR += unison240
SUBDIR += unison248
+ SUBDIR += unison251
SUBDIR += unix2tcp
SUBDIR += urelay
SUBDIR += uriparser
@@ -1561,10 +1566,13 @@
SUBDIR += whois
SUBDIR += widentd
SUBDIR += wifibox
+ SUBDIR += wifibox-alpine
+ SUBDIR += wifibox-core
SUBDIR += wireguard
SUBDIR += wireguard-go
SUBDIR += wireguard-kmod
SUBDIR += wireguard-tools
+ SUBDIR += wireproxy
SUBDIR += wireshark
SUBDIR += wireshark-lite
SUBDIR += wlan2eth
diff --git a/net/Sockets/Makefile b/net/Sockets/Makefile
index fa3086fa4a96..b3e6bb8b6aa1 100644
--- a/net/Sockets/Makefile
+++ b/net/Sockets/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Sockets
PORTVERSION= 2.3.9.9
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://www.alhem.net/Sockets/ \
https://www.netfence.it/Sockets/
diff --git a/net/adasockets/Makefile b/net/adasockets/Makefile
deleted file mode 100644
index 30d6bfcaf0f8..000000000000
--- a/net/adasockets/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME= adasockets
-DISTVERSION= 1.12
-CATEGORIES= net
-MASTER_SITES= http://www.rfc1149.net/download/adasockets/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= IPv4 socket library for Ada (TCP, UDP, and multicast)
-
-LICENSE= GPLv2 GMGPL
-LICENSE_COMB= multi
-
-USES= ada gmake libtool
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+=--disable-doc --disable-shared
-
-post-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/include/adasockets \
- ${STAGEDIR}${PREFIX}/lib/gnat
- ${MV} ${STAGEDIR}${PREFIX}/lib/libadasockets.* \
- ${STAGEDIR}${PREFIX}/lib/adasockets/
- ${MV} ${STAGEDIR}${PREFIX}/lib/adasockets/*.ad[bs] \
- ${STAGEDIR}${PREFIX}/include/adasockets/
- ${INSTALL_DATA} ${FILESDIR}/adasockets.gpr \
- ${STAGEDIR}${PREFIX}/lib/gnat/
-
-.include <bsd.port.mk>
diff --git a/net/adasockets/distinfo b/net/adasockets/distinfo
deleted file mode 100644
index c291633e5cb3..000000000000
--- a/net/adasockets/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1615767544
-SHA256 (adasockets-1.12.tar.gz) = cd4ff16f2b7de7a266ac16f670963fb5e9588b1d454dbd58c99208e5abd0f587
-SIZE (adasockets-1.12.tar.gz) = 808673
diff --git a/net/adasockets/files/adasockets.gpr b/net/adasockets/files/adasockets.gpr
deleted file mode 100644
index af4c0bac06ea..000000000000
--- a/net/adasockets/files/adasockets.gpr
+++ /dev/null
@@ -1,11 +0,0 @@
-library project ADASOCKETS is
-
- for Languages use ("Ada");
-
- for Source_Dirs use ("../../include/adasockets");
- for Library_Dir use "../../lib/adasockets";
- for Library_Name use "adasockets";
- for Library_Kind use "static";
- for Externally_Built use "True";
-
-end ADASOCKETS;
diff --git a/net/adasockets/files/patch-src_Makefile.in b/net/adasockets/files/patch-src_Makefile.in
deleted file mode 100644
index d50289ec8d98..000000000000
--- a/net/adasockets/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig 2012-12-08 16:46:24.000000000 +0000
-+++ src/Makefile.in
-@@ -289,7 +289,7 @@ DISTCLEANFILES = b_split.c split constan
- sockets-thin.ads sockets-thin.adb \
- sockets-constants.ads
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)data/pkgconfig
- pkgconfig_DATA = adasockets.pc
- SUFFIXES = .ads .lo .ali
- all: config.h
diff --git a/net/adasockets/files/patch-src_adasockets.pc.in b/net/adasockets/files/patch-src_adasockets.pc.in
deleted file mode 100644
index 7287d007c08d..000000000000
--- a/net/adasockets/files/patch-src_adasockets.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/adasockets.pc.in.orig 2010-03-18 18:49:32.000000000 +0000
-+++ src/adasockets.pc.in
-@@ -7,5 +7,5 @@ Name: @PACKAGE@
- Description: BSD sockets in Ada.
- Requires:
- Version: @VERSION@
--Libs: -L${libdir} -ladasockets
--Cflags: -I${libdir}/adasockets -L${libdir}/adasockets
-+Libs: -L${libdir}/adasockets -ladasockets
-+Cflags: -I${includedir}/adasockets
diff --git a/net/adasockets/pkg-descr b/net/adasockets/pkg-descr
deleted file mode 100644
index 9abc41c096c6..000000000000
--- a/net/adasockets/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-The AdaSockets library allows the use of BSD sockets from within an Ada
-program. It is limited to IP version 4 sockets (TCP, UDP, multicast).
-It is released under the GNAT Modified General Public License, which
-means AdaSockets can be freely used in proprietary applications without
-affecting their licenses.
-
-WWW: http://www.rfc1149.net/devel/adasockets.html
diff --git a/net/adasockets/pkg-plist b/net/adasockets/pkg-plist
deleted file mode 100644
index cbef580890be..000000000000
--- a/net/adasockets/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/adasockets-config
-include/adasockets/sockets-constants.ads
-include/adasockets/sockets-link.ads
-include/adasockets/sockets-multicast.adb
-include/adasockets/sockets-multicast.ads
-include/adasockets/sockets-naming.adb
-include/adasockets/sockets-naming.ads
-include/adasockets/sockets-stream_io.adb
-include/adasockets/sockets-stream_io.ads
-include/adasockets/sockets-thin.ads
-include/adasockets/sockets-types.ads
-include/adasockets/sockets-utils.adb
-include/adasockets/sockets-utils.ads
-include/adasockets/sockets.adb
-include/adasockets/sockets.ads
-lib/adasockets/libadasockets.a
-lib/adasockets/sockets-constants.ali
-lib/adasockets/sockets-link.ali
-lib/adasockets/sockets-multicast.ali
-lib/adasockets/sockets-naming.ali
-lib/adasockets/sockets-stream_io.ali
-lib/adasockets/sockets-thin.ali
-lib/adasockets/sockets-types.ali
-lib/adasockets/sockets-utils.ali
-lib/adasockets/sockets.ali
-lib/gnat/adasockets.gpr
-libdata/pkgconfig/adasockets.pc
-share/gpr/adasockets.gpr
-share/man/man1/adasockets-config.1.gz
diff --git a/net/akonadi-calendar/distinfo b/net/akonadi-calendar/distinfo
index 1cb6f6b1c517..26df110306ee 100644
--- a/net/akonadi-calendar/distinfo
+++ b/net/akonadi-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292375
-SHA256 (KDE/release-service/21.12.1/akonadi-calendar-21.12.1.tar.xz) = e743797c2909c93cc513946e0ba719db07888d26e6f35a134d04da4254abe10c
-SIZE (KDE/release-service/21.12.1/akonadi-calendar-21.12.1.tar.xz) = 352764
+TIMESTAMP = 1654672141
+SHA256 (KDE/release-service/22.04.2/akonadi-calendar-22.04.2.tar.xz) = d9f9ce4913683856837367bf602a707370b86a6062322f10fc5e515d4a7becc7
+SIZE (KDE/release-service/22.04.2/akonadi-calendar-22.04.2.tar.xz) = 366208
diff --git a/net/akonadi-calendar/pkg-plist b/net/akonadi-calendar/pkg-plist
index c2888abe712f..1dca13db237f 100644
--- a/net/akonadi-calendar/pkg-plist
+++ b/net/akonadi-calendar/pkg-plist
@@ -1,36 +1,36 @@
-share/qlogging-categories5/akonadi-calendar.categories
-share/qlogging-categories5/akonadi-calendar.renamecategories
-include/KF5/Akonadi/Calendar/BlockAlarmsAttribute
-include/KF5/Akonadi/Calendar/CalendarBase
-include/KF5/Akonadi/Calendar/CalendarClipboard
-include/KF5/Akonadi/Calendar/ETMCalendar
-include/KF5/Akonadi/Calendar/FetchJobCalendar
-include/KF5/Akonadi/Calendar/FreeBusyManager
-include/KF5/Akonadi/Calendar/FreeBusyProviderBase
-include/KF5/Akonadi/Calendar/History
-include/KF5/Akonadi/Calendar/ICalImporter
-include/KF5/Akonadi/Calendar/ITIPHandler
-include/KF5/Akonadi/Calendar/IncidenceChanger
-include/KF5/Akonadi/Calendar/PublishDialog
-include/KF5/Akonadi/Calendar/StandardCalendarActionManager
-include/KF5/Akonadi/Calendar/TodoPurger
-include/KF5/akonadi-calendar_version.h
-include/KF5/akonadi/calendar/akonadi-calendar_export.h
-include/KF5/akonadi/calendar/blockalarmsattribute.h
-include/KF5/akonadi/calendar/calendarbase.h
-include/KF5/akonadi/calendar/calendarclipboard.h
-include/KF5/akonadi/calendar/calendarsettings.h
-include/KF5/akonadi/calendar/etmcalendar.h
-include/KF5/akonadi/calendar/fetchjobcalendar.h
-include/KF5/akonadi/calendar/freebusymanager.h
-include/KF5/akonadi/calendar/freebusyproviderbase.h
-include/KF5/akonadi/calendar/history.h
-include/KF5/akonadi/calendar/icalimporter.h
-include/KF5/akonadi/calendar/incidencechanger.h
-include/KF5/akonadi/calendar/itiphandler.h
-include/KF5/akonadi/calendar/publishdialog.h
-include/KF5/akonadi/calendar/standardcalendaractionmanager.h
-include/KF5/akonadi/calendar/todopurger.h
+bin/kalendarac
+etc/xdg/autostart/org.kde.kalendarac.desktop
+include/KF5/AkonadiCalendar/Akonadi/BlockAlarmsAttribute
+include/KF5/AkonadiCalendar/Akonadi/CalendarBase
+include/KF5/AkonadiCalendar/Akonadi/CalendarClipboard
+include/KF5/AkonadiCalendar/Akonadi/ETMCalendar
+include/KF5/AkonadiCalendar/Akonadi/FetchJobCalendar
+include/KF5/AkonadiCalendar/Akonadi/FreeBusyManager
+include/KF5/AkonadiCalendar/Akonadi/FreeBusyProviderBase
+include/KF5/AkonadiCalendar/Akonadi/History
+include/KF5/AkonadiCalendar/Akonadi/ICalImporter
+include/KF5/AkonadiCalendar/Akonadi/ITIPHandler
+include/KF5/AkonadiCalendar/Akonadi/IncidenceChanger
+include/KF5/AkonadiCalendar/Akonadi/PublishDialog
+include/KF5/AkonadiCalendar/Akonadi/StandardCalendarActionManager
+include/KF5/AkonadiCalendar/Akonadi/TodoPurger
+include/KF5/AkonadiCalendar/akonadi-calendar_version.h
+include/KF5/AkonadiCalendar/akonadi/akonadi-calendar_export.h
+include/KF5/AkonadiCalendar/akonadi/blockalarmsattribute.h
+include/KF5/AkonadiCalendar/akonadi/calendarbase.h
+include/KF5/AkonadiCalendar/akonadi/calendarclipboard.h
+include/KF5/AkonadiCalendar/akonadi/calendarsettings.h
+include/KF5/AkonadiCalendar/akonadi/etmcalendar.h
+include/KF5/AkonadiCalendar/akonadi/fetchjobcalendar.h
+include/KF5/AkonadiCalendar/akonadi/freebusymanager.h
+include/KF5/AkonadiCalendar/akonadi/freebusyproviderbase.h
+include/KF5/AkonadiCalendar/akonadi/history.h
+include/KF5/AkonadiCalendar/akonadi/icalimporter.h
+include/KF5/AkonadiCalendar/akonadi/incidencechanger.h
+include/KF5/AkonadiCalendar/akonadi/itiphandler.h
+include/KF5/AkonadiCalendar/akonadi/publishdialog.h
+include/KF5/AkonadiCalendar/akonadi/standardcalendaractionmanager.h
+include/KF5/AkonadiCalendar/akonadi/todopurger.h
lib/cmake/KF5AkonadiCalendar/KF5AkonadiCalendarConfig.cmake
lib/cmake/KF5AkonadiCalendar/KF5AkonadiCalendarConfigVersion.cmake
lib/cmake/KF5AkonadiCalendar/KF5AkonadiCalendarTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -41,34 +41,44 @@ lib/libKF5AkonadiCalendar.so.%%KDE_APPLICATIONS_SHLIB_VER%%
%%QT_MKSPECDIR%%/modules/qt_AkonadiCalendar.pri
%%QT_PLUGINDIR%%/akonadi_serializer_kcalcore.so
share/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
+share/dbus-1/services/org.kde.kalendarac.service
+share/knotifications5/kalendarac.notifyrc
share/locale/ar/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ar/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/az/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/az/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/bs/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/bs/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/ca/LC_MESSAGES/kalendarac.mo
share/locale/ca/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ca/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/ca@valencia/LC_MESSAGES/kalendarac.mo
share/locale/ca@valencia/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ca@valencia/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/cs/LC_MESSAGES/kalendarac.mo
share/locale/cs/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/cs/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/da/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/da/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/de/LC_MESSAGES/kalendarac.mo
share/locale/de/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/de/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/el/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/el/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/en_GB/LC_MESSAGES/kalendarac.mo
share/locale/en_GB/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/en_GB/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/es/LC_MESSAGES/kalendarac.mo
share/locale/es/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/es/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/et/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/et/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/eu/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/eu/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/fi/LC_MESSAGES/kalendarac.mo
share/locale/fi/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/fi/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/fr/LC_MESSAGES/kalendarac.mo
share/locale/fr/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/fr/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/ga/LC_MESSAGES/libakonadi-calendar5-serializer.mo
@@ -77,8 +87,11 @@ share/locale/gl/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/gl/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/hu/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/hu/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/ia/LC_MESSAGES/kalendarac.mo
share/locale/ia/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ia/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/id/LC_MESSAGES/kalendarac.mo
+share/locale/it/LC_MESSAGES/kalendarac.mo
share/locale/it/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/it/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/ja/LC_MESSAGES/libakonadi-calendar5-serializer.mo
@@ -87,6 +100,7 @@ share/locale/kk/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/kk/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/km/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/km/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/ko/LC_MESSAGES/kalendarac.mo
share/locale/ko/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ko/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/lt/LC_MESSAGES/libakonadi-calendar5-serializer.mo
@@ -98,34 +112,45 @@ share/locale/nb/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/nb/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/nds/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/nds/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/nl/LC_MESSAGES/kalendarac.mo
share/locale/nl/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/nl/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/pa/LC_MESSAGES/libakonadi-calendar5-serializer.mo
+share/locale/pl/LC_MESSAGES/kalendarac.mo
share/locale/pl/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/pl/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/pt/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/pt/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/pt_BR/LC_MESSAGES/kalendarac.mo
share/locale/pt_BR/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/pt_BR/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/ro/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ro/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/ru/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ru/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/sk/LC_MESSAGES/kalendarac.mo
share/locale/sk/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/sk/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/sl/LC_MESSAGES/kalendarac.mo
share/locale/sl/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/sl/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/sr/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/sr/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/sv/LC_MESSAGES/kalendarac.mo
share/locale/sv/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/sv/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/tr/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/tr/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/ug/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/ug/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/uk/LC_MESSAGES/kalendarac.mo
share/locale/uk/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/uk/LC_MESSAGES/libakonadi-calendar5.mo
+share/locale/zh_CN/LC_MESSAGES/kalendarac.mo
share/locale/zh_CN/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/zh_CN/LC_MESSAGES/libakonadi-calendar5.mo
share/locale/zh_TW/LC_MESSAGES/libakonadi-calendar5-serializer.mo
share/locale/zh_TW/LC_MESSAGES/libakonadi-calendar5.mo
+share/qlogging-categories5/akonadi-calendar.categories
+share/qlogging-categories5/akonadi-calendar.renamecategories
+share/qlogging-categories5/org_kde_kalendarac.categories
diff --git a/net/akonadi-contacts/distinfo b/net/akonadi-contacts/distinfo
index 2c5301bc36b7..216b58c5d999 100644
--- a/net/akonadi-contacts/distinfo
+++ b/net/akonadi-contacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292378
-SHA256 (KDE/release-service/21.12.1/akonadi-contacts-21.12.1.tar.xz) = 43598a2075613297ca08cdd4a3227749779fbca7a15244c029efcd76705903fa
-SIZE (KDE/release-service/21.12.1/akonadi-contacts-21.12.1.tar.xz) = 425852
+TIMESTAMP = 1654672143
+SHA256 (KDE/release-service/22.04.2/akonadi-contacts-22.04.2.tar.xz) = 7e92e7569d12a67176ebc3719766a41e17fe578c6b45ac9903d571d304105034
+SIZE (KDE/release-service/22.04.2/akonadi-contacts-22.04.2.tar.xz) = 426352
diff --git a/net/akonadi-contacts/pkg-plist b/net/akonadi-contacts/pkg-plist
index 0ef22426cb7c..16a6bc6d9b58 100644
--- a/net/akonadi-contacts/pkg-plist
+++ b/net/akonadi-contacts/pkg-plist
@@ -1,83 +1,85 @@
-include/KF5/Akonadi/Contact/AbstractContactFormatter
-include/KF5/Akonadi/Contact/AbstractContactGroupFormatter
-include/KF5/Akonadi/Contact/AbstractEmailAddressSelectionDialog
-include/KF5/Akonadi/Contact/AddContactJob
-include/KF5/Akonadi/Contact/AddEmailAddressJob
-include/KF5/Akonadi/Contact/AddEmailDisplayJob
-include/KF5/Akonadi/Contact/ContactDefaultActions
-include/KF5/Akonadi/Contact/ContactEditor
-include/KF5/Akonadi/Contact/ContactEditorDialog
-include/KF5/Akonadi/Contact/ContactGrantleeWrapper
-include/KF5/Akonadi/Contact/ContactGroupEditor
-include/KF5/Akonadi/Contact/ContactGroupEditorDialog
-include/KF5/Akonadi/Contact/ContactGroupExpandJob
-include/KF5/Akonadi/Contact/ContactGroupSearchJob
-include/KF5/Akonadi/Contact/ContactGroupViewer
-include/KF5/Akonadi/Contact/ContactParts
-include/KF5/Akonadi/Contact/ContactSearchJob
-include/KF5/Akonadi/Contact/ContactViewer
-include/KF5/Akonadi/Contact/ContactViewerDialog
-include/KF5/Akonadi/Contact/ContactsFilterProxyModel
-include/KF5/Akonadi/Contact/ContactsTreeModel
-include/KF5/Akonadi/Contact/EmailAddressRequester
-include/KF5/Akonadi/Contact/EmailAddressSelection
-include/KF5/Akonadi/Contact/EmailAddressSelectionDialog
-include/KF5/Akonadi/Contact/EmailAddressSelectionModel
-include/KF5/Akonadi/Contact/EmailAddressSelectionWidget
-include/KF5/Akonadi/Contact/GrantleeContactFormatter
-include/KF5/Akonadi/Contact/GrantleeContactGroupFormatter
-include/KF5/Akonadi/Contact/GrantleeContactViewer
-include/KF5/Akonadi/Contact/GrantleePrint
-include/KF5/Akonadi/Contact/OpenEmailAddressJob
-include/KF5/Akonadi/Contact/RecipientsEditorManager
-include/KF5/Akonadi/Contact/RecipientsPickerWidget
-include/KF5/Akonadi/Contact/SelectAddressBookDialog
-include/KF5/Akonadi/Contact/StandardContactActionManager
-include/KF5/Akonadi/Contact/StandardContactFormatter
-include/KF5/Akonadi/Contact/StandardContactGroupFormatter
-include/KF5/ContactEditor/CategoriesEditAbstractWidget
-include/KF5/ContactEditor/ContactEditorPagePlugin
-include/KF5/akonadi/contact/abstractcontactformatter.h
-include/KF5/akonadi/contact/abstractcontactgroupformatter.h
-include/KF5/akonadi/contact/abstractemailaddressselectiondialog.h
-include/KF5/akonadi/contact/addcontactjob.h
-include/KF5/akonadi/contact/addemailaddressjob.h
-include/KF5/akonadi/contact/addemaildisplayjob.h
-include/KF5/akonadi/contact/akonadi-contact_export.h
-include/KF5/akonadi/contact/contactdefaultactions.h
-include/KF5/akonadi/contact/contacteditor.h
-include/KF5/akonadi/contact/contacteditordialog.h
-include/KF5/akonadi/contact/contactgrantleewrapper.h
-include/KF5/akonadi/contact/contactgroupeditor.h
-include/KF5/akonadi/contact/contactgroupeditordialog.h
-include/KF5/akonadi/contact/contactgroupexpandjob.h
-include/KF5/akonadi/contact/contactgroupsearchjob.h
-include/KF5/akonadi/contact/contactgroupviewer.h
-include/KF5/akonadi/contact/contactparts.h
-include/KF5/akonadi/contact/contactsearchjob.h
-include/KF5/akonadi/contact/contactsfilterproxymodel.h
-include/KF5/akonadi/contact/contactstreemodel.h
-include/KF5/akonadi/contact/contactviewer.h
-include/KF5/akonadi/contact/contactviewerdialog.h
-include/KF5/akonadi/contact/emailaddressrequester.h
-include/KF5/akonadi/contact/emailaddressselection.h
-include/KF5/akonadi/contact/emailaddressselectiondialog.h
-include/KF5/akonadi/contact/emailaddressselectionmodel.h
-include/KF5/akonadi/contact/emailaddressselectionwidget.h
-include/KF5/akonadi/contact/grantleecontactformatter.h
-include/KF5/akonadi/contact/grantleecontactgroupformatter.h
-include/KF5/akonadi/contact/grantleecontactviewer.h
-include/KF5/akonadi/contact/grantleeprint.h
-include/KF5/akonadi/contact/openemailaddressjob.h
-include/KF5/akonadi/contact/recipientseditormanager.h
-include/KF5/akonadi/contact/recipientspickerwidget.h
-include/KF5/akonadi/contact/selectaddressbookdialog.h
-include/KF5/akonadi/contact/standardcontactactionmanager.h
-include/KF5/akonadi/contact/standardcontactformatter.h
-include/KF5/akonadi/contact/standardcontactgroupformatter.h
-include/KF5/contacteditor/categorieseditabstractwidget.h
-include/KF5/contacteditor/contacteditor_export.h
-include/KF5/contacteditor/contacteditorpageplugin.h
+include/KF5/AkonadiContact/Akonadi/AbstractContactFormatter
+include/KF5/AkonadiContact/Akonadi/AbstractContactGroupFormatter
+include/KF5/AkonadiContact/Akonadi/AbstractEmailAddressSelectionDialog
+include/KF5/AkonadiContact/Akonadi/AddContactJob
+include/KF5/AkonadiContact/Akonadi/AddEmailAddressJob
+include/KF5/AkonadiContact/Akonadi/AddEmailDisplayJob
+include/KF5/AkonadiContact/Akonadi/ContactDefaultActions
+include/KF5/AkonadiContact/Akonadi/ContactEditor
+include/KF5/AkonadiContact/Akonadi/ContactEditorDialog
+include/KF5/AkonadiContact/Akonadi/ContactGrantleeWrapper
+include/KF5/AkonadiContact/Akonadi/ContactGroupEditor
+include/KF5/AkonadiContact/Akonadi/ContactGroupEditorDialog
+include/KF5/AkonadiContact/Akonadi/ContactGroupExpandJob
+include/KF5/AkonadiContact/Akonadi/ContactGroupSearchJob
+include/KF5/AkonadiContact/Akonadi/ContactGroupViewer
+include/KF5/AkonadiContact/Akonadi/ContactParts
+include/KF5/AkonadiContact/Akonadi/ContactSearchJob
+include/KF5/AkonadiContact/Akonadi/ContactViewer
+include/KF5/AkonadiContact/Akonadi/ContactViewerDialog
+include/KF5/AkonadiContact/Akonadi/ContactsFilterProxyModel
+include/KF5/AkonadiContact/Akonadi/ContactsTreeModel
+include/KF5/AkonadiContact/Akonadi/EmailAddressRequester
+include/KF5/AkonadiContact/Akonadi/EmailAddressSelection
+include/KF5/AkonadiContact/Akonadi/EmailAddressSelectionDialog
+include/KF5/AkonadiContact/Akonadi/EmailAddressSelectionModel
+include/KF5/AkonadiContact/Akonadi/EmailAddressSelectionWidget
+include/KF5/AkonadiContact/Akonadi/GrantleeContactFormatter
+include/KF5/AkonadiContact/Akonadi/GrantleeContactGroupFormatter
+include/KF5/AkonadiContact/Akonadi/GrantleeContactViewer
+include/KF5/AkonadiContact/Akonadi/GrantleePrint
+include/KF5/AkonadiContact/Akonadi/OpenEmailAddressJob
+include/KF5/AkonadiContact/Akonadi/RecipientsEditorManager
+include/KF5/AkonadiContact/Akonadi/RecipientsPickerWidget
+include/KF5/AkonadiContact/Akonadi/SelectAddressBookDialog
+include/KF5/AkonadiContact/Akonadi/StandardContactActionManager
+include/KF5/AkonadiContact/Akonadi/StandardContactFormatter
+include/KF5/AkonadiContact/Akonadi/StandardContactGroupFormatter
+include/KF5/AkonadiContact/akonadi-contact_version.h
+include/KF5/AkonadiContact/akonadi/abstractcontactformatter.h
+include/KF5/AkonadiContact/akonadi/abstractcontactgroupformatter.h
+include/KF5/AkonadiContact/akonadi/abstractemailaddressselectiondialog.h
+include/KF5/AkonadiContact/akonadi/addcontactjob.h
+include/KF5/AkonadiContact/akonadi/addemailaddressjob.h
+include/KF5/AkonadiContact/akonadi/addemaildisplayjob.h
+include/KF5/AkonadiContact/akonadi/akonadi-contact_export.h
+include/KF5/AkonadiContact/akonadi/contactdefaultactions.h
+include/KF5/AkonadiContact/akonadi/contacteditor.h
+include/KF5/AkonadiContact/akonadi/contacteditordialog.h
+include/KF5/AkonadiContact/akonadi/contactgrantleewrapper.h
+include/KF5/AkonadiContact/akonadi/contactgroupeditor.h
+include/KF5/AkonadiContact/akonadi/contactgroupeditordialog.h
+include/KF5/AkonadiContact/akonadi/contactgroupexpandjob.h
+include/KF5/AkonadiContact/akonadi/contactgroupsearchjob.h
+include/KF5/AkonadiContact/akonadi/contactgroupviewer.h
+include/KF5/AkonadiContact/akonadi/contactparts.h
+include/KF5/AkonadiContact/akonadi/contactsearchjob.h
+include/KF5/AkonadiContact/akonadi/contactsfilterproxymodel.h
+include/KF5/AkonadiContact/akonadi/contactstreemodel.h
+include/KF5/AkonadiContact/akonadi/contactviewer.h
+include/KF5/AkonadiContact/akonadi/contactviewerdialog.h
+include/KF5/AkonadiContact/akonadi/emailaddressrequester.h
+include/KF5/AkonadiContact/akonadi/emailaddressselection.h
+include/KF5/AkonadiContact/akonadi/emailaddressselectiondialog.h
+include/KF5/AkonadiContact/akonadi/emailaddressselectionmodel.h
+include/KF5/AkonadiContact/akonadi/emailaddressselectionwidget.h
+include/KF5/AkonadiContact/akonadi/grantleecontactformatter.h
+include/KF5/AkonadiContact/akonadi/grantleecontactgroupformatter.h
+include/KF5/AkonadiContact/akonadi/grantleecontactviewer.h
+include/KF5/AkonadiContact/akonadi/grantleeprint.h
+include/KF5/AkonadiContact/akonadi/openemailaddressjob.h
+include/KF5/AkonadiContact/akonadi/recipientseditormanager.h
+include/KF5/AkonadiContact/akonadi/recipientspickerwidget.h
+include/KF5/AkonadiContact/akonadi/selectaddressbookdialog.h
+include/KF5/AkonadiContact/akonadi/standardcontactactionmanager.h
+include/KF5/AkonadiContact/akonadi/standardcontactformatter.h
+include/KF5/AkonadiContact/akonadi/standardcontactgroupformatter.h
+include/KF5/AkonadiContactEditor/Akonadi/CategoriesEditAbstractWidget
+include/KF5/AkonadiContactEditor/Akonadi/ContactEditorPagePlugin
+include/KF5/AkonadiContactEditor/akonadi-contact-editor_version.h
+include/KF5/AkonadiContactEditor/akonadi/categorieseditabstractwidget.h
+include/KF5/AkonadiContactEditor/akonadi/contacteditor_export.h
+include/KF5/AkonadiContactEditor/akonadi/contacteditorpageplugin.h
lib/cmake/KF5AkonadiContact/KF5AkonadiContactConfig.cmake
lib/cmake/KF5AkonadiContact/KF5AkonadiContactConfigVersion.cmake
lib/cmake/KF5AkonadiContact/KF5AkonadiContactTargets-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/net/akonadi-mime/distinfo b/net/akonadi-mime/distinfo
index 91783fb6af09..10201c8b70c0 100644
--- a/net/akonadi-mime/distinfo
+++ b/net/akonadi-mime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292384
-SHA256 (KDE/release-service/21.12.1/akonadi-mime-21.12.1.tar.xz) = a6016f9c58fa899773c3f79f61aaae179a508e37405771a836bafcde72c22fca
-SIZE (KDE/release-service/21.12.1/akonadi-mime-21.12.1.tar.xz) = 142288
+TIMESTAMP = 1654672150
+SHA256 (KDE/release-service/22.04.2/akonadi-mime-22.04.2.tar.xz) = 927e8429d33abdd96b5045cfcd9f0100eb6ade1fcd68f5a19e65aa5fb87c5226
+SIZE (KDE/release-service/22.04.2/akonadi-mime-22.04.2.tar.xz) = 145180
diff --git a/net/akonadi-mime/pkg-plist b/net/akonadi-mime/pkg-plist
index ae32d1aa0507..444548fb44e0 100644
--- a/net/akonadi-mime/pkg-plist
+++ b/net/akonadi-mime/pkg-plist
@@ -1,38 +1,37 @@
-share/qlogging-categories5/akonadi-mime.categories
-include/KF5/Akonadi/KMime/AddressAttribute
-include/KF5/Akonadi/KMime/CommandBase
-include/KF5/Akonadi/KMime/MarkAsCommand
-include/KF5/Akonadi/KMime/MessageFlags
-include/KF5/Akonadi/KMime/MessageFolderAttribute
-include/KF5/Akonadi/KMime/MessageModel
-include/KF5/Akonadi/KMime/MessageParts
-include/KF5/Akonadi/KMime/MessageStatus
-include/KF5/Akonadi/KMime/MoveCommand
-include/KF5/Akonadi/KMime/NewMailNotifierAttribute
-include/KF5/Akonadi/KMime/Pop3ResourceAttribute
-include/KF5/Akonadi/KMime/RemoveDuplicatesJob
-include/KF5/Akonadi/KMime/SpecialMailCollections
-include/KF5/Akonadi/KMime/SpecialMailCollectionsDiscoveryJob
-include/KF5/Akonadi/KMime/SpecialMailCollectionsRequestJob
-include/KF5/Akonadi/KMime/StandardMailActionManager
-include/KF5/akonadi-mime_version.h
-include/KF5/akonadi/kmime/addressattribute.h
-include/KF5/akonadi/kmime/akonadi-mime_export.h
-include/KF5/akonadi/kmime/commandbase.h
-include/KF5/akonadi/kmime/markascommand.h
-include/KF5/akonadi/kmime/messageflags.h
-include/KF5/akonadi/kmime/messagefolderattribute.h
-include/KF5/akonadi/kmime/messagemodel.h
-include/KF5/akonadi/kmime/messageparts.h
-include/KF5/akonadi/kmime/messagestatus.h
-include/KF5/akonadi/kmime/movecommand.h
-include/KF5/akonadi/kmime/newmailnotifierattribute.h
-include/KF5/akonadi/kmime/pop3resourceattribute.h
-include/KF5/akonadi/kmime/removeduplicatesjob.h
-include/KF5/akonadi/kmime/specialmailcollections.h
-include/KF5/akonadi/kmime/specialmailcollectionsdiscoveryjob.h
-include/KF5/akonadi/kmime/specialmailcollectionsrequestjob.h
-include/KF5/akonadi/kmime/standardmailactionmanager.h
+include/KF5/AkonadiMime/Akonadi/AddressAttribute
+include/KF5/AkonadiMime/Akonadi/CommandBase
+include/KF5/AkonadiMime/Akonadi/MarkAsCommand
+include/KF5/AkonadiMime/Akonadi/MessageFlags
+include/KF5/AkonadiMime/Akonadi/MessageFolderAttribute
+include/KF5/AkonadiMime/Akonadi/MessageModel
+include/KF5/AkonadiMime/Akonadi/MessageParts
+include/KF5/AkonadiMime/Akonadi/MessageStatus
+include/KF5/AkonadiMime/Akonadi/MoveCommand
+include/KF5/AkonadiMime/Akonadi/NewMailNotifierAttribute
+include/KF5/AkonadiMime/Akonadi/Pop3ResourceAttribute
+include/KF5/AkonadiMime/Akonadi/RemoveDuplicatesJob
+include/KF5/AkonadiMime/Akonadi/SpecialMailCollections
+include/KF5/AkonadiMime/Akonadi/SpecialMailCollectionsDiscoveryJob
+include/KF5/AkonadiMime/Akonadi/SpecialMailCollectionsRequestJob
+include/KF5/AkonadiMime/Akonadi/StandardMailActionManager
+include/KF5/AkonadiMime/akonadi-mime_version.h
+include/KF5/AkonadiMime/akonadi/addressattribute.h
+include/KF5/AkonadiMime/akonadi/akonadi-mime_export.h
+include/KF5/AkonadiMime/akonadi/commandbase.h
+include/KF5/AkonadiMime/akonadi/markascommand.h
+include/KF5/AkonadiMime/akonadi/messageflags.h
+include/KF5/AkonadiMime/akonadi/messagefolderattribute.h
+include/KF5/AkonadiMime/akonadi/messagemodel.h
+include/KF5/AkonadiMime/akonadi/messageparts.h
+include/KF5/AkonadiMime/akonadi/messagestatus.h
+include/KF5/AkonadiMime/akonadi/movecommand.h
+include/KF5/AkonadiMime/akonadi/newmailnotifierattribute.h
+include/KF5/AkonadiMime/akonadi/pop3resourceattribute.h
+include/KF5/AkonadiMime/akonadi/removeduplicatesjob.h
+include/KF5/AkonadiMime/akonadi/specialmailcollections.h
+include/KF5/AkonadiMime/akonadi/specialmailcollectionsdiscoveryjob.h
+include/KF5/AkonadiMime/akonadi/specialmailcollectionsrequestjob.h
+include/KF5/AkonadiMime/akonadi/standardmailactionmanager.h
lib/cmake/KF5AkonadiMime/KF5AkonadiMimeConfig.cmake
lib/cmake/KF5AkonadiMime/KF5AkonadiMimeConfigVersion.cmake
lib/cmake/KF5AkonadiMime/KF5AkonadiMimeTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -40,8 +39,8 @@ lib/cmake/KF5AkonadiMime/KF5AkonadiMimeTargets.cmake
lib/libKF5AkonadiMime.so
lib/libKF5AkonadiMime.so.5
lib/libKF5AkonadiMime.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-%%QT_PLUGINDIR%%/akonadi_serializer_mail.so
%%QT_MKSPECDIR%%/modules/qt_AkonadiMime.pri
+%%QT_PLUGINDIR%%/akonadi_serializer_mail.so
share/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
share/config.kcfg/specialmailcollections.kcfg
share/locale/ar/LC_MESSAGES/libakonadi-kmime5.mo
@@ -89,3 +88,4 @@ share/locale/uk/LC_MESSAGES/libakonadi-kmime5.mo
share/locale/zh_CN/LC_MESSAGES/libakonadi-kmime5.mo
share/locale/zh_TW/LC_MESSAGES/libakonadi-kmime5.mo
share/mime/packages/x-vnd.kde.contactgroup.xml
+share/qlogging-categories5/akonadi-mime.categories
diff --git a/net/akonadi-notes/distinfo b/net/akonadi-notes/distinfo
index ea05479e5d8a..097d9965200a 100644
--- a/net/akonadi-notes/distinfo
+++ b/net/akonadi-notes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292361
-SHA256 (KDE/release-service/21.12.1/akonadi-notes-21.12.1.tar.xz) = db4a8435ae63f935d05d60313c849652c7e61dfe2d88efbfc9a56328cfaa2cd1
-SIZE (KDE/release-service/21.12.1/akonadi-notes-21.12.1.tar.xz) = 26568
+TIMESTAMP = 1654672123
+SHA256 (KDE/release-service/22.04.2/akonadi-notes-22.04.2.tar.xz) = 488c2243656e03c8a095ce9cfe2452f2d95d9f65be6f188529956e63b6fca7f2
+SIZE (KDE/release-service/22.04.2/akonadi-notes-22.04.2.tar.xz) = 27276
diff --git a/net/akonadi-notes/pkg-plist b/net/akonadi-notes/pkg-plist
index 8d297c9ac571..f3178b13ce97 100644
--- a/net/akonadi-notes/pkg-plist
+++ b/net/akonadi-notes/pkg-plist
@@ -1,8 +1,8 @@
-include/KF5/Akonadi/Notes/NoteUtils
-include/KF5/akonadi-notes_version.h
-include/KF5/akonadi/notes/NoteUtils
-include/KF5/akonadi/notes/akonadi-notes_export.h
-include/KF5/akonadi/notes/noteutils.h
+include/KF5/AkonadiNotes/Akonadi/NoteUtils
+include/KF5/AkonadiNotes/akonadi-notes_version.h
+include/KF5/AkonadiNotes/akonadi/NoteUtils
+include/KF5/AkonadiNotes/akonadi/akonadi-notes_export.h
+include/KF5/AkonadiNotes/akonadi/noteutils.h
lib/cmake/KF5AkonadiNotes/KF5AkonadiNotesConfig.cmake
lib/cmake/KF5AkonadiNotes/KF5AkonadiNotesConfigVersion.cmake
lib/cmake/KF5AkonadiNotes/KF5AkonadiNotesTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -58,5 +58,6 @@ share/locale/tg/LC_MESSAGES/akonadinotes5.mo
share/locale/tr/LC_MESSAGES/akonadinotes5.mo
share/locale/ug/LC_MESSAGES/akonadinotes5.mo
share/locale/uk/LC_MESSAGES/akonadinotes5.mo
+share/locale/vi/LC_MESSAGES/akonadinotes5.mo
share/locale/zh_CN/LC_MESSAGES/akonadinotes5.mo
share/locale/zh_TW/LC_MESSAGES/akonadinotes5.mo
diff --git a/net/akonadi-search/distinfo b/net/akonadi-search/distinfo
index 69aa74329124..9f237aba63c3 100644
--- a/net/akonadi-search/distinfo
+++ b/net/akonadi-search/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292366
-SHA256 (KDE/release-service/21.12.1/akonadi-search-21.12.1.tar.xz) = 5608ff3b0f3b131c556a9502223e887d7a9f78945d31e6b983b1e02828f9142d
-SIZE (KDE/release-service/21.12.1/akonadi-search-21.12.1.tar.xz) = 97776
+TIMESTAMP = 1654672130
+SHA256 (KDE/release-service/22.04.2/akonadi-search-22.04.2.tar.xz) = d8992134d37db201c3e572443f538d6a737bc0cd3fe07b93f820954c9f16b04a
+SIZE (KDE/release-service/22.04.2/akonadi-search-22.04.2.tar.xz) = 99888
diff --git a/net/akonadi-search/pkg-plist b/net/akonadi-search/pkg-plist
index 780395c26f72..b4c8912eea4d 100644
--- a/net/akonadi-search/pkg-plist
+++ b/net/akonadi-search/pkg-plist
@@ -1,11 +1,8 @@
bin/akonadi_indexing_agent
-share/qlogging-categories5/akonadi-search.categories
-share/qlogging-categories5/akonadi-search.renamecategories
-include/KF5/AkonadiSearch/Core/query.h
-include/KF5/AkonadiSearch/Core/resultiterator.h
-include/KF5/AkonadiSearch/Core/search_core_export.h
-include/KF5/AkonadiSearch/Core/searchstore.h
-include/KF5/AkonadiSearch/Core/term.h
+include/KF5/AkonadiSearch/Core/Query
+include/KF5/AkonadiSearch/Core/ResultIterator
+include/KF5/AkonadiSearch/Core/SearchStore
+include/KF5/AkonadiSearch/Core/Term
include/KF5/AkonadiSearch/Debug/akonadisearchdebugdialog.h
include/KF5/AkonadiSearch/Debug/akonadisearchdebugsearchpathcombobox.h
include/KF5/AkonadiSearch/Debug/search_debug_export.h
@@ -24,7 +21,12 @@ include/KF5/AkonadiSearch/Xapian/xapiandocument.h
include/KF5/AkonadiSearch/Xapian/xapianqueryparser.h
include/KF5/AkonadiSearch/Xapian/xapiansearchstore.h
include/KF5/AkonadiSearch/Xapian/xapiantermgenerator.h
-include/KF5/akonadi_search_version.h
+include/KF5/AkonadiSearch/akonadi_search_version.h
+include/KF5/AkonadiSearch/core/query.h
+include/KF5/AkonadiSearch/core/resultiterator.h
+include/KF5/AkonadiSearch/core/searchstore.h
+include/KF5/AkonadiSearch/core/term.h
+include/KF5/AkonadiSearch/search_core_export.h
lib/cmake/KF5AkonadiSearch/KF5AkonadiSearchConfig.cmake
lib/cmake/KF5AkonadiSearch/KF5AkonadiSearchConfigVersion.cmake
lib/cmake/KF5AkonadiSearch/KF5AkonadiSearchTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -46,10 +48,9 @@ lib/libKF5AkonadiSearchXapian.so.%%KDE_APPLICATIONS_SHLIB_VER%%
%%QT_PLUGINDIR%%/akonadi/contactsearchstore.so
%%QT_PLUGINDIR%%/akonadi/emailsearchstore.so
%%QT_PLUGINDIR%%/akonadi/notesearchstore.so
-%%QT_PLUGINDIR%%/kcm_krunner_pimcontacts.so
+%%QT_PLUGINDIR%%/kf5/krunner/kcms/kcm_krunner_pimcontacts.so
%%QT_PLUGINDIR%%/kf5/krunner/krunner_pimcontacts.so
share/akonadi/agents/akonadiindexingagent.desktop
-share/kservices5/plasma-krunner-pimcontacts_config.desktop
share/locale/ar/LC_MESSAGES/akonadi_search.mo
share/locale/az/LC_MESSAGES/akonadi_search.mo
share/locale/ca/LC_MESSAGES/akonadi_search.mo
@@ -88,3 +89,5 @@ share/locale/tr/LC_MESSAGES/akonadi_search.mo
share/locale/uk/LC_MESSAGES/akonadi_search.mo
share/locale/zh_CN/LC_MESSAGES/akonadi_search.mo
share/locale/zh_TW/LC_MESSAGES/akonadi_search.mo
+share/qlogging-categories5/akonadi-search.categories
+share/qlogging-categories5/akonadi-search.renamecategories
diff --git a/net/anet/Makefile b/net/anet/Makefile
deleted file mode 100644
index 39b9c638a6b5..000000000000
--- a/net/anet/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME= anet
-PORTVERSION= 0.4.1
-CATEGORIES= net
-MASTER_SITES= http://www.codelabs.ch/download/
-DISTNAME= libanet-${PORTVERSION}
-
-MAINTAINER= egypcio@FreeBSD.org
-COMMENT= Networking library for Ada
-
-LICENSE= GPLv2 GMGPL
-LICENSE_COMB= multi
-
-BUILD_DEPENDS= gprbuild:devel/gprbuild
-
-USES= ada tar:bzip2
-
-ALL_TARGET= build_lib
-MAKE_ARGS+= NUM_CPUS=${MAKE_JOBS_NUMBER} \
- LIBRARY_KIND=static \
- OS=bsd
-
-OPTIONS_DEFINE= TEST DOCS
-TEST_DESC= Run unit test suite before installation
-TEST_ALL_TARGET= tests
-TEST_BUILD_DEPENDS= ${LOCALBASE}/lib/gnat/ahven.gpr:devel/ahven
-DOCS_USES= gmake
-DOCS_ALL_TARGET= doc
-DOCS_BUILD_DEPENDS= asciidoc:textproc/asciidoc \
- source-highlight:textproc/source-highlight
-
-post-patch:
- @${REINPLACE_CMD} -e 's|dynamic|static|g' \
- ${WRKSRC}/gnat/anet.gpr
- @${REINPLACE_CMD} -e 's|DESTDIR|DEST2|g' \
- ${WRKSRC}/doc/Makefile
-
-do-build:
- @${MKDIR} ${WRKSRC}/doc/html
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
- ${STAGEDIR}${PREFIX}/lib/anet \
- ${STAGEDIR}${PREFIX}/include/anet
- ${INSTALL_DATA} ${WRKSRC}/src/*.ad[bs] ${WRKSRC}/src/bsd/*.ad[bs] \
- ${STAGEDIR}${PREFIX}/include/anet
- ${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.ali \
- ${STAGEDIR}${PREFIX}/lib/anet
- ${INSTALL_DATA} ${WRKSRC}/lib/bsd/static/*.a ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_DATA} ${WRKSRC}/gnat/anet.gpr ${STAGEDIR}${PREFIX}/lib/gnat
-
-do-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.mk>
diff --git a/net/anet/distinfo b/net/anet/distinfo
deleted file mode 100644
index e68f5342ba74..000000000000
--- a/net/anet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1544602181
-SHA256 (libanet-0.4.1.tar.bz2) = 8d53c3c922d1645c62cef34e39a633d4ed9c243c42d79e9cc9a0aac53e2b5871
-SIZE (libanet-0.4.1.tar.bz2) = 53485
diff --git a/net/anet/files/patch-src_anet-sockets-inet.adb b/net/anet/files/patch-src_anet-sockets-inet.adb
deleted file mode 100644
index 2c0e619f0650..000000000000
--- a/net/anet/files/patch-src_anet-sockets-inet.adb
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/anet-sockets-inet.adb.orig 2016-06-29 10:26:01 UTC
-+++ src/anet-sockets-inet.adb
-@@ -52,7 +52,7 @@ package body Anet.Sockets.Inet is
- Res : C.int;
- Sock : Thin.Inet.Sockaddr_In_Type
- (Family => Socket_Families.Family_Inet);
-- Len : aliased C.int := Sock'Size / 8;
-+ Len : aliased C.int := Thin.Inet.Sockaddr_In_Size;
- begin
- New_Socket.Sock_FD := -1;
-
-@@ -80,7 +80,7 @@ package body Anet.Sockets.Inet is
- Res : C.int;
- Sock : Thin.Inet.Sockaddr_In_Type
- (Family => Socket_Families.Family_Inet6);
-- Len : aliased C.int := Sock'Size / 8;
-+ Len : aliased C.int := Thin.Inet.Sockaddr_In6_Size;
- begin
- New_Socket.Sock_FD := -1;
-
-@@ -129,7 +129,7 @@ package body Anet.Sockets.Inet is
- (Result => Thin.C_Bind
- (S => Socket.Sock_FD,
- Name => Sockaddr'Address,
-- Namelen => Sockaddr'Size / 8),
-+ Namelen => Thin.Inet.Sockaddr_In_Size),
- Message => "Unable to bind IPv4 socket to " & To_String
- (Address => Address) & "," & Port'Img);
- end Bind;
-@@ -153,7 +153,7 @@ package body Anet.Sockets.Inet is
- (Result => Thin.C_Bind
- (S => Socket.Sock_FD,
- Name => Sockaddr'Address,
-- Namelen => Sockaddr'Size / 8),
-+ Namelen => Thin.Inet.Sockaddr_In6_Size),
- Message => "Unable to bind IPv6 socket to " & To_String
- (Address => Address) & "," & Port'Img);
- end Bind;
-@@ -173,7 +173,7 @@ package body Anet.Sockets.Inet is
- (Result => Thin.C_Connect
- (S => Socket.Sock_FD,
- Name => Dst'Address,
-- Namelen => Dst'Size / 8),
-+ Namelen => Thin.Inet.Sockaddr_In_Size),
- Message => "Unable to connect socket to address " & To_String
- (Address => Address) & " (" & Port'Img & " )");
- end Connect;
-@@ -193,7 +193,7 @@ package body Anet.Sockets.Inet is
- (Result => Thin.C_Connect
- (S => Socket.Sock_FD,
- Name => Dst'Address,
-- Namelen => Dst'Size / 8),
-+ Namelen => Thin.Inet.Sockaddr_In6_Size),
- Message => "Unable to connect socket to address " & To_String
- (Address => Address) & " (" & Port'Img & " )");
- end Connect;
-@@ -432,7 +432,7 @@ package body Anet.Sockets.Inet is
- Len => Item'Length,
- Flags => 0,
- To => Dst'Address,
-- Tolen => Dst'Size / 8);
-+ Tolen => Thin.Inet.Sockaddr_In_Size);
-
- Errno.Check_Or_Raise
- (Result => C.int (Res),
-@@ -464,7 +464,7 @@ package body Anet.Sockets.Inet is
- Len => Item'Length,
- Flags => 0,
- To => Dst'Address,
-- Tolen => Dst'Size / 8);
-+ Tolen => Thin.Inet.Sockaddr_In6_Size);
-
- Errno.Check_Or_Raise
- (Result => C.int (Res),
diff --git a/net/anet/pkg-descr b/net/anet/pkg-descr
deleted file mode 100644
index b2842d22b157..000000000000
--- a/net/anet/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
-Anet is a networking library for the Ada programming language featuring:
- * BSD socket implementation
- * High abstraction level
- * Extendable socket type hierarchy
- * Socket receiver tasks (Stream and Datagram)
- * Ada type serialisation/deserialisation over sockets
- * Supported socket families
- - IPv4 (AF_INET)
- - IPv6 (AF_INET6)
- - UNIX domain (AF_UNIX)
- - Linux only: Packet (AF_PACKET)
- - Linux only: Netlink (AF_NETLINK)
- * Supported socket modes
- - Stream (TCP)
- - Datagram (UDP)
- - RAW
- * Support for IPv4/IPv6 multicast
- * UDP/IPv4 packet creation and validation
-
-WWW: https://www.codelabs.ch/anet/
diff --git a/net/anet/pkg-plist b/net/anet/pkg-plist
deleted file mode 100644
index ec076eeab366..000000000000
--- a/net/anet/pkg-plist
+++ /dev/null
@@ -1,82 +0,0 @@
-include/anet/anet-arp.adb
-include/anet/anet-arp.ads
-include/anet/anet-byte_swapping.adb
-include/anet/anet-byte_swapping.ads
-include/anet/anet-constants.ads
-include/anet/anet-errno.adb
-include/anet/anet-errno.ads
-include/anet/anet-ipv4.adb
-include/anet/anet-ipv4.ads
-include/anet/anet-os.adb
-include/anet/anet-os.ads
-include/anet/anet-os_constants.ads
-include/anet/anet-receivers-datagram.adb
-include/anet/anet-receivers-datagram.ads
-include/anet/anet-receivers-stream.adb
-include/anet/anet-receivers-stream.ads
-include/anet/anet-receivers.adb
-include/anet/anet-receivers.ads
-include/anet/anet-socket_families.ads
-include/anet/anet-sockets-filters.adb
-include/anet/anet-sockets-filters.ads
-include/anet/anet-sockets-inet-iface.adb
-include/anet/anet-sockets-inet-iface.ads
-include/anet/anet-sockets-inet.adb
-include/anet/anet-sockets-inet.ads
-include/anet/anet-sockets-net_ifaces.adb
-include/anet/anet-sockets-net_ifaces.ads
-include/anet/anet-sockets-thin-inet.adb
-include/anet/anet-sockets-thin-inet.ads
-include/anet/anet-sockets-thin-netdev-requests.ads
-include/anet/anet-sockets-thin-netdev.ads
-include/anet/anet-sockets-thin-sockaddr.ads
-include/anet/anet-sockets-thin-unix.ads
-include/anet/anet-sockets-thin.ads
-include/anet/anet-sockets-unix.adb
-include/anet/anet-sockets-unix.ads
-include/anet/anet-sockets.adb
-include/anet/anet-sockets.ads
-include/anet/anet-streams.adb
-include/anet/anet-streams.ads
-include/anet/anet-thin.ads
-include/anet/anet-types.adb
-include/anet/anet-types.ads
-include/anet/anet-udp.adb
-include/anet/anet-udp.ads
-include/anet/anet-util.adb
-include/anet/anet-util.ads
-include/anet/anet.adb
-include/anet/anet.ads
-lib/anet/anet-arp.ali
-lib/anet/anet-byte_swapping.ali
-lib/anet/anet-constants.ali
-lib/anet/anet-errno.ali
-lib/anet/anet-ipv4.ali
-lib/anet/anet-os.ali
-lib/anet/anet-os_constants.ali
-lib/anet/anet-receivers-datagram.ali
-lib/anet/anet-receivers-stream.ali
-lib/anet/anet-receivers.ali
-lib/anet/anet-socket_families.ali
-lib/anet/anet-sockets-filters.ali
-lib/anet/anet-sockets-inet-iface.ali
-lib/anet/anet-sockets-inet.ali
-lib/anet/anet-sockets-net_ifaces.ali
-lib/anet/anet-sockets-thin-inet.ali
-lib/anet/anet-sockets-thin-netdev-requests.ali
-lib/anet/anet-sockets-thin-netdev.ali
-lib/anet/anet-sockets-thin-sockaddr.ali
-lib/anet/anet-sockets-thin-unix.ali
-lib/anet/anet-sockets-thin.ali
-lib/anet/anet-sockets-unix.ali
-lib/anet/anet-sockets.ali
-lib/anet/anet-streams.ali
-lib/anet/anet-thin.ali
-lib/anet/anet-types.ali
-lib/anet/anet-udp.ali
-lib/anet/anet-util.ali
-lib/anet/anet.ali
-lib/gnat/anet.gpr
-lib/libanet.a
-%%PORTDOCS%%%%DOCSDIR%%/html/asciidoc.css
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
diff --git a/net/apinger/Makefile b/net/apinger/Makefile
index 6454ea35f49b..80ecf24c3583 100644
--- a/net/apinger/Makefile
+++ b/net/apinger/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= net
MASTER_SITES= http://freebsdcluster.org/~mich/software/ \
http://www.bnet.pl/~jajcus/apinger/
-MAINTAINER= mich@FreeBSD.org
+MAINTAINER= portmaster@bsdforge.com
COMMENT= IP device monitoring tool
LICENSE= GPLv2
diff --git a/net/aquantia-atlantic-kmod/Makefile b/net/aquantia-atlantic-kmod/Makefile
index b33a0c3a2d51..e0606201680c 100644
--- a/net/aquantia-atlantic-kmod/Makefile
+++ b/net/aquantia-atlantic-kmod/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.0.5
PORTREVISION= 1
CATEGORIES= net
-MAINTAINER= koobs@FreeBSD.org
+MAINTAINER= bofh@FreeBSD.org
COMMENT= Aquantia AQtion (Atlantic) Network Driver (Development Preview)
LICENSE= BSD3CLAUSE
@@ -16,9 +16,6 @@ GH_ACCOUNT= Aquantia
GH_PROJECT= aqtion-freebsd
GH_TAGNAME= 4816644
-# Strip -Werror from sys/conf/kmod.mk
-MAKE_ENV= WERROR=""
-
PLIST_FILES= ${KMODDIR}/if_atlantic.ko
.include <bsd.port.mk>
diff --git a/net/aquantia-atlantic-kmod/files/patch-aq__main.c b/net/aquantia-atlantic-kmod/files/patch-aq__main.c
index f99c14376bb8..1f2353725bed 100644
--- a/net/aquantia-atlantic-kmod/files/patch-aq__main.c
+++ b/net/aquantia-atlantic-kmod/files/patch-aq__main.c
@@ -3,12 +3,71 @@ https://github.com/Aquantia/aqtion-freebsd/pull/11
--- aq_main.c.orig 2019-09-24 14:45:34 UTC
+++ aq_main.c
-@@ -735,6 +735,23 @@ static uint64_t aq_if_get_counter(if_ctx_t ctx, ift_co
+@@ -193,8 +193,12 @@ static driver_t aq_driver = {
+ "aq", aq_methods, sizeof(struct aq_dev),
+ };
+
++#if __FreeBSD_version >= 1400058
++DRIVER_MODULE(atlantic, pci, aq_driver, 0, 0);
++#else
+ static devclass_t aq_devclass;
+ DRIVER_MODULE(atlantic, pci, aq_driver, aq_devclass, 0, 0);
++#endif
+
+ MODULE_DEPEND(atlantic, pci, 1, 1, 1);
+ MODULE_DEPEND(atlantic, ether, 1, 1, 1);
+@@ -282,8 +286,6 @@ static struct if_shared_ctx aq_sctx_init = {
+ .isc_ntxd_default = {PAGE_SIZE / sizeof(aq_txc_desc_t) * 4},
+ };
+
+-if_shared_ctx_t aq_sctx = &aq_sctx_init;
+-
+ /*
+ * TUNEABLE PARAMETERS:
+ */
+@@ -300,7 +302,7 @@ static void *aq_register(device_t dev)
+ */
+ static void *aq_register(device_t dev)
+ {
+- return (aq_sctx);
++ return (&aq_sctx_init);
+ }
+
+ static int aq_if_attach_pre(if_ctx_t ctx)
+@@ -417,13 +419,11 @@ static int aq_if_attach_post(if_ctx_t ctx)
+ static int aq_if_attach_post(if_ctx_t ctx)
+ {
+ struct aq_dev *softc;
+- if_t ifp;
+ int rc;
+
+ AQ_DBG_ENTER();
+
+ softc = iflib_get_softc(ctx);
+- ifp = iflib_get_ifp(ctx);
+ rc = 0;
+
+ aq_update_hw_stats(softc);
+@@ -635,13 +635,11 @@ static void aq_if_init(if_ctx_t ctx)
+ struct aq_dev *softc;
+ struct aq_hw *hw;
+ struct ifmediareq ifmr;
+- struct ifnet *ifp;
+ int i, err;
+
+ AQ_DBG_ENTER();
+ softc = iflib_get_softc(ctx);
+ hw = &softc->hw;
+- ifp = iflib_get_ifp(ctx);
+
+ err = aq_hw_init(&softc->hw, softc->hw.mac_addr, softc->msix,
+ softc->scctx->isc_intr == IFLIB_INTR_MSIX);
+@@ -735,6 +733,23 @@ static uint64_t aq_if_get_counter(if_ctx_t ctx, ift_co
}
}
+#if __FreeBSD_version >= 1300054
-+static u_int aq_mc_filter_apply(void *arg, struct sockaddr_dl *dl, int count)
++static u_int aq_mc_filter_apply(void *arg, struct sockaddr_dl *dl, u_int count)
+{
+ struct aq_dev *softc = arg;
+ struct aq_hw *hw = &softc->hw;
@@ -20,14 +79,14 @@ https://github.com/Aquantia/aqtion-freebsd/pull/11
+ mac_addr = LLADDR(dl);
+ aq_hw_mac_addr_set(hw, mac_addr, count + 1);
+
-+ aq_log_detail("set %d mc address %6D", count + 1, mac_addr, ":");
++ aq_log_detail("set %u mc address %6D", count + 1, mac_addr, ":");
+ return (1);
+}
+#else
static int aq_mc_filter_apply(void *arg, struct ifmultiaddr *ifma, int count)
{
struct aq_dev *softc = arg;
-@@ -752,6 +769,7 @@ static int aq_mc_filter_apply(void *arg, struct ifmult
+@@ -752,6 +767,7 @@ static int aq_mc_filter_apply(void *arg, struct ifmult
aq_log_detail("set %d mc address %6D", count + 1, mac_addr, ":");
return (1);
}
@@ -35,7 +94,7 @@ https://github.com/Aquantia/aqtion-freebsd/pull/11
static bool aq_is_mc_promisc_required(struct aq_dev *softc)
{
-@@ -764,15 +782,22 @@ static void aq_if_multi_set(if_ctx_t ctx)
+@@ -764,15 +780,22 @@ static void aq_if_multi_set(if_ctx_t ctx)
struct ifnet *ifp = iflib_get_ifp(ctx);
struct aq_hw *hw = &softc->hw;
AQ_DBG_ENTER();
@@ -59,3 +118,16 @@ https://github.com/Aquantia/aqtion-freebsd/pull/11
}
AQ_DBG_EXIT(0);
}
+@@ -825,12 +848,10 @@ static int aq_if_promisc_set(if_ctx_t ctx, int flags)
+ static int aq_if_promisc_set(if_ctx_t ctx, int flags)
+ {
+ struct aq_dev *softc;
+- struct ifnet *ifp;
+
+ AQ_DBG_ENTER();
+
+ softc = iflib_get_softc(ctx);
+- ifp = iflib_get_ifp(softc->ctx);
+
+ aq_hw_set_promisc(&softc->hw, !!(flags & IFF_PROMISC),
+ aq_is_vlan_promisc_required(softc),
diff --git a/net/aquantia-atlantic-kmod/files/patch-aq__ring.c b/net/aquantia-atlantic-kmod/files/patch-aq__ring.c
new file mode 100644
index 000000000000..bc01c89d484e
--- /dev/null
+++ b/net/aquantia-atlantic-kmod/files/patch-aq__ring.c
@@ -0,0 +1,23 @@
+--- aq_ring.c.orig 2022-05-13 21:22:45 UTC
++++ aq_ring.c
+@@ -456,8 +456,8 @@ static int aq_isc_txd_encap(void *arg, if_pkt_info_t p
+ aq_tx_desc_t *txd = NULL;
+ bus_dma_segment_t *segs;
+ qidx_t pidx;
+- uint32_t hdrlen=0, pay_len, eop;
+- uint8_t tx_cmd = 0, ct_en, ct_idx;
++ uint32_t hdrlen=0, pay_len;
++ uint8_t tx_cmd = 0;
+ int i, desc_count = 0;
+
+ AQ_DBG_ENTERA("[%d] start=%d", pi->ipi_qsidx, pi->ipi_pidx);
+@@ -469,9 +469,6 @@ static int aq_isc_txd_encap(void *arg, if_pkt_info_t p
+ AQ_DBG_PRINT("txc at 0x%p, txd at 0x%p len %d", txc, txd, pi->ipi_len);
+
+ pay_len = pi->ipi_len;
+- eop = 0;
+- ct_en = 0;
+- ct_idx = 0;
+
+ txc->flags1 = 0U;
+ txc->flags2 = 0U;
diff --git a/net/arataga/Makefile b/net/arataga/Makefile
index 67c222cfac09..ad3c860503e9 100644
--- a/net/arataga/Makefile
+++ b/net/arataga/Makefile
@@ -37,7 +37,7 @@ GH_ACCOUNT= Stiffstream
GH_PROJECT= noexcept-ctcheck:nectc restinio:rinio so5extra:so5e
GH_TAGNAME= v.1.0.0:nectc v.0.6.13:rinio v.1.4.1:so5e
-_SO5_LIBVER= 5.7.3
+_SO5_LIBVER= 5.7.4.1
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= *.md
diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile
index 54e41ada0574..9f60db642595 100644
--- a/net/asterisk-chan_sccp/Makefile
+++ b/net/asterisk-chan_sccp/Makefile
@@ -18,7 +18,7 @@ FLAVOR?= ${FLAVORS:[1]}
LIB_DEPENDS= libltdl.so:devel/libltdl
-USES= autoreconf compiler:c11 gettext-tools iconv libtool \
+USES= autoreconf:2.69 compiler:c11 gettext-tools iconv libtool \
localbase ssl
USE_GITHUB= yes
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 618c2ca48415..f334a33c9dfc 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,5 +1,5 @@
PORTNAME= asterisk
-PORTVERSION= 16.23.0
+PORTVERSION= 16.27.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -19,7 +19,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
libjansson.so:devel/jansson
USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \
- shebangfix sqlite ssl ncurses
+ pkgconfig shebangfix sqlite ssl ncurses
USE_GNOME= libxml2
USE_LDCONFIG= yes
USE_RC_SUBR= asterisk
@@ -27,7 +27,7 @@ USE_GITHUB= nodefault
EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX}
-PJSIP_VERSION= 2.10
+PJSIP_VERSION= 2.12
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datarootdir=${DATADIR} \
--with-ilbc=internal \
@@ -65,11 +65,16 @@ OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQ
OPTIONS_DEFINE_i386= DAHDI
OPTIONS_DEFINE_amd64= DAHDI
OPTIONS_DEFINE_sparc64= DAHDI
+OPTIONS_DEFINE_powerpc= DAHDI
+OPTIONS_DEFINE_powerpc64= DAHDI
+OPTIONS_DEFINE_powerpc64le= DAHDI
OPTIONS_DEFAULT_i386= DAHDI XMPP
OPTIONS_DEFAULT_amd64= DAHDI XMPP
OPTIONS_DEFAULT_sparc64= DAHDI XMPP
-OPTIONS_DEFAULT_powerpc= XMPP
+OPTIONS_DEFAULT_powerpc= DAHDI XMPP
+OPTIONS_DEFAULT_powerpc64= DAHDI XMPP
+OPTIONS_DEFAULT_powerpc64le= DAHDI XMPP
OPTIONS_GROUP= CODECS
OPTIONS_GROUP_CODECS= GSM NEWG711 OPUS SPEEX VORBIS
@@ -161,7 +166,6 @@ PGSQL_CONFIGURE_WITH= postgres
PGSQL_USES= pgsql
PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled
-PJSIP_USES= pkgconfig
PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \
libspeex.so:audio/speex \
libspeexdsp.so:audio/speexdsp
@@ -240,6 +244,8 @@ post-extract-OPUS-on:
post-patch:
@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
+ @${REINPLACE_CMD} -e 's/@XMLSTARLET@//' ${WRKSRC}/makeopts.in
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/main/term.c
.if exists(${FILESDIR}/.asterisk.makeopts)
${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
.endif
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 8b9bfb05ed8e..c01c7e003982 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1639080465
-SHA256 (asterisk/asterisk-16.23.0.tar.gz) = c2ad32bdf45bfc297a4f172cd9a6a98e53c30c75f5f916cbd1ba2e24e0df8054
-SIZE (asterisk/asterisk-16.23.0.tar.gz) = 27960909
+TIMESTAMP = 1656004905
+SHA256 (asterisk/asterisk-16.27.0.tar.gz) = 050c86d983bb93d244351c479561d08c3ff0f99a885698a45d22ee97327457e6
+SIZE (asterisk/asterisk-16.27.0.tar.gz) = 28014649
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
SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044
-SHA256 (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de
-SIZE (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 8768705
+SHA256 (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a
+SIZE (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = 9658564
diff --git a/net/asterisk16/files/asterisk.in b/net/asterisk16/files/asterisk.in
index aaa2ce8cdd8f..5fab82c5700e 100644
--- a/net/asterisk16/files/asterisk.in
+++ b/net/asterisk16/files/asterisk.in
@@ -69,7 +69,7 @@ asterisk_stop()
if [ ${asterisk_stopsleep} -gt 0 ]; then
sleep ${asterisk_stopsleep}
fi
- $command -nqrx 'core stop now'
+ $command -rx 'core stop now'
wait_for_pids $rc_pid
}
@@ -80,7 +80,7 @@ asterisk_reload()
return 1
fi
echo 'Reloading asterisk.'
- $command -nqrx 'reload'
+ $command -rx 'reload'
}
run_rc_command "$1"
diff --git a/net/asterisk16/files/patch-build__tools_make__xml__documentation b/net/asterisk16/files/patch-build__tools_make__xml__documentation
new file mode 100644
index 000000000000..9b6dec995449
--- /dev/null
+++ b/net/asterisk16/files/patch-build__tools_make__xml__documentation
@@ -0,0 +1,11 @@
+--- build_tools/make_xml_documentation.orig 2022-03-17 15:34:42 UTC
++++ build_tools/make_xml_documentation
+@@ -228,7 +228,7 @@ for subdir in ${mod_subdirs} ; do
+ ${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }
+ fi
+ fi
+- ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
++ ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
+ done
+ done
+ echo "</docs>" >> "${output_file}"
diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
index 423e14aad59a..035ad3df2fe0 100644
--- a/net/asterisk16/files/patch-configure
+++ b/net/asterisk16/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2020-07-09 15:39:17 UTC
+--- configure.orig 2022-05-05 14:21:18 UTC
+++ configure
-@@ -4687,8 +4687,6 @@ case "${host_os}" in
+@@ -5148,8 +5148,6 @@ case "${host_os}" in
;;
dragonfly*|freebsd*)
ac_default_prefix=/usr/local
@@ -9,7 +9,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -20355,6 +20353,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
+@@ -22951,6 +22949,8 @@ printf %s "checking for getifaddrs() support... " >&6;
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17,34 +17,35 @@
+ #include <sys/socket.h>
#include <ifaddrs.h>
int
- main ()
-@@ -29514,6 +29514,8 @@ fi
+ main (void)
+@@ -32266,6 +32266,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
- for ver in 5.3 5.2 5.1; do
+ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
+vernodot=`echo ${ver} | sed 's/\.//'`
+
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
-@@ -29528,13 +29530,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -32280,14 +32282,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
--$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
-+$as_echo_n "checking for luaL_newstate in -llua-${ver}... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
- else
+ as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
+-printf %s "checking for luaL_newstate in -llua${ver}... " >&6; }
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
++printf %s "checking for luaL_newstate in -llua-${ver}... " >&6; }
+ if eval test \${$as_ac_Lib+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"
+LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -29576,7 +29578,7 @@ fi
+@@ -32328,7 +32330,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -53,18 +54,18 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29586,8 +29588,8 @@ fi
+@@ -32338,8 +32340,8 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-- as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
-+ as_ac_Header=`$as_echo "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
- if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+- as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
++ as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"
+ then :
LUA_HEADER_FOUND=1
- else
-@@ -29614,9 +29616,9 @@ fi
+@@ -32366,9 +32368,9 @@ fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
diff --git a/net/asterisk16/files/patch-main_term.c b/net/asterisk16/files/patch-main_term.c
new file mode 100644
index 000000000000..dc7ede7d4e12
--- /dev/null
+++ b/net/asterisk16/files/patch-main_term.c
@@ -0,0 +1,10 @@
+--- main/term.c.orig 2022-04-14 21:53:34 UTC
++++ main/term.c
+@@ -46,6 +46,7 @@ static const char * const termpath[] = {
+ static char quitdata[80] = "";
+
+ static const char * const termpath[] = {
++ "%%LOCALBASE%%/share/terminfo",
+ "/usr/share/terminfo",
+ "/usr/local/share/misc/terminfo",
+ "/usr/lib/terminfo",
diff --git a/net/asterisk16/files/patch-menuselect_configure b/net/asterisk16/files/patch-menuselect_configure
new file mode 100644
index 000000000000..30b3d50d7a34
--- /dev/null
+++ b/net/asterisk16/files/patch-menuselect_configure
@@ -0,0 +1,11 @@
+--- menuselect/configure.orig 2022-05-12 11:47:40 UTC
++++ menuselect/configure
+@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; }
+ printf "%s\n" "yes" >&6; }
+
+ PBX_LIBXML2=1
+- LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | $SED -e "s|-std=c99||g")
++ LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | sed -e "s|-std=c99||g")
+ LIBXML2_LIB="$LIBXML2_LIBS"
+
+ printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
diff --git a/net/asterisk16/files/patch-res_res__fax__spandsp.c b/net/asterisk16/files/patch-res_res__fax__spandsp.c
deleted file mode 100644
index 7efe45d3e616..000000000000
--- a/net/asterisk16/files/patch-res_res__fax__spandsp.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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/asterisk16/files/patch-third-party_pjproject_Makefile b/net/asterisk16/files/patch-third-party_pjproject_Makefile
index fc1b47d6e802..45ae5db97c97 100644
--- a/net/asterisk16/files/patch-third-party_pjproject_Makefile
+++ b/net/asterisk16/files/patch-third-party_pjproject_Makefile
@@ -1,8 +1,8 @@
---- third-party/pjproject/Makefile.orig 2020-07-09 15:39:17 UTC
+--- third-party/pjproject/Makefile.orig 2022-02-03 12:19:37 UTC
+++ third-party/pjproject/Makefile
-@@ -88,14 +88,10 @@ _all: $(TARGETS)
+@@ -88,15 +88,11 @@ SHELL_ECHO_PREFIX := echo '[pjproject] '
- .DELETE_ON_ERROR:
+ _all: $(TARGETS)
-$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak
- $(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\
@@ -12,12 +12,14 @@
+ @true
source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
-- $(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\
-- $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
- $(ECHO_PREFIX) Unpacking $<
- -@rm -rf source pjproject-*/ >/dev/null 2>&1
- $(CMD_PREFIX) $(TAR) -xjf $<
-@@ -155,7 +151,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES)
+- $(CMD_PREFIX) \
+- $(TARBALL_VERIFY) || (rm -rf $@ ; $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) ;\
+- $(SHELL_ECHO_PREFIX) Unpacking $< ;\
++ $(SHELL_ECHO_PREFIX) Unpacking $< ;\
+ rm -rf source pjproject-*/ $(REALLY_QUIET) || : ;\
+ $(TAR) -xjf $< ;\
+ mv pjproject-$(PJPROJECT_VERSION) source
+@@ -202,7 +198,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ
pjproject.symbols: $(ALL_LIB_FILES)
$(ECHO_PREFIX) Generating symbols
diff --git a/net/asterisk16/pkg-message b/net/asterisk16/pkg-message
index 5b79202b6b21..c32bcc7656ec 100644
--- a/net/asterisk16/pkg-message
+++ b/net/asterisk16/pkg-message
@@ -33,6 +33,10 @@
* https://wiki.asterisk.org/wiki/display/AST/Using+Menuselect+to+Select+Asterisk+Options
* http://www.asteriskdocs.org/en/3rd_Edition/asterisk-book-html-chunk/installing_base_configuration.html#Installing_id293213
+
+ NOTE: To get color output in the asterisk console you need to install
+ the misc/terminfo-db port
+
EOM
}
]
diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile
index a88c35fc59c0..00b091245c4c 100644
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@@ -1,5 +1,5 @@
PORTNAME= asterisk
-PORTVERSION= 18.9.0
+PORTVERSION= 18.13.0
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
@@ -19,7 +19,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
libjansson.so:devel/jansson
USES= bison compiler:c11 cpe gmake gnome iconv libedit localbase \
- shebangfix sqlite ssl ncurses
+ pkgconfig shebangfix sqlite ssl ncurses
USE_GNOME= libxml2
USE_LDCONFIG= yes
USE_RC_SUBR= asterisk
@@ -27,7 +27,7 @@ USE_GITHUB= nodefault
EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX}
-PJSIP_VERSION= 2.10
+PJSIP_VERSION= 2.12
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datarootdir=${DATADIR} \
--with-ilbc=internal \
@@ -60,16 +60,21 @@ OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO
SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP
OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \
PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \
- VORBIS XMLDOC
+ VORBIS XMLDOC
OPTIONS_DEFINE_i386= DAHDI
OPTIONS_DEFINE_amd64= DAHDI
OPTIONS_DEFINE_sparc64= DAHDI
+OPTIONS_DEFINE_powerpc= DAHDI
+OPTIONS_DEFINE_powerpc64= DAHDI
+OPTIONS_DEFINE_powerpc64le= DAHDI
OPTIONS_DEFAULT_i386= DAHDI XMPP
OPTIONS_DEFAULT_amd64= DAHDI XMPP
OPTIONS_DEFAULT_sparc64= DAHDI XMPP
-OPTIONS_DEFAULT_powerpc= XMPP
+OPTIONS_DEFAULT_powerpc= DAHDI XMPP
+OPTIONS_DEFAULT_powerpc64= DAHDI XMPP
+OPTIONS_DEFAULT_powerpc64le= DAHDI XMPP
OPTIONS_GROUP= CODECS
OPTIONS_GROUP_CODECS= GSM NEWG711 OPUS SPEEX VORBIS
@@ -161,7 +166,6 @@ PGSQL_CONFIGURE_WITH= postgres
PGSQL_USES= pgsql
PJSIP_CONFIGURE_WITH= pjproject pjproject-bundled
-PJSIP_USES= pkgconfig
PJSIP_LIB_DEPENDS= libsrtp2.so:net/libsrtp2 \
libspeex.so:audio/speex \
libspeexdsp.so:audio/speexdsp
@@ -240,6 +244,8 @@ post-extract-OPUS-on:
post-patch:
@${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
+ @${REINPLACE_CMD} -e 's/@XMLSTARLET@//' ${WRKSRC}/makeopts.in
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/main/term.c
.if exists(${FILESDIR}/.asterisk.makeopts)
${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts
.endif
diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo
index 5e7d94947c62..9205af26e9ac 100644
--- a/net/asterisk18/distinfo
+++ b/net/asterisk18/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1639080727
-SHA256 (asterisk/asterisk-18.9.0.tar.gz) = 6db6d295d5b99318a68a6c36e797c3a784e921670945acc7202542317ebffaef
-SIZE (asterisk/asterisk-18.9.0.tar.gz) = 28045278
+TIMESTAMP = 1656004930
+SHA256 (asterisk/asterisk-18.13.0.tar.gz) = 92681b928b75309860ebfd192ad8d1db3df3cdaebab401a2abc666ffaea096bf
+SIZE (asterisk/asterisk-18.13.0.tar.gz) = 28127627
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
SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000
SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded
SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044
-SHA256 (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de
-SIZE (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 8768705
+SHA256 (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a
+SIZE (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = 9658564
diff --git a/net/asterisk18/files/asterisk.in b/net/asterisk18/files/asterisk.in
index aaa2ce8cdd8f..5fab82c5700e 100644
--- a/net/asterisk18/files/asterisk.in
+++ b/net/asterisk18/files/asterisk.in
@@ -69,7 +69,7 @@ asterisk_stop()
if [ ${asterisk_stopsleep} -gt 0 ]; then
sleep ${asterisk_stopsleep}
fi
- $command -nqrx 'core stop now'
+ $command -rx 'core stop now'
wait_for_pids $rc_pid
}
@@ -80,7 +80,7 @@ asterisk_reload()
return 1
fi
echo 'Reloading asterisk.'
- $command -nqrx 'reload'
+ $command -rx 'reload'
}
run_rc_command "$1"
diff --git a/net/asterisk18/files/patch-build__tools_make__xml__documentation b/net/asterisk18/files/patch-build__tools_make__xml__documentation
new file mode 100644
index 000000000000..c11eac024b64
--- /dev/null
+++ b/net/asterisk18/files/patch-build__tools_make__xml__documentation
@@ -0,0 +1,11 @@
+--- build_tools/make_xml_documentation.orig 2022-03-17 15:40:57 UTC
++++ build_tools/make_xml_documentation
+@@ -228,7 +228,7 @@ for subdir in ${mod_subdirs} ; do
+ ${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" || { echo "" ; exit 1 ; }
+ fi
+ fi
+- ${SED} -r "/^\s*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
++ ${SED} -r "/^[[:space:]]*(<[?]xml|<.DOCTYPE|<.?docs)/d" "${i}" >> "${output_file}"
+ done
+ done
+ echo "</docs>" >> "${output_file}"
diff --git a/net/asterisk18/files/patch-configure b/net/asterisk18/files/patch-configure
index 423e14aad59a..a66863381c74 100644
--- a/net/asterisk18/files/patch-configure
+++ b/net/asterisk18/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2020-07-09 15:39:17 UTC
+--- configure.orig 2022-05-05 17:09:31 UTC
+++ configure
-@@ -4687,8 +4687,6 @@ case "${host_os}" in
+@@ -5156,8 +5156,6 @@ case "${host_os}" in
;;
dragonfly*|freebsd*)
ac_default_prefix=/usr/local
@@ -9,7 +9,7 @@
;;
openbsd*)
ac_default_prefix=/usr/local
-@@ -20355,6 +20353,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
+@@ -22983,6 +22981,8 @@ printf %s "checking for getifaddrs() support... " >&6;
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17,34 +17,35 @@
+ #include <sys/socket.h>
#include <ifaddrs.h>
int
- main ()
-@@ -29514,6 +29514,8 @@ fi
+ main (void)
+@@ -32380,6 +32380,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
- for ver in 5.3 5.2 5.1; do
+ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
+vernodot=`echo ${ver} | sed 's/\.//'`
+
if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
pbxlibdir=""
# if --with-LUA=DIR has been specified, use it.
-@@ -29528,13 +29530,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -32394,14 +32396,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} "
- as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
--$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
-+$as_echo_n "checking for luaL_newstate in -llua-${ver}... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
- else
+ as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh`
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5
+-printf %s "checking for luaL_newstate in -llua${ver}... " >&6; }
++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5
++printf %s "checking for luaL_newstate in -llua-${ver}... " >&6; }
+ if eval test \${$as_ac_Lib+y}
+ then :
+ printf %s "(cached) " >&6
+ else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS"
+LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -29576,7 +29578,7 @@ fi
+@@ -32442,7 +32444,7 @@ fi
# now check for the header.
if test "${AST_LUA_FOUND}" = "yes"; then
@@ -53,18 +54,18 @@
# if --with-LUA=DIR has been specified, use it.
if test "x${LUA_DIR}" != "x"; then
LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29586,8 +29588,8 @@ fi
+@@ -32452,8 +32454,8 @@ fi
# check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
-- as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
--ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
-+ as_ac_Header=`$as_echo "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
- if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+- as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default"
++ as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default"
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"
+ then :
LUA_HEADER_FOUND=1
- else
-@@ -29614,9 +29616,9 @@ fi
+@@ -32480,9 +32482,9 @@ fi
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
diff --git a/net/asterisk18/files/patch-main_term.c b/net/asterisk18/files/patch-main_term.c
new file mode 100644
index 000000000000..dc7ede7d4e12
--- /dev/null
+++ b/net/asterisk18/files/patch-main_term.c
@@ -0,0 +1,10 @@
+--- main/term.c.orig 2022-04-14 21:53:34 UTC
++++ main/term.c
+@@ -46,6 +46,7 @@ static const char * const termpath[] = {
+ static char quitdata[80] = "";
+
+ static const char * const termpath[] = {
++ "%%LOCALBASE%%/share/terminfo",
+ "/usr/share/terminfo",
+ "/usr/local/share/misc/terminfo",
+ "/usr/lib/terminfo",
diff --git a/net/asterisk18/files/patch-menuselect_configure b/net/asterisk18/files/patch-menuselect_configure
new file mode 100644
index 000000000000..0447a4c09766
--- /dev/null
+++ b/net/asterisk18/files/patch-menuselect_configure
@@ -0,0 +1,11 @@
+--- menuselect/configure.orig 2022-05-12 11:50:59 UTC
++++ menuselect/configure
+@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; }
+ printf "%s\n" "yes" >&6; }
+
+ PBX_LIBXML2=1
+- LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | $SED -e "s|-std=c99||g")
++ LIBXML2_INCLUDE=$(echo ${LIBXML2_CFLAGS} | sed -e "s|-std=c99||g")
+ LIBXML2_LIB="$LIBXML2_LIBS"
+
+ printf "%s\n" "#define HAVE_LIBXML2 1" >>confdefs.h
diff --git a/net/asterisk18/files/patch-res_res__fax__spandsp.c b/net/asterisk18/files/patch-res_res__fax__spandsp.c
deleted file mode 100644
index 5ad7b22a40ad..000000000000
--- a/net/asterisk18/files/patch-res_res__fax__spandsp.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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/asterisk18/files/patch-third-party_pjproject_Makefile b/net/asterisk18/files/patch-third-party_pjproject_Makefile
index 84f44591cb0e..dcfd4d618e80 100644
--- a/net/asterisk18/files/patch-third-party_pjproject_Makefile
+++ b/net/asterisk18/files/patch-third-party_pjproject_Makefile
@@ -1,8 +1,8 @@
---- third-party/pjproject/Makefile.orig 2020-09-09 15:43:27 UTC
+--- third-party/pjproject/Makefile.orig 2022-02-03 12:25:09 UTC
+++ third-party/pjproject/Makefile
-@@ -98,14 +98,10 @@ _all: $(TARGETS)
+@@ -98,15 +98,11 @@ SHELL_ECHO_PREFIX := echo '[pjproject] '
- .DELETE_ON_ERROR:
+ _all: $(TARGETS)
-$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak
- $(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\
@@ -12,12 +12,14 @@
+ @true
source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
-- $(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\
-- $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
- $(ECHO_PREFIX) Unpacking $<
- -@rm -rf source pjproject-*/ >/dev/null 2>&1
- $(CMD_PREFIX) $(TAR) -xjf $<
-@@ -165,7 +161,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES)
+- $(CMD_PREFIX) \
+- $(TARBALL_VERIFY) || (rm -rf $@ ; $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) ;\
+- $(SHELL_ECHO_PREFIX) Unpacking $< ;\
++ $(SHELL_ECHO_PREFIX) Unpacking $< ;\
+ rm -rf source pjproject-*/ $(REALLY_QUIET) || : ;\
+ $(TAR) -xjf $< ;\
+ mv pjproject-$(PJPROJECT_VERSION) source
+@@ -212,7 +208,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ
pjproject.symbols: $(ALL_LIB_FILES)
$(ECHO_PREFIX) Generating symbols
diff --git a/net/asterisk18/pkg-message b/net/asterisk18/pkg-message
index 5b79202b6b21..c32bcc7656ec 100644
--- a/net/asterisk18/pkg-message
+++ b/net/asterisk18/pkg-message
@@ -33,6 +33,10 @@
* https://wiki.asterisk.org/wiki/display/AST/Using+Menuselect+to+Select+Asterisk+Options
* http://www.asteriskdocs.org/en/3rd_Edition/asterisk-book-html-chunk/installing_base_configuration.html#Installing_id293213
+
+ NOTE: To get color output in the asterisk console you need to install
+ the misc/terminfo-db port
+
EOM
}
]
diff --git a/net/asterisk18/pkg-plist b/net/asterisk18/pkg-plist
index a376b7f08236..73c2dc1911e7 100644
--- a/net/asterisk18/pkg-plist
+++ b/net/asterisk18/pkg-plist
@@ -1,5 +1,6 @@
@sample %%ETCDIR%%/acl.conf.sample
@sample %%ETCDIR%%/adsi.conf.sample
+@sample %%ETCDIR%%/aeap.conf.sample
@sample %%ETCDIR%%/agents.conf.sample
@sample %%ETCDIR%%/alarmreceiver.conf.sample
@sample %%ETCDIR%%/alsa.conf.sample
@@ -257,6 +258,8 @@ include/asterisk/poll-compat.h
include/asterisk/presencestate.h
include/asterisk/privacy.h
include/asterisk/pval.h
+include/asterisk/res_aeap.h
+include/asterisk/res_aeap_message.h
include/asterisk/res_audiosocket.h
include/asterisk/res_fax.h
include/asterisk/res_hep.h
diff --git a/net/axa/Makefile b/net/axa/Makefile
index 825adef4abf8..05ad51ec9a72 100644
--- a/net/axa/Makefile
+++ b/net/axa/Makefile
@@ -1,6 +1,6 @@
PORTNAME= axa
PORTVERSION= 2.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net dns
MASTER_SITES= FARSIGHT LOCAL/truckman/farsight
@@ -12,6 +12,8 @@ LICENSE_COMB= multi
LICENSE_FILE_APACHE20= ${WRKSRC}/copyright
LICENSE_FILE_PD= ${WRKSRC}/license_pd
+BROKEN_aarch64= alignment error at link time
+
BUILD_DEPENDS= bash:shells/bash \
sie-nmsg>0:net/sie-nmsg
LIB_DEPENDS= liblmdb.so:databases/lmdb \
diff --git a/net/bctoolbox/Makefile b/net/bctoolbox/Makefile
index 5a44f4ea6a17..287d2973c0c8 100644
--- a/net/bctoolbox/Makefile
+++ b/net/bctoolbox/Makefile
@@ -1,24 +1,27 @@
PORTNAME= bctoolbox
-PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTVERSION= 5.1.38
+PORTREVISION= 1
CATEGORIES= net
-MASTER_SITES= https://www.linphone.org/releases/sources/bctoolbox/
+MASTER_SITES= https://gitlab.linphone.org/BC/public/${PORTNAME}/-/archive/${PORTVERSION}/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= bofh@FreeBSD.org
COMMENT= Belledonne Communications utility library
-LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= mbedtls>=2.3.0_2:security/mbedtls
-LIB_DEPENDS= libmbedtls.so:security/mbedtls
+LIB_DEPENDS= libbcunit.so:devel/bcunit \
+ libmbedtls.so:security/mbedtls
USES= cmake compiler:c++11-lib
USE_LDCONFIG= yes
-CFLAGS+= -DHAVE_ARC4RANDOM
CMAKE_ARGS= -DENABLE_STATIC=NO -DENABLE_STRICT=NO \
- -DENABLE_TESTS_COMPONENT=NO
+ -DCMAKE_PREFIX_PATH=${LOCALBASE} \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON
+
+CFLAGS+= -DHAVE_ARC4RANDOM
post-patch:
@${REINPLACE_CMD} '/clock_gettime/d' ${WRKSRC}/CMakeLists.txt
diff --git a/net/bctoolbox/distinfo b/net/bctoolbox/distinfo
index 551da5d7beaf..8979d3a671be 100644
--- a/net/bctoolbox/distinfo
+++ b/net/bctoolbox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505998461
-SHA256 (bctoolbox-0.6.0.tar.gz) = 4657e1970df262f77e47dee63b1135a5e063b63b0c42cfe7f41642b22e3831a8
-SIZE (bctoolbox-0.6.0.tar.gz) = 111344
+TIMESTAMP = 1655299638
+SHA256 (bctoolbox-5.1.38.tar.gz) = 4301b2f9caf7d6f63c381476f69296ed7676dbe384683cba545b866e567c56b1
+SIZE (bctoolbox-5.1.38.tar.gz) = 181516
diff --git a/net/bctoolbox/files/patch-src-CMakeLists.txt b/net/bctoolbox/files/patch-src-CMakeLists.txt
index c8969d2f44a8..2ae0a23516fa 100644
--- a/net/bctoolbox/files/patch-src-CMakeLists.txt
+++ b/net/bctoolbox/files/patch-src-CMakeLists.txt
@@ -1,6 +1,6 @@
---- src/CMakeLists.txt.orig 2017-07-17 12:16:03 UTC
+--- src/CMakeLists.txt.orig 2022-05-27 19:35:26 UTC
+++ src/CMakeLists.txt
-@@ -119,6 +119,7 @@ if(ENABLE_SHARED)
+@@ -177,6 +177,7 @@ if(ENABLE_SHARED)
)
endif()
endif()
diff --git a/net/bctoolbox/files/patch-src-utils-port.c b/net/bctoolbox/files/patch-src-utils-port.c
index 755fd32a214c..c6bc479b4ef7 100644
--- a/net/bctoolbox/files/patch-src-utils-port.c
+++ b/net/bctoolbox/files/patch-src-utils-port.c
@@ -1,6 +1,6 @@
---- src/utils/port.c.orig 2017-07-17 12:16:03 UTC
+--- src/utils/port.c.orig 2022-05-27 19:35:26 UTC
+++ src/utils/port.c
-@@ -1331,7 +1331,7 @@ void bctbx_sockaddr_remove_nat64_mapping(const struct
+@@ -1438,7 +1438,7 @@ void bctbx_sockaddr_remove_nat64_mapping(const struct
if (htonl(0x0064ff9b) ==
#ifdef _MSC_VER
((in6->sin6_addr.u.Word[0] << 16) & in6->sin6_addr.u.Word[1])
diff --git a/net/bctoolbox/pkg-descr b/net/bctoolbox/pkg-descr
index f452be1a185e..53b138dd0a5f 100644
--- a/net/bctoolbox/pkg-descr
+++ b/net/bctoolbox/pkg-descr
@@ -1,3 +1,4 @@
-Belledonne Communications utility library.
+Utilities library used by Belledonne Communications softwares like
+belle-sip, mediastreamer2 and liblinphone.
-WWW: https://www.linphone.org/
+WWW: https://gitlab.linphone.org/BC/public/bctoolbox
diff --git a/net/bctoolbox/pkg-plist b/net/bctoolbox/pkg-plist
index afbada4891d4..295b3edfd659 100644
--- a/net/bctoolbox/pkg-plist
+++ b/net/bctoolbox/pkg-plist
@@ -1,20 +1,34 @@
+include/bctoolbox/charconv.h
+include/bctoolbox/compiler.h
include/bctoolbox/crypto.h
+include/bctoolbox/crypto.hh
include/bctoolbox/defs.h
include/bctoolbox/exception.hh
include/bctoolbox/list.h
include/bctoolbox/logging.h
include/bctoolbox/map.h
+include/bctoolbox/param_string.h
include/bctoolbox/parser.h
include/bctoolbox/port.h
+include/bctoolbox/regex.h
+include/bctoolbox/tester.h
+include/bctoolbox/utils.hh
include/bctoolbox/vconnect.h
include/bctoolbox/vfs.h
+include/bctoolbox/vfs_encrypted.hh
+include/bctoolbox/vfs_standard.h
lib/libbctoolbox.so
lib/libbctoolbox.so.1
+lib/libbctoolbox-tester.so
+lib/libbctoolbox-tester.so.1
libdata/pkgconfig/bctoolbox.pc
+libdata/pkgconfig/bctoolbox-tester.pc
+%%DATADIR%%/cmake/ConfigureSpecfile.cmake
+%%DATADIR%%/cmake/MakeArchive.cmake
+%%DATADIR%%/cmake/bctoolboxCMakeUtils.cmake
+%%DATADIR%%/cmake/bctoolboxConfig.cmake
+%%DATADIR%%/cmake/bctoolboxConfigVersion.cmake
+%%DATADIR%%/cmake/bctoolboxTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/cmake/bctoolboxTargets.cmake
%%DATADIR%%/cmake/BcGitVersion.cmake
-%%DATADIR%%/cmake/BcToolboxCMakeUtils.cmake
-%%DATADIR%%/cmake/BcToolboxConfig.cmake
-%%DATADIR%%/cmake/BcToolboxConfigVersion.cmake
-%%DATADIR%%/cmake/BcToolboxTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATADIR%%/cmake/BcToolboxTargets.cmake
%%DATADIR%%/cmake/gitversion.h.in
diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile
index 5d7d89c93a03..c11be7e51c8c 100644
--- a/net/belle-sip/Makefile
+++ b/net/belle-sip/Makefile
@@ -1,33 +1,32 @@
PORTNAME= belle-sip
-PORTVERSION= 1.6.3
+DISTVERSION= 5.1.32
+PORTREVISION= 1
CATEGORIES= net java
-MASTER_SITES= https://www.linphone.org/releases/sources/belle-sip/ \
- http://www.antlr3.org/download/:source2
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- antlr-3.4-complete.jar:source2
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= bofh@FreeBSD.org
COMMENT= SIP (RFC 3261) implementation written in C
LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \
- libbctoolbox.so:net/bctoolbox
+ libbctoolbox.so:net/bctoolbox \
+ libbelr.so:textproc/belr
-USES= cmake cpe
+USES= cmake cpe tar:bz2
CPE_VENDOR= linphone
+USE_GITLAB= yes
+GL_SITE= https://gitlab.linphone.org/BC
+GL_ACCOUNT= public
+GL_COMMIT= 6cfa9cf048905756bb9e729ccc029ad19b36ca76
USE_JAVA= yes
-USE_LDCONFIG= yes
-
-CMAKE_ARGS= -DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TESTS=NO \
- -DANTLR3_JAR_PATH:FILEPATH=${WRKDIR}/antlr3.jar
JAVA_BUILD= jre
-WRKSRC= ${WRKDIR}/${DISTNAME}-0
+USE_LDCONFIG= yes
-post-extract:
- @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar
+CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
+ -DENABLE_STATIC=NO \
+ -DENABLE_STRICT=NO \
+ -DENABLE_TESTS=NO
post-patch:
@${REINPLACE_CMD} '/clock_gettime/d' ${WRKSRC}/CMakeLists.txt
diff --git a/net/belle-sip/distinfo b/net/belle-sip/distinfo
index dbadde2f8d91..ba6bd400bbe3 100644
--- a/net/belle-sip/distinfo
+++ b/net/belle-sip/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1506002640
-SHA256 (belle-sip-1.6.3.tar.gz) = 3f3807078b177e50a5ed97aaf8d7f6e77532df3205153e1b2957f557df9ba568
-SIZE (belle-sip-1.6.3.tar.gz) = 610200
-SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7
-SIZE (antlr-3.4-complete.jar) = 2388361
+TIMESTAMP = 1655320694
+SHA256 (public-belle-sip-6cfa9cf048905756bb9e729ccc029ad19b36ca76_GL0.tar.gz) = 2f6e5836c8663d66e35c0b4909031d5001b0e60222841bebf932384273721356
+SIZE (public-belle-sip-6cfa9cf048905756bb9e729ccc029ad19b36ca76_GL0.tar.gz) = 3747810
diff --git a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
index cf9490bf0c1a..cd486881507c 100644
--- a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
+++ b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c
@@ -1,7 +1,7 @@
---- src/belle_sip_headers_impl.c.orig 2016-08-11 09:23:59 UTC
+--- src/belle_sip_headers_impl.c.orig 2022-05-18 04:20:06 UTC
+++ src/belle_sip_headers_impl.c
-@@ -1672,11 +1672,6 @@ BELLESIP_EXPORT time_t belle_sip_header_
- char tmp2[16] ={0};
+@@ -1873,11 +1873,6 @@ BELLESIP_EXPORT time_t belle_sip_header_date_get_time(
+ char tmp2[17] ={0};
int i,j;
time_t seconds;
-#if defined(BELLE_SIP_WINDOWS_UNIVERSAL) || defined(BELLE_SIP_MSC_VER_GREATER_19)
@@ -10,17 +10,16 @@
- time_t adjust_timezone;
-#endif
-
/* time headers are in GMT as spec says */
-@@ -1698,26 +1693,12 @@ BELLESIP_EXPORT time_t belle_sip_header_
- return (time_t)-1;
+ sscanf(obj->date,"%3c,%d %16s %d %d:%d:%d",tmp1,&ret.tm_mday,tmp2,
+@@ -1899,25 +1894,11 @@ success:
success:
ret.tm_isdst=0;
--
+
-#if TARGET_IPHONE_SIMULATOR
- /* 'timezone' is buggy on iOS simulator, use the timegm() function to convert to UTC timestamp
- and discard the adjust timezone value */
- seconds = timegm(&ret);
+- seconds = timegm(&ret);
- adjust_timezone = 0;
-#else
- seconds = mktime(&ret);
@@ -31,7 +30,7 @@
-#endif
-#endif
-
- if (seconds==(time_t)-1){
+ if (seconds==(time_t)-1) {
- belle_sip_error("mktime() failed: %s",strerror(errno));
+ belle_sip_error("timegm() failed: %s",strerror(errno));
return (time_t)-1;
@@ -40,4 +39,4 @@
+ return seconds;
}
- BELLESIP_EXPORT void belle_sip_header_date_set_time(belle_sip_header_date_t *obj, const time_t *utc_time){
+ BELLESIP_EXPORT void belle_sip_header_date_set_time(belle_sip_header_date_t *obj, const time_t *utc_time) {
diff --git a/net/belle-sip/files/patch-src_belle__sip__internal.h b/net/belle-sip/files/patch-src_belle__sip__internal.h
index 51f8eddcda66..761204be2fa1 100644
--- a/net/belle-sip/files/patch-src_belle__sip__internal.h
+++ b/net/belle-sip/files/patch-src_belle__sip__internal.h
@@ -1,6 +1,6 @@
---- src/belle_sip_internal.h.orig 2015-10-19 11:43:47 UTC
+--- src/belle_sip_internal.h.orig 2022-05-18 04:20:06 UTC
+++ src/belle_sip_internal.h
-@@ -23,6 +23,7 @@
+@@ -25,6 +25,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <errno.h>
diff --git a/net/belle-sip/files/patch-src_dns.c b/net/belle-sip/files/patch-src_dns.c
deleted file mode 100644
index 1b7070ae4b69..000000000000
--- a/net/belle-sip/files/patch-src_dns.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dns.c.orig 2015-10-19 11:43:47 UTC
-+++ src/dns.c
-@@ -4345,6 +4345,7 @@ int dns_resconf_loadfromresolv(struct dn
- union res_sockaddr_union addresses[3];
- int i,error;
-
-+ memset(&res, 0, sizeof(res));
- if ((error = res_ninit(&res))) {
- return error;
- }
diff --git a/net/belle-sip/files/patch-src_dns_dns.c b/net/belle-sip/files/patch-src_dns_dns.c
new file mode 100644
index 000000000000..1d0afcd3c7c4
--- /dev/null
+++ b/net/belle-sip/files/patch-src_dns_dns.c
@@ -0,0 +1,29 @@
+--- src/dns/dns.c.orig 2022-06-15 16:24:13 UTC
++++ src/dns/dns.c
+@@ -5012,7 +5012,7 @@ static int guess_scope_id(void){
+ struct ifaddrs *ifp;
+ struct ifaddrs *ifpstart;
+ int scope_id = -1;
+-
++
+ if (getifaddrs(&ifpstart) < 0) {
+ return -1;
+ }
+@@ -5035,7 +5035,7 @@ static int guess_scope_id(void){
+ }
+ }
+ freeifaddrs(ifpstart);
+-
++
+ return scope_id;
+ }
+
+@@ -5044,7 +5044,7 @@ int dns_resconf_loadfromresolv(struct dns_resolv_conf
+ union res_sockaddr_union addresses[3];
+ int i,error,write_index;
+
+-
++ memset(&res, 0, sizeof(res));
+ if ((error = res_ninit(&res))) {
+ return error;
+ }
diff --git a/net/belle-sip/pkg-plist b/net/belle-sip/pkg-plist
index edce3a9205d7..de6d9cb1fc1e 100644
--- a/net/belle-sip/pkg-plist
+++ b/net/belle-sip/pkg-plist
@@ -14,8 +14,10 @@ include/belle-sip/list.h
include/belle-sip/listener.h
include/belle-sip/listeningpoint.h
include/belle-sip/mainloop.h
+include/belle-sip/mdns_register.h
include/belle-sip/message.h
include/belle-sip/object.h
+include/belle-sip/object++.hh
include/belle-sip/parameters.h
include/belle-sip/provider.h
include/belle-sip/refresher.h
@@ -27,9 +29,10 @@ include/belle-sip/types.h
include/belle-sip/utils.h
include/belle-sip/wakelock.h
lib/libbellesip.so
-lib/libbellesip.so.0
+lib/libbellesip.so.1
libdata/pkgconfig/belle-sip.pc
-share/BelleSIP/cmake/BelleSIPConfig.cmake
-share/BelleSIP/cmake/BelleSIPConfigVersion.cmake
-share/BelleSIP/cmake/BelleSIPTargets-%%CMAKE_BUILD_TYPE%%.cmake
-share/BelleSIP/cmake/BelleSIPTargets.cmake
+lib/cmake/BelleSIP/BelleSIPConfig.cmake
+lib/cmake/BelleSIP/BelleSIPConfigVersion.cmake
+lib/cmake/BelleSIP/BelleSIPTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/BelleSIP/BelleSIPTargets.cmake
+share/belr/grammars/sdp_grammar
diff --git a/net/bird2/Makefile b/net/bird2/Makefile
index 0ba12f96d705..db523094a910 100644
--- a/net/bird2/Makefile
+++ b/net/bird2/Makefile
@@ -1,8 +1,7 @@
# Created by: Alexander V. Chernikov <melifaro@FreeBSD.org>
PORTNAME= bird
-DISTVERSION= 2.0.8
-PORTREVISION= 1
+DISTVERSION= 2.0.9
CATEGORIES= net
MASTER_SITES= https://bird.network.cz/download/
PKGNAMESUFFIX= 2
@@ -59,8 +58,4 @@ STATIC_VARS= rt_prot+=static
CONFIGURE_ARGS+=--with-protocols="${RT_PROT}"
RPKI_LIB_DEPENDS= libssh.so:security/libssh
-post-patch:
- #${REINPLACE_CMD} -e 's|\.example|\.sample|g' ${WRKSRC}/Makefile.in
- #${MV} ${WRKSRC}/doc/bird.conf ${WRKSRC}/doc/bird.conf.sample
-
.include <bsd.port.mk>
diff --git a/net/bird2/distinfo b/net/bird2/distinfo
index 64f0806f6e4d..b7b8b6f8c8a0 100644
--- a/net/bird2/distinfo
+++ b/net/bird2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616395075
-SHA256 (bird-2.0.8.tar.gz) = 19d2de83ee25a307b9e5b9e58797dd68766d439bcee33e3ac617ed502370e7f6
-SIZE (bird-2.0.8.tar.gz) = 1135228
+TIMESTAMP = 1645441068
+SHA256 (bird-2.0.9.tar.gz) = 76786bbcded3061e1bb221b011f2cc00221ec063de9cda004a7d9b061a096d5e
+SIZE (bird-2.0.9.tar.gz) = 1282045
diff --git a/net/bird2/files/patch-Makefile.in b/net/bird2/files/patch-Makefile.in
index 8bddd6d09554..2f8db6f96b66 100644
--- a/net/bird2/files/patch-Makefile.in
+++ b/net/bird2/files/patch-Makefile.in
@@ -1,15 +1,11 @@
---- Makefile.in.orig 2021-03-21 22:29:42 UTC
+--- Makefile.in.orig 2022-02-21 11:12:46 UTC
+++ Makefile.in
-@@ -206,11 +206,7 @@ install: all
- for BIN in bird @CLIENT@ ; do \
+@@ -207,7 +207,7 @@ install: all
$(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ; \
done
-- if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \
+ if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then \
- $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ; \
-- else \
-- echo "Not overwriting old bird.conf" ; \
-- fi
-+ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.sample ; \
-
- install-docs:
- $(INSTALL) -d $(DESTDIR)/$(docdir)
++ $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@.sample ; \
+ else \
+ echo "Not overwriting old bird.conf" ; \
+ fi
diff --git a/net/bird2/files/patch-proto_babel_babel.c b/net/bird2/files/patch-proto_babel_babel.c
deleted file mode 100644
index 25cee54f7edc..000000000000
--- a/net/bird2/files/patch-proto_babel_babel.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- proto/babel/babel.c.orig 2021-04-16 21:18:15 UTC
-+++ proto/babel/babel.c
-@@ -1658,10 +1658,6 @@ babel_if_notify(struct proto *P, unsigned flags, struc
- if (!(iface->flags & IF_UP))
- return;
-
-- /* We only speak multicast */
-- if (!(iface->flags & IF_MULTICAST))
-- return;
--
- /* Ignore ifaces without link-local address */
- if (!iface->llv6)
- return;
-@@ -1734,10 +1730,6 @@ babel_reconfigure_ifaces(struct babel_proto *p, struct
- WALK_LIST(iface, iface_list)
- {
- if (!(iface->flags & IF_UP))
-- continue;
--
-- /* Ignore non-multicast ifaces */
-- if (!(iface->flags & IF_MULTICAST))
- continue;
-
- /* Ignore ifaces without link-local address */
diff --git a/net/bosh-bootloader/Makefile b/net/bosh-bootloader/Makefile
index d8af70c20aa4..ac4348b3956a 100644
--- a/net/bosh-bootloader/Makefile
+++ b/net/bosh-bootloader/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bosh-bootloader
PORTVERSION= 7.6.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net sysutils
MAINTAINER= dumbbell@FreeBSD.org
diff --git a/net/bosh-cli/Makefile b/net/bosh-cli/Makefile
index e4f9b85cc9d6..0c0d5c6e7d3c 100644
--- a/net/bosh-cli/Makefile
+++ b/net/bosh-cli/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bosh-cli
PORTVERSION= 5.5.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net sysutils
MAINTAINER= dumbbell@FreeBSD.org
diff --git a/net/bredbandskollen/Makefile b/net/bredbandskollen/Makefile
index 7a5b298db641..c5a50759ef5f 100644
--- a/net/bredbandskollen/Makefile
+++ b/net/bredbandskollen/Makefile
@@ -3,7 +3,7 @@ PORTVERSION= 0.20190705
PORTREVISION= 1
CATEGORIES= net
-MAINTAINER= zeising@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Command line tool to check internet connection speed
LICENSE= GPLv2
@@ -25,12 +25,6 @@ OPTIONS_DEFINE= GNUTLS
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_MAKE_ARGS= GNUTLS=1
-.include <bsd.port.pre.mk>
-
-.if ${ARCH:Mpowerpc*}
-EXTRA_PATCHES= ${FILESDIR}/extra-src_framework_socketreceiver.h
-.endif
-
post-patch:
${REINPLACE_CMD} -e 's/CXX = c++/CXX ?= c++/g' \
${WRKSRC}/src/framework/mk.inc
@@ -39,4 +33,4 @@ do-install:
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/cli ${STAGEDIR}/${PREFIX}/bin/bbk_cli
${LN} -sf bbk_cli ${STAGEDIR}/${PREFIX}/bin/bredbandskollen
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/bredbandskollen/files/extra-src_framework_socketreceiver.h b/net/bredbandskollen/files/extra-src_framework_socketreceiver.h
deleted file mode 100644
index 48e009b4e424..000000000000
--- a/net/bredbandskollen/files/extra-src_framework_socketreceiver.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/framework/socketreceiver.h.orig 2019-07-05 19:04:13 UTC
-+++ src/framework/socketreceiver.h
-@@ -3,6 +3,9 @@
-
- #pragma once
-
-+// work around broken? _ALIGN/_ALIGNBYTES on FreeBSD powerpc
-+#include <sys/types.h>
-+
- #include <sys/socket.h>
- #include "serversocket.h"
- class SocketConnection;
diff --git a/net/bwping/Makefile b/net/bwping/Makefile
index 6e9a2c155c18..4fb96ab7da29 100644
--- a/net/bwping/Makefile
+++ b/net/bwping/Makefile
@@ -1,5 +1,5 @@
PORTNAME= bwping
-PORTVERSION= 2.4
+PORTVERSION= 2.5
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/bwping/distinfo b/net/bwping/distinfo
index 387c6c99e635..37fbfa2fbc3b 100644
--- a/net/bwping/distinfo
+++ b/net/bwping/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641580360
-SHA256 (bwping-2.4.tar.gz) = 2f79c2a61cdc46f639233e0fcce8024c8d9fb4812b3ce77bbbed9baaee1a0166
-SIZE (bwping-2.4.tar.gz) = 112687
+TIMESTAMP = 1645386198
+SHA256 (bwping-2.5.tar.gz) = 1d8762227f40909f6d42ef756ebc2c258e5fd4f268ff63ecc544b8d6f0802c82
+SIZE (bwping-2.5.tar.gz) = 113076
diff --git a/net/calendarsupport/distinfo b/net/calendarsupport/distinfo
index 5881c3c0fb56..fd859b0d26f2 100644
--- a/net/calendarsupport/distinfo
+++ b/net/calendarsupport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292381
-SHA256 (KDE/release-service/21.12.1/calendarsupport-21.12.1.tar.xz) = d0cb28f180b760ed5314e55dda9083be024c019e170962ccdcdc2bbf8a468b3e
-SIZE (KDE/release-service/21.12.1/calendarsupport-21.12.1.tar.xz) = 765280
+TIMESTAMP = 1654672146
+SHA256 (KDE/release-service/22.04.2/calendarsupport-22.04.2.tar.xz) = dbad9e6478ed160f3daa5fbc4785eb40c6b47cb0c201c822f41e90ac995203b5
+SIZE (KDE/release-service/22.04.2/calendarsupport-22.04.2.tar.xz) = 767824
diff --git a/net/calendarsupport/pkg-plist b/net/calendarsupport/pkg-plist
index b3eec33955c5..14dd3df6b989 100644
--- a/net/calendarsupport/pkg-plist
+++ b/net/calendarsupport/pkg-plist
@@ -1,61 +1,59 @@
-share/qlogging-categories5/calendarsupport.categories
-share/qlogging-categories5/calendarsupport.renamecategories
-include/KF5/CalendarSupport/ArchiveDialog
-include/KF5/CalendarSupport/CalPrintDefaultPlugins
-include/KF5/CalendarSupport/CalPrintPluginBase
-include/KF5/CalendarSupport/CalPrinter
-include/KF5/CalendarSupport/CalendarSingleton
-include/KF5/CalendarSupport/CategoryConfig
-include/KF5/CalendarSupport/CategoryHierarchyReader
-include/KF5/CalendarSupport/CellItem
-include/KF5/CalendarSupport/CollectionSelection
-include/KF5/CalendarSupport/EventArchiver
-include/KF5/CalendarSupport/FreeBusyCalendar
-include/KF5/CalendarSupport/FreeBusyItem
-include/KF5/CalendarSupport/FreeBusyItemModel
-include/KF5/CalendarSupport/FreePeriodModel
-include/KF5/CalendarSupport/IdentityManager
-include/KF5/CalendarSupport/IncidenceViewer
-include/KF5/CalendarSupport/KCalPrefs
-include/KF5/CalendarSupport/KDatePickerPopup
-include/KF5/CalendarSupport/MessageWidget
-include/KF5/CalendarSupport/NoteEditDialog
-include/KF5/CalendarSupport/Plugin
-include/KF5/CalendarSupport/PrintPlugin
-include/KF5/CalendarSupport/UriHandler
-include/KF5/CalendarSupport/Utils
-include/KF5/calendarsupport/archivedialog.h
-include/KF5/calendarsupport/calendarsingleton.h
-include/KF5/calendarsupport/calendarsupport_export.h
-include/KF5/calendarsupport/calprintdefaultplugins.h
-include/KF5/calendarsupport/calprinter.h
-include/KF5/calendarsupport/calprintpluginbase.h
-include/KF5/calendarsupport/categoryconfig.h
-include/KF5/calendarsupport/categoryhierarchyreader.h
-include/KF5/calendarsupport/cellitem.h
-include/KF5/calendarsupport/collectionselection.h
-include/KF5/calendarsupport/eventarchiver.h
-include/KF5/calendarsupport/freebusycalendar.h
-include/KF5/calendarsupport/freebusyitem.h
-include/KF5/calendarsupport/freebusyitemmodel.h
-include/KF5/calendarsupport/freeperiodmodel.h
-include/KF5/calendarsupport/identitymanager.h
-include/KF5/calendarsupport/incidenceviewer.h
-include/KF5/calendarsupport/kcalprefs.h
-include/KF5/calendarsupport/kcalprefs_base.h
-include/KF5/calendarsupport/kdatepickerpopup.h
-include/KF5/calendarsupport/messagewidget.h
-include/KF5/calendarsupport/noteeditdialog.h
-include/KF5/calendarsupport/plugin.h
-include/KF5/calendarsupport/printplugin.h
-include/KF5/calendarsupport/ui_calprintdayconfig_base.h
-include/KF5/calendarsupport/ui_calprintincidenceconfig_base.h
-include/KF5/calendarsupport/ui_calprintmonthconfig_base.h
-include/KF5/calendarsupport/ui_calprinttodoconfig_base.h
-include/KF5/calendarsupport/ui_calprintweekconfig_base.h
-include/KF5/calendarsupport/urihandler.h
-include/KF5/calendarsupport/utils.h
-include/KF5/calendarsupport_version.h
+include/KF5/CalendarSupport/CalendarSupport/ArchiveDialog
+include/KF5/CalendarSupport/CalendarSupport/CalPrintDefaultPlugins
+include/KF5/CalendarSupport/CalendarSupport/CalPrintPluginBase
+include/KF5/CalendarSupport/CalendarSupport/CalPrinter
+include/KF5/CalendarSupport/CalendarSupport/CalendarSingleton
+include/KF5/CalendarSupport/CalendarSupport/CategoryConfig
+include/KF5/CalendarSupport/CalendarSupport/CategoryHierarchyReader
+include/KF5/CalendarSupport/CalendarSupport/CellItem
+include/KF5/CalendarSupport/CalendarSupport/CollectionSelection
+include/KF5/CalendarSupport/CalendarSupport/EventArchiver
+include/KF5/CalendarSupport/CalendarSupport/FreeBusyCalendar
+include/KF5/CalendarSupport/CalendarSupport/FreeBusyItem
+include/KF5/CalendarSupport/CalendarSupport/FreeBusyItemModel
+include/KF5/CalendarSupport/CalendarSupport/FreePeriodModel
+include/KF5/CalendarSupport/CalendarSupport/IdentityManager
+include/KF5/CalendarSupport/CalendarSupport/IncidenceViewer
+include/KF5/CalendarSupport/CalendarSupport/KCalPrefs
+include/KF5/CalendarSupport/CalendarSupport/KDatePickerPopup
+include/KF5/CalendarSupport/CalendarSupport/MessageWidget
+include/KF5/CalendarSupport/CalendarSupport/NoteEditDialog
+include/KF5/CalendarSupport/CalendarSupport/Plugin
+include/KF5/CalendarSupport/CalendarSupport/PrintPlugin
+include/KF5/CalendarSupport/CalendarSupport/UriHandler
+include/KF5/CalendarSupport/CalendarSupport/Utils
+include/KF5/CalendarSupport/calendarsupport/archivedialog.h
+include/KF5/CalendarSupport/calendarsupport/calendarsingleton.h
+include/KF5/CalendarSupport/calendarsupport/calendarsupport_export.h
+include/KF5/CalendarSupport/calendarsupport/calprintdefaultplugins.h
+include/KF5/CalendarSupport/calendarsupport/calprinter.h
+include/KF5/CalendarSupport/calendarsupport/calprintpluginbase.h
+include/KF5/CalendarSupport/calendarsupport/categoryconfig.h
+include/KF5/CalendarSupport/calendarsupport/categoryhierarchyreader.h
+include/KF5/CalendarSupport/calendarsupport/cellitem.h
+include/KF5/CalendarSupport/calendarsupport/collectionselection.h
+include/KF5/CalendarSupport/calendarsupport/eventarchiver.h
+include/KF5/CalendarSupport/calendarsupport/freebusycalendar.h
+include/KF5/CalendarSupport/calendarsupport/freebusyitem.h
+include/KF5/CalendarSupport/calendarsupport/freebusyitemmodel.h
+include/KF5/CalendarSupport/calendarsupport/freeperiodmodel.h
+include/KF5/CalendarSupport/calendarsupport/identitymanager.h
+include/KF5/CalendarSupport/calendarsupport/incidenceviewer.h
+include/KF5/CalendarSupport/calendarsupport/kcalprefs.h
+include/KF5/CalendarSupport/calendarsupport/kcalprefs_base.h
+include/KF5/CalendarSupport/calendarsupport/kdatepickerpopup.h
+include/KF5/CalendarSupport/calendarsupport/messagewidget.h
+include/KF5/CalendarSupport/calendarsupport/noteeditdialog.h
+include/KF5/CalendarSupport/calendarsupport/plugin.h
+include/KF5/CalendarSupport/calendarsupport/printplugin.h
+include/KF5/CalendarSupport/calendarsupport/ui_calprintdayconfig_base.h
+include/KF5/CalendarSupport/calendarsupport/ui_calprintincidenceconfig_base.h
+include/KF5/CalendarSupport/calendarsupport/ui_calprintmonthconfig_base.h
+include/KF5/CalendarSupport/calendarsupport/ui_calprinttodoconfig_base.h
+include/KF5/CalendarSupport/calendarsupport/ui_calprintweekconfig_base.h
+include/KF5/CalendarSupport/calendarsupport/urihandler.h
+include/KF5/CalendarSupport/calendarsupport/utils.h
+include/KF5/CalendarSupport/calendarsupport_version.h
lib/cmake/KF5CalendarSupport/KF5CalendarSupportConfig.cmake
lib/cmake/KF5CalendarSupport/KF5CalendarSupportConfigVersion.cmake
lib/cmake/KF5CalendarSupport/KF5CalendarSupportTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -124,3 +122,5 @@ share/locale/uk/LC_MESSAGES/calendarsupport.mo
share/locale/wa/LC_MESSAGES/calendarsupport.mo
share/locale/zh_CN/LC_MESSAGES/calendarsupport.mo
share/locale/zh_TW/LC_MESSAGES/calendarsupport.mo
+share/qlogging-categories5/calendarsupport.categories
+share/qlogging-categories5/calendarsupport.renamecategories
diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
index 43b50902a207..86297e92ebfc 100644
--- a/net/ceph14/Makefile
+++ b/net/ceph14/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ceph
DISTVERSIONPREFIX= v
DISTVERSION= 14.2.22
-PORTREVISION= 1
+PORTREVISION= 5
CATEGORIES= net
PKGNAMESUFFIX= 14
@@ -51,15 +51,15 @@ RUN_DEPENDS= \
${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
${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}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
USES= cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \
pkgconfig python:3.8-3.9 readline shebangfix ssl
diff --git a/net/ceph14/pkg-message b/net/ceph14/pkg-message
index 7c2cf9f6901a..d2ccd686e187 100644
--- a/net/ceph14/pkg-message
+++ b/net/ceph14/pkg-message
@@ -2,19 +2,32 @@
{ type: install
message: <<EOM
This package has installed ceph14, called nautilus.
-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:
- as root execute:
- cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
+To be able to run Ceph, the following setup changes are needed:
+
+ - Mount linux compat filesystem, add to /etc/fstab:
+ # required by ceph
+ linprocfs /compat/linux/proc linprocfs rw 0 0
+ linsysfs /compat/linux/sys linsysfs rw 0 0
+ fdescfs /compat/linux/dev/fd fdescfs rw,linrdlnk 0 0
+
+ - Shorten the WAIT2 time for TCP teardown
+ echo "net.inet.tcp.msl=3000" >> /etc/sysctl.conf
+
+Ceph comes with a web based dashboard that cannot be build
+into a packagei. But the user can it himselfi from a ready-made RPM.
+
+To install the dashboard, please execute (as root):
+
+ mkdir -p /usr/local/share/ceph/mgr/dashboard
pkg install rpm2cpio
+ cd /tmp
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
-
+ rpm2cpio ./ceph-mgr-dashboard-${DISTVERSION}-0.el8.noarch.rpm | cpio -divm
+ cd /tmp/usr/share/ceph/mgr/dashboard
+ rsync -vra . /usr/local/share/ceph/mgr/dashboard/
+ chown -R ceph:ceph /usr/local/share/ceph/mgr/dashboard/
+ chown -R ceph:ceph /var/lib/ceph /var/run/ceph /var/log/ceph
EOM
}
]
diff --git a/net/cf/Makefile b/net/cf/Makefile
index 2d30c3e13fd9..84b14c50d0b6 100644
--- a/net/cf/Makefile
+++ b/net/cf/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cf
PORTVERSION= 6.49.0
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= dumbbell@FreeBSD.org
diff --git a/net/clash/Makefile b/net/clash/Makefile
index 53b88a748cce..5ab343254611 100644
--- a/net/clash/Makefile
+++ b/net/clash/Makefile
@@ -1,6 +1,6 @@
PORTNAME= clash
DISTVERSIONPREFIX= v
-DISTVERSION= 1.7.0
+DISTVERSION= 1.11.0
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
@@ -9,7 +9,9 @@ COMMENT= Rule-based tunnel in Go
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:modules
+USES= go:modules cpe
+
+CPE_VENDOR= clash_project
GO_MODULE= github.com/Dreamacro/clash
diff --git a/net/clash/distinfo b/net/clash/distinfo
index 54f735caac68..5a331c3fbfd2 100644
--- a/net/clash/distinfo
+++ b/net/clash/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1631213543
-SHA256 (go/net_clash/clash-v1.7.0/v1.7.0.mod) = 3c3f651f1473babb2767bac38b4219865bfdbb8f7a9b2c76cb0700bc7b68e16d
-SIZE (go/net_clash/clash-v1.7.0/v1.7.0.mod) = 1094
-SHA256 (go/net_clash/clash-v1.7.0/v1.7.0.zip) = dc6d2708a086355b81b3ecf502a8ee59f3d3f09b128c04b4713cb4e1b69629eb
-SIZE (go/net_clash/clash-v1.7.0/v1.7.0.zip) = 246025
+TIMESTAMP = 1655661141
+SHA256 (go/net_clash/clash-v1.11.0/v1.11.0.mod) = cca66d777810c4de918dfc2a120360c66c77078a10f2d0575b22b579872890ff
+SIZE (go/net_clash/clash-v1.11.0/v1.11.0.mod) = 1256
+SHA256 (go/net_clash/clash-v1.11.0/v1.11.0.zip) = ab883c4ba9f1f28ef7dc22c25819a511d929f2eb9df7429a88504588bad7aa6d
+SIZE (go/net_clash/clash-v1.11.0/v1.11.0.zip) = 268930
diff --git a/net/clash/files/patch-listener_redir_tcp__freebsd.go b/net/clash/files/patch-listener_redir_tcp__freebsd.go
index a4b1df21095b..b1a770082637 100644
--- a/net/clash/files/patch-listener_redir_tcp__freebsd.go
+++ b/net/clash/files/patch-listener_redir_tcp__freebsd.go
@@ -1,9 +1,9 @@
---- listener/redir/tcp_freebsd.go.orig 2021-07-04 17:12:45 UTC
+--- listener/redir/tcp_freebsd.go.orig 2022-05-22 03:30:14 UTC
+++ listener/redir/tcp_freebsd.go
@@ -38,7 +38,8 @@ func parserPacket(conn net.Conn) (socks5.Addr, error)
func getorigdst(fd uintptr) (socks5.Addr, error) {
raw := syscall.RawSockaddrInet4{}
- siz := unsafe.Sizeof(raw)
+ siz := uint32(unsafe.Sizeof(raw))
- if err := socketcall(GETSOCKOPT, fd, syscall.IPPROTO_IP, SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&raw)), uintptr(unsafe.Pointer(&siz)), 0); err != nil {
+ _, _, err := syscall.Syscall6(syscall.SYS_GETSOCKOPT, fd, syscall.IPPROTO_IP, SO_ORIGINAL_DST, uintptr(unsafe.Pointer(&raw)), uintptr(unsafe.Pointer(&siz)), 0);
+ if err != 0 {
diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile
index 7ae243d82396..13cd32c58012 100644
--- a/net/cloudflared/Makefile
+++ b/net/cloudflared/Makefile
@@ -1,15 +1,12 @@
PORTNAME= cloudflared
-DISTVERSION= 2021.11.0
+DISTVERSION= 2022.6.2
CATEGORIES= net www
MAINTAINER= egypcio@FreeBSD.org
COMMENT= Cloudflare's Argo Tunnel client
-# Not sure if we are allowed to redistribute it.
-LICENSE= cloudflare
-LICENSE_NAME= cloudflare
+LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-LICENSE_PERMS= no-dist-sell no-pkg-sell
RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss
diff --git a/net/cloudflared/distinfo b/net/cloudflared/distinfo
index 2f8e5abe81dc..b4dc7d29e281 100644
--- a/net/cloudflared/distinfo
+++ b/net/cloudflared/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639216052
-SHA256 (cloudflare-cloudflared-2021.11.0_GH0.tar.gz) = 12b0f4cd3c82ad78375a9ded491453bb3fac868ec485091a43bec709848a7872
-SIZE (cloudflare-cloudflared-2021.11.0_GH0.tar.gz) = 8415928
+TIMESTAMP = 1655559255
+SHA256 (cloudflare-cloudflared-2022.6.2_GH0.tar.gz) = 599ea11ff7f6a8941eb2cdbc1eced0419eb3dec85104f3f7a6a8268f4d0e722a
+SIZE (cloudflare-cloudflared-2022.6.2_GH0.tar.gz) = 8883088
diff --git a/net/cloudquery/Makefile b/net/cloudquery/Makefile
index d4f4c5bfd3c5..ac887848377a 100644
--- a/net/cloudquery/Makefile
+++ b/net/cloudquery/Makefile
@@ -1,6 +1,7 @@
PORTNAME= cloudquery
DISTVERSIONPREFIX= v
DISTVERSION= 0.16.0
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= ports@FreeBSD.org
diff --git a/net/concourse-fly/Makefile b/net/concourse-fly/Makefile
index 2c0c32198146..27835c550667 100644
--- a/net/concourse-fly/Makefile
+++ b/net/concourse-fly/Makefile
@@ -1,5 +1,6 @@
PORTNAME= concourse
PORTVERSION= 6.7.1
+PORTREVISION= 2
CATEGORIES= net sysutils
MASTER_SITES= LOCAL/dumbbell/concourse/
PKGNAMESUFFIX= -fly
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index 17c3f8a129ae..180070e13d7c 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -1,6 +1,6 @@
# Created by: Yarema <yds@CoolRat.org>
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -ldap
COMMENT= LDAP support for the Courier authentication library
diff --git a/net/cpp-pcp-client/Makefile b/net/cpp-pcp-client/Makefile
index 9e370dfcf70a..3cacbeea0dc7 100644
--- a/net/cpp-pcp-client/Makefile
+++ b/net/cpp-pcp-client/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cpp-pcp-client
PORTVERSION= 1.7.7
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= puppet@FreeBSD.org
diff --git a/net/croc/Makefile b/net/croc/Makefile
index 316d63053368..a28d39fa93a8 100644
--- a/net/croc/Makefile
+++ b/net/croc/Makefile
@@ -1,7 +1,7 @@
PORTNAME= croc
-PORTVERSION= 9.5.0
+PORTVERSION= 9.5.6
DISTVERSIONPREFIX= v
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= olgeni@FreeBSD.org
@@ -16,17 +16,17 @@ USE_GITHUB= yes
GH_ACCOUNT= schollz
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 \
+ cpuguy83:go-md2man:v2.0.2: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:crypto:6f7dac969898:golang_crypto/vendor/golang.org/x/crypto \
+ golang:net:183a9ca12b87:golang_net/vendor/golang.org/x/net \
+ golang:sys:5e4e11fc645e:golang_sys/vendor/golang.org/x/sys \
+ golang:term:e5f449aeb171: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 \
+ golang:time:583f2d630306: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 \
@@ -37,9 +37,9 @@ GH_TUPLE= OneOfOne:xxhash:v1.2.5:oneofone_xxhash/vendor/github.com/OneOfOne/xxha
schollz:cli:v2.2.1:schollz_cli_v2/vendor/github.com/schollz/cli/v2 \
schollz:logger:v1.2.0:schollz_logger/vendor/github.com/schollz/logger \
schollz:mnemonicode:v1.0.1:schollz_mnemonicode/vendor/github.com/schollz/mnemonicode \
- 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 \
+ schollz:pake:v3.0.4:schollz_pake_v3/vendor/github.com/schollz/pake/v3 \
+ schollz:peerdiscovery:v1.6.11:schollz_peerdiscovery/vendor/github.com/schollz/peerdiscovery \
+ schollz:progressbar:v3.8.6: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 \
diff --git a/net/croc/distinfo b/net/croc/distinfo
index 8d5f40735877..4d77a2896646 100644
--- a/net/croc/distinfo
+++ b/net/croc/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1637505425
-SHA256 (schollz-croc-v9.5.0_GH0.tar.gz) = 0e250ecebc72753991a3442e48f9caadfae2467430a81595b79b5443e2ff523b
-SIZE (schollz-croc-v9.5.0_GH0.tar.gz) = 504327
+TIMESTAMP = 1652994855
+SHA256 (schollz-croc-v9.5.6_GH0.tar.gz) = c03c7b9daf2ba841d373d9c43abb68dc27ab1d7e01bbadead771918d499dea9e
+SIZE (schollz-croc-v9.5.6_GH0.tar.gz) = 506454
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
-SIZE (cpuguy83-go-md2man-v2.0.1_GH0.tar.gz) = 64220
+SHA256 (cpuguy83-go-md2man-v2.0.2_GH0.tar.gz) = 2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a
+SIZE (cpuguy83-go-md2man-v2.0.2_GH0.tar.gz) = 64353
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
SHA256 (denisbrodbeck-machineid-v1.0.1_GH0.tar.gz) = 0a01d2b131419cb2b9f7d910a2c90b824449bd91005b47efb235dc707665337a
@@ -15,18 +15,18 @@ SHA256 (go-check-check-41f04d3bba15_GH0.tar.gz) = 2d5b1036909b241e44f0d6a7cfa936
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
-SIZE (golang-crypto-089bfa567519_GH0.tar.gz) = 1734789
-SHA256 (golang-net-e81a3d93ecf6_GH0.tar.gz) = 6839bd05cf6948ec3db09e322241346d48325e018751f0017f90b082a6f1cf3a
-SIZE (golang-net-e81a3d93ecf6_GH0.tar.gz) = 1261073
-SHA256 (golang-sys-808efd93c36d_GH0.tar.gz) = 1ff3fc074c5eb4d54a779d264b9518e3ee89c518a915e00c7d9e3c6dd5b4a7f6
-SIZE (golang-sys-808efd93c36d_GH0.tar.gz) = 1213832
-SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
-SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
+SHA256 (golang-crypto-6f7dac969898_GH0.tar.gz) = 351756fb048714bcca712921ebc4b2db17a247be8a69feb470f14df4d2112522
+SIZE (golang-crypto-6f7dac969898_GH0.tar.gz) = 1631383
+SHA256 (golang-net-183a9ca12b87_GH0.tar.gz) = 00ef780946b69b7898cac77423588d762e27ed560798055e4ae00c6d45e7eb26
+SIZE (golang-net-183a9ca12b87_GH0.tar.gz) = 1230154
+SHA256 (golang-sys-5e4e11fc645e_GH0.tar.gz) = 49f11b48480ca7b5c52969475f9718d5b36aa53c49a2ec7fcfe02a980f4d00dc
+SIZE (golang-sys-5e4e11fc645e_GH0.tar.gz) = 1304278
+SHA256 (golang-term-e5f449aeb171_GH0.tar.gz) = 7b6ad4bc0249d9d2eccbd7795c523970020469d52c427753f4857227fd877261
+SIZE (golang-term-e5f449aeb171_GH0.tar.gz) = 14976
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 (golang-time-583f2d630306_GH0.tar.gz) = e0e7ca052905e38b71965d05c2852b3c216d8468846af088c82116694a324412
+SIZE (golang-time-583f2d630306_GH0.tar.gz) = 10299
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
@@ -47,12 +47,12 @@ SHA256 (schollz-logger-v1.2.0_GH0.tar.gz) = d3dd19c9e21b534bebc5a44a8699542f6e53
SIZE (schollz-logger-v1.2.0_GH0.tar.gz) = 3253
SHA256 (schollz-mnemonicode-v1.0.1_GH0.tar.gz) = 5eb5ef0f90c07ba14677274ff59908150e7cfa861cc7c89355d1ac61d80adc0b
SIZE (schollz-mnemonicode-v1.0.1_GH0.tar.gz) = 18193
-SHA256 (schollz-pake-v3.0.2_GH0.tar.gz) = 3441176fa8781c91e247855f3b058abbdc1218603b8dfe623851392a1d391e2b
-SIZE (schollz-pake-v3.0.2_GH0.tar.gz) = 9387
-SHA256 (schollz-peerdiscovery-v1.6.9_GH0.tar.gz) = b393923c5ce61c02cb5a7d26c480bc0bd22d9578ba5e0ad402a29304a2cf3d6c
-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 (schollz-pake-v3.0.4_GH0.tar.gz) = c235ced76f2f978a4d48362f66666b78dd693f34fe13a9d2d97da78c6de041b5
+SIZE (schollz-pake-v3.0.4_GH0.tar.gz) = 9585
+SHA256 (schollz-peerdiscovery-v1.6.11_GH0.tar.gz) = 7dc10590df95671bbcfe5f1830a4cee624b042e2b0e55a404bd9b450d305ff21
+SIZE (schollz-peerdiscovery-v1.6.11_GH0.tar.gz) = 8823
+SHA256 (schollz-progressbar-v3.8.6_GH0.tar.gz) = cc381b12e886698a9499795f346b00f80468a924a77f48d34893baf5734cb1b6
+SIZE (schollz-progressbar-v3.8.6_GH0.tar.gz) = 604127
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
diff --git a/net/czmq/Makefile b/net/czmq/Makefile
index 6b36b810c147..63699e62282c 100644
--- a/net/czmq/Makefile
+++ b/net/czmq/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 4.1.1
CATEGORIES= net
MASTER_SITES= https://github.com/zeromq/${PORTNAME}/releases/download/v${PORTVERSION}/
-MAINTAINER= koobs@FreeBSD.org
+MAINTAINER= bofh@FreeBSD.org
COMMENT= High-level C Binding for ZeroMQ
LICENSE= MPL20
diff --git a/net/dpdk-20.11/Makefile b/net/dpdk-20.11/Makefile
index 9639010821b7..5b387dfae7de 100644
--- a/net/dpdk-20.11/Makefile
+++ b/net/dpdk-20.11/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dpdk
-DISTVERSION= 20.11.1
+DISTVERSION= 20.11.5
CATEGORIES= net
MASTER_SITES= http://fast.dpdk.org/rel/
PKGNAMESUFFIX= 20.11
diff --git a/net/dpdk-20.11/distinfo b/net/dpdk-20.11/distinfo
index fcdbff3dbf6a..c77fc4a56675 100644
--- a/net/dpdk-20.11/distinfo
+++ b/net/dpdk-20.11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615544817
-SHA256 (dpdk-20.11.1.tar.xz) = 66c95e81dc4a9b4d1bf5a39d29cb5e353b055065e3a28c579cd13a54c7ba6362
-SIZE (dpdk-20.11.1.tar.xz) = 13974116
+TIMESTAMP = 1649077024
+SHA256 (dpdk-20.11.5.tar.xz) = caad9278dd99386940021355436b20a745daadb6c321893fa5a81d0feb023c7f
+SIZE (dpdk-20.11.5.tar.xz) = 14021364
diff --git a/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h b/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h
index c48d4a55c9a2..fab2a5de8163 100644
--- a/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h
+++ b/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h
@@ -1,9 +1,9 @@
--- lib/librte_eal/freebsd/include/rte_os.h.orig 2021-03-08 17:40:08 UTC
+++ lib/librte_eal/freebsd/include/rte_os.h
@@ -14,6 +14,28 @@
- #include <pthread_np.h>
-
+
typedef cpuset_t rte_cpuset_t;
+ #define RTE_HAS_CPUSET
+
+/* FreeBSD 14 uses GLIBC compatible CPU_AND, CPU_OR, ... */
+#ifdef CPU_ALLOC
@@ -37,5 +37,5 @@
+#endif /* CPU_NAND */
+
+#endif /* CPU_ALLOC */
-
+
#endif /* _RTE_OS_H_ */
diff --git a/net/dpdk-20.11/pkg-plist b/net/dpdk-20.11/pkg-plist
index 82cff6da31e7..7fa5e2545138 100644
--- a/net/dpdk-20.11/pkg-plist
+++ b/net/dpdk-20.11/pkg-plist
@@ -267,6 +267,7 @@ include/rte_stack.h
include/rte_stack_lf.h
include/rte_stack_lf_c11.h
include/rte_stack_lf_generic.h
+include/rte_stack_lf_stubs.h
include/rte_stack_std.h
include/rte_string_fns.h
include/rte_swx_ctl.h
@@ -950,11 +951,9 @@ libdata/pkgconfig/libdpdk-libs.pc
libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/bbdev_app/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/bbdev_app/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/bbdev_app/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/bond/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/bond/main.c
%%EXAMPLES%%%%DATADIR%%/examples/bond/main.h
-%%EXAMPLES%%%%DATADIR%%/examples/bond/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/bpf/README
%%EXAMPLES%%%%DATADIR%%/examples/bpf/dummy.c
%%EXAMPLES%%%%DATADIR%%/examples/bpf/t1.c
@@ -964,12 +963,10 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/cmdline/commands.c
%%EXAMPLES%%%%DATADIR%%/examples/cmdline/commands.h
%%EXAMPLES%%%%DATADIR%%/examples/cmdline/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/cmdline/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/cmdline/parse_obj_list.c
%%EXAMPLES%%%%DATADIR%%/examples/cmdline/parse_obj_list.h
%%EXAMPLES%%%%DATADIR%%/examples/distributor/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/distributor/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/distributor/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ethtool/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ethtool/ethtool-app/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ethtool/ethtool-app/ethapp.c
@@ -978,10 +975,8 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/ethtool/lib/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ethtool/lib/rte_ethtool.c
%%EXAMPLES%%%%DATADIR%%/examples/ethtool/lib/rte_ethtool.h
-%%EXAMPLES%%%%DATADIR%%/examples/ethtool/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/eventdev_pipeline/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/eventdev_pipeline/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/eventdev_pipeline/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/eventdev_pipeline/pipeline_common.h
%%EXAMPLES%%%%DATADIR%%/examples/eventdev_pipeline/pipeline_worker_generic.c
%%EXAMPLES%%%%DATADIR%%/examples/eventdev_pipeline/pipeline_worker_tx.c
@@ -999,24 +994,18 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/fips_validation/fips_validation_tdes.c
%%EXAMPLES%%%%DATADIR%%/examples/fips_validation/fips_validation_xts.c
%%EXAMPLES%%%%DATADIR%%/examples/fips_validation/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/fips_validation/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/flow_classify/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/flow_classify/flow_classify.c
%%EXAMPLES%%%%DATADIR%%/examples/flow_classify/ipv4_rules_file.txt
-%%EXAMPLES%%%%DATADIR%%/examples/flow_classify/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/flow_filtering/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/flow_filtering/flow_blocks.c
%%EXAMPLES%%%%DATADIR%%/examples/flow_filtering/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/flow_filtering/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/helloworld/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/helloworld/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/helloworld/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ioat/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ioat/ioatfwd.c
-%%EXAMPLES%%%%DATADIR%%/examples/ioat/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ip_fragmentation/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ip_fragmentation/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/ip_fragmentation/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/action.c
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/action.h
@@ -1043,7 +1032,6 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/main.c
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/mempool.c
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/mempool.h
-%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/parser.c
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/parser.h
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/pipeline.c
@@ -1058,7 +1046,6 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/ip_pipeline/tmgr.h
%%EXAMPLES%%%%DATADIR%%/examples/ip_reassembly/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ip_reassembly/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/ip_reassembly/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/ep0.cfg
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/ep1.cfg
@@ -1076,7 +1063,6 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/ipsec_process.c
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/ipsec_worker.c
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/ipsec_worker.h
-%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/parser.c
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/parser.h
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/rt.c
@@ -1114,18 +1100,14 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/ipsec-secgw/test/tun_null_header_reconstruct.py
%%EXAMPLES%%%%DATADIR%%/examples/ipv4_multicast/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/ipv4_multicast/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/ipv4_multicast/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/kni/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/kni/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/kni/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-cat/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-cat/cat.c
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-cat/cat.h
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-cat/l2fwd-cat.c
-%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-cat/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-crypto/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-crypto/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-crypto/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/l2fwd_common.c
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/l2fwd_common.h
@@ -1136,30 +1118,23 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/l2fwd_poll.c
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/l2fwd_poll.h
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-event/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-jobstats/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-jobstats/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-jobstats/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/ka-agent/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/ka-agent/main.c
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/shm.c
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd-keepalive/shm.h
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l2fwd/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l2fwd/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-acl/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-acl/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-acl/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-graph/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-graph/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-graph/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-power/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-power/main.c
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-power/main.h
-%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-power/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-power/perf_core.c
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd-power/perf_core.h
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd/Makefile
@@ -1184,42 +1159,33 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd/l3fwd_neon.h
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd/l3fwd_sse.h
%%EXAMPLES%%%%DATADIR%%/examples/l3fwd/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/l3fwd/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/link_status_interrupt/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/link_status_interrupt/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/link_status_interrupt/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_client/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_client/client.c
-%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_client/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/args.c
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/args.h
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/init.c
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/init.h
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/mp_server/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/client_server_mp/shared/common.h
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/hotplug_mp/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/hotplug_mp/commands.c
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/hotplug_mp/commands.h
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/hotplug_mp/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/multi_process/hotplug_mp/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/simple_mp/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/simple_mp/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/multi_process/simple_mp/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/simple_mp/mp_commands.c
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/simple_mp/mp_commands.h
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/symmetric_mp/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/multi_process/symmetric_mp/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/multi_process/symmetric_mp/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ntb/Makefile
-%%EXAMPLES%%%%DATADIR%%/examples/ntb/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ntb/ntb_fwd.c
%%EXAMPLES%%%%DATADIR%%/examples/packet_ordering/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/packet_ordering/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/packet_ordering/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/common/arch/arm64/ctx.c
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/common/arch/arm64/ctx.h
@@ -1249,11 +1215,9 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/common/lthread_tls.h
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/l3fwd-thread/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/l3fwd-thread/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/l3fwd-thread/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/l3fwd-thread/test.sh
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/pthread_shim/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/pthread_shim/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/pthread_shim/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/pthread_shim/pthread_shim.c
%%EXAMPLES%%%%DATADIR%%/examples/performance-thread/pthread_shim/pthread_shim.h
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/Makefile
@@ -1274,18 +1238,15 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/examples/vxlan_table.py
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/examples/vxlan_table.txt
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/pipeline/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/obj.c
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/obj.h
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/thread.c
%%EXAMPLES%%%%DATADIR%%/examples/pipeline/thread.h
%%EXAMPLES%%%%DATADIR%%/examples/ptpclient/Makefile
-%%EXAMPLES%%%%DATADIR%%/examples/ptpclient/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/ptpclient/ptpclient.c
%%EXAMPLES%%%%DATADIR%%/examples/qos_meter/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/qos_meter/main.c
%%EXAMPLES%%%%DATADIR%%/examples/qos_meter/main.h
-%%EXAMPLES%%%%DATADIR%%/examples/qos_meter/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/qos_meter/rte_policer.c
%%EXAMPLES%%%%DATADIR%%/examples/qos_meter/rte_policer.h
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/Makefile
@@ -1297,16 +1258,13 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/init.c
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/main.c
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/main.h
-%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/profile.cfg
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/profile_ov.cfg
%%EXAMPLES%%%%DATADIR%%/examples/qos_sched/stats.c
%%EXAMPLES%%%%DATADIR%%/examples/rxtx_callbacks/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/rxtx_callbacks/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/rxtx_callbacks/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/node/Makefile
-%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/node/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/node/node.c
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/server/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/server/args.c
@@ -1314,37 +1272,29 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/server/init.c
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/server/init.h
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/server/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/server/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/server_node_efd/shared/common.h
%%EXAMPLES%%%%DATADIR%%/examples/service_cores/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/service_cores/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/service_cores/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/skeleton/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/skeleton/basicfwd.c
-%%EXAMPLES%%%%DATADIR%%/examples/skeleton/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/timer/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/timer/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/timer/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vdpa/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vdpa/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/vdpa/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vhost/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vhost/ioat.c
%%EXAMPLES%%%%DATADIR%%/examples/vhost/ioat.h
%%EXAMPLES%%%%DATADIR%%/examples/vhost/main.c
%%EXAMPLES%%%%DATADIR%%/examples/vhost/main.h
-%%EXAMPLES%%%%DATADIR%%/examples/vhost/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vhost/virtio_net.c
%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/blk.c
%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/blk_spec.h
-%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/vhost_blk.c
%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/vhost_blk.h
%%EXAMPLES%%%%DATADIR%%/examples/vhost_blk/vhost_blk_compat.c
%%EXAMPLES%%%%DATADIR%%/examples/vhost_crypto/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vhost_crypto/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/vhost_crypto/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/channel_manager.c
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/channel_manager.h
@@ -1352,13 +1302,11 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/channel_monitor.h
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/parse.c
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/parse.h
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/guest_cli/vm_power_cli_guest.h
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/oob_monitor.h
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/oob_monitor_nop.c
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/oob_monitor_x86.c
@@ -1370,7 +1318,5 @@ libdata/pkgconfig/libdpdk.pc
%%EXAMPLES%%%%DATADIR%%/examples/vm_power_manager/vm_power_cli.h
%%EXAMPLES%%%%DATADIR%%/examples/vmdq/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vmdq/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/vmdq/meson.build
%%EXAMPLES%%%%DATADIR%%/examples/vmdq_dcb/Makefile
%%EXAMPLES%%%%DATADIR%%/examples/vmdq_dcb/main.c
-%%EXAMPLES%%%%DATADIR%%/examples/vmdq_dcb/meson.build
diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile
index 29555076a5f1..ee3cacd447e6 100644
--- a/net/dpdk/Makefile
+++ b/net/dpdk/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dpdk
-DISTVERSION= 19.11.7
+DISTVERSION= 19.11.12
CATEGORIES= net
MASTER_SITES= http://fast.dpdk.org/rel/
diff --git a/net/dpdk/distinfo b/net/dpdk/distinfo
index 203f3c67e36f..e90497b863c9 100644
--- a/net/dpdk/distinfo
+++ b/net/dpdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616152895
-SHA256 (dpdk-19.11.7.tar.xz) = 6060d4f87e985c8d03ccdc223e96ecb3e115fd43912113408f3c57c025b02c2d
-SIZE (dpdk-19.11.7.tar.xz) = 12454792
+TIMESTAMP = 1650379156
+SHA256 (dpdk-19.11.12.tar.xz) = 17d9b6f8c662de7d29b0f2308d6c218886db364a06971aadaeed8e955ed36f34
+SIZE (dpdk-19.11.12.tar.xz) = 12480488
diff --git a/net/dpdk/files/patch-examples_meson.build b/net/dpdk/files/patch-examples_meson.build
deleted file mode 100644
index b56efb70245c..000000000000
--- a/net/dpdk/files/patch-examples_meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
---- examples/meson.build
-+++ examples/meson.build
-@@ -48,6 +48,12 @@ all_examples = [
- 'vmdq', 'vmdq_dcb',
- ]
-
-+# on install, skip copying all meson.build files
-+ex_file_excludes = ['meson.build']
-+foreach ex:all_examples
-+ ex_file_excludes += [ex + '/meson.build']
-+endforeach
-+
- if get_option('examples') == ''
- subdir_done()
- endif
diff --git a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c b/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c
deleted file mode 100644
index fd780ff5b67c..000000000000
--- a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- kernel/freebsd/contigmem/contigmem.c.orig 2020-01-03 12:22:51 UTC
-+++ kernel/freebsd/contigmem/contigmem.c
-@@ -297,19 +297,22 @@ contigmem_cdev_pager_fault(vm_object_t object, vm_ooff
- VM_OBJECT_WLOCK(object);
- vm_page_updatefake(page, paddr, memattr);
- } else {
-- vm_page_t mret;
- /*
- * Replace the passed in reqpage page with our own fake page and
- * free up the original page.
- */
- page = vm_page_getfake(paddr, memattr);
- VM_OBJECT_WLOCK(object);
-- mret = vm_page_replace(page, object, (*mres)->pindex);
-+#if __FreeBSD__ >= 13
-+ vm_page_replace(page, object, (*mres)->pindex, *mres);
-+#else
-+ vm_page_t mret = vm_page_replace(page, object, (*mres)->pindex);
- KASSERT(mret == *mres,
- ("invalid page replacement, old=%p, ret=%p", *mres, mret));
- vm_page_lock(mret);
- vm_page_free(mret);
- vm_page_unlock(mret);
-+#endif
- *mres = page;
- }
-
diff --git a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h
index 6e63d49836ac..ab5c07dcae51 100644
--- a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h
+++ b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h
@@ -1,10 +1,9 @@
---- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2021-03-17 16:43:15 UTC
+--- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2021-03-08 17:40:08 UTC
+++ lib/librte_eal/freebsd/eal/include/rte_os.h
-@@ -14,8 +14,30 @@
+@@ -14,6 +14,28 @@
#include <pthread_np.h>
-
+
typedef cpuset_t rte_cpuset_t;
--#define RTE_CPU_AND(dst, src1, src2) do \
+
+/* FreeBSD 14 uses GLIBC compatible CPU_AND, CPU_OR, ... */
+#ifdef CPU_ALLOC
@@ -12,7 +11,7 @@
+#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2)
+#define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2)
+#define RTE_CPU_FILL(set) do \
- { \
++{ \
+ unsigned int i; \
+ CPU_ZERO(set); \
+ for (i = 0; i < CPU_SETSIZE; i++) \
@@ -27,35 +26,16 @@
+
+#else
+
-+#define RTE_CPU_AND(dst, src1, src2) do \
-+{ \
- cpuset_t tmp; \
- CPU_COPY(src1, &tmp); \
- CPU_AND(&tmp, src2); \
-@@ -29,6 +51,9 @@ typedef cpuset_t rte_cpuset_t;
- CPU_COPY(&tmp, dst); \
- } while (0)
- #define RTE_CPU_FILL(set) CPU_FILL(set)
-+
-+/* In FreeBSD 13 CPU_NAND macro is CPU_ANDNOT */
-+#ifdef CPU_NAND
- #define RTE_CPU_NOT(dst, src) do \
+ #define RTE_CPU_AND(dst, src1, src2) do \
{ \
cpuset_t tmp; \
-@@ -36,5 +61,16 @@ typedef cpuset_t rte_cpuset_t;
- CPU_NAND(&tmp, src); \
+@@ -47,6 +69,8 @@ typedef cpuset_t rte_cpuset_t;
+ CPU_ANDNOT(&tmp, src); \
CPU_COPY(&tmp, dst); \
} while (0)
-+#else
-+#define RTE_CPU_NOT(dst, src) do \
-+{ \
-+ cpuset_t tmp; \
-+ CPU_FILL(&tmp); \
-+ CPU_ANDNOT(&tmp, src); \
-+ CPU_COPY(&tmp, dst); \
-+} while (0)
+-#endif
+#endif /* CPU_NAND */
+
+#endif /* CPU_ALLOC */
-
+
#endif /* _RTE_OS_H_ */
diff --git a/net/dpdk/files/patch-meson.build b/net/dpdk/files/patch-meson.build
deleted file mode 100644
index 5402e919091b..000000000000
--- a/net/dpdk/files/patch-meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
---- meson.build
-+++ meson.build
-@@ -61,7 +61,7 @@ subdir('doc')
- subdir('examples')
- install_subdir('examples',
- install_dir: get_option('datadir') + '/dpdk',
-- exclude_files: 'meson.build')
-+ exclude_files: ex_file_excludes)
-
- # build kernel modules if enabled
- if get_option('enable_kmods')
diff --git a/net/dpdk/pkg-plist b/net/dpdk/pkg-plist
index 032497124903..32dd9aee66c4 100644
--- a/net/dpdk/pkg-plist
+++ b/net/dpdk/pkg-plist
@@ -236,6 +236,7 @@ include/rte_stack.h
include/rte_stack_lf.h
include/rte_stack_lf_c11.h
include/rte_stack_lf_generic.h
+include/rte_stack_lf_stubs.h
include/rte_stack_std.h
include/rte_string_fns.h
include/rte_table.h
@@ -1056,5 +1057,4 @@ lib/librte_table.so.20.0
lib/librte_timer.a
lib/librte_timer.so
lib/librte_timer.so.20.0
-libdata/pkgconfig/libdpdk-libs.pc
libdata/pkgconfig/libdpdk.pc
diff --git a/net/dpinger/Makefile b/net/dpinger/Makefile
index 683cce9bd3c2..b95cace4fb92 100644
--- a/net/dpinger/Makefile
+++ b/net/dpinger/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dpinger
-PORTVERSION= 3.0
+PORTVERSION= 3.2
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/dpinger/distinfo b/net/dpinger/distinfo
index 4a89628c3903..a75da27d0755 100644
--- a/net/dpinger/distinfo
+++ b/net/dpinger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507122562
-SHA256 (dennypage-dpinger-v3.0_GH0.tar.gz) = 850bdd2df33ed9de27202f0bb086e07c82a430a0d97d1442aa81bbb3a9d86506
-SIZE (dennypage-dpinger-v3.0_GH0.tar.gz) = 14794
+TIMESTAMP = 1646072799
+SHA256 (dennypage-dpinger-v3.2_GH0.tar.gz) = 70913e84098d55b9a2a71406010320be4237f72c044858cc2490f4957723fce5
+SIZE (dennypage-dpinger-v3.2_GH0.tar.gz) = 14827
diff --git a/net/drive/Makefile b/net/drive/Makefile
index 6186a34c2e4b..fb35811f40b2 100644
--- a/net/drive/Makefile
+++ b/net/drive/Makefile
@@ -3,7 +3,7 @@
PORTNAME= drive
PORTVERSION= 0.4.0
DISTVERSIONPREFIX= v
-PORTREVISION= 5
+PORTREVISION= 9
CATEGORIES= net
MAINTAINER= sunpoet@FreeBSD.org
@@ -23,18 +23,18 @@ GH_ACCOUNT= odeke-em
GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \
census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus/vendor/go.opencensus.io \
cheggaaa:pb:v3.0.8:cheggaaa_pb/vendor/github.com/cheggaaa/pb \
- golang:crypto:c084706:golang_crypto/vendor/golang.org/x/crypto \
+ golang:crypto:7b82a4e:golang_crypto/vendor/golang.org/x/crypto \
golang:groupcache:41bb18b:golang_groupcache/vendor/github.com/golang/groupcache \
- golang:net:978cfad:golang_net/vendor/golang.org/x/net \
- golang:oauth2:2bc19b1:golang_oauth2/vendor/golang.org/x/oauth2 \
+ golang:net:290c469:golang_net/vendor/golang.org/x/net \
+ golang:oauth2:9780585:golang_oauth2/vendor/golang.org/x/oauth2 \
golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
- golang:sys:d61c044:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
- google:go-genproto:b395a37:google_go_genproto/vendor/google.golang.org/genproto \
- googleapis:google-api-go-client:v0.57.0:google_googleapigoclient/vendor/google.golang.org/api \
- googleapis:google-cloud-go:v0.94.1:googleapis_googlecloudgo/vendor/cloud.google.com/go \
- googleapis:gax-go:v2.0.5:googleapis_gaxgo/vendor/github.com/googleapis/gax-go \
- grpc:grpc-go:v1.40.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+ golang:sys:33da011:golang_sys/vendor/golang.org/x/sys \
+ golang:text:8db23f8:golang_text/vendor/golang.org/x/text \
+ google:go-genproto:2d67ff6:google_go_genproto/vendor/google.golang.org/genproto \
+ googleapis:google-api-go-client:v0.74.0:google_googleapigoclient/vendor/google.golang.org/api \
+ googleapis:google-cloud-go:v0.100.2:googleapis_googlecloudgo/vendor/cloud.google.com/go \
+ googleapis:gax-go:v2.3.0:googleapis_gaxgo/vendor/github.com/googleapis/gax-go \
+ grpc:grpc-go:v1.45.0:grpc_grpc_go/vendor/google.golang.org/grpc \
mattn:go-isatty:v0.0.14:mattn_goisatty/vendor/github.com/mattn/go-isatty \
mattn:go-runewidth:v0.0.13:mattn_gorunewidth/vendor/github.com/mattn/go-runewidth \
mxk:go-flowrate:cca7078:mxk_goflowrate/vendor/github.com/mxk/go-flowrate \
@@ -51,7 +51,7 @@ GH_TUPLE= boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \
odeke-em:pretty-words:9d37a7f:odekeem_prettywords/vendor/github.com/odeke-em/pretty-words \
odeke-em:semalim:9c88bf5:odekeem_semalim/vendor/github.com/odeke-em/semalim \
odeke-em:statos:292960a:odekeem_statos/vendor/github.com/odeke-em/statos \
- protocolbuffers:protobuf-go:v1.27.1:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+ protocolbuffers:protobuf-go:v1.28.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
rivo:uniseg:v0.2.0:rivo_uniseg/vendor/github.com/rivo/uniseg \
skratchdot:open-golang:eef8423:skratchdot_opengolang/vendor/github.com/skratchdot/open-golang
USE_GITHUB= yes
diff --git a/net/drive/distinfo b/net/drive/distinfo
index 6c5552baf978..53d05d381971 100644
--- a/net/drive/distinfo
+++ b/net/drive/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1632036886
+TIMESTAMP = 1650228690
SHA256 (odeke-em-drive-v0.4.0_GH0.tar.gz) = 7a6445b54c6c13d0ddd8893ca02264211eeea68c7a0c7e9ccc6473f68af40a00
SIZE (odeke-em-drive-v0.4.0_GH0.tar.gz) = 337088
SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8
@@ -7,30 +7,30 @@ SHA256 (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = cc9dc0234de1b
SIZE (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = 176498
SHA256 (cheggaaa-pb-v3.0.8_GH0.tar.gz) = 17cb166dfe931ccdf3742271442dcfb2b886099d3e32fb706e2c4752133b2910
SIZE (cheggaaa-pb-v3.0.8_GH0.tar.gz) = 31487
-SHA256 (golang-crypto-c084706_GH0.tar.gz) = 7dde08034a6b6240ae90490d467b43ab6dde6d414c872a993602bbb6aebe7cee
-SIZE (golang-crypto-c084706_GH0.tar.gz) = 1734174
+SHA256 (golang-crypto-7b82a4e_GH0.tar.gz) = 167de1ebc38972ac8cf46d58c6e4744ceddf0123b28c6103b1df0dbb5a25def5
+SIZE (golang-crypto-7b82a4e_GH0.tar.gz) = 1630726
SHA256 (golang-groupcache-41bb18b_GH0.tar.gz) = e81c6bf3c6270a3237f53cc65bc74ea89ee2cd00981245c98279dac7a2e3c1b1
SIZE (golang-groupcache-41bb18b_GH0.tar.gz) = 26102
-SHA256 (golang-net-978cfad_GH0.tar.gz) = 2ef2871667ae4f981f9962f656ec2644e73fa9f914c6280c855584e6d8b0c041
-SIZE (golang-net-978cfad_GH0.tar.gz) = 1259254
-SHA256 (golang-oauth2-2bc19b1_GH0.tar.gz) = e1c48a0313a69f530b17740b77c07a33192bf90fea3cb75b4e793a2c800459c9
-SIZE (golang-oauth2-2bc19b1_GH0.tar.gz) = 85638
+SHA256 (golang-net-290c469_GH0.tar.gz) = 425ce83e169726faa616d6313f289ff79698d0efe8e754cbc52e4c27a70452a9
+SIZE (golang-net-290c469_GH0.tar.gz) = 1229571
+SHA256 (golang-oauth2-9780585_GH0.tar.gz) = ab652f855ba8b406568f86a818bddaa53de6cd3ad3aae888ea82533b919179b4
+SIZE (golang-oauth2-9780585_GH0.tar.gz) = 88409
SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sys-d61c044_GH0.tar.gz) = 68aa63f1a50533ac3d73ff2615ed4decc63711bd1b0dec42acc8341d41a88e49
-SIZE (golang-sys-d61c044_GH0.tar.gz) = 1210635
-SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
-SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
-SHA256 (google-go-genproto-b395a37_GH0.tar.gz) = e0353ac7ba80c9ebaa9268122392be687ab1d8518db35c1a32f352f179f8c407
-SIZE (google-go-genproto-b395a37_GH0.tar.gz) = 11538182
-SHA256 (googleapis-google-api-go-client-v0.57.0_GH0.tar.gz) = 65f42dd3c69e17a02a915d624b77c9f6fb04b41816488f8889cf0eeeefc9bc99
-SIZE (googleapis-google-api-go-client-v0.57.0_GH0.tar.gz) = 22046362
-SHA256 (googleapis-google-cloud-go-v0.94.1_GH0.tar.gz) = 75a5df2590374fef8606cb5aa9c8adb3565d0779c48454ab7b66dffe456feef0
-SIZE (googleapis-google-cloud-go-v0.94.1_GH0.tar.gz) = 6296927
-SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
-SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
-SHA256 (grpc-grpc-go-v1.40.0_GH0.tar.gz) = baab44655d2ca715630356e6a74b2d27d91c8d40095913cd904bcc68ad332a82
-SIZE (grpc-grpc-go-v1.40.0_GH0.tar.gz) = 1305305
+SHA256 (golang-sys-33da011_GH0.tar.gz) = 2ac7a98b72b20e9c4df4a522203ddc3be95b114370c3db34a759d849e700a885
+SIZE (golang-sys-33da011_GH0.tar.gz) = 1292495
+SHA256 (golang-text-8db23f8_GH0.tar.gz) = 9e15c53bad1e201f2e6fff0a65fe3a93c40192165d008678508e45ef2caa2960
+SIZE (golang-text-8db23f8_GH0.tar.gz) = 8356655
+SHA256 (google-go-genproto-2d67ff6_GH0.tar.gz) = da6237705a11ace1858afdec0477357bb09b01f316101137d544bd85eb418ef1
+SIZE (google-go-genproto-2d67ff6_GH0.tar.gz) = 13307406
+SHA256 (googleapis-google-api-go-client-v0.74.0_GH0.tar.gz) = c8cd6f399344fe28101ad3367adff5117e58142fbd5c1d9de2f8f67565310b4c
+SIZE (googleapis-google-api-go-client-v0.74.0_GH0.tar.gz) = 24287090
+SHA256 (googleapis-google-cloud-go-v0.100.2_GH0.tar.gz) = 21a52ffb356b09bbe00bd0a25478a56a1ea9a4c6f5958375784a27fa07501fda
+SIZE (googleapis-google-cloud-go-v0.100.2_GH0.tar.gz) = 6908129
+SHA256 (googleapis-gax-go-v2.3.0_GH0.tar.gz) = fa731ead74ef64acba679e48451661475e3c75f2a01d732c13a8791d3329bba3
+SIZE (googleapis-gax-go-v2.3.0_GH0.tar.gz) = 64604
+SHA256 (grpc-grpc-go-v1.45.0_GH0.tar.gz) = fc67e6dc18bb7990688b080b72b446791d4c5e58c2e21207717f15daf0c3be65
+SIZE (grpc-grpc-go-v1.45.0_GH0.tar.gz) = 1435144
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.13_GH0.tar.gz) = 9b2aeafa5d95a40b32067ba22accdf42cc83414ec5b433ea7de330791beaa196
@@ -63,8 +63,8 @@ SHA256 (odeke-em-semalim-9c88bf5_GH0.tar.gz) = a0d859f3d95d410f24866d4717d38c7fc
SIZE (odeke-em-semalim-9c88bf5_GH0.tar.gz) = 2733
SHA256 (odeke-em-statos-292960a_GH0.tar.gz) = 80b335137f369738f5a3ba1b660f1e5f34868203a6269fdaa8fb3a42b46f543b
SIZE (odeke-em-statos-292960a_GH0.tar.gz) = 2871
-SHA256 (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 3ec41a8324431e72f85e0dc0c2c098cc14c3cb1ee8820996c8f46afca2d65609
-SIZE (protocolbuffers-protobuf-go-v1.27.1_GH0.tar.gz) = 1278521
+SHA256 (protocolbuffers-protobuf-go-v1.28.0_GH0.tar.gz) = e59ae9ace31c3a84bddf1bc3f04a04c498adb9ea7f9fcde60db91bba33d55171
+SIZE (protocolbuffers-protobuf-go-v1.28.0_GH0.tar.gz) = 1279757
SHA256 (rivo-uniseg-v0.2.0_GH0.tar.gz) = 3ad738b5c9162ede110d75b23564b6e40e52dd9150ebbced402f4f70be106197
SIZE (rivo-uniseg-v0.2.0_GH0.tar.gz) = 44036
SHA256 (skratchdot-open-golang-eef8423_GH0.tar.gz) = 2697bd09651928573f85d107d5225177b7d93d7dae179a58deb9079d770298a2
diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index c97b6ff91027..860bb086068d 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -1,6 +1,6 @@
PORTNAME= dtcp
PORTVERSION= 20130602
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://www.mahoroba.org/~ume/ipv6/
diff --git a/net/dtcp/files/patch-dtcpc.rb b/net/dtcp/files/patch-dtcpc.rb
index a63ead05b960..e6395dd936e6 100644
--- a/net/dtcp/files/patch-dtcpc.rb
+++ b/net/dtcp/files/patch-dtcpc.rb
@@ -1,8 +1,6 @@
-Index: dtcpc.rb
-diff -u dtcpc.rb.orig dtcpc.rb
---- dtcpc.rb.orig 2013-06-02 23:05:51.000000000 +0900
-+++ dtcpc.rb 2014-05-22 17:24:50.852383194 +0900
-@@ -422,6 +422,10 @@
+--- dtcpc.rb.orig 2013-06-02 14:05:51 UTC
++++ dtcpc.rb
+@@ -422,6 +422,10 @@ class Interface
execute("ifconfig #{@name} mtu #{mtu}")
end
@@ -13,7 +11,7 @@ diff -u dtcpc.rb.orig dtcpc.rb
def linklocal
`ifconfig #{@name} inet6`.each_line { |s|
if s =~ /inet6 (fe80::[^ ]*)/
-@@ -461,6 +465,9 @@
+@@ -461,6 +465,9 @@ class ClonedInterface < Interface
end
}
end
@@ -23,7 +21,7 @@ diff -u dtcpc.rb.orig dtcpc.rb
@created = true
end
-@@ -520,6 +527,9 @@
+@@ -520,6 +527,9 @@ class NetgraphInterface < Interface
if !@tunif || @tunif == "ng"
@name = mkpeer
@created = true
@@ -33,7 +31,12 @@ diff -u dtcpc.rb.orig dtcpc.rb
return
end
-@@ -535,6 +545,9 @@
+@@ -531,10 +541,13 @@ class NetgraphInterface < Interface
+ shutdown(@tunif)
+
+ bogus = Array.new
+- while TRUE
++ while true
@name = mkpeer
if @name == @tunif
@created = true
@@ -43,7 +46,16 @@ diff -u dtcpc.rb.orig dtcpc.rb
break
end
-@@ -927,6 +940,7 @@
+@@ -899,7 +912,7 @@ class DTCPClient
+
+ def keep_alive(sock)
+ begin
+- while TRUE
++ while true
+ debugmsg("sleep(60)\n")
+ sleep 60
+ sendmsg(sock, "ping")
+@@ -927,6 +940,7 @@ ousername = username
password = ''
tunif = TUNIF
cloning = TUNIF_CLONING
@@ -51,7 +63,7 @@ diff -u dtcpc.rb.orig dtcpc.rb
tuntype = 'tunnelonly'
route_type = 'static'
static_routes = 'default'
-@@ -949,7 +963,7 @@
+@@ -949,7 +963,7 @@ pidfile = PIDFILE
# exit 0
begin
@@ -60,7 +72,7 @@ diff -u dtcpc.rb.orig dtcpc.rb
rescue
usage()
exit 0
-@@ -965,6 +979,7 @@
+@@ -965,6 +979,7 @@ cloning = false if params["c"]
$debug = params["d"]
daemonize = params["D"]
pidfile = params["f"] if params["f"]
@@ -68,3 +80,12 @@ diff -u dtcpc.rb.orig dtcpc.rb
tunif = params["i"] if params["i"]
loop = params["l"]
mtu = params["m"].to_i if params["m"]
+@@ -1013,7 +1028,7 @@ begin
+ rtadvd_disable)
+ dtcpc = DTCPClient.new(dst, port, username, password, tuntype, behind_nat,
+ mtu, udp_tunnel, udp_tunnel_port)
+- while TRUE
++ while true
+ interrupt = nil
+ begin
+ trap("SIGHUP") {
diff --git a/net/dtcp/files/patch-dtcps.rb b/net/dtcp/files/patch-dtcps.rb
index bea1832ee408..a12c07ecf5c5 100644
--- a/net/dtcp/files/patch-dtcps.rb
+++ b/net/dtcp/files/patch-dtcps.rb
@@ -1,8 +1,6 @@
-Index: dtcps.rb
-diff -u dtcps.rb.orig dtcps.rb
---- dtcps.rb.orig 2013-06-02 23:05:51.000000000 +0900
-+++ dtcps.rb 2014-05-22 17:24:50.868385076 +0900
-@@ -185,6 +185,18 @@
+--- dtcps.rb.orig 2013-06-02 14:05:51 UTC
++++ dtcps.rb
+@@ -185,6 +185,18 @@ class Interface
execute("ifconfig #{@name} mtu #{mtu}")
end
@@ -21,7 +19,7 @@ diff -u dtcps.rb.orig dtcps.rb
def linklocal
`ifconfig #{@name} inet6`.each_line { |s|
if s =~ /inet6 (fe80::[^ ]*)/
-@@ -226,6 +238,9 @@
+@@ -226,6 +238,9 @@ class ClonedInterface < Interface
end
}
end
@@ -31,7 +29,7 @@ diff -u dtcps.rb.orig dtcps.rb
@created = true
end
-@@ -291,6 +306,9 @@
+@@ -291,6 +306,9 @@ class NetgraphInterface < Interface
if !@tunif || @tunif == "ng"
@name = mkpeer
@created = true
@@ -41,7 +39,12 @@ diff -u dtcps.rb.orig dtcps.rb
return
end
-@@ -306,6 +324,9 @@
+@@ -302,10 +320,13 @@ class NetgraphInterface < Interface
+ shutdown(@tunif)
+
+ bogus = Array.new
+- while TRUE
++ while true
@name = mkpeer
if @name == @tunif
@created = true
@@ -51,7 +54,7 @@ diff -u dtcps.rb.orig dtcps.rb
break
end
-@@ -724,6 +745,7 @@
+@@ -724,6 +745,7 @@ class Tunnel
}
delpeer(@tunif, @info[3], @info[2])
end
@@ -59,7 +62,7 @@ diff -u dtcps.rb.orig dtcps.rb
_delete(@tunif)
@tunif = nil
end
-@@ -769,6 +791,7 @@
+@@ -769,6 +791,7 @@ class Tunnel
raise 'tunnel interface sold out'
end
debugmsg("#{s}: tunnel interface #{tunif.name}\n")
@@ -67,7 +70,34 @@ diff -u dtcps.rb.orig dtcps.rb
myaddr = nil
if type == 'host' || (type == 'network' && $network_with_peeraddr)
-@@ -1173,13 +1196,14 @@
+@@ -883,7 +906,7 @@ end
+ def checktraffic(tun)
+ return if TRAFFICTIMEOUT == 0
+ ipkts = getipkts(tun.name)
+- while TRUE
++ while true
+ sleep TRAFFICTIMEOUT
+ i = getipkts(tun.name)
+ next if i == -1
+@@ -899,7 +922,7 @@ end
+
+ def service_dtcp(sock, name)
+ debugmsg("service_dtcp(#{sock}, #{name})\n")
+- while TRUE
++ while true
+ debugmsg("service_dtcp(#{sock}, #{name}) accepting\n")
+ Thread.start(sock.accept) { |s|
+ debugmsg("service_dtcp(#{sock}, #{name}) accepted #{s}\n")
+@@ -912,7 +935,7 @@ def service_dtcp(sock, name)
+
+ # check response
+ # tunnel itojun RESPONSE type
+- while TRUE
++ while true
+ t = IO.select([s], [], [s], tun == nil ? AUTHTIMEOUT : TUNTIMEOUT)
+ if t == nil
+ s.print "-ERR connection timed out, disconnecting\r\n"
+@@ -1173,13 +1196,14 @@ port = 20200
$tunif = TUNIF
$ng_tunif = "ng"
$cloning = TUNIF_CLONING
@@ -83,7 +113,7 @@ diff -u dtcps.rb.orig dtcps.rb
rescue
usage()
exit 0
-@@ -1190,6 +1214,7 @@
+@@ -1190,6 +1214,7 @@ $udp_tunnel_port = params["b"].to_i if params["b"]
$cloning = false if params["c"]
$debug = params["d"]
$daemonize = !params["D"]
diff --git a/net/endlessh/Makefile b/net/endlessh/Makefile
index b21b47922c58..54968d94850e 100644
--- a/net/endlessh/Makefile
+++ b/net/endlessh/Makefile
@@ -29,6 +29,6 @@ post-patch:
post-install:
${INSTALL_DATA} ${FILESDIR}/endlessh.newsyslog.conf \
${FILESDIR}/endlessh.conf.sample ${STAGEDIR}${PREFIX}/etc/
- ${STRIP} ${STAGEDIR}${PREFIX}/bin/endlessh
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/endlessh
.include <bsd.port.mk>
diff --git a/net/eternalterminal/Makefile b/net/eternalterminal/Makefile
index d9d7bb608f55..64ada1cd41ff 100644
--- a/net/eternalterminal/Makefile
+++ b/net/eternalterminal/Makefile
@@ -1,7 +1,6 @@
PORTNAME= eternalterminal
DISTVERSIONPREFIX= et-v
-DISTVERSION= 6.1.11
-PORTREVISION= 1
+DISTVERSION= 6.2.1
CATEGORIES= net
MAINTAINER= willtisdale@gmail.com
@@ -23,8 +22,6 @@ GH_PROJECT= EternalTerminal
CMAKE_ON= DISABLE_VCPKG
-MAKE_JOBS_UNSAFE= yes # temporarily set due to weird races resulting in build failures
-
CONFLICTS_INSTALL= linux-enemyterritory # bin/et
post-patch:
diff --git a/net/eternalterminal/distinfo b/net/eternalterminal/distinfo
index 3c1980c911aa..535d7e16a7b3 100644
--- a/net/eternalterminal/distinfo
+++ b/net/eternalterminal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642206078
-SHA256 (MisterTea-EternalTerminal-et-v6.1.11_GH0.tar.gz) = bff58ae9122a39a7012e741d2d514b0966725c942021f3279fa7e2b00cfd20a3
-SIZE (MisterTea-EternalTerminal-et-v6.1.11_GH0.tar.gz) = 22081590
+TIMESTAMP = 1651782303
+SHA256 (MisterTea-EternalTerminal-et-v6.2.1_GH0.tar.gz) = fdf68a51cb8b62b3dbbacd1d2aeba5d5491e5142e65c97713c2f1ce61d4fdbed
+SIZE (MisterTea-EternalTerminal-et-v6.2.1_GH0.tar.gz) = 22307167
diff --git a/net/evans/Makefile b/net/evans/Makefile
index 0529b15a4046..150fabf0daf3 100644
--- a/net/evans/Makefile
+++ b/net/evans/Makefile
@@ -1,5 +1,6 @@
PORTNAME= evans
DISTVERSION= 0.9.1
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= lcook@FreeBSD.org
diff --git a/net/eventviews/distinfo b/net/eventviews/distinfo
index c5893237e09a..371e71d248a6 100644
--- a/net/eventviews/distinfo
+++ b/net/eventviews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641292380
-SHA256 (KDE/release-service/21.12.1/eventviews-21.12.1.tar.xz) = a3f13127220428dd3519dae7d5dd4fb10cc234145dfe36be1481c564d085cbbc
-SIZE (KDE/release-service/21.12.1/eventviews-21.12.1.tar.xz) = 454592
+TIMESTAMP = 1654672145
+SHA256 (KDE/release-service/22.04.2/eventviews-22.04.2.tar.xz) = b36ed64fd25c3b0301120d5a290e9e002df3d26970722c01a81decb600c4d78e
+SIZE (KDE/release-service/22.04.2/eventviews-22.04.2.tar.xz) = 457180
diff --git a/net/eventviews/pkg-plist b/net/eventviews/pkg-plist
index 7910841b8dea..b4d893368c21 100644
--- a/net/eventviews/pkg-plist
+++ b/net/eventviews/pkg-plist
@@ -1,45 +1,43 @@
-include/KF5/EventViews/AgendaView
-include/KF5/EventViews/CalendarDecoration
-include/KF5/EventViews/ConfigDialogInterface
-include/KF5/EventViews/EventView
-include/KF5/EventViews/Helper
-include/KF5/EventViews/IncidenceTreeModel
-include/KF5/EventViews/JournalView
-include/KF5/EventViews/ListView
-include/KF5/EventViews/MonthView
-include/KF5/EventViews/MultiAgendaView
-include/KF5/EventViews/Prefs
-include/KF5/EventViews/TimeLineView
-include/KF5/EventViews/TodoModel
-include/KF5/EventViews/TodoView
-include/KF5/EventViews/ViewCalendar
-include/KF5/EventViews/WhatsNextView
-include/KF5/EventViews/eventview.h
-include/KF5/EventViews/helper.h
-include/KF5/EventViews/prefs.h
-include/KF5/eventviews/EventView
-include/KF5/eventviews/Helper
-include/KF5/eventviews/Prefs
-include/KF5/eventviews/agendaview.h
-include/KF5/eventviews/calendardecoration.h
-include/KF5/eventviews/configdialoginterface.h
-include/KF5/eventviews/eventview.h
-include/KF5/eventviews/eventviews_export.h
-include/KF5/eventviews/helper.h
-include/KF5/eventviews/incidencetreemodel.h
-include/KF5/eventviews/journalview.h
-include/KF5/eventviews/listview.h
-include/KF5/eventviews/monthview.h
-include/KF5/eventviews/multiagendaview.h
-include/KF5/eventviews/prefs.h
-include/KF5/eventviews/timelineview.h
-include/KF5/eventviews/todomodel.h
-include/KF5/eventviews/todoview.h
-include/KF5/eventviews/viewcalendar.h
-include/KF5/eventviews/whatsnextview.h
-include/KF5/eventviews_version.h
-share/qlogging-categories5/eventviews.categories
-share/qlogging-categories5/eventviews.renamecategories
+include/KF5/EventViews/EventViews/AgendaView
+include/KF5/EventViews/EventViews/CalendarDecoration
+include/KF5/EventViews/EventViews/ConfigDialogInterface
+include/KF5/EventViews/EventViews/EventView
+include/KF5/EventViews/EventViews/Helper
+include/KF5/EventViews/EventViews/IncidenceTreeModel
+include/KF5/EventViews/EventViews/JournalView
+include/KF5/EventViews/EventViews/ListView
+include/KF5/EventViews/EventViews/MonthView
+include/KF5/EventViews/EventViews/MultiAgendaView
+include/KF5/EventViews/EventViews/Prefs
+include/KF5/EventViews/EventViews/TimeLineView
+include/KF5/EventViews/EventViews/TodoModel
+include/KF5/EventViews/EventViews/TodoView
+include/KF5/EventViews/EventViews/ViewCalendar
+include/KF5/EventViews/EventViews/WhatsNextView
+include/KF5/EventViews/EventViews/eventview.h
+include/KF5/EventViews/EventViews/helper.h
+include/KF5/EventViews/EventViews/prefs.h
+include/KF5/EventViews/eventviews/EventView
+include/KF5/EventViews/eventviews/Helper
+include/KF5/EventViews/eventviews/Prefs
+include/KF5/EventViews/eventviews/agendaview.h
+include/KF5/EventViews/eventviews/calendardecoration.h
+include/KF5/EventViews/eventviews/configdialoginterface.h
+include/KF5/EventViews/eventviews/eventview.h
+include/KF5/EventViews/eventviews/eventviews_export.h
+include/KF5/EventViews/eventviews/helper.h
+include/KF5/EventViews/eventviews/incidencetreemodel.h
+include/KF5/EventViews/eventviews/journalview.h
+include/KF5/EventViews/eventviews/listview.h
+include/KF5/EventViews/eventviews/monthview.h
+include/KF5/EventViews/eventviews/multiagendaview.h
+include/KF5/EventViews/eventviews/prefs.h
+include/KF5/EventViews/eventviews/timelineview.h
+include/KF5/EventViews/eventviews/todomodel.h
+include/KF5/EventViews/eventviews/todoview.h
+include/KF5/EventViews/eventviews/viewcalendar.h
+include/KF5/EventViews/eventviews/whatsnextview.h
+include/KF5/EventViews/eventviews_version.h
lib/cmake/KF5EventViews/KF5EventViewsConfig.cmake
lib/cmake/KF5EventViews/KF5EventViewsConfigVersion.cmake
lib/cmake/KF5EventViews/KF5EventViewsTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -91,3 +89,5 @@ share/locale/ug/LC_MESSAGES/libeventviews.mo
share/locale/uk/LC_MESSAGES/libeventviews.mo
share/locale/zh_CN/LC_MESSAGES/libeventviews.mo
share/locale/zh_TW/LC_MESSAGES/libeventviews.mo
+share/qlogging-categories5/eventviews.categories
+share/qlogging-categories5/eventviews.renamecategories
diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index 34ccc3056ef6..f6568b601bd0 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fb303
-DISTVERSION= g20210709
-PORTREVISION= 1
+DISTVERSIONPREFIX= v
+DISTVERSION= 2022.06.20.00
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
@@ -17,6 +17,7 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
libfolly.so:devel/folly \
libgflags.so:devel/gflags \
libglog.so:devel/glog \
+ libicuuc.so:devel/icu \
liblz4.so:archivers/liblz4 \
libsnappy.so:archivers/snappy \
libsodium.so:security/libsodium \
@@ -25,12 +26,11 @@ LIB_DEPENDS= libboost_regex.so:devel/boost-libs \
libwangle.so:net/wangle \
libzstd.so:archivers/zstd
-USES= cmake compiler:c++17-lang ssl
+USES= cmake compiler:c++17-lang
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= facebook
-GH_TAGNAME= 83ae662219660d30b49ad8474f5c63bbfc6d5f6f
CXXFLAGS+= -fPIC
diff --git a/net/fb303/distinfo b/net/fb303/distinfo
index 5d44ade6ba25..fa2c068aa53b 100644
--- a/net/fb303/distinfo
+++ b/net/fb303/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625850513
-SHA256 (facebook-fb303-g20210709-83ae662219660d30b49ad8474f5c63bbfc6d5f6f_GH0.tar.gz) = 47011442205176a7d0f763d48979bf30d7250b6ade96808ae66122d491accdc7
-SIZE (facebook-fb303-g20210709-83ae662219660d30b49ad8474f5c63bbfc6d5f6f_GH0.tar.gz) = 233451
+TIMESTAMP = 1655746886
+SHA256 (facebook-fb303-v2022.06.20.00_GH0.tar.gz) = a3561271e0b209a378039db69e1608717b1c22e90ab0686c18d630ce35fedbc0
+SIZE (facebook-fb303-v2022.06.20.00_GH0.tar.gz) = 231265
diff --git a/net/fb303/pkg-plist b/net/fb303/pkg-plist
index f30be7b5c05f..371262180a81 100644
--- a/net/fb303/pkg-plist
+++ b/net/fb303/pkg-plist
@@ -10,6 +10,7 @@ include/fb303/ExportedStatMapImpl.h
include/fb303/FollyLoggingHandler.h
include/fb303/HistogramExporter.h
include/fb303/LegacyClock.h
+include/fb303/LimitUtils.h
include/fb303/MutexWrapper.h
include/fb303/QuantileStat-inl.h
include/fb303/QuantileStat.h
diff --git a/net/fbzmq/Makefile b/net/fbzmq/Makefile
index 8843c6a593f4..b884bb921a6d 100644
--- a/net/fbzmq/Makefile
+++ b/net/fbzmq/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fbzmq
DISTVERSIONPREFIX= v
-DISTVERSION= 2022.01.17.00
+DISTVERSION= 2022.05.30.00
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/fbzmq/distinfo b/net/fbzmq/distinfo
index 05508c402ace..c44dcd1d2027 100644
--- a/net/fbzmq/distinfo
+++ b/net/fbzmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642450307
-SHA256 (facebook-fbzmq-v2022.01.17.00_GH0.tar.gz) = f956e03e748ce5a8a8c4b209bde59d1a60b090cfea7ea2426323a6abd9d95cd7
-SIZE (facebook-fbzmq-v2022.01.17.00_GH0.tar.gz) = 202383
+TIMESTAMP = 1654315039
+SHA256 (facebook-fbzmq-v2022.05.30.00_GH0.tar.gz) = c9c70b3b656fdd0c1706a348ad1f09a1736b4121438c3f21cd8b04e0d8fad8a4
+SIZE (facebook-fbzmq-v2022.05.30.00_GH0.tar.gz) = 191974
diff --git a/net/findomain/Makefile b/net/findomain/Makefile
index 084eb2dd323e..9b0ecfd71efe 100644
--- a/net/findomain/Makefile
+++ b/net/findomain/Makefile
@@ -1,6 +1,6 @@
PORTNAME= findomain
DISTVERSION= 5.0.0
-PORTREVISION= 5
+PORTREVISION= 9
CATEGORIES= net security
MAINTAINER= lcook@FreeBSD.org
diff --git a/net/foreman-proxy/Makefile b/net/foreman-proxy/Makefile
index d348ac26fa3e..0316527149ab 100644
--- a/net/foreman-proxy/Makefile
+++ b/net/foreman-proxy/Makefile
@@ -1,29 +1,32 @@
# Created by: Martin Matuska <mm@FreeBSD.org>
PORTNAME= foreman-proxy
-PORTVERSION= 1.21.2
+PORTVERSION= 3.1.2
CATEGORIES= net
MASTER_SITES= https://downloads.theforeman.org/foreman-proxy/
-MAINTAINER= ruby@FreeBSD.org
+MAINTAINER= freebsd@moov.de
COMMENT= Foreman Proxy Agent
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-bundler_ext>=0.4:sysutils/rubygem-bundler_ext \
+ rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
rubygem-json>=1.8.1:devel/rubygem-json \
+ rubygem-logging>=0:devel/rubygem-logging \
rubygem-rack>=2.0:www/rubygem-rack \
rubygem-rb-kqueue>=0.2.2:devel/rubygem-rb-kqueue \
rubygem-rsec>=0.4.3:devel/rubygem-rsec \
+ rubygem-sd_notify>=0.1.1:devel/rubygem-sd_notify \
rubygem-sinatra>=2.0:www/rubygem-sinatra \
- wget:ftp/wget
+ curl:ftp/curl
USES= shebangfix tar:bzip2
-OPTIONS_DEFINE= BMC PUPPET6
-BMC_DESC= Depend on rubyipmi for BMC support
-PUPPET6_DESC= Depend on Puppet 6
+OPTIONS_DEFINE= BMC PUPPET7
+BMC_DESC= Depend on rubyipmi and redfish_client for BMC support
+PUPPET7_DESC= Depend on Puppet 7
NO_ARCH= yes
NO_BUILD= yes
@@ -48,8 +51,9 @@ PLIST_SUB= ${SUB_LIST} MKDIR="${MKDIR}"
SHEBANG_FILES= extra/foreman-debug-proxy
-BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi
-PUPPET6_RUN_DEPENDS= puppet:sysutils/puppet6 \
+BMC_RUN_DEPENDS= rubygem-rubyipmi>=0.10.0:sysutils/rubygem-rubyipmi \
+ rubygem-redfish_client>=0.5.1:sysutils/rubygem-redfish_client
+PUPPET7_RUN_DEPENDS= puppet:sysutils/puppet7 \
rubygem-ruby-augeas>=0.5:textproc/rubygem-ruby-augeas
post-patch:
@@ -59,9 +63,12 @@ post-patch:
-e "s|%%PREFIX%%|${PREFIX}|g" \
-e "s|%%DATADIR%%|${DATADIR}|g" \
${WRKSRC}/bin/smart-proxy \
+ ${WRKSRC}/extra/dhcpd_config_check.rb \
+ ${WRKSRC}/extra/foreman-debug-proxy \
${WRKSRC}/extra/migrate_settings.rb \
+ ${WRKSRC}/extra/puppet_sign.rb \
${WRKSRC}/extra/query.rb \
- ${WRKSRC}/extra/register-service.rb
+ ${WRKSRC}/extra/register_service.rb
@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
${WRKSRC}/config/settings.d/*.yml.example \
@@ -78,7 +85,8 @@ do-install:
${CP} -r ${WRKSRC}/${file} ${STAGEDIR}${DATADIR}
.endfor
${LN} -s Gemfile ${STAGEDIR}${DATADIR}/Gemfile.in
-.for script in foreman-debug-proxy migrate_settings.rb query.rb register-service.rb
+.for script in dhcpd_config_check.rb foreman-debug-proxy \
+ migrate_settings.rb puppet_sign.rb query.rb register_service.rb
${INSTALL_SCRIPT} ${WRKSRC}/extra/${script} \
${STAGEDIR}${DATADIR}/extra/${script}
.endfor
@@ -86,11 +94,11 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/config/settings.yml.example \
${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.yml.sample
.for cfg in bmc dhcp_isc dhcp_libvirt dhcp_native_ms dhcp dns_dnscmd \
- dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts logs \
- puppet_proxy_customrun puppet_proxy_legacy \
- puppet_proxy_mcollective puppet_proxy_puppet_api \
- puppet_proxy_puppetrun puppet_proxy_salt puppet_proxy_ssh puppet \
- puppetca realm templates tftp
+ dns_libvirt dns_nsupdate_gss dns_nsupdate dns facts httpboot \
+ logs puppet_proxy_puppet_api puppet \
+ puppetca_hostname_whitelisting puppetca_http_api \
+ puppetca_puppet_cert puppetca_token_whitelisting \
+ puppetca realm_freeipa realm registration templates tftp
${INSTALL_DATA} ${WRKSRC}/config/settings.d/${cfg}.yml.example \
${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/${cfg}.yml.sample
.endfor
diff --git a/net/foreman-proxy/distinfo b/net/foreman-proxy/distinfo
index 581509743483..ffa4444487b8 100644
--- a/net/foreman-proxy/distinfo
+++ b/net/foreman-proxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555274078
-SHA256 (foreman-proxy-1.21.2.tar.bz2) = bc5590f13de8e37cfb52c9a898642ae595b91d498b0384da28602e5505245a6a
-SIZE (foreman-proxy-1.21.2.tar.bz2) = 210802
+TIMESTAMP = 1646448265
+SHA256 (foreman-proxy-3.1.2.tar.bz2) = 14a21af2e735e266f5e22ec64e4597bf4821b53fb7a2393a5146587f1400a1eb
+SIZE (foreman-proxy-3.1.2.tar.bz2) = 199897
diff --git a/net/foreman-proxy/files/patch-bin-smart-proxy b/net/foreman-proxy/files/patch-bin-smart-proxy
index d85df17df24c..3df6da1863db 100644
--- a/net/foreman-proxy/files/patch-bin-smart-proxy
+++ b/net/foreman-proxy/files/patch-bin-smart-proxy
@@ -3,7 +3,7 @@
@@ -1,6 +1,7 @@
#!/usr/bin/env ruby
- $LOAD_PATH.unshift(*Dir[File.expand_path("../../lib", __FILE__), File.expand_path("../../modules", __FILE__)])
+ $LOAD_PATH.unshift(*Dir[File.expand_path('../lib', __dir__), File.expand_path('../modules', __dir__)])
+$LOAD_PATH.unshift(*Dir["%%DATADIR%%/lib", "%%DATADIR%%/modules"])
require 'smart_proxy_main'
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example
deleted file mode 100644
index 9acd043d62ec..000000000000
--- a/net/foreman-proxy/files/patch-config-settings.d-puppet_proxy_legacy.yml.example
+++ /dev/null
@@ -1,24 +0,0 @@
---- config/settings.d/puppet_proxy_legacy.yml.example 2018-12-06 13:30:25.000000000 +0100
-+++ config/settings.d/puppet_proxy_legacy.yml.example 2019-02-11 22:22:20.750500000 +0100
-@@ -5,7 +5,7 @@
- # :puppet_version setting in smart-proxy's puppet.yml configuration file.
- #
- ---
--#:puppet_conf: /etc/puppet/puppet.conf
-+#:puppet_conf: %%LOCALBASE%%/etc/puppet/puppet.conf
- #
- # Override use of Puppet's API to list environments, by default it will use only if
- # environmentpath is given in puppet.conf, else will look for environments in puppet.conf
-@@ -16,9 +16,9 @@
- #:puppet_url: https://puppet.example.com:8140
- #
- # SSL certificates used to access the environment API. Required if puppet_use_environment_api is set to true.
--#:puppet_ssl_ca: /var/lib/puppet/ssl/certs/ca.pem
--#:puppet_ssl_cert: /var/lib/puppet/ssl/certs/puppet.example.com.pem
--#:puppet_ssl_key: /var/lib/puppet/ssl/private_keys/puppet.example.com.pem
-+#:puppet_ssl_ca: /var/puppet/ssl/certs/ca.pem
-+#:puppet_ssl_cert: /var/puppet/ssl/certs/puppet.example.com.pem
-+#:puppet_ssl_key: /var/puppet/ssl/private_keys/puppet.example.com.pem
- #
- # Enable/disable puppet class cache
- #:use_cache: true
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example
new file mode 100644
index 000000000000..644021449e3c
--- /dev/null
+++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca_hostname_whitelisting.yml.example
@@ -0,0 +1,8 @@
+--- config/settings.d/puppetca_hostname_whitelisting.yml.example.orig 2021-10-26 14:48:17.000000000 +0200
++++ config/settings.d/puppetca_hostname_whitelisting.yml.example 2021-11-24 11:59:39.227846000 +0100
+@@ -3,4 +3,4 @@
+ # Configuration of the PuppetCA hostname_whitelisting provider
+ #
+
+-#:autosignfile: /etc/puppet/autosign.conf
++#:autosignfile: %%LOCALBASE%%/etc/puppet/autosign.conf
diff --git a/net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example b/net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example
new file mode 100644
index 000000000000..b6f1d195b004
--- /dev/null
+++ b/net/foreman-proxy/files/patch-config-settings.d-puppetca_http_api.yml.example
@@ -0,0 +1,12 @@
+--- config/settings.d/puppetca_http_api.yml.example.orig 2021-10-26 14:48:17.000000000 +0200
++++ config/settings.d/puppetca_http_api.yml.example 2021-11-24 12:00:12.367622000 +0100
+@@ -3,6 +3,6 @@
+ #:puppet_url: https://puppet.example.com:8140
+ #
+ # SSL certificates used to access the CA API.
+-#:puppet_ssl_ca: /etc/puppetlabs/ssl/certs/ca.pem
+-#:puppet_ssl_cert: /etc/puppetlabs/ssl/certs/puppet.example.com.pem
+-#:puppet_ssl_key: /etc/puppetlabs/ssl/private_keys/puppet.example.com.pem
++#:puppet_ssl_ca: %%LOCALBASE%%/etc/puppetlabs/ssl/certs/ca.pem
++#:puppet_ssl_cert: %%LOCALBASE%%/etc/puppetlabs/ssl/certs/puppet.example.com.pem
++#:puppet_ssl_key: %%LOCALBASE%%/etc/puppetlabs/ssl/private_keys/puppet.example.com.pem
diff --git a/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example b/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
index 52f93d135b18..c7eb5e8a5d54 100644
--- a/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
+++ b/net/foreman-proxy/files/patch-config-settings.d-realm_freeipa.yml.example
@@ -1,10 +1,10 @@
---- config/settings.d/realm_freeipa.yml.example.orig 2018-12-06 13:30:25.000000000 +0100
-+++ config/settings.d/realm_freeipa.yml.example 2019-02-11 22:24:18.091737000 +0100
-@@ -1,8 +1,8 @@
+--- config/settings.d/realm_freeipa.yml.example.orig 2021-10-26 14:48:17.000000000 +0200
++++ config/settings.d/realm_freeipa.yml.example 2021-11-24 12:26:05.935474000 +0100
+@@ -1,9 +1,9 @@
---
# Authentication for Kerberos-based Realms
-:keytab_path: /etc/foreman-proxy/freeipa.keytab
-+:realm_keytab: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab
++:keytab_path: %%LOCALBASE%%/etc/foreman-proxy/freeipa.keytab
:principal: realm-proxy@EXAMPLE.COM
-:ipa_config: /etc/ipa/default.conf
diff --git a/net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example b/net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example
new file mode 100644
index 000000000000..a236513fca8e
--- /dev/null
+++ b/net/foreman-proxy/files/patch-config_settings.d_puppetca__puppet__cert.yml.example
@@ -0,0 +1,9 @@
+--- config/settings.d/puppetca_puppet_cert.yml.example.orig 2019-12-22 22:37:03 UTC
++++ config/settings.d/puppetca_puppet_cert.yml.example
+@@ -1,4 +1,4 @@
+ ---
+-#:ssldir: /var/lib/puppet/ssl
++#:ssldir: /var/puppet/ssl
+ #:puppetca_use_sudo: true
+-#:sudo_command: /usr/bin/sudo
++#:sudo_command: %%LOCALBASE%%/bin/sudo
diff --git a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
index 81c97ff8734e..030c87085c8e 100644
--- a/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
+++ b/net/foreman-proxy/files/patch-lib_proxy_http__download.rb
@@ -1,11 +1,11 @@
---- lib/proxy/http_download.rb.orig 2018-12-06 13:30:25.000000000 +0100
-+++ lib/proxy/http_download.rb 2019-02-11 22:33:58.455890000 +0100
-@@ -9,7 +9,7 @@
+--- lib/proxy/http_download.rb.orig 2022-02-16 01:16:26 UTC
++++ lib/proxy/http_download.rb
+@@ -10,7 +10,7 @@ module Proxy
+ logger.warn('Deprecated: HttpDownload read_timeout is deprecated and will be removed in 4.0') if read_timeout
+ logger.warn('Deprecated: HttpDownload dns_timeout is deprecated and will be removed in 4.0') if dns_timeout
+ connect_timeout ||= DEFAULT_CONNECT_TIMEOUT
+- args = [which('curl')]
++ args = ["%%LOCALBASE%%/bin/curl"]
- def initialize(src, dst, read_timeout = nil, connect_timeout = nil, dns_timeout = nil)
- @dst = dst
-- wget = which("wget")
-+ wget = "%%LOCALBASE%%/bin/wget"
- read_timeout ||= DEFAULT_READ_TIMEOUT
- dns_timeout ||= DEFAULT_CONNECT_TIMEOUT
- connect_timeout ||= DEFAULT_DNS_TIMEOUT
+ # no cert verification if set
+ args << "--insecure" unless verify_server_cert
diff --git a/net/foreman-proxy/pkg-message b/net/foreman-proxy/pkg-message
index 82c1238d5fe2..451fa7a16cc4 100644
--- a/net/foreman-proxy/pkg-message
+++ b/net/foreman-proxy/pkg-message
@@ -11,7 +11,7 @@ ${PREFIX}/etc/foreman-proxy/settings.d
You can use a bundled script to convert your old settings to new settings:
-${PREFIX}/share/foreman/extra/migrate_settings.rb
+${PREFIX}/share/foreman-proxy/extra/migrate_settings.rb
EOM
}
]
diff --git a/net/foreman-proxy/pkg-plist b/net/foreman-proxy/pkg-plist
index 4ade110f67cd..f4ae423e3751 100644
--- a/net/foreman-proxy/pkg-plist
+++ b/net/foreman-proxy/pkg-plist
@@ -9,17 +9,18 @@
@sample %%ETCDIR%%/settings.d/dns_nsupdate.yml.sample
@sample %%ETCDIR%%/settings.d/dns_nsupdate_gss.yml.sample
@sample %%ETCDIR%%/settings.d/facts.yml.sample
+@sample %%ETCDIR%%/settings.d/httpboot.yml.sample
@sample %%ETCDIR%%/settings.d/logs.yml.sample
@sample %%ETCDIR%%/settings.d/puppet.yml.sample
-@sample %%ETCDIR%%/settings.d/puppet_proxy_customrun.yml.sample
-@sample %%ETCDIR%%/settings.d/puppet_proxy_legacy.yml.sample
-@sample %%ETCDIR%%/settings.d/puppet_proxy_mcollective.yml.sample
@sample %%ETCDIR%%/settings.d/puppet_proxy_puppet_api.yml.sample
-@sample %%ETCDIR%%/settings.d/puppet_proxy_puppetrun.yml.sample
-@sample %%ETCDIR%%/settings.d/puppet_proxy_salt.yml.sample
-@sample %%ETCDIR%%/settings.d/puppet_proxy_ssh.yml.sample
@sample %%ETCDIR%%/settings.d/puppetca.yml.sample
+@sample %%ETCDIR%%/settings.d/puppetca_hostname_whitelisting.yml.sample
+@sample %%ETCDIR%%/settings.d/puppetca_http_api.yml.sample
+@sample %%ETCDIR%%/settings.d/puppetca_puppet_cert.yml.sample
+@sample %%ETCDIR%%/settings.d/puppetca_token_whitelisting.yml.sample
@sample %%ETCDIR%%/settings.d/realm.yml.sample
+@sample %%ETCDIR%%/settings.d/realm_freeipa.yml.sample
+@sample %%ETCDIR%%/settings.d/registration.yml.sample
@sample %%ETCDIR%%/settings.d/templates.yml.sample
@sample %%ETCDIR%%/settings.d/tftp.yml.sample
@sample %%ETCDIR%%/settings.yml.sample
@@ -37,13 +38,13 @@ sbin/smart-proxy
%%DATADIR%%/bundler.d/journald.rb
%%DATADIR%%/bundler.d/krb5.rb
%%DATADIR%%/bundler.d/libvirt.rb
-%%DATADIR%%/bundler.d/puppet.rb
%%DATADIR%%/bundler.d/puppetca_token_whitelisting.rb
%%DATADIR%%/bundler.d/realm_freeipa.rb
%%DATADIR%%/bundler.d/test.rb
%%DATADIR%%/bundler.d/windows.rb
%%DATADIR%%/config
%%DATADIR%%/config.ru
+%%DATADIR%%/extra/dhcpd_config_check.rb
%%DATADIR%%/extra/foreman-debug-proxy
%%DATADIR%%/extra/migrate_settings.rb
%%DATADIR%%/extra/migrations/20150327000000_migrate_monolithic_config.rb
@@ -54,11 +55,11 @@ sbin/smart-proxy
%%DATADIR%%/extra/migrations/20161209000000_migrate_realm_settings.rb
%%DATADIR%%/extra/migrations/20170523000000_migrate_autosign_setting.rb
%%DATADIR%%/extra/migrations/2018062000000_migrate_puppetca_settings.rb
+%%DATADIR%%/extra/migrations/20181016000000_migrate_puppetca_puppet_cert_settings.rb
+%%DATADIR%%/extra/puppet_sign.rb
%%DATADIR%%/extra/query.rb
-%%DATADIR%%/extra/register-service.rb
+%%DATADIR%%/extra/register_service.rb
%%DATADIR%%/lib/bundler_helper.rb
-%%DATADIR%%/lib/checks.rb
-%%DATADIR%%/lib/daemon.rb
%%DATADIR%%/lib/launcher.rb
%%DATADIR%%/lib/proxy/default_di_wirings.rb
%%DATADIR%%/lib/proxy/default_plugin_validators.rb
@@ -67,14 +68,13 @@ sbin/smart-proxy
%%DATADIR%%/lib/proxy/file_lock.rb
%%DATADIR%%/lib/proxy/helpers.rb
%%DATADIR%%/lib/proxy/http_download.rb
-%%DATADIR%%/lib/proxy/http_download.rb.bak
-%%DATADIR%%/lib/proxy/http_download.rb.orig
%%DATADIR%%/lib/proxy/kerberos.rb
%%DATADIR%%/lib/proxy/log.rb
%%DATADIR%%/lib/proxy/log_buffer/buffer.rb
%%DATADIR%%/lib/proxy/log_buffer/decorator.rb
%%DATADIR%%/lib/proxy/log_buffer/ring_buffer.rb
%%DATADIR%%/lib/proxy/log_buffer/trace_decorator.rb
+%%DATADIR%%/lib/proxy/logging_resolv.rb
%%DATADIR%%/lib/proxy/memory_store.rb
%%DATADIR%%/lib/proxy/pluggable.rb
%%DATADIR%%/lib/proxy/plugin.rb
@@ -85,26 +85,27 @@ sbin/smart-proxy
%%DATADIR%%/lib/proxy/provider_factory.rb
%%DATADIR%%/lib/proxy/request.rb
%%DATADIR%%/lib/proxy/request_id_middleware.rb
-%%DATADIR%%/lib/proxy/sd_notify.rb
%%DATADIR%%/lib/proxy/settings.rb
%%DATADIR%%/lib/proxy/settings/global.rb
%%DATADIR%%/lib/proxy/settings/plugin.rb
%%DATADIR%%/lib/proxy/signal_handler.rb
+%%DATADIR%%/lib/proxy/time_utils.rb
%%DATADIR%%/lib/proxy/util.rb
%%DATADIR%%/lib/proxy/validations.rb
-%%DATADIR%%/lib/rack-patch.rb
%%DATADIR%%/lib/sinatra/authorization.rb
%%DATADIR%%/lib/sinatra/default_not_found_page.rb
%%DATADIR%%/lib/smart_proxy.rb
%%DATADIR%%/lib/smart_proxy_for_testing.rb
%%DATADIR%%/lib/smart_proxy_main.rb
-%%DATADIR%%/lib/webrick-patch.rb
%%DATADIR%%/modules/bmc/base.rb
%%DATADIR%%/modules/bmc/bmc.rb
%%DATADIR%%/modules/bmc/bmc_api.rb
%%DATADIR%%/modules/bmc/bmc_plugin.rb
%%DATADIR%%/modules/bmc/http_config.ru
%%DATADIR%%/modules/bmc/ipmi.rb
+%%DATADIR%%/modules/bmc/redfish.rb
+%%DATADIR%%/modules/bmc/redfish/dell.rb
+%%DATADIR%%/modules/bmc/redfish/hpe.rb
%%DATADIR%%/modules/bmc/shell.rb
%%DATADIR%%/modules/bmc/ssh.rb
%%DATADIR%%/modules/dhcp/configuration_loader.rb
@@ -118,8 +119,6 @@ sbin/smart-proxy
%%DATADIR%%/modules/dhcp_common/isc/configuration_parser.rb
%%DATADIR%%/modules/dhcp_common/isc/omapi_provider.rb
%%DATADIR%%/modules/dhcp_common/isc/subnet_service_initialization.rb
-%%DATADIR%%/modules/dhcp_common/monkey_patch_subnet.rb
-%%DATADIR%%/modules/dhcp_common/monkey_patches.rb
%%DATADIR%%/modules/dhcp_common/pingable.rb
%%DATADIR%%/modules/dhcp_common/record.rb
%%DATADIR%%/modules/dhcp_common/record/deleted_reservation.rb
@@ -189,62 +188,35 @@ sbin/smart-proxy
%%DATADIR%%/modules/puppet_proxy/puppet_api.rb
%%DATADIR%%/modules/puppet_proxy/puppet_plugin.rb
%%DATADIR%%/modules/puppet_proxy_common/api_request.rb
-%%DATADIR%%/modules/puppet_proxy_common/custom_validators.rb
%%DATADIR%%/modules/puppet_proxy_common/environment.rb
%%DATADIR%%/modules/puppet_proxy_common/environments_retriever_base.rb
%%DATADIR%%/modules/puppet_proxy_common/errors.rb
%%DATADIR%%/modules/puppet_proxy_common/puppet_class.rb
-%%DATADIR%%/modules/puppet_proxy_common/runner.rb
-%%DATADIR%%/modules/puppet_proxy_customrun/customrun_main.rb
-%%DATADIR%%/modules/puppet_proxy_customrun/plugin_configuration.rb
-%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun.rb
-%%DATADIR%%/modules/puppet_proxy_customrun/puppet_proxy_customrun_plugin.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_base.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/class_scanner_eparser.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/environments_api_request.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/initializer.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/plugin_configuration.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_api_v2_environments_retriever.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_cache.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_config_environments_retriever.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy.rb
-%%DATADIR%%/modules/puppet_proxy_legacy/puppet_proxy_legacy_plugin.rb
-%%DATADIR%%/modules/puppet_proxy_mcollective/mcollective_main.rb
-%%DATADIR%%/modules/puppet_proxy_mcollective/plugin_configuration.rb
-%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective.rb
-%%DATADIR%%/modules/puppet_proxy_mcollective/puppet_proxy_mcollective_plugin.rb
%%DATADIR%%/modules/puppet_proxy_puppet_api/plugin_configuration.rb
%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api.rb
%%DATADIR%%/modules/puppet_proxy_puppet_api/puppet_proxy_puppet_api_plugin.rb
%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_api_request.rb
-%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_classes_retriever.rb
%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environment_classes_api_classes_retriever.rb
%%DATADIR%%/modules/puppet_proxy_puppet_api/v3_environments_retriever.rb
-%%DATADIR%%/modules/puppet_proxy_puppetrun/plugin_configuration.rb
-%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun.rb
-%%DATADIR%%/modules/puppet_proxy_puppetrun/puppet_proxy_puppetrun_plugin.rb
-%%DATADIR%%/modules/puppet_proxy_puppetrun/puppetrun_main.rb
-%%DATADIR%%/modules/puppet_proxy_salt/plugin_configuration.rb
-%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt.rb
-%%DATADIR%%/modules/puppet_proxy_salt/puppet_proxy_salt_plugin.rb
-%%DATADIR%%/modules/puppet_proxy_salt/salt_main.rb
-%%DATADIR%%/modules/puppet_proxy_ssh/plugin_configuration.rb
-%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh.rb
-%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_main.rb
-%%DATADIR%%/modules/puppet_proxy_ssh/puppet_proxy_ssh_plugin.rb
%%DATADIR%%/modules/puppetca/dependency_injection.rb
%%DATADIR%%/modules/puppetca/http_config.ru
%%DATADIR%%/modules/puppetca/plugin_configuration.rb
%%DATADIR%%/modules/puppetca/puppetca.rb
%%DATADIR%%/modules/puppetca/puppetca_api.rb
%%DATADIR%%/modules/puppetca/puppetca_plugin.rb
-%%DATADIR%%/modules/puppetca/puppetca_puppet_cert.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/plugin_configuration.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting_autosigner.rb
%%DATADIR%%/modules/puppetca_hostname_whitelisting/puppetca_hostname_whitelisting_plugin.rb
+%%DATADIR%%/modules/puppetca_http_api/ca_v1_api_request.rb
+%%DATADIR%%/modules/puppetca_http_api/plugin_configuration.rb
+%%DATADIR%%/modules/puppetca_http_api/puppetca_http_api.rb
+%%DATADIR%%/modules/puppetca_http_api/puppetca_http_api_plugin.rb
+%%DATADIR%%/modules/puppetca_http_api/puppetca_impl.rb
+%%DATADIR%%/modules/puppetca_puppet_cert/plugin_configuration.rb
+%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_impl.rb
+%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_puppet_cert.rb
+%%DATADIR%%/modules/puppetca_puppet_cert/puppetca_puppet_cert_plugin.rb
%%DATADIR%%/modules/puppetca_token_whitelisting/plugin_configuration.rb
%%DATADIR%%/modules/puppetca_token_whitelisting/puppetca_token_whitelisting.rb
%%DATADIR%%/modules/puppetca_token_whitelisting/puppetca_token_whitelisting_autosigner.rb
@@ -262,16 +234,25 @@ sbin/smart-proxy
%%DATADIR%%/modules/realm_freeipa/provider.rb
%%DATADIR%%/modules/realm_freeipa/realm_freeipa.rb
%%DATADIR%%/modules/realm_freeipa/realm_freeipa_plugin.rb
+%%DATADIR%%/modules/registration/http_config.ru
+%%DATADIR%%/modules/registration/proxy_request.rb
+%%DATADIR%%/modules/registration/registration.rb
+%%DATADIR%%/modules/registration/registration_api.rb
+%%DATADIR%%/modules/registration/registration_plugin.rb
%%DATADIR%%/modules/root/http_config.ru
%%DATADIR%%/modules/root/root.rb
%%DATADIR%%/modules/root/root_api.rb
%%DATADIR%%/modules/root/root_module_loader.rb
%%DATADIR%%/modules/root/root_plugin.rb
+%%DATADIR%%/modules/root/root_v2_api.rb
%%DATADIR%%/modules/templates/http_config.ru
+%%DATADIR%%/modules/templates/proxy_request.rb
%%DATADIR%%/modules/templates/template_proxy_request.rb
%%DATADIR%%/modules/templates/templates.rb
-%%DATADIR%%/modules/templates/templates_api.rb
%%DATADIR%%/modules/templates/templates_plugin.rb
+%%DATADIR%%/modules/templates/templates_unattended_api.rb
+%%DATADIR%%/modules/templates/templates_userdata_api.rb
+%%DATADIR%%/modules/templates/userdata_proxy_request.rb
%%DATADIR%%/modules/tftp/http_config.ru
%%DATADIR%%/modules/tftp/server.rb
%%DATADIR%%/modules/tftp/tftp.rb
diff --git a/net/fort/Makefile b/net/fort/Makefile
index ee850aea8832..db3e07342bcb 100644
--- a/net/fort/Makefile
+++ b/net/fort/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fort
DISTVERSION= 1.5.3
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= toni@devboks.com
diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile
index 68e6ddb9cf0c..c3a44bf08ed9 100644
--- a/net/fpc-ldap/Makefile
+++ b/net/fpc-ldap/Makefile
@@ -1,6 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
-PORTREVISION= 1
+PORTREVISION= 4
CATEGORIES= net lang
PKGNAMESUFFIX= -ldap
diff --git a/net/fping/Makefile b/net/fping/Makefile
index af42b27bf518..1a3c2d858d24 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fping
PORTVERSION= 5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://fping.org/dist/ \
https://github.com/schweikert/${PORTNAME}/releases/download/v${PORTVERSION}/
diff --git a/net/fping/files/patch-fping.c b/net/fping/files/patch-fping.c
index 054f171fad67..e8b5343c04ba 100644
--- a/net/fping/files/patch-fping.c
+++ b/net/fping/files/patch-fping.c
@@ -14,3 +14,26 @@
socket_set_src_addr_ipv6(socket6, &src_addr6, (socktype6 == SOCK_DGRAM) ? &ident6 : NULL);
}
#endif
+@@ -2299,6 +2299,22 @@ int wait_for_reply(int64_t wait_time)
+ #endif
+ else {
+ return 1;
++ }
++
++ /* Check that src address is one of the hosts we pinged before */
++ int found = 0;
++ for (int i = 0; i < num_hosts; i++) {
++ HOST_ENTRY *h = table[i];
++ if (!addr_cmp((struct sockaddr*)&response_addr, (struct sockaddr*)&h->saddr)) {
++ found = 1;
++ break;
++ }
++ }
++ if (!found) {
++ // char buf[INET6_ADDRSTRLEN];
++ // getnameinfo((struct sockaddr*)&response_addr, sizeof(response_addr), buf, INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST);
++ // fprintf(stderr, "ignoring response from %s\n", buf);
++ return 1; /* packet received, but not from a host we pinged */
+ }
+
+ seqmap_value = seqmap_fetch(seq, current_time_ns);
diff --git a/net/freerdp/Makefile b/net/freerdp/Makefile
index 9016d8f41744..0ed795d58cb2 100644
--- a/net/freerdp/Makefile
+++ b/net/freerdp/Makefile
@@ -1,11 +1,13 @@
# Created by: Alexander Logvinov <avl@FreeBSD.org>
PORTNAME= freerdp
-DISTVERSION= 2.5.0
+DISTVERSION= 2.7.0
CATEGORIES= net comms
MASTER_SITES= https://pub.freerdp.com/releases/ \
https://github.com/FreeRDP/FreeRDP/releases/download/${DISTVERSION}/
+#PATCH_SITES= https://github.com/FreeRDP/FreeRDP/commit/
+
MAINTAINER= vvd@unislabs.com
COMMENT= Free implementation of Remote Desktop Protocol
@@ -29,7 +31,7 @@ CMAKE_OFF= WITH_DSP_EXPERIMENTAL WITH_GPROF WITH_GSTREAMER_0_10 WITH_IPP \
WITH_LIBSYSTEMD WITH_MBEDTLS WITH_OPENCL WITH_OPENSLES WITH_PROFILER \
WITH_SAMPLE WITH_SANITIZE_ADDRESS WITH_SANITIZE_MEMORY \
WITH_SANITIZE_THREAD WITH_SERVER WITH_SERVER_INTERFACE \
- WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK WITH_X264
+ WITH_SMARTCARD_INSPECT WITH_THIRD_PARTY WITH_VALGRIND_MEMCHECK
CMAKE_ARGS_aarch64+= -DWITH_NEON=ON
CFLAGS_aarch64+= -D__ARM_NEON__=__ARM_NEON # clang
@@ -78,8 +80,8 @@ GSM_LIB_DEPENDS= libgsm.so:audio/gsm
GSM_CMAKE_BOOL= WITH_GSM
GSTREAMER_CMAKE_BOOL= WITH_GSTREAMER_1_0 CHANNEL_TSMF
-GSTREAMER_USES= gnome xorg
-GSTREAMER_USE= gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr
+GSTREAMER_USES= gnome gstreamer xorg
+GSTREAMER_USE= gnome=glib20 xorg=x11,xext,xorgproto,xrandr
GSTREAMER_LIB_DEPENDS= libgstbase-1.0.so:multimedia/gstreamer1
ICU_LIB_DEPENDS= libicuuc.so:devel/icu
@@ -142,20 +144,6 @@ X11_USES= xorg
X11_USE= xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
post-patch:
- @${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
- ${WRKSRC}/CMakeLists.txt
- @${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \
- ${WRKSRC}/winpr/CMakeLists.txt
- @${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
- ${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
- @${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
- @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \
- ${WRKSRC}/client/CMakeLists.txt \
- ${WRKSRC}/winpr/CMakeLists.txt \
- ${WRKSRC}/uwac/CMakeLists.txt \
- ${WRKSRC}/server/CMakeLists.txt \
- ${WRKSRC}/server/shadow/CMakeLists.txt \
- ${WRKSRC}/libfreerdp/CMakeLists.txt
@${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \
${WRKSRC}/cmake/FindGSM.cmake \
${WRKSRC}/libfreerdp/codec/dsp.c
diff --git a/net/freerdp/distinfo b/net/freerdp/distinfo
index 4f67a3b454bd..5b6e3b4d20fd 100644
--- a/net/freerdp/distinfo
+++ b/net/freerdp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642080752
-SHA256 (freerdp-2.5.0.tar.gz) = 0fd9396068cda8e6d884d063a4993001f140f46c36464ccae261b9475050cd2b
-SIZE (freerdp-2.5.0.tar.gz) = 7303832
+TIMESTAMP = 1650933949
+SHA256 (freerdp-2.7.0.tar.gz) = 89000728b6e66ac37db018d6dc5f0981b530fd550ab748877ff42892dd0c166b
+SIZE (freerdp-2.7.0.tar.gz) = 7274512
diff --git a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h b/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h
deleted file mode 100644
index 67e8ab7b2759..000000000000
--- a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevice.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/urbdrc/client/libusb/libusb_udevice.h.orig 2020-05-20 14:45:43 UTC
-+++ channels/urbdrc/client/libusb/libusb_udevice.h
-@@ -75,4 +75,8 @@ IUDEVICE* udev_new_by_addr(URBDRC_PLUGIN* urbdrc, libu
- BYTE dev_number);
- const char* usb_interface_class_to_string(uint8_t class);
-
-+#ifndef LIBUSB_CLASS_PHYSICAL
-+#define LIBUSB_CLASS_PHYSICAL 5
-+#endif
-+
- #endif /* FREERDP_CHANNEL_URBDRC_CLIENT_LIBUSB_UDEVICE_H */
diff --git a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c b/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c
deleted file mode 100644
index f1662e96308a..000000000000
--- a/net/freerdp/files/patch-channels_urbdrc_client_libusb_libusb__udevman.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- channels/urbdrc/client/libusb/libusb_udevman.c.orig 2020-06-08 15:33:51 UTC
-+++ channels/urbdrc/client/libusb/libusb_udevman.c
-@@ -832,7 +832,7 @@ static DWORD poll_thread(LPVOID lpThreadParameter)
- {
- libusb_hotplug_callback_handle handle;
- UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter;
-- BOOL hasHotplug = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG);
-+ BOOL hasHotplug = TRUE;
-
- if (hasHotplug)
- {
diff --git a/net/freerdp/pkg-plist b/net/freerdp/pkg-plist
index b49bd7312f2e..9c7f14f6a8f7 100644
--- a/net/freerdp/pkg-plist
+++ b/net/freerdp/pkg-plist
@@ -16,6 +16,7 @@ include/freerdp2/freerdp/cache/nine_grid.h
include/freerdp2/freerdp/cache/offscreen.h
include/freerdp2/freerdp/cache/palette.h
include/freerdp2/freerdp/cache/pointer.h
+include/freerdp2/freerdp/channels/ainput.h
include/freerdp2/freerdp/channels/audin.h
include/freerdp2/freerdp/channels/channels.h
include/freerdp2/freerdp/channels/cliprdr.h
@@ -35,6 +36,7 @@ include/freerdp2/freerdp/channels/urbdrc.h
include/freerdp2/freerdp/channels/video.h
include/freerdp2/freerdp/channels/wtsvc.h
include/freerdp2/freerdp/client.h
+include/freerdp2/freerdp/client/ainput.h
include/freerdp2/freerdp/client/audin.h
include/freerdp2/freerdp/client/channels.h
include/freerdp2/freerdp/client/cliprdr.h
@@ -112,6 +114,7 @@ include/freerdp2/freerdp/primitives.h
include/freerdp2/freerdp/rail.h
include/freerdp2/freerdp/scancode.h
include/freerdp2/freerdp/secondary.h
+include/freerdp2/freerdp/server/ainput.h
include/freerdp2/freerdp/server/audin.h
include/freerdp2/freerdp/server/channels.h
include/freerdp2/freerdp/server/cliprdr.h
@@ -143,6 +146,7 @@ include/freerdp2/freerdp/window.h
%%WAYLAND%%include/uwac0/uwac/uwac-tools.h
%%WAYLAND%%include/uwac0/uwac/uwac.h
include/winpr2/winpr/asn1.h
+include/winpr2/winpr/assert.h
include/winpr2/winpr/bcrypt.h
include/winpr2/winpr/bitstream.h
include/winpr2/winpr/clipboard.h
diff --git a/net/frp/Makefile b/net/frp/Makefile
index cf12dbda9e54..88a7453c5d2f 100644
--- a/net/frp/Makefile
+++ b/net/frp/Makefile
@@ -1,6 +1,7 @@
PORTNAME= frp
DISTVERSIONPREFIX= v
-DISTVERSION= 0.38.0
+DISTVERSION= 0.43.0
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/frp/distinfo b/net/frp/distinfo
index aa37310ae826..9e301d384918 100644
--- a/net/frp/distinfo
+++ b/net/frp/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1653799419
+SHA256 (go/net_frp/frp-v0.43.0/v0.43.0.mod) = 6ce9a8d55e44d41067c11a515db3c6128b17332a630f34f1cd557fcb0c919bf9
+SIZE (go/net_frp/frp-v0.43.0/v0.43.0.mod) = 1306
+SHA256 (go/net_frp/frp-v0.43.0/v0.43.0.zip) = 7ed70f122e7a653ace4520d8dad882443bdbfeb49dbbb8abadce1ea97915082b
+SIZE (go/net_frp/frp-v0.43.0/v0.43.0.zip) = 1413759
diff --git a/net/frr7/Makefile b/net/frr7/Makefile
index 245eb1cf956d..6cd310e42e33 100644
--- a/net/frr7/Makefile
+++ b/net/frr7/Makefile
@@ -84,7 +84,7 @@ VTYSH_DESC= Build integrated vty shell
USERS= frr
GROUPS= frr frrvty
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -Wno-error
LDFLAGS+= -L${LOCALBASE}/lib
# PIM compile but didn't work on FreeBSD
diff --git a/net/gamenetworkingsockets/Makefile b/net/gamenetworkingsockets/Makefile
index 8e1a5b983669..4ae7a1ebbf17 100644
--- a/net/gamenetworkingsockets/Makefile
+++ b/net/gamenetworkingsockets/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gamenetworkingsockets
PORTVERSION= 1.3.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= kpedersen@disroot.org
diff --git a/net/gdrive/Makefile b/net/gdrive/Makefile
index 2558ed19f54e..67b59e7c41c0 100644
--- a/net/gdrive/Makefile
+++ b/net/gdrive/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gdrive
DISTVERSION= 2.1.1
+PORTREVISION= 2
CATEGORIES= net
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/net/gemserv/Makefile b/net/gemserv/Makefile
index 83bd05a7c728..4f382fc3e933 100644
--- a/net/gemserv/Makefile
+++ b/net/gemserv/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gemserv
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.5
-PORTREVISION= 7
+PORTREVISION= 11
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/geoipupdate/Makefile b/net/geoipupdate/Makefile
index 1e4821697322..e09f8f18f047 100644
--- a/net/geoipupdate/Makefile
+++ b/net/geoipupdate/Makefile
@@ -1,8 +1,9 @@
# Created by: adamw
PORTNAME= geoipupdate
-PORTVERSION= 4.8.0
+PORTVERSION= 4.9.0
DISTVERSIONPREFIX= v
+PORTREVISION= 3
CATEGORIES= net geography
MAINTAINER= adamw@FreeBSD.org
@@ -13,8 +14,6 @@ LICENSE_COMB= dual
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
-RUN_DEPENDS= ca_root_nss>=3:security/ca_root_nss
-
USES= gmake go:modules,no_targets
GO_MODULE= github.com/maxmind/geoipupdate/v4
diff --git a/net/geoipupdate/distinfo b/net/geoipupdate/distinfo
index e1f78d83d670..c6a674db7bf9 100644
--- a/net/geoipupdate/distinfo
+++ b/net/geoipupdate/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1626800658
-SHA256 (go/net_geoipupdate/geoipupdate-v4.8.0/v4.8.0.mod) = 23f49c05ca5ecdd996ae9eaa779e33d85004930e794230e1a753fafd04f6ed1a
-SIZE (go/net_geoipupdate/geoipupdate-v4.8.0/v4.8.0.mod) = 548
-SHA256 (go/net_geoipupdate/geoipupdate-v4.8.0/v4.8.0.zip) = 3897540f55baeeff13a883b1c738c120a788f925717e3184bad9c023c03879c4
-SIZE (go/net_geoipupdate/geoipupdate-v4.8.0/v4.8.0.zip) = 51211
+TIMESTAMP = 1644969543
+SHA256 (go/net_geoipupdate/geoipupdate-v4.9.0/v4.9.0.mod) = a69989b2d8864b71b104040fce76ac20ff485130a8dcd44ba01da755c5920229
+SIZE (go/net_geoipupdate/geoipupdate-v4.9.0/v4.9.0.mod) = 548
+SHA256 (go/net_geoipupdate/geoipupdate-v4.9.0/v4.9.0.zip) = 1fa815fc1a7049a339b99e7b2530bea49878e9017f85cc037cb8d55119ef610f
+SIZE (go/net_geoipupdate/geoipupdate-v4.9.0/v4.9.0.zip) = 53543
diff --git a/net/gerbera/Makefile b/net/gerbera/Makefile
index 54d09fc765e3..90844de150e7 100644
--- a/net/gerbera/Makefile
+++ b/net/gerbera/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gerbera
DISTVERSIONPREFIX= v
-DISTVERSION= 1.9.2
+DISTVERSION= 1.11.0
CATEGORIES= net multimedia
MAINTAINER= diizzy@FreeBSD.org
@@ -22,8 +22,6 @@ USE_RC_SUBR= gerbera
CMAKE_OFF= WITH_EXIF WITH_LASTFM WITH_MYSQL WITH_SYSTEMD
-TEST_TARGET= test
-
SUB_FILES= pkg-message
SUB_LIST= USER=${USERS} GROUP=${GROUPS}
@@ -84,6 +82,7 @@ TAGLIB_CMAKE_BOOL= WITH_TAGLIB
TEST_IMPLIES= CURL DUKTAPE
TEST_BUILD_DEPENDS= googletest>=0:devel/googletest
TEST_CMAKE_BOOL= WITH_TESTS
+TEST_TEST_TARGET= test
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gerbera
diff --git a/net/gerbera/distinfo b/net/gerbera/distinfo
index 2e3e0ef47158..bac17464eb66 100644
--- a/net/gerbera/distinfo
+++ b/net/gerbera/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633359496
-SHA256 (gerbera-gerbera-v1.9.2_GH0.tar.gz) = dee562cc5d22e8442e2fe1620b073bda612c80f9c4a8333311c647db06c1c4cd
-SIZE (gerbera-gerbera-v1.9.2_GH0.tar.gz) = 3671452
+TIMESTAMP = 1651706607
+SHA256 (gerbera-gerbera-v1.11.0_GH0.tar.gz) = 0c13049792a28ec0e3086ba61c7f9675626a1dbadb043650a452192727418be7
+SIZE (gerbera-gerbera-v1.11.0_GH0.tar.gz) = 4115178
diff --git a/net/gerbera/pkg-plist b/net/gerbera/pkg-plist
index 4c41161e63dd..1e4b8ebb7c0e 100644
--- a/net/gerbera/pkg-plist
+++ b/net/gerbera/pkg-plist
@@ -49,20 +49,12 @@ bin/gerbera
%%DATADIR%%/web/js/jquery.gerbera.tweak.js
%%DATADIR%%/web/js/md5.js
%%DATADIR%%/web/mr_reg.xml
-%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.css
-%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.css.map
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.min.css
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-grid.min.css.map
-%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.css
-%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.css.map
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.min.css
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap-reboot.min.css.map
-%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.css
-%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.css.map
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.min.css
%%DATADIR%%/web/vendor/bootstrap/css/bootstrap.min.css.map
-%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.js
-%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.js.map
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.min.js
%%DATADIR%%/web/vendor/bootstrap/js/bootstrap.min.js.map
%%DATADIR%%/web/vendor/font-awesome/css/font-awesome.css
@@ -73,9 +65,10 @@ bin/gerbera
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.ttf
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff
%%DATADIR%%/web/vendor/font-awesome/fonts/fontawesome-webfont.woff2
-%%DATADIR%%/web/vendor/jquery/jquery-3.5.1.min.js
+%%DATADIR%%/web/vendor/jquery/jquery-3.6.0.min.js
+%%DATADIR%%/web/vendor/jquery/jquery-3.6.0.min.map
%%DATADIR%%/web/vendor/jquery/jquery-ui.min.js
-%%DATADIR%%/web/vendor/js-cookie.js
+%%DATADIR%%/web/vendor/js-cookie.min.js
%%DATADIR%%/web/vendor/lato/LICENCE.md
%%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff
%%DATADIR%%/web/vendor/lato/lato-v14-latin-ext_latin-regular.woff2
diff --git a/net/gfbgraph/Makefile b/net/gfbgraph/Makefile
index 1038a2c38b60..ece0f5c22a71 100644
--- a/net/gfbgraph/Makefile
+++ b/net/gfbgraph/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gfbgraph
DISTVERSION= 0.2.4
+PORTREVISION= 2
CATEGORIES= net www
MASTER_SITES= GNOME
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 7c438066a27c..29b9e4f83254 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,9 +1,9 @@
# Created by: Matthias Fechner <mfechner@FreeBSD.org>
PORTNAME= gitlab-agent
-PORTVERSION= 14.7.0
-PORTREVISION= 0
+PORTVERSION= 15.1.0
DISTVERSIONPREFIX= v
+PORTREVISION= 0
CATEGORIES= net
MAINTAINER= mfechner@FreeBSD.org
@@ -16,13 +16,15 @@ BUILD_DEPENDS= git>=0:devel/git \
golangci-lint>=0:devel/golangci-lint
USES= go:modules
-GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v14
+GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15
-GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \
+_BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC")
+GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \
-ldflags=" \
- -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/cmd.Version=v${PORTVERSION} \
- -X gitlab.com/gitlab-org/cluster-integration/gitlab-agent/cmd.Commit=${GL_COMMIT:C/^(........).*/\1/}"
-GO_TARGET= ./cmd/kas
+ -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.Version=v${PORTVERSION}' \
+ -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.Commit=${GL_COMMIT:C/^(........).*/\1/}' \
+ -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v15/cmd.BuildTime=${_BUILD_DATE}'"
+GO_TARGET= ./cmd/kas
PLIST_FILES= bin/kas
@@ -30,4 +32,3 @@ do-install:
${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas
.include <bsd.port.mk>
-
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 0a7649ac6198..74080d109ce7 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1642495053
-SHA256 (go/net_gitlab-agent/gitlab-agent-v14.7.0/v14.7.0.mod) = 758fd24d8c91a81d13b69b2b7385391dccd5ba0c8e4a8fd53f34912bb6b4621e
-SIZE (go/net_gitlab-agent/gitlab-agent-v14.7.0/v14.7.0.mod) = 11757
-SHA256 (go/net_gitlab-agent/gitlab-agent-v14.7.0/v14.7.0.zip) = 19cf1730fab430d69acb15607b0aee626f5c4bc58ae2bf06f5dbcc43c707d1fe
-SIZE (go/net_gitlab-agent/gitlab-agent-v14.7.0/v14.7.0.zip) = 842274
+TIMESTAMP = 1655736227
+SHA256 (go/net_gitlab-agent/gitlab-agent-v15.1.0/v15.1.0.mod) = 0c7d9742f27db7cc2b9c3fed9b7d2c1c72692fb5de593803da9f8c3232913c10
+SIZE (go/net_gitlab-agent/gitlab-agent-v15.1.0/v15.1.0.mod) = 10876
+SHA256 (go/net_gitlab-agent/gitlab-agent-v15.1.0/v15.1.0.zip) = 2510c531f55e3dbdd41fb004035e3ced2d96b542b7a1572ee347babab3026e7b
+SIZE (go/net_gitlab-agent/gitlab-agent-v15.1.0/v15.1.0.zip) = 863583
diff --git a/net/gitup/Makefile b/net/gitup/Makefile
index 8b1fe7efa168..d4bebb92b0fe 100644
--- a/net/gitup/Makefile
+++ b/net/gitup/Makefile
@@ -1,7 +1,11 @@
PORTNAME= gitup
-DISTVERSION= 0.96
+DISTVERSION= 0.97
+PORTREVISION= 1
CATEGORIES= net
+PATCH_SITES= https://github.com/johnmehr/gitup/commit/
+PATCHFILES= dfbe3f0f847cb09225b5d09c4a09d654356bab68.patch:-p1
+
MAINTAINER= eduardo@FreeBSD.org
COMMENT= Minimalist, dependency-free program to clone/pull git repositories
diff --git a/net/gitup/distinfo b/net/gitup/distinfo
index d1926f15dc47..86398725fb3a 100644
--- a/net/gitup/distinfo
+++ b/net/gitup/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1631528863
-SHA256 (johnmehr-gitup-0.96_GH0.tar.gz) = 47e2df5cbe95afab6c419da3bfa1ac3068812c00e49033b160e5ba847923e9c1
-SIZE (johnmehr-gitup-0.96_GH0.tar.gz) = 29134
+TIMESTAMP = 1654646024
+SHA256 (johnmehr-gitup-0.97_GH0.tar.gz) = e474a88a4cd9fda43e6004b536ac0e519d508addb0d5b5b10b8289f04276cf43
+SIZE (johnmehr-gitup-0.97_GH0.tar.gz) = 31005
+SHA256 (dfbe3f0f847cb09225b5d09c4a09d654356bab68.patch) = cbd5ed74efdc79027b12f3b1bd5ef34e8e2eaeef1d32059f333de64394e6c8e1
+SIZE (dfbe3f0f847cb09225b5d09c4a09d654356bab68.patch) = 1171
diff --git a/net/glflow/Makefile b/net/glflow/Makefile
index 84ffd93f9aca..c3c165186c3c 100644
--- a/net/glflow/Makefile
+++ b/net/glflow/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= net security
MASTER_SITES= SF
DISTNAME= glFlow-${PORTVERSION}
-MAINTAINER= lx@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= NetFlow tool for detecting DoS attacks
USES= ssl tar:tgz
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index d233e956ff4f..b2ebd44dcfee 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -1,8 +1,7 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
PORTNAME= glib-networking
-PORTVERSION= 2.66.0
-PORTREVISION= 1
+PORTVERSION= 2.72.0
CATEGORIES= net
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index d34123711cac..c28d72e9b9db 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601278942
-SHA256 (gnome/glib-networking-2.66.0.tar.xz) = c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099
-SIZE (gnome/glib-networking-2.66.0.tar.xz) = 193920
+TIMESTAMP = 1652980465
+SHA256 (gnome/glib-networking-2.72.0.tar.xz) = 100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
+SIZE (gnome/glib-networking-2.72.0.tar.xz) = 265060
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index c47f216281d2..26cd4ff99026 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -1,3 +1,4 @@
+lib/gio/modules/libgioenvironmentproxy.so
lib/gio/modules/libgiognomeproxy.so
lib/gio/modules/libgiognutls.so
lib/gio/modules/libgiolibproxy.so
diff --git a/net/glusterfs/Makefile b/net/glusterfs/Makefile
index cf5346b73a2c..d42fd39fe0e7 100644
--- a/net/glusterfs/Makefile
+++ b/net/glusterfs/Makefile
@@ -1,5 +1,6 @@
PORTNAME= glusterfs
PORTVERSION= 8.4
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
diff --git a/net/gmid/Makefile b/net/gmid/Makefile
index acb91fc54b0e..b4086ffd1182 100644
--- a/net/gmid/Makefile
+++ b/net/gmid/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gmid
-DISTVERSION= 1.7.5
+DISTVERSION= 1.8.3
CATEGORIES= net
MASTER_SITES= https://github.com/omar-polo/gmid/releases/download/${DISTVERSION}/
@@ -25,6 +25,7 @@ USERS= _gmid
GROUPS= _gmid
post-build:
+ ${STRIP_CMD} ${WRKSRC}/gg
${STRIP_CMD} ${WRKSRC}/gmid
post-install:
diff --git a/net/gmid/distinfo b/net/gmid/distinfo
index bceb5a831162..0e9c9f07c922 100644
--- a/net/gmid/distinfo
+++ b/net/gmid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634292038
-SHA256 (gmid-1.7.5.tar.gz) = e1b31a13d320929b70ac030e8406a9121da09fb3404525261ff762694ac8eb61
-SIZE (gmid-1.7.5.tar.gz) = 82100
+TIMESTAMP = 1648387071
+SHA256 (gmid-1.8.3.tar.gz) = f7b6cc1deaea6c5242301fa7440c0f5caaf282fea780ba1edcef480f7fa67fe1
+SIZE (gmid-1.8.3.tar.gz) = 141650
diff --git a/net/gmid/pkg-plist b/net/gmid/pkg-plist
index 2dbb6ab99576..60e82b9c2875 100644
--- a/net/gmid/pkg-plist
+++ b/net/gmid/pkg-plist
@@ -1,3 +1,5 @@
@sample etc/gmid.conf.sample
+bin/gg
bin/gmid
+man/man1/gg.1.gz
man/man1/gmid.1.gz
diff --git a/net/gnome-connections/Makefile b/net/gnome-connections/Makefile
new file mode 100644
index 000000000000..42945d81d1f3
--- /dev/null
+++ b/net/gnome-connections/Makefile
@@ -0,0 +1,27 @@
+PORTNAME= gnome-connections
+PORTVERSION= 42.1.2
+CATEGORIES= net gnome
+MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
+DIST_SUBDIR= gnome
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Remote desktop client for GNOME
+
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= vapigen:lang/vala \
+ itstool:textproc/itstool
+LIB_DEPENDS= libgtk-vnc-2.0.so:net/gtk-vnc \
+ libhandy-1.so:x11-toolkits/libhandy \
+ libfreerdp2.so:net/freerdp \
+ libsecret-1.so:security/libsecret
+
+USES= desktop-file-utils shared-mime-info gettext gnome meson \
+ python:env pkgconfig tar:xz
+USE_GNOME= glib20 gtk30
+
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
+.include <bsd.port.mk>
+
diff --git a/net/gnome-connections/distinfo b/net/gnome-connections/distinfo
new file mode 100644
index 000000000000..85c67ba77bb0
--- /dev/null
+++ b/net/gnome-connections/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1656086569
+SHA256 (gnome/gnome-connections-42.1.2.tar.xz) = d8e6e72741091d892dfc84281f625551d0568cd482d48db58a4edb8afa1377b6
+SIZE (gnome/gnome-connections-42.1.2.tar.xz) = 3987992
diff --git a/net/gnome-connections/pkg-descr b/net/gnome-connections/pkg-descr
new file mode 100644
index 000000000000..36a5eb681ead
--- /dev/null
+++ b/net/gnome-connections/pkg-descr
@@ -0,0 +1,13 @@
+View and use other desktops
+
+Connections allows you to connect to and use other desktops. This can be a great
+way to access content or software on a different desktop operating system. It
+can also be used as a way to provide support to users who might need help.
+
+A range of different operating systems can be connected to, including Linux and
+Windows desktops. You can also connect to virtual machines.
+
+Connections uses the widely supported VNC and RDP protocols, and one of these
+must be enabled on the desktop that you want to connect to.
+
+WWW: https://apps.gnome.org/app/org.gnome.Connections/
diff --git a/net/gnome-connections/pkg-plist b/net/gnome-connections/pkg-plist
new file mode 100644
index 000000000000..a9f4d2d3ae92
--- /dev/null
+++ b/net/gnome-connections/pkg-plist
@@ -0,0 +1,142 @@
+bin/gnome-connections
+include/gnome-connections/gtk-frdp/frdp-display.h
+include/gnome-connections/gtk-frdp/frdp-session.h
+include/gnome-connections/gtk-frdp/gtk-frdp-version.h
+include/gnome-connections/gtk-frdp/gtk-frdp.h
+lib/gnome-connections/girepository-1.0/GtkFrdp-0.1.typelib
+lib/gnome-connections/libgtk-frdp-0.1.so
+lib/gnome-connections/pkgconfig/gtk-frdp-0.1.pc
+share/applications/org.gnome.Connections.desktop
+share/dbus-1/services/org.gnome.Connections.service
+share/glib-2.0/schemas/org.gnome.Connections.gschema.xml
+%%DATADIR%%/gir-1.0/GtkFrdp-0.1.gir
+%%DATADIR%%/vapi/gtk-frdp-0.1.deps
+%%DATADIR%%/vapi/gtk-frdp-0.1.vapi
+share/help/C/gnome-connections/connect.page
+share/help/C/gnome-connections/figures/org.gnome.Connections.svg
+share/help/C/gnome-connections/index.page
+share/help/C/gnome-connections/legal.xml
+share/help/ca/gnome-connections/connect.page
+share/help/ca/gnome-connections/figures/org.gnome.Connections.svg
+share/help/ca/gnome-connections/index.page
+share/help/ca/gnome-connections/legal.xml
+share/help/cs/gnome-connections/connect.page
+share/help/cs/gnome-connections/figures/org.gnome.Connections.svg
+share/help/cs/gnome-connections/index.page
+share/help/cs/gnome-connections/legal.xml
+share/help/da/gnome-connections/connect.page
+share/help/da/gnome-connections/figures/org.gnome.Connections.svg
+share/help/da/gnome-connections/index.page
+share/help/da/gnome-connections/legal.xml
+share/help/de/gnome-connections/connect.page
+share/help/de/gnome-connections/figures/org.gnome.Connections.svg
+share/help/de/gnome-connections/index.page
+share/help/de/gnome-connections/legal.xml
+share/help/en_GB/gnome-connections/connect.page
+share/help/en_GB/gnome-connections/figures/org.gnome.Connections.svg
+share/help/en_GB/gnome-connections/index.page
+share/help/en_GB/gnome-connections/legal.xml
+share/help/es/gnome-connections/connect.page
+share/help/es/gnome-connections/figures/org.gnome.Connections.svg
+share/help/es/gnome-connections/index.page
+share/help/es/gnome-connections/legal.xml
+share/help/eu/gnome-connections/connect.page
+share/help/eu/gnome-connections/figures/org.gnome.Connections.svg
+share/help/eu/gnome-connections/index.page
+share/help/eu/gnome-connections/legal.xml
+share/help/fr/gnome-connections/connect.page
+share/help/fr/gnome-connections/figures/org.gnome.Connections.svg
+share/help/fr/gnome-connections/index.page
+share/help/fr/gnome-connections/legal.xml
+share/help/gl/gnome-connections/connect.page
+share/help/gl/gnome-connections/figures/org.gnome.Connections.svg
+share/help/gl/gnome-connections/index.page
+share/help/gl/gnome-connections/legal.xml
+share/help/hu/gnome-connections/connect.page
+share/help/hu/gnome-connections/figures/org.gnome.Connections.svg
+share/help/hu/gnome-connections/index.page
+share/help/hu/gnome-connections/legal.xml
+share/help/id/gnome-connections/connect.page
+share/help/id/gnome-connections/figures/org.gnome.Connections.svg
+share/help/id/gnome-connections/index.page
+share/help/id/gnome-connections/legal.xml
+share/help/ko/gnome-connections/connect.page
+share/help/ko/gnome-connections/figures/org.gnome.Connections.svg
+share/help/ko/gnome-connections/index.page
+share/help/ko/gnome-connections/legal.xml
+share/help/pl/gnome-connections/connect.page
+share/help/pl/gnome-connections/figures/org.gnome.Connections.svg
+share/help/pl/gnome-connections/index.page
+share/help/pl/gnome-connections/legal.xml
+share/help/pt/gnome-connections/connect.page
+share/help/pt/gnome-connections/figures/org.gnome.Connections.svg
+share/help/pt/gnome-connections/index.page
+share/help/pt/gnome-connections/legal.xml
+share/help/pt_BR/gnome-connections/connect.page
+share/help/pt_BR/gnome-connections/figures/org.gnome.Connections.svg
+share/help/pt_BR/gnome-connections/index.page
+share/help/pt_BR/gnome-connections/legal.xml
+share/help/ru/gnome-connections/connect.page
+share/help/ru/gnome-connections/figures/org.gnome.Connections.svg
+share/help/ru/gnome-connections/index.page
+share/help/ru/gnome-connections/legal.xml
+share/help/sv/gnome-connections/connect.page
+share/help/sv/gnome-connections/figures/org.gnome.Connections.svg
+share/help/sv/gnome-connections/index.page
+share/help/sv/gnome-connections/legal.xml
+share/help/tr/gnome-connections/connect.page
+share/help/tr/gnome-connections/figures/org.gnome.Connections.svg
+share/help/tr/gnome-connections/index.page
+share/help/tr/gnome-connections/legal.xml
+share/help/uk/gnome-connections/connect.page
+share/help/uk/gnome-connections/figures/org.gnome.Connections.svg
+share/help/uk/gnome-connections/index.page
+share/help/uk/gnome-connections/legal.xml
+share/icons/hicolor/scalable/apps/org.gnome.Connections.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Connections-symbolic.svg
+share/locale/bg/LC_MESSAGES/gnome-connections.mo
+share/locale/ca/LC_MESSAGES/gnome-connections.mo
+share/locale/cs/LC_MESSAGES/gnome-connections.mo
+share/locale/da/LC_MESSAGES/gnome-connections.mo
+share/locale/de/LC_MESSAGES/gnome-connections.mo
+share/locale/el/LC_MESSAGES/gnome-connections.mo
+share/locale/en_GB/LC_MESSAGES/gnome-connections.mo
+share/locale/eo/LC_MESSAGES/gnome-connections.mo
+share/locale/es/LC_MESSAGES/gnome-connections.mo
+share/locale/eu/LC_MESSAGES/gnome-connections.mo
+share/locale/fa/LC_MESSAGES/gnome-connections.mo
+share/locale/fi/LC_MESSAGES/gnome-connections.mo
+share/locale/fr/LC_MESSAGES/gnome-connections.mo
+share/locale/fur/LC_MESSAGES/gnome-connections.mo
+share/locale/gl/LC_MESSAGES/gnome-connections.mo
+share/locale/he/LC_MESSAGES/gnome-connections.mo
+share/locale/hr/LC_MESSAGES/gnome-connections.mo
+share/locale/hu/LC_MESSAGES/gnome-connections.mo
+share/locale/id/LC_MESSAGES/gnome-connections.mo
+share/locale/is/LC_MESSAGES/gnome-connections.mo
+share/locale/it/LC_MESSAGES/gnome-connections.mo
+share/locale/ja/LC_MESSAGES/gnome-connections.mo
+share/locale/kk/LC_MESSAGES/gnome-connections.mo
+share/locale/ko/LC_MESSAGES/gnome-connections.mo
+share/locale/lt/LC_MESSAGES/gnome-connections.mo
+share/locale/nb/LC_MESSAGES/gnome-connections.mo
+share/locale/ne/LC_MESSAGES/gnome-connections.mo
+share/locale/nl/LC_MESSAGES/gnome-connections.mo
+share/locale/oc/LC_MESSAGES/gnome-connections.mo
+share/locale/pa/LC_MESSAGES/gnome-connections.mo
+share/locale/pl/LC_MESSAGES/gnome-connections.mo
+share/locale/pt/LC_MESSAGES/gnome-connections.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-connections.mo
+share/locale/ro/LC_MESSAGES/gnome-connections.mo
+share/locale/ru/LC_MESSAGES/gnome-connections.mo
+share/locale/sk/LC_MESSAGES/gnome-connections.mo
+share/locale/sl/LC_MESSAGES/gnome-connections.mo
+share/locale/sr/LC_MESSAGES/gnome-connections.mo
+share/locale/sv/LC_MESSAGES/gnome-connections.mo
+share/locale/tr/LC_MESSAGES/gnome-connections.mo
+share/locale/uk/LC_MESSAGES/gnome-connections.mo
+share/locale/vi/LC_MESSAGES/gnome-connections.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-connections.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-connections.mo
+share/metainfo/org.gnome.Connections.appdata.xml
+share/mime/packages/org.gnome.Connections.xml
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 69a2dfe62ba3..b76526e65ce1 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,11 +1,10 @@
# Created by: Adam Weinberger <adamw@FreeBSD.org>
PORTNAME= gnome-nettool
-PORTVERSION= 3.8.1
-PORTREVISION= 1
+PORTVERSION= 42.0
PORTEPOCH= 1
CATEGORIES= net gnome
-MASTER_SITES= GNOME
+MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
@@ -15,12 +14,10 @@ BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgtop-2.0.so:devel/libgtop
RUN_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind-tools
+USES= gettext gmake gnome meson pathfix pkgconfig python:3.8+ tar:xz
USE_GNOME= gtk30 intlhack libxml2:build
-USES= gettext gmake gnome libtool localbase:ldflags pathfix pkgconfig \
- tar:xz
-GNU_CONFIGURE= yes
-INSTALL_TARGET= install-strip
-
GLIB_SCHEMAS= org.gnome.gnome-nettool.gschema.xml
+BINARY_ALIAS= python3=${PYTHON_CMD}
+
.include <bsd.port.mk>
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 202dc797e663..c399611ce771 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-nettool-3.8.1.tar.xz) = f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
-SIZE (gnome3/gnome-nettool-3.8.1.tar.xz) = 589024
+TIMESTAMP = 1653086843
+SHA256 (gnome3/gnome-nettool-42.0.tar.xz) = a54f29eef2038aee69551c8b19ca4f758e5eb9e2090a4bc6b5633dff0188751f
+SIZE (gnome3/gnome-nettool-42.0.tar.xz) = 422880
diff --git a/net/gnome-nettool/files/patch-data_meson.build b/net/gnome-nettool/files/patch-data_meson.build
new file mode 100644
index 000000000000..c48b91948b6b
--- /dev/null
+++ b/net/gnome-nettool/files/patch-data_meson.build
@@ -0,0 +1,20 @@
+--- data/meson.build.orig 2022-05-20 22:55:41 UTC
++++ data/meson.build
+@@ -20,7 +20,7 @@ desktop_in = configure_file(input: 'gnome-nettool.desk
+ output: 'gnome-nettool.desktop.in',
+ configuration: desktop_conf)
+
+-i18n.merge_file('desktop',
++i18n.merge_file(
+ type: 'desktop',
+ input: desktop_in,
+ output: 'gnome-nettool.desktop',
+@@ -28,7 +28,7 @@ i18n.merge_file('desktop',
+ install: true,
+ install_dir: join_paths(prefix, datadir, 'applications'))
+
+-i18n.merge_file('appdata',
++i18n.merge_file(
+ type: 'xml',
+ input: 'gnome-nettool.appdata.xml.in',
+ output: 'gnome-nettool.appdata.xml',
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
index beaefe639437..d99d72a079c9 100644
--- a/net/gnome-nettool/files/patch-src_info.c
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -1,4 +1,4 @@
---- src/info.c.orig 2013-05-31 00:00:21 UTC
+--- src/info.c.orig 2022-04-06 01:52:01 UTC
+++ src/info.c
@@ -20,6 +20,10 @@
#include <gtk/gtk.h>
@@ -28,8 +28,8 @@
+ { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "tun", NULL },
{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
{ N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },
- { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL },
-@@ -131,9 +139,35 @@ info_get_interface_from_dev_name (const gchar *dev_nam
+ { N_("Infiniband Interface"), INFO_INTERFACE_IB, "network.png", "ib", NULL },
+@@ -132,9 +140,35 @@ info_get_interface_from_dev_name (const gchar *dev_nam
{
gint i;
gchar *path;
diff --git a/net/gnome-nettool/files/patch-src_netstat.c b/net/gnome-nettool/files/patch-src_netstat.c
index 660514d28322..15ee9d6069d0 100644
--- a/net/gnome-nettool/files/patch-src_netstat.c
+++ b/net/gnome-nettool/files/patch-src_netstat.c
@@ -1,6 +1,6 @@
---- src/netstat.c.orig 2012-01-03 10:38:09.000000000 +0100
-+++ src/netstat.c 2015-08-28 16:21:17.101757000 +0200
-@@ -114,7 +114,7 @@ netstat_get_active_option (Netinfo * net
+--- src/netstat.c.orig 2022-04-06 01:52:01 UTC
++++ src/netstat.c
+@@ -114,7 +114,7 @@ netstat_get_active_option (Netinfo * netinfo)
g_return_val_if_fail (netinfo != NULL, NULL);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) {
diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c
index 05fa09223019..601604a1de07 100644
--- a/net/gnome-nettool/files/patch-src_nettool.c
+++ b/net/gnome-nettool/files/patch-src_nettool.c
@@ -1,5 +1,5 @@
---- src/nettool.c.orig 2012-01-03 10:38:09.000000000 +0100
-+++ src/nettool.c 2015-08-28 16:28:52.904785000 +0200
+--- src/nettool.c.orig 2022-04-06 01:52:01 UTC
++++ src/nettool.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <sys/types.h>
@@ -8,7 +8,7 @@
#include <signal.h>
#include <errno.h>
#include <sys/wait.h>
-@@ -410,6 +409,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -410,6 +409,10 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
len, NULL);
}
@@ -19,7 +19,7 @@
} else if (status == G_IO_STATUS_AGAIN) {
char buf[1];
-@@ -421,6 +424,11 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -421,6 +424,11 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
}
g_string_append_c (netinfo->command_output, buf[0]);
}
@@ -31,7 +31,7 @@
} else if (status == G_IO_STATUS_EOF) {
} else if (status == G_IO_STATUS_ERROR) {
-@@ -438,15 +446,16 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -438,15 +446,16 @@ netinfo_io_text_buffer_dialog (GIOChannel * channel,
} else {
g_warning ("Error: %s\n", err->message);
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index b39cf2f64e95..57991a57750a 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -57,12 +57,54 @@ share/help/es/gnome-nettool/index.page
share/help/es/gnome-nettool/introduction.page
share/help/es/gnome-nettool/ip-information.page
share/help/es/gnome-nettool/network-connectivity.page
+share/help/eu/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/eu/gnome-nettool/figures/gnome-nettool.png
+share/help/eu/gnome-nettool/index.page
+share/help/eu/gnome-nettool/introduction.page
+share/help/eu/gnome-nettool/ip-information.page
+share/help/eu/gnome-nettool/network-connectivity.page
share/help/fr/gnome-nettool/figures/gnome-nettool-trail.png
share/help/fr/gnome-nettool/figures/gnome-nettool.png
share/help/fr/gnome-nettool/index.page
share/help/fr/gnome-nettool/introduction.page
share/help/fr/gnome-nettool/ip-information.page
share/help/fr/gnome-nettool/network-connectivity.page
+share/help/fur/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/fur/gnome-nettool/figures/gnome-nettool.png
+share/help/fur/gnome-nettool/index.page
+share/help/fur/gnome-nettool/introduction.page
+share/help/fur/gnome-nettool/ip-information.page
+share/help/fur/gnome-nettool/network-connectivity.page
+share/help/gl/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/gl/gnome-nettool/figures/gnome-nettool.png
+share/help/gl/gnome-nettool/index.page
+share/help/gl/gnome-nettool/introduction.page
+share/help/gl/gnome-nettool/ip-information.page
+share/help/gl/gnome-nettool/network-connectivity.page
+share/help/hu/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/hu/gnome-nettool/figures/gnome-nettool.png
+share/help/hu/gnome-nettool/index.page
+share/help/hu/gnome-nettool/introduction.page
+share/help/hu/gnome-nettool/ip-information.page
+share/help/hu/gnome-nettool/network-connectivity.page
+share/help/id/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/id/gnome-nettool/figures/gnome-nettool.png
+share/help/id/gnome-nettool/index.page
+share/help/id/gnome-nettool/introduction.page
+share/help/id/gnome-nettool/ip-information.page
+share/help/id/gnome-nettool/network-connectivity.page
+share/help/it/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/it/gnome-nettool/figures/gnome-nettool.png
+share/help/it/gnome-nettool/index.page
+share/help/it/gnome-nettool/introduction.page
+share/help/it/gnome-nettool/ip-information.page
+share/help/it/gnome-nettool/network-connectivity.page
+share/help/ko/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/ko/gnome-nettool/figures/gnome-nettool.png
+share/help/ko/gnome-nettool/index.page
+share/help/ko/gnome-nettool/introduction.page
+share/help/ko/gnome-nettool/ip-information.page
+share/help/ko/gnome-nettool/network-connectivity.page
share/help/oc/gnome-nettool/figures/gnome-nettool-trail.png
share/help/oc/gnome-nettool/figures/gnome-nettool.png
share/help/oc/gnome-nettool/index.page
@@ -75,6 +117,12 @@ share/help/pa/gnome-nettool/index.page
share/help/pa/gnome-nettool/introduction.page
share/help/pa/gnome-nettool/ip-information.page
share/help/pa/gnome-nettool/network-connectivity.page
+share/help/pl/gnome-nettool/figures/gnome-nettool-trail.png
+share/help/pl/gnome-nettool/figures/gnome-nettool.png
+share/help/pl/gnome-nettool/index.page
+share/help/pl/gnome-nettool/introduction.page
+share/help/pl/gnome-nettool/ip-information.page
+share/help/pl/gnome-nettool/network-connectivity.page
share/help/pt_BR/gnome-nettool/figures/gnome-nettool-trail.png
share/help/pt_BR/gnome-nettool/figures/gnome-nettool.png
share/help/pt_BR/gnome-nettool/index.page
@@ -115,6 +163,7 @@ share/icons/hicolor/16x16/apps/gnome-nettool.png
share/icons/hicolor/22x22/apps/gnome-nettool.png
share/icons/hicolor/24x24/apps/gnome-nettool.png
share/icons/hicolor/32x32/apps/gnome-nettool.png
+share/icons/hicolor/scalable/apps/gnome-nettool-symbolic.svg
share/icons/hicolor/scalable/apps/gnome-nettool.svg
share/locale/af/LC_MESSAGES/gnome-nettool.mo
share/locale/ar/LC_MESSAGES/gnome-nettool.mo
@@ -129,6 +178,7 @@ share/locale/br/LC_MESSAGES/gnome-nettool.mo
share/locale/bs/LC_MESSAGES/gnome-nettool.mo
share/locale/ca/LC_MESSAGES/gnome-nettool.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-nettool.mo
+share/locale/ckb/LC_MESSAGES/gnome-nettool.mo
share/locale/cs/LC_MESSAGES/gnome-nettool.mo
share/locale/cy/LC_MESSAGES/gnome-nettool.mo
share/locale/da/LC_MESSAGES/gnome-nettool.mo
@@ -145,7 +195,9 @@ share/locale/eu/LC_MESSAGES/gnome-nettool.mo
share/locale/fa/LC_MESSAGES/gnome-nettool.mo
share/locale/fi/LC_MESSAGES/gnome-nettool.mo
share/locale/fr/LC_MESSAGES/gnome-nettool.mo
+share/locale/fur/LC_MESSAGES/gnome-nettool.mo
share/locale/ga/LC_MESSAGES/gnome-nettool.mo
+share/locale/gd/LC_MESSAGES/gnome-nettool.mo
share/locale/gl/LC_MESSAGES/gnome-nettool.mo
share/locale/gu/LC_MESSAGES/gnome-nettool.mo
share/locale/he/LC_MESSAGES/gnome-nettool.mo
@@ -153,13 +205,16 @@ share/locale/hi/LC_MESSAGES/gnome-nettool.mo
share/locale/hr/LC_MESSAGES/gnome-nettool.mo
share/locale/hu/LC_MESSAGES/gnome-nettool.mo
share/locale/id/LC_MESSAGES/gnome-nettool.mo
+share/locale/is/LC_MESSAGES/gnome-nettool.mo
share/locale/it/LC_MESSAGES/gnome-nettool.mo
share/locale/ja/LC_MESSAGES/gnome-nettool.mo
share/locale/ka/LC_MESSAGES/gnome-nettool.mo
+share/locale/kk/LC_MESSAGES/gnome-nettool.mo
share/locale/km/LC_MESSAGES/gnome-nettool.mo
share/locale/kn/LC_MESSAGES/gnome-nettool.mo
share/locale/ko/LC_MESSAGES/gnome-nettool.mo
share/locale/ku/LC_MESSAGES/gnome-nettool.mo
+share/locale/lo/LC_MESSAGES/gnome-nettool.mo
share/locale/lt/LC_MESSAGES/gnome-nettool.mo
share/locale/lv/LC_MESSAGES/gnome-nettool.mo
share/locale/mai/LC_MESSAGES/gnome-nettool.mo
@@ -205,3 +260,4 @@ share/locale/xh/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_HK/LC_MESSAGES/gnome-nettool.mo
share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo
+share/metainfo/gnome-nettool.appdata.xml
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index fd6f54c51883..c6a32aa00a08 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -1,7 +1,7 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
PORTNAME= gnome-online-accounts
-PORTVERSION= 3.40.1
+PORTVERSION= 3.44.0
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gnome-online-accounts/distinfo b/net/gnome-online-accounts/distinfo
index ab821a20015c..89ad2ffd2b2f 100644
--- a/net/gnome-online-accounts/distinfo
+++ b/net/gnome-online-accounts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635011092
-SHA256 (gnome-online-accounts-3.40.1.tar.xz) = 955a03128d0e87855d34d7c534e088f6286ed7ac01baa4ef824ef42a2cb39aad
-SIZE (gnome-online-accounts-3.40.1.tar.xz) = 861220
+TIMESTAMP = 1651009726
+SHA256 (gnome-online-accounts-3.44.0.tar.xz) = 381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342
+SIZE (gnome-online-accounts-3.44.0.tar.xz) = 859564
diff --git a/net/gnome-online-miners/Makefile b/net/gnome-online-miners/Makefile
index 397d3615be8b..65b65e3a8740 100644
--- a/net/gnome-online-miners/Makefile
+++ b/net/gnome-online-miners/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnome-online-miners
PORTVERSION= 3.34.0
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index 53c494c8422c..414cffecfe82 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -2,6 +2,7 @@
PORTNAME= dico
PORTVERSION= 2.10
+PORTREVISION= 1
CATEGORIES= net textproc
MASTER_SITES= GNU
PKGNAMEPREFIX= gnu-
diff --git a/net/go-bapu/Makefile b/net/go-bapu/Makefile
index 15ab4e2bf36c..b97cdd5d1856 100644
--- a/net/go-bapu/Makefile
+++ b/net/go-bapu/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bapu
PORTVERSION= 0.3.0
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= https://bitbucket.org/carlostrub/bapu/get/
PKGNAMEPREFIX= go-
diff --git a/net/go-cs/Makefile b/net/go-cs/Makefile
index 18f522817199..0c5d3fdcf4f5 100644
--- a/net/go-cs/Makefile
+++ b/net/go-cs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= go-cs
PORTVERSION= 0.9
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= net
MAINTAINER= akosela@andykosela.com
diff --git a/net/gobgp/Makefile b/net/gobgp/Makefile
index cddddf7d72ba..9429515c6f4e 100644
--- a/net/gobgp/Makefile
+++ b/net/gobgp/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gobgp
-PORTVERSION= 2.23.0
+PORTVERSION= 3.0.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= net
DIST_SUBDIR= gobgp
@@ -11,52 +12,13 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go:modules
-USE_GITHUB= yes
+USE_RC_SUBR= gobgpd
+GO_MODULE= github.com/osrg/gobgp/v3
+GO_TARGET= ./cmd/gobgp ./cmd/gobgpd:${PREFIX}/libexec/gobgpd
-GO_PKGNAME= github.com/${GH_ACCOUNT}/${PORTNAME}
-GO_TARGET= ./cmd/gobgp \
- ./cmd/gobgpd:${PREFIX}/libexec/gobgpd
-GH_ACCOUNT= osrg
+SUB_FILES= gobgpd
PLIST_FILES= bin/gobgp libexec/gobgpd
-GH_TUPLE= \
- BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
- coreos:go-systemd:95778dfbb74e:coreos_go_systemd/vendor/github.com/coreos/go-systemd \
- davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
- dgryski:go-farm:ac7624ea8da3:dgryski_go_farm/vendor/github.com/dgryski/go-farm \
- eapache:channels:v1.1.0:eapache_channels/vendor/github.com/eapache/channels \
- eapache:queue:v1.1.0:eapache_queue/vendor/github.com/eapache/queue \
- fsnotify:fsnotify:v1.4.2:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
- go-test:deep:v1.0.6:go_test_deep/vendor/github.com/go-test/deep \
- go-yaml:yaml:913338de1bd2:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
- go-yaml:yaml:v2.2.8:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
- golang:net:3c3fba18258b:golang_net/vendor/golang.org/x/net \
- golang:protobuf:v1.0.0:golang_protobuf/vendor/github.com/golang/protobuf \
- golang:sys:85ca7c5b95cd:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
- google:go-genproto:09f6ed296fc6:google_go_genproto/vendor/google.golang.org/genproto \
- google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
- grpc:grpc-go:v1.5.1:grpc_grpc_go/vendor/google.golang.org/grpc \
- hashicorp:hcl:392dba7d905e:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
- inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
- jessevdk:go-flags:v1.3.0:jessevdk_go_flags/vendor/github.com/jessevdk/go-flags \
- k-sone:critbitgo:48c9e1530131:k_sone_critbitgo/vendor/github.com/k-sone/critbitgo \
- kr:pretty:v0.2.0:kr_pretty/vendor/github.com/kr/pretty \
- kr:text:v0.2.0:kr_text/vendor/github.com/kr/text \
- magiconair:properties:v1.7.3:magiconair_properties/vendor/github.com/magiconair/properties \
- mitchellh:mapstructure:d0303fe80992:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
- pelletier:go-buffruneio:v0.2.0:pelletier_go_buffruneio/vendor/github.com/pelletier/go-buffruneio \
- pelletier:go-toml:v1.0.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
- pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
- sirupsen:logrus:a3f95b5c4235:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
- spf13:afero:9be650865eab:spf13_afero/vendor/github.com/spf13/afero \
- spf13:cast:v1.1.0:spf13_cast/vendor/github.com/spf13/cast \
- spf13:cobra:b26b538f6930:spf13_cobra/vendor/github.com/spf13/cobra \
- spf13:jwalterweatherman:0efa5202c046:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
- spf13:pflag:v1.0.0:spf13_pflag/vendor/github.com/spf13/pflag \
- spf13:viper:v1.0.0:spf13_viper/vendor/github.com/spf13/viper \
- stretchr:testify:v1.6.0:stretchr_testify/vendor/github.com/stretchr/testify \
- vishvananda:netlink:a95659537721:vishvananda_netlink/vendor/github.com/vishvananda/netlink \
- vishvananda:netns:86bef332bfc3:vishvananda_netns/vendor/github.com/vishvananda/netns
+
OPTIONS_DEFINE= BASH ZSH
OPTIONS_DEFAULT=BASH ZSH
@@ -65,9 +27,6 @@ BASH_PLIST_FILES= etc/bash_completion.d/gobgp-completion.bash \
etc/bash_completion.d/gobgp-static-completion.bash
ZSH_PLIST_FILES= share/zsh/site-functions/_gobgp
-USE_RC_SUBR= gobgpd
-SUB_FILES= gobgpd
-
post-install-BASH-on:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
${INSTALL_DATA} ${GO_WRKSRC}/tools/completion/gobgp*-completion.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
diff --git a/net/gobgp/distinfo b/net/gobgp/distinfo
index 97f619169deb..feefd18ebaf6 100644
--- a/net/gobgp/distinfo
+++ b/net/gobgp/distinfo
@@ -1,79 +1,5 @@
-TIMESTAMP = 1610280502
-SHA256 (gobgp/osrg-gobgp-v2.23.0_GH0.tar.gz) = d637af13808aba5e998fed3f8b3f90cf583ec23111bd55475351fc26b57e7eea
-SIZE (gobgp/osrg-gobgp-v2.23.0_GH0.tar.gz) = 1029320
-SHA256 (gobgp/BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
-SIZE (gobgp/BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (gobgp/coreos-go-systemd-95778dfbb74e_GH0.tar.gz) = 4df631756d675518bcf61e9d34e5fb8cc69310b4c9eb5878e8641121d4daedd3
-SIZE (gobgp/coreos-go-systemd-95778dfbb74e_GH0.tar.gz) = 64114
-SHA256 (gobgp/davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (gobgp/davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (gobgp/dgryski-go-farm-ac7624ea8da3_GH0.tar.gz) = 1059f66d3f30a35136bef20b52e1814e596bc9bcefb8d625dfa171688dd8cf58
-SIZE (gobgp/dgryski-go-farm-ac7624ea8da3_GH0.tar.gz) = 20513
-SHA256 (gobgp/eapache-channels-v1.1.0_GH0.tar.gz) = 443b9361ff7db635b830e84d8eb0830477083efba53fb0c531af04e07cde3a59
-SIZE (gobgp/eapache-channels-v1.1.0_GH0.tar.gz) = 11705
-SHA256 (gobgp/eapache-queue-v1.1.0_GH0.tar.gz) = 2be4716ba2bba5f7c125a8fe72ba534f02cf0d7d98d3a372d4ebe54b170f7329
-SIZE (gobgp/eapache-queue-v1.1.0_GH0.tar.gz) = 3502
-SHA256 (gobgp/fsnotify-fsnotify-v1.4.2_GH0.tar.gz) = 4a1fd9beeb0496b9cf6084ac83654ece19188e9b2ffa041652d1071d4b225415
-SIZE (gobgp/fsnotify-fsnotify-v1.4.2_GH0.tar.gz) = 29552
-SHA256 (gobgp/go-test-deep-v1.0.6_GH0.tar.gz) = efb077dfe783aeabc04756a5d04b3f16202073a558d8ebdc020b53d28e428a4c
-SIZE (gobgp/go-test-deep-v1.0.6_GH0.tar.gz) = 9575
-SHA256 (gobgp/go-yaml-yaml-913338de1bd2_GH0.tar.gz) = f5c0400359c4b2178278571197b14df2fce013b5a27df5fa84ab96f84b95229f
-SIZE (gobgp/go-yaml-yaml-913338de1bd2_GH0.tar.gz) = 87064
-SHA256 (gobgp/go-yaml-yaml-v2.2.8_GH0.tar.gz) = 9632d0760e9a07c414f2b2b6cd453d6225e42ecea77906883b23f1f1d0546045
-SIZE (gobgp/go-yaml-yaml-v2.2.8_GH0.tar.gz) = 72732
-SHA256 (gobgp/golang-net-3c3fba18258b_GH0.tar.gz) = 94df3283789155d9652a1035dab57fa60e471abbbc65dea36b97b4c269e3ebd2
-SIZE (gobgp/golang-net-3c3fba18258b_GH0.tar.gz) = 1177169
-SHA256 (gobgp/golang-protobuf-v1.0.0_GH0.tar.gz) = 378eb25acba0056bdf1011f20e3df7a139d3372306df09949011e5642b739cb1
-SIZE (gobgp/golang-protobuf-v1.0.0_GH0.tar.gz) = 269544
-SHA256 (gobgp/golang-sys-85ca7c5b95cd_GH0.tar.gz) = 06a5cbc446381df9653d4b410239720eea6b27461597de88f3e621664c811294
-SIZE (gobgp/golang-sys-85ca7c5b95cd_GH0.tar.gz) = 1047239
-SHA256 (gobgp/golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (gobgp/golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (gobgp/google-go-genproto-09f6ed296fc6_GH0.tar.gz) = 81066ad3158ec118e84b4981b3c793720a02fbdefe41153b5e18b6e296fcb293
-SIZE (gobgp/google-go-genproto-09f6ed296fc6_GH0.tar.gz) = 952886
-SHA256 (gobgp/google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (gobgp/google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (gobgp/grpc-grpc-go-v1.5.1_GH0.tar.gz) = d93d7e7e8a6d59c26f0f82b32c2b34299016aa56766a4d426331038fb3e35545
-SIZE (gobgp/grpc-grpc-go-v1.5.1_GH0.tar.gz) = 302765
-SHA256 (gobgp/hashicorp-hcl-392dba7d905e_GH0.tar.gz) = 11198e365257a8f3455023aa4db78b01b4f44408e8e21ca04aab171453bdfd69
-SIZE (gobgp/hashicorp-hcl-392dba7d905e_GH0.tar.gz) = 69715
-SHA256 (gobgp/inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (gobgp/inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (gobgp/jessevdk-go-flags-v1.3.0_GH0.tar.gz) = e0f9f94adbea4b2df5e6185d3e402dbe472816e2d76ac44ee8d2688175d7bb36
-SIZE (gobgp/jessevdk-go-flags-v1.3.0_GH0.tar.gz) = 55446
-SHA256 (gobgp/k-sone-critbitgo-48c9e1530131_GH0.tar.gz) = 4a76ae6c14c34d0c262c8e821267e24b10db81b541706f7296ac3a3b518b3ec2
-SIZE (gobgp/k-sone-critbitgo-48c9e1530131_GH0.tar.gz) = 9840
-SHA256 (gobgp/kr-pretty-v0.2.0_GH0.tar.gz) = 6dc2207cfe03d3b9d65460cbada52c533ed273726a78d9f485c439ad813fe990
-SIZE (gobgp/kr-pretty-v0.2.0_GH0.tar.gz) = 8760
-SHA256 (gobgp/kr-text-v0.2.0_GH0.tar.gz) = 59b5e4a7fd4097be87fad0edcaf342fdc971d0c8fdfb4f2d7424561471992e7c
-SIZE (gobgp/kr-text-v0.2.0_GH0.tar.gz) = 8699
-SHA256 (gobgp/magiconair-properties-v1.7.3_GH0.tar.gz) = 984fdc5c5d303e4c85975e3a8e15ac7217f48998c262388b21dbceb94010b1a8
-SIZE (gobgp/magiconair-properties-v1.7.3_GH0.tar.gz) = 27512
-SHA256 (gobgp/mitchellh-mapstructure-d0303fe80992_GH0.tar.gz) = 92f9bdb6a6674e4d3c1e63f670dbc64cc92bc320f2abc39df3c28dfa8a151eff
-SIZE (gobgp/mitchellh-mapstructure-d0303fe80992_GH0.tar.gz) = 15560
-SHA256 (gobgp/pelletier-go-buffruneio-v0.2.0_GH0.tar.gz) = 2a838bbc3240d323549c9e6820cbf66199296d2706e72697685ee9576affd49f
-SIZE (gobgp/pelletier-go-buffruneio-v0.2.0_GH0.tar.gz) = 3028
-SHA256 (gobgp/pelletier-go-toml-v1.0.0_GH0.tar.gz) = 068455531f9a8cb9cad590d2d9a02bc25180737868de640849d85a5b99a0ce37
-SIZE (gobgp/pelletier-go-toml-v1.0.0_GH0.tar.gz) = 47009
-SHA256 (gobgp/pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (gobgp/pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (gobgp/sirupsen-logrus-a3f95b5c4235_GH0.tar.gz) = 2021fc539ff0a25ebe54bbb37527f135d7cbbaebe0504846753b7b2f21b85f8a
-SIZE (gobgp/sirupsen-logrus-a3f95b5c4235_GH0.tar.gz) = 28455
-SHA256 (gobgp/spf13-afero-9be650865eab_GH0.tar.gz) = e455d4ae29952c7e361664957b1c248eb9b3ec4c547f178645266952fecbd22d
-SIZE (gobgp/spf13-afero-9be650865eab_GH0.tar.gz) = 40623
-SHA256 (gobgp/spf13-cast-v1.1.0_GH0.tar.gz) = 2758eb969dd8707c0ff165fda4191fd8811e19b0c5d29d3dced0fba1b4410ad4
-SIZE (gobgp/spf13-cast-v1.1.0_GH0.tar.gz) = 9592
-SHA256 (gobgp/spf13-cobra-b26b538f6930_GH0.tar.gz) = 8326acb9d680c581f6d5c8b41a2ddcf77c1ee2bb703a9868f0e7f641df60bed0
-SIZE (gobgp/spf13-cobra-b26b538f6930_GH0.tar.gz) = 100127
-SHA256 (gobgp/spf13-jwalterweatherman-0efa5202c046_GH0.tar.gz) = 52ee9f8b3af8eb883f5085d712b0bef85d953b8f67f41598a384ee865f16ba21
-SIZE (gobgp/spf13-jwalterweatherman-0efa5202c046_GH0.tar.gz) = 6349
-SHA256 (gobgp/spf13-pflag-v1.0.0_GH0.tar.gz) = 690b86ae5499fad84ada4644c85215d66d56f31934683e8543f4c57c5048e011
-SIZE (gobgp/spf13-pflag-v1.0.0_GH0.tar.gz) = 38988
-SHA256 (gobgp/spf13-viper-v1.0.0_GH0.tar.gz) = 50c1c336095ce0e7edf414c25f80f3f01b65457b092752252f2c47af85c8c99e
-SIZE (gobgp/spf13-viper-v1.0.0_GH0.tar.gz) = 30804
-SHA256 (gobgp/stretchr-testify-v1.6.0_GH0.tar.gz) = a5c33d77640da2fc2d8db091f9ecdf99214c64f19e7264493bff728706f00bda
-SIZE (gobgp/stretchr-testify-v1.6.0_GH0.tar.gz) = 84517
-SHA256 (gobgp/vishvananda-netlink-a95659537721_GH0.tar.gz) = dad4fb75bf646bbb83de81b1565f980f443facd26680469c630ad98160a31bbf
-SIZE (gobgp/vishvananda-netlink-a95659537721_GH0.tar.gz) = 103179
-SHA256 (gobgp/vishvananda-netns-86bef332bfc3_GH0.tar.gz) = ed1be9a3a05f4963b69c73cb25c2f34e5430957b6de48bde41fdd6eeb1097cad
-SIZE (gobgp/vishvananda-netns-86bef332bfc3_GH0.tar.gz) = 7743
+TIMESTAMP = 1647439182
+SHA256 (go/net_gobgp/gobgp-v3.0.0/v3.0.0.mod) = 46f03ab424d0f425bd8bf05d5aa323f16b03da79e2722b90f811faa937a281e3
+SIZE (go/net_gobgp/gobgp-v3.0.0/v3.0.0.mod) = 1062
+SHA256 (go/net_gobgp/gobgp-v3.0.0/v3.0.0.zip) = da81e4e4ece69b5f53ba750c5d94a042c843fd35ed7cae02aa257d074dcec2be
+SIZE (go/net_gobgp/gobgp-v3.0.0/v3.0.0.zip) = 1236219
diff --git a/net/gogoc/Makefile b/net/gogoc/Makefile
deleted file mode 100644
index c3073de0ee88..000000000000
--- a/net/gogoc/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by: Toma┼ż Muraus <kami@k5-storitve.net>
-
-PORTNAME= gogoc
-PORTVERSION= 1.2
-PORTREVISION= 2
-CATEGORIES= net
-MASTER_SITES= http://gogo6.com/downloads/
-DISTNAME= gogoc-1_2-RELEASE
-
-MAINTAINER= kami@k5-storitve.net
-COMMENT= GogoCLIENT, connect to Freenet6 tunnel
-
-USES= gmake ssl
-USE_RC_SUBR= gogoc
-
-OPTIONS_DEFINE= DOCS EXAMPLES
-
-MAKE_JOBS_UNSAFE= yes
-
-PORTDOCS= CLIENT-LICENSE.TXT GUI-LICENSE.TXT INSTALL README
-
-SUB_FILES= gogoc
-SUB_LIST= LOCALBASE=${LOCALBASE}
-
-.include <bsd.port.options.mk>
-
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12= incomplete definition of type 'struct dsa_st'
-BROKEN_FreeBSD_13= incomplete definition of type 'struct dsa_st'
-BROKEN_FreeBSD_14= incomplete definition of type 'struct dsa_st'
-.endif
-
-do-install:
- cd ${WRKSRC}/gogoc-tsp/ && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} \
- ${MAKE_CMD} platform=freebsd installdir=${STAGEDIR}${PREFIX} install
- ${RM} ${STAGEDIR}${PREFIX}/bin/gogoc.conf*
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gogoc
- ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${STAGEDIR}${EXAMPLESDIR}
- @${REINPLACE_CMD} -e \
- 's|gogoc_dir=${STAGEDIR}${PREFIX}|gogoc_dir=${PREFIX}|g' \
- ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample
- @${RM} ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample.bak # pass stage-qa
- ${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample \
- ${STAGEDIR}${PREFIX}/etc/gogoc.conf
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for file in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/net/gogoc/distinfo b/net/gogoc/distinfo
deleted file mode 100644
index b74375d14f21..000000000000
--- a/net/gogoc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (gogoc-1_2-RELEASE.tar.gz) = a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49
-SIZE (gogoc-1_2-RELEASE.tar.gz) = 249286
diff --git a/net/gogoc/files/gogoc.in b/net/gogoc/files/gogoc.in
deleted file mode 100644
index c78bb5fe283b..000000000000
--- a/net/gogoc/files/gogoc.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: gogoc
-# REQUIRE: NETWORK
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# gogoc_enable (bool): Set to NO by default.
-# Set it to YES to enable gogoc.
-#
-# Additional configurable variables:
-# gogoc_config (path): Set to %%LOCALBASE%%/etc/gogoc.conf
-# by default.
-
-. /etc/rc.subr
-
-name="gogoc"
-rcvar=gogoc_enable
-sig_stop="HUP"
-
-command=%%LOCALBASE%%/bin/${name}
-
-load_rc_config $name
-
-: ${gogoc_enable="NO"}
-: ${gogoc_config="%%LOCALBASE%%/etc/gogoc.conf"}
-
-command_args="-f $gogoc_config"
-
-run_rc_command "$1"
-
diff --git a/net/gogoc/files/patch-env b/net/gogoc/files/patch-env
deleted file mode 100644
index fa769e653f81..000000000000
--- a/net/gogoc/files/patch-env
+++ /dev/null
@@ -1,190 +0,0 @@
---- gogoc-pal/Makefile.orig 2010-03-07 17:38:30.000000000 +0100
-+++ gogoc-pal/Makefile 2010-11-19 19:40:21.000000000 +0100
-@@ -27,11 +27,10 @@
- PLATFORM :=$(shell [ -z "$(platform)" ] && uname | tr "[A-Z]" "[a-z]" || echo "$(platform)" )
-
- SUPPORTED_PLATFORMS=linux netbsd freebsd openbsd darwin sunos gogocpe
--CC=gcc
-+CC?=gcc
--
-
- # Export these variables to sub-makes.
--export PLATFORM PLATFORM_DIR OBJS_DIR DEFS_DIR OUT_INC_DIR CC DEBUG
-+export PLATFORM PLATFORM_DIR OBJS_DIR DEFS_DIR OUT_INC_DIR DEBUG
-
-
- #
---- gogoc-tsp/src/lib/Makefile.orig 2009-11-20 17:53:36.000000000 +0100
-+++ gogoc-tsp/src/lib/Makefile 2010-11-19 19:42:39.000000000 +0100
-@@ -14,11 +14,11 @@
-
-
- ifdef DEBUG
--CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
- else
--CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
- endif
--CC=gcc
-+CC?=gcc
-
- OBJS=$(OBJS_DIR)/base64.o \
- $(OBJS_DIR)/cli.o \
---- gogoc-tsp/src/net/Makefile.orig 2009-11-20 17:53:38.000000000 +0100
-+++ gogoc-tsp/src/net/Makefile 2010-11-19 19:43:55.000000000 +0100
-@@ -14,11 +14,11 @@
-
-
- ifdef DEBUG
--CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
- else
--CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
- endif
--CC=gcc
-+CC?=gcc
-
- OBJS=$(OBJS_DIR)/net.o \
- $(OBJS_DIR)/net_rudp.o \
---- gogoc-tsp/src/tsp/Makefile.orig 2009-11-20 17:53:40.000000000 +0100
-+++ gogoc-tsp/src/tsp/Makefile 2010-11-19 19:50:22.000000000 +0100
-@@ -14,11 +14,11 @@
-
-
- ifdef DEBUG
--CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
- else
--CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
- endif
--CC=gcc
-+CC?=gcc
-
- OBJS=$(OBJS_DIR)/tsp_auth.o \
- $(OBJS_DIR)/tsp_cap.o \
---- gogoc-tsp/src/xml/Makefile.orig 2009-11-20 17:53:42.000000000 +0100
-+++ gogoc-tsp/src/xml/Makefile 2010-11-19 19:51:14.000000000 +0100
-@@ -14,11 +14,11 @@
-
-
- ifdef DEBUG
--CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
- else
--CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
- endif
--CC=gcc
-+CC?=gcc
-
- OBJS=$(OBJS_DIR)/xmlparse.o \
- $(OBJS_DIR)/xml_req.o \
---- gogoc-tsp/platform/freebsd/Makefile.orig 2009-11-20 17:53:23.000000000 +0100
-+++ gogoc-tsp/platform/freebsd/Makefile 2010-11-19 19:53:22.000000000 +0100
-@@ -13,13 +13,13 @@
- -include platform.mak
-
- ifdef DEBUG
--CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
--LDFLAGS=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
-+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT -DDEBUG
-+LDFLAGS+=-g $(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -pthread -lstdc++
- else
--CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
--LDFLAGS=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -lpthread -lstdc++
-+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -D_REENTRANT
-+LDFLAGS+=$(LD_LIB_PATHS) $(LD_LIBRARIES) -lcrypto -pthread -lstdc++
- endif
--CC=gcc
-+CC?=gcc
-
- OBJS=$(OBJS_DIR)/tsp_local.o \
- $(OBJS_DIR)/tsp_tun.o
---- gogoc-tsp/platform/unix-common/Makefile.orig 2009-11-20 17:53:30.000000000 +0100
-+++ gogoc-tsp/platform/unix-common/Makefile 2010-11-19 19:53:49.000000000 +0100
-@@ -13,11 +13,11 @@
- -include $(PLATFORM_DIR)/$(PLATFORM)/platform.mak
-
- ifdef DEBUG
--CFLAGS=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG
-+CFLAGS+=-g -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS) -DDEBUG
- else
--CFLAGS=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS)
-+CFLAGS+=-O2 -Wall $(CC_INC_PATHS) $(PLATFORM_CFLAGS)
- endif
--CC=gcc
-+CC?=gcc
-
- OS_UNAME=os_uname.h
- OBJS=$(OBJS_DIR)/unix-main.o
---- gogoc-config/Makefile.orig 2009-11-20 17:30:23.000000000 +0100
-+++ gogoc-config/Makefile 2010-11-19 20:06:16.000000000 +0100
-@@ -23,20 +23,20 @@
- GOGOCPALLIB_DIR=$(GOGOCPAL)/out_lib
- GOGOCPALLIB=gogocpal
-
--CC=gcc
-+CC?=gcc
--CXX=g++
-+CXX?=g++
--LD=g++
-+LD?=g++
--RANLIB=ranlib
-+RANLIB?=ranlib
--AR=ar
-+AR?=ar
-
- ifdef DEBUG
--CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
--CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
--LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
-+CXXFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-+CFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-+LDFLAGS+=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
- else
--CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
--CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
--LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
-+CXXFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-+CFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-+LDFLAGS+=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocconfig -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
- endif
-
-
---- gogoc-messaging/Makefile.orig 2009-11-20 17:34:50.000000000 +0100
-+++ gogoc-messaging/Makefile 2010-11-19 20:11:29.000000000 +0100
-@@ -21,20 +21,20 @@
- GOGOCPALLIB_DIR=$(GOGOCPAL)/out_lib
- GOGOCPALLIB=gogocpal
-
--CC=gcc
-+CC?=gcc
--CXX=g++
-+CXX?=g++
--LD=g++
-+LD?=g++
--RANLIB=ranlib
-+RANLIB?=ranlib
--AR=ar
-+AR?=ar
-
- ifdef DEBUG
--CXXFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
--CFLAGS=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
--LDFLAGS=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
-+CXXFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-+CFLAGS+=-g -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-+LDFLAGS+=-g -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
- else
--CXXFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
--CFLAGS=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
--LDFLAGS=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
-+CXXFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CXXFLAGS)
-+CFLAGS+=-O2 -I. -I$(GOGOCPALINC_DIR) -I$(GOGOCPALDEFS_DIR) -Wall -D_REENTRANT -DNDEBUG $(HACCESS_DEFINES) $(EXTRA_CFLAGS)
-+LDFLAGS+=-O2 -L$(LIB_DIR) -L$(GOGOCPALLIB_DIR) -lgogocmessaging -l$(GOGOCPALLIB) $(EXTRA_LDFLAGS)
- endif
-
-
diff --git a/net/gogoc/files/patch-freebsd.sh b/net/gogoc/files/patch-freebsd.sh
deleted file mode 100644
index e8b5b987af34..000000000000
--- a/net/gogoc/files/patch-freebsd.sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- gogoc-tsp/template/freebsd.sh~ 2016-07-28 01:31:15.964503000 +0800
-+++ gogoc-tsp/template/freebsd.sh 2016-07-28 01:33:41.691541000 +0800
-@@ -212,6 +212,7 @@
- #
- # Configured tunnel config (IPv6)
-
-+ Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 -ifdisabled
- Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 $TSP_CLIENT_ADDRESS_IPV6 $TSP_SERVER_ADDRESS_IPV6 prefixlen $TSP_TUNNEL_PREFIXLEN alias
- Exec $ifconfig $TSP_TUNNEL_INTERFACE mtu 1280
- #
diff --git a/net/gogoc/files/patch-icmp_echo_engine.c b/net/gogoc/files/patch-icmp_echo_engine.c
deleted file mode 100644
index c43043f317bd..000000000000
--- a/net/gogoc/files/patch-icmp_echo_engine.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gogoc-tsp/src/net/icmp_echo_engine.c~ 2016-07-22 15:16:32.382995000 +0800
-+++ gogoc-tsp/src/net/icmp_echo_engine.c 2016-07-22 15:16:44.244691000 +0800
-@@ -238,7 +238,7 @@
- p_engine->clbk_recv = recv_clbk;
-
- // Initialize engine socket variables.
-- p_engine->icmp_echo_id = pal_getpid();
-+ p_engine->icmp_echo_id = pal_getpid() % 65536;
- p_engine->icmp_saf = af;
- switch( p_engine->icmp_saf )
- {
diff --git a/net/gogoc/pkg-descr b/net/gogoc/pkg-descr
deleted file mode 100644
index a5d136a6fd48..000000000000
--- a/net/gogoc/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-gogoc is gogoCLIENT, which is needed to connect to Freenet6 tunnel.
-
-Freenet6 Tunnel is an IPv6 access service which enables thousands of people
-from all over the world to experience the best solution for a smooth and
-incremental deployment of IPv6. Freenet6 Tunnel users can get IPv6 connectivity
-from anywhere, including from behind any NAT device or from outside of their
-home network.
-
-WWW: http://www.gogo6.com/freenet6
diff --git a/net/gogoc/pkg-plist b/net/gogoc/pkg-plist
deleted file mode 100644
index cb33744c5cf5..000000000000
--- a/net/gogoc/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/gogoc
-@sample %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gogoc.conf.sample etc/gogoc.conf
-man/man5/gogoc.conf.5.gz
-man/man8/gogoc.8.gz
-template/README
-template/freebsd.sh
diff --git a/net/google-cloud-sdk-app-engine-go/Makefile b/net/google-cloud-sdk-app-engine-go/Makefile
deleted file mode 100644
index 247f8dc762ac..000000000000
--- a/net/google-cloud-sdk-app-engine-go/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME= google-cloud-sdk-app-engine-go
-DISTVERSION= g20181102165140
-CATEGORIES= net
-MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/components/
-DISTNAME= ${PORTNAME}-linux-x86_64-${DISTVERSION:S/^g//}
-
-MAINTAINER= dmgk@FreeBSD.org
-COMMENT= Google Cloud SDK App Engine Go Extensions
-
-LICENSE= APACHE20 BSD3CLAUSE
-LICENSE_COMB= multi
-LICENSE_FILE_APACHE20= ${WRKDIR}/platform/google_appengine/LICENSE.golang
-LICENSE_FILE_BSD3CLAUSE= ${WRKDIR}/platform/google_appengine/goroot-1.9/LICENSE
-
-ONLY_FOR_ARCHS= amd64 i386
-
-RUN_DEPENDS= gcloud:net/google-cloud-sdk
-
-USES= go
-
-do-build:
- (cd ${WRKDIR}/platform/google_appengine/goroot-1.9/src && \
- ${SETENV} ${MAKE_ENV} ${GO_ENV} \
- GOROOT_BOOTSTRAP=${LOCALBASE}/go \
- ${SH} make.bash); \
- (cd ${WRKDIR}/platform/google_appengine/goroot-1.9/bin && \
- ${RM} cover goapp godoc);
- (cd ${WRKDIR}/platform/google_appengine/goroot-1.9/pkg && \
- ${RM} -rf bootstrap linux_amd64_appengine obj tool/linux_amd64);
-
-do-install:
- (cd ${WRKDIR} && ${COPYTREE_SHARE} platform ${STAGEDIR}${PREFIX}/google-cloud-sdk)
- (cd ${STAGEDIR}${PREFIX} && \
- ${FIND} google-cloud-sdk/platform/google_appengine/goroot-1.9/bin -type f -exec ${CHMOD} +x {} \;);
- ${MV} ${STAGEDIR}${PREFIX}/google-cloud-sdk//platform/google_appengine/goroot-1.9/bin/go-app-stager \
- ${STAGEDIR}${PREFIX}/google-cloud-sdk/platform/google_appengine/;
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/google-cloud-sdk/platform/google_appengine/go-app-stager
- ${MKDIR} ${STAGEDIR}${PREFIX}/google-cloud-sdk/.install
- ${INSTALL_DATA} ${FILESDIR}/app-engine-go.snapshot.json ${STAGEDIR}${PREFIX}/google-cloud-sdk/.install/
- ${TOUCH} ${STAGEDIR}${PREFIX}/google-cloud-sdk/.install/app-engine-go.manifest
-
-post-install:
- @(cd ${STAGEDIR}${PREFIX} && \
- ${FIND} -s google-cloud-sdk -type f -o -type l >> ${TMPPLIST})
-
-find-new-version:
- @(v=$$(${FETCH_CMD} -qo- ${MASTER_SITES:H:H}/components-2.json | ${SED} -nE '/${DISTNAME:S|-${DISTVERSION:S|^g||}||}/s/.*-([0-9]{14})\..*/\1/p' ); \
- [ $$v -gt ${DISTVERSION:S|^g||} ] && ${ECHO} "Found new version $$v") || ${ECHO} "No new version was found"
-
-.include <bsd.port.mk>
diff --git a/net/google-cloud-sdk-app-engine-go/distinfo b/net/google-cloud-sdk-app-engine-go/distinfo
deleted file mode 100644
index 849c553731f0..000000000000
--- a/net/google-cloud-sdk-app-engine-go/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1550518372
-SHA256 (google-cloud-sdk-app-engine-go-linux-x86_64-20181102165140.tar.gz) = 15cc3ff0072e77b1740bd31e594398c98a409685784f5378442b10c7baa51613
-SIZE (google-cloud-sdk-app-engine-go-linux-x86_64-20181102165140.tar.gz) = 59310816
diff --git a/net/google-cloud-sdk-app-engine-go/files/app-engine-go.snapshot.json b/net/google-cloud-sdk-app-engine-go/files/app-engine-go.snapshot.json
deleted file mode 100644
index ac260767500e..000000000000
--- a/net/google-cloud-sdk-app-engine-go/files/app-engine-go.snapshot.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "components": [
- {
- "dependencies": [
- "core"
- ],
- "details": {
- "description": "Provides the tools to develop Go applications on App Engine.",
- "display_name": "App Engine Go Extensions"
- },
- "id": "app-engine-go",
- "is_configuration": false,
- "is_hidden": false,
- "is_required": false,
- "platform": {},
- "version": {
- "build_number": 0,
- "version_string": ""
- }
- }
- ],
- "revision": 0,
- "schema_version": {
- "no_update": false,
- "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz",
- "version": 0
- },
- "version": ""
-}
diff --git a/net/google-cloud-sdk-app-engine-go/pkg-descr b/net/google-cloud-sdk-app-engine-go/pkg-descr
deleted file mode 100644
index 772902f281a6..000000000000
--- a/net/google-cloud-sdk-app-engine-go/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Google Cloud SDK contains tools and libraries that enable you to easily create
-and manage resources on Google Cloud Platform, including App Engine, Compute
-Engine, Cloud Storage, BigQuery, Cloud SQL, and Cloud DNS.
-
-This port installs Google Cloud SDK "App Engine Go Extensions" component.
-
-WWW: https://cloud.google.com/sdk/
diff --git a/net/goreplay/Makefile b/net/goreplay/Makefile
index 6a4c7460c09a..918a4b633146 100644
--- a/net/goreplay/Makefile
+++ b/net/goreplay/Makefile
@@ -1,6 +1,7 @@
PORTNAME= goreplay
PORTVERSION= 1.2.0
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= swills@FreeBSD.org
diff --git a/net/gorss/Makefile b/net/gorss/Makefile
new file mode 100644
index 000000000000..0de4581f4731
--- /dev/null
+++ b/net/gorss/Makefile
@@ -0,0 +1,37 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+
+PORTNAME= gorss
+PORTVERSION= 0.3
+DISTVERSIONPREFIX= v
+PORTREVISION= 2
+CATEGORIES= net www
+
+MAINTAINER= danfe@FreeBSD.org
+COMMENT= Simple RSS/Atom reader written in Go
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USES= go:modules
+USE_GITHUB= yes
+GH_ACCOUNT= Lallassu
+
+.include "${.CURDIR}/Makefile.deps"
+
+GO_BUILDFLAGS= -ldflags "-w -X github.com/${GH_ACCOUNT}/${GH_PROJECT}/internal.Version=${PORTVERSION}"
+GO_TARGET= ./cmd/${PORTNAME}
+
+PLIST_FILES= bin/${PORTNAME} \
+ ${DATADIR_REL}/themes/default.theme \
+ ${DATADIR_REL}/themes/irssi.theme \
+ ${DATADIR_REL}/themes/night.theme
+
+post-patch:
+ @${LN} -sf xdg_linux.go \
+ ${WRKSRC}/vendor/github.com/OpenPeeDeeP/xdg/xdg_${OPSYS:tl}.go
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${CP} -a ${WRKSRC}/themes ${STAGEDIR}${DATADIR}
+
+.include <bsd.port.mk>
diff --git a/net/gorss/Makefile.deps b/net/gorss/Makefile.deps
new file mode 100644
index 000000000000..b0f237ba9786
--- /dev/null
+++ b/net/gorss/Makefile.deps
@@ -0,0 +1,21 @@
+# Generated with `make gomod-vendor'
+GH_TUPLE= \
+ OpenPeeDeeP:xdg:v0.2.0:openpeedeep_xdg/vendor/github.com/OpenPeeDeeP/xdg \
+ PuerkitoBio:goquery:v1.5.0:puerkitobio_goquery/vendor/github.com/PuerkitoBio/goquery \
+ andybalholm:cascadia:v1.0.0:andybalholm_cascadia/vendor/github.com/andybalholm/cascadia \
+ gdamore:encoding:v1.0.0:gdamore_encoding/vendor/github.com/gdamore/encoding \
+ gdamore:tcell:v1.2.0:gdamore_tcell/vendor/github.com/gdamore/tcell \
+ gilliek:go-opml:v1.0.0:gilliek_go_opml/vendor/github.com/gilliek/go-opml \
+ golang:net:ba9fcec4b297:golang_net/vendor/golang.org/x/net \
+ golang:sys:e07cf5db2756:golang_sys/vendor/golang.org/x/sys \
+ golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+ jaytaylor:html2text:01ec452cbe43:jaytaylor_html2text/vendor/jaytaylor.com/html2text \
+ lucasb-eyer:go-colorful:v1.0.2:lucasb_eyer_go_colorful/vendor/github.com/lucasb-eyer/go-colorful \
+ mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
+ mattn:go-sqlite3:v1.11.0:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+ mmcdole:gofeed:v1.0.0-beta2:mmcdole_gofeed/vendor/github.com/mmcdole/gofeed \
+ mmcdole:goxpp:0068e33feabf:mmcdole_goxpp/vendor/github.com/mmcdole/goxpp \
+ olekukonko:tablewriter:v0.0.1:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
+ rivo:tview:f8bc69b90341:rivo_tview/vendor/github.com/rivo/tview \
+ rivo:uniseg:b9f5b9457d44:rivo_uniseg/vendor/github.com/rivo/uniseg \
+ ssor:bom:6386211fdfcf:ssor_bom/vendor/github.com/ssor/bom
diff --git a/net/gorss/distinfo b/net/gorss/distinfo
new file mode 100644
index 000000000000..7f27b22d0e58
--- /dev/null
+++ b/net/gorss/distinfo
@@ -0,0 +1,41 @@
+TIMESTAMP = 1603882104
+SHA256 (Lallassu-gorss-v0.3_GH0.tar.gz) = 28f8c03c0ec5844fde940216d3906fbdc5a8f644dd9ccb5d0321825ca6bf7a57
+SIZE (Lallassu-gorss-v0.3_GH0.tar.gz) = 7816076
+SHA256 (OpenPeeDeeP-xdg-v0.2.0_GH0.tar.gz) = decfceaec24c6b09f209924c3ff17b528604f1b60df8f3b5dff82b4c34558f63
+SIZE (OpenPeeDeeP-xdg-v0.2.0_GH0.tar.gz) = 6601
+SHA256 (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 0307341d56ae12648584b3990fb1e84f465870247e46aff00381c98c5ad231c7
+SIZE (PuerkitoBio-goquery-v1.5.0_GH0.tar.gz) = 100975
+SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52
+SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232
+SHA256 (gdamore-encoding-v1.0.0_GH0.tar.gz) = 8fb8593a69cd86f16233d63dd6d74181136ec8f22900c509e961a25eb4b2e013
+SIZE (gdamore-encoding-v1.0.0_GH0.tar.gz) = 10886
+SHA256 (gdamore-tcell-v1.2.0_GH0.tar.gz) = 39f3d1fb6c30b911141f6d19d3e3ee1352af7907336910811a8e60b2f10c8d8b
+SIZE (gdamore-tcell-v1.2.0_GH0.tar.gz) = 146485
+SHA256 (gilliek-go-opml-v1.0.0_GH0.tar.gz) = 54d184503845a831daa9eb9c041f2bd9ae33aa2f607f3aeb6bcee5e61e513d69
+SIZE (gilliek-go-opml-v1.0.0_GH0.tar.gz) = 4165
+SHA256 (golang-net-ba9fcec4b297_GH0.tar.gz) = eae512644d59db05f5420315897daf1315beee1b07c723703922d6174f28b993
+SIZE (golang-net-ba9fcec4b297_GH0.tar.gz) = 1100029
+SHA256 (golang-sys-e07cf5db2756_GH0.tar.gz) = 4aff7bdec4be7c5d8ddb1655b02c537e1380d26f02eb25dec89e9dca563f0f36
+SIZE (golang-sys-e07cf5db2756_GH0.tar.gz) = 1448658
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
+SHA256 (jaytaylor-html2text-01ec452cbe43_GH0.tar.gz) = 4132a677ad55a82d24cf7f5422a227bce85044c08ab9ca6be0fd14551a7ee345
+SIZE (jaytaylor-html2text-01ec452cbe43_GH0.tar.gz) = 15152
+SHA256 (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 9ca738f5e694587af132cdfedefe1c8fbc5e2fe4339286884fe051742d970140
+SIZE (lucasb-eyer-go-colorful-v1.0.2_GH0.tar.gz) = 430545
+SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
+SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
+SHA256 (mattn-go-sqlite3-v1.11.0_GH0.tar.gz) = bbf0711c000be4dcdda2bed529ed8fd03679c69e39793e11b8b5d9dfe9b533ca
+SIZE (mattn-go-sqlite3-v1.11.0_GH0.tar.gz) = 2278788
+SHA256 (mmcdole-gofeed-v1.0.0-beta2_GH0.tar.gz) = c9bba6379f2f7c3bf65e0f2ddfe3789310c0f8af269152df20dc4daae4b57be9
+SIZE (mmcdole-gofeed-v1.0.0-beta2_GH0.tar.gz) = 3804592
+SHA256 (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 432aadb22bc36d15d405c8b08a2c44dfd6f73508c49971e5a773cb6683f124ab
+SIZE (mmcdole-goxpp-0068e33feabf_GH0.tar.gz) = 5167
+SHA256 (olekukonko-tablewriter-v0.0.1_GH0.tar.gz) = d9d620f0bcd58953a44b514042caa378b8256a692bcc8c0842e8aeac5a87db89
+SIZE (olekukonko-tablewriter-v0.0.1_GH0.tar.gz) = 17505
+SHA256 (rivo-tview-f8bc69b90341_GH0.tar.gz) = f271740c1d46fe1be6888af636ea5fe430f4dacfacf11c6de0b208c292db74bf
+SIZE (rivo-tview-f8bc69b90341_GH0.tar.gz) = 2861099
+SHA256 (rivo-uniseg-b9f5b9457d44_GH0.tar.gz) = 710a4b93f00e30012ecc518eb5c3a032681aab2bcdd20ae734fe7b5e6a8bbb4a
+SIZE (rivo-uniseg-b9f5b9457d44_GH0.tar.gz) = 43962
+SHA256 (ssor-bom-6386211fdfcf_GH0.tar.gz) = 6e05adf64dd2846fa27f0e89038171600806529d3f0df3ef50edb42304399336
+SIZE (ssor-bom-6386211fdfcf_GH0.tar.gz) = 1802
diff --git a/net/gorss/pkg-descr b/net/gorss/pkg-descr
new file mode 100644
index 000000000000..0b88263039fb
--- /dev/null
+++ b/net/gorss/pkg-descr
@@ -0,0 +1,3 @@
+Console RSS/Atom reader written in Go, highly configurable and with themes.
+
+WWW: https://github.com/Lallassu/gorss
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 36ebd2d0cdbd..83d39561f20f 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gq
PORTVERSION= 1.3.4
-PORTREVISION= 15
+PORTREVISION= 17
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 3a60266fd62b..70c864cbfef8 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -2,6 +2,7 @@
PORTNAME= grilo-plugins
PORTVERSION= 0.3.14
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= GNOME
@@ -24,10 +25,10 @@ LIB_DEPENDS= libgrilo-0.3.so:net/grilo \
libgmime-2.6.so:mail/gmime26 \
libjson-glib-1.0.so:devel/json-glib
-USES= gettext gperf gnome libarchive meson pathfix pkgconfig sqlite tar:xz
+USES= gettext gperf gnome gstreamer libarchive meson pathfix pkgconfig sqlite tar:xz
USE_LDCONFIG= yes
USE_GNOME= glib20 intlhack libxml2
-USE_GSTREAMER1= chromaprint
+USE_GSTREAMER= chromaprint
MESON_ARGS= -Denable-lua-factory=no
OPTIONS_SUB= yes
diff --git a/net/grilo/Makefile b/net/grilo/Makefile
index 92f6af51d77a..20d52e9e1da6 100644
--- a/net/grilo/Makefile
+++ b/net/grilo/Makefile
@@ -2,6 +2,7 @@
PORTNAME= grilo
PORTVERSION= 0.3.14
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/grive2/Makefile b/net/grive2/Makefile
index a47c7d9f4808..f8fbd7763015 100644
--- a/net/grive2/Makefile
+++ b/net/grive2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= grive2
DISTVERSIONPREFIX= v
DISTVERSION= 0.5.2-dev
+PORTREVISION= 1
CATEGORIES= net
MAINTAINER= samuel@andersentech.net
diff --git a/net/grpcox/Makefile b/net/grpcox/Makefile
index b284c46c5f4a..478c479fb0e3 100644
--- a/net/grpcox/Makefile
+++ b/net/grpcox/Makefile
@@ -1,6 +1,7 @@
PORTNAME= grpcox
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.0
+PORTREVISION= 2
CATEGORIES= net www
MAINTAINER= yuri@FreeBSD.org
diff --git a/net/grpcui/Makefile b/net/grpcui/Makefile
index 462fcf29d1a0..aae8ef06463e 100644
--- a/net/grpcui/Makefile
+++ b/net/grpcui/Makefile
@@ -1,6 +1,7 @@
PORTNAME= grpcui
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.0
+DISTVERSION= 1.3.0
+PORTREVISION= 2
CATEGORIES= net www
MAINTAINER= yuri@FreeBSD.org
@@ -15,26 +16,25 @@ GH_ACCOUNT= fullstorydev
GH_SUBDIR= src/github.com/fullstorydev/grpcui
GH_TUPLE= \
census-instrumentation:opencensus-proto:v0.2.1:census_instrumentation_opencensus_proto/vendor/github.com/census-instrumentation/opencensus-proto \
- cncf:udpa:5459f2c99403:cncf_udpa_go/vendor/github.com/cncf/udpa \
- envoyproxy:go-control-plane:668b12f5399d:envoyproxy_go_control_plane/vendor/github.com/envoyproxy/go-control-plane \
+ cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
+ cncf:udpa:04548b0d99d4:cncf_udpa_go/vendor/github.com/cncf/udpa \
+ cncf:xds:cb28da3451f1:cncf_xds_go/vendor/github.com/cncf/xds \
+ envoyproxy:go-control-plane:cf90f659a021:envoyproxy_go_control_plane/vendor/github.com/envoyproxy/go-control-plane \
envoyproxy:protoc-gen-validate:v0.1.0:envoyproxy_protoc_gen_validate/vendor/github.com/envoyproxy/protoc-gen-validate \
- fullstorydev:grpcurl:v1.8.5:fullstorydev_grpcurl/vendor/github.com/fullstorydev/grpcurl \
+ fullstorydev:grpcurl:v1.8.6:fullstorydev_grpcurl/vendor/github.com/fullstorydev/grpcurl \
golang:appengine:v1.6.5:golang_appengine/vendor/google.golang.org/appengine \
golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
- golang:net:4c5254603344:golang_net/vendor/golang.org/x/net \
+ golang:net:c89045814202:golang_net/vendor/golang.org/x/net \
golang:oauth2:bf48bf16ab8d:golang_oauth2/vendor/golang.org/x/oauth2 \
- golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
+ golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
golang:sys:c3d80250170d:golang_sys/vendor/golang.org/x/sys \
- golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
- golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
- google:go-cmp:v0.5.0:google_go_cmp/vendor/github.com/google/go-cmp \
+ golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
google:go-genproto:cb27e3aa2013:google_go_genproto/vendor/google.golang.org/genproto \
- google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \
googleapis:google-cloud-go:v0.56.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
- grpc:grpc-go:v1.37.0:grpc_grpc_go/vendor/google.golang.org/grpc \
- jhump:protoreflect:v1.10.1:jhump_protoreflect/vendor/github.com/jhump/protoreflect \
+ grpc:grpc-go:v1.44.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+ jhump:protoreflect:c1d18a52a21d:jhump_protoreflect/vendor/github.com/jhump/protoreflect \
pkg:browser:0a3d74bf9ce4:pkg_browser/vendor/github.com/pkg/browser \
- protocolbuffers:protobuf-go:a709e31e5d12:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
+ protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
GO_TARGET= ./cmd/${PORTNAME}
PLIST_FILES= bin/${PORTNAME}
diff --git a/net/grpcui/distinfo b/net/grpcui/distinfo
index fe1acaab9fca..46581d7de0d2 100644
--- a/net/grpcui/distinfo
+++ b/net/grpcui/distinfo
@@ -1,45 +1,43 @@
-TIMESTAMP = 1641317249
-SHA256 (fullstorydev-grpcui-v1.2.0_GH0.tar.gz) = 20d109dc9f91ad2ca8e185ac60e9d36ece56282dd65ee9cf735322471ca0fe40
-SIZE (fullstorydev-grpcui-v1.2.0_GH0.tar.gz) = 4311663
+TIMESTAMP = 1645517051
+SHA256 (fullstorydev-grpcui-v1.3.0_GH0.tar.gz) = 56519818d08a47339dece319cb4c8387a65bf24623f49242ef6a1201a1eb8b15
+SIZE (fullstorydev-grpcui-v1.3.0_GH0.tar.gz) = 4354750
SHA256 (census-instrumentation-opencensus-proto-v0.2.1_GH0.tar.gz) = bfcefa6093fc2ecdf5c9effea86e6982d0d6f9a5178b17fcf73a62e0f3fb43d0
SIZE (census-instrumentation-opencensus-proto-v0.2.1_GH0.tar.gz) = 151701
-SHA256 (cncf-udpa-5459f2c99403_GH0.tar.gz) = 2ec5d01e917868bac4e8ddc77cb5247e4e7969ae8efd6e0641688cd91e1124b4
-SIZE (cncf-udpa-5459f2c99403_GH0.tar.gz) = 39583
-SHA256 (envoyproxy-go-control-plane-668b12f5399d_GH0.tar.gz) = b7436a465b9e8b260fa3dc286f3a879dd360e4c99f927bbe3ac2bbc17b8f43d9
-SIZE (envoyproxy-go-control-plane-668b12f5399d_GH0.tar.gz) = 2538237
+SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
+SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
+SHA256 (cncf-udpa-04548b0d99d4_GH0.tar.gz) = 30d87780df8c93070d8c5c5e870b1c638eaac35789b6febb7a2695829abbb290
+SIZE (cncf-udpa-04548b0d99d4_GH0.tar.gz) = 20518
+SHA256 (cncf-xds-cb28da3451f1_GH0.tar.gz) = e5b585c02479759719649b82779109bc7aa2adf9a3a9153b48df71972d703ae0
+SIZE (cncf-xds-cb28da3451f1_GH0.tar.gz) = 79245
+SHA256 (envoyproxy-go-control-plane-cf90f659a021_GH0.tar.gz) = 69886cb2e25c91b3042fb052096f6c0d1ccd9a5941ca47f35f086b27eeeace5c
+SIZE (envoyproxy-go-control-plane-cf90f659a021_GH0.tar.gz) = 1948253
SHA256 (envoyproxy-protoc-gen-validate-v0.1.0_GH0.tar.gz) = 49a275b7aff7e9c7e84db38e405b49b1ac91bbd2fcbd0c253d39ec412ed3be61
SIZE (envoyproxy-protoc-gen-validate-v0.1.0_GH0.tar.gz) = 9625220
-SHA256 (fullstorydev-grpcurl-v1.8.5_GH0.tar.gz) = 1a9612560b2da18d50f0a46e9f2f5a7e5a13c4bb1ccef15ba65cb0c37335342b
-SIZE (fullstorydev-grpcurl-v1.8.5_GH0.tar.gz) = 126464
+SHA256 (fullstorydev-grpcurl-v1.8.6_GH0.tar.gz) = 18b457f644baabeef0de350596dd8d23563586ee94a3ed3cb290063e097ab934
+SIZE (fullstorydev-grpcurl-v1.8.6_GH0.tar.gz) = 127536
SHA256 (golang-appengine-v1.6.5_GH0.tar.gz) = 4e7df5d4ec2dda0f59f26925b36a087843fd1a165adb938712068376bf791316
SIZE (golang-appengine-v1.6.5_GH0.tar.gz) = 332903
SHA256 (golang-crypto-75b288015ac9_GH0.tar.gz) = 6e74e21bf9dfdbf0a8dac8cb205fbc3bfd8dff308a24080b9d6093a3858f0db2
SIZE (golang-crypto-75b288015ac9_GH0.tar.gz) = 1729931
-SHA256 (golang-net-4c5254603344_GH0.tar.gz) = 5957e628f2676d9e6c9517890bdcec334e8cac53d0f000b42ed6364a0550e152
-SIZE (golang-net-4c5254603344_GH0.tar.gz) = 1177478
+SHA256 (golang-net-c89045814202_GH0.tar.gz) = 9e67378e3fb5859927b4a1cc458d87e210859823d14955ba6477c7c6ca4cbcee
+SIZE (golang-net-c89045814202_GH0.tar.gz) = 1178563
SHA256 (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 28b3a51a8bd90beb5952d1080218ea238127edfe9455ad48921989619ff918a8
SIZE (golang-oauth2-bf48bf16ab8d_GH0.tar.gz) = 47016
-SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
-SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
+SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
+SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
SHA256 (golang-sys-c3d80250170d_GH0.tar.gz) = ed0e2147bf0f636e18c8e13f439b6f28018c17790a7e2e9ef4166b0f14c65fb1
SIZE (golang-sys-c3d80250170d_GH0.tar.gz) = 1050079
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb4d99e6cba2e3e5331d064f46640cc01a0e630ee6a684ae810bd94a7e4eb7
-SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
-SHA256 (google-go-cmp-v0.5.0_GH0.tar.gz) = 6d4eb0e3a4b7d1ee3a9fa917bd776c557e21cee0040c7da4fe6180acb9e2d911
-SIZE (google-go-cmp-v0.5.0_GH0.tar.gz) = 98584
+SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
+SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
SHA256 (google-go-genproto-cb27e3aa2013_GH0.tar.gz) = 1f0c3be40b17772975c71b54ca512ee681f7db384ebc43c8adb24f1ab44d2d0e
SIZE (google-go-genproto-cb27e3aa2013_GH0.tar.gz) = 9293098
-SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0
-SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871
SHA256 (googleapis-google-cloud-go-v0.56.0_GH0.tar.gz) = 3ae13915d10bf4a68794cd7a92072ee7a6bd29cbf1d20b217c5c9b2061c935e2
SIZE (googleapis-google-cloud-go-v0.56.0_GH0.tar.gz) = 2670258
-SHA256 (grpc-grpc-go-v1.37.0_GH0.tar.gz) = ab96e0de7416d1d26ea5c98417d21cd72b2c66094b80ba3ab1d03f4a5aa728ca
-SIZE (grpc-grpc-go-v1.37.0_GH0.tar.gz) = 1236791
-SHA256 (jhump-protoreflect-v1.10.1_GH0.tar.gz) = 63e1b2fec17d248ff1ac7e4d0aa7ef6e73231c4c2c8701c82ee1917db822151e
-SIZE (jhump-protoreflect-v1.10.1_GH0.tar.gz) = 607735
+SHA256 (grpc-grpc-go-v1.44.0_GH0.tar.gz) = d733af3137f3d835dea70904f73d18b4cb34dc2cbc4d2ee8f6b9912dd38d22eb
+SIZE (grpc-grpc-go-v1.44.0_GH0.tar.gz) = 1399762
+SHA256 (jhump-protoreflect-c1d18a52a21d_GH0.tar.gz) = b5ebf311fb0deeb6fa545fc6fdc125cbc6a094d68fd25ecb3d0f97c225089cb7
+SIZE (jhump-protoreflect-c1d18a52a21d_GH0.tar.gz) = 674934
SHA256 (pkg-browser-0a3d74bf9ce4_GH0.tar.gz) = b4e4eb4a5ad18f4f8889a1deb067beaaf7a7f40becf36d437f0f9aab76547505
SIZE (pkg-browser-0a3d74bf9ce4_GH0.tar.gz) = 3005
-SHA256 (protocolbuffers-protobuf-go-a709e31e5d12_GH0.tar.gz) = ff88e571fc9a01203360245fbdb8643c14ff12cd38201d8edf0c2599a0536153
-SIZE (protocolbuffers-protobuf-go-a709e31e5d12_GH0.tar.gz) = 1267955
+SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
+SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
diff --git a/net/grpcurl/Makefile b/net/grpcurl/Makefile
index 5d3fe6971031..e9c979ae6b20 100644
--- a/net/grpcurl/Makefile
+++ b/net/grpcurl/Makefile
@@ -1,6 +1,7 @@
PORTNAME= grpcurl
DISTVERSIONPREFIX= v
-DISTVERSION= 1.8.5
+DISTVERSION= 1.8.6
+PORTREVISION= 2
CATEGORIES= net
MAINTAINER= nc@FreeBSD.org
diff --git a/net/grpcurl/distinfo b/net/grpcurl/distinfo
index 03f6e58aafdf..8793fe1bead0 100644
--- a/net/grpcurl/distinfo
+++ b/net/grpcurl/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1633985640
-SHA256 (fullstorydev-grpcurl-v1.8.5_GH0.tar.gz) = 1a9612560b2da18d50f0a46e9f2f5a7e5a13c4bb1ccef15ba65cb0c37335342b
-SIZE (fullstorydev-grpcurl-v1.8.5_GH0.tar.gz) = 126464
+TIMESTAMP = 1644448707
+SHA256 (fullstorydev-grpcurl-v1.8.6_GH0.tar.gz) = 18b457f644baabeef0de350596dd8d23563586ee94a3ed3cb290063e097ab934
+SIZE (fullstorydev-grpcurl-v1.8.6_GH0.tar.gz) = 127536
SHA256 (census-instrumentation-opencensus-proto-v0.2.1_GH0.tar.gz) = bfcefa6093fc2ecdf5c9effea86e6982d0d6f9a5178b17fcf73a62e0f3fb43d0
SIZE (census-instrumentation-opencensus-proto-v0.2.1_GH0.tar.gz) = 151701
SHA256 (cncf-udpa-5459f2c99403_GH0.tar.gz) = 2ec5d01e917868bac4e8ddc77cb5247e4e7969ae8efd6e0641688cd91e1124b4
diff --git a/net/gscloud/Makefile b/net/gscloud/Makefile
index a9e4fb357745..3bfd9901ce46 100644
--- a/net/gscloud/Makefile
+++ b/net/gscloud/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gscloud
DISTVERSIONPREFIX= v
DISTVERSION= 0.11.0
+PORTREVISION= 2
CATEGORIES= net devel
MAINTAINER= egypcio@FreeBSD.org
diff --git a/net/gscloud/distinfo b/net/gscloud/distinfo
index 5d711d8f808d..3857ad9b308f 100644
--- a/net/gscloud/distinfo
+++ b/net/gscloud/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1634545681
-SHA256 (gridscale-gscloud-v0.11.0_GH0.tar.gz) = cfc532c2b87a580ff77500a332f41f398301118501bd0e7c7e4619e8b0fa2556
-SIZE (gridscale-gscloud-v0.11.0_GH0.tar.gz) = 131814
+TIMESTAMP = 1649507357
+SHA256 (gridscale-gscloud-v0.11.0_GH0.tar.gz) = f4c714d52025ba72b1823ba7bc60ceb9baeb97d844bcbdc2a4e57e4746c1eb3a
+SIZE (gridscale-gscloud-v0.11.0_GH0.tar.gz) = 131817
SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile
index 45af3c7ead94..e2d66e45d2e1 100644
--- a/net/gssdp/Makefile
+++ b/net/gssdp/Makefile
@@ -1,7 +1,7 @@
# Created by: Martin Wilke <miwi@FreeBSD.org>
PORTNAME= gssdp
-PORTVERSION= 1.4.0.1
+PORTVERSION= 1.5.1
CATEGORIES= net
MASTER_SITES= GNOME
@@ -11,10 +11,10 @@ COMMENT= Framework for UPnP devices
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= glib>=2.54:devel/glib20 \
+BUILD_DEPENDS= glib>=2.69:devel/glib20 \
gobject-introspection>=1.36:devel/gobject-introspection \
- libsoup>=2.26.1:devel/libsoup
-LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
+ libsoup3>=2.99.0:devel/libsoup3
+LIB_DEPENDS= libsoup-3.0.so:devel/libsoup3
USES= gnome meson pkgconfig tar:xz
USE_GNOME= glib20 introspection:build
@@ -22,6 +22,8 @@ USE_GNOME= glib20 introspection:build
MESON_ARGS= -Dexamples=false -Dgtk_doc=false -Dintrospection=true
USE_LDCONFIG= yes
+CONFLICTS_INSTALL= gssdp14
+
OPTIONS_DEFINE= SNIFFER VAPI
OPTIONS_SUB= yes
SNIFFER_DESC= Build graphical SSDP sniffer
diff --git a/net/gssdp/distinfo b/net/gssdp/distinfo
index e8977861a33b..8d6afe8c9196 100644
--- a/net/gssdp/distinfo
+++ b/net/gssdp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632227466
-SHA256 (gssdp-1.4.0.1.tar.xz) = 8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582
-SIZE (gssdp-1.4.0.1.tar.xz) = 1229264
+TIMESTAMP = 1654708322
+SHA256 (gssdp-1.5.1.tar.xz) = 53287227a3dcf099cecd89ed8b086f68aeb099933199bc7c8d6bee9bef81abf7
+SIZE (gssdp-1.5.1.tar.xz) = 1231084
diff --git a/net/gssdp/pkg-plist b/net/gssdp/pkg-plist
index 7fd69be16c69..11bebeea0fed 100644
--- a/net/gssdp/pkg-plist
+++ b/net/gssdp/pkg-plist
@@ -1,15 +1,15 @@
%%SNIFFER%%bin/gssdp-device-sniffer
-include/gssdp-1.2/libgssdp/gssdp-client.h
-include/gssdp-1.2/libgssdp/gssdp-enums.h
-include/gssdp-1.2/libgssdp/gssdp-error.h
-include/gssdp-1.2/libgssdp/gssdp-resource-browser.h
-include/gssdp-1.2/libgssdp/gssdp-resource-group.h
-include/gssdp-1.2/libgssdp/gssdp.h
-lib/girepository-1.0/GSSDP-1.2.typelib
-lib/libgssdp-1.2.so
-lib/libgssdp-1.2.so.0
-lib/libgssdp-1.2.so.0.104.0
-libdata/pkgconfig/gssdp-1.2.pc
-share/gir-1.0/GSSDP-1.2.gir
-%%VAPI%%share/vala/vapi/gssdp-1.2.deps
-%%VAPI%%share/vala/vapi/gssdp-1.2.vapi
+include/gssdp-1.6/libgssdp/gssdp-client.h
+include/gssdp-1.6/libgssdp/gssdp-enums.h
+include/gssdp-1.6/libgssdp/gssdp-error.h
+include/gssdp-1.6/libgssdp/gssdp-resource-browser.h
+include/gssdp-1.6/libgssdp/gssdp-resource-group.h
+include/gssdp-1.6/libgssdp/gssdp.h
+lib/girepository-1.0/GSSDP-1.6.typelib
+lib/libgssdp-1.6.so
+lib/libgssdp-1.6.so.0
+lib/libgssdp-1.6.so.0.105.1
+libdata/pkgconfig/gssdp-1.6.pc
+share/gir-1.0/GSSDP-1.6.gir
+%%VAPI%%share/vala/vapi/gssdp-1.6.deps
+%%VAPI%%share/vala/vapi/gssdp-1.6.vapi
diff --git a/net/gssdp14/Makefile b/net/gssdp14/Makefile
new file mode 100644
index 000000000000..ebd891cfb0e8
--- /dev/null
+++ b/net/gssdp14/Makefile
@@ -0,0 +1,40 @@
+# Created by: Martin Wilke <miwi@FreeBSD.org>
+
+PORTNAME= gssdp
+PORTVERSION= 1.4.0.1
+CATEGORIES= net
+MASTER_SITES= GNOME
+PKGNAMESUFFIX= 14
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Framework for UPnP devices
+
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= glib>=2.54:devel/glib20 \
+ gobject-introspection>=1.36:devel/gobject-introspection \
+ libsoup>=2.26.1:devel/libsoup
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
+
+USES= gnome meson pkgconfig tar:xz
+USE_GNOME= glib20 introspection:build
+
+MESON_ARGS= -Dexamples=false -Dgtk_doc=false -Dintrospection=true
+USE_LDCONFIG= yes
+
+CONFLICTS_INSTALL= gssdp
+
+PORTSCOUT= limit:^1\.4\.
+
+OPTIONS_DEFINE= SNIFFER VAPI
+OPTIONS_SUB= yes
+SNIFFER_DESC= Build graphical SSDP sniffer
+
+SNIFFER_BUILD_DEPENDS= gtk4>=4:x11-toolkits/gtk40
+SNIFFER_MESON_TRUE= sniffer
+SNIFFER_USE= GNOME=gtk40
+VAPI_BUILD_DEPENDS= vala>=0.20:lang/vala
+VAPI_MESON_TRUE= vapi
+
+.include <bsd.port.mk>
diff --git a/net/gssdp14/distinfo b/net/gssdp14/distinfo
new file mode 100644
index 000000000000..e8977861a33b
--- /dev/null
+++ b/net/gssdp14/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1632227466
+SHA256 (gssdp-1.4.0.1.tar.xz) = 8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582
+SIZE (gssdp-1.4.0.1.tar.xz) = 1229264
diff --git a/net/gssdp14/files/patch-libgssdp-gssdp-client.h b/net/gssdp14/files/patch-libgssdp-gssdp-client.h
new file mode 100644
index 000000000000..2d02e0443a2a
--- /dev/null
+++ b/net/gssdp14/files/patch-libgssdp-gssdp-client.h
@@ -0,0 +1,12 @@
+--- libgssdp/gssdp-client.h.orig 2018-12-10 21:21:06 UTC
++++ libgssdp/gssdp-client.h
+@@ -31,9 +31,6 @@ G_BEGIN_DECLS
+
+ G_DECLARE_DERIVABLE_TYPE (GSSDPClient, gssdp_client, GSSDP, CLIENT, GObject)
+
+-typedef struct _GSSDPClient GSSDPClient;
+-typedef struct _GSSDPClientClass GSSDPClientClass;
+-
+ /**
+ * GSSDPUDAVersion:
+ * @GSSDP_UDA_VERSION_UNSPECIFIED: When creating a client, use the default version
diff --git a/net/gssdp14/files/patch-libgssdp-gssdp-resource-group.h b/net/gssdp14/files/patch-libgssdp-gssdp-resource-group.h
new file mode 100644
index 000000000000..f440f0134db6
--- /dev/null
+++ b/net/gssdp14/files/patch-libgssdp-gssdp-resource-group.h
@@ -0,0 +1,10 @@
+--- libgssdp/gssdp-resource-group.h.orig 2018-11-30 23:17:04 UTC
++++ libgssdp/gssdp-resource-group.h
+@@ -44,7 +44,6 @@ struct _GSSDPResourceGroupClass {
+ void (* _gssdp_reserved3) (void);
+ void (* _gssdp_reserved4) (void);
+ };
+-typedef struct _GSSDPResourceGroupClass GSSDPResourceGroupClass;
+
+ GSSDPResourceGroup *
+ gssdp_resource_group_new (GSSDPClient *client);
diff --git a/net/gssdp14/pkg-descr b/net/gssdp14/pkg-descr
new file mode 100644
index 000000000000..e428b3dca1e4
--- /dev/null
+++ b/net/gssdp14/pkg-descr
@@ -0,0 +1,3 @@
+A GObject-based API for handling resource discovery and announcement over SSDP.
+
+WWW: https://wiki.gnome.org/Projects/GUPnP
diff --git a/net/gssdp14/pkg-plist b/net/gssdp14/pkg-plist
new file mode 100644
index 000000000000..7fd69be16c69
--- /dev/null
+++ b/net/gssdp14/pkg-plist
@@ -0,0 +1,15 @@
+%%SNIFFER%%bin/gssdp-device-sniffer
+include/gssdp-1.2/libgssdp/gssdp-client.h
+include/gssdp-1.2/libgssdp/gssdp-enums.h
+include/gssdp-1.2/libgssdp/gssdp-error.h
+include/gssdp-1.2/libgssdp/gssdp-resource-browser.h
+include/gssdp-1.2/libgssdp/gssdp-resource-group.h
+include/gssdp-1.2/libgssdp/gssdp.h
+lib/girepository-1.0/GSSDP-1.2.typelib
+lib/libgssdp-1.2.so
+lib/libgssdp-1.2.so.0
+lib/libgssdp-1.2.so.0.104.0
+libdata/pkgconfig/gssdp-1.2.pc
+share/gir-1.0/GSSDP-1.2.gir
+%%VAPI%%share/vala/vapi/gssdp-1.2.deps
+%%VAPI%%share/vala/vapi/gssdp-1.2.vapi
diff --git a/net/gstreamer1-plugins-libmms/Makefile b/net/gstreamer1-plugins-libmms/Makefile
index cac956dd5910..bfc9c6648b89 100644
--- a/net/gstreamer1-plugins-libmms/Makefile
+++ b/net/gstreamer1-plugins-libmms/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 0
+PORTREVISION= 2
CATEGORIES= net
COMMENT= GStreamer mms:// and mmsh:// plugin
diff --git a/net/gstreamer1-plugins-srtp/Makefile b/net/gstreamer1-plugins-srtp/Makefile
index 8f8a68eccff6..64bea88595b9 100644
--- a/net/gstreamer1-plugins-srtp/Makefile
+++ b/net/gstreamer1-plugins-srtp/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 0
+PORTREVISION= 2
CATEGORIES= net
COMMENT= GStreamer srtp plugin
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 40e009809059..66ac126cd2d6 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -1,8 +1,7 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
PORTNAME= gtk-vnc
-PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTVERSION= 1.3.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -18,22 +17,21 @@ LIB_DEPENDS= libgnutls.so:security/gnutls \
libgpg-error.so:security/libgpg-error \
libsasl2.so:security/cyrus-sasl2
-USES= gettext gmake gnome libtool localbase pathfix pkgconfig python \
+USES= gettext gnome localbase meson perl5 pkgconfig python \
tar:xz xorg
-USE_GNOME= cairo gdkpixbuf2 gtk30 intltool introspection:build
+USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build
USE_XORG= x11
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-introspection \
- --disable-plugin --without-python
-INSTALL_TARGET= install-strip
OPTIONS_DEFINE= PULSEAUDIO
OPTIONS_DEFAULT=PULSEAUDIO
OPTIONS_SUB= yes
PULSEAUDIO_DESC= use PulseAudio for audio playback
-PULSEAUDIO_CONFIGURE_WITH= pulseaudio
+PULSEAUDIO_MESON_ENABLED= pulseaudio
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+
+BINARY_ALIAS= python3=${PYTHON_VERSION}
+
.include <bsd.port.mk>
diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo
index 58e7bc9f6051..256ea5d1340d 100644
--- a/net/gtk-vnc/distinfo
+++ b/net/gtk-vnc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522058863
-SHA256 (gtk-vnc-0.7.2.tar.xz) = f893f32b1ef6d09dd23cda39b8a2567be7c2aebda58026288e1362f042e20808
-SIZE (gtk-vnc-0.7.2.tar.xz) = 447088
+TIMESTAMP = 1656074601
+SHA256 (gtk-vnc-1.3.0.tar.xz) = 5faaa5823b8cbe8c0b0ba1e456c4e70c4b1ae6685c9fe81a4282d98cf00a211d
+SIZE (gtk-vnc-1.3.0.tar.xz) = 220488
diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist
index 6a3d37ca36c5..b7e49d65dac2 100644
--- a/net/gtk-vnc/pkg-plist
+++ b/net/gtk-vnc/pkg-plist
@@ -1,9 +1,9 @@
bin/gvnccapture
include/gtk-vnc-2.0/gtk-vnc.h
+include/gtk-vnc-2.0/vnccairoframebuffer.h
include/gtk-vnc-2.0/vncdisplay.h
include/gtk-vnc-2.0/vncdisplayenums.h
include/gtk-vnc-2.0/vncgrabsequence.h
-include/gtk-vnc-2.0/vncimageframebuffer.h
include/gvnc-1.0/gvnc.h
include/gvnc-1.0/vncaudio.h
include/gvnc-1.0/vncaudioformat.h
@@ -17,6 +17,7 @@ include/gvnc-1.0/vnccursor.h
include/gvnc-1.0/vncframebuffer.h
include/gvnc-1.0/vncpixelformat.h
include/gvnc-1.0/vncutil.h
+include/gvnc-1.0/vncversion.h
%%PULSEAUDIO%%include/gvncpulse-1.0/gvncpulse.h
%%PULSEAUDIO%%include/gvncpulse-1.0/vncaudiopulse.h
lib/girepository-1.0/GVnc-1.0.typelib
@@ -49,6 +50,7 @@ share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo
share/locale/eo/LC_MESSAGES/gtk-vnc.mo
share/locale/es/LC_MESSAGES/gtk-vnc.mo
share/locale/eu/LC_MESSAGES/gtk-vnc.mo
+share/locale/fa/LC_MESSAGES/gtk-vnc.mo
share/locale/fr/LC_MESSAGES/gtk-vnc.mo
share/locale/fur/LC_MESSAGES/gtk-vnc.mo
share/locale/gd/LC_MESSAGES/gtk-vnc.mo
diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile
index b80afa835122..fdcbdb202d25 100644
--- a/net/gupnp-av/Makefile
+++ b/net/gupnp-av/Makefile
@@ -1,7 +1,7 @@
# Created by: Martin Wilke <miwi@FreeBSD.org>
PORTNAME= gupnp-av
-PORTVERSION= 0.14.0
+PORTVERSION= 0.14.1
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gupnp-av/distinfo b/net/gupnp-av/distinfo
index 1e9835aab765..4f3b0795204a 100644
--- a/net/gupnp-av/distinfo
+++ b/net/gupnp-av/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632227470
-SHA256 (gupnp-av-0.14.0.tar.xz) = 20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156
-SIZE (gupnp-av-0.14.0.tar.xz) = 93128
+TIMESTAMP = 1654708326
+SHA256 (gupnp-av-0.14.1.tar.xz) = b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f
+SIZE (gupnp-av-0.14.1.tar.xz) = 93484
diff --git a/net/gupnp-av/pkg-plist b/net/gupnp-av/pkg-plist
index a2f98fc5bb1d..c4f4253f7589 100644
--- a/net/gupnp-av/pkg-plist
+++ b/net/gupnp-av/pkg-plist
@@ -21,7 +21,7 @@ include/gupnp-av-1.0/libgupnp-av/gupnp-search-criteria-parser.h
lib/girepository-1.0/GUPnPAV-1.0.typelib
lib/libgupnp-av-1.0.so
lib/libgupnp-av-1.0.so.3
-lib/libgupnp-av-1.0.so.3.14.0
+lib/libgupnp-av-1.0.so.3.14.1
libdata/pkgconfig/gupnp-av-1.0.pc
share/gir-1.0/GUPnPAV-1.0.gir
%%DATADIR%%/av.xsd
diff --git a/net/gupnp-dlna/Makefile b/net/gupnp-dlna/Makefile
index 2bd2622e73f6..0423277fbcb2 100644
--- a/net/gupnp-dlna/Makefile
+++ b/net/gupnp-dlna/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gupnp-dlna
PORTVERSION= 0.10.3
-PORTREVISION= 2
+PORTREVISION= 5
CATEGORIES= net
MASTER_SITES= GNOME
@@ -13,16 +13,15 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= valac:lang/vala \
- gupnp>=0.19.0:net/gupnp
-LIB_DEPENDS= libgupnp-1.2.so:net/gupnp
-RUN_DEPENDS= gupnp>=0.19.0:net/gupnp
+ gupnp14>=0.19.0:net/gupnp14
+LIB_DEPENDS= libgupnp-1.2.so:net/gupnp14
+RUN_DEPENDS= gupnp14>=0.19.0:net/gupnp14
CONFIGURE_ARGS= --enable-introspection \
--enable-gstreamer-metadata-backend
-USES= gmake gnome libtool pathfix pkgconfig tar:xz
+USES= gmake gnome gstreamer libtool pathfix pkgconfig tar:xz
USE_GNOME= glib20 introspection:build libxml2
-USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile
index 69c06a5faa1a..6efa554ae6ca 100644
--- a/net/gupnp-igd/Makefile
+++ b/net/gupnp-igd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gupnp-igd
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= GNOME
@@ -13,10 +13,10 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gobject-introspection>=0.10:devel/gobject-introspection \
- gssdp>=1.2.0:net/gssdp \
- gupnp>=1.2.0:net/gupnp
-LIB_DEPENDS= libgssdp-1.2.so:net/gssdp \
- libgupnp-1.2.so:net/gupnp
+ gssdp14>=1.2.0:net/gssdp14 \
+ gupnp14>=1.2.0:net/gupnp14
+LIB_DEPENDS= libgssdp-1.2.so:net/gssdp14 \
+ libgupnp-1.2.so:net/gupnp14
USES= compiler:c11 gnome meson pkgconfig tar:xz
USE_GNOME= glib20 introspection:build
diff --git a/net/gupnp-tools/Makefile b/net/gupnp-tools/Makefile
index dc5650d2d4c7..f5f35e886461 100644
--- a/net/gupnp-tools/Makefile
+++ b/net/gupnp-tools/Makefile
@@ -1,7 +1,7 @@
# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
PORTNAME= gupnp-tools
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.3
CATEGORIES= net
MASTER_SITES= GNOME
@@ -12,15 +12,15 @@ LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= glib>=2.24:devel/glib20 \
- gssdp>=1.2.0:net/gssdp \
+ gssdp14>=1.2.0:net/gssdp14 \
gtk3>=3.10:x11-toolkits/gtk30 \
- gupnp>=1.2.0:net/gupnp \
+ gupnp14>=1.4.0:net/gupnp14 \
libsoup>=2.42:devel/libsoup
-LIB_DEPENDS= libgssdp-1.2.so:net/gssdp \
- libgupnp-1.2.so:net/gupnp \
+LIB_DEPENDS= libgssdp-1.2.so:net/gssdp14 \
+ libgupnp-1.2.so:net/gupnp14 \
libsoup-2.4.so:devel/libsoup
-USES= gnome meson pkgconfig tar:xz
+USES= gettext-tools gnome meson pkgconfig tar:xz
USE_GNOME= glib20 gtk30 libxml2
USE_LDCONFIG= yes
diff --git a/net/gupnp-tools/distinfo b/net/gupnp-tools/distinfo
index 7c593d50d46b..2f7505c18dc1 100644
--- a/net/gupnp-tools/distinfo
+++ b/net/gupnp-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637519824
-SHA256 (gupnp-tools-0.10.2.tar.xz) = 6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c
-SIZE (gupnp-tools-0.10.2.tar.xz) = 181020
+TIMESTAMP = 1653151048
+SHA256 (gupnp-tools-0.10.3.tar.xz) = 457f4d923935b078415cd2ba88d78db60079b725926b7ee106e4565efe3204de
+SIZE (gupnp-tools-0.10.3.tar.xz) = 180596
diff --git a/net/gupnp-tools/pkg-plist b/net/gupnp-tools/pkg-plist
index eeb4a072987c..f14df03fd89c 100644
--- a/net/gupnp-tools/pkg-plist
+++ b/net/gupnp-tools/pkg-plist
@@ -3,6 +3,9 @@ bin/gupnp-av-cp
bin/gupnp-network-light
bin/gupnp-universal-cp
bin/gupnp-upload
+share/applications/gupnp-av-cp.desktop
+share/applications/gupnp-network-light.desktop
+share/applications/gupnp-universal-cp.desktop
%%DATADIR%%/pixmaps/media-renderer.png
%%DATADIR%%/pixmaps/network-light-22x22.png
%%DATADIR%%/pixmaps/network-light-off.png
@@ -21,3 +24,26 @@ share/icons/hicolor/256x256/apps/universal-cp.png
share/icons/hicolor/64x64/apps/av-cp.png
share/icons/hicolor/64x64/apps/network-light.png
share/icons/hicolor/64x64/apps/universal-cp.png
+share/locale/bs/LC_MESSAGES/gupnp-tools.mo
+share/locale/cs/LC_MESSAGES/gupnp-tools.mo
+share/locale/da/LC_MESSAGES/gupnp-tools.mo
+share/locale/de/LC_MESSAGES/gupnp-tools.mo
+share/locale/el/LC_MESSAGES/gupnp-tools.mo
+share/locale/es/LC_MESSAGES/gupnp-tools.mo
+share/locale/eu/LC_MESSAGES/gupnp-tools.mo
+share/locale/fur/LC_MESSAGES/gupnp-tools.mo
+share/locale/hu/LC_MESSAGES/gupnp-tools.mo
+share/locale/id/LC_MESSAGES/gupnp-tools.mo
+share/locale/ja/LC_MESSAGES/gupnp-tools.mo
+share/locale/pl/LC_MESSAGES/gupnp-tools.mo
+share/locale/pt/LC_MESSAGES/gupnp-tools.mo
+share/locale/pt_BR/LC_MESSAGES/gupnp-tools.mo
+share/locale/ro/LC_MESSAGES/gupnp-tools.mo
+share/locale/sk/LC_MESSAGES/gupnp-tools.mo
+share/locale/sl/LC_MESSAGES/gupnp-tools.mo
+share/locale/sr/LC_MESSAGES/gupnp-tools.mo
+share/locale/sr@latin/LC_MESSAGES/gupnp-tools.mo
+share/locale/sv/LC_MESSAGES/gupnp-tools.mo
+share/locale/tr/LC_MESSAGES/gupnp-tools.mo
+share/locale/uk/LC_MESSAGES/gupnp-tools.mo
+share/locale/zh_CN/LC_MESSAGES/gupnp-tools.mo
diff --git a/net/gupnp-ui/Makefile b/net/gupnp-ui/Makefile
index 202838c9596b..f4e3c1dbd4db 100644
--- a/net/gupnp-ui/Makefile
+++ b/net/gupnp-ui/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gupnp-ui
PORTVERSION= 0.1.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net
MASTER_SITES= GNOME
@@ -12,8 +12,8 @@ COMMENT= Framework for UPnP devices
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= gupnp>=0.3:net/gupnp
-LIB_DEPENDS= libgupnp-1.2.so:net/gupnp \
+BUILD_DEPENDS= gupnp14>=0.3:net/gupnp14
+LIB_DEPENDS= libgupnp-1.2.so:net/gupnp14 \
libsoup-2.4.so:devel/libsoup
USES= compiler:c++11-lang gnome libtool pathfix pkgconfig python
diff --git a/net/gupnp/Makefile b/net/gupnp/Makefile
index 27a96b9d72f0..7d0284b6f083 100644
--- a/net/gupnp/Makefile
+++ b/net/gupnp/Makefile
@@ -1,7 +1,7 @@
# Created by: Martin Wilke <miwi@FreeBSD.org>
PORTNAME= gupnp
-PORTVERSION= 1.4.2
+PORTVERSION= 1.5.1
CATEGORIES= net
MASTER_SITES= GNOME
@@ -11,12 +11,12 @@ COMMENT= Framework for UPnP devices
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= glib>=2.66:devel/glib20 \
+BUILD_DEPENDS= glib>=2.69:devel/glib20 \
gobject-introspection>=1.36:devel/gobject-introspection \
- gssdp>=1.3.0:net/gssdp \
- libsoup>=2.48.0:devel/libsoup
-LIB_DEPENDS= libgssdp-1.2.so:net/gssdp \
- libsoup-2.4.so:devel/libsoup \
+ gssdp>=1.5.0:net/gssdp \
+ libsoup3>=2.99.0:devel/libsoup3
+LIB_DEPENDS= libgssdp-1.6.so:net/gssdp \
+ libsoup-3.0.so:devel/libsoup3 \
libuuid.so:misc/e2fsprogs-libuuid
USES= compiler:c11 cpe gnome meson pkgconfig python:run shebangfix tar:xz
@@ -28,7 +28,9 @@ USE_LDCONFIG= yes
CPE_VENDOR= gnome
-SHEBANG_FILES= tools/gupnp-binding-tool-1.2
+CONFLICTS_INSTALL= gupnp14
+
+SHEBANG_FILES= tools/gupnp-binding-tool
OPTIONS_DEFINE= VAPI
OPTIONS_SUB= yes
diff --git a/net/gupnp/distinfo b/net/gupnp/distinfo
index 43c1e5f19552..e9310105ae23 100644
--- a/net/gupnp/distinfo
+++ b/net/gupnp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642102145
-SHA256 (gupnp-1.4.2.tar.xz) = bcad92f2ee09d02f55e0f6ea480c475ed8a7523529263f7ce28013d3c263bacc
-SIZE (gupnp-1.4.2.tar.xz) = 154636
+TIMESTAMP = 1654708324
+SHA256 (gupnp-1.5.1.tar.xz) = 8b7168cc0011136985877acf2800bbb4072cfcb083528a563b2b1d8a951f8f15
+SIZE (gupnp-1.5.1.tar.xz) = 2217980
diff --git a/net/gupnp/pkg-plist b/net/gupnp/pkg-plist
index 4492999aeb5d..26ac575c3295 100644
--- a/net/gupnp/pkg-plist
+++ b/net/gupnp/pkg-plist
@@ -1,30 +1,29 @@
-bin/gupnp-binding-tool-1.2
-include/gupnp-1.2/libgupnp/gupnp-acl.h
-include/gupnp-1.2/libgupnp/gupnp-context-filter.h
-include/gupnp-1.2/libgupnp/gupnp-context-manager.h
-include/gupnp-1.2/libgupnp/gupnp-context.h
-include/gupnp-1.2/libgupnp/gupnp-control-point.h
-include/gupnp-1.2/libgupnp/gupnp-device-info.h
-include/gupnp-1.2/libgupnp/gupnp-device-proxy.h
-include/gupnp-1.2/libgupnp/gupnp-device.h
-include/gupnp-1.2/libgupnp/gupnp-enums.h
-include/gupnp-1.2/libgupnp/gupnp-error.h
-include/gupnp-1.2/libgupnp/gupnp-resource-factory.h
-include/gupnp-1.2/libgupnp/gupnp-root-device.h
-include/gupnp-1.2/libgupnp/gupnp-service-info.h
-include/gupnp-1.2/libgupnp/gupnp-service-introspection.h
-include/gupnp-1.2/libgupnp/gupnp-service-proxy.h
-include/gupnp-1.2/libgupnp/gupnp-service.h
-include/gupnp-1.2/libgupnp/gupnp-types.h
-include/gupnp-1.2/libgupnp/gupnp-uuid.h
-include/gupnp-1.2/libgupnp/gupnp-white-list.h
-include/gupnp-1.2/libgupnp/gupnp-xml-doc.h
-include/gupnp-1.2/libgupnp/gupnp.h
-lib/girepository-1.0/GUPnP-1.2.typelib
-lib/libgupnp-1.2.so
-lib/libgupnp-1.2.so.1
-lib/libgupnp-1.2.so.1.104.2
-libdata/pkgconfig/gupnp-1.2.pc
-share/gir-1.0/GUPnP-1.2.gir
-%%VAPI%%share/vala/vapi/gupnp-1.2.deps
-%%VAPI%%share/vala/vapi/gupnp-1.2.vapi
+bin/gupnp-binding-tool-1.6
+include/gupnp-1.6/libgupnp/gupnp-acl.h
+include/gupnp-1.6/libgupnp/gupnp-context-filter.h
+include/gupnp-1.6/libgupnp/gupnp-context-manager.h
+include/gupnp-1.6/libgupnp/gupnp-context.h
+include/gupnp-1.6/libgupnp/gupnp-control-point.h
+include/gupnp-1.6/libgupnp/gupnp-device-info.h
+include/gupnp-1.6/libgupnp/gupnp-device-proxy.h
+include/gupnp-1.6/libgupnp/gupnp-device.h
+include/gupnp-1.6/libgupnp/gupnp-enums.h
+include/gupnp-1.6/libgupnp/gupnp-error.h
+include/gupnp-1.6/libgupnp/gupnp-resource-factory.h
+include/gupnp-1.6/libgupnp/gupnp-root-device.h
+include/gupnp-1.6/libgupnp/gupnp-service-info.h
+include/gupnp-1.6/libgupnp/gupnp-service-introspection.h
+include/gupnp-1.6/libgupnp/gupnp-service-proxy.h
+include/gupnp-1.6/libgupnp/gupnp-service.h
+include/gupnp-1.6/libgupnp/gupnp-types.h
+include/gupnp-1.6/libgupnp/gupnp-uuid.h
+include/gupnp-1.6/libgupnp/gupnp-xml-doc.h
+include/gupnp-1.6/libgupnp/gupnp.h
+lib/girepository-1.0/GUPnP-1.6.typelib
+lib/libgupnp-1.6.so
+lib/libgupnp-1.6.so.0
+lib/libgupnp-1.6.so.0.105.1
+libdata/pkgconfig/gupnp-1.6.pc
+share/gir-1.0/GUPnP-1.6.gir
+%%VAPI%%share/vala/vapi/gupnp-1.6.deps
+%%VAPI%%share/vala/vapi/gupnp-1.6.vapi
diff --git a/net/gupnp14/Makefile b/net/gupnp14/Makefile
new file mode 100644
index 000000000000..d56402139df3
--- /dev/null
+++ b/net/gupnp14/Makefile
@@ -0,0 +1,50 @@
+# Created by: Martin Wilke <miwi@FreeBSD.org>
+
+PORTNAME= gupnp
+PORTVERSION= 1.4.3
+CATEGORIES= net
+MASTER_SITES= GNOME
+PKGNAMESUFFIX= 14
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= Framework for UPnP devices
+
+LICENSE= LGPL20
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+BUILD_DEPENDS= glib>=2.66:devel/glib20 \
+ gobject-introspection>=1.36:devel/gobject-introspection \
+ gssdp14>=1.3.0:net/gssdp14 \
+ libsoup>=2.48.0:devel/libsoup
+LIB_DEPENDS= libgssdp-1.2.so:net/gssdp14 \
+ libsoup-2.4.so:devel/libsoup \
+ libuuid.so:misc/e2fsprogs-libuuid
+
+USES= compiler:c11 cpe gnome meson pkgconfig python:run shebangfix tar:xz
+USE_GNOME= glib20 introspection:build libxml2
+
+MESON_ARGS= -Dexamples=false -Dgtk_doc=false -Dintrospection=true
+USE_CSTD= c11
+USE_LDCONFIG= yes
+
+CONFLICTS_INSTALL= gupnp
+
+CPE_VENDOR= gnome
+
+PORTSCOUT= limit:^1\.4\.
+
+SHEBANG_FILES= tools/gupnp-binding-tool-1.2
+
+OPTIONS_DEFINE= VAPI
+OPTIONS_SUB= yes
+
+VAPI_BUILD_DEPENDS= vala>=0.20:lang/vala
+VAPI_MESON_TRUE= vapi
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == "clang"
+CPPFLAGS+= -Wno-return-type
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/gupnp14/distinfo b/net/gupnp14/distinfo
new file mode 100644
index 000000000000..dfff7db40bc8
--- /dev/null
+++ b/net/gupnp14/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1643133665
+SHA256 (gupnp-1.4.3.tar.xz) = 14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba
+SIZE (gupnp-1.4.3.tar.xz) = 154812
diff --git a/net/gupnp14/files/patch-libgupnp-gupnp-control-point.c b/net/gupnp14/files/patch-libgupnp-gupnp-control-point.c
new file mode 100644
index 000000000000..2705d6c17981
--- /dev/null
+++ b/net/gupnp14/files/patch-libgupnp-gupnp-control-point.c
@@ -0,0 +1,11 @@
+--- libgupnp/gupnp-control-point.c.orig 2018-11-12 22:04:49 UTC
++++ libgupnp/gupnp-control-point.c
+@@ -795,7 +795,7 @@ parse_usn (const char *usn,
+ /* Count elements */
+ count = g_strv_length (bits);
+
+- if (count == 1) {
++ if (count == 1 || (count == 2 && strlen(bits[1]) == 0)) {
+ /* uuid:device-UUID */
+
+ *udn = bits[0];
diff --git a/net/gupnp14/pkg-descr b/net/gupnp14/pkg-descr
new file mode 100644
index 000000000000..1a17f56a449a
--- /dev/null
+++ b/net/gupnp14/pkg-descr
@@ -0,0 +1,13 @@
+GUPnP is an elegant, object-oriented open source framework for creating UPnP
+devices and control points, written in C using GObject and libsoup. The GUPnP
+API is intended to be easy to use, efficient and flexible. It provides the same
+set of features as libupnp, but shields the developer from most of UPnP's
+internals.
+
+GUPnP implements the UPnP specification: resource announcement and discovery,
+description, control, event notification, and presentation (GUPnP includes basic
+web server functionality through libsoup). GUPnP does not include helpers for
+construction or control of specific standardized resources (e.g. MediaServer);
+this is left for higher level libraries utilizing the GUPnP framework.
+
+WWW: https://wiki.gnome.org/Projects/GUPnP
diff --git a/net/gupnp14/pkg-plist b/net/gupnp14/pkg-plist
new file mode 100644
index 000000000000..9b37890ebc3f
--- /dev/null
+++ b/net/gupnp14/pkg-plist
@@ -0,0 +1,30 @@
+bin/gupnp-binding-tool-1.2
+include/gupnp-1.2/libgupnp/gupnp-acl.h
+include/gupnp-1.2/libgupnp/gupnp-context-filter.h
+include/gupnp-1.2/libgupnp/gupnp-context-manager.h
+include/gupnp-1.2/libgupnp/gupnp-context.h
+include/gupnp-1.2/libgupnp/gupnp-control-point.h
+include/gupnp-1.2/libgupnp/gupnp-device-info.h
+include/gupnp-1.2/libgupnp/gupnp-device-proxy.h
+include/gupnp-1.2/libgupnp/gupnp-device.h
+include/gupnp-1.2/libgupnp/gupnp-enums.h
+include/gupnp-1.2/libgupnp/gupnp-error.h
+include/gupnp-1.2/libgupnp/gupnp-resource-factory.h
+include/gupnp-1.2/libgupnp/gupnp-root-device.h
+include/gupnp-1.2/libgupnp/gupnp-service-info.h
+include/gupnp-1.2/libgupnp/gupnp-service-introspection.h
+include/gupnp-1.2/libgupnp/gupnp-service-proxy.h
+include/gupnp-1.2/libgupnp/gupnp-service.h
+include/gupnp-1.2/libgupnp/gupnp-types.h
+include/gupnp-1.2/libgupnp/gupnp-uuid.h
+include/gupnp-1.2/libgupnp/gupnp-white-list.h
+include/gupnp-1.2/libgupnp/gupnp-xml-doc.h
+include/gupnp-1.2/libgupnp/gupnp.h
+lib/girepository-1.0/GUPnP-1.2.typelib
+lib/libgupnp-1.2.so
+lib/libgupnp-1.2.so.1
+lib/libgupnp-1.2.so.1.104.3
+libdata/pkgconfig/gupnp-1.2.pc
+share/gir-1.0/GUPnP-1.2.gir
+%%VAPI%%share/vala/vapi/gupnp-1.2.deps
+%%VAPI%%share/vala/vapi/gupnp-1.2.vapi
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 0843de3e7be9..b0ef440c57a3 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -1,9 +1,9 @@
# Created by: Hugo Saro <hugo@barafranca.com>
PORTNAME= haproxy
-DISTVERSION= 2.5-dev13
+DISTVERSION= 2.7-dev1
CATEGORIES= net www
-MASTER_SITES= http://www.haproxy.org/download/2.5/src/devel/
+MASTER_SITES= http://www.haproxy.org/download/2.7/src/devel/
PKGNAMESUFFIX= -devel
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
@@ -13,30 +13,47 @@ COMMENT= Reliable, high performance TCP/HTTP load balancer
LICENSE= GPLv2 LGPL21
LICENSE_COMB= multi
-CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy19 haproxy20 haproxy21
+FLAVORS= default lua
+FLAVOR?= ${FLAVORS:[1]}
USES= compiler:c++11-lang cpe gmake
USE_RC_SUBR= haproxy
+default_CONFLICTS_INSTALL= haproxy-devel-lua
+lua_CONFLICTS_INSTALL= haproxy-devel
+lua_PKGNAMESUFFIX= devel-lua
+
+CONFLICTS_INSTALL= haproxy haproxy17 haproxy18 haproxy20 haproxy22 haproxy23 haproxy24 haproxy25
+
ALL_TARGET= all admin/halog/halog
MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \
USE_TFO=1 USE_THREAD_DUMP=1 \
- CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}"
+ CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" \
+ ${MAKE_ARGS_${ARCH}}
+
+MAKE_ARGS_i386= USE_LIBATOMIC=
+MAKE_ARGS_powerpc= USE_LIBATOMIC=
OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS PROMEX
OPTIONS_RADIO= PCRE
-OPTIONS_RADIO_PCRE= DPCRE SPCRE
-DPCRE_DESC= Link dynamically
-SPCRE_DESC= Link statically
+OPTIONS_RADIO_PCRE= DPCRE DPCRE2 SPCRE SPCRE2
+DPCRE_DESC= Link pcre(1) dynamically
+DPCRE2_DESC= Link pcre2 dynamically
+SPCRE_DESC= Link pcre(1) statically
+SPCRE2_DESC= Link pcre2 statically
DEVICEATLAS_DESC= DeviceAtlas Device Detection support
PROMEX_DESC= Enable Prometheus exporter
-OPTIONS_DEFAULT= SPCRE OPENSSL
+OPTIONS_DEFAULT= DPCRE2 OPENSSL PROMEX
DPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
DPCRE_MAKE_ARGS= USE_PCRE=1 USE_PCRE_JIT=1
-SPCRE_LIB_DEPENDS= libpcre.so:devel/pcre
+DPCRE2_LIB_DEPENDS= libpcre2-8.so:devel/pcre2
+DPCRE2_MAKE_ARG