summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-01-09 12:11:05 -0200
committerRenato Botelho <renato@netgate.com>2017-01-09 12:11:05 -0200
commit681a482d8fc4bfc14a24f7a9d75cca6337f2a520 (patch)
tree08368e0c4dcea4baa16f4a34b2cc104c42e1ed27 /tools
parentcbeab2a9b6b7ac70992175202f35fcc05a5821d5 (diff)
parent91f6edbb8913d163d5c16fb615e84baf8a16d390 (diff)
downloadFreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.zip
FreeBSD-src-681a482d8fc4bfc14a24f7a9d75cca6337f2a520.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc205
-rw-r--r--tools/build/options/WITH_SSP2
2 files changed, 207 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index c92367f..165d8e9 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -406,22 +406,211 @@ OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz
OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz
OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz
OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz
+# lib/libbsnmp/libbsnmp
+OLD_FILES+=usr/share/man/man3/TRUTH_GET.3.gz
+OLD_FILES+=usr/share/man/man3/TRUTH_MK.3.gz
+OLD_FILES+=usr/share/man/man3/TRUTH_OK.3.gz
+OLD_FILES+=usr/share/man/man3/asn1.3.gz
+OLD_FILES+=usr/share/man/man3/asn_append_oid.3.gz
+OLD_FILES+=usr/share/man/man3/asn_commit_header.3.gz
+OLD_FILES+=usr/share/man/man3/asn_compare_oid.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_counter64_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_header.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_integer.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_integer_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_ipaddress.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_ipaddress_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_null.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_null_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_objid.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_objid_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_octetstring.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_octetstring_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_sequence.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_timeticks.3.gz
+OLD_FILES+=usr/share/man/man3/asn_get_uint32_raw.3.gz
+OLD_FILES+=usr/share/man/man3/asn_is_suboid.3.gz
+OLD_FILES+=usr/share/man/man3/asn_oid2str.3.gz
+OLD_FILES+=usr/share/man/man3/asn_oid2str_r.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_counter64.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_exception.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_header.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_integer.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_ipaddress.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_null.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_objid.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_octetstring.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_temp_header.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_timeticks.3.gz
+OLD_FILES+=usr/share/man/man3/asn_put_uint32.3.gz
+OLD_FILES+=usr/share/man/man3/asn_skip.3.gz
+OLD_FILES+=usr/share/man/man3/asn_slice_oid.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_add_binding.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_calc_keychange.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client_init.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client_set_host.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_client_set_port.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_close.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_debug.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_dep_commit.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_dep_finish.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_dep_lookup.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_dep_rollback.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_depop_t.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_dialog.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_discover_engine.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_get.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_get_local_keys.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_getbulk.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_getnext.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_init_context.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_make_errresp.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_oid_append.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_op_t.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_open.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_parse_server.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_passwd_to_keys.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_check.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_create.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_decode.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_header.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_scoped.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_secmode.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_dump.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_encode.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_free.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_init_secparams.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_send.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_receive.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_send_cb_f.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_set.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_table_cb_f.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_table_fetch.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_table_fetch_async.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_timeout_cb_f.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_timeout_start_f.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_timeout_stop_f.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_trace.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_value_copy.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_value_free.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_value_parse.3.gz
+OLD_FILES+=usr/share/man/man3/tree.3.gz
+OLD_FILES+=usr/share/man/man3/tree_size.3.gz
+# usr.sbin/bsnmpd/bsnmpd
+OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT.3.gz
+OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK.3.gz
+OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK_INDEX.3.gz
+OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID.3.gz
+OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK.3.gz
+OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK_INDEX.3.gz
+OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT.3.gz
+OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK.3.gz
+OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK_INDEX.3.gz
+OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID.3.gz
+OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK.3.gz
+OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK_INDEX.3.gz
+OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT.3.gz
+OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK.3.gz
+OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK_INDEX.3.gz
+OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID.3.gz
+OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK.3.gz
+OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK_INDEX.3.gz
OLD_FILES+=usr/share/man/man3/asn1.3.gz
OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz
OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz
+OLD_FILES+=usr/share/man/man3/bsnmpd_get_target_stats.3.gz
+OLD_FILES+=usr/share/man/man3/bsnmpd_get_usm_stats.3.gz
+OLD_FILES+=usr/share/man/man3/bsnmpd_reset_usm_stats.3.gz
OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz
+OLD_FILES+=usr/share/man/man3/buf_alloc.3.gz
+OLD_FILES+=usr/share/man/man3/buf_size.3.gz
+OLD_FILES+=usr/share/man/man3/comm_define.3.gz
+OLD_FILES+=usr/share/man/man3/community.3.gz
+OLD_FILES+=usr/share/man/man3/fd_deselect.3.gz
+OLD_FILES+=usr/share/man/man3/fd_resume.3.gz
+OLD_FILES+=usr/share/man/man3/fd_select.3.gz
+OLD_FILES+=usr/share/man/man3/fd_suspend.3.gz
+OLD_FILES+=usr/share/man/man3/get_ticks.3.gz
+OLD_FILES+=usr/share/man/man3/index_append.3.gz
+OLD_FILES+=usr/share/man/man3/index_append_off.3.gz
+OLD_FILES+=usr/share/man/man3/index_compare.3.gz
+OLD_FILES+=usr/share/man/man3/index_compare_off.3.gz
+OLD_FILES+=usr/share/man/man3/index_decode.3.gz
+OLD_FILES+=usr/share/man/man3/ip_commit.3.gz
+OLD_FILES+=usr/share/man/man3/ip_get.3.gz
+OLD_FILES+=usr/share/man/man3/ip_rollback.3.gz
+OLD_FILES+=usr/share/man/man3/ip_save.3.gz
+OLD_FILES+=usr/share/man/man3/or_register.3.gz
+OLD_FILES+=usr/share/man/man3/or_unregister.3.gz
+OLD_FILES+=usr/share/man/man3/oid_commit.3.gz
+OLD_FILES+=usr/share/man/man3/oid_get.3.gz
+OLD_FILES+=usr/share/man/man3/oid_rollback.3.gz
+OLD_FILES+=usr/share/man/man3/oid_save.3.gz
+OLD_FILES+=usr/share/man/man3/oid_usmNotInTimeWindows.3.gz
+OLD_FILES+=usr/share/man/man3/oid_usmUnknownEngineIDs.3.gz
+OLD_FILES+=usr/share/man/man3/oid_zeroDotZero.3.gz
+OLD_FILES+=usr/share/man/man3/reqid_allocate.3.gz
+OLD_FILES+=usr/share/man/man3/reqid_base.3.gz
+OLD_FILES+=usr/share/man/man3/reqid_istype.3.gz
+OLD_FILES+=usr/share/man/man3/reqid_next.3.gz
+OLD_FILES+=usr/share/man/man3/reqid_type.3.gz
OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz
OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_input_finish.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_input_start.3.gz
OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz
OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz
OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_output.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_pdu_auth_access.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_send_port.3.gz
+OLD_FILES+=usr/share/man/man3/snmp_send_trap.3.gz
OLD_FILES+=usr/share/man/man3/snmp_target.3.gz
OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz
OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz
OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
+OLD_FILES+=usr/share/man/man3/snmpd_target_stat.3.gz
+OLD_FILES+=usr/share/man/man3/snmpd_usmstats.3.gz
OLD_FILES+=usr/share/man/man3/snmpmod.3.gz
+OLD_FILES+=usr/share/man/man3/start_tick.3.gz
+OLD_FILES+=usr/share/man/man3/string_commit.3.gz
+OLD_FILES+=usr/share/man/man3/string_free.3.gz
+OLD_FILES+=usr/share/man/man3/string_get.3.gz
+OLD_FILES+=usr/share/man/man3/string_get_max.3.gz
+OLD_FILES+=usr/share/man/man3/string_rollback.3.gz
+OLD_FILES+=usr/share/man/man3/string_save.3.gz
+OLD_FILES+=usr/share/man/man3/systemg.3.gz
+OLD_FILES+=usr/share/man/man3/this_tick.3.gz
+OLD_FILES+=usr/share/man/man3/timer_start.3.gz
+OLD_FILES+=usr/share/man/man3/timer_start_repeat.3.gz
+OLD_FILES+=usr/share/man/man3/timer_stop.3.gz
+OLD_FILES+=usr/share/man/man3/target_activate_address.3.gz
+OLD_FILES+=usr/share/man/man3/target_address.3.gz
+OLD_FILES+=usr/share/man/man3/target_delete_address.3.gz
+OLD_FILES+=usr/share/man/man3/target_delete_notify.3.gz
+OLD_FILES+=usr/share/man/man3/target_delete_param.3.gz
+OLD_FILES+=usr/share/man/man3/target_first_address.3.gz
+OLD_FILES+=usr/share/man/man3/target_first_notify.3.gz
+OLD_FILES+=usr/share/man/man3/target_first_param.3.gz
+OLD_FILES+=usr/share/man/man3/target_flush_all.3.gz
+OLD_FILES+=usr/share/man/man3/target_next_address.3.gz
+OLD_FILES+=usr/share/man/man3/target_next_notify.3.gz
+OLD_FILES+=usr/share/man/man3/target_next_param.3.gz
+OLD_FILES+=usr/share/man/man3/target_new_address.3.gz
+OLD_FILES+=usr/share/man/man3/target_new_notify.3.gz
+OLD_FILES+=usr/share/man/man3/target_new_param.3.gz
+OLD_FILES+=usr/share/man/man3/target_notify.3.gz
+OLD_FILES+=usr/share/man/man3/target_param.3.gz
+OLD_FILES+=usr/share/man/man3/usm_delete_user.3.gz
+OLD_FILES+=usr/share/man/man3/usm_find_user.3.gz
+OLD_FILES+=usr/share/man/man3/usm_first_user.3.gz
+OLD_FILES+=usr/share/man/man3/usm_flush_users.3.gz
+OLD_FILES+=usr/share/man/man3/usm_next_user.3.gz
+OLD_FILES+=usr/share/man/man3/usm_new_user.3.gz
+OLD_FILES+=usr/share/man/man3/usm_user.3.gz
OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
OLD_FILES+=usr/share/snmp/defs/atm_tree.def
OLD_FILES+=usr/share/snmp/defs/bridge_tree.def
@@ -2229,6 +2418,12 @@ OLD_FILES+=usr/share/man/man5/hast.conf.5.gz
OLD_FILES+=usr/share/man/man8/hastctl.8.gz
OLD_FILES+=usr/share/man/man8/hastd.8.gz
OLD_DIRS+=usr/share/examples/hast
+# bsnmp
+OLD_FILES+=usr/lib/snmp_hast.so
+OLD_LIBS+=usr/lib/snmp_hast.so.6
+OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
+OLD_FILES+=usr/share/snmp/defs/hast_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
.endif
.if ${MK_HESIOD} == no
@@ -5506,12 +5701,20 @@ OLD_FILES+=usr/share/man/man8/wlandebug.8.gz
OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz
OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz
+OLD_FILES+=usr/lib/snmp_wlan.so
+OLD_LIBS+=usr/lib/snmp_wlan.so.6
+# bsnmp module
+OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
+OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
.endif
.if ${MK_SVNLITE} == no || ${MK_SVN} == yes
OLD_FILES+=usr/bin/svnlite
OLD_FILES+=usr/bin/svnliteadmin
+OLD_FILES+=usr/bin/svnlitebench
OLD_FILES+=usr/bin/svnlitedumpfilter
+OLD_FILES+=usr/bin/svnlitefsfs
OLD_FILES+=usr/bin/svnlitelook
OLD_FILES+=usr/bin/svnlitemucc
OLD_FILES+=usr/bin/svnliterdump
@@ -5524,7 +5727,9 @@ OLD_FILES+=usr/share/man/man1/svnlite.1.gz
.if ${MK_SVN} == no
OLD_FILES+=usr/bin/svn
OLD_FILES+=usr/bin/svnadmin
+OLD_FILES+=usr/bin/svnbench
OLD_FILES+=usr/bin/svndumpfilter
+OLD_FILES+=usr/bin/svnfsfs
OLD_FILES+=usr/bin/svnlook
OLD_FILES+=usr/bin/svnmucc
OLD_FILES+=usr/bin/svnrdump
diff --git a/tools/build/options/WITH_SSP b/tools/build/options/WITH_SSP
new file mode 100644
index 0000000..7704e54
--- /dev/null
+++ b/tools/build/options/WITH_SSP
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build world with propolice stack smashing protection.
OpenPOWER on IntegriCloud