Date: Thu, 28 Jul 2005 01:58:10 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81098 for review Message-ID: <200507280158.j6S1wAvF099857@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=81098 Change 81098 by sam@sam_ebb on 2005/07/28 01:57:11 IFC @ 81092 Affected files ... .. //depot/projects/wifi/Makefile#10 integrate .. //depot/projects/wifi/Makefile.inc1#22 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#1 branch .. //depot/projects/wifi/UPDATING#18 integrate .. //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#4 integrate .. //depot/projects/wifi/etc/rc.d/dhclient#6 integrate .. //depot/projects/wifi/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/wifi/include/Makefile#13 integrate .. //depot/projects/wifi/include/netdb.h#7 integrate .. //depot/projects/wifi/lib/bind/bind/config.h#2 integrate .. //depot/projects/wifi/lib/bind/config.h#3 integrate .. //depot/projects/wifi/lib/bind/config.mk#5 integrate .. //depot/projects/wifi/lib/bind/isc/Makefile#2 integrate .. //depot/projects/wifi/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.c#10 integrate .. //depot/projects/wifi/lib/libc/net/inet_pton.c#2 integrate .. //depot/projects/wifi/lib/libc/nls/pl_PL.ISO8859-2.msg#2 integrate .. //depot/projects/wifi/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/Makefile#2 integrate .. //depot/projects/wifi/lib/libmemstat/libmemstat.3#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/memstat.h#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_internal.h#4 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_malloc.c#3 integrate .. //depot/projects/wifi/lib/libmemstat/memstat_uma.c#4 integrate .. //depot/projects/wifi/lib/libz/inftrees.h#2 integrate .. //depot/projects/wifi/sbin/dhclient/bpf.c#4 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient-script#7 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#9 integrate .. //depot/projects/wifi/sbin/dhclient/tables.c#3 integrate .. //depot/projects/wifi/sbin/geom/class/Makefile#3 integrate .. //depot/projects/wifi/sbin/geom/class/eli/Makefile#1 branch .. //depot/projects/wifi/sbin/geom/class/eli/geli.8#1 branch .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#1 branch .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#44 integrate .. //depot/projects/wifi/share/doc/IPv6/IMPLEMENTATION#2 integrate .. //depot/projects/wifi/share/man/man4/gif.4#4 integrate .. //depot/projects/wifi/share/man/man7/build.7#3 integrate .. //depot/projects/wifi/share/man/man7/ffs.7#2 integrate .. //depot/projects/wifi/share/man/man9/Makefile#13 integrate .. //depot/projects/wifi/share/man/man9/VFS.9#3 integrate .. //depot/projects/wifi/share/man/man9/VFS_START.9#4 delete .. //depot/projects/wifi/sys/amd64/conf/GENERIC#11 integrate .. //depot/projects/wifi/sys/arm/include/atomic.h#9 integrate .. //depot/projects/wifi/sys/arm/include/clock.h#2 integrate .. //depot/projects/wifi/sys/arm/include/endian.h#6 integrate .. //depot/projects/wifi/sys/boot/common/help.common#3 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/smbios.c#2 integrate .. //depot/projects/wifi/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/wifi/sys/conf/NOTES#25 integrate .. //depot/projects/wifi/sys/conf/files#30 integrate .. //depot/projects/wifi/sys/conf/options#21 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdHardware.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdInterrupt.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_battery.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_if.m#6 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_package.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#10 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_quirk.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#5 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#92 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#39 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli.c#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli.h#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli_crypto.c#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli_ctl.c#1 branch .. //depot/projects/wifi/sys/geom/eli/g_eli_key.c#1 branch .. //depot/projects/wifi/sys/geom/eli/pkcs5v2.c#1 branch .. //depot/projects/wifi/sys/geom/eli/pkcs5v2.h#1 branch .. //depot/projects/wifi/sys/geom/geom_io.c#2 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#13 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.h#7 integrate .. //depot/projects/wifi/sys/geom/zero/g_zero.c#1 branch .. //depot/projects/wifi/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#13 integrate .. //depot/projects/wifi/sys/libkern/iconv.c#3 integrate .. //depot/projects/wifi/sys/modules/geom/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/geom/geom_eli/Makefile#1 branch .. //depot/projects/wifi/sys/modules/geom/geom_zero/Makefile#1 branch .. //depot/projects/wifi/sys/net/bpf.c#12 integrate .. //depot/projects/wifi/sys/net/bpfdesc.h#3 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#4 integrate .. //depot/projects/wifi/sys/net/if_gif.c#4 integrate .. //depot/projects/wifi/sys/net/if_spppsubr.c#7 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#57 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#56 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#49 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#32 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#20 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/wifi/sys/netinet/icmp6.h#4 integrate .. //depot/projects/wifi/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/wifi/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#13 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/wifi/sys/netinet6/ah_aesxcbcmac.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ah_core.c#5 integrate .. //depot/projects/wifi/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/wifi/sys/netinet6/in6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/in6.h#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_src.c#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/wifi/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/wifi/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/wifi/sys/netinet6/ip6_output.c#8 integrate .. //depot/projects/wifi/sys/netinet6/ip6_var.h#5 integrate .. //depot/projects/wifi/sys/netinet6/ipsec.c#6 integrate .. //depot/projects/wifi/sys/netinet6/mld6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/nd6.c#5 integrate .. //depot/projects/wifi/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/wifi/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#7 integrate .. //depot/projects/wifi/sys/netinet6/route6.c#3 integrate .. //depot/projects/wifi/sys/netinet6/scope6.c#4 integrate .. //depot/projects/wifi/sys/netinet6/scope6_var.h#3 integrate .. //depot/projects/wifi/sys/netinet6/udp6_output.c#4 integrate .. //depot/projects/wifi/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/wifi/sys/netkey/key.c#4 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_node.c#11 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_socket.c#12 integrate .. //depot/projects/wifi/sys/pci/if_de.c#6 integrate .. //depot/projects/wifi/sys/pci/if_devar.h#4 integrate .. //depot/projects/wifi/sys/pci/if_sis.c#6 integrate .. //depot/projects/wifi/sys/pci/if_xl.c#8 integrate .. //depot/projects/wifi/sys/sparc64/include/cpufunc.h#3 integrate .. //depot/projects/wifi/sys/sys/param.h#15 integrate .. //depot/projects/wifi/sys/vm/uma.h#7 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#13 integrate .. //depot/projects/wifi/tools/regression/geom_eli/attach-d.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/delkey.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/detach-l.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/init.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/kill.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/onetime-d.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/onetime.t#1 branch .. //depot/projects/wifi/tools/regression/geom_eli/setkey.t#1 branch .. //depot/projects/wifi/tools/regression/netinet/msocket/Makefile#1 branch .. //depot/projects/wifi/tools/regression/netinet/msocket/msocket.c#1 branch .. //depot/projects/wifi/tools/regression/netinet/udpconnectjail/udpconnectjail.c#2 integrate .. //depot/projects/wifi/tools/tools/README#6 integrate .. //depot/projects/wifi/tools/tools/ath/80211debug.c#7 integrate .. //depot/projects/wifi/tools/tools/ath/80211stats.c#11 integrate .. //depot/projects/wifi/tools/tools/bpfstat/Makefile#1 branch .. //depot/projects/wifi/tools/tools/bpfstat/bpfstat.8#1 branch .. //depot/projects/wifi/tools/tools/bpfstat/bpfstat.c#1 branch .. //depot/projects/wifi/tools/tools/bpfstat/bpfstat.h#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/Files/root/change_password#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Files/root/save_sshkeys#2 integrate .. //depot/projects/wifi/tools/tools/nanobsd/Files/root/updatep#1 branch .. //depot/projects/wifi/tools/tools/nanobsd/i386.diskimage#8 integrate .. //depot/projects/wifi/tools/tools/nanobsd/make.conf#11 integrate .. //depot/projects/wifi/tools/tools/nanobsd/nanobsd.sh#1 branch .. //depot/projects/wifi/usr.bin/dig/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/host/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/netstat/mbuf.c#3 integrate .. //depot/projects/wifi/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/wifi/usr.sbin/acpi/acpiconf/acpiconf.c#4 integrate .. //depot/projects/wifi/usr.sbin/dnssec-keygen/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/dnssec-signzone/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/jail/jail.8#10 integrate .. //depot/projects/wifi/usr.sbin/named-checkconf/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/named-checkzone/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/named/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/ndiscvt/ndisgen.8#3 integrate .. //depot/projects/wifi/usr.sbin/ndiscvt/ndisgen.sh#3 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/main.c#4 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/perform.c#3 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/pkg_version.1#7 integrate .. //depot/projects/wifi/usr.sbin/pkg_install/version/version.h#3 integrate .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/wifi/usr.sbin/powerd/powerd.c#4 integrate .. //depot/projects/wifi/usr.sbin/rndc-confgen/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/rndc/Makefile#2 integrate Differences ... ==== //depot/projects/wifi/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.321 2005/07/19 11:21:14 ru Exp $ +# $FreeBSD: src/Makefile,v 1.322 2005/07/23 14:23:30 netchild Exp $ # # The user-driven targets are: # @@ -16,6 +16,9 @@ # reinstallkernel.debug # kernel - buildkernel + installkernel. # update - Convenient way to update your source tree (cvs). +# check-old - Print a list of old files/directories in the system. +# delete-old - Delete obsolete files and directories interactively. +# delete-old-libs - Delete obsolete libraries interactively. # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the @@ -38,15 +41,17 @@ # For individuals wanting to upgrade their sources (even if only a # delta of a few days): # -# 1. `cd /usr/src' (or to the directory containing your source tree). -# 2. `make buildworld' -# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). -# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). -# 5. `reboot' (in single user mode: boot -s from the loader prompt). -# 6. `mergemaster -p' -# 7. `make installworld' -# 8. `mergemaster' -# 9. `reboot' +# 1. `cd /usr/src' (or to the directory containing your source tree). +# 2. `make buildworld' +# 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 5. `reboot' (in single user mode: boot -s from the loader prompt). +# 6. `mergemaster -p' +# 7. `make installworld' +# 8. `make delete-old' +# 9. `mergemaster' +# 10. `reboot' +# 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) # # See src/UPDATING `COMMON ITEMS' for more complete information. # @@ -62,9 +67,9 @@ # developer convenience only. They are intentionally not documented and # completely subject to change without notice. # -TGTS= all all-man buildenv buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distributeworld \ - distrib-dirs distribution everything \ +TGTS= all all-man buildenv buildkernel buildworld check-old checkdpadd \ + clean cleandepend cleandir delete-old delete-old-libs depend \ + distribute distributeworld distrib-dirs distribution everything \ hierarchy install installcheck installkernel installkernel.debug\ reinstallkernel reinstallkernel.debug installworld \ kernel-toolchain libraries lint maninstall \ ==== //depot/projects/wifi/Makefile.inc1#22 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.500 2005/07/15 14:38:54 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.502 2005/07/25 14:44:09 des Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -973,14 +973,6 @@ lib/libopie__L lib/libtacplus__L: lib/libmd__L -.if !defined(NO_BIND) -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -_prebuild_libs+= lib/libc_r -.else -_prebuild_libs+= lib/libpthread -.endif -.endif - _generic_libs+= lib .if !defined(NO_CRYPT) @@ -1058,3 +1050,95 @@ .endfor .include <bsd.subdir.mk> + +# +# check for / delete old files section +# + +.include "ObsoleteFiles.inc" + +OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \ +else you can not start such an application. Consult UPDATING for more \ +information regarding how to cope with the removal/revision bump of a \ +specific library." + +.if !defined(BATCH_DELETE_OLD_FILES) +RM_I=-i +.endif + +delete-old-files: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old files (only deletes safe to delete libs)" +.for file in ${OLD_FILES} +# Ask for every old file if the user really wants to remove it. +# It's anoying, but beter safe than sorry. + @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ + || ([ -f "${DESTDIR}/${file}" ] \ + && echo "Removing schg flag on ${DESTDIR}/${file}" \ + && chflags noschg "${DESTDIR}/${file}" \ + && rm ${RM_I} "${DESTDIR}/${file}")) +.endfor + @echo ">>> Old files removed" + +check-old-files: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old files" +.for file in ${OLD_FILES} + @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" +.endfor + +delete-old-libs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old libraries" + @echo "${OLD_LIBS_MESSAGE}" | fmt +.for file in ${OLD_LIBS} + @[ ! -f "${DESTDIR}/${file}" ] || (rm ${RM_I} "${DESTDIR}/${file}" \ + || ([ -f "${DESTDIR}/${file}" ] \ + && echo "Removing schg flag on ${DESTDIR}/${file}" \ + && chflags noschg "${DESTDIR}/${file}" \ + && rm ${RM_I} "${DESTDIR}/${file}")) +.endfor + @echo ">>> Old libraries removed" + +check-old-libs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old libraries" +.for file in ${OLD_LIBS} + @[ ! -f "${DESTDIR}/${file}" ] || echo "${DESTDIR}/${file}" +.endfor + +delete-old-dirs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Removing old directories" +.for dir in ${OLD_DIRS} +# Don't fail if an old directory isn't empty. + @[ ! -d "${DESTDIR}/${dir}" ] || (rmdir -v "${DESTDIR}/${dir}" || true) +.endfor + @echo ">>> Old directories removed" + +check-old-dirs: +.if defined(${TARGET_ARCH}) +.error "You have to run this in a native environment!" +.endif + @echo ">>> Checking for old directories" +.for dir in ${OLD_DIRS} + @[ ! -d "${DESTDIR}/${dir}" ] || echo "${DESTDIR}/${dir}" +.endfor + +delete-old: delete-old-files delete-old-dirs + @echo "To remove old libraries run '${MAKE} delete-old-libs'." + +check-old: check-old-files check-old-libs check-old-dirs + @echo "To remove old files and directories run '${MAKE} delete-old'." + @echo "To remove old libraries run '${MAKE} delete-old-libs'." + ==== //depot/projects/wifi/UPDATING#18 (text+ko) ==== @@ -21,6 +21,13 @@ developers choose to disable these features on build machines to maximize performance. +20050722: + The ai_addrlen of a struct addrinfo was changed to a socklen_t + to conform to POSIX-2001. This change broke an ABI + compatibility on 64 bit architecture. You have to recompile + userland programs that use getaddrinfo(3) on 64 bit + architecture. + 20050711: RELENG_6 branched here. @@ -270,6 +277,7 @@ <reboot in single user> [3] mergemaster -p [5] make installworld + make delete-old mergemaster [4] <reboot> @@ -307,6 +315,7 @@ <reboot in single user> [3] mergemaster -p [5] make installworld + make delete-old mergemaster -i [4] <reboot> @@ -400,4 +409,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.417 2005/07/11 15:46:45 kensmith Exp $ +$FreeBSD: src/UPDATING,v 1.419 2005/07/23 14:23:30 netchild Exp $ ==== //depot/projects/wifi/contrib/bind9/FREEBSD-Upgrade#4 (text+ko) ==== @@ -43,11 +43,12 @@ 7) Generate and run configure: - $ autoconf253 - $ autoheader253 + $ aclocal + $ autoheader + $ autoconf $ ./configure --prefix=/usr \ --infodir=/usr/share/info --mandir=/usr/share/man \ - --enable-threads --enable-libbind --disable-ipv6 \ + --disable-threads --enable-libbind --disable-ipv6 \ --enable-getifaddrs --disable-linux-caps \ --with-openssl=/usr --with-randomdev=/dev/random @@ -55,9 +56,20 @@ command line; src/lib/bind/config.mk will re-enable it at compile time if NO_INET6 is not defined. -8) Copy the resulting config.h to src/lib/bind, add an RCS id tag and - commit it. Do not commit any other file that was modified or - created in steps 6) or 7). +8) Copy the following generated files to src/lib/bind and commit them: + + Path in src/contrib/bind9 Path in src/lib/bind + ------------------------------------------------------------ + config.h config.h + lib/bind/config.h bind/config.h + lib/bind/port_after.h bind/port_after.h + lib/bind/port_before.h bind/port_before.h + lib/isc/include/isc/platform.h isc/isc/platform.h + lib/lwres/include/lwres/netdb.h lwres/lwres/netdb.h + lib/lwres/include/lwres/platform.h lwres/lwres/platform.h + + Do not commit any other file that was modified or created in + steps 6) or 7). 9) cd src/lib/bind/dns && make -DMAINTAINER_MODE generate && rm gen Commit the new versions of the files generated. @@ -102,4 +114,4 @@ -- des@FreeBSD.org -- dougb@FreeBSD.org -$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.4 2005/03/17 08:40:41 dougb Exp $ +$FreeBSD: src/contrib/bind9/FREEBSD-Upgrade,v 1.5 2005/07/25 17:14:00 des Exp $ ==== //depot/projects/wifi/etc/rc.d/dhclient#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.20 2005/06/30 17:50:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.21 2005/07/26 00:37:19 brooks Exp $ # # PROVIDE: dhclient @@ -23,7 +23,6 @@ if [ -x /usr/bin/pgrep ]; then pids=`/usr/bin/pgrep -f "dhclient: $ifn(\$| .*)"` if [ -n "$pids" ]; then - echo "${name} ${ifn}: already running?" exit 0 fi fi ==== //depot/projects/wifi/games/fortune/fortune/fortune.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.27 2005/02/17 18:06:37 ru Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.29 2005/07/23 18:24:47 ache Exp $"); # include <sys/stat.h> # include <sys/endian.h> ==== //depot/projects/wifi/include/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.244 2005/06/09 19:45:05 jkoshy Exp $ +# $FreeBSD: src/include/Makefile,v 1.245 2005/07/27 21:47:54 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -42,8 +42,8 @@ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ fs/nwfs fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ - geom/concat geom/gate geom/label geom/mirror geom/nop geom/raid3 \ - geom/shsec geom/stripe \ + geom/concat geom/eli geom/gate geom/label geom/mirror geom/nop \ + geom/raid3 geom/shsec geom/stripe \ isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ ==== //depot/projects/wifi/include/netdb.h#7 (text+ko) ==== @@ -55,7 +55,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 * From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $ - * $FreeBSD: src/include/netdb.h,v 1.38 2005/06/03 03:32:06 ume Exp $ + * $FreeBSD: src/include/netdb.h,v 1.39 2005/07/22 18:21:28 ume Exp $ */ #ifndef _NETDB_H_ @@ -63,8 +63,6 @@ #include <sys/cdefs.h> #include <sys/_types.h> -#include <machine/_limits.h> -#include <machine/endian.h> #ifndef _SIZE_T_DECLARED typedef __size_t size_t; @@ -125,29 +123,12 @@ int p_proto; /* protocol # */ }; -/* - * Note: ai_addrlen used to be a size_t, per RFC 2553. - * In XNS5.2, and subsequently in POSIX-2001 and RFC 3493 it was - * changed to a socklen_t. - * To accomodate for this while preserving binary compatibility with the - * old interface, we prepend or append 32 bits of padding, depending on - * the (LP64) architecture's endianness. - * - * This should be deleted the next time the libc major number is - * incremented. - */ struct addrinfo { int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */ int ai_family; /* PF_xxx */ int ai_socktype; /* SOCK_xxx */ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _BIG_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif socklen_t ai_addrlen; /* length of ai_addr */ -#if __LONG_BIT == 64 && _BYTE_ORDER == _LITTLE_ENDIAN - uint32_t __ai_pad0; /* ABI compatibility */ -#endif char *ai_canonname; /* canonical name for hostname */ struct sockaddr *ai_addr; /* binary address */ struct addrinfo *ai_next; /* next structure in linked list */ ==== //depot/projects/wifi/lib/bind/bind/config.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/bind/config.h,v 1.1 2004/09/21 19:01:42 des Exp $ */ +/* $FreeBSD: src/lib/bind/bind/config.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* #undef _SOCKADDR_LEN */ @@ -46,3 +46,11 @@ #endif /* #undef BROKEN_IN6ADDR_INIT_MACROS */ #define HAVE_STRLCAT 1 +/* Shut up warnings about missing braces */ +/* #undef SHUTUP_MUTEX_INITIALIZER */ +#ifdef SHUTUP_MUTEX_INITIALIZER +#define LIBBIND_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER } +#else +#define LIBBIND_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif + ==== //depot/projects/wifi/lib/bind/config.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/config.h,v 1.2 2005/03/17 08:37:32 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/config.h,v 1.3 2005/07/25 14:44:09 des Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -36,7 +36,7 @@ /* #undef NEED_PTHREAD_INIT */ /* define if your system has sigwait() */ -#define HAVE_SIGWAIT 1 +/* #undef HAVE_SIGWAIT */ /* define if sigwait() is the UnixWare flavor */ /* #undef HAVE_UNIXWARE_SIGWAIT */ @@ -48,7 +48,7 @@ /* #undef HAVE_LINUXTHREADS */ /* define if sysconf() is available */ -#define HAVE_SYSCONF 1 +/* #undef HAVE_SYSCONF */ /* define if sysctlbyname() is available */ #define HAVE_SYSCTLBYNAME 1 @@ -129,10 +129,10 @@ #define PATH_RANDOMDEV "/dev/random" /* define if pthread_attr_getstacksize() is available */ -#define HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_GETSTACKSIZE */ /* define if pthread_attr_setstacksize() is available */ -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 +/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */ /* define if you have strerror in the C library. */ #define HAVE_STRERROR 1 @@ -149,6 +149,9 @@ /* Define if threads need PTHREAD_SCOPE_SYSTEM */ /* #undef NEED_PTHREAD_SCOPE_SYSTEM */ +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef HAVE_DLFCN_H */ + /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 @@ -165,7 +168,7 @@ /* #undef HAVE_LIBNSL */ /* Define to 1 if you have the `pthread' library (-lpthread). */ -#define HAVE_LIBPTHREAD 1 +/* #undef HAVE_LIBPTHREAD */ /* Define to 1 if you have the `scf' library (-lscf). */ /* #undef HAVE_LIBSCF */ @@ -252,9 +255,11 @@ /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus /* #undef inline */ +#endif /* Define to `unsigned' if <sys/types.h> does not define. */ /* #undef size_t */ ==== //depot/projects/wifi/lib/bind/config.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.14 2005/03/17 08:35:21 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.15 2005/07/25 14:44:09 des Exp $ # BIND version number .if defined(BIND_DIR) && exists(${BIND_DIR}/version) @@ -74,7 +74,7 @@ CFLAGS+= -I${BIND_DIR}/lib/isccfg/include LIBISC= ${LIB_BIND_REL}/isc/libisc.a CFLAGS+= -I${BIND_DIR}/lib/isc/unix/include \ - -I${BIND_DIR}/lib/isc/pthreads/include \ + -I${BIND_DIR}/lib/isc/nothreads/include \ -I${BIND_DIR}/lib/isc/include \ -I${LIB_BIND_DIR}/isc LIBLWRES= ${LIB_BIND_REL}/lwres/liblwres.a @@ -95,17 +95,3 @@ CRYPTO_DPADD= ${LIBCRYPTO} CRYPTO_LDADD= -lcrypto .endif - -# Link against POSIX threads library -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" -.if defined(NO_LIBC_R) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBC_R" -.endif -.else -.if defined(NO_LIBPTHREAD) -.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBPTHREAD" -.endif -.endif - -PTHREAD_DPADD= ${LIBPTHREAD} -PTHREAD_LDADD= -lpthread ==== //depot/projects/wifi/lib/bind/isc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/isc/Makefile,v 1.4 2004/09/24 18:42:04 dougb Exp $ +# $FreeBSD: src/lib/bind/isc/Makefile,v 1.5 2005/07/25 14:44:09 des Exp $ BIND_DIR= ${.CURDIR}/../../../contrib/bind9 LIB_BIND_REL= .. @@ -19,7 +19,7 @@ .PATH: ${SRCDIR}/nls SRCS+= msgcat.c \ -.PATH: ${SRCDIR}/pthreads +.PATH: ${SRCDIR}/nothreads SRCS+= condition.c mutex.c \ thread.c @@ -35,7 +35,7 @@ serial.c sha1.c sockaddr.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c -CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/nothreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} DPADD= ${PTHREAD_DPADD} @@ -104,10 +104,10 @@ ${SRCDIR}/include/isc/types.h \ ${SRCDIR}/include/isc/util.h \ ${SRCDIR}/include/isc/version.h \ - ${SRCDIR}/pthreads/include/isc/condition.h \ - ${SRCDIR}/pthreads/include/isc/mutex.h \ - ${SRCDIR}/pthreads/include/isc/once.h \ - ${SRCDIR}/pthreads/include/isc/thread.h \ + ${SRCDIR}/nothreads/include/isc/condition.h \ + ${SRCDIR}/nothreads/include/isc/mutex.h \ + ${SRCDIR}/nothreads/include/isc/once.h \ + ${SRCDIR}/nothreads/include/isc/thread.h \ ${SRCDIR}/unix/include/isc/dir.h \ ${SRCDIR}/unix/include/isc/int.h \ ${SRCDIR}/unix/include/isc/keyboard.h \ ==== //depot/projects/wifi/lib/bind/isc/isc/platform.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.1 2004/09/21 19:01:43 des Exp $ */ +/* $FreeBSD: src/lib/bind/isc/isc/platform.h,v 1.2 2005/07/25 14:44:09 des Exp $ */ /* * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") @@ -158,7 +158,7 @@ /* * Defined if we are using threads. */ -#define ISC_PLATFORM_USETHREADS 1 +#undef ISC_PLATFORM_USETHREADS /* * Defined if unistd.h does not cause fd_set to be delared. ==== //depot/projects/wifi/lib/libc/gen/getnetgrent.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)getnetgrent.c 8.2 (Berkeley) 4/27/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33 2005/01/13 18:33:01 jon Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.34 2005/07/22 22:20:26 jon Exp $"); #include <ctype.h> #include <stdio.h> @@ -305,22 +305,44 @@ } static int -_buildkey(char *key, const char *str, const char *dom, int *rotation) +_revnetgr_lookup(char* lookupdom, char* map, const char* str, + const char* dom, const char* group) { - (*rotation)++; - if (*rotation > 4) - return(0); - switch(*rotation) { - case(1): sprintf((char *)key, "%s.%s", str, dom ? dom : "*"); - break; - case(2): sprintf((char *)key, "%s.*", str); - break; - case(3): sprintf((char *)key, "*.%s", dom ? dom : "*"); - break; - case(4): sprintf((char *)key, "*.*"); - break; + int y, rv, rot; + char key[MAXHOSTNAMELEN]; + char *result; + int resultlen; + + for (rot = 0; ; rot++) { + switch (rot) { + case(0): snprintf(key, MAXHOSTNAMELEN, "%s.%s", + str, dom?dom:lookupdom); + break; + case(1): snprintf(key, MAXHOSTNAMELEN, "%s.*", + str); + break; + case(2): snprintf(key, MAXHOSTNAMELEN, "*.%s", + dom?dom:lookupdom); + break; + case(3): snprintf(key, MAXHOSTNAMELEN, "*.*"); + break; + default: return(0); + } + y = yp_match(lookupdom, map, key, strlen(key), &result, + &resultlen); + if (y == 0) { + rv = _listmatch(result, group, resultlen); + free(result); + if (rv) return(1); + } else if (y != YPERR_KEY) { + /* + * If we get an error other than 'no + * such key in map' then something is + * wrong and we should stop the search. + */ + return(-1); + } } - return(1); } #endif @@ -331,11 +353,6 @@ innetgr(const char *group, const char *host, const char *user, const char *dom) { char *hst, *usr, *dm; -#ifdef YP - char *result; - int resultlen; - int rv; -#endif /* Sanity check */ if (group == NULL || !strlen(group)) @@ -350,44 +367,36 @@ /* * If we're in NIS-only mode, do the search using * NIS 'reverse netgroup' lookups. + * + * What happens with 'reverse netgroup' lookups: + * + * 1) try 'reverse netgroup' lookup + * 1.a) if host is specified and user is null: + * look in netgroup.byhost + * (try host.domain, host.*, *.domain or *.*) + * if found, return yes + * 1.b) if user is specified and host is null: + * look in netgroup.byuser + * (try host.domain, host.*, *.domain or *.*) + * if found, return yes + * 1.c) if both host and user are specified, + * don't do 'reverse netgroup' lookup. It won't work. + * 1.d) if neither host ane user are specified (why?!?) + * don't do 'reverse netgroup' lookup either. + * 2) if domain is specified and 'reverse lookup' is done: + * 'reverse lookup' was authoritative. bye bye. + * 3) otherwise, too bad, try it the slow way. */ - if (_use_only_yp) { - char _key[MAXHOSTNAMELEN]; - int rot = 0, y = 0; - + if (_use_only_yp && (host == NULL) != (user == NULL)) { + int ret; if(yp_get_default_domain(&_netgr_yp_domain)) return(0); - while(_buildkey(_key, user ? user : host, dom, &rot)) { - y = yp_match(_netgr_yp_domain, user? "netgroup.byuser": - "netgroup.byhost", _key, strlen(_key), &result, - &resultlen); - if (y) { - /* - * If we get an error other than 'no - * such key in map' then something is - * wrong and we should stop the search. - */ - if (y != YPERR_KEY) - break; - } else { - rv = _listmatch(result, group, resultlen); - free(result); - if (rv) - return(1); - else - return(0); - } - } - /* - * Couldn't match using NIS-exclusive mode. If the error - * was YPERR_MAP, then the failure happened because there - * was no netgroup.byhost or netgroup.byuser map. The odds - * are we are talking to a Sun NIS+ server in YP emulation - * mode; if this is the case, then we have to do the check - * the 'old-fashioned' way by grovelling through the netgroup - * map and resolving memberships on the fly. - */ - if (y != YPERR_MAP) + ret = _revnetgr_lookup(_netgr_yp_domain, + host?"netgroup.byhost":"netgroup.byuser", + host?host:user, dom, group); + if (ret == 1) + return(1); + else if (ret == 0 && dom != NULL) return(0); } ==== //depot/projects/wifi/lib/libc/gen/getttyent.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $"); #include <ttyent.h> #include <stdio.h> @@ -105,6 +105,10 @@ zapchar = 0; tty.ty_name = p; + tty.ty_status = 0; + tty.ty_window = NULL; + tty.ty_group = _TTYS_NOGROUP; + p = skip(p); if (!*(tty.ty_getty = p)) tty.ty_getty = tty.ty_type = NULL; @@ -121,9 +125,6 @@ p = skip(p); } } - tty.ty_status = 0; - tty.ty_window = NULL; - tty.ty_group = _TTYS_NOGROUP; for (; *p; p = skip(p)) { if (scmp(_TTYS_OFF)) ==== //depot/projects/wifi/lib/libc/net/getaddrinfo.c#10 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.69 2005/05/15 20:15:15 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.70 2005/07/22 18:21:28 ume Exp $"); #include "namespace.h" #include <sys/types.h> @@ -1352,9 +1352,6 @@ memset(ai->ai_addr, 0, (size_t)afd->a_socklen); ai->ai_addr->sa_len = afd->a_socklen; ai->ai_addrlen = afd->a_socklen; -#if __LONG_BIT == 64 - ai->__ai_pad0 = 0; /* ABI compatibility */ -#endif ai->ai_addr->sa_family = ai->ai_family = afd->a_af; p = (char *)(void *)(ai->ai_addr); #ifdef FAITH ==== //depot/projects/wifi/lib/libc/net/inet_pton.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.11 2002/09/06 11:23:49 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.12 2005/07/27 14:33:36 ume Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -88,6 +88,8 @@ if ((pch = strchr(digits, ch)) != NULL) { u_int new = *tp * 10 + (pch - digits); + if (saw_digit && *tp == 0) + return (0); if (new > 255) return (0); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507280158.j6S1wAvF099857>