From owner-p4-projects@FreeBSD.ORG Sat May 21 15:45:12 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2BB116A4D0; Sat, 21 May 2005 15:45:11 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 848D916A4CF for ; Sat, 21 May 2005 15:45:11 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7787A43D6B for ; Sat, 21 May 2005 15:45:09 +0000 (GMT) (envelope-from trhodes@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4LFj9Ne054390 for ; Sat, 21 May 2005 15:45:09 GMT (envelope-from trhodes@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4LFj83F054387 for perforce@freebsd.org; Sat, 21 May 2005 15:45:08 GMT (envelope-from trhodes@freebsd.org) Date: Sat, 21 May 2005 15:45:08 GMT Message-Id: <200505211545.j4LFj83F054387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trhodes@freebsd.org using -f From: Tom Rhodes To: Perforce Change Reviews Subject: PERFORCE change 77251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 May 2005 15:45:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=77251 Change 77251 by trhodes@trhodes_local on 2005/05/21 15:44:38 Remove NO_AUDIT flag I introduced. We do not do anything special for MAC either. Affected files ... .. //depot/projects/trustedbsd/audit3/etc/Makefile#4 edit .. //depot/projects/trustedbsd/audit3/lib/Makefile#5 edit .. //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#5 edit .. //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#4 edit .. //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#3 edit .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/etc/Makefile#4 (text+ko) ==== @@ -20,14 +20,12 @@ ${.CURDIR}/../usr.bin/mail/misc/mail.rc \ ${.CURDIR}/../usr.bin/locate/locate/locate.rc -.if !defined(NO_AUDIT) BSM_ETC_OPEN_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_class \ ${.CURDIR}/../contrib/bsm/etc/audit_event BSM_ETC_RESTRICTED_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_control \ ${.CURDIR}/../contrib/bsm/etc/audit_user BSM_ETC_EXEC_FILES= ${.CURDIR}/../contrib/bsm/etc/audit_warn BSM_ETC_DIR= ${DESTDIR}/etc/security -.endif .if !defined(NO_LPR) BIN1+= printcap @@ -101,14 +99,12 @@ cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt cd ${.CURDIR}/pam.d; ${MAKE} install -.if !defined(NO_AUDIT) cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0400 \ ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} -.endif .if !defined(NO_I4B) cd ${.CURDIR}/isdn; ${MAKE} install .endif ==== //depot/projects/trustedbsd/audit3/lib/Makefile#5 (text+ko) ==== @@ -22,7 +22,7 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} ${_libbsm} libcom_err libcrypt libkvm msun libmd libncurses \ +SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ @@ -30,7 +30,7 @@ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libautofs libpanel libpcap \ - ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ + ${_libpthread} ${_libsdp} libsm ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_bind} @@ -47,10 +47,6 @@ _libngatm= libngatm .endif -.if !defined(NO_AUDIT) -_libbsm= libbsm -.endif - .if !defined(NO_BIND) _bind= bind .endif ==== //depot/projects/trustedbsd/audit3/share/examples/etc/make.conf#5 (text+ko) ==== @@ -110,7 +110,6 @@ # To avoid building various parts of the base system: #NO_ACPI= # do not build acpiconf(8) and related programs #NOATM= # do not build ATM related programs and libraries -#NO_AUDIT= # do not build audit libraries or utilities #NO_AUTHPF= # do not build and install authpf (setuid/gid) #NO_BLUETOOTH= # do not build Bluetooth related stuff #NO_BOOT= # do not build boot blocks and loader ==== //depot/projects/trustedbsd/audit3/share/man/man5/make.conf.5#4 (text+ko) ==== @@ -410,9 +410,6 @@ .It Va MODULES_WITH_WORLD .Pq Vt bool Set to build modules with the system instead of the kernel. -.It Va NO_AUDIT -.Pq Vt bool -Set to not build audit utilities and libraries. .It Va NO_BLUETOOTH .Pq Vt bool Set to not build Bluetooth related kernel modules, programs and libraries. ==== //depot/projects/trustedbsd/audit3/usr.bin/login/Makefile#3 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= login.c login_fbtab.c CFLAGS+=-DLOGALL DPADD= ${LIBUTIL} ${LIBPAM} -LDADD= -lutil -lbsm ${MINUSLPAM} +LDADD+= -lutil ${MINUSLPAM} -lbsm MAN= login.1 login.access.5 .if !defined(NO_SETUID_LOGIN) BINOWN= root ==== //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#8 (text+ko) ==== @@ -12,10 +12,10 @@ ${_apmd} \ ${_arlcontrol} \ arp \ - ${_audit} \ - ${_auditd} \ - ${_auditon} \ - ${_auditreduce} \ + audit \ + auditd \ + auditon \ + auditreduce \ ${_asf} \ ${_atm} \ ${_authpf} \ @@ -122,7 +122,7 @@ pppd \ pppstats \ ${_praliases} \ - ${_praudit} \ + praudit \ procctl \ pstat \ pw \ @@ -197,14 +197,6 @@ _atm= atm .endif -.if !defined(NO_AUDIT) -_audit= audit -_auditd= auditd -_auditon= auditon -_auditreduce= auditreduce -_praudit= praudit -.endif - .if !defined(NO_BIND) .if !defined(NO_BIND_DNSSEC) && !defined(NOCRYPT) _dnssec-keygen= dnssec-keygen