Date: Fri, 5 Apr 2002 20:05:31 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9162 for review Message-ID: <200204060405.g3645Vs67658@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9162 Change 9162 by peter@peter_daintree on 2002/04/05 20:05:11 IFC @9160 Affected files ... ... //depot/projects/ia64/UPDATING#7 integrate ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#3 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#7 integrate ... //depot/projects/ia64/etc/mail/Makefile#6 integrate ... //depot/projects/ia64/etc/mail/mailer.conf#2 integrate ... //depot/projects/ia64/etc/mtree/BSD.local.dist#6 integrate ... //depot/projects/ia64/etc/mtree/BSD.usr.dist#8 integrate ... //depot/projects/ia64/etc/rc#10 integrate ... //depot/projects/ia64/etc/sendmail/Makefile#4 integrate ... //depot/projects/ia64/etc/sendmail/rc.sendmail#1 branch ... //depot/projects/ia64/gnu/lib/csu/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#5 integrate ... //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#7 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#8 integrate ... //depot/projects/ia64/sbin/atacontrol/atacontrol.c#5 integrate ... //depot/projects/ia64/share/colldef/Makefile#5 integrate ... //depot/projects/ia64/share/man/man5/rc.conf.5#12 integrate ... //depot/projects/ia64/share/man/man8/Makefile#4 integrate ... //depot/projects/ia64/share/man/man8/rc.sendmail.8#1 branch ... //depot/projects/ia64/share/man/man9/vm_page_hold.9#2 integrate ... //depot/projects/ia64/share/mklocale/Makefile#5 integrate ... //depot/projects/ia64/share/monetdef/Makefile#5 integrate ... //depot/projects/ia64/share/monetdef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/ia64/share/msgdef/Makefile#5 integrate ... //depot/projects/ia64/share/msgdef/ja_JP.SJIS.src#1 branch ... //depot/projects/ia64/share/numericdef/Makefile#5 integrate ... //depot/projects/ia64/share/numericdef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/ia64/share/timedef/Makefile#5 integrate ... //depot/projects/ia64/share/timedef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/ia64/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#7 integrate ... //depot/projects/ia64/sys/conf/files.sparc64#9 integrate ... //depot/projects/ia64/sys/dev/aac/aac_pci.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.c#11 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.h#4 integrate ... //depot/projects/ia64/sys/dev/ata/ata-disk.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/ata-disk.h#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/ata-isa.c#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-all.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-all.h#3 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.h#4 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-tape.c#6 integrate ... //depot/projects/ia64/sys/dev/em/if_em.c#4 integrate ... //depot/projects/ia64/sys/dev/em/if_em.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.c#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs#10 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#10 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#5 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#7 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_smp.c#7 integrate ... //depot/projects/ia64/sys/netinet/if_fddi.h#3 delete ... //depot/projects/ia64/sys/netinet6/nd6.c#4 integrate ... //depot/projects/ia64/sys/sparc64/include/eeprom.h#1 branch ... //depot/projects/ia64/sys/sys/ata.h#5 integrate ... //depot/projects/ia64/sys/sys/cdio.h#2 integrate ... //depot/projects/ia64/usr.bin/sed/process.c#4 integrate ... //depot/projects/ia64/usr.bin/sort/init.c#5 integrate ... //depot/projects/ia64/usr.bin/sort/sort.1#4 integrate ... //depot/projects/ia64/usr.bin/yacc/error.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/mkpar.c#6 integrate ... //depot/projects/ia64/usr.sbin/arp/arp.4#2 integrate ... //depot/projects/ia64/usr.sbin/burncd/burncd.c#4 integrate ... //depot/projects/ia64/usr.sbin/mailwrapper/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/pw/pw.8#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/config.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/menus.c#8 integrate Differences ... ==== //depot/projects/ia64/UPDATING#7 (text+ko) ==== @@ -23,6 +23,24 @@ integrity. Re-enabling write caching can substantially improve performance. +20020404: + New sendmail startup scripts have been installed to make it + easier to use alternative MTAs with FreeBSD. Setting the rc.conf + variable sendmail_enable to "NO" no longer prevents any sendmail + daemons from starting. Instead, either set sendmail_enable to + "NONE" or change mta_start_script to a script for starting + an alternative MTA. Setting mta_start_script to "" will + also prevent any MTA from being started at boot. + +20020404: + Due to the import of sendmail 8.12.2 (see 20020217 entry), a new + user and group are required in order for sendmail to run as a + set-group-ID binary. A 'make installworld' will use the new user + and group to set the owner and group of /var/spool/clientmqueue + and will fail if the new user and group do not exist. The 'smmsp' + user and group must be merged from src/etc/group and + src/etc/master.passwd before using 'make installworld'. + 20020315: FreeBSD 5.0 DP-1 was basically branched today. @@ -984,4 +1002,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.196 2002/03/18 04:52:24 imp Exp $ +$FreeBSD: src/UPDATING,v 1.197 2002/04/05 07:42:42 gshapiro Exp $ ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.8 2002/02/17 22:06:57 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.10 2002/04/05 04:28:10 gshapiro Exp $ sendmail 8.12.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ @@ -32,5 +32,57 @@ All local changes should be submitted to the Sendmail Consortium <sendmail@sendmail.org> for inclusion in the next vendor release. +The following files make up the sendmail build/install/runtime +infrastructure in FreeBSD: + + bin/Makefile + bin/rmail/Makefile + contrib/sendmail/ + etc/Makefile + etc/defaults/make.conf (RELENG_4) + etc/defaults/rc.conf + etc/mail/Makefile + etc/mail/README + etc/mail/access.sample + etc/mail/aliases + etc/mail/mailer.conf + etc/mail/mailertable.sample + etc/mail/virtusertable.sample + etc/mtree/BSD.include.dist + etc/mtree/BSD.usr.dist + etc/mtree/BSD.var.dist + etc/rc + etc/sendmail/Makefile + etc/sendmail/freebsd.mc + etc/sendmail/freefall.mc + etc/sendmail/rc.sendmail + lib/Makefile + lib/libmilter/Makefile + lib/libsm/Makefile + lib/libsmdb/Makefile + lib/libsmutil/Makefile + libexec/Makefile + libexec/mail.local/Makefile + libexec/smrsh/Makefile + share/Makefile + share/doc/smm/Makefile + share/doc/smm/08.sendmailop/Makefile + share/examples/etc/make.conf (HEAD) + share/man/man5/make.conf.5 + share/man/man5/rc.conf.5 + share/man/man8/Makefile + share/man/man8/rc.sendmail.8 + share/mk/bsd.libnames.mk + share/sendmail/Makefile + usr.bin/Makefile + usr.bin/vacation/Makefile + usr.sbin/Makefile + usr.sbin/editmap/Makefile + usr.sbin/mailstats/Makefile + usr.sbin/makemap/Makefile + usr.sbin/praliases/Makefile + usr.sbin/sendmail/Makefile + usr.sbin/mailwrapper/Makefile + gshapiro@FreeBSD.org 17-February-2002 ==== //depot/projects/ia64/etc/defaults/rc.conf#7 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.141 2002/03/28 03:29:20 gshapiro Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.142 2002/04/05 02:30:41 gshapiro Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -324,17 +324,12 @@ ############################################################## -### Miscellaneous administrative options ################### +### Mail Transfer Agent (MTA) options ###################### ############################################################## -cron_enable="YES" # Run the periodic job daemon. -cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). -cron_flags="" # Which options to pass to the cron daemon. -lpd_enable="NO" # Run the line printer daemon. -lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. -lpd_flags="" # Flags to lpd (if enabled). -usbd_enable="NO" # Run the usbd daemon. -usbd_flags="" # Flags to usbd (if enabled). +mta_start_script="/etc/rc.sendmail" + # Script to start your chosen MTA, called by /etc/rc. +# Settings for /etc/rc.sendmail: sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO/NONE). # If NONE, don't start any sendmail processes. sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) @@ -346,6 +341,20 @@ sendmail_msp_queue_enable="YES" # Dequeue stuck clientmqueue mail (YES/NO). sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m" # Flags for sendmail_msp_queue daemon. + + +############################################################## +### Miscellaneous administrative options ################### +############################################################## + +cron_enable="YES" # Run the periodic job daemon. +cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). +cron_flags="" # Which options to pass to the cron daemon. +lpd_enable="NO" # Run the line printer daemon. +lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. +lpd_flags="" # Flags to lpd (if enabled). +usbd_enable="NO" # Run the usbd daemon. +usbd_flags="" # Flags to usbd (if enabled). dumpdev="NO" # Device name to crashdump to (or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. ==== //depot/projects/ia64/etc/mail/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mail/Makefile,v 1.26 2002/04/04 07:42:12 ru Exp $ +# $FreeBSD: src/etc/mail/Makefile,v 1.27 2002/04/05 02:30:45 gshapiro Exp $ # # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. @@ -12,13 +12,22 @@ # aliases - Build the sendmail aliases # install - Install the .cf file as /etc/mail/sendmail.cf # -# For the MTA daemon: -# start - Start the sendmail daemon with the flags defined in -# /etc/defaults/rc.conf or /etc/rc.conf -# stop - Stop the sendmail daemon -# restart - Restart the sendmail daemon +# For acting on both the MTA daemon and MSP queue running daemon: +# start - Start both the sendmail MTA daemon and MSP queue running +# daemon with the flags defined in /etc/defaults/rc.conf or +# /etc/rc.conf +# stop - Stop both the sendmail MTA daemon and MSP queue running +# daemon +# restart - Restart both the sendmail MTA daemon and MSP queue running +# daemon +# +# For acting on just the MTA daemon: +# start-mta - Start the sendmail MTA daemon with the flags defined in +# /etc/defaults/rc.conf or /etc/rc.conf +# stop-mta - Stop the sendmail MTA daemon +# restart-mta - Restart the sendmail MTA daemon # -# For the MSP queue running daemon: +# For acting on just the MSP queue running daemon: # start-mspq - Start the sendmail MSP queue running daemon with the # flags defined in /etc/defaults/rc.conf or /etc/rc.conf # stop-mspq - Stop the sendmail MSP queue running daemon @@ -70,10 +79,9 @@ .endif # -# The pid is used to stop and restart the running daemon. +# The sendmail startup script # -SENDMAIL_PIDFILE?= /var/run/sendmail.pid -SENDMAIL_MSPQ_PIDFILE?= /var/spool/clientmqueue/sm-client.pid +SENDMAIL_START_SCRIPT?= /etc/rc.sendmail # # Some useful programs we need. @@ -81,7 +89,6 @@ SENDMAIL?= /usr/sbin/sendmail MAKEMAP?= /usr/sbin/makemap M4?= /usr/bin/m4 -KILL?= /bin/kill # Set a reasonable default .MAIN: all @@ -172,65 +179,26 @@ ${INSTALL} -c -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf .endif -start: - @(. /etc/defaults/rc.conf; source_rc_confs; \ - case "$${sendmail_enable}" in \ - [Nn][Oo][Nn][Ee]) \ - echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \ - ;; \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_flags}; \ - echo "${SENDMAIL} $${sendmail_flags}" \ - ;; \ - *) \ - case "$${sendmail_submit_enable}" in \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_submit_flags}; \ - echo "${SENDMAIL} $${sendmail_submit_flags}" \ - ;; \ - *) \ - case "$${sendmail_outbound_enable}" in \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_outbound_flags}; \ - echo "${SENDMAIL} $${sendmail_outbound_flags}" \ - ;; \ - esac \ - ;; \ - esac \ - ;; \ - esac \ - ) +start start-mta start-mspq: + @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ + echo -n 'Starting:'; \ + sh ${SENDMAIL_START_SCRIPT} $@; \ + echo '.'; \ + fi -stop: - ${KILL} -TERM `head -1 ${SENDMAIL_PIDFILE}` +stop stop-mta stop-mspq: + @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ + echo -n 'Stopping:'; \ + sh ${SENDMAIL_START_SCRIPT} $@; \ + echo '.'; \ + fi -restart: - ${KILL} -HUP `head -1 ${SENDMAIL_PIDFILE}` - -start-mspq: - @(. /etc/defaults/rc.conf; source_rc_confs; \ - case "$${sendmail_enable}" in \ - [Nn][Oo][Nn][Ee]) \ - echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \ - ;; \ - *) \ - if [ -r /etc/mail/submit.cf ]; then \ - case "$${sendmail_msp_queue_enable}" in \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_msp_queue_flags}; \ - echo "${SENDMAIL} $${sendmail_msp_queue_flags}" \ - ;; \ - esac \ - fi \ - ;; \ - esac \ - ) - -stop-mspq: - ${KILL} -TERM `head -1 ${SENDMAIL_MSPQ_PIDFILE}` - -restart-mspq: - ${KILL} -HUP `head -1 ${SENDMAIL_MSPQ_PIDFILE}` +restart restart-mta restart-mspq: + @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ + echo -n 'Restarting:'; \ + sh ${SENDMAIL_START_SCRIPT} $@; \ + echo '.'; \ + fi # User defined targets .if exists(Makefile.local) ==== //depot/projects/ia64/etc/mail/mailer.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/mailer.conf,v 1.2 1999/12/29 18:24:06 peter Exp $ +# $FreeBSD: src/etc/mail/mailer.conf,v 1.3 2002/04/05 04:25:12 gshapiro Exp $ # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # @@ -6,3 +6,5 @@ send-mail /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail +hoststat /usr/libexec/sendmail/sendmail +purgestat /usr/libexec/sendmail/sendmail ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.88 2002/03/16 21:37:56 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.89 2002/04/05 14:58:03 phantom Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -371,6 +371,8 @@ .. pl_PL.ISO8859-2 .. + pt_BR.ISO8859-1 + .. pt_PT.ISO8859-1 .. pt_PT.ISO8859-15 ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.255 2002/03/16 21:37:56 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.256 2002/04/05 14:58:03 phantom Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -617,6 +617,8 @@ .. pl_PL.ISO8859-2 .. + pt_BR.ISO8859-1 + .. pt_PT.ISO8859-1 .. pt_PT.ISO8859-15 @@ -935,6 +937,8 @@ .. pl_PL.ISO8859-2 .. + pt_BR.ISO8859-1 + .. pt_PT.ISO8859-1 .. pt_PT.ISO8859-15 ==== //depot/projects/ia64/etc/rc#10 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.307 2002/03/28 03:29:18 gshapiro Exp $ +# $FreeBSD: src/etc/rc,v 1.308 2002/04/05 02:30:40 gshapiro Exp $ # # System startup script run by init on autoboot @@ -702,44 +702,10 @@ ;; esac -# Note: Please keep the sendmail startup code here in sync with the code -# in src/etc/mail/Makefile. -case ${sendmail_enable} in -[Nn][Oo][Nn][Ee]) - ;; -[Yy][Ee][Ss]) - echo -n ' sendmail' - /usr/sbin/sendmail ${sendmail_flags} - ;; -*) - case ${sendmail_submit_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-submit' - /usr/sbin/sendmail ${sendmail_submit_flags} - ;; - *) - case ${sendmail_outbound_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-outbound' - /usr/sbin/sendmail ${sendmail_outbound_flags} - ;; - esac - ;; - esac - ;; -esac - -case ${sendmail_enable} in -[Nn][Oo][Nn][Ee]) - ;; -*) - if [ -r /etc/mail/submit.cf ]; then - case ${sendmail_msp_queue_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-clientmqueue' - /usr/sbin/sendmail ${sendmail_msp_queue_flags} - ;; - esac +case ${mta_start_script} in +/*) + if [ -r ${mta_start_script} ]; then + sh ${mta_start_script} fi ;; esac ==== //depot/projects/ia64/etc/sendmail/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.19 (Berkeley) 1/14/97 -# $FreeBSD: src/etc/sendmail/Makefile,v 1.15 2002/02/24 02:38:23 gshapiro Exp $ +# $FreeBSD: src/etc/sendmail/Makefile,v 1.16 2002/04/05 02:30:46 gshapiro Exp $ M4= m4 CHMOD= chmod @@ -82,6 +82,8 @@ @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set" @false .endif + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/rc.sendmail \ + ${DESTDIR}/etc ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ ${DESTDIR}/etc/mail/freebsd.mc ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ==== //depot/projects/ia64/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.3 2001/10/04 14:13:16 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.4 2002/04/05 08:53:35 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc.295 @@ -16,11 +16,7 @@ CFLAGS+= -I${GCCDIR}/config -I. -DIN_GCC \ -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-omit-frame-pointer -NOMAN= true -NOPIC= true -NOPROFILE= true INTERNALLIB= true -CLEANFILES+= tm.h CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG} @@ -35,7 +31,7 @@ ln -sf ${.ALLSRC} ${.TARGET} .endfor .else -crtbegin.o crtbegin.So crtend.o crtend.So: crtstuff.c tm.h +crtbegin.o crtbegin.So crtend.o crtend.So: ${SRCS} .endif crtbegin.o: @@ -54,6 +50,7 @@ ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h} +CLEANFILES+= tm.h # KEEP THIS IN SYNC with src/gnu/usr.bin/cc/cc_tools/Makefile !! tm.h: echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"' > ${.TARGET} ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.34 2001/01/06 06:16:25 obrien Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.35 2002/04/05 09:12:25 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc.295 @@ -63,7 +63,6 @@ CFLAGS+= -fexceptions CFLAGS+= -DIN_GCC .if ${OBJFORMAT} != aout -#CFLAGS+= -D_PTHREADS -fPIC -DGTHREAD_USE_WEAK CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK .endif CXXFLAGS+= -I${GCCDIR}/cp/inc @@ -86,7 +85,7 @@ NEW1POBJS= ${NEW1FUNCS:S/$/.po/} NEW2POBJS= ${NEW2FUNCS:S/$/.po/} -OBJS= ${LIB1OBJS} ${LIB2OBJS} ${NEW1OBJS} ${NEW2OBJS} +OBJS= ${LIB1OBJS} ${LIB2OBJS} ${NEW1OBJS} ${NEW2OBJS} config.h: echo '#include <${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h>' > ${.TARGET} @@ -132,22 +131,22 @@ .if !defined(NOPIC) ${LIB1SOBJS}: libgcc1.c - ${CC} -c -fpic ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} + ${CC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} ${LIB2SOBJS}: libgcc2.c - ${XCC} -c -fpic ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} + ${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} ${NEW1SOBJS}: new1.cc - ${XCXX} -c -fpic ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} + ${XCXX} -c ${PICFLAG} ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} ${NEW2SOBJS}: new2.cc - ${CXX} -c -fpic ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} + ${CXX} -c ${PICFLAG} ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .endif ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.55 2002/04/04 18:24:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.56 2002/04/05 10:23:19 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -12,6 +12,7 @@ # aliases of generated headers. CFLAGS+= -I. +CFLAGS+= -static .include "../Makefile.inc" @@ -33,8 +34,8 @@ .for F in attr codes config emit extract flags opinit output peep recog build-tools: gen$F -gen$F: gen$F.o rtl.o obstack.o print-rtl.o bitmap.o - ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +gen$F: gen$F.o rtl.o print-rtl.o obstack.o bitmap.o + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F @@ -44,7 +45,7 @@ build-tools: gen$F gen$F: gen$F.o rtl.o rtlanal.o print-rtl.o obstack.o bitmap.o - ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F @@ -56,7 +57,7 @@ build-tools: gen$F gen$F: gen$F.o - ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F ==== //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#3 (text+ko) ==== @@ -49,7 +49,7 @@ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.2 2002/02/18 20:35:18 mike Exp $" + .asciz "$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.3 2002/04/06 00:07:15 tmm Exp $" #endif /* SYSLIBC_RCS and not lint */ /* netorder = htonl(hostorder) */ @@ -57,5 +57,5 @@ .set CNAME(htonl),CNAME(__htonl) ENTRY(__htonl) retl - srl %o0, 0, %o0 /* zero extend -- or do we sign extend? */ + srl %o0, 0, %o0 /* zero extend */ END(__htonl) ==== //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#3 (text+ko) ==== @@ -49,7 +49,7 @@ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.2 2002/02/18 20:35:18 mike Exp $" + .asciz "$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.3 2002/04/06 00:07:15 tmm Exp $" #endif /* SYSLIBC_RCS and not lint */ /* hostorder = ntohl(netorder) */ @@ -57,5 +57,5 @@ .set CNAME(ntohl),CNAME(__ntohl) ENTRY(__ntohl) retl - signx %o0, %o0 + srl %o0, 0, %o0 /* zero extend */ END(__ntohl) ==== //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.29 2002/04/04 18:45:21 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.31 2002/04/05 20:00:05 des Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -282,7 +282,7 @@ /* pass prompt message to application and receive passphrase */ - if ((retval = pam_get_pass(pamh, &pass, NEED_PASSPHRASE, options)) + if ((retval = pam_get_authtok(pamh, &pass, NEED_PASSPHRASE)) != PAM_SUCCESS) return retval; @@ -303,6 +303,7 @@ if (auth_via_key(pamh, file, dotdir, pwent, pass) == PAM_SUCCESS) authenticated++; + free(dotdir); free(keyfiles); if (!authenticated) return PAM_AUTH_ERR; @@ -346,6 +347,7 @@ int no_link; /* link per-agent file? */ char *per_agent; /* to store env */ char *per_session; /* per-session filename */ + char *agent_pid; /* agent pid */ const struct passwd *pwent; /* user's passwd entry */ int retval; /* from calls */ uid_t saved_uid; /* caller's uid */ @@ -416,7 +418,6 @@ SSH_AGENT); if (env_write >= 0) (void) close(env_write); - free(per_agent); return PAM_SESSION_ERR; } } @@ -448,7 +449,6 @@ (void) close(env_write); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SERVICE_ERR; } @@ -470,12 +470,12 @@ (void) close(env_write); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SERVICE_ERR; } else if (strcmp(&env_string[strlen(env_string) - strlen(ENV_PID_SUFFIX)], ENV_PID_SUFFIX) == 0 && + ((agent_pid = strdup(env_value)) == NULL || (retval = pam_set_data(pamh, "ssh_agent_pid", - env_value, ssh_cleanup)) != PAM_SUCCESS) { + agent_pid, ssh_cleanup)) != PAM_SUCCESS)) { if (start_agent) (void) pclose(env_read); else @@ -484,7 +484,8 @@ (void) close(env_write); if (agent_socket) free(agent_socket); - free(per_agent); + if (agent_pid) + free(agent_pid); return retval; } @@ -499,7 +500,6 @@ SSH_AGENT); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SESSION_ERR; case 0: break; @@ -508,7 +508,6 @@ MODULE_NAME, SSH_AGENT); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SESSION_ERR; default: openpam_log(PAM_LOG_ERROR, "%s: %s exited %s %d", @@ -518,22 +517,17 @@ WTERMSIG(retval) : WEXITSTATUS(retval)); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SESSION_ERR; } } else (void) fclose(env_read); - if (!agent_socket) { - free(per_agent); + if (!agent_socket) return PAM_SESSION_ERR; - } if (start_agent && (retval = add_keys(pamh, agent_socket)) - != PAM_SUCCESS) { - free(per_agent); + != PAM_SUCCESS) return retval; - } free(agent_socket); /* if we couldn't access the per-agent file, don't link a @@ -546,14 +540,11 @@ well as the hostname */ if ((retval = pam_get_item(pamh, PAM_TTY, (const void **)&tty)) - != PAM_SUCCESS) { - free(per_agent); + != PAM_SUCCESS) return retval; - } if (asprintf(&per_session, "%s/.ssh/agent-%s-%s", pwent->pw_dir, hname, tty) == -1) { openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); - free(per_agent); return PAM_SERVICE_ERR; } @@ -563,14 +554,11 @@ if ((retval = pam_set_data(pamh, "ssh_agent_env_session", per_session, ssh_cleanup)) != PAM_SUCCESS) { free(per_session); - free(per_agent); return retval; } (void) unlink(per_session); /* remove cruft */ (void) link(per_agent, per_session); - free(per_agent); - free(per_session); return PAM_SUCCESS; } ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- -$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.13 2002/03/30 00:18:46 keramida Exp $ +$FreeBSD: src/release/doc/en_US.ISO8859-1/installation/common/install.sgml,v 1.14 2002/04/05 22:07:44 asmodai Exp $ install.sgml @@ -750,13 +750,12 @@ it's the right one by examining its size).</para> <para><application>FIPS</application> does NOT currently - work with FAT32 or VFAT style partitions as used by newer - versions of Windows 95. To split up such a partition, you - will need a commercial product such as - <application>Partition Magic</application>. Sorry, but this - is just the breaks if you've got a Windows partition hogging - your whole disk and you don't want to reinstall from - scratch.</para> + work with NTFS style partitions. To split up such a + partition, you will need a commercial product such as + <application>Partition Magic</application>. Sorry, but this + is just the breaks if you've got a Windows partition hogging + your whole disk and you don't want to reinstall from + scratch.</para> </answer> </qandaentry> ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.314 2002/04/04 21:42:25 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.315 2002/04/05 17:03:33 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -489,7 +489,7 @@ <title>Bootloader Changes</title> <para arch="i386"><filename>boot2</filename> now supports a - <option>-n</option> to disallow boot interruption by + <option>-n</option> option to disallow boot interruption by keypresses. &merged;</para> <para arch="i386">A new <filename>cdboot</filename> bootstrap ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#8 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.24 2002/03/28 09:20:39 murray Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.26 2002/04/06 01:24:58 murray Exp $ # # MAINTAINER: jkh # @@ -88,6 +88,7 @@ CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-manuals" CDROM_SET_1="${CDROM_SET_1} x11/gnome" CDROM_SET_1="${CDROM_SET_1} x11/kde2" +CDROM_SET_1="${CDROM_SET_1} www/links" # This is the set of "people really want these" packages. Please add to # this list. @@ -97,9 +98,11 @@ CDROM_SET_1="${CDROM_SET_1} editors/vim5" CDROM_SET_1="${CDROM_SET_1} emulators/mtools" CDROM_SET_1="${CDROM_SET_1} ftp/ncftp" +CDROM_SET_1="${CDROM_SET_1} graphics/gimp1" CDROM_SET_1="${CDROM_SET_1} graphics/xpdf" CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat" +CDROM_SET_1="${CDROM_SET_1} lang/gnat" CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" @@ -146,11 +149,9 @@ ## End of set for CDROM #2 ## Start of set for CDROM #3 +CDROM_SET_3="${CDROM_SET_3} editors/xemacs21" CDROM_SET_3="${CDROM_SET_3} print/teTeX" CDROM_SET_3="${CDROM_SET_3} textproc/docproj" -CDROM_SET_3="${CDROM_SET_3} editors/xemacs21" -CDROM_SET_3="${CDROM_SET_3} graphics/gimp1" -CDROM_SET_3="${CDROM_SET_3} lang/gnat" ## End of set for CDROM #3 ==== //depot/projects/ia64/sbin/atacontrol/atacontrol.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.14 2002/04/02 13:48:17 sos Exp $ + * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.16 2002/04/05 21:51:03 sos Exp $ */ #include <stdio.h> @@ -50,6 +50,7 @@ case ATA_UDMA2: return "UDMA33"; case ATA_UDMA4: return "UDMA66"; case ATA_UDMA5: return "UDMA100"; + case ATA_UDMA6: return "UDMA133"; case ATA_DMA: return "BIOSDMA"; default: return "???"; } @@ -77,7 +78,6 @@ return -1; } - void usage() { @@ -108,6 +108,14 @@ void cap_print(struct ata_params *parm) { + u_int32_t lbasize = (u_int32_t)parm->lba_size_1 | + ((u_int32_t)parm->lba_size_2 << 16); + + u_int64_t lbasize48 = ((u_int64_t)parm->lba_size48_1) | + ((u_int64_t)parm->lba_size48_2 << 16) | + ((u_int64_t)parm->lba_size48_3 << 32) | + ((u_int64_t)parm->lba_size48_4 << 48); + printf("\n"); printf("ATA/ATAPI revision %d\n", version(parm->version_major)); printf("device model %.40s\n", parm->model); @@ -118,21 +126,24 @@ printf("sectors/track %d\n", parm->sectors); printf("lba%ssupported ", parm->support_lba ? " " : " not "); - if (parm->lba_size) - printf("%d sectors\n", parm->lba_size); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204060405.g3645Vs67658>