From f78ad938538ffa55fb9bb18b632d9d9b01e3d5b8 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 13 May 2015 23:30:14 +0200
Subject: [PATCH] Update Makefile's, constants and symbols

---
 src/Makefile.in       |   6 +-
 src/libgetdns.symbols | 209 +++++++++++++++++++-----------------------
 src/mk-symfiles.sh    |   2 +-
 3 files changed, 100 insertions(+), 117 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 9c73c04f..30187456 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -264,9 +264,9 @@ rr-iter.lo rr-iter.o: $(srcdir)/rr-iter.c $(srcdir)/rr-iter.h getdns/getdns.h $(
  $(srcdir)/gldns/gbuffer.h config.h
 stub.lo stub.o: $(srcdir)/stub.c config.h $(srcdir)/stub.h getdns/getdns.h $(srcdir)/types-internal.h \
  $(srcdir)/getdns/getdns_extra.h getdns/getdns.h $(srcdir)/util/rbtree.h $(srcdir)/gldns/gbuffer.h \
- $(srcdir)/gldns/pkthdr.h $(srcdir)/context.h $(srcdir)/extension/libmini_event.h config.h \
- $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h $(srcdir)/types-internal.h $(srcdir)/util-internal.h \
- $(srcdir)/rr-iter.h $(srcdir)/rr-dict.h $(srcdir)/general.h
+ $(srcdir)/gldns/pkthdr.h $(srcdir)/gldns/rrdef.h $(srcdir)/gldns/str2wire.h $(srcdir)/gldns/rrdef.h $(srcdir)/rr-iter.h \
+ $(srcdir)/rr-dict.h $(srcdir)/context.h $(srcdir)/extension/libmini_event.h config.h $(srcdir)/util/mini_event.h \
+ $(srcdir)/util/rbtree.h $(srcdir)/types-internal.h $(srcdir)/util-internal.h $(srcdir)/general.h
 sync.lo sync.o: $(srcdir)/sync.c getdns/getdns.h config.h $(srcdir)/context.h $(srcdir)/getdns/getdns_extra.h \
  getdns/getdns.h $(srcdir)/types-internal.h $(srcdir)/util/rbtree.h $(srcdir)/extension/libmini_event.h \
  config.h $(srcdir)/util/mini_event.h $(srcdir)/util/rbtree.h $(srcdir)/types-internal.h $(srcdir)/general.h \
diff --git a/src/libgetdns.symbols b/src/libgetdns.symbols
index 7bb6b1c4..b68062ee 100644
--- a/src/libgetdns.symbols
+++ b/src/libgetdns.symbols
@@ -1,127 +1,110 @@
-getdns_context_set_namespaces
-getdns_context_set_namespaces
-getdns_context_set_namespaces
-getdns_context_set_namespaces
-getdns_context_set_namespaces
-getdns_context_set_resolution_type
-getdns_context_set_resolution_type
-getdns_context_set_follow_redirects
-getdns_context_set_follow_redirects
-getdns_context_set_dns_transport
-getdns_context_set_dns_transport
-getdns_context_set_dns_transport
-getdns_context_set_dns_transport
-getdns_context_set_append_name
-getdns_context_set_append_name
-getdns_context_set_append_name
-getdns_context_set_append_name
-getdns_list_get_length
-getdns_list_get_data_type
-getdns_list_get_dict
-getdns_list_get_list
-getdns_list_get_bindata
-getdns_list_get_int
-getdns_dict_get_names
-getdns_dict_get_data_type
-getdns_dict_get_dict
-getdns_dict_get_list
-getdns_dict_get_bindata
-getdns_dict_get_int
-getdns_list_create
-getdns_list_create_with_context
-getdns_list_create_with_memory_functions
-getdns_list_create_with_extended_memory_functions
-getdns_list_destroy
-getdns_list_set_dict
-getdns_list_set_list
-getdns_list_set_bindata
-getdns_list_set_int
-getdns_dict_create
-getdns_dict_create_with_context
-getdns_dict_create_with_memory_functions
-getdns_dict_create_with_extended_memory_functions
-getdns_dict_destroy
-getdns_dict_set_dict
-getdns_dict_set_list
-getdns_dict_set_bindata
-getdns_dict_set_int
-getdns_dict_remove_name
-getdns_general
 getdns_address
-getdns_hostname
-getdns_service
-getdns_context_create
-getdns_context_create_with_memory_functions
-getdns_context_create_with_extended_memory_functions
-getdns_context_destroy
-getdns_cancel_callback
-getdns_general_sync
 getdns_address_sync
-getdns_hostname_sync
-getdns_service_sync
+getdns_cancel_callback
+getdns_context_create
+getdns_context_create_with_extended_memory_functions
+getdns_context_create_with_memory_functions
+getdns_context_destroy
+getdns_context_detach_eventloop
+getdns_context_get_api_information
+getdns_context_get_append_name
+getdns_context_get_dns_root_servers
+getdns_context_get_dnssec_allowed_skew
+getdns_context_get_dnssec_trust_anchors
+getdns_context_get_dns_transport
+getdns_context_get_edns_do_bit
+getdns_context_get_edns_extended_rcode
+getdns_context_get_edns_maximum_udp_payload_size
+getdns_context_get_edns_version
+getdns_context_get_follow_redirects
+getdns_context_get_limit_outstanding_queries
+getdns_context_get_namespaces
+getdns_context_get_num_pending_requests
+getdns_context_get_resolution_type
+getdns_context_get_suffix
+getdns_context_get_timeout
+getdns_context_get_update_callback
+getdns_context_get_upstream_recursive_servers
+getdns_context_process_async
+getdns_context_run
+getdns_context_set_append_name
+getdns_context_set_context_update_callback
+getdns_context_set_dns_root_servers
+getdns_context_set_dnssec_allowed_skew
+getdns_context_set_dnssec_trust_anchors
+getdns_context_set_dns_transport
+getdns_context_set_edns_do_bit
+getdns_context_set_edns_extended_rcode
+getdns_context_set_edns_maximum_udp_payload_size
+getdns_context_set_edns_version
+getdns_context_set_eventloop
+getdns_context_set_extended_memory_functions
+getdns_context_set_follow_redirects
+getdns_context_set_limit_outstanding_queries
+getdns_context_set_memory_functions
+getdns_context_set_namespaces
+getdns_context_set_resolution_type
+getdns_context_set_return_dnssec_status
+getdns_context_set_suffix
+getdns_context_set_timeout
+getdns_context_set_update_callback
+getdns_context_set_upstream_recursive_servers
+getdns_context_set_use_threads
+getdns_convert_alabel_to_ulabel
 getdns_convert_dns_name_to_fqdn
 getdns_convert_fqdn_to_dns_name
 getdns_convert_ulabel_to_alabel
-getdns_convert_alabel_to_ulabel
-getdns_validate_dnssec
-getdns_pretty_print_dict
-getdns_display_ip_address
-getdns_context_set_context_update_callback
-getdns_context_set_resolution_type
-getdns_context_set_namespaces
-getdns_context_set_dns_transport
-getdns_context_set_limit_outstanding_queries
-getdns_context_set_timeout
-getdns_context_set_follow_redirects
-getdns_context_set_dns_root_servers
-getdns_context_set_append_name
-getdns_context_set_suffix
-getdns_context_set_dnssec_trust_anchors
-getdns_context_set_dnssec_allowed_skew
-getdns_context_set_upstream_recursive_servers
-getdns_context_set_edns_maximum_udp_payload_size
-getdns_context_set_edns_extended_rcode
-getdns_context_set_edns_version
-getdns_context_set_edns_do_bit
-getdns_context_set_memory_functions
-getdns_context_set_extended_memory_functions
-getdns_context_get_api_information
-getdns_root_trust_anchor
-getdns_context_set_return_dnssec_status
-getdns_dict_util_set_string
+getdns_dict_create
+getdns_dict_create_with_context
+getdns_dict_create_with_extended_memory_functions
+getdns_dict_create_with_memory_functions
+getdns_dict_destroy
+getdns_dict_get_bindata
+getdns_dict_get_data_type
+getdns_dict_get_dict
+getdns_dict_get_int
+getdns_dict_get_list
+getdns_dict_get_names
+getdns_dict_remove_name
+getdns_dict_set_bindata
+getdns_dict_set_dict
+getdns_dict_set_int
+getdns_dict_set_list
 getdns_dict_util_get_string
-getdns_context_set_use_threads
-getdns_context_get_num_pending_requests
-getdns_context_process_async
-getdns_context_set_eventloop
-getdns_context_detach_eventloop
-getdns_context_run
-getdns_context_get_resolution_type
-getdns_context_get_namespaces
-getdns_context_get_dns_transport
-getdns_context_get_limit_outstanding_queries
-getdns_context_get_timeout
-getdns_context_get_follow_redirects
-getdns_context_get_dns_root_servers
-getdns_context_get_append_name
-getdns_context_get_suffix
-getdns_context_get_dnssec_trust_anchors
-getdns_context_get_dnssec_allowed_skew
-getdns_context_get_upstream_recursive_servers
-getdns_context_get_edns_maximum_udp_payload_size
-getdns_context_get_edns_extended_rcode
-getdns_context_get_edns_version
-getdns_context_get_edns_do_bit
-getdns_pretty_snprint_dict
+getdns_dict_util_set_string
+getdns_display_ip_address
+getdns_general
+getdns_general_sync
+getdns_get_errorstr_by_id
+getdns_hostname
+getdns_hostname_sync
+getdns_list_create
+getdns_list_create_with_context
+getdns_list_create_with_extended_memory_functions
+getdns_list_create_with_memory_functions
+getdns_list_destroy
+getdns_list_get_bindata
+getdns_list_get_data_type
+getdns_list_get_dict
+getdns_list_get_int
+getdns_list_get_length
+getdns_list_get_list
+getdns_list_set_bindata
+getdns_list_set_dict
+getdns_list_set_int
+getdns_list_set_list
+getdns_pretty_print_dict
 getdns_pretty_print_list
+getdns_pretty_snprint_dict
 getdns_pretty_snprint_list
 getdns_print_json_dict
-getdns_snprint_json_dict
 getdns_print_json_list
+getdns_root_trust_anchor
+getdns_service
+getdns_service_sync
+getdns_snprint_json_dict
 getdns_snprint_json_list
-getdns_context_set_update_callback
-getdns_context_get_update_callback
-getdns_get_errorstr_by_id
 getdns_strerror
+getdns_validate_dnssec
 plain_mem_funcs_user_arg
 priv_getdns_context_mf
diff --git a/src/mk-symfiles.sh b/src/mk-symfiles.sh
index 9b74ab94..35bda5cb 100755
--- a/src/mk-symfiles.sh
+++ b/src/mk-symfiles.sh
@@ -4,7 +4,7 @@ write_symbols() {
 	OUTPUT=$1
 	shift
 	grep 'getdns_[0-9a-zA-Z_]*(' $* | grep -v '^#' | grep -v 'INLINE' \
-	| sed -e 's/(.*$//g' -e 's/^.*getdns_/getdns_/g' > $OUTPUT
+	| sed -e 's/(.*$//g' -e 's/^.*getdns_/getdns_/g' | sort | uniq > $OUTPUT
 }
 
 write_symbols libgetdns.symbols getdns/getdns.h.in getdns/getdns_extra.h