Date: Sun, 9 Feb 2003 00:03:57 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24876 for review Message-ID: <200302090803.h1983vAQ017537@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24876 Change 24876 by marcel@marcel_nfs on 2003/02/09 00:03:41 IFC @24859 Affected files ... .. //depot/projects/ia64/Makefile.inc1#45 integrate .. //depot/projects/ia64/UPDATING#32 integrate .. //depot/projects/ia64/bin/ls/Makefile#6 integrate .. //depot/projects/ia64/bin/ls/cmp.c#4 integrate .. //depot/projects/ia64/bin/ls/extern.h#5 integrate .. //depot/projects/ia64/bin/ls/ls.1#15 integrate .. //depot/projects/ia64/bin/ls/ls.c#15 integrate .. //depot/projects/ia64/bin/ls/ls.h#6 integrate .. //depot/projects/ia64/bin/ls/print.c#11 integrate .. //depot/projects/ia64/bin/ls/util.c#5 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#6 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#6 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#11 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#14 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#10 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#11 integrate .. //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#6 integrate .. //depot/projects/ia64/contrib/sendmail/README#5 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#8 integrate .. //depot/projects/ia64/contrib/sendmail/cf/README#8 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#5 integrate .. //depot/projects/ia64/contrib/sendmail/cf/feature/local_procmail.m4#4 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#8 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#8 integrate .. //depot/projects/ia64/contrib/sendmail/cf/sendmail.schema#5 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/cidrexpand#2 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/doublebounce.pl#2 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#8 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/mfdef.h#4 integrate .. //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#6 integrate .. //depot/projects/ia64/contrib/sendmail/include/libsmdb/smdb.h#5 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/bdb.h#1 branch .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/fdset.h#4 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_unixware.h#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/README#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_settimeout.html#2 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/handler.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#5 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/main.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/local.h#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/mbdb.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/refill.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsmdb/smdb2.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/libsmutil/cf.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.8#6 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/Makefile.m4#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/README#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/SECURITY#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/collect.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/control.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/daemon.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/envelope.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#4 integrate .. //depot/projects/ia64/contrib/sendmail/src/mailq.1#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/map.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/mci.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/recipient.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/sasl.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/savemail.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/src/sysexits.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/tls.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/trace.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/udb.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/util.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#8 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#6 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#25 integrate .. //depot/projects/ia64/etc/mail/Makefile#12 integrate .. //depot/projects/ia64/etc/mail/aliases#5 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#12 integrate .. //depot/projects/ia64/etc/namedb/named.conf#5 integrate .. //depot/projects/ia64/include/Makefile#23 integrate .. //depot/projects/ia64/lib/Makefile#18 integrate .. //depot/projects/ia64/lib/libc/Makefile#6 integrate .. //depot/projects/ia64/lib/libc/alpha/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/alpha/gen/infinity.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#18 integrate .. //depot/projects/ia64/lib/libc/gen/fpclassify.3#1 branch .. //depot/projects/ia64/lib/libc/gen/fpclassify.c#1 branch .. //depot/projects/ia64/lib/libc/i386/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/i386/gen/infinity.c#5 integrate .. //depot/projects/ia64/lib/libc/ia64/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/ia64/gen/infinity.c#5 integrate .. //depot/projects/ia64/lib/libc/include/fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/powerpc/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/powerpc/gen/infinity.c#2 integrate .. //depot/projects/ia64/lib/libc/sparc64/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/sparc64/gen/infinity.c#6 integrate .. //depot/projects/ia64/lib/libgeom/Makefile#1 branch .. //depot/projects/ia64/lib/libgeom/geom_stats.c#1 branch .. //depot/projects/ia64/lib/libgeom/libgeom.3#1 branch .. //depot/projects/ia64/lib/libgeom/libgeom.h#1 branch .. //depot/projects/ia64/lib/msun/src/math.h#9 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#9 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#13 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/errata/article.sgml#10 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#66 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#8 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#8 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#17 integrate .. //depot/projects/ia64/sbin/vinum/vext.h#4 integrate .. //depot/projects/ia64/share/man/man5/periodic.conf.5#10 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#25 integrate .. //depot/projects/ia64/sys/alpha/include/_types.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/float.h#3 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#14 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/ia64/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/ia64/sys/conf/NOTES#37 integrate .. //depot/projects/ia64/sys/conf/files#61 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#18 integrate .. //depot/projects/ia64/sys/dev/an/if_anreg.h#7 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#15 integrate .. //depot/projects/ia64/sys/dev/ida/ida_disk.c#6 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/isa/es1888.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/isa/ess.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/isa/mss.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb8.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sbc.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sndbuf_dma.c#1 branch .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#10 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsecvar.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#24 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#23 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#23 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumhdr.h#5 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs.h#6 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#12 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#13 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#6 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#5 integrate .. //depot/projects/ia64/sys/geom/geom.h#20 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#24 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#15 integrate .. //depot/projects/ia64/sys/geom/geom_enc.c#8 integrate .. //depot/projects/ia64/sys/geom/geom_int.h#7 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#16 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_stats.c#1 branch .. //depot/projects/ia64/sys/geom/geom_stats.h#1 branch .. //depot/projects/ia64/sys/geom/geom_subr.c#18 integrate .. //depot/projects/ia64/sys/geom/geom_vol_ffs.c#2 integrate .. //depot/projects/ia64/sys/geom/notes#1 branch .. //depot/projects/ia64/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/ia64/sys/i386/include/_types.h#3 integrate .. //depot/projects/ia64/sys/i386/include/float.h#3 integrate .. //depot/projects/ia64/sys/ia64/include/_types.h#4 integrate .. //depot/projects/ia64/sys/ia64/include/float.h#2 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#33 integrate .. //depot/projects/ia64/sys/kern/subr_prof.c#10 integrate .. //depot/projects/ia64/sys/modules/sound/driver/als4000/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/cmi/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/cs4281/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/csa/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sound/driver/driver/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/ds1/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/emu10k1/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/es137x/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/fm801/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/ich/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/maestro/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/maestro3/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/neomagic/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/solo/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/t4dwave/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/uaudio/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/via8233/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/via82c686/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/driver/vibes/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/sound/pcm/Makefile#4 integrate .. //depot/projects/ia64/sys/net/radix.c#9 integrate .. //depot/projects/ia64/sys/net/radix.h#6 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#16 integrate .. //depot/projects/ia64/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#18 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#25 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#10 integrate .. //depot/projects/ia64/sys/powerpc/include/_types.h#3 integrate .. //depot/projects/ia64/sys/powerpc/include/float.h#2 integrate .. //depot/projects/ia64/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/ia64/sys/sparc64/include/float.h#3 integrate .. //depot/projects/ia64/sys/sys/agpio.h#3 integrate .. //depot/projects/ia64/sys/sys/bio.h#14 integrate .. //depot/projects/ia64/sys/sys/proc.h#47 integrate .. //depot/projects/ia64/tools/KSE/ksetest/simplelock.h#3 integrate .. //depot/projects/ia64/tools/regression/lib/libc/gen/test-fpclassify.c#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#24 integrate .. //depot/projects/ia64/usr.bin/login/login.c#15 integrate .. //depot/projects/ia64/usr.bin/yacc/skeleton.c#6 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.sh#3 integrate .. //depot/projects/ia64/usr.sbin/mailwrapper/mailwrapper.8#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#45 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.315 2003/02/04 08:15:30 phk Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.316 2003/02/07 07:29:57 jkoshy Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -469,7 +469,7 @@ # buildkernel: .if empty(BUILDKERNELS) - @echo ">>> ERROR: Missing kernel configuration file(s) (${KERNCONF})." + @echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; @false .endif .if defined(KERNWARN) @@ -528,6 +528,10 @@ # Install the kernel defined by INSTALLKERNEL # installkernel reinstallkernel: +.if empty(INSTALLKERNEL) + @echo "ERROR: No kernel \"${KERNCONF}\" to install." + @false +.endif cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${CROSSENV} PATH=${TMPPATH} \ ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} ==== //depot/projects/ia64/UPDATING#32 (text+ko) ==== @@ -17,7 +17,14 @@ developers choose to disable these features on build machines to maximize performance. -20030128 +20030208: + sendmail 8.12.7 has been imported. It has one important + change for IPv6 users. The default submit.mc now uses + '[127.0.0.1]' instead of 'localhost' meaning only IPv4 is + used to connect to the MTA. Users on IPv6-only machines + will need to edit /etc/mail/submit.mc appropriately. + +20030128: NODEVFS option has been removed and DEVFS thereby made standard. This makes all references to MAKEDEV obsolete, and the should be removed when convenient. @@ -1071,8 +1078,34 @@ <reboot> - To upgrade from 4.x-stable to current - ------------------------------------- + To cross-install current onto a separate partition + -------------------------------------------------- + # In this approach we use a separate partition to hold + # current's root, 'usr', and 'var' directories. A partition + # holding "/", "/usr" and "/var" should be about 2GB in + # size. + + <make sure you have good level 0 dumps> + <boot into -stable> + make buildworld + <maybe newfs current's root partition> + <mount current's root partition on directory ${CURRENT_ROOT}> + make installworld DESTDIR=${CURRENT_ROOT} + make buildkernel KERNCONF=YOUR_KERNEL_HERE + cp /usr/src/sys/${ARCH}/conf/GENERIC.hints \ + ${CURRENT_ROOT}/boot/device.hints # as needed + make installkernel KERNCONF=YOUR_KERNEL_HERE DESTDIR=${CURRENT_ROOT} + cd /usr/src/etc; make distribution DESTDIR=${CURRENT_ROOT} # if newfs'd + cp /etc/fstab ${CURRENT_ROOT}/etc/fstab # if newfs'd + <edit ${CURRENT_ROOT}/etc/fstab to mount "/" from the correct partition> + <reboot into current> + <do a "native" rebuild/install as described in the previous section> + <maybe install compatibility libraries from /usr/src/lib/compat> + <reboot> + + + To upgrade in-place from 4.x-stable to current + ---------------------------------------------- # 5.x uses more space than 4.x. Also, the location of kernel # modules has changed. If you are installing 5.0 onto a 4.x # system, you'll need about 30MB of free disk space on your / @@ -1198,4 +1231,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.239 2003/01/29 07:14:16 phk Exp $ +$FreeBSD: src/UPDATING,v 1.241 2003/02/08 20:36:35 gshapiro Exp $ ==== //depot/projects/ia64/bin/ls/Makefile#6 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/cmp.c#4 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/extern.h#5 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/ls.1#15 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/ls.c#15 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/ls.h#6 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/print.c#11 (text+ko) ==== ==== //depot/projects/ia64/bin/ls/util.c#5 (text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#4 $ */ #include <sys/param.h> @@ -57,9 +57,18 @@ struct pam_saved_cred *scred; int r; - ENTER(); - if (geteuid() != 0) + ENTERI(pwd->pw_uid); + r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred); + if (r == PAM_SUCCESS && scred != NULL) { + openpam_log(PAM_LOG_DEBUG, + "already operating under borrowed credentials"); + RETURNC(PAM_SYSTEM_ERR); + } + if (geteuid() != 0 && geteuid() != pwd->pw_uid) { + openpam_log(PAM_LOG_DEBUG, "called with non-zero euid: %d", + (int)geteuid()); RETURNC(PAM_PERM_DENIED); + } scred = calloc(1, sizeof *scred); if (scred == NULL) RETURNC(PAM_BUF_ERR); @@ -76,6 +85,8 @@ free(scred); RETURNC(r); } + if (geteuid() == pwd->pw_uid) + RETURNC(PAM_SUCCESS); if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 || setegid(pwd->pw_gid) == -1 || seteuid(pwd->pw_uid) == -1) { openpam_restore_cred(pamh); ==== //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_findenv.c#9 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#10 $ */ #include <string.h> @@ -55,12 +55,12 @@ ENTER(); if (pamh == NULL) - RETURNI(-1); + RETURNN(-1); for (i = 0; i < pamh->env_count; ++i) if (strncmp(pamh->env[i], name, len) == 0 && pamh->env[i][len] == '=') - RETURNI(i); - RETURNI(-1); + RETURNN(i); + RETURNN(-1); } /* ==== //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_get_option.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#6 $ */ #include <sys/param.h> @@ -57,7 +57,7 @@ size_t len; int i; - ENTER(); + ENTERS(option); if (pamh == NULL || pamh->current == NULL || option == NULL) RETURNS(NULL); cur = pamh->current; ==== //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#14 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_impl.h#19 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#20 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -42,6 +42,7 @@ extern const char *_pam_func_name[PAM_NUM_PRIMITIVES]; extern const char *_pam_sm_func_name[PAM_NUM_PRIMITIVES]; extern const char *_pam_err_name[PAM_NUM_ERRORS]; +extern const char *_pam_item_name[PAM_NUM_ITEMS]; /* * Control flags @@ -123,6 +124,21 @@ #ifdef DEBUG #define ENTER() openpam_log(PAM_LOG_DEBUG, "entering") +#define ENTERI(i) do { \ + if ((i) > 0 && (i) < PAM_NUM_ITEMS) \ + openpam_log(PAM_LOG_DEBUG, "entering: %s", _pam_item_name[i]); \ + else \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", (i)); \ +} while (0); +#define ENTERN(n) do { \ + openpam_log(PAM_LOG_DEBUG, "entering: %d", (n)); \ +} while (0); +#define ENTERS(s) do { \ + if ((s) == NULL) \ + openpam_log(PAM_LOG_DEBUG, "entering: NULL"); \ + else \ + openpam_log(PAM_LOG_DEBUG, "entering: '%s'", (s)); \ +} while (0); #define RETURNV() openpam_log(PAM_LOG_DEBUG, "returning") #define RETURNC(c) do { \ if ((c) >= 0 && (c) < PAM_NUM_ERRORS) \ @@ -131,9 +147,9 @@ openpam_log(PAM_LOG_DEBUG, "returning %d!", (c)); \ return (c); \ } while (0) -#define RETURNI(i) do { \ - openpam_log(PAM_LOG_DEBUG, "returning %d", (i)); \ - return (i); \ +#define RETURNN(n) do { \ + openpam_log(PAM_LOG_DEBUG, "returning %d", (n)); \ + return (n); \ } while (0) #define RETURNP(p) do { \ if ((p) == NULL) \ @@ -151,9 +167,12 @@ } while (0) #else #define ENTER() +#define ENTERI(i) +#define ENTERN(n) +#define ENTERS(s) #define RETURNV() return #define RETURNC(c) return (c) -#define RETURNI(i) return (i) +#define RETURNN(n) return (n) #define RETURNP(p) return (p) #define RETURNS(s) return (s) #endif ==== //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#4 $ */ #include <sys/param.h> @@ -62,10 +62,12 @@ RETURNC(r); if (scred == NULL) RETURNC(PAM_SYSTEM_ERR); - if (seteuid(scred->euid) == -1 || - setgroups(scred->ngroups, scred->groups) == -1 || - setegid(scred->egid) == -1) - RETURNC(PAM_SYSTEM_ERR); + if (scred->euid != geteuid()) { + if (seteuid(scred->euid) == -1 || + setgroups(scred->ngroups, scred->groups) == -1 || + setegid(scred->egid) == -1) + RETURNC(PAM_SYSTEM_ERR); + } pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL); RETURNC(PAM_SUCCESS); } ==== //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_set_option.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#7 $ */ #include <sys/param.h> @@ -61,7 +61,7 @@ size_t len; int i; - ENTER(); + ENTERS(option); if (pamh == NULL || pamh->current == NULL || option == NULL) RETURNC(PAM_SYSTEM_ERR); cur = pamh->current; ==== //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#11 $ */ #include <sys/param.h> @@ -51,11 +51,11 @@ pam_acct_mgmt(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); - pam_err = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); - RETURNC(pam_err); + r = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#11 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_authenticate.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#13 $ */ #include <sys/param.h> @@ -51,14 +51,14 @@ pam_authenticate(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) RETURNC(PAM_SYMBOL_ERR); - pam_err = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); + r = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); pam_set_item(pamh, PAM_AUTHTOK, NULL); - RETURNC(pam_err); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#11 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#14 $ */ #include <sys/param.h> @@ -51,19 +51,19 @@ pam_chauthtok(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) RETURNC(PAM_SYMBOL_ERR); - pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, + r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_PRELIM_CHECK); - if (pam_err == PAM_SUCCESS) - pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, + if (r == PAM_SUCCESS) + r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_UPDATE_AUTHTOK); pam_set_item(pamh, PAM_OLDAUTHTOK, NULL); pam_set_item(pamh, PAM_AUTHTOK, NULL); - RETURNC(pam_err); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_close_session.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#11 $ */ #include <sys/param.h> @@ -51,11 +51,13 @@ pam_close_session(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT)) RETURNC(PAM_SYMBOL_ERR); - RETURNC(openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); + r = openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#14 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#20 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#21 $ */ #include <sys/param.h> @@ -124,7 +124,8 @@ free(resp); if (r != PAM_SUCCESS) RETURNC(r); - RETURNC(pam_get_item(pamh, item, (const void **)authtok)); + r = pam_get_item(pamh, item, (const void **)authtok); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_data.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#10 $ */ #include <string.h> @@ -54,7 +54,7 @@ { pam_data_t *dp; - ENTER(); + ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_item.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#15 $ */ #include <sys/param.h> @@ -40,6 +40,22 @@ #include "openpam_impl.h" +const char *_pam_item_name[PAM_NUM_ITEMS] = { + "(NO ITEM)", + "PAM_SERVICE", + "PAM_USER", + "PAM_TTY", + "PAM_RHOST", + "PAM_CONV", + "PAM_AUTHTOK", + "PAM_OLDAUTHTOK", + "PAM_RUSER", + "PAM_USER_PROMPT", + "PAM_REPOSITORY", + "PAM_AUTHTOK_PROMPT", + "PAM_OLDAUTHTOK_PROMPT" +}; + /* * XSSO 4.2.1 * XSSO 6 page 46 @@ -53,7 +69,7 @@ const void **item) { - ENTER(); + ENTERI(item_type); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); switch (item_type) { ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_user.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#14 $ */ #include <sys/param.h> @@ -78,7 +78,8 @@ free(resp); if (r != PAM_SUCCESS) RETURNC(r); - RETURNC(pam_get_item(pamh, PAM_USER, (const void **)user)); + r = pam_get_item(pamh, PAM_USER, (const void **)user); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#12 $ */ #include <stdlib.h> @@ -52,16 +52,23 @@ pam_getenv(pam_handle_t *pamh, const char *name) { + char *str; int i; - ENTER(); + ENTERS(name); if (pamh == NULL) RETURNS(NULL); if (name == NULL || strchr(name, '=') != NULL) RETURNS(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) RETURNS(NULL); - RETURNS(strdup(pamh->env[i])); + for (str = pamh->env[i]; *str != '\0'; ++str) { + if (*str == '=') { + ++str; + break; + } + } + RETURNS(str); } /** ==== //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_open_session.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#11 $ */ #include <sys/param.h> @@ -51,11 +51,13 @@ pam_open_session(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT)) RETURNC(PAM_SYMBOL_ERR); - RETURNC(openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); + r = openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_data.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_set_data.c#12 $ */ #include <stdlib.h> @@ -58,7 +58,7 @@ { pam_data_t *dp; - ENTER(); + ENTERS(module_data_name); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) { ==== //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_item.c#16 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#17 $ */ #include <sys/param.h> @@ -58,7 +58,7 @@ void **slot, *tmp; size_t nsize, osize; - ENTER(); + ENTERI(item_type); if (pamh == NULL) RETURNC(PAM_SYSTEM_ERR); slot = &pamh->item[item_type]; ==== //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_setcred.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_setcred.c#12 $ */ #include <sys/param.h> @@ -51,13 +51,15 @@ pam_setcred(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) RETURNC(PAM_SYMBOL_ERR); /* XXX enforce exclusivity */ - RETURNC(openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); + r = openpam_dispatch(pamh, PAM_SM_SETCRED, flags); + RETURNC(r); } /* ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#11 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.18 2002/08/28 17:59:45 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.19 2003/02/08 20:36:52 gshapiro Exp $ -sendmail 8.12.6 +sendmail 8.12.7 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.12.6' \ - src/contrib/sendmail SENDMAIL v8_12_6 + cvs import -m 'Import sendmail 8.12.7' \ + src/contrib/sendmail SENDMAIL v8_12_7 To make local changes to sendmail, simply patch and commit to the main @@ -92,4 +92,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -28-August-2002 +8-February-2003 ==== //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#6 (text+ko) ==== @@ -235,4 +235,10 @@ the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. -$Revision: 8.55 $, Last updated $Date: 2002/03/05 00:45:54 $ +* MAIL_HUB always takes precedence over LOCAL_RELAY + + Despite the information in the documentation, MAIL_HUB ($H) will always + be used if set instead of LOCAL_RELAY ($R). This will be fixed in a + future version. + +$Revision: 8.55.2.1 $, Last updated $Date: 2002/12/18 22:38:48 $ ==== //depot/projects/ia64/contrib/sendmail/README#5 (text+ko) ==== @@ -177,10 +177,17 @@ cf/README Details on configuring sendmail. doc/op/op.me - The sendmail Installation & Operations Guide. Be warned: if - you are running this off on SunOS or some other system with an - old version of -me, you need to add the following macro to the - macros: + The sendmail Installation & Operations Guide. In addition + to the shipped PostScript version, plain text and PDF versions + can be generating using (assuming the required conversion software + is installed on your system, see doc/op/Makefile): + >>> 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?200302090803.h1983vAQ017537>