diff options
Diffstat (limited to 'usr/src/lib/libresolv')
| -rw-r--r-- | usr/src/lib/libresolv/Makefile | 42 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/mapfile-vers | 65 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/Makefile | 55 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/Makefile.targ | 35 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/amd64/Makefile | 44 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/i386/Makefile | 44 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/res_mkquery.spec | 75 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/resolv.spec | 135 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/sparc/Makefile | 44 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/sparcv9/Makefile | 45 | ||||
| -rw-r--r-- | usr/src/lib/libresolv/spec/versions | 51 |
11 files changed, 58 insertions, 577 deletions
diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile index 9e9fbedc68..b2637e6f89 100644 --- a/usr/src/lib/libresolv/Makefile +++ b/usr/src/lib/libresolv/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -25,8 +24,6 @@ # # ident "%Z%%M% %I% %E% SMI" # -# lib/libresolv/Makefile -# LIBRARY= libresolv.a VERS= .1 @@ -49,14 +46,7 @@ include ../Makefile.lib # install this library in the root filesystem include ../Makefile.rootfs -SUBDIRS= spec - -MAPDIR= ./spec/$(MACH) -MAPFILE= $(MAPDIR)/mapfile -MAPFILES= $(MAPFILE) mapfile-vers -MAPOPTS= $(MAPFILES:%=-M%) - -CLOBBERFILES += $(MAPFILE) +SRCDIR = . C99MODE= $(C99_DISABLE) @@ -66,40 +56,18 @@ C99MODE= $(C99_DISABLE) # so we must put -I. ahead of the default include directories: CPPFLAGS = -I. -I../common/inc $(CPPFLAGS.master) -DDEBUG -DSYSV -D_REENTRANT LDLIBS += -lsocket -lnsl -lc -DYNFLAGS += $(MAPOPTS) ROOTDYNLIBS= $(DYNLIB:%=$(ROOTLIBDIR)/%) -all := TARGET= all -clean := TARGET= clean -clobber := TARGET= clobber -delete := TARGET= delete -install := TARGET= install -lint := TARGET= lint -catalog := TARGET= catalog -package := TARGET= package - .KEEP_STATE: LIBS = $(DYNLIB) -all: $(SUBDIRS) $(LIBS) +all: $(LIBS) -install: all $(ROOTDYNLIBS) $(SUBDIRS) +install: all $(ROOTDYNLIBS) lint: lintcheck -clean clobber: $(SUBDIRS) - -spec: FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -$(DYNLIB): $(MAPFILES) - -$(MAPFILE): - @cd $(MAPDIR); $(MAKE) mapfile - # include library targets include ../Makefile.targ - -FRC: diff --git a/usr/src/lib/libresolv/mapfile-vers b/usr/src/lib/libresolv/mapfile-vers index 8107ddfb6e..6e7d8ac332 100644 --- a/usr/src/lib/libresolv/mapfile-vers +++ b/usr/src/lib/libresolv/mapfile-vers @@ -1,13 +1,9 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -22,14 +18,59 @@ # # CDDL HEADER END # +# +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# # ident "%Z%%M% %I% %E% SMI" # -# Special mapfile to establish h_errno as a filter on libnsl. As a filtered -# symbol, this isn't visible to apptrace, and thus doesn't have to be defined -# from the specfiles. To ensure the symbol remains in .bss, with the correct -# size, its filtering capabilities are assigned here rather than via a specfile. + +# Due to mistakes made early in the history of this library, there are +# no SUNW_1.1 symbols, but the version is now kept as a placeholder. +# Don't add any symbols to this version. + +SUNW_1.1 { + global: + SUNW_1.1; +} SUNW_0.7; SUNW_0.7 { - global: - h_errno = FILTER libnsl.so.1; + global: + dn_comp; + dn_expand; + dn_skipname; + fp_query; + _getlong; + _getshort; + h_errno = FILTER libnsl.so.1; + hostalias; + p_cdname; + p_class; + p_query; + p_rr; + p_time; + p_type; + putlong; + _res; + res_init; + res_mkquery; + res_query; + res_querydomain; + res_search; + res_send; + strcasecmp = FUNCTION FILTER libc.so.1; + strncasecmp = FUNCTION FILTER libc.so.1; +}; + +SUNWprivate_1.1 { + global: + res_endhostent; + res_gethostbyaddr; + res_gethostbyname; + _res_opcodes; + _res_resultcodes; + res_sethostent; + __res_set_no_hosts_fallback; + local: + *; }; diff --git a/usr/src/lib/libresolv/spec/Makefile b/usr/src/lib/libresolv/spec/Makefile deleted file mode 100644 index cb7140006e..0000000000 --- a/usr/src/lib/libresolv/spec/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# lib/libresolv/spec/Makefile - -# -# no sparcv9 build of libresolv -# if it is desirable to build one then uncomment the line below and delete -# the rest of the lines. -# -#include $(SRC)/lib/Makefile.spec.arch - -i386_ARCHITECTURES = i386 -sparc_ARCHITECTURES = sparc - -all := TARGET= all -install := TARGET= install -clean := TARGET= clean -clobber := TARGET= clobber -lint := TARGET= lint - -.KEEP_STATE: - -all install clean clobber lint: $($(MACH)_ARCHITECTURES) - -# spec files do not have msgs or catalogs -_msg catalog: - -$($(MACH)_ARCHITECTURES): FRC - @cd $@; pwd; $(MAKE) $(TARGET) - -FRC: diff --git a/usr/src/lib/libresolv/spec/Makefile.targ b/usr/src/lib/libresolv/spec/Makefile.targ deleted file mode 100644 index b9f97daf6e..0000000000 --- a/usr/src/lib/libresolv/spec/Makefile.targ +++ /dev/null @@ -1,35 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# lib/libresolv/spec/Makefile.targ - -LIBRARY = libresolv.a -VERS = .1 - -OBJECTS = resolv.o \ - res_mkquery.o - -SPECCPP = -I.. diff --git a/usr/src/lib/libresolv/spec/amd64/Makefile b/usr/src/lib/libresolv/spec/amd64/Makefile deleted file mode 100644 index d334868181..0000000000 --- a/usr/src/lib/libresolv/spec/amd64/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -.KEEP_STATE: - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#amd64_C_PICFLAGS = $(amd64_C_BIGPICFLAGS) - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/libresolv/spec/i386/Makefile b/usr/src/lib/libresolv/spec/i386/Makefile deleted file mode 100644 index a3f2757746..0000000000 --- a/usr/src/lib/libresolv/spec/i386/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# lib/libresolv/spec/i386/Makefile - -.KEEP_STATE: - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#i386_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/libresolv/spec/res_mkquery.spec b/usr/src/lib/libresolv/spec/res_mkquery.spec deleted file mode 100644 index bed047b457..0000000000 --- a/usr/src/lib/libresolv/spec/res_mkquery.spec +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -#pragma ident "%Z%%M% %I% %E% SMI" -# -# lib/libresolv/spec/res_mkquery.spec - -function res_mkquery -include <sys/types.h>, <struct_rrec_compat.h> -declaration int res_mkquery(int op, const char *dname, int class, \ - int type, const char *data, int datalen, \ - struct rrec *newrr, uchar_t *buf, int buflen ) -version SUNW_0.7 -exception $return == -1 -end - -function _res -version SUNW_0.7 -end - -# nss_dns.so.1 -function __res_set_no_hosts_fallback -version SUNWprivate_1.1 -end - -# in.named -function _res_opcodes -version SUNWprivate_1.1 -end - -# in.named -function _res_resultcodes -version SUNWprivate_1.1 -end - -# nss_dns.so.1 -function res_endhostent -version SUNWprivate_1.1 -end - -# nss_dns.so.1 -function res_gethostbyaddr -version SUNWprivate_1.1 -end - -# nss_dns.so.1m hotjava -function res_gethostbyname -version SUNWprivate_1.1 -end - -# nss_dns.so.1 -function res_sethostent -version SUNWprivate_1.1 -end diff --git a/usr/src/lib/libresolv/spec/resolv.spec b/usr/src/lib/libresolv/spec/resolv.spec deleted file mode 100644 index 83db4e4b6d..0000000000 --- a/usr/src/lib/libresolv/spec/resolv.spec +++ /dev/null @@ -1,135 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# ident "%Z%%M% %I% %E% SMI" -# -# lib/libresolv/spec/resolv.spec - -function _getlong -version SUNW_0.7 -end - -function _getshort -version SUNW_0.7 -end - -function res_querydomain -version SUNW_0.7 -end - -function res_init -include <sys/types.h>, <netinet/in.h>, <arpa/nameser.h>, <resolv.h> -declaration int res_init(void) -version SUNW_0.7 -end - -function res_query -include <sys/types.h>, <netinet/in.h>, <arpa/nameser.h>, <resolv.h> -declaration int res_query(const char *dname, int class, int type, \ - u_char *answer, int anslen) -version SUNW_0.7 -end - -function res_search -include <sys/types.h>, <netinet/in.h>, <arpa/nameser.h>, <resolv.h> -declaration int res_search(const char *dname, int class, int type, \ - u_char *answer, int anslen) -version SUNW_0.7 -end - -function res_send -include <sys/types.h>, <netinet/in.h>, <arpa/nameser.h>, <resolv.h> -declaration int res_send(const uchar_t *msg, int msglen, uchar_t *answer, \ - int anslen) -version SUNW_0.7 -exception $return == -1 -end - -function dn_comp -include <sys/types.h>, <netinet/in.h>, <arpa/nameser.h>, <resolv.h> -declaration int dn_comp(const char *exp_dn, u_char *comp_dn, \ - int length, u_char **dnptrs, u_char **lastdnptr) -version SUNW_0.7 -exception $return == -1 -end - -function dn_expand -include <sys/types.h>, <netinet/in.h>, <arpa/nameser.h>, <resolv.h> -declaration int dn_expand(const uchar_t *msg, const uchar_t *eomorig, \ - const uchar_t *comp_dn, char *exp_dn, int length) -version SUNW_0.7 -exception $return == -1 -end - -function strcasecmp -version SUNW_0.7 -filter libc.so.1 -end - -function strncasecmp -version SUNW_0.7 -filter libc.so.1 -end - -function dn_skipname -version SUNW_0.7 -end - -function fp_query -version SUNW_0.7 -end - -# h_errno moved to explicit mapfile definition to provide correct type and size. - -function hostalias -version SUNW_0.7 -end - -function p_cdname -version SUNW_0.7 -end - -function p_class -version SUNW_0.7 -end - -function p_query -version SUNW_0.7 -end - -function p_rr -version SUNW_0.7 -end - -function p_time -version SUNW_0.7 -end - -function p_type -version SUNW_0.7 -end - -function putlong -version SUNW_0.7 -end diff --git a/usr/src/lib/libresolv/spec/sparc/Makefile b/usr/src/lib/libresolv/spec/sparc/Makefile deleted file mode 100644 index 3d23bad698..0000000000 --- a/usr/src/lib/libresolv/spec/sparc/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# lib/libresolv/spec/sparc/Makefile - -.KEEP_STATE: - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib - -# Uncomment the following if the linker complains -#sparc_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB) diff --git a/usr/src/lib/libresolv/spec/sparcv9/Makefile b/usr/src/lib/libresolv/spec/sparcv9/Makefile deleted file mode 100644 index e772bf503c..0000000000 --- a/usr/src/lib/libresolv/spec/sparcv9/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -#ident "%Z%%M% %I% %E% SMI" -# -# Copyright (c) 1998-1999 by Sun Microsystems, Inc. -# All rights reserved. -# -# lib/libresolv/spec/sparcv9/Makefile - -.KEEP_STATE: - -include ../Makefile.targ - -# Add arch specific objects here -OBJECTS += - -include $(SRC)/lib/Makefile.lib -include $(SRC)/lib/Makefile.lib.64 - -# Uncomment the following if the linker complains -#sparcv9_C_PICFLAGS = -K PIC - -include $(SRC)/lib/Makefile.spec - -install: $(ROOTABILIB64) diff --git a/usr/src/lib/libresolv/spec/versions b/usr/src/lib/libresolv/spec/versions deleted file mode 100644 index 23ec67427b..0000000000 --- a/usr/src/lib/libresolv/spec/versions +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# ident "%Z%%M% %I% %E% SMI" -# -# Note: Even though the SUNW_1.1 version now contains no symbols -# beyond what was present at Solaris 2.3, the SUNW_1.1 version MUST be -# present. This is because applications built on 2.6 Beta -# (when it did contain symbols explicitly) may depend on it. -# -sparcv9 { - SUNW_1.1: {SUNW_0.7}; - SUNW_0.7; - SUNWprivate_1.1; -} -sparc { - SUNW_1.1: {SUNW_0.7}; - SUNW_0.7; - SUNWprivate_1.1; -} -i386 { - SUNW_1.1: {SUNW_0.7}; - SUNW_0.7; - SUNWprivate_1.1; -} -amd64 { - SUNW_1.1: {SUNW_0.7}; - SUNW_0.7; - SUNWprivate_1.1; -} |