Date: Fri, 29 Nov 2002 01:56:45 -0800 (PST) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 21660 for review Message-ID: <200211290956.gAT9ujqZ045684@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=21660 Change 21660 by marcel@marcel_vaio on 2002/11/29 01:56:19 IFC @21651 Affected files ... .. //depot/projects/ia64/Makefile#16 integrate .. //depot/projects/ia64/lib/libc/net/if_nametoindex.c#2 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#3 integrate .. //depot/projects/ia64/lib/libfetch/http.c#10 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.c#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#11 integrate .. //depot/projects/ia64/sys/sys/select.h#6 integrate .. //depot/projects/ia64/sys/sys/signal.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#7 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#14 integrate Differences ... ==== //depot/projects/ia64/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.268 2002/10/02 13:52:36 phk Exp $ +# $FreeBSD: src/Makefile,v 1.269 2002/11/28 13:08:09 ru Exp $ # # The user-driven targets are: # @@ -158,39 +158,15 @@ # # Perform a few tests to determine if the installed tools are adequate -# for building the world. These are for older systems (prior to 2.2.5). +# for building the world. # -# From 2.2.5 onwards, the installed tools will pass these upgrade tests, -# so the normal make world is capable of doing what is required to update -# the system to current. -# upgrade_checks: - @cd ${.CURDIR}; \ - if ! make -m ${.CURDIR}/share/mk -Dnotdef test >/dev/null 2>&1; then \ - make make; \ - fi - @cd ${.CURDIR}; \ - if make -V .CURDIR:C/.// 2>&1 >/dev/null | \ - grep -q "Unknown modifier 'C'"; then \ - make make; \ - fi + @(cd ${.CURDIR}/tools/regression/usr.bin/make && make 2>/dev/null) || \ + (cd ${.CURDIR} && make make) # -# A simple test target used as part of the test to see if make supports -# the -m argument. Also test that make will only evaluate a conditional -# as far as is necessary to determine its value. -# -test: -.if defined(notdef) -.undef notdef -.if defined(notdef) && ${notdef:U} -.endif -.endif - -# # Upgrade the installed make to the current version using the installed -# headers, libraries and build tools. This is required on installed versions -# prior to 2.2.5 in which the installed make doesn't support the -m argument. +# headers, libraries and tools. # make: @echo ==== //depot/projects/ia64/lib/libc/net/if_nametoindex.c#2 (text+ko) ==== @@ -26,10 +26,11 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/if_nametoindex.c,v 1.1 2002/07/15 19:58:56 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/if_nametoindex.c,v 1.2 2002/11/28 17:46:40 ume Exp $"); #include <sys/types.h> #include <sys/socket.h> +#include <sys/sockio.h> #include <net/if.h> #include <net/if_dl.h> #include <ifaddrs.h> @@ -59,9 +60,21 @@ unsigned int if_nametoindex(const char *ifname) { + int s; + struct ifreq ifr; struct ifaddrs *ifaddrs, *ifa; unsigned int ni; + s = _socket(AF_INET, SOCK_DGRAM, 0); + if (s != -1) { + strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); + if (_ioctl(s, SIOCGIFINDEX, &ifr) != -1) { + _close(s); + return (ifr.ifr_index); + } + _close(s); + } + if (getifaddrs(&ifaddrs) < 0) return(0); ==== //depot/projects/ia64/lib/libfetch/fetch.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.48 2002/11/08 19:10:05 fenner Exp $ +.\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.49 2002/11/28 12:07:15 des Exp $ .\" .Dd July 1, 1998 .Dt FETCH 3 @@ -511,6 +511,11 @@ This variable is used if and only if connected to an HTTP proxy, and is ignored if a user and/or a password were specified in the proxy URL. +.It Ev HTTP_REFERER +Specifies the referer URL to use for HTTP requests. +If set to +.Dq auto , +the document URL will be used as referer URL. .It Ev HTTP_USER_AGENT Specifies the User-Agent string to use for HTTP requests. This can be useful when working with HTTP origin or proxy servers that ==== //depot/projects/ia64/lib/libfetch/http.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.64 2002/10/30 15:01:29 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.65 2002/11/28 12:07:15 des Exp $"); /* * The following copyright applies to the base64 code: @@ -776,10 +776,7 @@ const char *p; FILE *f; hdr_t h; - char *host; -#ifdef INET6 - char hbuf[MAXHOSTNAMELEN + 1]; -#endif + char hbuf[MAXHOSTNAMELEN + 7], *host; direct = CHECK_FLAG('d'); noredirect = CHECK_FLAG('A'); @@ -831,24 +828,29 @@ host = hbuf; } #endif + if (url->port != _fetch_default_port(url->scheme)) { + if (host != hbuf) { + strcpy(hbuf, host); + host = hbuf; + } + snprintf(hbuf + strlen(hbuf), + sizeof(hbuf) - strlen(hbuf), ":%d", url->port); + } /* send request */ if (verbose) - _fetch_info("requesting %s://%s:%d%s", - url->scheme, host, url->port, url->doc); + _fetch_info("requesting %s://%s%s", + url->scheme, host, url->doc); if (purl) { - _http_cmd(conn, "%s %s://%s:%d%s HTTP/1.1", - op, url->scheme, host, url->port, url->doc); + _http_cmd(conn, "%s %s://%s%s HTTP/1.1", + op, url->scheme, host, url->doc); } else { _http_cmd(conn, "%s %s HTTP/1.1", op, url->doc); } /* virtual host */ - if (url->port == _fetch_default_port(url->scheme)) - _http_cmd(conn, "Host: %s", host); - else - _http_cmd(conn, "Host: %s:%d", host, url->port); + _http_cmd(conn, "Host: %s", host); /* proxy authorization */ if (purl) { @@ -874,6 +876,13 @@ } /* other headers */ + if ((p = getenv("HTTP_REFERER")) != NULL && *p != '\0') { + if (strcasecmp(p, "auto") == 0) + _http_cmd(conn, "Referer: %s://%s%s", + url->scheme, host, url->doc); + else + _http_cmd(conn, "Referer: %s", p); + } if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0') _http_cmd(conn, "User-Agent: %s", p); else ==== //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.c,v 1.1 2002/05/28 20:52:31 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ksu/pam_ksu.c,v 1.3 2002/11/28 20:11:31 des Exp $"); #include <sys/param.h> #include <errno.h> @@ -58,7 +58,7 @@ char *su_principal_name; long rv; int pamret; - + pamret = pam_get_user(pamh, &user, NULL); if (pamret != PAM_SUCCESS) return (pamret); @@ -238,7 +238,7 @@ *su_principal_name = NULL; (void)asprintf(su_principal_name, "%s/%s@%s", principal_name, superuser, p); free(principal_name); - } else + } else *su_principal_name = principal_name; if (*su_principal_name == NULL) @@ -254,3 +254,5 @@ *su_principal = default_principal; return (0); } + +PAM_MODULE_ENTRY("pam_ksu"); ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 (text+ko) ==== @@ -26,7 +26,7 @@ <corpauthor>The &os; Release Engineering Team</corpauthor> </authorgroup> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.6 2002/11/25 21:14:16 keramida Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.7 2002/11/28 19:50:56 bmah Exp $</pubdate> <copyright> <year>2002</year> @@ -127,7 +127,7 @@ <para>More information on &os; release engineering processes can be found on the <ulink url="http://www.FreeBSD.org/releng/index.html">Release - Engineering Web pages</ulink> and in the &os; <ulink url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html">Release + Engineering Web pages</ulink> and in the &os; <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/releng/index.html">Release Engineering</ulink> article.</para> </sect1> @@ -164,8 +164,8 @@ </listitem> <listitem> - <para>GCC: The compiler toolchain is now based on GCC - 3.<replaceable>X</replaceable>, rather than GCC + <para>GCC: The compiler toolchain is now based on a GCC + 3.2.1 pre-release snapshot, rather than GCC 2.95.<replaceable>X</replaceable>.</para> </listitem> @@ -222,7 +222,9 @@ <listitem> <para>Because of changes in kernel data structures and ABIs/APIs, third-party binary device drivers will require - modifications to work correctly under &os; 5.0.</para> + modifications to work correctly under &os; 5.0. There is + a possibility of more minor ABI/API changes before the + 5-STABLE branch is created.</para> </listitem> <listitem> @@ -265,6 +267,14 @@ 5.2-RELEASE.)</para> </listitem> + <listitem> + <para>Documentation (such as the &os; <ulink + url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/index.html">Handbook</ulink>; + and <ulink + url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">FAQ</ulink>) + may not reflect changes recently made to &os; 5.0.</para> + </listitem> + </itemizedlist> <para>Because a number of these drawbacks affect system stability, the @@ -335,14 +345,17 @@ <para>As of this time, the binary upgrade option in &man.sysinstall.8; has not been well-tested for cross-major-version upgrades. Using this feature is not - recommended.</para> + recommended. In particular, a binary upgrade will leave + behind a number of files that are present in &os; + 4.<replaceable>X</replaceable> but not in 5.0. These obsolete + files may create some problems.</para> <para>On the i386 and pc98 platforms, a UserConfig utility exists on 4-STABLE to allow boot-time configuration of ISA devices when booting from installation media. Under &os; 5.0, this functionality has been replaced in part by the &man.device.hints.5; mechanism (it allows specifying the same - parameters, but is not interactive).</para> + parameters, but with a very different interface).</para> <para>Floppy-based binary installations may require downloading a third, new floppy image holding additional device drivers @@ -383,7 +396,15 @@ difficulties which made updates problematic. The base system utilities that used Perl have either been rewritten (if still applicable) or discarded (if - obsolete).</para> + obsolete).<para> + + <para>Some scripts expect to find a Perl interpreter at + <filename>/usr/bin/perl</filename>. The + <filename>use.perl</filename> command, a part of the Perl + port, can be used to create an appropriate set of symbolic + links for them. In particular, <command>use.perl + port</command> will generally set things up as + expected.</para> <para>It is generally possible to run old 4.<replaceable>X</replaceable> executables under ==== //depot/projects/ia64/sys/kern/kern_subr.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.62 2002/10/12 05:32:23 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.63 2002/11/28 08:44:26 alc Exp $ */ #include "opt_zero.h" @@ -104,12 +104,11 @@ return(EFAULT); } if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")) - vm_page_unlock_queues(); - pmap_remove(map->pmap, uaddr, uaddr+PAGE_SIZE); - vm_page_lock_queues(); + do + vm_page_lock_queues(); + while (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")); vm_page_busy(user_pg); + pmap_remove_all(user_pg); vm_page_free(user_pg); vm_page_unlock_queues(); } ==== //depot/projects/ia64/sys/sys/select.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/select.h,v 1.16 2002/11/17 16:22:18 mike Exp $ + * $FreeBSD: src/sys/sys/select.h,v 1.17 2002/11/28 15:34:32 mike Exp $ */ #ifndef _SYS_SELECT_H_ @@ -86,12 +86,12 @@ #endif #define __fdset_mask(n) ((__fd_mask)1 << ((n) % _NFDBITS)) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/_NFDBITS] &= ~__fdset_mask(n)) +#define FD_CLR(n, p) ((p)->__fds_bits[(n)/_NFDBITS] &= ~__fdset_mask(n)) #if __BSD_VISIBLE #define FD_COPY(f, t) (void)(*(t) = *(f)) #endif -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/_NFDBITS] & __fdset_mask(n)) -#define FD_SET(n, p) ((p)->fds_bits[(n)/_NFDBITS] |= __fdset_mask(n)) +#define FD_ISSET(n, p) ((p)->__fds_bits[(n)/_NFDBITS] & __fdset_mask(n)) +#define FD_SET(n, p) ((p)->__fds_bits[(n)/_NFDBITS] |= __fdset_mask(n)) #define FD_ZERO(p) do { \ fd_set *_p; \ __size_t _n; \ ==== //depot/projects/ia64/sys/sys/signal.h#9 (text+ko) ==== @@ -36,13 +36,14 @@ * SUCH DAMAGE. * * @(#)signal.h 8.4 (Berkeley) 5/4/95 - * $FreeBSD: src/sys/sys/signal.h,v 1.37 2002/10/25 19:10:58 peter Exp $ + * $FreeBSD: src/sys/sys/signal.h,v 1.38 2002/11/28 15:32:49 mike Exp $ */ #ifndef _SYS_SIGNAL_H_ #define _SYS_SIGNAL_H_ #include <sys/cdefs.h> +#include <sys/_types.h> #include <sys/_sigset.h> #include <machine/signal.h> /* sig_atomic_t; trap codes; sigcontext */ ==== //depot/projects/ia64/sys/vm/vm_mmap.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_mmap.c,v 1.152 2002/10/22 15:56:44 rwatson Exp $ + * $FreeBSD: src/sys/vm/vm_mmap.c,v 1.153 2002/11/28 08:01:39 alc Exp $ */ /* @@ -883,6 +883,7 @@ pindex = OFF_TO_IDX(offset); m = vm_page_lookup(current->object.vm_object, pindex); + vm_page_lock_queues(); /* * if the page is resident, then gather information about * it. @@ -898,6 +899,7 @@ mincoreinfo |= MINCORE_REFERENCED_OTHER; } } + vm_page_unlock_queues(); } /* ==== //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/tools/regression/usr.bin/make/Makefile,v 1.8 2002/10/25 06:17:44 jmallett Exp $ +# $FreeBSD: src/tools/regression/usr.bin/make/Makefile,v 1.10 2002/11/28 13:21:32 ru Exp $ # Test for broken LHS expansion. -# This *must* case make(1) to detect a recursive variable, and fail as such. +# This *must* cause make(1) to detect a recursive variable, and fail as such. .if make(lhs_expn) FOO= ${BAR} BAR${NIL}= ${FOO} @@ -32,6 +32,15 @@ @echo "Running test lhs_expn" @! ${MAKE} lhs_expn && true || ${MAKE} failure @echo "PASS: Test lhs_expn detected no regression." + @echo "Running test notdef" + @${MAKE} notdef || ${MAKE} failure + @echo "PASS: Test notdef detected no regression." + @echo "Running test modifiers" + @${MAKE} modifiers || ${MAKE} failure + @echo "PASS: Test modifiers detected no regression." + @echo "Running test funny_targets" + @${MAKE} funny_targets || ${MAKE} failure + @echo "PASS: Test funny_targets detected no regression." .if make(double) # Doubly-defined targets. make(1) will warn, but use the "right" one. If it @@ -57,6 +66,30 @@ lhs_expn: @true +.if make(notdef) +# make(1) claims to only evaluate a conditional as far as is necessary +# to determine its value; that was not always the case. +.undef notdef +notdef: +.if defined(notdef) && ${notdef:U} +.endif +.endif + +.if make(modifiers) +# See if make(1) supports the C modifier. +modifiers: + @if ${MAKE} -V .CURDIR:C/.// 2>&1 >/dev/null | \ + grep -q "Unknown modifier 'C'"; then \ + false; \ + fi +.endif + +.if make(funny_targets) +funny_targets: colons::target exclamation!target +colons::target: +exclamation!target: +.endif + failure: @echo "FAIL: Test failed: regression detected. See above." @false ==== //depot/projects/ia64/usr.bin/make/parse.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.49 2002/10/23 01:57:33 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/make/parse.c,v 1.50 2002/11/28 12:47:56 ru Exp $"); /*- * parse.c -- @@ -729,14 +729,15 @@ } else if (*cp == '!' || *cp == ':') { /* * We don't want to end a word on ':' or '!' if there is a - * better match later on in the string. By "better" I mean - * one that is followed by whitespace. This allows the user - * to have targets like: + * better match later on in the string (greedy matching). + * This allows the user to have targets like: * fie::fi:fo: fum - * where "fie::fi:fo" is the target. In real life this is used - * for perl5 library man pages where "::" separates an object - * from its class. Ie: "File::Spec::Unix". This behaviour - * is also consistent with other versions of make. + * foo::bar: + * where "fie::fi:fo" and "foo::bar" are the targets. In + * real life this is used for perl5 library man pages where + * "::" separates an object from its class. + * Ie: "File::Spec::Unix". This behaviour is also consistent + * with other versions of make. */ char *p = cp + 1; @@ -747,11 +748,7 @@ if (*p == '\0' || isspace(*p)) break; - do { - p += strcspn(p, "!:"); - if (*p == '\0') - break; - } while (!isspace(*++p)); + p += strcspn(p, "!:"); /* No better match later on... */ if (*p == '\0') 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?200211290956.gAT9ujqZ045684>