PERFORCE change 108734 for review
Michael Bushkov
bushman at FreeBSD.org
Mon Oct 30 11:37:13 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=108734
Change 108734 by bushman at bushman_nss_ldap_cached on 2006/10/30 11:36:11
IFC
Affected files ...
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libnssutil/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/Makefile#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/_secure_path.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/_secure_path.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/auth.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/auth.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/auth.conf.5#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/fparseln.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/fparseln.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/humanize_number.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/humanize_number.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/kld.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/kld.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/libutil.h#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login.conf.5#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_auth.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_auth.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_cap.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_cap.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_cap.h#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_class.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_class.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_crypt.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_ok.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_ok.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_times.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_times.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_tty.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_tty.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/logout.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/logout.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/logwtmp.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/logwtmp.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pidfile.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pidfile.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/property.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/property.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pty.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pty.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pw_util.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/realhostname.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/realhostname.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/realhostname_sa.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/stub.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/trimdomain.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/trimdomain.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/uucplock.3#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/uucplock.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_compat/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_dns/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_files/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_icmp/Makefile#2 integrate
Differences ...
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/Makefile#2 (text+ko) ====
@@ -14,9 +14,10 @@
# libmd must be built before libatm, libopie, libradius, and libtacplus.
# libncurses must be built before libdialog, libedit and libreadline.
# libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
-# libnssutil must be built before nss_files/nss_dns/nss_nis/nss_compat
-# libnss_files must be built before libnss_compat
-# nssfiles/nss_dns/nss_nis/nss_compat/nss_icmp must be built before libc
+# libnssutil must be built before nss_files, nss_dns, nss_nis, nss_compat
+# and libutil
+# nss_files, nss_dns, nss_nis, nss_compat and nss_icmp must be built
+# before libc
# libopie must be built before libpam.
# libradius must be built before libpam.
# librpcsvc must be built before libpam.
@@ -28,10 +29,11 @@
# Otherwise, the SUBDIR list should be in alphabetical order.
SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \
- libnssutil nss_compat nss_dns nss_files nss_icmp ${_nss_nis}\
- libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
+ libnetgraph libnssutil \
+ libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} libalias libarchive ${_libatm} \
- libbegemot ${_libbluetooth} libbsnmp libbz2 libc \
+ libbegemot ${_libbluetooth} libbsnmp libbz2 \
+ nss_compat nss_dns nss_files nss_icmp ${_nss_nis} libc \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
libgssapi libipsec \
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/Symbol.map#2 (text) ====
@@ -165,8 +165,6 @@
getgrnam;
getgrgid;
getgrent;
- # Why are __gr_parse_entry() and __gr_match_entry() not static in
- # gen/getgrent.c?
getgrouplist;
gethostname;
getloadavg;
@@ -402,8 +400,6 @@
_err;
_warn;
__fmtcheck;
- # __pw_match_entry;
- # __pw_parse_entry;
__fdnlist; # used by libkvm
# __aout_fdnlist;
# __elf_is_okay__;
@@ -412,7 +408,6 @@
__pause;
_pause;
__pselect;
- __pw_scan; # Used by (at least) libutil
__raise;
_raise;
__sem_init;
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libnssutil/Makefile#2 (text+ko) ====
@@ -3,7 +3,7 @@
LIB= nssutil
SRCS= copynetent.c copyhtent.c gr_scan.c pw_scan.c rpcunpack.c\
servunpack.c
-INTERNAL=
-NO_PIC=
+INTERNALLIB=
.include <bsd.lib.mk>
+
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_compat/Makefile#2 (text+ko) ====
@@ -8,15 +8,19 @@
SHLIBDIR?= /lib
SRCS+= nss_compat.c compat_group.c compat_passwd.c compat_serv.c
-# NOTE: dirty hack with nss_files's file_serv.c is used
+# NOTE: hack with nss_files's file_serv.c is used
SRCS+= ${.CURDIR}/../nss_files/files_serv.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
+.endif
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.endif
+
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_dns/Makefile#2 (text+ko) ====
@@ -11,11 +11,15 @@
dns_group.c dns_net.c dns_shells.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
+.endif
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.endif
+
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_files/Makefile#2 (text+ko) ====
@@ -12,11 +12,15 @@
files_net.c files_rpc.c files_shells.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
+.endif
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.endif
+
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
==== //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_icmp/Makefile#2 (text+ko) ====
@@ -10,11 +10,15 @@
SRCS= nss_icmp.c icmp_hosts_namadr.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../libc/gen -I${.CURDIR}/../libc/include\
-I${.CURDIR}/../libc/net -I${.CURDIR}/../libnssutil
+
+.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+=-DINET6
+.endif
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.endif
+
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
More information about the p4-projects
mailing list