From 2fbe5860d33ca2318b35ea6d31beefa381b4ac8a Mon Sep 17 00:00:00 2001 From: Florian Weimer <fweimer@redhat.com> Date: Mon, 19 Jul 2021 07:55:27 +0200 Subject: resolv: Rename res_comp.c to res-name-checking.c and move into libc This reflects what the remaining functions in the file do. The __res_dnok, __res_hnok, __res_mailok, __res_ownok were moved with the script, using --no-new-version, and turned into compat symbols. __libc_res_dnok@@GLIBC_PRIVATE and __libc_res_hnok@@GLIBC_PRIVATE are added for internal use, to avoid accidentally binding to compatibility symbols. The new public symbols res_dnok, res_hnok, res_mailok, res_ownok were added using make update-all-abi. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com> --- sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist | 8 ++++++++ sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist | 4 ---- sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist | 8 ++++++++ sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist | 4 ---- 4 files changed, 16 insertions(+), 8 deletions(-) (limited to 'sysdeps/unix/sysv/linux/s390') diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index e7309a82f7..bfb4d0168f 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -206,6 +206,10 @@ GLIBC_2.0 __register_frame F GLIBC_2.0 __register_frame_info F GLIBC_2.0 __register_frame_info_table F GLIBC_2.0 __register_frame_table F +GLIBC_2.0 __res_dnok F +GLIBC_2.0 __res_hnok F +GLIBC_2.0 __res_mailok F +GLIBC_2.0 __res_ownok F GLIBC_2.0 __res_randomid F GLIBC_2.0 __sbrk F GLIBC_2.0 __sched_get_priority_max F @@ -2683,6 +2687,10 @@ GLIBC_2.34 pthread_spin_unlock F GLIBC_2.34 pthread_testcancel F GLIBC_2.34 pthread_timedjoin_np F GLIBC_2.34 pthread_tryjoin_np F +GLIBC_2.34 res_dnok F +GLIBC_2.34 res_hnok F +GLIBC_2.34 res_mailok F +GLIBC_2.34 res_ownok F GLIBC_2.34 sem_clockwait F GLIBC_2.34 sem_close F GLIBC_2.34 sem_destroy F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist index 48ff3bffa1..b6244e71e7 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libresolv.abilist @@ -22,12 +22,8 @@ GLIBC_2.0 __p_type_syms D 0x228 GLIBC_2.0 __putlong F GLIBC_2.0 __putshort F GLIBC_2.0 __res_close F -GLIBC_2.0 __res_dnok F -GLIBC_2.0 __res_hnok F GLIBC_2.0 __res_isourserver F -GLIBC_2.0 __res_mailok F GLIBC_2.0 __res_nameinquery F -GLIBC_2.0 __res_ownok F GLIBC_2.0 __res_queriesmatch F GLIBC_2.0 __res_send F GLIBC_2.0 __sym_ntop F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index d056821ab8..ed73e1c75b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -408,9 +408,13 @@ GLIBC_2.2 __register_frame F GLIBC_2.2 __register_frame_info F GLIBC_2.2 __register_frame_info_table F GLIBC_2.2 __register_frame_table F +GLIBC_2.2 __res_dnok F +GLIBC_2.2 __res_hnok F GLIBC_2.2 __res_init F +GLIBC_2.2 __res_mailok F GLIBC_2.2 __res_nclose F GLIBC_2.2 __res_ninit F +GLIBC_2.2 __res_ownok F GLIBC_2.2 __res_randomid F GLIBC_2.2 __res_state F GLIBC_2.2 __sbrk F @@ -2490,6 +2494,10 @@ GLIBC_2.34 pthread_spin_unlock F GLIBC_2.34 pthread_testcancel F GLIBC_2.34 pthread_timedjoin_np F GLIBC_2.34 pthread_tryjoin_np F +GLIBC_2.34 res_dnok F +GLIBC_2.34 res_hnok F +GLIBC_2.34 res_mailok F +GLIBC_2.34 res_ownok F GLIBC_2.34 sem_clockwait F GLIBC_2.34 sem_close F GLIBC_2.34 sem_destroy F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist index 23e952fcac..07d7ef8935 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libresolv.abilist @@ -22,11 +22,8 @@ GLIBC_2.2 __p_type_syms D 0x450 GLIBC_2.2 __putlong F GLIBC_2.2 __putshort F GLIBC_2.2 __res_close F -GLIBC_2.2 __res_dnok F -GLIBC_2.2 __res_hnok F GLIBC_2.2 __res_hostalias F GLIBC_2.2 __res_isourserver F -GLIBC_2.2 __res_mailok F GLIBC_2.2 __res_mkquery F GLIBC_2.2 __res_nameinquery F GLIBC_2.2 __res_nmkquery F @@ -34,7 +31,6 @@ GLIBC_2.2 __res_nquery F GLIBC_2.2 __res_nquerydomain F GLIBC_2.2 __res_nsearch F GLIBC_2.2 __res_nsend F -GLIBC_2.2 __res_ownok F GLIBC_2.2 __res_queriesmatch F GLIBC_2.2 __res_query F GLIBC_2.2 __res_querydomain F -- cgit v1.2.3-70-g09d2