summaryrefslogtreecommitdiff
path: root/usr/src/cmd/sendmail
diff options
context:
space:
mode:
authorrie <none@none>2007-05-17 16:27:31 -0700
committerrie <none@none>2007-05-17 16:27:31 -0700
commit24da5b34f49324ed742a340010ed5bd3d4e06625 (patch)
treed634cc86da07688eb2048c7bfeed71bedea99c80 /usr/src/cmd/sendmail
parent3230aa086e19b239f0306ae02bd82e788031cfef (diff)
downloadillumos-joyent-24da5b34f49324ed742a340010ed5bd3d4e06625.tar.gz
6455532 OSNet cleanup required in preparation for direct bindings
--HG-- rename : usr/src/cmd/bnu/strecpy.c => deleted_files/usr/src/cmd/bnu/strecpy.c rename : usr/src/cmd/fs.d/ufs/mount/realpath.c => deleted_files/usr/src/cmd/fs.d/ufs/mount/realpath.c rename : usr/src/cmd/lp/lib/lp/tinames.c => deleted_files/usr/src/cmd/lp/lib/lp/tinames.c rename : usr/src/cmd/sgs/crle/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/crle/common/mapfile-vers rename : usr/src/cmd/sgs/elfdump/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/elfdump/common/mapfile-vers rename : usr/src/cmd/sgs/ldd/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/ldd/common/mapfile-vers rename : usr/src/cmd/sgs/moe/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/moe/common/mapfile-vers rename : usr/src/cmd/sgs/pvs/common/mapfile-vers => deleted_files/usr/src/cmd/sgs/pvs/common/mapfile-vers rename : usr/src/lib/libsocket/amd64/byteorder.s => deleted_files/usr/src/lib/libsocket/amd64/byteorder.s rename : usr/src/lib/libsocket/i386/byteorder.s => deleted_files/usr/src/lib/libsocket/i386/byteorder.s rename : usr/src/cmd/sgs/ld/common/mapfile-vers => usr/src/cmd/sgs/ld/common/mapfile-intf rename : usr/src/cmd/sgs/mapfiles/Makefile => usr/src/common/mapfiles/Makefile rename : usr/src/cmd/sgs/mapfiles/amd64/Makefile => usr/src/common/mapfiles/amd64/Makefile rename : usr/src/cmd/sgs/mapfiles/amd64/map.above4G => usr/src/common/mapfiles/amd64/map.above4G rename : usr/src/cmd/sgs/mapfiles/amd64/map.below4G => usr/src/common/mapfiles/amd64/map.below4G rename : usr/src/cmd/sgs/mapfiles/common/Makefile => usr/src/common/mapfiles/common/Makefile rename : usr/src/cmd/mapfile_bssalign => usr/src/common/mapfiles/common/map.bssalign rename : usr/src/cmd/mapfile_execdata => usr/src/common/mapfiles/common/map.execdata rename : usr/src/lib/common/mapfile-filter => usr/src/common/mapfiles/common/map.filter rename : usr/src/cmd/mapfile_noexstk => usr/src/common/mapfiles/common/map.noexstk rename : usr/src/cmd/sgs/mapfiles/i386/Makefile => usr/src/common/mapfiles/i386/Makefile rename : usr/src/cmd/sgs/mapfiles/i386/map.default => usr/src/common/mapfiles/i386/map.default rename : usr/src/cmd/mapfile_noexdata => usr/src/common/mapfiles/i386/map.noexdata rename : usr/src/cmd/sgs/mapfiles/i386/map.pagealign => usr/src/common/mapfiles/i386/map.pagealign rename : usr/src/cmd/sgs/mapfiles/sparc/Makefile => usr/src/common/mapfiles/sparc/Makefile rename : usr/src/cmd/sgs/mapfiles/sparc/map.default => usr/src/common/mapfiles/sparc/map.default rename : usr/src/cmd/sgs/mapfiles/sparc/map.pagealign => usr/src/common/mapfiles/sparc/map.pagealign rename : usr/src/cmd/sgs/mapfiles/sparcv9/Makefile => usr/src/common/mapfiles/sparcv9/Makefile rename : usr/src/cmd/sgs/mapfiles/sparcv9/map.above4G => usr/src/common/mapfiles/sparcv9/map.above4G rename : usr/src/cmd/sgs/mapfiles/sparcv9/map.below4G => usr/src/common/mapfiles/sparcv9/map.below4G rename : usr/src/lib/libsocket/inet/byteorder.c => usr/src/lib/libc/sparc/gen/byteorder.c
Diffstat (limited to 'usr/src/cmd/sendmail')
-rw-r--r--usr/src/cmd/sendmail/aux/Makefile7
-rw-r--r--usr/src/cmd/sendmail/src/Makefile8
-rw-r--r--usr/src/cmd/sendmail/src/mapfile-intf37
3 files changed, 47 insertions, 5 deletions
diff --git a/usr/src/cmd/sendmail/aux/Makefile b/usr/src/cmd/sendmail/aux/Makefile
index 0982fb3938..af6aa7c2a8 100644
--- a/usr/src/cmd/sendmail/aux/Makefile
+++ b/usr/src/cmd/sendmail/aux/Makefile
@@ -18,11 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#
# ident "%Z%%M% %I% %E% SMI"
#
# cmd/sendmail/aux/Makefile
@@ -65,6 +64,10 @@ DBMDEF= -DNDBM -DNEWDB
CPPFLAGS = $(INCPATH) $(ENVDEF) $(SUNENVDEF) $(DBMDEF) $(CPPFLAGS.sm)
+# Nearly every support application provides sleep(). This isn't incompatible
+# with libc, but can be confined to the applications themselves.
+LDFLAGS += $(MAPFILE.NGB:%=-M%)
+
.KEEP_STATE:
all: $(PROG) $(LIBPROG) $(USRSBINPROG)
diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile
index 9a015bb558..cd028d6a0e 100644
--- a/usr/src/cmd/sendmail/src/Makefile
+++ b/usr/src/cmd/sendmail/src/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# ident "%Z%%M% %I% %E% SMI"
@@ -41,7 +41,8 @@ OBJS= alias.o arpadate.o bf.o collect.o conf.o control.o convtime.o daemon.o \
SRCS= $(OBJS:%.o=%.c)
-LDFLAGS += -R$(SFW_ROOT)/lib
+MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
+LDFLAGS += -R$(SFW_ROOT)/lib $(MAPFILES:%=-M%)
# EXPORT DELETE START
CRYPTOLIBS= -lssl -lcrypto
@@ -75,7 +76,8 @@ all: $(PROG)
.PARALLEL: $(OBJS)
-$(PROG): $(OBJS) ../libsmutil/libsmutil.a ../libsm/libsm.a ../db/libdb.a
+$(PROG): $(OBJS) $(MAPFILES) \
+ ../libsmutil/libsmutil.a ../libsm/libsm.a ../db/libdb.a
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
$(POST_PROCESS)
diff --git a/usr/src/cmd/sendmail/src/mapfile-intf b/usr/src/cmd/sendmail/src/mapfile-intf
new file mode 100644
index 0000000000..93dd4710e8
--- /dev/null
+++ b/usr/src/cmd/sendmail/src/mapfile-intf
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# 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.
+# 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 2007 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# ident "%Z%%M% %I% %E% SMI"
+#
+
+# sendmail defines its own sleep() which pre-dates libc's sleep(), but is
+# essentially the same. To maintain source compatibility, define only those
+# symbols that must remain global, and therefore remove the sleep name-space
+# clash.
+{
+ global:
+ allow_severity; # required by libwrap
+ deny_severity; # required by libwrap
+};