From owner-p4-projects@FreeBSD.ORG Mon Oct 8 23:00:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FB2016A41B; Mon, 8 Oct 2007 23:00:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5176816A419 for ; Mon, 8 Oct 2007 23:00:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4382213C49D for ; Mon, 8 Oct 2007 23:00:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l98N0NFP086694 for ; Mon, 8 Oct 2007 23:00:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l98N0LPR086678 for perforce@freebsd.org; Mon, 8 Oct 2007 23:00:21 GMT (envelope-from jb@freebsd.org) Date: Mon, 8 Oct 2007 23:00:21 GMT Message-Id: <200710082300.l98N0LPR086678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 127323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2007 23:00:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=127323 Change 127323 by jb@jb_freebsd1 on 2007/10/08 22:59:47 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#44 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#39 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/dtrace/ports/LEGAL#22 integrate .. //depot/projects/dtrace/ports/MOVED#43 integrate .. //depot/projects/dtrace/ports/Mk/bsd.java.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#12 integrate .. //depot/projects/dtrace/ports/UPDATING#35 integrate .. //depot/projects/dtrace/src/contrib/less/NEWS#6 integrate .. //depot/projects/dtrace/src/contrib/less/README#6 integrate .. //depot/projects/dtrace/src/contrib/less/ch.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/charset.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/configure#6 integrate .. //depot/projects/dtrace/src/contrib/less/configure.ac#6 integrate .. //depot/projects/dtrace/src/contrib/less/filename.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/funcs.h#6 integrate .. //depot/projects/dtrace/src/contrib/less/jump.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/less.h#6 integrate .. //depot/projects/dtrace/src/contrib/less/less.man#6 integrate .. //depot/projects/dtrace/src/contrib/less/less.nro#6 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.man#4 integrate .. //depot/projects/dtrace/src/contrib/less/lessecho.nro#4 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.man#6 integrate .. //depot/projects/dtrace/src/contrib/less/lesskey.nro#6 integrate .. //depot/projects/dtrace/src/contrib/less/line.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/search.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/signal.c#6 integrate .. //depot/projects/dtrace/src/contrib/less/version.c#6 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/auto-host.h#6 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/dtrace/src/share/man/man4/ata.4#10 integrate .. //depot/projects/dtrace/src/share/man/man4/uscanner.4#8 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#16 integrate .. //depot/projects/dtrace/src/share/zoneinfo/Makefile#4 integrate .. //depot/projects/dtrace/src/share/zoneinfo/africa#7 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#7 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#7 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/dtrace/src/sys/dev/usb/uscanner.c#9 integrate .. //depot/projects/dtrace/src/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/accf_data.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/accf_http.c#4 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/igmp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/in.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/in_cksum.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/in_pcb.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/in_proto.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ecn.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_encap.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fastfwd.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#20 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_gre.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_id.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_input.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_ipsec.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_mroute.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_options.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/ip_output.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#9 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#6 integrate .. //depot/projects/dtrace/src/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/mbuf.h#10 integrate .. //depot/projects/dtrace/src/sys/vm/vm_fault.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#21 integrate .. //depot/projects/dtrace/www/en/news/status/README#2 integrate .. //depot/projects/dtrace/www/en/news/status/report-2006-06-2006-10.xml#2 integrate .. //depot/projects/dtrace/www/en/news/status/report.xsl#5 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#18 integrate .. //depot/projects/dtrace/www/en/ports/categories#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#44 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -221,7 +221,7 @@ NOINET6 for &os; prior to 6.0-RELEASE and NO_INET6 for later releases (for example in &man.make.conf.5;) was defined during the build, it also - requiresoptions INET6. + requires options INET6. Once the kernel module is loaded or the kernel is statically ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#39 (text+ko) ==== @@ -1,7 +1,7 @@ + INSTALL_KLD is a command to install + kernel loadable modules. Some architectures don't like it when + the modules are stripped, therefor use this command instead + of INSTALL_PROGRAM. + + + INSTALL_DATA is a command to install sharable data. ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -4032,7 +4032,8 @@ нь ~/.ssh/id_dsa.pub эсвэл ~/.ssh/id_rsa.pub-д DSA болон RSA түлхүүрийн төрлүүдэд зориулагдан хадгалагддаг. Тохируулга нь ажиллахын тулд нийтийн түлхүүр нь алсын машины - ~/.ssh/authorized_keys файлд хийгдэх ёстой байдаг. + ~/.ssh/authorized_keys файлд DSA болон RSA түлхүүрүүдийн + хоёулангийнх нь хувьд хийгдэх ёстой байдаг. Үүнтэй адилаар нийтийн түлхүүрүүдийн RSA хувилбар нь ~/.ssh/authorized_keys файлд бас хийгдэх ёстой. ==== //depot/projects/dtrace/ports/LEGAL#22 (text+ko) ==== @@ -1,5 +1,5 @@ # Creator: Jordan Hubbard -# $FreeBSD: ports/LEGAL,v 1.553 2007/10/02 19:14:47 alepulver Exp $ +# $FreeBSD: ports/LEGAL,v 1.554 2007/10/05 20:23:11 acm Exp $ ********************************************************************** *** NOTE TO COMMITTERS *** @@ -427,6 +427,8 @@ netshow_linux.gz multimedia/netshow Commercial software nerolinux-* sysutils/linux-nero Must be downloaded from WWW and a Serial Number must be bought +nero2_linux_* games/linux-nerogame Nero is freeware, but i am not + sure of its license nntpcache-* news/nntpcache Commercial or government use requires license nsc2ke.* math/nsc2ke No resale, contact author for ==== //depot/projects/dtrace/ports/MOVED#43 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1490 2007/10/04 09:00:56 linimon Exp $ +# $FreeBSD: ports/MOVED,v 1.1492 2007/10/07 23:09:09 bsam Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3269,3 +3269,5 @@ print/clibpdf||2007-10-01|Has expired: distfile and homepage disappeared print/ruby-clibpdf||2007-10-01|Has expired: required port print/clibpdf deprecated lang/snobol|lang/snobol4|2007-10-04|Use newer version +x11-servers/synaptics|x11-drivers/synaptics|2007-10-06|Change to new category +emulators/linux_base-fc7|emulators/linux_base-f7|2007-10-07|Fedora is no more Core ==== //depot/projects/dtrace/ports/Mk/bsd.java.mk#5 (text+ko) ==== @@ -9,7 +9,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.java.mk,v 1.80 2007/08/05 21:19:47 glewis Exp $ +# $FreeBSD: ports/Mk/bsd.java.mk,v 1.81 2007/10/07 14:42:03 glewis Exp $ # .if !defined(Java_Include) @@ -214,7 +214,7 @@ # Enforce preferred Java ports according to OS . if (${ARCH} == "amd64" && ${OSVERSION} >= 600000 && ${OSVERSION} < 700000) || \ - (${ARCH} == "i386" && ${OSVERSION} >= 500000 && ${OSVERSION} < 700000) + (${ARCH} == "i386" && ${OSVERSION} < 700000) _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_FREEBSD_JDK_1_5 . else _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5 ==== //depot/projects/dtrace/ports/Mk/bsd.python.mk#12 (text+ko) ==== @@ -1,7 +1,7 @@ # -*- mode: Makefile; tab-width: 4; -*- # ex: ts=4 # -# $FreeBSD: ports/Mk/bsd.python.mk,v 1.99 2007/08/04 11:37:24 gabor Exp $ +# $FreeBSD: ports/Mk/bsd.python.mk,v 1.100 2007/10/07 13:50:15 perky Exp $ # .if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include) @@ -204,8 +204,8 @@ # # USE_ZOPE - Use Zope - an object-based web application platform, this # also sets up: -# ZOPEBASEDIR - relative base directory of zope server -# SZOPEBASEDIR - absolute base directory of zope that is +# SZOPEBASEDIR - relative base directory of zope server +# ZOPEBASEDIR - absolute base directory of zope that is # ${LOCALBASE}/${SZOPEBASEDIR} by default, # ZOPEPRODUCTDIR - directory, where products for zope can be found # @@ -431,7 +431,11 @@ PYDISTUTILS_BUILD_TARGET?= bdist_egg PYDISTUTILS_INSTALL_TARGET?= easy_install -PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYEASYINSTALL_EGG} +PYDISTUTILS_INSTALLARGS?= -O 1 -N -S ${PYTHON_SITELIBDIR} \ + -d ${PYEASYINSTALL_SITELIBDIR} \ + -s ${PYEASYINSTALL_BINDIR} \ + ${WRKSRC}/dist/${PYEASYINSTALL_EGG} +MAKE_ENV+= PYTHONPATH=${PYEASYINSTALL_SITELIBDIR} .if defined(PYEASYINSTALL_ARCHDEP) _OSRELEASE!= ${UNAME} -r @@ -439,13 +443,23 @@ .endif PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER} +PYEASYINSTALL_BINDIR?= ${PREFIX}/bin +PYEASYINSTALL_SITELIBDIR?= ${PYTHONPREFIX_SITELIBDIR} PYEASYINSTALL_INSTALLARGS?= -q -N -S ${PYTHON_SITELIBDIR} \ + -d ${PYEASYINSTALL_SITELIBDIR} \ + -s ${PYEASYINSTALL_BINDIR} \ ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} PYEASYINSTALL_UNINSTALLARGS?= -q -m -S ${PYTHON_SITELIBDIR} \ + -d ${PYEASYINSTALL_SITELIBDIR} \ + -s ${PYEASYINSTALL_BINDIR} \ ${PYDISTUTILS_PKGNAME}==${PYDISTUTILS_PKGVERSION} PLIST_SUB+= PYEASYINSTALL_EGG=${PYEASYINSTALL_EGG} +pre-install: pre-install-easyinstall +pre-install-easyinstall: + @${MKDIR} ${PYEASYINSTALL_SITELIBDIR} + add-plist-post: add-plist-easyinstall add-plist-easyinstall: @# @unexec line must be located before any other line while @exec must not. @@ -453,7 +467,8 @@ @${ECHO_CMD} "@unexec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_UNINSTALLARGS}" \ > ${TMPPLIST} @${CAT} ${TMPPLIST}.pei_tmp >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \ + @${ECHO_CMD} "@exec ${SETENV} PYTHONPATH=${PYEASYINSTALL_SITELIBDIR} \ + ${PYEASYINSTALL_CMD} ${PYEASYINSTALL_INSTALLARGS}" \ >> ${TMPPLIST} .endif # defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" @@ -465,7 +480,7 @@ PYDISTUTILS_PKGNAME?= ${PORTNAME} PYDISTUTILS_PKGVERSION?=${PORTVERSION} PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info -PYDISTUTILS_EGGINFODIR?=${PYTHON_SITELIBDIR} +PYDISTUTILS_EGGINFODIR?=${PYTHONPREFIX_SITELIBDIR} .if !defined(PYDISTUTILS_NOEGGINFO) && \ (defined(INSTALLS_EGGINFO) || \ @@ -488,7 +503,7 @@ ZOPESKELDIR= ${ZOPEBASEDIR}/zopeskel .elif ${ZOPE_VERSION} == "2.10" SZOPEBASEDIR?= www/Zope210 -ZOPE_PORTDIR= ${PORTSDIR}/www/zope210 +ZOPE_PORTSDIR= ${PORTSDIR}/www/zope210 ZOPESKELDIR= ${ZOPEBASEDIR}/skel .elif ${ZOPE_VERSION} == "2.9" SZOPEBASEDIR?= www/Zope29 @@ -688,6 +703,19 @@ do-install: @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) .endif + +.if defined(PYEASYINSTALL_ARCHDEP) +.if !target(easyinstall-setopt) +easyinstall-setopt: + @(cd ${BUILD_WRKSRC}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-platlib -s lib.${PYEASYINSTALL_OSARCH:S/^-//}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c build -o build-temp -s temp.${PYEASYINSTALL_OSARCH:S/^-//}-${PYTHON_VER}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist_egg -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}; \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} setopt -c bdist -o plat-name -s ${PYEASYINSTALL_OSARCH:S/^-//}) +.endif # !target(eayinstall-setopt) + +pre-build: easyinstall-setopt +.endif # defined(PYEASYINSTALL_ARCHDEP) .endif # defined(USE_PYDISTUTILS) .endif # defined(_POSTMKINCLUDED) && !defined(Python_Post_Include) ==== //depot/projects/dtrace/ports/UPDATING#35 (text+ko) ==== @@ -6,6 +6,50 @@ time you update your ports collection, before attempting any port upgrades. +20070614: + AFFECTS: users of www/mediawiki + AUTHOR: miwi@FreeBSD.org + + www/mediawiki version is 1.11 now. 1.10 version was preserved on + www/mediawiki110 port. + +20071008: + AFFECTS: users of graphics/OpenEXR and graphics/ilmbase + AUTHOR: nork@FreeBSD.org + + The new OpenEXR (1.6 and later) separated two libraries. The first is IlmImf + library a.k.a. ILM's "EXR" file format operation library for storing 16-bit + FP images. The others are Half, IlmThread, Imath and Iex a.k.a. ILM's basic + utility libraries. + + To portupgrade OpenEXR and related ports, please do following operations, + manually: + + # pkg_delete -f OpenEXR + # pkg_delete -f ilmbase (if you already installed before CONFLICT) + # cd /usr/ports/graphics/OpenEXR + # make install + # pkgdb -F + +20071008: + AFFECTS: users of emulators/linux_base-fc7 + AUTHOR: bsam@FreeBSD.org + + Since Fedora is not more Core the port emulators/linux_base-fc7 is renamed + emulators/linux_base-f7. Now it's Fedora 7. + +20071007: + AFFECTS: users of sysutils/nut sysutils/nut-* + AUTHOR: Martin Matuska + + The slave ports sysutils/nut-libupsclient, sysutils/nut-snmp and + sysutils/nut-usb have been removed with the upgrade of sysutils/nut to 2.2.0 + They are now fully integrated into sysutils/nut and their functionality + can be enabled/disabled in OPTIONS of sysutils/nut. + + Please uninstall all sysutils/nut-* slave ports before upgrading sysutils/nut + to version 2.2.0 or higher. + 20070930: AFFECTS: everyone AUTHOR: Mark Linimon @@ -5704,4 +5748,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.552 2007/10/04 20:06:24 linimon Exp $ +$FreeBSD: ports/UPDATING,v 1.556 2007/10/08 09:21:42 miwi Exp $ ==== //depot/projects/dtrace/src/contrib/less/NEWS#6 (text+ko) ==== @@ -13,6 +13,18 @@ ====================================================================== + Major changes between "less" versions 406 and 408 + +* Support CSI escape sequences, like SGR escape sequences. + +* Fix bug which caused screen to fail to repaint when window is resized. + +* Fix bug in using -i and -I flags with non-ASCII text. + +* Fix configure bug on systems which don't support langinfo.h. + +====================================================================== + Major changes between "less" versions 394 and 406 * Allow decimal point in number for % (percent) command. ==== //depot/projects/dtrace/src/contrib/less/README#6 (text+ko) ==== @@ -1,7 +1,7 @@ - Less, version 406 + Less, version 408 - This is the distribution of less, version 406, released 19 Jun 2007. + This is the distribution of less, version 408, released 01 Oct 2007. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or ==== //depot/projects/dtrace/src/contrib/less/ch.c#6 (text+ko) ==== @@ -128,6 +128,9 @@ POSITION pos; POSITION len; + if (thisfile == NULL) + return (EOI); + slept = FALSE; /* @@ -416,6 +419,9 @@ BLOCKNUM new_block; POSITION len; + if (thisfile == NULL) + return (0); + len = ch_length(); if (pos < ch_zero() || (len != NULL_POSITION && pos > len)) return (1); @@ -450,6 +456,9 @@ { POSITION len; + if (thisfile == NULL) + return (0); + if (ch_flags & CH_CANSEEK) ch_fsize = filesize(ch_file); @@ -503,6 +512,8 @@ public POSITION ch_length() { + if (thisfile == NULL) + return (NULL_POSITION); if (ignore_eoi) return (NULL_POSITION); if (ch_flags & CH_HELPFILE) @@ -516,6 +527,8 @@ public POSITION ch_tell() { + if (thisfile == NULL) + return (NULL_POSITION); return (ch_block * LBUFSIZE) + ch_offset; } @@ -527,6 +540,8 @@ { register int c; + if (thisfile == NULL) + return (EOI); c = ch_get(); if (c == EOI) return (EOI); @@ -546,6 +561,8 @@ public int ch_back_get() { + if (thisfile == NULL) + return (EOI); if (ch_offset > 0) ch_offset --; else @@ -586,6 +603,9 @@ { register struct buf *bp; + if (thisfile == NULL) + return; + if (!(ch_flags & CH_CANSEEK)) { /* @@ -769,6 +789,9 @@ { int keepstate = FALSE; + if (thisfile == NULL) + return; + if (ch_flags & (CH_CANSEEK|CH_POPENED|CH_HELPFILE)) { /* @@ -807,6 +830,8 @@ public int ch_getflags() { + if (thisfile == NULL) + return (0); return (ch_flags); } ==== //depot/projects/dtrace/src/contrib/less/charset.c#6 (text+ko) ==== @@ -567,24 +567,29 @@ { case 1: default: + /* 0xxxxxxx */ return (LWCHAR) (p[0] & 0xFF); case 2: + /* 110xxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x1F) << 6) | (p[1] & 0x3F)); case 3: + /* 1110xxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x0F) << 12) | ((p[1] & 0x3F) << 6) | (p[2] & 0x3F)); case 4: + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x07) << 18) | ((p[1] & 0x3F) << 12) | ((p[2] & 0x3F) << 6) | (p[3] & 0x3F)); case 5: + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x03) << 24) | ((p[1] & 0x3F) << 18) | @@ -592,6 +597,7 @@ ((p[3] & 0x3F) << 6) | (p[4] & 0x3F)); case 6: + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ return (LWCHAR) ( ((p[0] & 0x01) << 30) | ((p[1] & 0x3F) << 24) | @@ -603,6 +609,56 @@ } /* + * Store a character into a UTF-8 string. + */ + public void +put_wchar(pp, ch) + char **pp; + LWCHAR ch; +{ + if (!utf_mode || ch < 0x80) + { + /* 0xxxxxxx */ + *(*pp)++ = (char) ch; + } else if (ch < 0x800) + { + /* 110xxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xC0 | ((ch >> 6) & 0x1F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x10000) + { + /* 1110xxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xE0 | ((ch >> 12) & 0x0F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x200000) + { + /* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 18) & 0x07)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else if (ch < 0x4000000) + { + /* 111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 24) & 0x03)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } else + { + /* 1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx */ + *(*pp)++ = (char) (0xF0 | ((ch >> 30) & 0x01)); + *(*pp)++ = (char) (0x80 | ((ch >> 24) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 18) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 12) & 0x3F)); + *(*pp)++ = (char) (0x80 | ((ch >> 6) & 0x3F)); + *(*pp)++ = (char) (0x80 | (ch & 0x3F)); + } +} + +/* * Step forward or backward one character in a string. */ public LWCHAR ==== //depot/projects/dtrace/src/contrib/less/configure#6 (text+ko) ==== @@ -6473,6 +6473,7 @@ /* end confdefs.h. */ #include #include +#include int main () { ==== //depot/projects/dtrace/src/contrib/less/configure.ac#6 (text+ko) ==== @@ -304,7 +304,8 @@ AC_MSG_CHECKING(for locale) AC_TRY_LINK([#include -#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], +#include +#include ], [setlocale(LC_CTYPE,""); isprint(0); iscntrl(0);], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_LOCALE)], [AC_MSG_RESULT(no)]) AC_MSG_CHECKING(for ctype functions) AC_TRY_LINK([ ==== //depot/projects/dtrace/src/contrib/less/filename.c#6 (text+ko) ==== @@ -482,7 +482,7 @@ for (i = 0; i < n; i++) { char c = data[i]; - if (ctldisp == OPT_ONPLUS && c == ESC) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { while (++i < n && is_ansi_middle(data[i])) continue; ==== //depot/projects/dtrace/src/contrib/less/funcs.h#6 (text+ko) ==== @@ -56,6 +56,7 @@ public int utf_len (); public int is_utf8_well_formed (); public LWCHAR get_wchar (); + public void put_wchar (); public LWCHAR step_char (); public int is_composing_char (); public int is_ubin_char (); ==== //depot/projects/dtrace/src/contrib/less/jump.c#6 (text+ko) ==== @@ -31,6 +31,7 @@ jump_forw() { POSITION pos; + POSITION end_pos; if (ch_end_seek()) { @@ -42,11 +43,17 @@ * Go back one line from the end of the file * to get to the beginning of the last line. */ - pos = back_line(ch_tell()); + pos_clear(); + end_pos = ch_tell(); + pos = back_line(end_pos); if (pos == NULL_POSITION) jump_loc((POSITION)0, sc_height-1); else + { jump_loc(pos, sc_height-1); + if (position(sc_height-1) != end_pos) + repaint(); + } } /* ==== //depot/projects/dtrace/src/contrib/less/less.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/less.h,v 1.7 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/less.h,v 1.8 2007/10/08 16:17:42 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -150,6 +150,8 @@ #define IS_DIGIT(c) ((c) >= '0' && (c) <= '9') #endif +#define IS_CSI_START(c) ((c) == ESC || ((unsigned char)(c)) == CSI) + #ifndef NULL #define NULL 0 #endif @@ -425,6 +427,7 @@ #endif /* IS_EBCDIC_HOST */ #define ESC CONTROL('[') +#define CSI ((unsigned char)'\233') #if _OSK_MWC32 #define LSIGNAL(sig,func) os9_signal(sig,func) ==== //depot/projects/dtrace/src/contrib/less/less.man#6 (text+ko) ==== @@ -1544,4 +1544,4 @@ - Version 406: 19 Jun 2007 LESS(1) + Version 408: 01 Oct 2007 LESS(1) ==== //depot/projects/dtrace/src/contrib/less/less.nro#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 406: 19 Jun 2007" +.TH LESS 1 "Version 408: 01 Oct 2007" .SH NAME less \- opposite of more .SH SYNOPSIS ==== //depot/projects/dtrace/src/contrib/less/lessecho.man#4 (text+ko) ==== @@ -46,4 +46,4 @@ - Version 406: 19 Jun 2007 LESSECHO(1) + Version 408: 01 Oct 2007 LESSECHO(1) ==== //depot/projects/dtrace/src/contrib/less/lessecho.nro#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 406: 19 Jun 2007" +.TH LESSECHO 1 "Version 408: 01 Oct 2007" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS ==== //depot/projects/dtrace/src/contrib/less/lesskey.man#6 (text+ko) ==== @@ -357,4 +357,4 @@ - Version 406: 19 Jun 2007 LESSKEY(1) + Version 408: 01 Oct 2007 LESSKEY(1) ==== //depot/projects/dtrace/src/contrib/less/lesskey.nro#6 (text+ko) ==== @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 406: 19 Jun 2007" +.TH LESSKEY 1 "Version 408: 01 Oct 2007" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS ==== //depot/projects/dtrace/src/contrib/less/line.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/line.c,v 1.4 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/line.c,v 1.5 2007/10/08 16:17:42 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -269,7 +269,7 @@ while (shifted <= shift && from < curr) { c = linebuf[from]; - if (c == ESC && ctldisp == OPT_ONPLUS) + if (ctldisp == OPT_ONPLUS && IS_CSI_START(c)) { /* Keep cumulative effect. */ linebuf[to] = c; @@ -524,7 +524,7 @@ for (p = &linebuf[curr]; p > linebuf; ) { LWCHAR ch = step_char(&p, -1, linebuf); - if (ch == ESC) + if (IS_CSI_START(ch)) return (1); if (!is_ansi_middle(ch)) return (0); @@ -603,13 +603,13 @@ /* Remove whole unrecognized sequence. */ do { --curr; - } while (linebuf[curr] != ESC); + } while (!IS_CSI_START(linebuf[curr])); return 0; } a = AT_ANSI; /* Will force re-AT_'ing around it. */ w = 0; } - else if (ctldisp == OPT_ONPLUS && ch == ESC) + else if (ctldisp == OPT_ONPLUS && IS_CSI_START(ch)) { a = AT_ANSI; /* Will force re-AT_'ing around it. */ w = 0; @@ -943,7 +943,7 @@ } else if ((!utf_mode || is_ascii_char(ch)) && control_char((char)ch)) { do_control_char: - if (ctldisp == OPT_ON || (ctldisp == OPT_ONPLUS && ch == ESC)) + if (ctldisp == OPT_ON || (ctldisp == OPT_ONPLUS && IS_CSI_START(ch))) { /* * Output as a normal character. ==== //depot/projects/dtrace/src/contrib/less/search.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/search.c,v 1.8 2007/06/17 23:20:43 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/search.c,v 1.9 2007/10/08 16:17:42 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -16,6 +16,7 @@ #include "less.h" #include "position.h" +#include "charset.h" #define MINPOS(a,b) (((a) < (b)) ? (a) : (b)) #define MAXPOS(a,b) (((a) > (b)) ? (a) : (b)) @@ -120,24 +121,31 @@ int *lenp; int ops; { - register char *dst; - register char *src; + char *dst; + char *src; register char *src_end; + LWCHAR ch; if (lenp != NULL) src_end = osrc + *lenp; else src_end = osrc + strlen(osrc); - for (src = osrc, dst = odst; src < src_end; src++) + for (src = osrc, dst = odst; src < src_end; ) { - if ((ops & CVT_TO_LC) && IS_UPPER(*src)) + ch = step_char(&src, +1, src_end); + if ((ops & CVT_TO_LC) && IS_UPPER(ch)) + { /* Convert uppercase to lowercase. */ - *dst++ = TO_LOWER(*src); - else if ((ops & CVT_BS) && *src == '\b' && dst > odst) + put_wchar(&dst, TO_LOWER(ch)); + } else if ((ops & CVT_BS) && ch == '\b' && dst > odst) + { /* Delete BS and preceding char. */ - dst--; - else if ((ops & CVT_ANSI) && *src == ESC) + do { + dst--; + } while (dst > odst && + !IS_ASCII_OCTET(*dst) && !IS_UTF8_LEAD(*dst)); + } else if ((ops & CVT_ANSI) && IS_CSI_START(ch)) { /* Skip to end of ANSI escape sequence. */ while (src + 1 != src_end) @@ -145,7 +153,7 @@ break; } else /* Just copy. */ - *dst++ = *src; + put_wchar(&dst, ch); } if ((ops & CVT_CRLF) && dst > odst && dst[-1] == '\r') dst--; @@ -182,14 +190,18 @@ * Are there any uppercase letters in this string? */ static int -is_ucase(s) - char *s; +is_ucase(str) + char *str; { - register char *p; + char *str_end = str + strlen(str); + LWCHAR ch; - for (p = s; *p != '\0'; p++) - if (IS_UPPER(*p)) + while (str < str_end) + { + ch = step_char(&str, +1, str_end); + if (IS_UPPER(ch)) return (1); + } return (0); } @@ -679,7 +691,7 @@ char *line_end = *line + line_len; if (cvt_ops & CVT_ANSI) - while (**line == ESC) + while (IS_CSI_START(**line)) { /* * Found an ESC. The file position moves ==== //depot/projects/dtrace/src/contrib/less/signal.c#6 (text+ko) ==== @@ -8,7 +8,7 @@ * contact the author, see the README file. */ -/* $FreeBSD: src/contrib/less/signal.c,v 1.5 2007/06/04 01:43:11 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/signal.c,v 1.6 2007/10/08 16:17:42 delphij Exp $ */ /* * Routines dealing with signals. @@ -93,6 +93,8 @@ { LSIGNAL(SIGWINCH, winch); sigs |= S_WINCH; + if (reading) + intread(); } #else #ifdef SIGWIND ==== //depot/projects/dtrace/src/contrib/less/version.c#6 (text+ko) ==== @@ -693,6 +693,8 @@ v404 6/5/07 Fix display bug with F command and long lines. v405 6/17/07 Fix display bug when using -w option. v406 6/17/07 Fix secure build. +v407 8/16/07 Fix bugs; support CSI chars. +v408 10/1/07 Fix bug in -i with non-ASCII chars. */ -char version[] = "406"; +char version[] = "408"; ==== //depot/projects/dtrace/src/gnu/usr.bin/cc/cc_tools/auto-host.h#6 (text+ko) ==== @@ -1,6 +1,6 @@ /* auto-host.h. Generated by configure. */ /* config.in. Generated from configure.ac by autoheader. */ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.20 2007/05/19 04:25:58 kan Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.21 2007/10/08 18:59:34 marius Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<