replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
authorDario Lombardo <lomato@gmail.com>
Wed, 7 Feb 2018 11:26:45 +0000 (12:26 +0100)
committerAnders Broman <a.broman58@gmail.com>
Thu, 8 Feb 2018 14:57:36 +0000 (14:57 +0000)
The first is deprecated, as per https://spdx.org/licenses/.

Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed
Reviewed-on: https://code.wireshark.org/review/25661
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
909 files changed:
capchild/capture_ifinfo.c
capchild/capture_session.h
capchild/capture_sync.c
capchild/capture_sync.h
capinfos.c
capture_info.c
capture_info.h
capture_opts.c
capture_opts.h
capture_stop_conditions.c
capture_stop_conditions.h
captype.c
caputils/airpcap_loader.c
caputils/airpcap_loader.h
caputils/capture-pcap-util-int.h
caputils/capture-pcap-util-unix.c
caputils/capture-pcap-util.c
caputils/capture-pcap-util.h
caputils/capture-wpcap.c
caputils/capture-wpcap.h
caputils/capture_ifinfo.h
caputils/capture_win_ifnames.h
caputils/capture_wpcap_packet.c
caputils/capture_wpcap_packet.h
caputils/iface_monitor.c
caputils/iface_monitor.h
caputils/ws80211_utils.h
cfile.c
cfile.h
codecs/G711a/G711adecode.c
codecs/G711a/G711adecode.h
codecs/G711a/G711atable.h
codecs/G711u/G711udecode.c
codecs/G711u/G711udecode.h
codecs/G711u/G711utable.h
codecs/G722/G722decode.c
codecs/G722/G722decode.h
codecs/G726/G726decode.c
codecs/G726/G726decode.h
codecs/G729/G729decode.c
codecs/G729/G729decode.h
codecs/codecs.c
codecs/codecs.h
codecs/sbc/sbc.c
codecs/sbc/sbc_private.h
conditions.c
conditions.h
dftest.c
doc/CMakeLists.txt
doc/Makefile.am
doc/README.stats_tree
doc/extcap_example.py
doc/make-authors-format.pl
doc/make-authors-short.pl
doc/packet-PROTOABBREV.c
doc/perlnoutf.pl
doc/plugins.example/Makefile.am
doc/plugins.example/hello.c
docbook/CMakeLists.txt
docbook/make-wsluarm.pl
dumpcap.c
editcap.c
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.h
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c
epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h
epan/dissectors/asn1/sbc-ap/packet-sbc-ap-template.c
epan/dissectors/dissectors.h
epan/dissectors/make-dissectors.c
epan/dissectors/packet-artemis.c
epan/dissectors/packet-bacnet.h
epan/dissectors/packet-btmesh.c
epan/dissectors/packet-caneth.c
epan/dissectors/packet-cvspserver.c
epan/dissectors/packet-ldap.c
epan/dissectors/packet-lnet.c
epan/dissectors/packet-lnet.h
epan/dissectors/packet-lte-rrc.c
epan/dissectors/packet-lte-rrc.h
epan/dissectors/packet-lustre.c
epan/dissectors/packet-nas_eps.c
epan/dissectors/packet-nr-rrc.c
epan/dissectors/packet-nr-rrc.h
epan/dissectors/packet-nxp_802154_sniffer.c
epan/dissectors/packet-sbc-ap.c
epan/dissectors/packet-sip.c
epan/dissectors/packet-smp.c
epan/dissectors/packet-thrift.c
epan/dissectors/packet-thrift.h
epan/epan.c
epan/packet.c
epan/packet.h
epan/prefs.c
epan/print_stream.c
epan/print_stream.h
epan/proto.c
epan/register.c
epan/register.h
epan/wslua/init_wslua.c
epan/wslua/init_wslua.h
extcap.c
extcap.h
extcap/Makefile.am
extcap/androiddump.c
extcap/ciscodump.c
extcap/extcap-base.c
extcap/extcap-base.h
extcap/randpktdump.c
extcap/ssh-base.c
extcap/ssh-base.h
extcap/sshdump.c
extcap/udpdump.c
extcap_parser.c
extcap_parser.h
extcap_spawn.c
extcap_spawn.h
file.c
file.h
file_packet_provider.c
fileset.c
fileset.h
frame_tvbuff.c
frame_tvbuff.h
globals.h
log.h
mergecap.c
packaging/wix/windeployqt-to-wix.ps1
plugins/codecs/Makefile.am.inc
plugins/epan/Makefile.am.inc
plugins/wiretap/Makefile.am.inc
plugins/wiretap/usbdump/CMakeLists.txt
plugins/wiretap/usbdump/Makefile.am
plugins/wiretap/usbdump/usbdump.c
randpkt.c
randpkt_core/randpkt_core.c
randpkt_core/randpkt_core.h
rawshark.c
reordercap.c
ringbuffer.c
ringbuffer.h
sharkd.c
sharkd.h
sharkd_daemon.c
sharkd_session.c
sync_pipe.h
sync_pipe_write.c
text2pcap.c
text2pcap.h
tfshark.c
tools/oss-fuzzshark/fuzzshark.c
trigcap.c
tshark.c
ui/alert_box.c
ui/alert_box.h
ui/all_files_wildcard.h
ui/capture.c
ui/capture.h
ui/capture_globals.h
ui/capture_ui_utils.c
ui/capture_ui_utils.h
ui/cli/tap-camelsrt.c
ui/cli/tap-comparestat.c
ui/cli/tap-diameter-avp.c
ui/cli/tap-endpoints.c
ui/cli/tap-expert.c
ui/cli/tap-exportobject.c
ui/cli/tap-exportobject.h
ui/cli/tap-flow.c
ui/cli/tap-follow.c
ui/cli/tap-funnel.c
ui/cli/tap-gsm_astat.c
ui/cli/tap-hosts.c
ui/cli/tap-httpstat.c
ui/cli/tap-icmpstat.c
ui/cli/tap-icmpv6stat.c
ui/cli/tap-iostat.c
ui/cli/tap-iousers.c
ui/cli/tap-macltestat.c
ui/cli/tap-protocolinfo.c
ui/cli/tap-protohierstat.c
ui/cli/tap-rlcltestat.c
ui/cli/tap-rpcprogs.c
ui/cli/tap-rtd.c
ui/cli/tap-rtp.c
ui/cli/tap-rtspstat.c
ui/cli/tap-sctpchunkstat.c
ui/cli/tap-simple_stattable.c
ui/cli/tap-sipstat.c
ui/cli/tap-smbsids.c
ui/cli/tap-srt.c
ui/cli/tap-stats_tree.c
ui/cli/tap-sv.c
ui/cli/tap-wspstat.c
ui/cli/tshark-tap.h
ui/commandline.c
ui/commandline.h
ui/console.c
ui/console.h
ui/decode_as_utils.c
ui/decode_as_utils.h
ui/dissect_opts.c
ui/dissect_opts.h
ui/export_object_ui.c
ui/export_object_ui.h
ui/export_pdu_ui_utils.c
ui/export_pdu_ui_utils.h
ui/failure_message.c
ui/failure_message.h
ui/file_dialog.h
ui/filter_files.c
ui/filter_files.h
ui/firewall_rules.c
ui/firewall_rules.h
ui/gtk/fileset_dlg.c
ui/help_url.c
ui/help_url.h
ui/iface_lists.c
ui/iface_lists.h
ui/iface_toolbar.c
ui/iface_toolbar.h
ui/io_graph_item.c
ui/io_graph_item.h
ui/language.c
ui/language.h
ui/last_open_dir.h
ui/main_statusbar.h
ui/make-taps.c
ui/mcast_stream.c
ui/mcast_stream.h
ui/packet_list_utils.c
ui/packet_list_utils.h
ui/packet_range.c
ui/packet_range.h
ui/persfilepath_opt.c
ui/persfilepath_opt.h
ui/preference_utils.c
ui/preference_utils.h
ui/profile.c
ui/profile.h
ui/progress_dlg.h
ui/proto_hier_stats.c
ui/proto_hier_stats.h
ui/qt/about_dialog.cpp
ui/qt/about_dialog.h
ui/qt/accordion_frame.cpp
ui/qt/accordion_frame.h
ui/qt/address_editor_frame.cpp
ui/qt/address_editor_frame.h
ui/qt/bluetooth_att_server_attributes_dialog.cpp
ui/qt/bluetooth_att_server_attributes_dialog.h
ui/qt/bluetooth_device_dialog.cpp
ui/qt/bluetooth_device_dialog.h
ui/qt/bluetooth_devices_dialog.cpp
ui/qt/bluetooth_devices_dialog.h
ui/qt/bluetooth_hci_summary_dialog.cpp
ui/qt/bluetooth_hci_summary_dialog.h
ui/qt/byte_view_tab.cpp
ui/qt/byte_view_tab.h
ui/qt/capture_file.cpp
ui/qt/capture_file.h
ui/qt/capture_file_dialog.cpp
ui/qt/capture_file_dialog.h
ui/qt/capture_file_properties_dialog.cpp
ui/qt/capture_file_properties_dialog.h
ui/qt/capture_filter_syntax_worker.cpp
ui/qt/capture_filter_syntax_worker.h
ui/qt/capture_info_dialog.cpp
ui/qt/capture_info_dialog.h
ui/qt/capture_interfaces_dialog.cpp
ui/qt/capture_interfaces_dialog.h
ui/qt/capture_preferences_frame.cpp
ui/qt/capture_preferences_frame.h
ui/qt/coloring_rules_dialog.cpp
ui/qt/coloring_rules_dialog.h
ui/qt/column_editor_frame.cpp
ui/qt/column_editor_frame.h
ui/qt/column_preferences_frame.cpp
ui/qt/column_preferences_frame.h
ui/qt/compiled_filter_output.cpp
ui/qt/compiled_filter_output.h
ui/qt/conversation_colorize_action.cpp
ui/qt/conversation_colorize_action.h
ui/qt/conversation_dialog.cpp
ui/qt/conversation_dialog.h
ui/qt/conversation_hash_tables_dialog.cpp
ui/qt/conversation_hash_tables_dialog.h
ui/qt/decode_as_dialog.cpp
ui/qt/decode_as_dialog.h
ui/qt/display_filter_expression_dialog.cpp
ui/qt/display_filter_expression_dialog.h
ui/qt/dissector_tables_dialog.cpp
ui/qt/dissector_tables_dialog.h
ui/qt/enabled_protocols_dialog.cpp
ui/qt/enabled_protocols_dialog.h
ui/qt/endpoint_dialog.cpp
ui/qt/endpoint_dialog.h
ui/qt/expert_info_dialog.cpp
ui/qt/expert_info_dialog.h
ui/qt/export_dissection_dialog.cpp
ui/qt/export_dissection_dialog.h
ui/qt/export_object_action.cpp
ui/qt/export_object_action.h
ui/qt/export_object_dialog.cpp
ui/qt/export_object_dialog.h
ui/qt/export_pdu_dialog.cpp
ui/qt/export_pdu_dialog.h
ui/qt/extcap_argument.cpp
ui/qt/extcap_argument.h
ui/qt/extcap_argument_file.cpp
ui/qt/extcap_argument_file.h
ui/qt/extcap_argument_multiselect.cpp
ui/qt/extcap_argument_multiselect.h
ui/qt/extcap_options_dialog.cpp
ui/qt/extcap_options_dialog.h
ui/qt/file_set_dialog.cpp
ui/qt/file_set_dialog.h
ui/qt/filter_action.cpp
ui/qt/filter_action.h
ui/qt/filter_dialog.cpp
ui/qt/filter_dialog.h
ui/qt/filter_expression_frame.cpp
ui/qt/filter_expression_frame.h
ui/qt/firewall_rules_dialog.cpp
ui/qt/firewall_rules_dialog.h
ui/qt/follow_stream_dialog.cpp
ui/qt/follow_stream_dialog.h
ui/qt/font_color_preferences_frame.cpp
ui/qt/font_color_preferences_frame.h
ui/qt/funnel_statistics.cpp
ui/qt/funnel_statistics.h
ui/qt/funnel_string_dialog.cpp
ui/qt/funnel_string_dialog.h
ui/qt/funnel_text_dialog.cpp
ui/qt/funnel_text_dialog.h
ui/qt/geometry_state_dialog.cpp
ui/qt/geometry_state_dialog.h
ui/qt/gpl-template.txt
ui/qt/gsm_map_summary_dialog.cpp
ui/qt/gsm_map_summary_dialog.h
ui/qt/iax2_analysis_dialog.cpp
ui/qt/iax2_analysis_dialog.h
ui/qt/import_text_dialog.cpp
ui/qt/import_text_dialog.h
ui/qt/interface_frame.cpp
ui/qt/interface_frame.h
ui/qt/interface_toolbar.cpp
ui/qt/interface_toolbar.h
ui/qt/interface_toolbar_reader.cpp
ui/qt/interface_toolbar_reader.h
ui/qt/io_graph_dialog.cpp
ui/qt/io_graph_dialog.h
ui/qt/layout_preferences_frame.cpp
ui/qt/layout_preferences_frame.h
ui/qt/lbm_lbtrm_transport_dialog.cpp
ui/qt/lbm_lbtrm_transport_dialog.h
ui/qt/lbm_lbtru_transport_dialog.cpp
ui/qt/lbm_lbtru_transport_dialog.h
ui/qt/lbm_stream_dialog.cpp
ui/qt/lbm_stream_dialog.h
ui/qt/lte_mac_statistics_dialog.cpp
ui/qt/lte_mac_statistics_dialog.h
ui/qt/lte_rlc_graph_dialog.cpp
ui/qt/lte_rlc_graph_dialog.h
ui/qt/lte_rlc_statistics_dialog.cpp
ui/qt/lte_rlc_statistics_dialog.h
ui/qt/main_status_bar.cpp
ui/qt/main_status_bar.h
ui/qt/main_welcome.cpp
ui/qt/main_welcome.h
ui/qt/main_window.cpp
ui/qt/main_window.h
ui/qt/main_window_preferences_frame.cpp
ui/qt/main_window_preferences_frame.h
ui/qt/main_window_slots.cpp
ui/qt/manage_interfaces_dialog.cpp
ui/qt/manage_interfaces_dialog.h
ui/qt/manager/preference_manager.cpp
ui/qt/manager/preference_manager.h
ui/qt/manager/wireshark_preference.cpp
ui/qt/manager/wireshark_preference.h
ui/qt/models/astringlist_list_model.cpp
ui/qt/models/astringlist_list_model.h
ui/qt/models/cache_proxy_model.cpp
ui/qt/models/cache_proxy_model.h
ui/qt/models/decode_as_delegate.cpp
ui/qt/models/decode_as_delegate.h
ui/qt/models/decode_as_model.cpp
ui/qt/models/decode_as_model.h
ui/qt/models/dissector_tables_model.cpp
ui/qt/models/dissector_tables_model.h
ui/qt/models/enabled_protocols_model.cpp
ui/qt/models/enabled_protocols_model.h
ui/qt/models/expert_info_model.cpp
ui/qt/models/expert_info_model.h
ui/qt/models/expert_info_proxy_model.cpp
ui/qt/models/expert_info_proxy_model.h
ui/qt/models/export_objects_model.cpp
ui/qt/models/export_objects_model.h
ui/qt/models/fileset_entry_model.cpp
ui/qt/models/fileset_entry_model.h
ui/qt/models/info_proxy_model.cpp
ui/qt/models/info_proxy_model.h
ui/qt/models/interface_sort_filter_model.cpp
ui/qt/models/interface_sort_filter_model.h
ui/qt/models/interface_tree_cache_model.cpp
ui/qt/models/interface_tree_cache_model.h
ui/qt/models/interface_tree_model.cpp
ui/qt/models/interface_tree_model.h
ui/qt/models/numeric_value_chooser_delegate.cpp
ui/qt/models/numeric_value_chooser_delegate.h
ui/qt/models/packet_list_model.cpp
ui/qt/models/packet_list_model.h
ui/qt/models/packet_list_record.cpp
ui/qt/models/packet_list_record.h
ui/qt/models/path_chooser_delegate.cpp
ui/qt/models/path_chooser_delegate.h
ui/qt/models/percent_bar_delegate.cpp
ui/qt/models/percent_bar_delegate.h
ui/qt/models/pref_delegate.cpp
ui/qt/models/pref_delegate.h
ui/qt/models/pref_models.cpp
ui/qt/models/pref_models.h
ui/qt/models/proto_tree_model.cpp
ui/qt/models/proto_tree_model.h
ui/qt/models/related_packet_delegate.cpp
ui/qt/models/related_packet_delegate.h
ui/qt/models/sparkline_delegate.cpp
ui/qt/models/sparkline_delegate.h
ui/qt/models/supported_protocols_model.cpp
ui/qt/models/supported_protocols_model.h
ui/qt/models/timeline_delegate.cpp
ui/qt/models/timeline_delegate.h
ui/qt/models/tree_model_helpers.h
ui/qt/models/uat_delegate.cpp
ui/qt/models/uat_delegate.h
ui/qt/models/uat_model.cpp
ui/qt/models/uat_model.h
ui/qt/models/url_link_delegate.cpp
ui/qt/models/url_link_delegate.h
ui/qt/models/voip_calls_info_model.cpp
ui/qt/models/voip_calls_info_model.h
ui/qt/module_preferences_scroll_area.cpp
ui/qt/module_preferences_scroll_area.h
ui/qt/mtp3_summary_dialog.cpp
ui/qt/mtp3_summary_dialog.h
ui/qt/multicast_statistics_dialog.cpp
ui/qt/multicast_statistics_dialog.h
ui/qt/packet_comment_dialog.cpp
ui/qt/packet_comment_dialog.h
ui/qt/packet_dialog.cpp
ui/qt/packet_dialog.h
ui/qt/packet_format_group_box.cpp
ui/qt/packet_format_group_box.h
ui/qt/packet_list.cpp
ui/qt/packet_list.h
ui/qt/packet_range_group_box.cpp
ui/qt/packet_range_group_box.h
ui/qt/preference_editor_frame.cpp
ui/qt/preference_editor_frame.h
ui/qt/preferences_dialog.cpp
ui/qt/preferences_dialog.h
ui/qt/print_dialog.cpp
ui/qt/print_dialog.h
ui/qt/profile_dialog.cpp
ui/qt/profile_dialog.h
ui/qt/progress_frame.cpp
ui/qt/progress_frame.h
ui/qt/proto_tree.cpp
ui/qt/proto_tree.h
ui/qt/protocol_hierarchy_dialog.cpp
ui/qt/protocol_hierarchy_dialog.h
ui/qt/protocol_preferences_menu.cpp
ui/qt/protocol_preferences_menu.h
ui/qt/recent_file_status.cpp
ui/qt/recent_file_status.h
ui/qt/remote_capture_dialog.cpp
ui/qt/remote_capture_dialog.h
ui/qt/remote_settings_dialog.cpp
ui/qt/remote_settings_dialog.h
ui/qt/resolved_addresses_dialog.cpp
ui/qt/resolved_addresses_dialog.h
ui/qt/response_time_delay_dialog.cpp
ui/qt/response_time_delay_dialog.h
ui/qt/rpc_service_response_time_dialog.cpp
ui/qt/rpc_service_response_time_dialog.h
ui/qt/rtp_analysis_dialog.cpp
ui/qt/rtp_analysis_dialog.h
ui/qt/rtp_audio_stream.cpp
ui/qt/rtp_audio_stream.h
ui/qt/rtp_player_dialog.cpp
ui/qt/rtp_player_dialog.h
ui/qt/rtp_stream_dialog.cpp
ui/qt/rtp_stream_dialog.h
ui/qt/scsi_service_response_time_dialog.cpp
ui/qt/scsi_service_response_time_dialog.h
ui/qt/sctp_all_assocs_dialog.cpp
ui/qt/sctp_all_assocs_dialog.h
ui/qt/sctp_assoc_analyse_dialog.cpp
ui/qt/sctp_assoc_analyse_dialog.h
ui/qt/sctp_chunk_statistics_dialog.cpp
ui/qt/sctp_chunk_statistics_dialog.h
ui/qt/sctp_graph_arwnd_dialog.cpp
ui/qt/sctp_graph_arwnd_dialog.h
ui/qt/sctp_graph_byte_dialog.cpp
ui/qt/sctp_graph_byte_dialog.h
ui/qt/sctp_graph_dialog.cpp
ui/qt/sctp_graph_dialog.h
ui/qt/search_frame.cpp
ui/qt/search_frame.h
ui/qt/sequence_diagram.cpp
ui/qt/sequence_diagram.h
ui/qt/sequence_dialog.cpp
ui/qt/sequence_dialog.h
ui/qt/service_response_time_dialog.cpp
ui/qt/service_response_time_dialog.h
ui/qt/show_packet_bytes_dialog.cpp
ui/qt/show_packet_bytes_dialog.h
ui/qt/simple_dialog.cpp
ui/qt/simple_dialog.h
ui/qt/simple_statistics_dialog.cpp
ui/qt/simple_statistics_dialog.h
ui/qt/splash_overlay.cpp
ui/qt/splash_overlay.h
ui/qt/stats_tree_dialog.cpp
ui/qt/stats_tree_dialog.h
ui/qt/supported_protocols_dialog.cpp
ui/qt/supported_protocols_dialog.h
ui/qt/tabnav_tree_widget.cpp
ui/qt/tabnav_tree_widget.h
ui/qt/tap_parameter_dialog.cpp
ui/qt/tap_parameter_dialog.h
ui/qt/tcp_stream_dialog.cpp
ui/qt/tcp_stream_dialog.h
ui/qt/time_shift_dialog.cpp
ui/qt/time_shift_dialog.h
ui/qt/traffic_table_dialog.cpp
ui/qt/traffic_table_dialog.h
ui/qt/uat_dialog.cpp
ui/qt/uat_dialog.h
ui/qt/uat_frame.cpp
ui/qt/uat_frame.h
ui/qt/utils/color_utils.cpp
ui/qt/utils/color_utils.h
ui/qt/utils/data_printer.cpp
ui/qt/utils/data_printer.h
ui/qt/utils/field_information.cpp
ui/qt/utils/field_information.h
ui/qt/utils/frame_information.cpp
ui/qt/utils/frame_information.h
ui/qt/utils/idata_printable.h
ui/qt/utils/proto_node.cpp
ui/qt/utils/proto_node.h
ui/qt/utils/qt_ui_utils.cpp
ui/qt/utils/qt_ui_utils.h
ui/qt/utils/stock_icon.cpp
ui/qt/utils/stock_icon.h
ui/qt/utils/tango_colors.h
ui/qt/utils/variant_pointer.h
ui/qt/utils/wireshark_mime_data.cpp
ui/qt/utils/wireshark_mime_data.h
ui/qt/voip_calls_dialog.cpp
ui/qt/voip_calls_dialog.h
ui/qt/widgets/additional_toolbar.cpp
ui/qt/widgets/additional_toolbar.h
ui/qt/widgets/apply_line_edit.cpp
ui/qt/widgets/apply_line_edit.h
ui/qt/widgets/byte_view_text.cpp
ui/qt/widgets/byte_view_text.h
ui/qt/widgets/capture_filter_combo.cpp
ui/qt/widgets/capture_filter_combo.h
ui/qt/widgets/capture_filter_edit.cpp
ui/qt/widgets/capture_filter_edit.h
ui/qt/widgets/clickable_label.cpp
ui/qt/widgets/clickable_label.h
ui/qt/widgets/display_filter_combo.cpp
ui/qt/widgets/display_filter_combo.h
ui/qt/widgets/display_filter_edit.cpp
ui/qt/widgets/display_filter_edit.h
ui/qt/widgets/dissector_tables_view.cpp
ui/qt/widgets/dissector_tables_view.h
ui/qt/widgets/drag_drop_toolbar.cpp
ui/qt/widgets/drag_drop_toolbar.h
ui/qt/widgets/drag_label.cpp
ui/qt/widgets/drag_label.h
ui/qt/widgets/editor_color_dialog.cpp
ui/qt/widgets/editor_color_dialog.h
ui/qt/widgets/editor_file_dialog.cpp
ui/qt/widgets/editor_file_dialog.h
ui/qt/widgets/elided_label.cpp
ui/qt/widgets/elided_label.h
ui/qt/widgets/expert_info_view.cpp
ui/qt/widgets/expert_info_view.h
ui/qt/widgets/export_objects_view.cpp
ui/qt/widgets/export_objects_view.h
ui/qt/widgets/field_filter_edit.cpp
ui/qt/widgets/field_filter_edit.h
ui/qt/widgets/find_line_edit.cpp
ui/qt/widgets/find_line_edit.h
ui/qt/widgets/follow_stream_text.cpp
ui/qt/widgets/follow_stream_text.h
ui/qt/widgets/interface_toolbar_lineedit.cpp
ui/qt/widgets/interface_toolbar_lineedit.h
ui/qt/widgets/label_stack.cpp
ui/qt/widgets/label_stack.h
ui/qt/widgets/overlay_scroll_bar.cpp
ui/qt/widgets/overlay_scroll_bar.h
ui/qt/widgets/pref_module_view.cpp
ui/qt/widgets/pref_module_view.h
ui/qt/widgets/range_syntax_lineedit.cpp
ui/qt/widgets/range_syntax_lineedit.h
ui/qt/widgets/stock_icon_tool_button.cpp
ui/qt/widgets/stock_icon_tool_button.h
ui/qt/widgets/syntax_line_edit.cpp
ui/qt/widgets/syntax_line_edit.h
ui/qt/widgets/tabnav_tree_view.cpp
ui/qt/widgets/tabnav_tree_view.h
ui/qt/wireless_frame.cpp
ui/qt/wireless_frame.h
ui/qt/wireless_timeline.cpp
ui/qt/wireless_timeline.h
ui/qt/wireshark_application.cpp
ui/qt/wireshark_application.h
ui/qt/wireshark_dialog.cpp
ui/qt/wireshark_dialog.h
ui/qt/wlan_statistics_dialog.cpp
ui/qt/wlan_statistics_dialog.h
ui/recent.c
ui/recent.h
ui/recent_utils.h
ui/rtp_media.c
ui/rtp_media.h
ui/rtp_stream.c
ui/rtp_stream.h
ui/service_response_time.c
ui/service_response_time.h
ui/simple_dialog.h
ui/software_update.c
ui/software_update.h
ui/ssl_key_export.c
ui/ssl_key_export.h
ui/summary.c
ui/summary.h
ui/tap-iax2-analysis.c
ui/tap-iax2-analysis.h
ui/tap-rlc-graph.c
ui/tap-rlc-graph.h
ui/tap-rtp-analysis.h
ui/tap-rtp-common.c
ui/tap-rtp-common.h
ui/tap-sctp-analysis.c
ui/tap-sctp-analysis.h
ui/tap-tcp-stream.c
ui/tap-tcp-stream.h
ui/tap_export_pdu.c
ui/tap_export_pdu.h
ui/taps.h
ui/text_import.c
ui/text_import.h
ui/text_import_scanner.h
ui/time_shift.c
ui/time_shift.h
ui/traffic_table_ui.c
ui/traffic_table_ui.h
ui/util.c
ui/util.h
ui/voip_calls.c
ui/voip_calls.h
ui/win32/console_win32.c
ui/win32/console_win32.h
ui/win32/file_dlg_win32.c
ui/win32/file_dlg_win32.h
ui/win32/print_win32.c
ui/win32/print_win32.h
ui/ws_ui_util.h
version_info.c
version_info.h
wireshark-qt.cpp
wiretap/5views.c
wiretap/5views.h
wiretap/aethra.c
wiretap/aethra.h
wiretap/ascend-int.h
wiretap/ascend.y
wiretap/ascend_scanner.l
wiretap/ascendtext.c
wiretap/ascendtext.h
wiretap/atm.c
wiretap/atm.h
wiretap/ber.c
wiretap/ber.h
wiretap/btsnoop.c
wiretap/btsnoop.h
wiretap/camins.c
wiretap/camins.h
wiretap/capsa.c
wiretap/capsa.h
wiretap/catapult_dct2000.c
wiretap/catapult_dct2000.h
wiretap/commview.c
wiretap/commview.h
wiretap/cosine.c
wiretap/cosine.h
wiretap/csids.c
wiretap/csids.h
wiretap/daintree-sna.c
wiretap/daintree-sna.h
wiretap/dbs-etherwatch.c
wiretap/dbs-etherwatch.h
wiretap/dct3trace.c
wiretap/dct3trace.h
wiretap/eyesdn.c
wiretap/eyesdn.h
wiretap/file_access.c
wiretap/file_wrappers.c
wiretap/file_wrappers.h
wiretap/hcidump.c
wiretap/hcidump.h
wiretap/i4btrace.c
wiretap/i4btrace.h
wiretap/ipfix.c
wiretap/ipfix.h
wiretap/iptrace.c
wiretap/iptrace.h
wiretap/iseries.c
wiretap/iseries.h
wiretap/json.c
wiretap/json.h
wiretap/k12.c
wiretap/k12.h
wiretap/k12text.l
wiretap/lanalyzer.c
wiretap/lanalyzer.h
wiretap/libpcap.c
wiretap/libpcap.h
wiretap/logcat.c
wiretap/logcat.h
wiretap/logcat_text.c
wiretap/logcat_text.h
wiretap/merge.c
wiretap/merge.h
wiretap/mime_file.c
wiretap/mime_file.h
wiretap/mp2t.c
wiretap/mp2t.h
wiretap/mpeg.c
wiretap/mpeg.h
wiretap/mplog.c
wiretap/mplog.h
wiretap/netmon.c
wiretap/netmon.h
wiretap/netscaler.c
wiretap/netscaler.h
wiretap/netscreen.c
wiretap/netscreen.h
wiretap/nettl.c
wiretap/nettl.h
wiretap/nettrace_3gpp_32_423.c
wiretap/nettrace_3gpp_32_423.h
wiretap/netxray.c
wiretap/netxray.h
wiretap/ngsniffer.c
wiretap/ngsniffer.h
wiretap/packetlogger.c
wiretap/packetlogger.h
wiretap/pcap-common.c
wiretap/pcap-common.h
wiretap/pcap-encap.h
wiretap/pcapng.c
wiretap/pcapng.h
wiretap/pcapng_module.h
wiretap/peekclassic.c
wiretap/peekclassic.h
wiretap/peektagged.c
wiretap/peektagged.h
wiretap/pppdump.c
wiretap/pppdump.h
wiretap/radcom.c
wiretap/radcom.h
wiretap/snoop.c
wiretap/snoop.h
wiretap/stanag4607.c
wiretap/stanag4607.h
wiretap/tnef.c
wiretap/tnef.h
wiretap/toshiba.c
wiretap/toshiba.h
wiretap/visual.c
wiretap/visual.h
wiretap/vms.c
wiretap/vms.h
wiretap/vwr.c
wiretap/vwr.h
wiretap/wtap-int.h
wiretap/wtap.c
wiretap/wtap.h
wiretap/wtap_opttypes.c
wiretap/wtap_opttypes.h
ws_attributes.h
ws_compiler_tests.h
ws_diag_control.h
ws_symbol_export.h
wsutil/adler32.c
wsutil/adler32.h
wsutil/base32.c
wsutil/base32.h
wsutil/base64.c
wsutil/base64.h
wsutil/bits_count_ones.h
wsutil/bits_ctz.h
wsutil/bitswap.c
wsutil/bitswap.h
wsutil/buffer.c
wsutil/buffer.h
wsutil/cfutils.c
wsutil/cfutils.h
wsutil/clopts_common.c
wsutil/clopts_common.h
wsutil/cmdarg_err.c
wsutil/cmdarg_err.h
wsutil/color.h
wsutil/copyright_info.c
wsutil/copyright_info.h
wsutil/cpu_info.c
wsutil/cpu_info.h
wsutil/crash_info.c
wsutil/crash_info.h
wsutil/crc10.c
wsutil/crc10.h
wsutil/crc11.c
wsutil/crc11.h
wsutil/crc16-plain.c
wsutil/crc16-plain.h
wsutil/crc16.c
wsutil/crc16.h
wsutil/crc32.c
wsutil/crc32.h
wsutil/crc6.c
wsutil/crc6.h
wsutil/crc7.c
wsutil/crc7.h
wsutil/crc8.c
wsutil/crc8.h
wsutil/eax.c
wsutil/eax.h
wsutil/file_util.c
wsutil/file_util.h
wsutil/filesystem.c
wsutil/filesystem.h
wsutil/frequency-utils.c
wsutil/frequency-utils.h
wsutil/g711.h
wsutil/glib-compat.c
wsutil/glib-compat.h
wsutil/inet_addr.c
wsutil/inet_addr.h
wsutil/inet_ipv4.h
wsutil/inet_ipv6.h
wsutil/interface.c
wsutil/interface.h
wsutil/mpeg-audio.c
wsutil/mpeg-audio.h
wsutil/nstime.c
wsutil/nstime.h
wsutil/os_version_info.c
wsutil/os_version_info.h
wsutil/pint.h
wsutil/plugins.c
wsutil/plugins.h
wsutil/popcount.c
wsutil/popcount.h
wsutil/privileges.c
wsutil/privileges.h
wsutil/processes.h
wsutil/report_message.c
wsutil/report_message.h
wsutil/rsa.c
wsutil/rsa.h
wsutil/sign_ext.h
wsutil/socket.h
wsutil/str_util.c
wsutil/str_util.h
wsutil/strptime.h
wsutil/strtoi.c
wsutil/strtoi.h
wsutil/tempfile.c
wsutil/tempfile.h
wsutil/time_util.c
wsutil/time_util.h
wsutil/type_util.c
wsutil/type_util.h
wsutil/unicode-utils.c
wsutil/unicode-utils.h
wsutil/utf8_entities.h
wsutil/win32-utils.c
wsutil/win32-utils.h
wsutil/ws_cpuid.h
wsutil/ws_mempbrk.c
wsutil/ws_mempbrk.h
wsutil/ws_mempbrk_int.h
wsutil/ws_pipe.c
wsutil/ws_pipe.h
wsutil/ws_printf.h
wsutil/wsgcrypt.c
wsutil/wsgcrypt.h
wsutil/wsjsmn.c
wsutil/wsjsmn.h
wsutil/wspcap.h
wsutil/xtea.c
wsutil/xtea.h

index ffcaacebee1bcaf32af7022ff4671841d160bfb3..0236d468beeb4c8ad3f6021cc09f21175929b36d 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 3a915ffe5420a664ffe683f5ccb264ed74dc02e9..bdf1af362d8c82925c71b66e98e9508dd1cf5ccf 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CAPCHILD_CAPTURE_SESSION_H__
 #define __CAPCHILD_CAPTURE_SESSION_H__
index ef5040d67fd041c285a8c958814461ca7e284e3f..a0c194ad6b60d8cfbbeb96dcdacb0cd03c4c8639 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index d51e531eb918f5a728bb8d26b76db313ed4e0832..6f419cc9dc22dbe3dc26c541b5b8517617e2867a 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 
 /** @file
index c3b0a7e50123d22e1cf30c2279587f8fa51499fd..58a7514ca9115dbe596cf27d75b4680c61e28f18 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index d0fed6b778ea1b10c795db2b84a8bb5ff100f304..f73b58bbef8c6b7ffb59549d183b66d3c1ba8ead 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index c01d1f8a7a387cd8e85c5253f07e457e6fd1287f..9f2bb4978d33ab49728e83acd8a0546623806c91 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index a30485a3cf4859021b3614f623fc4441a8f92c23..5d6e84d64184cff84c3f69275939f7504bdeeb70 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 17c049c00a447798eb46bd4bd1f1483586ed0828..715a3bee90cf34855d1d8b1eb0907fd009a5c1a8 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index 4765fb8d5b0bfe928a2790f638c3348ace9a0892..d1823fa174e401fe8a5dffb9d4e7e659feec7269 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 2fe3bc6e48a113e2096d6a54ebf3c5b16b633245..274b4f8a8425c1cc1cbcf2bb2c23567760b559f1 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 void init_capture_stop_conditions(void);
index c5e5a933341f1dd37b0d4168d209448acc7f54cb..b47a66ef2a9191f75722a70a5d0d51ff0ec350f8 100644 (file)
--- a/captype.c
+++ b/captype.c
@@ -8,7 +8,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 916ef608632d9358a4f428197f9d5b7e2016b0de..e29996a22202c405a121913cdad710c9ae1c2521 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2000 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index f47965c32fb86e29ba826fd0928fbbd6d027d351..23199366fad687051989781d7f47ed4e907f6867 100644 (file)
@@ -8,7 +8,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __AIRPCAP_LOADER_H__
 #define __AIRPCAP_LOADER_H__
index 2993843c132a20ee95ff8283c9bcf01d1987707b..7d892c5c53d4a4d000a0d75d42683e3253ddcfd3 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __PCAP_UTIL_INT_H__
 #define __PCAP_UTIL_INT_H__
index a84670746cd8cdde979e91800d23e663aa016aa7..f2e494af7189cdc97014a0b0dfa86d235aa645c5 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 393a8c3e6e3338a422d68cf88b2b85007b8bd757..faed73d0fe25c1e56c16714f514a1dc86e74b4d1 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 2583f9890a2ab3d5c78c144c51ca66ce46387b13..5e5c6568d884ea5c4abe12901859aa4d3dc47e6e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CAPTURE_PCAP_UTIL_H__
 #define __CAPTURE_PCAP_UTIL_H__
index 321d645744f818c1a200f7318254030b38eac886..2dc75f6ba22b60e0041d81ce385c801cafbe3674 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index ccb6bad820863051a31461aee6db722dd1212d5c..e0bbc44623588399a4d9ed68cbc3358bd5138120 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef CAPTURE_WPCAP_H
 #define CAPTURE_WPCAP_H
index 0318e5907459b55290997e1f02e8e8ae6c0218b5..8e42b647610cd1dc212b09fe6184c6332ccdd13d 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CAPTURE_IFINFO_H__
 #define __CAPTURE_IFINFO_H__
index 79d6f2915360189380aa7d8c2d3416078156b78f..8814258e0a9c26004c478424c565cb3ae2a893dd 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef CAPTURE_WIN_IFNAMES_H
 #define CAPTURE_WIN_IFNAMES_H
index d1d4411e9b981089dd000770530a7f0c93446e1c..9db48e6b0ce0cfe3c9bf812140a6dd2a973a5547 100644 (file)
@@ -8,7 +8,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 2001 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 1079d362bcf19fc4ac5b551b4478f6669de755ec..e4864132431a1b37511eb56311f044b750db0c18 100644 (file)
@@ -5,7 +5,7 @@
  * Copyright 2001 Gerald Combs
  *
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef CAPTURE_WPCAP_PACKET_H
 #define CAPTURE_WPCAP_PACKET_H
index 830007b199e1a14e31d41e9fb8d018086b93f838..672967e08c648e8d2da46a6887edcd430f7cf1c7 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include <config.h>
 
index c303a623e8ea6573d9c256e8d4f093f9410e37c9..11e80a9205c5a39fa23579a5792e141068e9a13f 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 #ifndef IFACE_MONITOR_H
 #define IFACE_MONITOR_H
 
index a1e394fc91384c7e728fec33946825c3fb90f67e..a8b28ccf365340e2c1594e9d475b9e243caab981 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __WS80211_UTILS_H__
 #define __WS80211_UTILS_H__
diff --git a/cfile.c b/cfile.c
index 3e257c933fe33f89484b0a0207f4395bc21b7cc8..6de3b3d30cd305846e3a8ebe1ee3a396fe77064b 100644 (file)
--- a/cfile.c
+++ b/cfile.c
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
diff --git a/cfile.h b/cfile.h
index d1c4e379a75b79d9d68d1dc495636fe4087a532b..bc6f2bbddb58a99c7ba893f879ce1ff32ea5e7c1 100644 (file)
--- a/cfile.h
+++ b/cfile.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __CFILE_H__
index 1fd122b8201d7d8f318ac701e28fef5c8c07d3f2..2c4d9727cfbf38a963a125b856a902a3b974a3e6 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 2d229a6d7142cfbbec9f0d3d2c4e074fb457214e..688d85d50d3b6d7ff9787ae05ca20b25c295ed2b 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CODECS_G711ADECODE_H__
 #define __CODECS_G711ADECODE_H__
index ce74f199376da6989294bc0b5aa26a700d81c0e6..d4235ded748a45bc0014bdf6e63bef7aa2eb4274 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 gint16 alaw_exp_table[256] = {
       -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
index 4344d6399d28e12b8e52129817cdbe0c824c66c8..d235a3bc10c744a3c19411f62cd327e824611c31 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 988cfa83db40401badfa78980faa9a9970bcb53f..dedf2bf45101c9c4939e5b7ed8540c506a46cf00 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CODECS_G711UDECODE_H__
 #define __CODECS_G711UDECODE_H__
index ceb9df9ca987576ad1f0ebd1c53eb02d8649ee98..548dc3e573654147dedb8cd989621197b1f63dbf 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 gint16 ulaw_exp_table[256] = {
    -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
index b9baa2a3ef5bb1cbc329c0e8df49f1fa5325f283..08c6473f2f2c3263ee46f7b32d85cfe222a140a9 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index c38e5f197a807c0c3af4febb0c75f9ce15ab7e40..1bf603b8ae6ea5fb2734d73f0f3f82a18fc5d0cd 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CODECS_G722DECODE_H__
 #define __CODECS_G722DECODE_H__
index 3edfa09237ab453059b32a739eeeeddcef5a3439..1ed00667595f51974a49d6a03261372cf77548ab 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index b9bbce346bd0089bc9d598ec1df5edd5492dbc2b..4ae50d2c672b34d324d21c11389c322b34e9eb48 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CODECS_G726DECODE_H__
 #define __CODECS_G726DECODE_H__
index b73e783692b45c10261d98005c04e231c8f8c72c..082a0704c6f5525242c43907caf5fdec5538c526 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 36110329f3297dcb25bf83b174121cce495f07bd..d8a0870ca9b73a4c6e1e6f1fe9f16a8bcfe3a7c6 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CODECS_G729DECODE_H__
 #define __CODECS_G729DECODE_H__
index 5188bfd3c9f9502444a50edcdb9f194190bcfa1c..4e5f542116eb053c648cbc09570ec88fe7b588da 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 94dc474fb14edbbe44b37ec93b17ddedb9702341..7d2715418c10ee784d4eaca59fdd82a0088f6c68 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef _CODECS_H_
 #define _CODECS_H_
index 809b0300b6d156814509ef6081e5b6ad2cdd612c..beb614b329fe6e69eb83cd9dae22381296911e48 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 1a2335729362cc5960337f7a511525d00227bc93..259a4f2acb904c3606cdb52f3fbac79f0b768147 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CODECS_SBC_H__
 #define __CODECS_SBC_H__
index a5bf3cdc01908143a27e86a0923fffd7dbae0893..35a24bc6fb3caf08e22c9f3fc7f6fccd93a3041e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index f19626745721c443dd5df5031f5a9d5d51300178..a0202b5184ef236ac1ad3c02899230c188a3b9b7 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef CONDITIONS_H
index 4de107b04cff3396e47b2e15fefcf0b08b3cdc33..24e6002c1462ec271bace2934c39a2d1590e7269 100644 (file)
--- a/dftest.c
+++ b/dftest.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 333e356e2a91fe5664cd4993cd53c2cd13b1627b..c0cf6c11fc53764a5f1e760d2997fadd2a927f0a 100644 (file)
@@ -4,7 +4,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 add_custom_command(
index fe517fe4cf05007f06ec69439310e04f013d44c4..5bcacb26c081dc17f05a3be81d982872dfd807b7 100644 (file)
@@ -5,7 +5,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 # We include dependencies on ../config.h in order to
index 811dd754ed9600661a8c8e326ef0baeb95c03cf8..24d44799458a4b49f72bbeb92f822562b29d27c5 100644 (file)
@@ -47,7 +47,7 @@ A small example of a very basic stats_tree plugin follows.
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index a2ee6fb3b9d20a6e67a4fe7aef857fe5889972b7..6d1d1d32bcdb410de9b4f1dc54d8c6e4562bf62b 100755 (executable)
@@ -6,7 +6,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 """
index 2c37dca54f7f47d2d6aa2fd7523d89b1d4d5ddb8..33d4a116a5f34afad5ccda4fe894da8acf90d07b 100755 (executable)
@@ -9,7 +9,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 use strict;
index 00e23c3132748ae3b1147e207c6fa964513f95f0..5500bfd244c706fb4205cb79383a464bca7d60db 100755 (executable)
@@ -9,7 +9,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 use strict;
index 8d564e473f3d2e07894444c3cf9b529407be78fe..69262e8acc65d6dae5fb4b0c6f8478a9bc57dde4 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index a562f964a507f392076f6b385564bb93070cd75e..8a6fea33956abe4cedc68e59549969725cae3224 100755 (executable)
@@ -9,7 +9,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 use strict;
index d33e1867572b9d7c3d9592ab54b634b9ab9c2039..10abf565e88cb3d27ed78fb208d6873c540aa949 100644 (file)
@@ -4,7 +4,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 WARNFLAGS = -Wall -Wextra
index 455b4741a6ce3fad9c418655b2405bcba93c7055..52c4a50ec6c154c4a13e7c7620369712a7380d15 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifdef HAVE_CONFIG_H
index 18f38b3b2ce43d427bf0654e57b14f1f5437881e..370c7077ad69d90b4fe3ebdf2e179e756e86a18f 100644 (file)
@@ -4,7 +4,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 find_package( LYNX )
index 0393a168839fcc7abd9fa2242d339e651ff9d6ce..fdfd550553039c170b0249c369d95dc6cff1706b 100755 (executable)
@@ -9,7 +9,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 # (-: I don't even think writing this in Lua  :-)
 # ...well I wished you had!
index eed5abba1b36f234d72fa3253b80d61f91c481f2..161219d46074a2bb5a2cfa7518e53fd05c2ce85a 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 37fd3baa55a455d6e72a2aa38d1f63cb90ea2847..a5645b5ee8e65e52d7d69a1b1fec73d92faac937 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -12,7 +12,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index ac30a8512cb2c8f5f1e4a45d8f42144ef478a954..88a26ee4148885137b4f7ffb7f89cc75b2896790 100644 (file)
@@ -9,7 +9,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index c2badb021ca8c2c02637e654d15ff15edbcaeb64..3495be91c34576e3e620dfac860be6b90b39b45e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef PACKET_LTE_RRC_H
index 10eea2cd5332814ccbc8da44692a0531a461d8aa..ef2bdbaf2e4c10550233c0e20c0061f1e0211d1a 100644 (file)
@@ -8,7 +8,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 518a57b62d2b42c40ff6d26e852a73a3534e176f..2d5b8196448be70803a8080b652cbc1cede7f928 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef PACKET_NR_RRC_H
index 0e3549cbfaa3d8633b29e4770c1f413afb9ae40b..822409d39a61d911d4f286daa183564006fd1152 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref 3GPP TS 29.168
  */
index 5cf9ed99710eefdad069c7d9eb4bce5064bfcb8d..5ff81d2005e0701d693450708ef6afa0c6cacb52 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __DISSECTOR_REGISTER_H__
index 514b1efef6216099b0b5db5daa26a22c53f22898..90d41bc55d4bc8cf720e7961fa59a493c6d1cef1 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdlib.h>
index 6b14187b09cf0398d85bcb952f6a35d026d3d366..146b736019a17ae7551c6df53ea33fe4e6b49a08 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Protocol information:
  * https://github.com/apache/activemq-artemis/blob/master/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java#L309-L326
index bc4ae68881d268ae89daf338bf5ec0267ea47b4f..11d153dde6c35e383af1f4287f6f3a408b11cf32 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __PACKET_BACNET_H__
index 3e6658e09131b699710cd61a89928e6a66dd4cb2..14583ee70e87c30f755ca21c9f4b43c087cec7dc 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref: Mesh Profile v1.0
  */
index 04157d7afaee619c6d3d5dc65b097ae835168a54..56add4f1dfa8acaf0b14aed46073ec88f76c7ede 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index 3954d1bb27dc86a3b617181c38f4dd7e88853d26..90cbdca796354107f7f3924c0433aefafae2fadc 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 67c3414af03c7ec3b239c8db2d58a44dc7def4ce..e55a4deae9841011e658f294d544a9ae5a10a859 100644 (file)
@@ -15,7 +15,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index 7aa4f0753315aed7c5c725e5264951644fc3086b..1fad311b6e004c83ee15ef6ece17c9ffc3ec4e62 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index f57d2a8131aac3c6c6a7e26346ccffb4d895318a..6093c7e11657d1299a0430304c8443bc1892fb47 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 #ifndef __PACKET_LNET_H__
 #define __PACKET_LNET_H__
index 0bd2f6c4755b32bd368aa5dd6b2c28e012aea335..71ad21350da78988a8930b21a6de7b4303e5664a 100644 (file)
@@ -17,7 +17,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 254ce07ea5c36d1395eff88fd8e14af01979e956..cccbc26114a3e433627f1a8041417ea7ae952b3c 100644 (file)
@@ -13,7 +13,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef PACKET_LTE_RRC_H
index 4aa999d9f4f658d656fcf262bce98393299b7dd5..60ae5e89e3fba5e53135f1c1ee222bb30f34c1f1 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index eaeb68b4314990b0778df78904b0456681531da4..980779a421fec1ede3a3cee0cbf09d1339aa6de5 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * References: 3GPP TS 24.301 V15.1.1 (2017-12)
  */
index 10c31f8e7148cdd9e8b5c37836b3f8a273fdb9cd..1fff4a5a756be8ac5541b4a15ed99f6fe9b24407 100644 (file)
@@ -16,7 +16,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 57d4204b141eed1ce32ccab74176b95d66ac9dd8..3f1de1435ab04c04de3a25519d24a4a63ecd6fae 100644 (file)
@@ -13,7 +13,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef PACKET_NR_RRC_H
index b21172e7d9d1fa20516e3d1695c2882ce5b13648..b9ed391bba2a192a74bd4c24c1412bdeebd07394 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index 8757d69a6e4013f62b417c0fd8cba79c02a0bab5..acea7f98637d996fd65a56946d7b7d1076e747be 100644 (file)
@@ -13,7 +13,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Ref 3GPP TS 29.168
  */
index bd9466ee3c544e5dc82a1b15448e88f443566c10..ab379a54fe97ed017a1b40347702d38bfb2cefce 100644 (file)
@@ -15,7 +15,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  */
 
index bf2ad34d023292ec8defd41291b9c3cafeaf53ce..63ae6fc8acb50c77c6c69aea303cd2707ce1e7f8 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index 6793a77b2227019ab34e26efdeb05981efb2ddd4..8ad5d48c9c4f9ef028a36778072107dc012421e2 100644 (file)
@@ -11,7 +11,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
  /* Ref https://thrift.apache.org/developers */
 
index ce965ee656be9b9c58e286f29469481b4fcd9cf9..3e4b208783dbb42566ebe3b23564423b8c1de817 100644 (file)
@@ -4,7 +4,7 @@
 * By Gerald Combs <gerald@wireshark.org>
 * Copyright 1998 Gerald Combs
 *
-* SPDX-License-Identifier: GPL-2.0+
+* SPDX-License-Identifier: GPL-2.0-or-later
 *
 * Note used by proprietarry dissectors (too).
 */
index 0806a231419606ed9c857009240157d2a2466ec1..3a1d79df33173fbc630f5df2eb1a3f6334a6fb38 100644 (file)
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 2001 by Gerald Combs <gerald@wireshark.org>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 1e7ae97708b7535789dab21d86e6de7efb52a37a..f98b09f884891f74dcfc2bd29a1a3112656ed68d 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index e96375e5095f7f09e12504595dae817878ccdbe7..6582d8987d68e8535a402ac3e549e41bb2f6577e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __PACKET_H__
index a2d323c12544459c640f600ffc64245c8adb64ad..1ccf5ac18513ef144ea536f0da479b363663051e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index a682ebcf85a194e288907ab860c7853aac30ccb7..5d068582779eb6c23671fc477220a37394a03d68 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 32adeaa29ad1c9fd83ed61d4e16dc0ac6d6da9e5..c9de6c402344263d11d21cd726bb3a1515e4e7ad 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __PRINT_STREAM_H__
index 71bc2ee1c54da60871e4da91d76b9b694edba690..7b69ac64c23b91099e0313dc5f690258ff0454d8 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 3f0306f56ba2a7904061c20947c28864c8a65ec6..8e54c8c76c1ee7b5bca2c8f3d6302106d6254b04 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "register.h"
index 17e8133b5e7d01d9807b5e12808e4345170b9a01..491badd4af0fef9b9af6660612f8f84582f4ef0f 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __REGISTER_H__
index 9369972486cc6ed3d05c877bb2fb5a4a2a4d537d..d3e8260a5c30ffa27fe12315a9b75e269ee8c6d4 100644 (file)
@@ -9,7 +9,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 9504379eaab739183b0ff11f4259091808f2ed01..8edb77702973a81c5223190183e5b27830a16142 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __INIT_WSLUA_H__
index 392e2b6689c982f7028ca0b252451103a1202f42..ac1de60ffc97e8925b6275a5fe615c6843356caf 100644 (file)
--- a/extcap.c
+++ b/extcap.c
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 49e23ffb706ebd830fc36404ea298fc093138217..d7728006e3d9f5c98ed446c8700664ccf1d926c4 100644 (file)
--- a/extcap.h
+++ b/extcap.h
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __EXTCAP_H__
index 7784e414cb169e737a28812fc8197fa13d2a002a..6a4d7f39c728d18743eac1ef74b79fb873b50cc8 100644 (file)
@@ -5,7 +5,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 include ../Makefile.am.inc
 
index 2969a33cf7c6b5d5f7373f0721e17e04317b4e29..ff163b1f837decc55ec85d075c30431c1a55cf9f 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 #include "config.h"
 
index 1c8f40f33ba4539788737eede5a0fabb74d13a83..83e54a9b4f799e5d00c6278c3bab128e19b74235 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index e2ba0015a1a50c8a22699cadab76d94660b708d3..6ec654c790740942af9229443fa50f7f961a2f10 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 5bb4f2621700e370ebcdb77ac9181d803c3eee8f..264281577cef26818630de8fca8cddea27c040c6 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 #ifndef __EXTCAP_BASE_H__
 #define __EXTCAP_BASE_H__
index b45ea75645a15c9680090f27ca910b61249bbd82..754ffc4bb9c516de8d49206b208e4a60cf2cef95 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 1799887d90c719af84d03d1256daf0554861577c..ac39134b208958d83f6974e4263f41f6858fa6d1 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 76790e87918123bf28a777945b2f9c7b32c7208d..8c81ac5c506b93a6564a3fc0bb19cab43887dc56 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __SSHBASE_H__
index 1872cce39272375c99756a32065a30b5dd1cf248..2217d6f3c772140d9ddab149376265ab800cfc48 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 44cc24e1dbf865ae247877e7c2ababa207f9e19f..5ea0addcc340c4d99506020ecf4959f8f6a77e33 100644 (file)
@@ -8,7 +8,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 561b2eaefdd9c0927a73a3fb708fed5d25673e4a..db326a9ef659a925049f69b672de80638815bf2c 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 512f4ba8b47b8e0cb7678f9e25345b6da129faed..924318144c95671e4db74d4f82a0762e266c2ff5 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __EXTCAP_PARSER_H__
index c5659181ad9f8087218def57bfbbff0c90bbf567..816e0e3a5f8c117cfd6c098081ce81ca60c2f203 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index fafce74268af54269fda52117c1a8dc4a5dd8201..0557a6f35290f6b0dcf3fb8df68e0c89cb3a7ecd 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __EXTCAP_SPAWN_H__
diff --git a/file.c b/file.c
index e154b71752176f3229e33caef64442d74f9540d4..ceb1a8b9718d1e76fdccb436f214a36244b1bb52 100644 (file)
--- a/file.c
+++ b/file.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
diff --git a/file.h b/file.h
index 198e20a23011578452077df81349bb9943a1ba97..4804f08c8403e38dcfd9e13ca2f286686922df35 100644 (file)
--- a/file.h
+++ b/file.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __FILE_H__
index c08d2168193e8b31f016b9638de7724b11c61afd..3a0531388a57337f3acc1d4f0ce23f8fb8851799 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <glib.h>
index 6e8ea0157535032543b36e4d12bcef2e7f51a13f..bf10ca56be23ef8d230c67965e58b0c4c0d4f538 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 776df31952bea0b0c4076f5be14302e35b4a0236..ca02e97b46efc21340946f76acc5909b22ace315 100644 (file)
--- a/fileset.h
+++ b/fileset.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __FILESET_H__
index e5309bd134ed1c79b5b19062032f0baeda0b34f0..513aefb8d3b58d868a8c510377c0fd07591d2967 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 5b8edb4dd4e546821946f44ba09ee922fbbff0ed..6122eccaa83ae80d5f8c52d63589527210723c25 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __FRAME_TVBUFF_H__
index 246c829c1ae2c7c002197430c8c6b6fad66209af..8e6d333f0e5c98195de1a44dd061c9ff610153c6 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __GLOBALS_H__
diff --git a/log.h b/log.h
index fd9f1b58e2ad40b55a1c4ce34b08d79c58da7c86..ba38897bb81afcceba03ca028c4cfe8397563ba3 100644 (file)
--- a/log.h
+++ b/log.h
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __LOG_H__
index 98a32b8b2d429a35ae36a04489a0e37ae0c4d4d4..73cb8439a53f0c8f4a01a008b78f7ddc2f015c95 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  * Mergecap written by Scott Renfro <scott@renfro.org> based on
  * editcap by Richard Sharpe and Guy Harris
index 809ceacaf2d026113d5ce60a6fe854cc71bdd5fd..b621e55e632a888ed0da88baf7b636419c979023 100644 (file)
@@ -9,7 +9,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 #requires -version 2
 
index 14ac941b08973bddb165e696e88cf7d7c1c17ebc..fb1b6d7770384a833a8841f7f1492f109b181de8 100644 (file)
@@ -5,7 +5,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 include $(top_srcdir)/plugins/Makefile.am.inc
index 5c7f5256ecf3583555b1c23deb6b824712baebd7..4d3f1452255575c9343ee79dceee6740ab01a7d6 100644 (file)
@@ -5,7 +5,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 include $(top_srcdir)/plugins/Makefile.am.inc
index eab1328465595da1ed1c2053a92029d235d08160..384ea2e170cdebaf03af9fa33ac4d8b463d365c0 100644 (file)
@@ -5,7 +5,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 include $(top_srcdir)/plugins/Makefile.am.inc
index 5093353ff3bdfec75cfd25e401682e44ece8b582..2c6b22af8e2881e75258ac1318de03567fc8ec7b 100644 (file)
@@ -4,7 +4,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 include(WiresharkPlugin)
index b090b19e27d804667c3dc94c89f5e8da8576ef6b..dd12ad96acadf8b3e1311e757f3687f1d48e9b1b 100644 (file)
@@ -4,7 +4,7 @@
 # By Gerald Combs <gerald@wireshark.org>
 # Copyright 1998 Gerald Combs
 #
-# SPDX-License-Identifier: GPL-2.0+
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
 
 include $(top_srcdir)/Makefile.am.inc
index b52c94be098df310702c40aec9f57744e41d968c..99b88a2f1a3a154960dd4b4b69a3265b05e335c9 100644 (file)
@@ -6,7 +6,7 @@
  * File format support for usbdump file format
  * Copyright (c) 2017 by Jaap Keuter <jaap.keuter@xs4all.nl>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index 7fe34c6e91e8ec82a3264de215dc698856a02cd9..fe3cc9d43f3a111d22d64c7a7872401d9ab7ba20 100644 (file)
--- a/randpkt.c
+++ b/randpkt.c
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 70769a4551a0fb8ad1c82feb9f9ae226a8fb8c05..7e73c7678b590bc0f4e113e4871e28aba8f417e5 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include <config.h>
 
index c977b669960e6c8c69e94c0c0c14bde958345891..dd1ff49860d2006c4936bed5eb12e46f14e9127a 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Copyright (C) 1999 by Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __RANDPKT_CORE_H__
 #define __RANDPKT_CORE_H__
index d8a1d1917cef79ec626677c67abd8af9d0e0e5b5..3b5fc64caae17cda9ec13b3d06309d52090ec835 100644 (file)
@@ -9,7 +9,7 @@
  * Based on TShark, by Gilbert Ramirez <gram@alumni.rice.edu> and Guy Harris
  * <guy@alum.mit.edu>.
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index 8570726cfc5f7e443f082fd2b0f84debe6a2e1a9..c4b9dfd02b0c673d966c80f3ca2feefafec9f11e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 4b215cfe175c1ccf25dc3d0e58b195213da4d4f3..31eb9bdd337cce390645517eba0fef8f82e65f80 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /*
index f1c99fa68c0870e04c09b897e16f7968b42262ff..b56fa056fa4377e5ec15ee9d4632dac17661e748 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __RINGBUFFER_H__
index 65971718620d4eb46a60e4e77942df56876fb384..a3219d3a35851ba0b2b0e2dacaec940b7728ce80 100644 (file)
--- a/sharkd.c
+++ b/sharkd.c
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 134917e5002fceae2a754071fca51e0ca1580e24..80cd8d9edfdda791053c99a96f20c0440208cadd 100644 (file)
--- a/sharkd.h
+++ b/sharkd.h
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __SHARKD_H
index 230534914fea57cb85ee6b88749948bc249c8361..4f98ef48cbfc3f27cb57a813bad9bd5c04c1ddf9 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 08b3e44696a52d4aaf833a489917d1605f4bc740..087f2f658901ff8f2575b4f59b8bdc7c8de08af0 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 05f9ff15e46d9d73c7e1e4ef1360d4d232eca3d1..04407389ae28b58e46d9cdb6353b97995a75fcea 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index 3a6155513d010463b62c0623c8c03b7c469d2d4e..ea1a7927d061c18742568cf7603fc11f1840ce3c 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index aae921aad02daa944c46b813d1546d6d081ac045..ffa3c0fc84cba9af8effbf0e5730a1ade60d332d 100644 (file)
@@ -10,7 +10,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  *******************************************************************************/
 
index 42d97a10b1dc5b1b8f9e1a98f3bc8b212d34228e..d9cd7f9d28cf6e407c1274e499374b70a1a50342 100644 (file)
@@ -10,7 +10,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index bb522b04b82c75e92d30bd84a2db01e76a72a4bd..fee411c0a2c41797a68e4fe10b7897ec06c91221 100644 (file)
--- a/tfshark.c
+++ b/tfshark.c
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index 5d0ceae0b665af032d59b021dde603257aa6987e..79caada80de8f9168914a658b17886c7f9b1bb31 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include <config.h>
 
index ef09a8fc0952117406c26a178fa7cc91f6b9538a..9086b5897ff961965baac2f451546708c8bcae57 100644 (file)
--- a/trigcap.c
+++ b/trigcap.c
@@ -4,7 +4,7 @@
  *
  * (c) 2007, Luis E. Garcia Ontanon <luis@ontanon.org>
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdio.h>
index bfccd59aa69f6ea69b36462735e9e9b46d27f406..c3d30776f2873b5a6d9b3331f0c25ce7a73b0eb1 100644 (file)
--- a/tshark.c
+++ b/tshark.c
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <config.h>
index b7aa64e354f52673ecd6a1def179964190ac422a..b3000e894476d7444d3cd1c569c22c1438a7fd12 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 6070208b3501c2254fe8dd629ad5bb6694868dca..afa99c08f8fd0f2893619b6a0cd6aca670551441 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __ALERT_BOX_H__
 #define __ALERT_BOX_H__
index 82aa6a0789ad168c7020cfd2e71bb839fcc6d816..dd18381637bab36a3858e0d56f5671a913984774 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __ALL_FILES_WILDCARD_H__
 #define __ALL_FILES_WILDCARD_H__
index cc4b09127e0ec56af4d9b4196125673a94439358..5b7c68cda18a60832ed99af690ffc348d6dd307f 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index 219767c40f702d468b89e4f61c6069412a73ec16..f30f76ef80ba6600f84337311ef1b76a540b4b79 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /* This file should only be included if libpcap is present */
index 38c1acdd75f0d955f8e332bd9b825861f7b1a559..2394427badf97e3e9d6e5ff76894c3d72820d62d 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CAPTURE_GLOBALS_H__
 #define __CAPTURE_GLOBALS_H__
index 84b1f7782ea43e4ff54b91a92fb29cb080be19cb..e6d4099fd4f0caccb42684d6f3cff947d61ae654 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
index dfedebd9c15e8b4d0e4e32842d0b744a65a0c06f..da5bc9a5d97e1ca37d5834961975c7f766f6b350 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #ifndef __CAPTURE_UI_UTILS_H__
index ba85055b65e6f6a2196aece84b5582a0722f2247..a8c9942e1bdda913aa9fcd636a84956d5c5e9b5e 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index f9f795765a7cfe6ed797eab2b5d45f9f59807202..6b205ad75dd3b2dbfdfdbe1a1379055ca6424b88 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides statistics about two merged capture files, to find packet loss,
  * time delay, ip header checksum errors and order check to tshark.
index 232fbe26ab4081506b24d827b11017f555cd5f1c..37d309216444bc51d765bc5548351fd8f3da2fb8 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /*
  * This TAP enables extraction of most important diameter fields in text format.
index f87ce95b434a5070f9d527787f6179b00c643adc..539668f1b01a063c24397525ad8547f04579c4ad 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 224f6d4dfc9e5db95ae738757850ba0fda5ceb21..b7eaf5e47995363dfca4f756cda28b2260a0d550 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index aae061c99628ba3d603b8ac860a547189a801a6e..b1f08e1abe8b4b0043d65d47e026afc443457eaa 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index ca4ca67de3053cc71bcf74f7ea2bdc70f92ca672..182fd1af18ad151d28429be6e5d0bb5c34d4fadf 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __TAP_EXPORT_OBJECT_H__
 #define __TAP_EXPORT_OBJECT_H__
index ba80b856a7c6f626f4f34b4aa7995f7ab6d5a5cc..55178fa61fa09368722cd21e395193def195c52c 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides udp and tcp follow stream capabilities to tshark.
  * It is only used by tshark and not wireshark.
index a96dd5f9de43d5289b6a8e719169d35d48d31949..a22d4590b5f248036b860f0e5c45a4227430cb59 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides udp and tcp follow stream capabilities to tshark.
  * It is only used by tshark and not wireshark.
index e30a9ff69ddc9b868e01288c1a12610901b25794..d769c82c4fb66895b8509e9497cccbef5dc0ff30 100644 (file)
@@ -9,7 +9,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index b934314a07f78cc27271cd8ecce9e185345b6587..a3d13ee75ec2475306d177f09d7f98d383b6ad6e 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /*
  * This TAP provides statistics for the GSM A Interface:
index 39b1017dfc6e46df0d3687c343a989c51a5af522..69b7ccb9f71efba41ca133d2f5761f5a63bc1157 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* Dump our collected IPv4- and IPv6-to-hostname mappings */
 
index af70d2416a059ebd231aba39a6385191646b0bb5..93cfbab64d2c392f8835884aa127645bf76671e1 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 840988f2f9b620d997f121c34b6fca26cc45ba21..c2d14336dfffb27227ccf5f10d6ed382224a56c6 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides icmp echo request/reply SRT statistics to tshark.
  * It is only used by tshark and not wireshark
index 0d067bbe7f404e007898af154092a272115ffeb5..88a462fbb3569b8b7929d1acd6c79c068add1b86 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides icmpv6 echo request/reply SRT statistics to tshark.
  * It is only used by tshark and not wireshark
index e0f0c54e698f88cfe868fa43605a617f3c7067d6..c4186aaa83cc80631ff4380045cc231cdc4cccc9 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 3ca7fa68b924a59361ec8704ab5a54aa8356b13b..fa2df3cf26fcb8684cd766cb4b628f6b046b7110 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 9738bef977e8110e199f5927023656a7abfe266c..de35425d2dd9fddbfcba9c7b7cf458a4bdb08275 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index d4c7b8b855540926e677b029a3fca83aacb305d0..9bed7fb656f15a5a8092324e655e94aa9bc0bf80 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides Protocol Column Info tap for tshark */
 
index cab2ce4f7adc2d2878543e7c2fa02af39344ccff..1defd98423e5ab902db5fe0082e6eda4a9a5b937 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides ProtocolHierarchyStatistics for tshark */
 
index d7fce85f9c55ac5cd73569070b5459ac41326810..02967dc4e02bdeba544fc342992cdc9d302e6fd4 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 
index 6650491075f12c0120c38cb4edb029fbb6a3b1b1..c0602839d10cdebf93deb5c585a7bef3a4166afd 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides rpc call/reply SRT statistics to tshark.
  * It is only used by tshark and not wireshark
index cbaef97fab90f0348508ad23b5ffa61e95630dd7..480b239f75ba2caf6827fbf6c050a59b806905cb 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index f8d598dc3076d0afb651e64ef25ac6b903cb630c..f6569d463b703f05c945092e30656388937d1e75 100644 (file)
@@ -12,7 +12,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /*
  * This TAP provides statistics for RTP streams
index 276cc6a1f49bab68bf00771bff4b9296bc7e117e..ec2de3edd5b20911bcd29dcad00cad64c44ffe54 100644 (file)
@@ -8,7 +8,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index b27da537556ed665d075176f098c53f3836586b2..b471301cca49e42cc68a4e7169999903824a2271 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index e28b5648a3d4ebbd59e483f4d6c43c1fd60d3ef2..4390d2e98e98e27e148c98b2307b662798646798 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index c2e106dd98321ef1e78fc8bad6afbe51f01ab791..090605b01a7356d8a7eba61850649fa4775f5a0f 100644 (file)
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index c428e9fc70fe064ac011e9d71233e1a5f1b78923..5874b3dee7ba9d4e2820acb5f2ef1ed27831110c 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 6fc1743a6d0b76645cd4a61a36451d9d021e0757..fd881015b6638b12f12a5038a7549da96b773d92 100644 (file)
@@ -4,7 +4,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 4107bbf55d70ddcf3c8e56d066fae2df4eb09e6e..8062a6ac8300787055e7314b0429b3dd7126e484 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 6ec6ee4f0ad685f48d7c88ec41260d764914b74f..6f5c4f00635a17f85e1d93c38a35b55b2e439921 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 
 #include "config.h"
index 55c4f123e027a886c9567891df8ae24cc4a66d2c..15e9afd4aa7213c4d8395341b9e6c4252fb110c9 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 /* This module provides WSP  statistics to tshark.
  * It is only used by tshark and not wireshark
index 56fe981bdac47e3d4556e126f63469038154016a..76bc9823ffe1e3e514004d8990e9826fff5b423d 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 #ifndef __TSHARK_TAP_H__
 #define __TSHARK_TAP_H__
 
index e29a64ebb21908d630408fec86eeaf73cf4d8264..2c249dad91c6964423020a00cd0daab1d55ad58d 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index ef2b204b37901bf69c2da2d23f0d35d30de7e83c..981aaadf6e13a6d434bc97aae6e6aef31e2ef45c 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __COMMANDLINE_H__
 #define __COMMANDLINE_H__
index 2a791288bc4bf6ece9f9eec30853b75ce108952b..d0b7f74e55ba6f54cc8b0bb61de896daefba300e 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include "config.h"
 
index 48c775c7c48cfe0e5e08afcdfa87e7fd98596082..18cf0288dafc4dc95579c94bbad245499b880828 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #ifndef __CONSOLE_H__
 #define __CONSOLE_H__
index e52bb67d874cca78b05f7d280eceaa0996c972cc..9634112bda0660e69ab97c4ee1a268ff17d50145 100644 (file)
@@ -5,7 +5,7 @@
  * By David Hampton <dhampton@mac.com>
  * Copyright 2001 David Hampton
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 #include "config.h"
 
 #include <stdlib.h>
index 9b2d9e8b67f501a89859f87571bb52c1e42e0a7b..1c121d4f841ecbe431ca4e4e4865ff73a2d05ab6 100644 (file)
@@ -5,7 +5,7 @@
  * By David Hampton <dhampton@mac.com>
  * Copyright 2001 David Hampton
  *
- * SPDX-License-Identifier: GPL-2.0+*
+ * SPDX-License-Identifier: GPL-2.0-or-later*
  */
 
 #ifndef __DECODE_AS_UTILS_H__
index 18ccf552f7f4f06291f754dc89a0105925ad9189..33f284b1e7cb9164cb5efe8359cf68dc5301b7be 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 #include <config.h>
 
index fb7cd0212151810b467a69512bd8aab8755c05f8..71bb5ef4d4f5ddc5344d536eeab826d3a9edcbfd 100644 (file)
@@ -5,7 +5,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+*/
+ * SPDX-License-Identifier: GPL-2.0-or-later*/
 
 
 /** @file
index c24e5bf9a23dd5d7c6369a76d19c48c9cc3f6a17..71e464336bc217bd23721d7d8bb546ecc322e309 100644 (file)
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0+ */
+ * SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include "config.h"