From owner-svn-doc-head@freebsd.org Sun Oct 22 11:22:55 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F87AE503D8; Sun, 22 Oct 2017 11:22:55 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gatekeeper.allbsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E70DB33C0; Sun, 22 Oct 2017 11:22:54 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail-d.allbsd.org ([IPv6:2409:11:a740:c00:58:65ff:fe00:b0b]) (authenticated bits=56) by mail.allbsd.org (8.15.2/8.15.2) with ESMTPSA id v9MBMdjL092227 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) (Client CN "/OU=GT07882699/OU=See+20www.rapidssl.com/resources/cps+20+28c+2915/OU=Domain+20Control+20Validated+20-+20RapidSSL+28R+29/CN=*.allbsd.org", Issuer "/C=US/O=GeoTrust+20Inc./CN=RapidSSL+20SHA256+20CA+20-+20G3"); Sun, 22 Oct 2017 20:22:50 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from alph.d.allbsd.org (alph.allbsd.org [192.168.0.10]) by mail-d.allbsd.org (8.15.2/8.15.2) with ESMTPS id v9MBMcTJ051973 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 22 Oct 2017 20:22:38 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:0:0:0:0:0:0:0:1]) (authenticated bits=0) by alph.d.allbsd.org (8.15.2/8.15.2) with ESMTPA id v9MBManf051970; Sun, 22 Oct 2017 20:22:38 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Sun, 22 Oct 2017 18:41:44 +0900 (JST) Message-Id: <20171022.184144.203971308906863927.hrs@allbsd.org> To: gjb@FreeBSD.org Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: Re: svn commit: r51058 - head/share/tools From: Hiroki Sato In-Reply-To: <201710052017.v95KHXIE042251@repo.freebsd.org> <201710052032.v95KWQbI050265@repo.freebsd.org> References: <201710052017.v95KHXIE042251@repo.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.7 on Emacs 25.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Sun_Oct_22_18_41_44_2017_679)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.99.2 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mail.allbsd.org [IPv6:2001:2f0:104:e001:0:0:0:32]); Sun, 22 Oct 2017 20:22:52 +0900 (JST) X-Spam-Status: No, score=-97.9 required=13.0 tests=CONTENT_TYPE_PRESENT, QENCPTR1,URIBL_SC2_SURBL,URIBL_XS_SURBL,USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on gatekeeper.allbsd.org X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 11:22:55 -0000 ----Security_Multipart(Sun_Oct_22_18_41_44_2017_679)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber wrote in <201710052017.v95KHXIE042251@repo.freebsd.org>: gj> Author: gjb gj> Date: Thu Oct 5 20:17:33 2017 gj> New Revision: 51058 gj> URL: https://svnweb.freebsd.org/changeset/doc/51058 gj> gj> Log: gj> Enable update/checkout of src/share/man/man4 for the 12.0R hardware gj> page. gj> gj> Sponsored by: The FreeBSD Foundation gj> gj> Modified: gj> head/share/tools/webupdate gj> gj> Modified: head/share/tools/webupdate gj> ============================================================================== gj> --- head/share/tools/webupdate Thu Oct 5 20:13:57 2017 (r51057) gj> +++ head/share/tools/webupdate Thu Oct 5 20:17:33 2017 (r51058) gj> @@ -88,7 +88,7 @@ export NO_OBJ=YES gj> # assumes that the directory right below that is the language code. gj> # This works fine if all the languages are in a directory called gj> # 'doc', and not at all if they aren't. gj> -subtrees='head gj> +subtrees='head src/share/man/man4 gj> relnotes11/doc relnotes11/man4 gj> relnotes10/doc relnotes10/man4 gj> ports'; gj> @@ -129,6 +129,8 @@ if [ $cond ]; then gj> svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2; gj> gj> test -d relnotes || mkdir relnotes; gj> + mkdir -p src/share/man/man4 gj> + svn co $SVNROOT/base/head/share/man/man4 src/share/man/man4 >> $LOGFILE 2>&1 || exit 2; gj> svn co $SVNROOT/base/stable/11/release/doc relnotes11/doc >> $LOGFILE 2>&1 || exit 2; gj> svn co $SVNROOT/base/stable/11/share/man/man4 relnotes11/man4 >> $LOGFILE 2>&1 || exit 2; gj> svn co $SVNROOT/base/stable/10/release/doc relnotes10/doc >> $LOGFILE 2>&1 || exit 2; I think we need to checkout man4 directory in a per-release-branch (and per-stable-branch for webupdate) basis because each hwnotes should be generated by using man4 directory from a specific release after migration from src/release/doc. I think relnotes/12/man4, and relnotes/12.0/man4 after releng/12.0 would be reasonable names if we reuse the old convention. Glen Barber wrote in <201710052032.v95KWQbI050265@repo.freebsd.org>: gj> Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile gj> ============================================================================== gj> --- head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Thu Oct 5 20:20:05 2017 (r51059) gj> +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Thu Oct 5 20:32:26 2017 (r51060) gj> @@ -21,6 +21,13 @@ SRCS?= errata.xml gj> gj> DATA+= ${DOC}.html gj> gj> +beforeclean: gj> +CLEANFILES+= ${DOC}.html \ gj> + ${DOC}.txt \ gj> + catalog-cwd.xml \ gj> + autogen.ent \ gj> + ${DOC}.parsed.* gj> + catalog-cwd.xml, autogen.ent, and ${DOC}.parsed.* are already included in doc.dockbook.mk. -- Hiroki ----Security_Multipart(Sun_Oct_22_18_41_44_2017_679)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iEYEABECAAYFAlnsZ9gACgkQTyzT2CeTzy2GdgCbBHlRWGhoLpHB8/Fcr7Z5egRJ /dYAniHWTfrGFsPbg2MaxDNTlFkm8dC9 =6Lu/ -----END PGP SIGNATURE----- ----Security_Multipart(Sun_Oct_22_18_41_44_2017_679)---- From owner-svn-doc-head@freebsd.org Sun Oct 22 11:23:02 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 689B5E50411; Sun, 22 Oct 2017 11:23:02 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37C1233D4; Sun, 22 Oct 2017 11:23:02 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9MBN1Ad016029; Sun, 22 Oct 2017 11:23:01 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9MBN1Rf016028; Sun, 22 Oct 2017 11:23:01 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201710221123.v9MBN1Rf016028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 22 Oct 2017 11:23:01 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51141 - head/en_US.ISO8859-1/articles/contributors X-SVN-Group: doc-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/contributors X-SVN-Commit-Revision: 51141 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 11:23:02 -0000 Author: dbaio (ports committer) Date: Sun Oct 22 11:23:01 2017 New Revision: 51141 URL: https://svnweb.freebsd.org/changeset/doc/51141 Log: Add Talal Al Dik to contributors Maintainer of net/sngrep PR: 223141 Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sat Oct 21 03:53:47 2017 (r51140) +++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sun Oct 22 11:23:01 2017 (r51141) @@ -10280,6 +10280,11 @@ + Talal Al Dik + tad@vif.com + + + Tanja Wittke tawi@gruft.de From owner-svn-doc-head@freebsd.org Sun Oct 22 11:23:00 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71B44E50405; Sun, 22 Oct 2017 11:23:00 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "gatekeeper.allbsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E769C33C8; Sun, 22 Oct 2017 11:22:59 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail-d.allbsd.org ([IPv6:2409:11:a740:c00:58:65ff:fe00:b0b]) (authenticated bits=56) by mail.allbsd.org (8.15.2/8.15.2) with ESMTPSA id v9MBMdkU092228 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) (Client CN "/OU=GT07882699/OU=See+20www.rapidssl.com/resources/cps+20+28c+2915/OU=Domain+20Control+20Validated+20-+20RapidSSL+28R+29/CN=*.allbsd.org", Issuer "/C=US/O=GeoTrust+20Inc./CN=RapidSSL+20SHA256+20CA+20-+20G3"); Sun, 22 Oct 2017 20:22:50 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from alph.d.allbsd.org (alph.allbsd.org [192.168.0.10]) by mail-d.allbsd.org (8.15.2/8.15.2) with ESMTPS id v9MBMcDL051978 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 22 Oct 2017 20:22:38 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:0:0:0:0:0:0:0:1]) (authenticated bits=0) by alph.d.allbsd.org (8.15.2/8.15.2) with ESMTPA id v9MBMang051970; Sun, 22 Oct 2017 20:22:38 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Sun, 22 Oct 2017 20:20:23 +0900 (JST) Message-Id: <20171022.202023.700298682654760426.hrs@allbsd.org> To: gjb@FreeBSD.org Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: Re: svn commit: r51055 - head/en_US.ISO8859-1/htdocs/releases/12.0R From: Hiroki Sato In-Reply-To: <201710052007.v95K7wdI038021@repo.freebsd.org> References: <201710052007.v95K7wdI038021@repo.freebsd.org> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.7 on Emacs 25.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart0(Sun_Oct_22_20_20_23_2017_644)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.99.2 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (mail.allbsd.org [IPv6:2001:2f0:104:e001:0:0:0:32]); Sun, 22 Oct 2017 20:22:55 +0900 (JST) X-Spam-Status: No, score=-97.2 required=13.0 tests=CONTENT_TYPE_PRESENT, FAKEDWORD_ATMARK,QENCPTR1,QENCPTR2,URIBL_SC2_SURBL,URIBL_XS_SURBL, USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on gatekeeper.allbsd.org X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 11:23:00 -0000 ----Security_Multipart0(Sun_Oct_22_20_20_23_2017_644)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Sun_Oct_22_20_20_23_2017_745)--" Content-Transfer-Encoding: 7bit ----Next_Part(Sun_Oct_22_20_20_23_2017_745)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber wrote in <201710052007.v95K7wdI038021@repo.freebsd.org>: gj> Author: gjb gj> Date: Thu Oct 5 20:07:58 2017 gj> New Revision: 51055 gj> URL: https://svnweb.freebsd.org/changeset/doc/51055 gj> gj> Log: gj> Reapply r51054, with a few fixes. gj> Fix a typo: s/elfi/elif/ gj> Remove dependencies from the dev-auto.ent target, which seems gj> I misread the original version of how this was invoked. gj> gj> Sponsored by: The FreeBSD Foundation These part should be in hardware/ directory and a part of guessing MAN4DIR should be dropped. MAN4DIR must be specified because each hardware directory is for a specific branch/release as I pointed out in another email. A generic location such as src/share/man/man4 or a guessed directory is confusing. Makefile does not handle cross-directory dependency well, so dev-auto.ent should be generated in the hardware directory. Also, please do not use /htdocs/share. Common files should be in head/share or head//share consistently. releases/12.0R/share/xml needs some more consideration, but I think it is fine for now. A patch to fix generation of hardware notes and other minor nits is attached. Note that XML catalog resolution is still broken. -- Hiroki ----Next_Part(Sun_Oct_22_20_20_23_2017_745)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="releases-120R-fix.20171022-1.diff" Index: en_US.ISO8859-1/htdocs/releases/12.0R/Makefile =================================================================== --- en_US.ISO8859-1/htdocs/releases/12.0R/Makefile (revision 51140) +++ en_US.ISO8859-1/htdocs/releases/12.0R/Makefile (working copy) @@ -19,6 +19,8 @@ DATA= docbook.css +SUBDIR= errata hardware readme relnotes + # PGP-signed checksums _BIGIRON?= amd64 \ @@ -55,63 +57,4 @@ . endfor .endfor -_hardware?= hardware - -# The path used on build-web is 'src/share/man/man4'. -.if !defined(MAN4DIR) || empty(MAN4DIR) -. if exists(${DOC_PREFIX}/../src/share/man/man4) -MAN4DIR= ${DOC_PREFIX}/../src/share/man/man4 -. elif exists(${DOC_PREFIX}/../share/man/man4) -MAN4DIR= ${DOC_PREFIX}/../share/man/man4 -. elif exists(${DOC_PREFIX}/../man/man4) -MAN4DIR= ${DOC_PREFIX}/../man/man4 -. elif exists(${DOC_PREFIX}/../man4) -MAN4DIR= ${DOC_PREFIX}/../man4 -. else -. warning "MAN4DIR not found. Unable to build hardware.html" -_hardware= # empty -. endif -.endif - -D= errata -D+= ${_hardware} -D+= readme -D+= relnotes - -MAN4PAGES?= ${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4 -ARCHLIST?= ${.CURDIR}/../../share/misc/dev.archlist.txt -CLEANFILES+= dev-auto.ent \ - index.html \ - schedule.html - -MAN2HWNOTES_CMD=${.CURDIR}/../../share/misc/man2hwnotes.pl -.if defined(HWNOTES_MI) -MAN2HWNOTES_FLAGS= -.else -MAN2HWNOTES_FLAGS= -c -.endif - -dev-auto.ent: - ${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET}.tmp ${MAN4PAGES} - ${MV} ${.TARGET}.tmp ${.TARGET} - -.if make(clean) -beforeclean: -SUBDIR+= ${D} -.include "${DOC_PREFIX}/share/mk/doc.subdir.mk" -.endif - -beforeinstall: -.for _SD in ${D} -. if (${_SD:Mhardware} != "") - ${MAKE} -B -C ${.CURDIR} dev-auto.ent -. endif - ${MAKE} -C ${_SD} DOCINSTALLDIR=${DOCINSTALLDIR} all -.endfor - -afterinstall: -.for _SD in ${D} - ${MAKE} -C ${_SD} DOCINSTALLDIR=${DOCINSTALLDIR} install -.endfor - .include "${DOC_PREFIX}/share/mk/web.site.mk" Index: en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc =================================================================== --- en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc (nonexistent) +++ en_US.ISO8859-1/htdocs/releases/12.0R/Makefile.inc (working copy) @@ -0,0 +1,12 @@ +# $FreeBSD$ +.if !defined(_HTDOCS_RELEASES_12_0R_INC) +_HTDOCS_RELEASES_12_0R_INC=1 +DOC_PREFIX?= ${.CURDIR}/../../../../.. +WEBDIR?= /data/releases/12.0R +.if defined(DESTDIR) +DESTDIR:= ${DESTDIR}/${WEBDIR} +.else +DESTDIR= ${HOME}/public_html/${WEBDIR} +.endif +DOCBOOK_DEPS_DISABLE= YES +.endif Index: en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile =================================================================== --- en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile (revision 51140) +++ en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile (working copy) @@ -1,34 +1,12 @@ # $FreeBSD$ -.if exists(../Makefile.conf) -.include "../Makefile.conf" -.endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -DOC_PREFIX?= ${.CURDIR}/../../../../.. -RELN_ROOT?= ${.CURDIR}/.. - DOC?= errata -FORMATS?= html +FORMATS?= html txt INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED= -JADEFLAGS+= -V %generate-article-toc% - -SRCS?= errata.xml - -DATA+= ${DOC}.html - -CLEANFILES+= ${DOC}.html \ - ${DOC}.txt \ - catalog-cwd.xml \ - autogen.ent \ - ${DOC}.parsed.* - -install: ${DOC}.html - mkdir -p ${DOCINSTALLDIR} - ${INSTALL_DOCS} ${DATA} ${DOCINSTALLDIR} - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Index: en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile =================================================================== --- en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile (revision 51140) +++ en_US.ISO8859-1/htdocs/releases/12.0R/hardware/Makefile (working copy) @@ -1,34 +1,32 @@ # $FreeBSD$ -.if exists(../Makefile.conf) -.include "../Makefile.conf" -.endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif -DOC_PREFIX?= ${.CURDIR}/../../../../.. -RELN_ROOT?= ${.CURDIR}/.. +# The path used on build-web is 'src/share/man/man4'. +.if make(all) && (!defined(MAN4DIR) || empty(MAN4DIR) || !exists(${MAN4DIR})) +. error "MAN4DIR not found. Unable to build hardware.html" +.endif -JADEFLAGS+= -V %generate-article-toc% +MAN4PAGES?= ${MAN4DIR}/*.4 ${MAN4DIR}/man4.*/*.4 +ARCHLIST?= ${DOC_PREFIX}/share/misc/dev.archlist.txt -DOC?= hardware +MAN2HWNOTES_CMD=${DOC_PREFIX}/share/misc/man2hwnotes.pl +.if defined(HWNOTES_MI) +MAN2HWNOTES_FLAGS= +.else +MAN2HWNOTES_FLAGS= -c +.endif + +DOC= hardware FORMATS?= html INSTALL_COMPRESSED?= gz INSTALL_ONLY_COMPRESSED= -SRCS?= hardware.xml +hardware.parsed.xml: dev-auto.ent +dev-auto.ent: + ${PERL} ${MAN2HWNOTES_CMD} ${MAN2HWNOTES_FLAGS} -a ${ARCHLIST} -o ${.TARGET} ${MAN4PAGES} || (rm -f ${.TARGET}) +CLEANFILES+= dev-auto.ent -DATA+= ${DOC}.html - -CLEANFILES+= ${DOC}.html \ - ${DOC}.txt \ - catalog-cwd.xml \ - autogen.ent \ - ${DOC}.parsed.* - -install: ${DOC}.html - mkdir -p ${DOCINSTALLDIR} - ${INSTALL_DOCS} ${DATA} ${DOCINSTALLDIR} - .include "${DOC_PREFIX}/share/mk/doc.project.mk" Index: en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml =================================================================== --- en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml (revision 51140) +++ en_US.ISO8859-1/htdocs/releases/12.0R/hardware/hardware.xml (working copy) @@ -1,16 +1,19 @@ + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ + %release; - + %sponsor; - + %vendor; - - + %devauto; ]>
[,...] -# -aac i386,amd64 -adv i386,amd64 -adw i386,amd64 -aha i386 -ahb i386 -ahd i386,sparc64,amd64 -aic i386,amd64 -amd i386,amd64 -arcmsr i386,amd64 -asr i386 -ath i386,amd64,sparc64 -aue i386,amd64,powerpc -axe i386,amd64,powerpc -bce i386,amd64 -bge i386,sparc64,amd64 -bktr i386 -bt i386,amd64 -bxe i386,amd64 -cdce i386,amd64,powerpc -ciss i386,amd64 -ce i386 -cm i386 -cnw i386,amd64 -cp i386 -ctau i386 -cue i386,amd64,powerpc -cx i386 -cxgb i386,amd64 -de i386,amd64 -dpt i386,amd64 -ed i386 -ep i386,amd64 -esp sparc64 -ex i386,amd64 -fe i386,amd64 -fwohci i386,sparc64,amd64,powerpc -hifn i386,amd64 -hpt27xx i386,amd64 -hptiop i386,amd64 -hptmv i386,amd64 -hptrr i386,amd64 -ida i386 -ie i386 -iir i386,amd64 -ips i386,amd64 -isci i386,amd64 -ixgb i386,amd64 -kue i386,amd64,powerpc -lge i386,amd64 -mfi i386,amd64 -mlx i386,amd64 -mly i386,amd64 -msk i386,amd64 -mxge i386,amd64 -my i386 -ncr i386,amd64 -ncv i386 -nfe i386,amd64 -ng_bt3c i386,amd64 -ng_ubt i386,amd64 -nsp i386 -nxge i386,amd64 -oce i386,amd64 -ohci i386,amd64,powerpc -oltr i386 -otus i386,amd64 -pcn i386,amd64 -pst i386 -qlxgb amd64 -qlxgbe amd64 -qlxge amd64 -rc i386 -ral i386,amd64 -rsu i386,amd64 -rue i386,amd64 -rum i386,amd64 -run i386,amd64 -safe i386,amd64 -sbp i386,sparc64,amd64 -sfgxe amd64 -sn i386,amd64 -snd_ad1816 i386,amd64 -snd_als4000 i386 -snd_atiixp i386,amd64 -snd_audiocs sparc64 -snd_cmi i386,amd64 -snd_cs4281 i386,amd64 -snd_csa i386,amd64 -snd_ds1 i386,amd64 -snd_emu10k1 i386,amd64 -snd_emu10kx i386,amd64 -snd_envy24 i386,amd64 -snd_envy24ht i386,amd64 -snd_es137x i386,sparc64,amd64 -snd_ess i386,amd64 -snd_fm801 i386,amd64 -snd_gusc i386,amd64 -snd_hda i386,amd64 -snd_hdspe i386,amd64 -snd_ich i386,amd64 -snd_maestro i386,amd64 -snd_maestro3 i386,amd64 -snd_mss i386 -snd_neomagic i386,amd64 -snd_sbc i386,amd64 -snd_solo i386,amd64 -snd_spicds i386,amd64 -snd_t4dwave i386,amd64,sparc64 -snd_via8233 i386,amd64 -snd_via82c686 i386,amd64 -snd_vibes i386,amd64 -stg i386 -ti i386,amd64,sparc64 -tl i386,amd64 -trm i386,amd64 -twa i386,amd64 -twe i386,amd64 -tws i386,amd64 -ubsa i386,amd64 -ubsec i386,amd64 -ubser i386,amd64 -ucycom i386,amd64 -udav i386,amd64 -uftdi i386,amd64 -uhci i386,amd64,powerpc -ulpt i386,amd64,powerpc -umass i386,amd64,powerpc -umodem i386,amd64 -uplcom i386,amd64 -ural i386,amd64 -urio i386,amd64,powerpc -uvisor i386,amd64 -uvscom i386,amd64 -vpo i386 -vx i386,amd64 -vxge i386,amd64 -wb i386,amd64 -xe i386,amd64 -zyd i386,amd64 Property changes on: en_US.ISO8859-1/htdocs/share/misc/dev.archlist.txt ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: en_US.ISO8859-1/htdocs/share/misc/man2hwnotes.pl =================================================================== --- en_US.ISO8859-1/htdocs/share/misc/man2hwnotes.pl (revision 51140) +++ en_US.ISO8859-1/htdocs/share/misc/man2hwnotes.pl (nonexistent) @@ -1,534 +0,0 @@ -#!/usr/local/bin/perl -w -# Emacs should use -*- cperl -*- mode -# -# Copyright (c) 2003-2006 Simon L. Nielsen -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# $FreeBSD$ -# - -# Parse the list of supported hardware out of section 4 manual pages -# and output it on stdout as SGML/DocBook entities. - -# The script will look for the following line in the manual page: -# .Sh HARDWARE -# and make an entity of the content until the line containing: -# .Sh -# -# For Lists only the first line will be printed. If there are -# arguments to the .It command, only the argument will be printed. - -# Usage: -# man2hwnotes.pl [-cl] [-d 0-6] [-a ] [-o ] -# [ ...] - -use strict; -#use warnings; -use Getopt::Std; -use Digest::MD5 qw(md5_hex); - -# Section from manual page to extract -my $hwlist_sect = "HARDWARE"; - -# Override default archtecture list for some devices: -my $archlist_file = "dev.archlist.txt"; -my %archlist; - -# Globals -my $compat_mode = 0; # Enable compat for old Hardware Notes style -my $debuglevel = 0; -my $only_list_out = 0; # Should only lists be generated in the output? -my @out_lines; # Single lines -my @out_dev; # Device entities - -# Getopt -my %options = (); -if (!getopts("a:cd:lo:",\%options)) { - die("$!: Invalid command line arguments in ", __LINE__, "\n"); -} - -if (defined($options{c})) { - $compat_mode = 1; -} -if (defined($options{d})) { - $debuglevel = $options{d}; -} -if (defined($options{a})) { - $archlist_file = $options{a}; -} -if (defined($options{l})) { - $only_list_out = 1; -} - -my $outputfile = $options{o}; - -if ($debuglevel > 0) { - # Don't do output buffering in debug mode. - $| = 1; -} - -load_archlist($archlist_file); - -if (defined($outputfile)) { - open(OLDOUT, ">&STDOUT") || die("$!: Could not open STDOUT in ", __LINE__, ".\n"); - open(STDOUT, ">$outputfile") || die("$!: Could not open $outputfile in ", __LINE__, ".\n"); -} - -print < -EOT - -if ($only_list_out) { - # Print the default device preamble entities - print "\n"; - print "\n"; -} - -foreach my $page (@ARGV) { - if ($page !~ m/\.4$/) { - dlog(2, "Skipped $page (not *.4)"); - next; - } - dlog(2, "Parsing $page"); - parse($page); - - if (@out_lines) { - print join("\n", @out_lines), "\n"; - } - if (@out_dev) { - print join("\n", @out_dev), "\n"; - } - - @out_lines = (); - @out_dev = (); -} - -if (defined($outputfile)) { - open(STDOUT, ">&OLDOUT") || die("$!: Could not open STDOUT in ", __LINE__, ".\n"); - close(OLDOUT) || die("$!: Could not close OLDOUT in ", __LINE__, ".\n"); -} - -sub normalize (@) { - my @lines = @_; - - foreach my $l (@lines) { - $l =~ s/\\&//g; - $l =~ s:([\x21-\x2f\x5b-\x60\x7b-\x7f]):sprintf("&\#\%d;", ord($1)):eg; - # Make sure ampersand is encoded as & since jade seems to - # be confused when it is encoded as & inside an entity. - $l =~ s/&/&/g; - } - return (wantarray) ? @lines : join "", @lines; -} - -sub parse { - my ($manpage) = @_; - - my $cur_mansection; - my $found_hwlist = 0; - my %mdocvars; - $mdocvars{isin_hwlist} = 0; - $mdocvars{isin_list} = 0; - $mdocvars{first_para} = 1; - $mdocvars{parabuf} = ""; - $mdocvars{listtype} = ""; - $mdocvars{it_nr} = 0; - - open(MANPAGE, "$manpage") || die("$!: Could not open $manpage in ", __LINE__, ".\n"); - while() { - chomp; - my $line = $_; - - dlog(5, "Read '$line'"); - - # Find commands - if (s/^\.(.*)$/$1/) { - my $cmd = $1; - - # Detect, and ignore, comment lines - if (s/^\\"(.*)$/$1/) { - next; - } - - $cmd =~ s/^([^ ]+).*$/$1/; - - if (/^Nm "?(\w+)"?/ && !defined($mdocvars{Nm})) { - dlog(3, "Setting Nm to $1"); - $mdocvars{Nm} = $1; - # "_" cannot be used for an entity name. - $mdocvars{EntNm} = $1; - $mdocvars{EntNm} =~ s,_,.,g; - - } elsif (/^Nm$/) { - if (defined($mdocvars{Nm}) && $mdocvars{Nm} ne "") { - parabuf_addline(\%mdocvars, "&man.".$mdocvars{EntNm}.".$cur_mansection;"); - } else { - dlog(2, "Warning: Bad Nm call in $manpage"); - } - - } elsif (/^Sh (.+)$/) { - dlog(4, "Setting section to $1"); - my $cur_section = $1; - - flush_out(\%mdocvars); - - if ($cur_section =~ /^${hwlist_sect}$/) { - dlog(2, "Found the device section ${hwlist_sect}"); - $mdocvars{isin_hwlist} = 1; - $found_hwlist = 1; - add_sgmltag(\%mdocvars, "&hwlist.preamble.pre; " . - "&man.".$mdocvars{EntNm}.".$cur_mansection; " . - "&hwlist.preamble.post;"); - } - } elsif ($mdocvars{isin_hwlist}) { - dlog(2, "Found a HWLIST STOP key!"); - add_sgmltag(\%mdocvars, "'>"); - $mdocvars{isin_hwlist} = 0; - } - if ($mdocvars{isin_list}) { - dlog(1, "Warning: Still in list, but just entered new " . - "section. This is probably due to missing .El; " . - "check manual page for errors."); - # If we try to recover from this we will probably - # just end with bad SGML output and it really - # should be fixed in the manual page so we don't - # even try to "fix" this. - } - - - } elsif (/^Dt ([^ ]+) ([^ ]+)/) { - dlog(4, "Setting mansection to $2"); - $mdocvars{cur_manname} = lc($1); - $cur_mansection = $2; - - # "_" cannot be used for an entity name. - $mdocvars{cur_manname} =~ s,_,.,g; - - } elsif (/^It ?(.*)$/) { - my $txt = $1; - - $mdocvars{it_nr}++; - - # Flush last item - if ($mdocvars{parabuf} ne "") { - add_listitem(\%mdocvars); - } - - # Remove quotes, if any. - $txt =~ s/"(.*)"/$1/; - - if ($mdocvars{listtype} eq "column") { - # Ignore first item when it is likely to be a - # header. - if ($mdocvars{it_nr} == 1 && $txt =~ m/^(Em|Sy) /) { - dlog(2, "Skipping header line in column list"); - next; - } - # Only extract the first column. - $txt =~ s/ Ta /\t/g; - $txt =~ s/([^\t]+)\t.*/$1/; - } - - # Remove Li commands - $txt =~ s/^Li //g; - - parabuf_addline(\%mdocvars, normalize($txt)); - } elsif (/^Bl/) { - $mdocvars{isin_list} = 1; - flush_out(\%mdocvars); - add_sgmltag(\%mdocvars, ""); - - if (/-tag/) { - $mdocvars{listtype} = "tag"; - # YACK! Hack for ata(4) - if ($mdocvars{Nm} eq "ata") { - $mdocvars{listtype} = "tagHACK"; - } - } elsif (/-bullet/) { - $mdocvars{listtype} = "bullet"; - } elsif (/-column/) { - $mdocvars{listtype} = "column"; - } else { - $mdocvars{listtype} = "unknown"; - } - dlog(2, "Listtype set to $mdocvars{listtype}"); - } elsif (/^El/) { - if ($mdocvars{parabuf} ne "") { - add_listitem(\%mdocvars); - } - - add_sgmltag(\%mdocvars, ""); - $mdocvars{isin_list} = 0; - } elsif (/^Tn (.+)$/) { - # For now we print TradeName text as regular text. - my ($txt, $punct_str) = split_punct_chars($1); - - parabuf_addline(\%mdocvars, normalize($txt . $punct_str)); - } elsif (/^Xr ([^ ]+) (.+)$/) { - my ($xr_sect, $punct_str) = split_punct_chars($2); - my $txt; - - # We need to check if the manual page exist to avoid - # breaking the doc build just because of a broken - # reference. - #$txt = "&man.$1.$xr_sect;$punct_str"; - $txt = "$1($xr_sect)$punct_str"; - parabuf_addline(\%mdocvars, normalize($txt)); - } elsif (/^Dq (.+)$/) { - my ($txt, $punct_str) = split_punct_chars($1); - - parabuf_addline(\%mdocvars, - normalize("$txt$punct_str")); - } elsif (/^Sx (.+)$/) { - if ($mdocvars{isin_hwlist}) { - dlog(1, "Warning: Reference to another section in the " . - "$hwlist_sect section in " . $mdocvars{Nm} . - "(${cur_mansection})"); - } - parabuf_addline(\%mdocvars, normalize($1)); - } elsif (/^Pa (.+)$/) { - my ($txt, $punct_str) = split_punct_chars($1); - - $txt = make_ulink($txt) . $punct_str; - parabuf_addline(\%mdocvars, normalize($txt)); - } elsif (/^Pp/) { - dlog(3, "Got Pp command - forcing new para"); - flush_out(\%mdocvars); - } elsif (/^Fx (.+)/) { - dlog(3, "Got Fx command"); - parabuf_addline(\%mdocvars, "FreeBSD $1"); - } elsif (/^Fx/) { - dlog(3, "Got Fx command"); - parabuf_addline(\%mdocvars, "FreeBSD"); - } elsif (/^Em (.+)$/) { - my ($txt, $punct_str) = split_punct_chars($1); - - parabuf_addline(\%mdocvars, - normalize("$txt$punct_str")); - } else { - # Ignore all other commands. - dlog(3, "Ignoring unknown command $cmd"); - } - } else { - # This is then regular text - parabuf_addline(\%mdocvars, normalize($_)); - } - } - close(MANPAGE) || die("$!: Could not close $manpage in ", __LINE__, ".\n"); - if (! $found_hwlist) { - dlog(2, "Hardware list not found in $manpage"); - } -} - -sub dlog { - my ($level, $txt) = @_; - - if ($level <= $debuglevel) { - print STDERR "$level: $txt\n"; - } -} - -# Output a SGML tag. -sub add_sgmltag { - my ($mdocvars, $txt) = (@_); - - # We only care about the HW list for now. - if (${$mdocvars}{isin_hwlist}) { - push(@out_dev, $txt); - } -} - -# Add a text entity, and return the used entity name. -sub add_txt_ent { - my ($itemtxt) = (@_); - my ($entity_name); - - # Convert mdoc(7) minus - $itemtxt =~ s/\\-/-/g; - - $itemtxt =~ s/'/‘/g; - - $entity_name = "hwlist." . md5_hex($itemtxt); - dlog(4, "Adding '$itemtxt' as entity $entity_name"); - push(@out_lines, ""); - - return ($entity_name); -} -sub flush_out { - my ($mdocvars) = (@_); - my ($entity_name, $out); - my $para_arch = ""; - - if (!${$mdocvars}{isin_hwlist} || ${$mdocvars}{parabuf} eq "") { - return; - } - - $entity_name = add_txt_ent(${$mdocvars}{parabuf}); - ${$mdocvars}{parabuf} = ""; - if(defined($archlist{${$mdocvars}{Nm}})) { - if ($compat_mode) { - $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; - } else { - $para_arch = '[' . $archlist{${$mdocvars}{Nm}} . '] '; - } - } - if ($compat_mode) { - $out = "&".$entity_name.";"; - } else { - if (${$mdocvars}{first_para}) { - $out = "".$para_arch."&".$entity_name.";"; - } else { - $out = "&".$entity_name.";"; - } - ${$mdocvars}{first_para} = 0; - } - - dlog(4, "Flushing parabuf"); - add_sgmltag($mdocvars, $out); -} - -# Add a new list item from the "parabuf". -sub add_listitem { - my ($mdocvars) = (@_); - my ($listitem, $entity_name); - my $para_arch = ""; - - $entity_name = add_txt_ent(${$mdocvars}{parabuf}); - ${$mdocvars}{parabuf} = ""; - - if ($compat_mode) { - if(defined($archlist{${$mdocvars}{Nm}})) { - $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; - } - } - $listitem = "&".$entity_name.";"; - dlog(4, "Adding '$listitem' to out_dev"); - push(@out_dev, $listitem); - -} - -# Add a line to the "paragraph buffer" -sub parabuf_addline { - my $mdocvars = shift; - my ($txt) = (@_); - - dlog(5, "Now in parabuf_addline for '$txt'"); - - # We only care about the HW list for now. - if (!${$mdocvars}{isin_hwlist}) { - dlog(6, "Exiting parabuf_addline due to: !\${\$mdocvars}{isin_hwlist}"); - return; - } - if ($txt eq "") { - dlog(6, "Exiting parabuf_addline due to: \$txt eq \"\""); - return; - } - - if ($only_list_out && !${$mdocvars}{isin_list}) { - dlog(6, "Exiting parabuf_addline due to: ". - "\$only_list_out && !\${\$mdocvars}{isin_list}"); - return; - } - - # We only add the first line for "tag" lists - if (${$mdocvars}{parabuf} ne "" && ${$mdocvars}{isin_list} && - ${$mdocvars}{listtype} eq "tag") { - dlog(6, "Exiting parabuf_addline due to: ". - "\${\$mdocvars}{parabuf} ne \"\" && \${\$mdocvars}{isin_list} && ". - "\${\$mdocvars}{listtype} eq \"tag\""); - return; - } - - if (${$mdocvars}{parabuf} ne "") { - ${$mdocvars}{parabuf} .= " "; - } - - dlog(4, "Adding '$txt' to parabuf"); - - ${$mdocvars}{parabuf} .= $txt; -} - -sub load_archlist { - my ($file) = (@_); - - my $lineno = 0; - - dlog(2, "Parsing archlist $file"); - - open(FILE, "$file") || die("$!: Could not open archlist $file in ", __LINE__, ".\n"); - while() { - chomp; - $lineno++; - - if (/^#/ || $_ eq "") { - next; - } - - if (/(\w+)\t([\w,]+)/) { - dlog(4, "For driver $1 setting arch to $2"); - $archlist{$1} = $2; - } else { - dlog(1, "Warning: Could not parse archlist line $lineno"); - } - } - - close(FILE); -} - -# Check if a character is a mdoc(7) punctuation character. -sub is_punct_char { - my ($str) = (@_); - - return (length($str) == 1 && $str =~ /[\.,:;()\[\]\?!]/); -} - -# Split out the punctuation characters of a mdoc(7) line. -sub split_punct_chars { - my ($str) = (@_); - my (@stritems, $stritem, $punct_str); - - $punct_str = ""; - @stritems = split(/ /, $str); - - while (defined($stritem = $stritems[$#stritems]) && - is_punct_char($stritem)) { - $punct_str = $stritem . $punct_str; - pop(@stritems); - } - - return (join(' ', @stritems), $punct_str); -} - -# Create a ulink, if the string contains an URL. -sub make_ulink { - my ($str) = (@_); - - $str =~ s,(http://[^ ]+),,; - - return $str; -} Property changes on: en_US.ISO8859-1/htdocs/share/misc/man2hwnotes.pl ___________________________________________________________________ Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: share/misc/dev.archlist.txt =================================================================== --- share/misc/dev.archlist.txt (nonexistent) +++ share/misc/dev.archlist.txt (working copy) @@ -0,0 +1,176 @@ +# +# Copyright (c) 2004-2006 The FreeBSD Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# +# This file is used by man2hwnotes.pl to set which drivers are usable +# on which architectures. +# +# Format: +# +# Empty lines, and lines beginning with "#" are ignored. +# [,...] +# +aac i386,amd64 +adv i386,amd64 +adw i386,amd64 +aha i386 +ahb i386 +ahd i386,sparc64,amd64 +aic i386,amd64 +amd i386,amd64 +arcmsr i386,amd64 +asr i386 +ath i386,amd64,sparc64 +aue i386,amd64,powerpc +axe i386,amd64,powerpc +bce i386,amd64 +bge i386,sparc64,amd64 +bktr i386 +bt i386,amd64 +bxe i386,amd64 +cdce i386,amd64,powerpc +ciss i386,amd64 +ce i386 +cm i386 +cnw i386,amd64 +cp i386 +ctau i386 +cue i386,amd64,powerpc +cx i386 +cxgb i386,amd64 +de i386,amd64 +dpt i386,amd64 +ed i386 +ep i386,amd64 +esp sparc64 +ex i386,amd64 +fe i386,amd64 +fwohci i386,sparc64,amd64,powerpc +hifn i386,amd64 +hpt27xx i386,amd64 +hptiop i386,amd64 +hptmv i386,amd64 +hptrr i386,amd64 +ida i386 +ie i386 +iir i386,amd64 +ips i386,amd64 +isci i386,amd64 +ixgb i386,amd64 +kue i386,amd64,powerpc +lge i386,amd64 +mfi i386,amd64 +mlx i386,amd64 +mly i386,amd64 +msk i386,amd64 +mxge i386,amd64 +my i386 +ncr i386,amd64 +ncv i386 +nfe i386,amd64 +ng_bt3c i386,amd64 +ng_ubt i386,amd64 +nsp i386 +nxge i386,amd64 +oce i386,amd64 +ohci i386,amd64,powerpc +oltr i386 +otus i386,amd64 +pcn i386,amd64 +pst i386 +qlxgb amd64 +qlxgbe amd64 +qlxge amd64 +rc i386 +ral i386,amd64 +rsu i386,amd64 +rue i386,amd64 +rum i386,amd64 +run i386,amd64 +safe i386,amd64 +sbp i386,sparc64,amd64 +sfgxe amd64 +sn i386,amd64 +snd_ad1816 i386,amd64 +snd_als4000 i386 +snd_atiixp i386,amd64 +snd_audiocs sparc64 +snd_cmi i386,amd64 +snd_cs4281 i386,amd64 +snd_csa i386,amd64 +snd_ds1 i386,amd64 +snd_emu10k1 i386,amd64 +snd_emu10kx i386,amd64 +snd_envy24 i386,amd64 +snd_envy24ht i386,amd64 +snd_es137x i386,sparc64,amd64 +snd_ess i386,amd64 +snd_fm801 i386,amd64 +snd_gusc i386,amd64 +snd_hda i386,amd64 +snd_hdspe i386,amd64 +snd_ich i386,amd64 +snd_maestro i386,amd64 +snd_maestro3 i386,amd64 +snd_mss i386 +snd_neomagic i386,amd64 +snd_sbc i386,amd64 +snd_solo i386,amd64 +snd_spicds i386,amd64 +snd_t4dwave i386,amd64,sparc64 +snd_via8233 i386,amd64 +snd_via82c686 i386,amd64 +snd_vibes i386,amd64 +stg i386 +ti i386,amd64,sparc64 +tl i386,amd64 +trm i386,amd64 +twa i386,amd64 +twe i386,amd64 +tws i386,amd64 +ubsa i386,amd64 +ubsec i386,amd64 +ubser i386,amd64 +ucycom i386,amd64 +udav i386,amd64 +uftdi i386,amd64 +uhci i386,amd64,powerpc +ulpt i386,amd64,powerpc +umass i386,amd64,powerpc +umodem i386,amd64 +uplcom i386,amd64 +ural i386,amd64 +urio i386,amd64,powerpc +uvisor i386,amd64 +uvscom i386,amd64 +vpo i386 +vx i386,amd64 +vxge i386,amd64 +wb i386,amd64 +xe i386,amd64 +zyd i386,amd64 Property changes on: share/misc/dev.archlist.txt ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: share/misc/man2hwnotes.pl =================================================================== --- share/misc/man2hwnotes.pl (nonexistent) +++ share/misc/man2hwnotes.pl (working copy) @@ -0,0 +1,534 @@ +#!/usr/local/bin/perl -w +# Emacs should use -*- cperl -*- mode +# +# Copyright (c) 2003-2006 Simon L. Nielsen +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Parse the list of supported hardware out of section 4 manual pages +# and output it on stdout as SGML/DocBook entities. + +# The script will look for the following line in the manual page: +# .Sh HARDWARE +# and make an entity of the content until the line containing: +# .Sh +# +# For Lists only the first line will be printed. If there are +# arguments to the .It command, only the argument will be printed. + +# Usage: +# man2hwnotes.pl [-cl] [-d 0-6] [-a ] [-o ] +# [ ...] + +use strict; +#use warnings; +use Getopt::Std; +use Digest::MD5 qw(md5_hex); + +# Section from manual page to extract +my $hwlist_sect = "HARDWARE"; + +# Override default archtecture list for some devices: +my $archlist_file = "dev.archlist.txt"; +my %archlist; + +# Globals +my $compat_mode = 0; # Enable compat for old Hardware Notes style +my $debuglevel = 0; +my $only_list_out = 0; # Should only lists be generated in the output? +my @out_lines; # Single lines +my @out_dev; # Device entities + +# Getopt +my %options = (); +if (!getopts("a:cd:lo:",\%options)) { + die("$!: Invalid command line arguments in ", __LINE__, "\n"); +} + +if (defined($options{c})) { + $compat_mode = 1; +} +if (defined($options{d})) { + $debuglevel = $options{d}; +} +if (defined($options{a})) { + $archlist_file = $options{a}; +} +if (defined($options{l})) { + $only_list_out = 1; +} + +my $outputfile = $options{o}; + +if ($debuglevel > 0) { + # Don't do output buffering in debug mode. + $| = 1; +} + +load_archlist($archlist_file); + +if (defined($outputfile)) { + open(OLDOUT, ">&STDOUT") || die("$!: Could not open STDOUT in ", __LINE__, ".\n"); + open(STDOUT, ">$outputfile") || die("$!: Could not open $outputfile in ", __LINE__, ".\n"); +} + +print < +EOT + +if ($only_list_out) { + # Print the default device preamble entities + print "\n"; + print "\n"; +} + +foreach my $page (@ARGV) { + if ($page !~ m/\.4$/) { + dlog(2, "Skipped $page (not *.4)"); + next; + } + dlog(2, "Parsing $page"); + parse($page); + + if (@out_lines) { + print join("\n", @out_lines), "\n"; + } + if (@out_dev) { + print join("\n", @out_dev), "\n"; + } + + @out_lines = (); + @out_dev = (); +} + +if (defined($outputfile)) { + open(STDOUT, ">&OLDOUT") || die("$!: Could not open STDOUT in ", __LINE__, ".\n"); + close(OLDOUT) || die("$!: Could not close OLDOUT in ", __LINE__, ".\n"); +} + +sub normalize (@) { + my @lines = @_; + + foreach my $l (@lines) { + $l =~ s/\\&//g; + $l =~ s:([\x21-\x2f\x5b-\x60\x7b-\x7f]):sprintf("&\#\%d;", ord($1)):eg; + # Make sure ampersand is encoded as & since jade seems to + # be confused when it is encoded as & inside an entity. + $l =~ s/&/&/g; + } + return (wantarray) ? @lines : join "", @lines; +} + +sub parse { + my ($manpage) = @_; + + my $cur_mansection; + my $found_hwlist = 0; + my %mdocvars; + $mdocvars{isin_hwlist} = 0; + $mdocvars{isin_list} = 0; + $mdocvars{first_para} = 1; + $mdocvars{parabuf} = ""; + $mdocvars{listtype} = ""; + $mdocvars{it_nr} = 0; + + open(MANPAGE, "$manpage") || die("$!: Could not open $manpage in ", __LINE__, ".\n"); + while() { + chomp; + my $line = $_; + + dlog(5, "Read '$line'"); + + # Find commands + if (s/^\.(.*)$/$1/) { + my $cmd = $1; + + # Detect, and ignore, comment lines + if (s/^\\"(.*)$/$1/) { + next; + } + + $cmd =~ s/^([^ ]+).*$/$1/; + + if (/^Nm "?(\w+)"?/ && !defined($mdocvars{Nm})) { + dlog(3, "Setting Nm to $1"); + $mdocvars{Nm} = $1; + # "_" cannot be used for an entity name. + $mdocvars{EntNm} = $1; + $mdocvars{EntNm} =~ s,_,.,g; + + } elsif (/^Nm$/) { + if (defined($mdocvars{Nm}) && $mdocvars{Nm} ne "") { + parabuf_addline(\%mdocvars, "&man.".$mdocvars{EntNm}.".$cur_mansection;"); + } else { + dlog(2, "Warning: Bad Nm call in $manpage"); + } + + } elsif (/^Sh (.+)$/) { + dlog(4, "Setting section to $1"); + my $cur_section = $1; + + flush_out(\%mdocvars); + + if ($cur_section =~ /^${hwlist_sect}$/) { + dlog(2, "Found the device section ${hwlist_sect}"); + $mdocvars{isin_hwlist} = 1; + $found_hwlist = 1; + add_sgmltag(\%mdocvars, "&hwlist.preamble.pre; " . + "&man.".$mdocvars{EntNm}.".$cur_mansection; " . + "&hwlist.preamble.post;"); + } + } elsif ($mdocvars{isin_hwlist}) { + dlog(2, "Found a HWLIST STOP key!"); + add_sgmltag(\%mdocvars, "'>"); + $mdocvars{isin_hwlist} = 0; + } + if ($mdocvars{isin_list}) { + dlog(1, "Warning: Still in list, but just entered new " . + "section. This is probably due to missing .El; " . + "check manual page for errors."); + # If we try to recover from this we will probably + # just end with bad SGML output and it really + # should be fixed in the manual page so we don't + # even try to "fix" this. + } + + + } elsif (/^Dt ([^ ]+) ([^ ]+)/) { + dlog(4, "Setting mansection to $2"); + $mdocvars{cur_manname} = lc($1); + $cur_mansection = $2; + + # "_" cannot be used for an entity name. + $mdocvars{cur_manname} =~ s,_,.,g; + + } elsif (/^It ?(.*)$/) { + my $txt = $1; + + $mdocvars{it_nr}++; + + # Flush last item + if ($mdocvars{parabuf} ne "") { + add_listitem(\%mdocvars); + } + + # Remove quotes, if any. + $txt =~ s/"(.*)"/$1/; + + if ($mdocvars{listtype} eq "column") { + # Ignore first item when it is likely to be a + # header. + if ($mdocvars{it_nr} == 1 && $txt =~ m/^(Em|Sy) /) { + dlog(2, "Skipping header line in column list"); + next; + } + # Only extract the first column. + $txt =~ s/ Ta /\t/g; + $txt =~ s/([^\t]+)\t.*/$1/; + } + + # Remove Li commands + $txt =~ s/^Li //g; + + parabuf_addline(\%mdocvars, normalize($txt)); + } elsif (/^Bl/) { + $mdocvars{isin_list} = 1; + flush_out(\%mdocvars); + add_sgmltag(\%mdocvars, ""); + + if (/-tag/) { + $mdocvars{listtype} = "tag"; + # YACK! Hack for ata(4) + if ($mdocvars{Nm} eq "ata") { + $mdocvars{listtype} = "tagHACK"; + } + } elsif (/-bullet/) { + $mdocvars{listtype} = "bullet"; + } elsif (/-column/) { + $mdocvars{listtype} = "column"; + } else { + $mdocvars{listtype} = "unknown"; + } + dlog(2, "Listtype set to $mdocvars{listtype}"); + } elsif (/^El/) { + if ($mdocvars{parabuf} ne "") { + add_listitem(\%mdocvars); + } + + add_sgmltag(\%mdocvars, ""); + $mdocvars{isin_list} = 0; + } elsif (/^Tn (.+)$/) { + # For now we print TradeName text as regular text. + my ($txt, $punct_str) = split_punct_chars($1); + + parabuf_addline(\%mdocvars, normalize($txt . $punct_str)); + } elsif (/^Xr ([^ ]+) (.+)$/) { + my ($xr_sect, $punct_str) = split_punct_chars($2); + my $txt; + + # We need to check if the manual page exist to avoid + # breaking the doc build just because of a broken + # reference. + #$txt = "&man.$1.$xr_sect;$punct_str"; + $txt = "$1($xr_sect)$punct_str"; + parabuf_addline(\%mdocvars, normalize($txt)); + } elsif (/^Dq (.+)$/) { + my ($txt, $punct_str) = split_punct_chars($1); + + parabuf_addline(\%mdocvars, + normalize("$txt$punct_str")); + } elsif (/^Sx (.+)$/) { + if ($mdocvars{isin_hwlist}) { + dlog(1, "Warning: Reference to another section in the " . + "$hwlist_sect section in " . $mdocvars{Nm} . + "(${cur_mansection})"); + } + parabuf_addline(\%mdocvars, normalize($1)); + } elsif (/^Pa (.+)$/) { + my ($txt, $punct_str) = split_punct_chars($1); + + $txt = make_ulink($txt) . $punct_str; + parabuf_addline(\%mdocvars, normalize($txt)); + } elsif (/^Pp/) { + dlog(3, "Got Pp command - forcing new para"); + flush_out(\%mdocvars); + } elsif (/^Fx (.+)/) { + dlog(3, "Got Fx command"); + parabuf_addline(\%mdocvars, "FreeBSD $1"); + } elsif (/^Fx/) { + dlog(3, "Got Fx command"); + parabuf_addline(\%mdocvars, "FreeBSD"); + } elsif (/^Em (.+)$/) { + my ($txt, $punct_str) = split_punct_chars($1); + + parabuf_addline(\%mdocvars, + normalize("$txt$punct_str")); + } else { + # Ignore all other commands. + dlog(3, "Ignoring unknown command $cmd"); + } + } else { + # This is then regular text + parabuf_addline(\%mdocvars, normalize($_)); + } + } + close(MANPAGE) || die("$!: Could not close $manpage in ", __LINE__, ".\n"); + if (! $found_hwlist) { + dlog(2, "Hardware list not found in $manpage"); + } +} + +sub dlog { + my ($level, $txt) = @_; + + if ($level <= $debuglevel) { + print STDERR "$level: $txt\n"; + } +} + +# Output a SGML tag. +sub add_sgmltag { + my ($mdocvars, $txt) = (@_); + + # We only care about the HW list for now. + if (${$mdocvars}{isin_hwlist}) { + push(@out_dev, $txt); + } +} + +# Add a text entity, and return the used entity name. +sub add_txt_ent { + my ($itemtxt) = (@_); + my ($entity_name); + + # Convert mdoc(7) minus + $itemtxt =~ s/\\-/-/g; + + $itemtxt =~ s/'/‘/g; + + $entity_name = "hwlist." . md5_hex($itemtxt); + dlog(4, "Adding '$itemtxt' as entity $entity_name"); + push(@out_lines, ""); + + return ($entity_name); +} +sub flush_out { + my ($mdocvars) = (@_); + my ($entity_name, $out); + my $para_arch = ""; + + if (!${$mdocvars}{isin_hwlist} || ${$mdocvars}{parabuf} eq "") { + return; + } + + $entity_name = add_txt_ent(${$mdocvars}{parabuf}); + ${$mdocvars}{parabuf} = ""; + if(defined($archlist{${$mdocvars}{Nm}})) { + if ($compat_mode) { + $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; + } else { + $para_arch = '[' . $archlist{${$mdocvars}{Nm}} . '] '; + } + } + if ($compat_mode) { + $out = "&".$entity_name.";"; + } else { + if (${$mdocvars}{first_para}) { + $out = "".$para_arch."&".$entity_name.";"; + } else { + $out = "&".$entity_name.";"; + } + ${$mdocvars}{first_para} = 0; + } + + dlog(4, "Flushing parabuf"); + add_sgmltag($mdocvars, $out); +} + +# Add a new list item from the "parabuf". +sub add_listitem { + my ($mdocvars) = (@_); + my ($listitem, $entity_name); + my $para_arch = ""; + + $entity_name = add_txt_ent(${$mdocvars}{parabuf}); + ${$mdocvars}{parabuf} = ""; + + if ($compat_mode) { + if(defined($archlist{${$mdocvars}{Nm}})) { + $para_arch = ' arch="' . $archlist{${$mdocvars}{Nm}} . '"'; + } + } + $listitem = "&".$entity_name.";"; + dlog(4, "Adding '$listitem' to out_dev"); + push(@out_dev, $listitem); + +} + +# Add a line to the "paragraph buffer" +sub parabuf_addline { + my $mdocvars = shift; + my ($txt) = (@_); + + dlog(5, "Now in parabuf_addline for '$txt'"); + + # We only care about the HW list for now. + if (!${$mdocvars}{isin_hwlist}) { + dlog(6, "Exiting parabuf_addline due to: !\${\$mdocvars}{isin_hwlist}"); + return; + } + if ($txt eq "") { + dlog(6, "Exiting parabuf_addline due to: \$txt eq \"\""); + return; + } + + if ($only_list_out && !${$mdocvars}{isin_list}) { + dlog(6, "Exiting parabuf_addline due to: ". + "\$only_list_out && !\${\$mdocvars}{isin_list}"); + return; + } + + # We only add the first line for "tag" lists + if (${$mdocvars}{parabuf} ne "" && ${$mdocvars}{isin_list} && + ${$mdocvars}{listtype} eq "tag") { + dlog(6, "Exiting parabuf_addline due to: ". + "\${\$mdocvars}{parabuf} ne \"\" && \${\$mdocvars}{isin_list} && ". + "\${\$mdocvars}{listtype} eq \"tag\""); + return; + } + + if (${$mdocvars}{parabuf} ne "") { + ${$mdocvars}{parabuf} .= " "; + } + + dlog(4, "Adding '$txt' to parabuf"); + + ${$mdocvars}{parabuf} .= $txt; +} + +sub load_archlist { + my ($file) = (@_); + + my $lineno = 0; + + dlog(2, "Parsing archlist $file"); + + open(FILE, "$file") || die("$!: Could not open archlist $file in ", __LINE__, ".\n"); + while() { + chomp; + $lineno++; + + if (/^#/ || $_ eq "") { + next; + } + + if (/(\w+)\t([\w,]+)/) { + dlog(4, "For driver $1 setting arch to $2"); + $archlist{$1} = $2; + } else { + dlog(1, "Warning: Could not parse archlist line $lineno"); + } + } + + close(FILE); +} + +# Check if a character is a mdoc(7) punctuation character. +sub is_punct_char { + my ($str) = (@_); + + return (length($str) == 1 && $str =~ /[\.,:;()\[\]\?!]/); +} + +# Split out the punctuation characters of a mdoc(7) line. +sub split_punct_chars { + my ($str) = (@_); + my (@stritems, $stritem, $punct_str); + + $punct_str = ""; + @stritems = split(/ /, $str); + + while (defined($stritem = $stritems[$#stritems]) && + is_punct_char($stritem)) { + $punct_str = $stritem . $punct_str; + pop(@stritems); + } + + return (join(' ', @stritems), $punct_str); +} + +# Create a ulink, if the string contains an URL. +sub make_ulink { + my ($str) = (@_); + + $str =~ s,(http://[^ ]+),,; + + return $str; +} Property changes on: share/misc/man2hwnotes.pl ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property ----Next_Part(Sun_Oct_22_20_20_23_2017_745)---- ----Security_Multipart0(Sun_Oct_22_20_20_23_2017_644)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iEYEABECAAYFAlnsfvcACgkQTyzT2CeTzy0x4ACdGF+zXa956jRN70mStb3RXMw8 LIkAniV/JaS5UfXZv/+aNuUl1nO7MN7x =s98r -----END PGP SIGNATURE----- ----Security_Multipart0(Sun_Oct_22_20_20_23_2017_644)---- From owner-svn-doc-head@freebsd.org Sun Oct 22 14:02:52 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3AE29E532A2; Sun, 22 Oct 2017 14:02:52 +0000 (UTC) (envelope-from ryusuke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 00E3E66CE2; Sun, 22 Oct 2017 14:02:51 +0000 (UTC) (envelope-from ryusuke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9ME2peQ083152; Sun, 22 Oct 2017 14:02:51 GMT (envelope-from ryusuke@FreeBSD.org) Received: (from ryusuke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9ME2pgM083151; Sun, 22 Oct 2017 14:02:51 GMT (envelope-from ryusuke@FreeBSD.org) Message-Id: <201710221402.v9ME2pgM083151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ryusuke set sender to ryusuke@FreeBSD.org using -f From: Ryusuke SUZUKI Date: Sun, 22 Oct 2017 14:02:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51142 - head/ja_JP.eucJP/htdocs X-SVN-Group: doc-head X-SVN-Commit-Author: ryusuke X-SVN-Commit-Paths: head/ja_JP.eucJP/htdocs X-SVN-Commit-Revision: 51142 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Oct 2017 14:02:52 -0000 Author: ryusuke Date: Sun Oct 22 14:02:50 2017 New Revision: 51142 URL: https://svnweb.freebsd.org/changeset/doc/51142 Log: - Merge the following from the English version: r51093 -> r51137 head/ja_JP.eucJP/htdocs/where.xml Modified: head/ja_JP.eucJP/htdocs/where.xml Modified: head/ja_JP.eucJP/htdocs/where.xml ============================================================================== --- head/ja_JP.eucJP/htdocs/where.xml Sun Oct 22 11:23:01 2017 (r51141) +++ head/ja_JP.eucJP/htdocs/where.xml Sun Oct 22 14:02:50 2017 (r51142) @@ -6,7 +6,7 @@ ]> - + @@ -348,17 +348,17 @@ From owner-svn-doc-head@freebsd.org Mon Oct 23 13:58:18 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55E0FE4C7A9; Mon, 23 Oct 2017 13:58:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 313D471A1E; Mon, 23 Oct 2017 13:58:18 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 4AF7F14A49; Mon, 23 Oct 2017 13:58:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Mon, 23 Oct 2017 13:58:15 +0000 From: Glen Barber To: Hiroki Sato Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: Re: svn commit: r51058 - head/share/tools Message-ID: <20171023135815.GD95482@FreeBSD.org> References: <201710052017.v95KHXIE042251@repo.freebsd.org> <20171022.184144.203971308906863927.hrs@allbsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rqzD5py0kzyFAOWN" Content-Disposition: inline In-Reply-To: <20171022.184144.203971308906863927.hrs@allbsd.org> User-Agent: Mutt/1.8.2 (2017-04-18) X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Oct 2017 13:58:18 -0000 --rqzD5py0kzyFAOWN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 22, 2017 at 06:41:44PM +0900, Hiroki Sato wrote: > Glen Barber wrote > in <201710052017.v95KHXIE042251@repo.freebsd.org>: >=20 > gj> Author: gjb > gj> Date: Thu Oct 5 20:17:33 2017 > gj> New Revision: 51058 > gj> URL: https://svnweb.freebsd.org/changeset/doc/51058 > gj> > gj> Log: > gj> Enable update/checkout of src/share/man/man4 for the 12.0R hardware > gj> page. > gj> > gj> Sponsored by: The FreeBSD Foundation > gj> > gj> Modified: > gj> head/share/tools/webupdate > gj> > gj> Modified: head/share/tools/webupdate > gj> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > gj> --- head/share/tools/webupdate Thu Oct 5 20:13:57 2017 (r51057) > gj> +++ head/share/tools/webupdate Thu Oct 5 20:17:33 2017 (r51058) > gj> @@ -88,7 +88,7 @@ export NO_OBJ=3DYES > gj> # assumes that the directory right below that is the language code. > gj> # This works fine if all the languages are in a directory called > gj> # 'doc', and not at all if they aren't. > gj> -subtrees=3D'head > gj> +subtrees=3D'head src/share/man/man4 > gj> relnotes11/doc relnotes11/man4 > gj> relnotes10/doc relnotes10/man4 > gj> ports'; > gj> @@ -129,6 +129,8 @@ if [ $cond ]; then > gj> svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2; > gj> > gj> test -d relnotes || mkdir relnotes; > gj> + mkdir -p src/share/man/man4 > gj> + svn co $SVNROOT/base/head/share/man/man4 src/share/man/man4 >> $LOG= FILE 2>&1 || exit 2; > gj> svn co $SVNROOT/base/stable/11/release/doc relnotes11/doc >> $LOGFI= LE 2>&1 || exit 2; > gj> svn co $SVNROOT/base/stable/11/share/man/man4 relnotes11/man4 >> $L= OGFILE 2>&1 || exit 2; > gj> svn co $SVNROOT/base/stable/10/release/doc relnotes10/doc >> $LOGFI= LE 2>&1 || exit 2; >=20 > I think we need to checkout man4 directory in a per-release-branch > (and per-stable-branch for webupdate) basis because each hwnotes > should be generated by using man4 directory from a specific release > after migration from src/release/doc. I think relnotes/12/man4, and > relnotes/12.0/man4 after releng/12.0 would be reasonable names if we > reuse the old convention. >=20 Yes, that is the plan for future updates. > Glen Barber wrote > in <201710052032.v95KWQbI050265@repo.freebsd.org>: >=20 > gj> Modified: head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile > gj> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > gj> --- head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Thu Oc= t 5 20:20:05 2017 (r51059) > gj> +++ head/en_US.ISO8859-1/htdocs/releases/12.0R/errata/Makefile Thu Oc= t 5 20:32:26 2017 (r51060) > gj> @@ -21,6 +21,13 @@ SRCS?=3D errata.xml > gj> > gj> DATA+=3D ${DOC}.html > gj> > gj> +beforeclean: > gj> +CLEANFILES+=3D ${DOC}.html \ > gj> + ${DOC}.txt \ > gj> + catalog-cwd.xml \ > gj> + autogen.ent \ > gj> + ${DOC}.parsed.* > gj> + >=20 > catalog-cwd.xml, autogen.ent, and ${DOC}.parsed.* are already > included in doc.dockbook.mk. >=20 With how the targets are invoked and the conditional use of SUBDIR (which was intentional), these did not properly get cleaned with use of 'clean' or 'beforeclean'. I have not looked into it further since this change. Glen --rqzD5py0kzyFAOWN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEVVuz/A7vpH93hEhKuWzd6q+LXtAFAlnt9XcACgkQuWzd6q+L XtCEfA/9FqGOTRNEHHPYsNuZ9kt2hzd19cWfGPM7X723pOejt9P8oik8d9m3fMT4 1pHbeFDKy/lC8gIP7MsgETdAf2FnvNj9P80fljVu06dHia7kt6GjVKMqpE2uotJZ kZc/8gZh6PLlLcw0SYoGnDrNAhzSID/Eyrs/FBwgNex0P/tCB2V0FTxntO/BxyNO nks7MsvcFr2uNUul+X210JZfUWU0wtZG9KQJVxUlt9GXGyRjqzXP6dJJnFGLLXOP Zvbr/SkcPhPRYqtfY+Wv571omNKVyVvzL7pz9hUJLfWs3MHH/veTuGVGvDuHou3c t0XKs6mVN//06AZQV5ps8SI26QyQd86tZNpWkRcccFQbsOWcoaRYITc49YfpIhMk DzDgjl2nE/LAoQRth987bhUmTF+zwKRv6W81QJUIU53RBXZfCYpKcVFmOelNNpWf nZXqkr6lVUqm1NSWKqyUlY065O/+H5FpCBt68HBb2ET054uPnh5n3LnLI4xP//ZZ zXaxs6o7WK+Hh26Z4Rvke5kjrD5xefp9uF66dyqCdzReQUMwU61gtRG7cX0VJ0O+ nykRojkC2bZRCEjliwu3f5V8iz70TlNMxfJf+KxzmlaMIZesL4l+cC6KjGBQjaVy akTfcYq95dI2AFIcaPeMCKlutV74tgDrzaIosnOXGjj4DjpNeVM= =f50/ -----END PGP SIGNATURE----- --rqzD5py0kzyFAOWN-- From owner-svn-doc-head@freebsd.org Mon Oct 23 14:04:56 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C551E4CA08; Mon, 23 Oct 2017 14:04:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E295C71D9E; Mon, 23 Oct 2017 14:04:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id F023114B4F; Mon, 23 Oct 2017 14:04:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Date: Mon, 23 Oct 2017 14:04:53 +0000 From: Glen Barber To: Hiroki Sato Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: Re: svn commit: r51055 - head/en_US.ISO8859-1/htdocs/releases/12.0R Message-ID: <20171023140453.GE95482@FreeBSD.org> References: <201710052007.v95K7wdI038021@repo.freebsd.org> <20171022.202023.700298682654760426.hrs@allbsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6Vw0j8UKbyX0bfpA" Content-Disposition: inline In-Reply-To: <20171022.202023.700298682654760426.hrs@allbsd.org> User-Agent: Mutt/1.8.2 (2017-04-18) X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Oct 2017 14:04:56 -0000 --6Vw0j8UKbyX0bfpA Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 22, 2017 at 08:20:23PM +0900, Hiroki Sato wrote: > Glen Barber wrote > in <201710052007.v95K7wdI038021@repo.freebsd.org>: >=20 > gj> Author: gjb > gj> Date: Thu Oct 5 20:07:58 2017 > gj> New Revision: 51055 > gj> URL: https://svnweb.freebsd.org/changeset/doc/51055 > gj> > gj> Log: > gj> Reapply r51054, with a few fixes. > gj> Fix a typo: s/elfi/elif/ > gj> Remove dependencies from the dev-auto.ent target, which seems > gj> I misread the original version of how this was invoked. > gj> > gj> Sponsored by: The FreeBSD Foundation >=20 > These part should be in hardware/ directory and a part of guessing > MAN4DIR should be dropped. MAN4DIR must be specified because each > hardware directory is for a specific branch/release as I pointed out > in another email. A generic location such as src/share/man/man4 or a > guessed directory is confusing. >=20 > Makefile does not handle cross-directory dependency well, so > dev-auto.ent should be generated in the hardware directory. >=20 > Also, please do not use /htdocs/share. Common files should be > in head/share or head//share consistently. > releases/12.0R/share/xml needs some more consideration, but I think > it is fine for now. >=20 > A patch to fix generation of hardware notes and other minor nits is > attached. Note that XML catalog resolution is still broken. >=20 Thank you for the feedback. I will try to look at this today, but if it just works for you, please go ahead and commit it. One thing to note is SUBDIR was originally not used, as a faster way to get the install path correct for files like relnotes.html and hardware.html, so the structure did not change on the website. I cannot tell after a quick glance if this behavior persists with the attached patch. Glen --6Vw0j8UKbyX0bfpA Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEVVuz/A7vpH93hEhKuWzd6q+LXtAFAlnt9wUACgkQuWzd6q+L XtBUihAA02BWfAZgNej2MEWCUjypaDr2MbX+q9ENNiJh8dgeoaZgN5I2LxmQ40Sx 5qOBmAn83u+oFhCb+ZzdL7+ZkopeFtw0XSiIIRP7KGzVPLxmi1+65HWkBA6X3aAZ rHgjZD8osqHHhZNKcblfTVyxON67yCvB42PPLsTCUMF7todDwGByy9G+gAzK+CzM auahm7s1MANb05zJGCCsGW2ESpUn6YoLji+gxPUaM7fqx/tWwSIMVxNDcSZdtxKo HFYNO7o4WC4tfgrVv1uxRz/lkRPtR7+5cvs4X7hUYDr3GFAtGB6aYjVAhm/0xvd3 nX9BlTxlTKXI5YysEv59TO4Dr+ML4luzo55QVbd97edSsmE0xznQj8XJTEDawUS3 Yaot7ybA2XXIQnDDpU0BIHcehsALj/aArIXk9oK1YtjOqLXJ4337Pb3qFCo54TcS goK5nkylp6mqQXCnYdljHfh9AktVnSVBqTv3Bnq/xk7GeTsZwGq8vBfRNa0Fh60y MZJeqnUy1Git+upz+3cQvu8ZAefa9q1V1ti1WS7UewY6gHPJ6G9a3CZpUSclftSH /sqqnUKinXFdl6S52xsFb6WVwEUD1dX/1kPKb4ytTbKT8Q6e0l+3yiE4Ntyfvuuw mLAVy89j5yzjtn/6PIB/dSqNsiQ4QF866W3I2EdYA2yxnChRlkQ= =QS+2 -----END PGP SIGNATURE----- --6Vw0j8UKbyX0bfpA-- From owner-svn-doc-head@freebsd.org Wed Oct 25 15:01:31 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD27EE4C689; Wed, 25 Oct 2017 15:01:31 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A1F6705B1; Wed, 25 Oct 2017 15:01:31 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PF1UAA007285; Wed, 25 Oct 2017 15:01:30 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PF1UXJ007284; Wed, 25 Oct 2017 15:01:30 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201710251501.v9PF1UXJ007284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Wed, 25 Oct 2017 15:01:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51143 - head/en_US.ISO8859-1/books/porters-handbook/special X-SVN-Group: doc-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/special X-SVN-Commit-Revision: 51143 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2017 15:01:31 -0000 Author: ak (ports committer) Date: Wed Oct 25 15:01:30 2017 New Revision: 51143 URL: https://svnweb.freebsd.org/changeset/doc/51143 Log: - Update Scons section Differential Revision: https://reviews.freebsd.org/D12697 Approved by: portmgr (mat) Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Sun Oct 22 14:02:50 2017 (r51142) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Wed Oct 25 15:01:30 2017 (r51143) @@ -766,51 +766,11 @@ CMAKE_SOURCE_PATH= ${WRKSRC}/subprojectUsing scons If the port uses SCons, - define USE_SCONS=yes. + define USES=scons. - - Variables for Ports That Use - <command>scons</command> - - - - - Variable - Means - - - - - - SCONS_ARGS - Port specific SCons flags passed to the SCons - environment. - - - - SCONS_BUILDENV - Variables to be set in system - environment. - - - - SCONS_ENV - Variables to be set in SCons - environment. - - - - SCONS_TARGET - Last argument passed to SCons, similar to - MAKE_TARGET. - - - -
- To make third party SConstruct respect everything that is passed to SCons in - SCONS_ENV (that is, most importantly, + the environment (that is, most importantly, CC/CXX/CFLAGS/CXXFLAGS), patch SConstruct so build Environment is constructed like From owner-svn-doc-head@freebsd.org Wed Oct 25 15:06:15 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FA70E4C8FB; Wed, 25 Oct 2017 15:06:15 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C9E0707E3; Wed, 25 Oct 2017 15:06:15 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PF6E87008962; Wed, 25 Oct 2017 15:06:14 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PF6EjN008961; Wed, 25 Oct 2017 15:06:14 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201710251506.v9PF6EjN008961@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Wed, 25 Oct 2017 15:06:14 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51144 - head/en_US.ISO8859-1/books/porters-handbook/special X-SVN-Group: doc-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/special X-SVN-Commit-Revision: 51144 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2017 15:06:15 -0000 Author: ak (ports committer) Date: Wed Oct 25 15:06:14 2017 New Revision: 51144 URL: https://svnweb.freebsd.org/changeset/doc/51144 Log: - Remove 'Using Emacs' section. It is "yet to be written" for 13+ years. Differential Revision: https://reviews.freebsd.org/D12696 Approved by: portmgr (mat) Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Wed Oct 25 15:01:30 2017 (r51143) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Wed Oct 25 15:06:14 2017 (r51144) @@ -3826,12 +3826,6 @@ USE_PYTHON= autoplist distutils /usr/ports/Mk/Uses/tcl.mk. - - Using Emacs - - This section is yet to be written. - - Using Ruby From owner-svn-doc-head@freebsd.org Wed Oct 25 15:10:21 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42C44E4C9BF; Wed, 25 Oct 2017 15:10:21 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C453709A7; Wed, 25 Oct 2017 15:10:21 +0000 (UTC) (envelope-from ak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9PFAKts009354; Wed, 25 Oct 2017 15:10:20 GMT (envelope-from ak@FreeBSD.org) Received: (from ak@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9PFAKF2009353; Wed, 25 Oct 2017 15:10:20 GMT (envelope-from ak@FreeBSD.org) Message-Id: <201710251510.v9PFAKF2009353@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ak set sender to ak@FreeBSD.org using -f From: Alex Kozlov Date: Wed, 25 Oct 2017 15:10:20 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51145 - head/en_US.ISO8859-1/books/porters-handbook/special X-SVN-Group: doc-head X-SVN-Commit-Author: ak X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/special X-SVN-Commit-Revision: 51145 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2017 15:10:21 -0000 Author: ak (ports committer) Date: Wed Oct 25 15:10:19 2017 New Revision: 51145 URL: https://svnweb.freebsd.org/changeset/doc/51145 Log: - Update wxWidgets section Differential Revision: https://reviews.freebsd.org/D12700 Approved by: portmgr (mat) Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Wed Oct 25 15:06:14 2017 (r51144) +++ head/en_US.ISO8859-1/books/porters-handbook/special/chapter.xml Wed Oct 25 15:10:19 2017 (r51145) @@ -4167,35 +4167,20 @@ USE_PYTHON= autoplist distutils - 2.4 + 2.8 x11-toolkits/wxgtk24 + role="port">x11-toolkits/wxgtk28 - 2.6 + 3.0 x11-toolkits/wxgtk26 + role="port">x11-toolkits/wxgtk30 - - - 2.8 - x11-toolkits/wxgtk28 - - - The versions starting from 2.5 also - come in Unicode version and are installed by a slave port - named like the normal one plus a - -unicode suffix, but this can be - handled with variables (see - ). - - The variables in can be set to one or more of these combinations separated by spaces: @@ -4215,22 +4200,22 @@ USE_PYTHON= autoplist distutils Single version - 2.4 + 2.8 Ascending range - 2.4+ + 2.8+ Descending range - 2.6- + 3.0- Full range (must be ascending) - 2.4-2.6 + 2.8-3.0 @@ -4307,20 +4292,8 @@ USE_PYTHON= autoplist distutils python wxPython (Python bindings) - 2.4-2.6 + 2.8-3.0 - - - mozilla - wxMozilla - 2.4 - - - - svg - wxSVG - 2.6 - @@ -4418,73 +4391,11 @@ USE_PYTHON= autoplist distutils 2.4 and its contributed libraries. - USE_WX= 2.4 + USE_WX= 2.8 WX_COMPS= wx contrib - - Unicode - - The wxWidgets library - supports Unicode since version 2.5. In - the ports tree both versions are available and can be - selected with these variables: - - - Variables to Select Unicode in - <application>wxWidgets</application> - Versions - - - - - Variable - Description - Designed for - - - - - - WX_UNICODE - The port works only with - the Unicode version - the port - - - - WANT_UNICODE - The port works with both versions but prefers - the Unicode one - the port - - - - WITH_UNICODE - The port will use the Unicode version - the user - - - - WITHOUT_UNICODE - The port will use the normal version if - supported (when WX_UNICODE is not - defined) - the user - - - -
- - - Do not use WX_UNICODE for ports - that can use both Unicode and normal versions. If - the port needs to use Unicode by default, define - WANT_UNICODE instead. - - - Detecting Installed Versions @@ -4507,8 +4418,8 @@ WX_COMPS= wx contrib .include <bsd.port.pre.mk> -.if defined(WITH_WX) || !empty(PORT_OPTIONS:MWX) || !empty(HAVE_WX:Mwx-2.4) -USE_WX= 2.4 +.if defined(WITH_WX) || !empty(PORT_OPTIONS:MWX) || !empty(HAVE_WX:Mwx-2.8) +USE_WX= 2.8 CONFIGURE_ARGS+= --enable-wx .endif @@ -4516,11 +4427,11 @@ CONFIGURE_ARGS+= --enable-wx enables wxPython support if it is installed or if an option is selected, in addition to wxWidgets, both version - 2.6. + 2.8. - USE_WX= 2.6 + USE_WX= 2.8 WX_COMPS= wx -WANT_WX= 2.6 +WANT_WX= 2.8 .include <bsd.port.pre.mk> @@ -4573,12 +4484,6 @@ CONFIGURE_ARGS+= --enable-wxpython version that is going to be used (for example, 2.6) - - - WX_UNICODE - If not defined but Unicode is going to be used - then it will be defined - @@ -4611,7 +4516,7 @@ CONFIGURE_ARGS+= --enable-wxpython version string, assign it to a variable and pass it to the program. - USE_WX= 2.4 + USE_WX= 2.8 WX_PREMK= yes .include <bsd.port.pre.mk> From owner-svn-doc-head@freebsd.org Thu Oct 26 00:35:50 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDAC3E57C01; Thu, 26 Oct 2017 00:35:50 +0000 (UTC) (envelope-from bjk@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8B3EB3711; Thu, 26 Oct 2017 00:35:50 +0000 (UTC) (envelope-from bjk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9Q0Znvp049480; Thu, 26 Oct 2017 00:35:49 GMT (envelope-from bjk@FreeBSD.org) Received: (from bjk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9Q0ZnJj049479; Thu, 26 Oct 2017 00:35:49 GMT (envelope-from bjk@FreeBSD.org) Message-Id: <201710260035.v9Q0ZnJj049479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bjk set sender to bjk@FreeBSD.org using -f From: Benjamin Kaduk Date: Thu, 26 Oct 2017 00:35:49 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51146 - head/en_US.ISO8859-1/htdocs/news/status X-SVN-Group: doc-head X-SVN-Commit-Author: bjk X-SVN-Commit-Paths: head/en_US.ISO8859-1/htdocs/news/status X-SVN-Commit-Revision: 51146 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2017 00:35:50 -0000 Author: bjk Date: Thu Oct 26 00:35:49 2017 New Revision: 51146 URL: https://svnweb.freebsd.org/changeset/doc/51146 Log: Add 2017Q3 gdb entry from jhb Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml Modified: head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml Wed Oct 25 15:10:19 2017 (r51145) +++ head/en_US.ISO8859-1/htdocs/news/status/report-2017-07-2017-09.xml Thu Oct 26 00:35:49 2017 (r51146) @@ -254,4 +254,61 @@ Add support for the CCP (Crypto Co-Processor). + + + Updates to GDB + + + + + John + Baldwin + + jhb@FreeBSD.org + + + + + Luca + Pizzamiglio + + pizzamig@FreeBSD.org + + + + +

The port has been updated to GDB 8.0.

+ +

Support for &os;/aarch64 userland binaries has been committed + upstream. These patches, along with support for debugging + &os;/aarch64 kernels, have been committed to the port.

+ +

Upstream patches adding improved support for &os;/arm userland + binaries are currently in review. &os; 12 has recently grown + support for debugging VFP registers via ptrace() and + core dumps as part of this work. Support for &os;/arm kernels + will be added to the port after the upstream patches are added + to the port.

+ +

Support for $_siginfo has been committed upstream. + This uses the recently added NT_LWPINFO note to extract + signal information from process cores.

+ +

Hangs that occured when GDB's kill command was used + were fixed in &os; in r313992.

+ + + + Figure out why the powerpc kgdb targets are not able to + unwind the stack past the initial frame. + + Test support for sparc64 binaries and kernels. + + Add support for debugging powerpc vector registers. + + Implement info proc commands. + + Implement info os commands. + + From owner-svn-doc-head@freebsd.org Thu Oct 26 15:25:15 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1083BE4C385; Thu, 26 Oct 2017 15:25:15 +0000 (UTC) (envelope-from rcyu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9CF7D81ECA; Thu, 26 Oct 2017 15:25:14 +0000 (UTC) (envelope-from rcyu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9QFPDVV017800; Thu, 26 Oct 2017 15:25:13 GMT (envelope-from rcyu@FreeBSD.org) Received: (from rcyu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9QFP97k017797; Thu, 26 Oct 2017 15:25:09 GMT (envelope-from rcyu@FreeBSD.org) Message-Id: <201710261525.v9QFP97k017797@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rcyu set sender to rcyu@FreeBSD.org using -f From: Ruey-Cherng Yu Date: Thu, 26 Oct 2017 15:25:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51147 - head/zh_TW.UTF-8/books/handbook X-SVN-Group: doc-head X-SVN-Commit-Author: rcyu X-SVN-Commit-Paths: head/zh_TW.UTF-8/books/handbook X-SVN-Commit-Revision: 51147 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2017 15:25:15 -0000 Author: rcyu Date: Thu Oct 26 15:25:09 2017 New Revision: 51147 URL: https://svnweb.freebsd.org/changeset/doc/51147 Log: - Update po file with newest handbook document. - Translated following chaptors or sectors: 28.7. Domain Name System (DNS) 28.8. Apache HTTP Server 28.9. File Transfer Protocol (FTP) 28.10. File and Print Services for Microsoft® Windows® Clients (Samba) 28.11. Clock Synchronization with NTP 29.1. Synopsis 29.2. Firewall Concepts Submitted by: cwlin@gmail.com Differential Revision: https://reviews.freebsd.org/D12756 Modified: head/zh_TW.UTF-8/books/handbook/book.xml head/zh_TW.UTF-8/books/handbook/zh_TW.po Modified: head/zh_TW.UTF-8/books/handbook/book.xml ============================================================================== --- head/zh_TW.UTF-8/books/handbook/book.xml Thu Oct 26 00:35:49 2017 (r51146) +++ head/zh_TW.UTF-8/books/handbook/book.xml Thu Oct 26 15:25:09 2017 (r51147) @@ -22,6 +22,7 @@ + @@ -72,6 +73,7 @@ + @@ -101,6 +103,7 @@ + @@ -131,6 +134,7 @@ + @@ -176,6 +180,7 @@ + @@ -270,9 +275,11 @@ + + @@ -288,6 +295,7 @@ + @@ -345,6 +353,7 @@ + @@ -357,6 +366,7 @@ + @@ -406,6 +416,7 @@ + @@ -428,6 +439,7 @@ + @@ -515,6 +527,7 @@ + @@ -544,6 +557,7 @@ + @@ -612,16 +626,25 @@ $FreeBSD$ -->]> - + + + + + + + + + + FreeBSD 使用手冊 FreeBSD 文件計劃 - $FreeBSD$ + $FreeBSD$ - $FreeBSD$ + $FreeBSD$ 1995 @@ -724,9 +747,9 @@ - 歡迎使用 FreeBSD！ 本使用手冊涵蓋範圍包括了 FreeBSD 11.0-RELEASE, FreeBSD 10.3-RELEASE 以及 FreeBSD 9.3-RELEASE 的安裝與平日操作的說明。 這份使用手冊是很多人的集體創作，而且仍然『持續不斷』的進行中，因此部份章節可能尚未仍未完成，如果您有興趣協助本計畫的話，請寄電子郵件至 FreeBSD 文件專案郵遞論壇。 + 歡迎使用 FreeBSD！ 本使用手冊涵蓋範圍包括了 FreeBSD 11.1-RELEASE, FreeBSD 11.0-RELEASE 與 FreeBSD 10.4-RELEASE 的安裝與平日操作的說明。 這份使用手冊是很多人的集體創作，而且仍然『持續不斷』的進行中，因此部份章節可能尚未仍未完成，如果您有興趣協助本計畫的話，請寄電子郵件至 FreeBSD 文件專案郵遞論壇。 - 在 FreeBSD 網站 可以找到本文件的最新版本，舊版文件可從 http://docs.FreeBSD.org/doc/ 取得。本文件也提供各種格式與不同壓縮方式的版本可自 FreeBSD FTP 伺服器 或是其中一個 鏡像網站 下載。 列印出來的實體書面資料可在 FreeBSD 商城 購買。 此外，您可在 搜尋頁面 中搜尋本文件或其他文件的資料。 + 在 FreeBSD 網站 可以找到本文件的最新版本，舊版文件可從 https://docs.FreeBSD.org/doc/ 取得。本文件也提供各種格式與不同壓縮方式的版本可自 FreeBSD FTP 伺服器 或是其中一個 鏡像網站 下載。 列印出來的實體書面資料可在 FreeBSD 商城 購買。 此外，您可在 搜尋頁面 中搜尋本文件或其他文件的資料。 @@ -1346,7 +1369,7 @@ 4.4BSD-Lite - FreeBSD 是一個從 4.4BSD-Lite 衍生出而能在以 Intel (x86 與 Itanium), AMD64, Sun UltraSPARC 為基礎的電腦上執行的作業系統。同時，移植到其他平台的工作也在進行中。 對於本計劃歷史的介紹，請看 FreeBSD 歷史， 對於 FreeBSD 的最新版本介紹，請看 最新的發行版。 若打算對於 FreeBSD 計劃有所貢獻的話 (程式碼、硬體、經費)， 請看 如何對 FreeBSD 貢獻。 + FreeBSD 是一個從 4.4BSD-Lite 衍生出而能在以 Intel (x86 與 Itanium), AMD64, ARM, Sun UltraSPARC 為基礎的電腦上執行的作業系統。同時，移植到其他平台的工作也在進行中。 對於本計劃歷史的介紹，請看 FreeBSD 歷史， 對於 FreeBSD 的最新版本介紹，請看 最新的發行版。 若打算對於 FreeBSD 計劃有所貢獻的話 (程式碼、硬體、經費)， 請看 如何對 FreeBSD 貢獻。 FreeBSD 能做什麼？ @@ -1623,13 +1646,9 @@ - Sandvine - + Sandvine Sandvine - - Sandvine uses FreeBSD as the basis of their - high performance real-time network processing platforms - that make up their intelligent network policy control - products. + - Sandvine 使用 FreeBSD 作為它的高性能即時網路處理平台的基礎來建立它們的智慧網路策略控制產品。 @@ -1732,7 +1751,7 @@ - TrueOS + TrueOS TrueOS - 訂製版本的 FreeBSD，裝備了給桌面使用者使用的圖型化工具來展示 FreeBSD 強大的功能給所有使用者，專門設計來緩解使用者在 Windows 與 OS X 間的過渡。 @@ -2029,7 +2048,7 @@ - 此外，可在下列網址找到最新版 (也是更新最頻繁的版本)：http://www.FreeBSD.org/。 + 此外，可在下列網址找到最新版 (也是更新最頻繁的版本)：https://www.FreeBSD.org/。 @@ -2167,7 +2186,7 @@ 桌面電腦與筆記型電腦最常見的處理器類型，運用在近代的系統。Intel 稱該類型為 Intel64，其他製造商則稱該類型為 x86-64。 - 與 amd64 相容的處理器包含：AMD Athlon64, AMD Opteron, 多核心 Intel Xeon 以及 Intel Core 2 與之後的處理器。 + 與 amd64 相容的處理器範例包含：AMD Athlon64, AMD Opteron, 多核心 Intel Xeon 以及 Intel Core 2 與之後的處理器。 @@ -2287,9 +2306,9 @@ 檢查 FreeBSD 勘誤表 - 儘管 FreeBSD Project 努力確保每個 FreeBSD 發行版能夠儘可能地穩定，但錯誤偶爾還是會悄悄出現，並有極小的可能會發生影響安裝流程的錯誤，當這些問題被發現並修正後，會被紀錄在 FreeBSD 網站的 FreeBSD 勘誤表 (http://www.freebsd.org/releases/11.0R/errata.html)。 安裝前先檢查勘誤表，以確保沒有會影響到安裝的問題。 + 儘管 FreeBSD 計劃努力確保每個 FreeBSD 發行版能夠儘可能地穩定，但錯誤偶爾還是會悄悄出現，並有極小的可能會發生影響安裝流程的錯誤，當這些問題被發現並修正後，會被紀錄在 FreeBSD 網站的 FreeBSD 勘誤表 (https://www.freebsd.org/releases/11.1R/errata.html)。 安裝前先檢查勘誤表，以確保沒有會影響到安裝的問題。 - 所有發行版的資訊和勘誤表可以在 FreeBSD 網站的發行資訊找到 (http://www.freebsd.org/releases/index.html)。 + 所有發行版的資訊和勘誤表可以在 FreeBSD 網站的發行資訊找到 (https://www.freebsd.org/releases/index.html)。 @@ -3696,7 +3715,7 @@ Starting sshd. 本節涵蓋基礎的安裝疑難排解，例如一些已有人回報的常見問題。 - 查看該 FreeBSD 版本的 Hardware Notes (http://www.freebsd.org/releases/index.html) 文件來確認是否支援該硬體。若確定有支援該硬體但仍然卡住或發生其他問題，請依照 的指示編譯自訂核心來加入未在 GENERIC 核心的裝置。預設的核心會假設大部份的硬體裝置會使用原廠預設的 IRQs, I/O 位址，及 DMA 通道，若硬體已經被重新設定過，自訂的核心設定檔可以告訴 FreeBSD 到那找到這些裝置。 + 查看該 FreeBSD 版本的 Hardware Notes (https://www.freebsd.org/releases/index.html) 文件來確認是否支援該硬體。若確定有支援該硬體但仍然卡住或發生其他問題，請依照 的指示編譯自訂核心來加入未在 GENERIC 核心的裝置。預設的核心會假設大部份的硬體裝置會使用原廠預設的 IRQs, I/O 位址，及 DMA 通道，若硬體已經被重新設定過，自訂的核心設定檔可以告訴 FreeBSD 到那找到這些裝置。 部份安裝問題可以透過更各種硬體元件的韌體來避免或緩解，特別是主機板。主機板的韌體通常稱為 BIOS，大部份主機板與電腦製造商會有網站可以取得升級程式與升級資訊。 @@ -6102,7 +6121,7 @@ Swap: 2048M Total, 2048M Free - FreeBSD 網站有維護一份可搜尋的最新應用程式清單，在 http://www.FreeBSD.org/ports/。 可以依應用程式名稱或軟體分類來搜尋 Port。 + FreeBSD 網站有維護一份可搜尋的最新應用程式清單，在 https://www.FreeBSD.org/ports/。 可以依應用程式名稱或軟體分類來搜尋 Port。 @@ -6918,18 +6937,18 @@ ports-mgmt/pkg 雖然可以同時使用自訂的檔案庫與官方檔案庫，但有時關閉官方檔案庫會有幫助。這可以透過建立一個設定檔覆蓋並關閉官方的設定檔來完成。建立 /usr/local/etc/pkg/repos/FreeBSD.conf 包含以下內容： - FreeBSD: { + FreeBSD: { enabled: no -} +} 通常最簡單要提供 poudriere 檔案庫給客戶端的方式是透過 HTTP。安裝一個網頁伺服器來提供套件目錄，通常會像：/usr/local/poudriere/data/packages/10amd64，其中 10amd64 是編譯的名稱。 若要連往套件檔案庫的 URL 是：http://pkg.example.com/10amd64，則在 /usr/local/etc/pkg/repos/custom.conf 的檔案庫設定檔為： - custom: { + custom: { url: "http://pkg.example.com/10amd64", enabled: yes, -} +} @@ -7931,7 +7950,7 @@ DisplayManager.requestPort: 0 GNOME GNOME - GNOME 是一個擁有友善使用者介面的的桌面環境，它包括用於啟動應用程式和顯示狀態的面板、一系列工具與應用程序及一套可讓應用程式更容易進行合作、相互一致的協定。更多有關 FreeBSD GNOME 的訊息可在 http://www.FreeBSD.org/gnome 取得，該網站包含了有關在 FreeBSD 安裝、設定和管理 GNOME 的額外文件。 + GNOME 是一個擁有友善使用者介面的的桌面環境，它包括用於啟動應用程式和顯示狀態的面板、一系列工具與應用程序及一套可讓應用程式更容易進行合作、相互一致的協定。更多有關 FreeBSD GNOME 的訊息可在 https://www.FreeBSD.org/gnome 取得，該網站包含了有關在 FreeBSD 安裝、設定和管理 GNOME 的額外文件。 這套桌面環境可以從套件安裝： @@ -8471,7 +8490,7 @@ EndSection web - 在 FreeBSD 中並未預先安裝好網頁瀏覽器。 但在 Port 套件集中的 www 分類中有許多瀏覽器可以採 Binary 套件安裝或自 Port 套件集編譯的方式安裝。 + 在 FreeBSD 中並未預先安裝好網頁瀏覽器。 但在 Port 套件集中的 www 分類中有許多瀏覽器可以採 Binary 套件安裝或自 Port 套件集編譯的方式安裝。 KDE 和 GNOME 桌面環境都有提供自有的 HTML 瀏覽器。請參考 來了解更多有關如何設定完整桌面環境的資訊。 @@ -8560,7 +8579,7 @@ EndSection 編譯 Port 時使用預設設定選項。 - 安裝完成時，啟動 firefox，在網址列輸入 about:plugins 並按 Enter 鍵。 會出現一個頁面列出已安裝的附加元件。 Java 附加元件應該會列在其中。 + 安裝完成後，啟動 firefox，在網址列輸入 about:plugins 並按 Enter 鍵，便會出現一個列出已安裝附加元件的頁面，清單中應該要有 Java 附加元件。 若瀏覽器無法找到附加元件，每位使用者則須執行以下指令並重新執行瀏覽器： @@ -8586,7 +8605,7 @@ EndSection - 自 Port 安裝 www/linux-c6-flashplugin11 ，受到授權條款的限制，該套件無 Binary 版本。 + 自 Port 安裝 www/linux-flashplayer ，受到授權條款的限制，該套件無 Binary 版本。 @@ -8667,7 +8686,7 @@ EndSection # pkg install kwebkitpart - 由 Port 套件集安裝： + 從 Port 套件集安裝： # cd /usr/ports/www/kwebkitpart # make install clean @@ -8841,7 +8860,7 @@ EndSection # cd /usr/ports/graphics/gimp # make install clean - 在 Port 套件集的 graphics 分類 (freebsd.org/ports/graphics.html) 下也包含了許多 GIMP 相關的附加元件，說明檔及使用手冊。 + 在 Port 套件集的 graphics 分類 (freebsd.org/ports/graphics.html) 下也包含了許多 GIMP 相關的附加元件，說明檔及使用手冊。 @@ -8907,7 +8926,7 @@ EndSection # pkg install libreoffice - Port 套件集的編輯器分類 (freebsd.org/ports/editors.html) 中含有數個 LibreOffice 的語系。安裝在地化套件時，請替換 libreoffice 為在地化套件的名稱。 + Port 套件集的編輯器分類 (freebsd.org/ports/editors.html) 中含有數個 LibreOffice 的語系。安裝在地化套件時，請替換 libreoffice 為在地化套件的名稱。 套件安裝之後，輸入以下指令來執行 LibreOffice： @@ -8921,7 +8940,7 @@ EndSection # make install clean - 要編譯在地化版本，則需 cd 進入想要的語言 Port 目錄。支援的語言可在 Port 套件集的編輯器分類 (freebsd.org/ports/editors.html) 中找到。 + 要編譯在地化版本，則需 cd 進入想要的語言 Port 目錄。支援的語言可在 Port 套件集的編輯器分類 (freebsd.org/ports/editors.html) 中找到。 @@ -9307,7 +9326,7 @@ EndSection PCI sound cards - 開始設定之前，必須先知道你的音效卡型號、晶片為何。 FreeBSD 支援許多種音效卡，請檢查支援的音效硬體表 Hardware Notes，以確認你的音效卡是否支援以及如何在 FreeBSD 上驅動。 + 開始設定之前，必須先知道你的音效卡型號、晶片為何。 FreeBSD 支援許多種音效卡，請檢查支援的音效硬體表 Hardware Notes，以確認你的音效卡是否支援以及如何在 FreeBSD 上驅動。 kernel @@ -9673,7 +9692,7 @@ pcm7: <HDA Realtek ALC889 PCM #3 Digital> at cad provides an alternative, command-line MP3 player. Once installed, specify the MP3 file to play on the command line. If the system has multiple - audio devices, the sound device can also be specifed: + audio devices, the sound device can also be specified: # mpg123 -a /dev/dsp1.0 Foobar-GreatestHits.mp3 High Performance MPEG 1.0/2.0/2.5 Audio Player for Layers 1, 2 and 3 @@ -10473,7 +10492,7 @@ bktr0: Pinnacle/Miro TV, Philips SECAM tuner.# pkg install mythtv - 或由 Port 套件集安裝： + 或從 Port 套件集安裝： # cd /usr/ports/multimedia/mythtv # make install @@ -10908,11 +10927,10 @@ ath0@pci0:3:0:0: class=0x020000 card=0x058a1014 在 man1 指令加上 旗標可提供有用的資訊，例如，這可列出有包含指定裝置品牌或名稱的手冊頁面清單： - # man -k Atheros + # man -k Atheros +ath(4) - Atheros IEEE 802.11 wireless network driver +ath_hal(4) - Atheros Hardware Access Layer (HAL) - ath(4) - Atheros IEEE 802.11 wireless network driver -ath_hal(4) - Atheros Hardware Access Layer (HAL) - 準備好硬體清單之後，參考該清單來確認已安裝的硬體驅動程式在編輯自訂核心設定時沒有被移除。 @@ -12951,9 +12969,7 @@ lp: 在 FreeBSD 安裝基本的 Linux 程式庫和 Binary 最簡單的方式是安裝 emulators/linux_base-c6 套件或是 Port 。要安裝 Port： - # printf "compat.linux.osrelease=2.6.18\n" >> /etc/sysctl.conf -# sysctl compat.linux.osrelease=2.6.18 -# pkg install emulators/linux_base-c6 + # pkg install emulators/linux_base-c6 要在開機時開啟 Linux 相容性，可以加入這行到 /etc/rc.conf： @@ -12963,7 +12979,10 @@ lp: 核心選項 COMPAT_LINUX - 想要靜態連結 Linux Binary 相容性到自訂核心的使用者應加入 options COMPAT_LINUX 到自訂核心設定檔。 編譯並安裝新核心的方法，如 所述。 + Since the Linux binary compatibility layer has gained support + for running both 32- and 64-bit Linux binaries (on 64-bit x86 hosts), + it is no longer possible to link the emulation functionality statically + into a custom kernel. 手動安裝其他程式庫 @@ -14211,7 +14230,7 @@ run_rc_command "$1" # /etc/crontab - root's crontab for FreeBSD # -# $FreeBSD$ +# $FreeBSD$ # SHELL=/bin/sh PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin @@ -14809,7 +14828,7 @@ ifconfig_fxp0_alias7="inet 202.0.75.20 netmask 255.255 此設定檔中一行代表一個動作，每一行的格式皆為一個選擇器欄位 (Selector field) 接著一個動作欄位 (Action field)。選擇器欄位的格式為 facility.level 可以用來比對來自 facility 於層級 level 或更高層的日誌訊息，也可以在層級前加入選擇性的比對旗標來更確切的指定記錄的內容。同樣一個動作可以使用多個選擇器欄位並使用分號 (;) 來分隔。用 * 可以比對任何東西。動作欄位可用來指定傳送日誌訊息的目標，如一個檔案或遠端日誌主機。範例為以下為 FreeBSD 預設的 syslog.conf： - # $FreeBSD$ + # $FreeBSD$ # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field @@ -14889,7 +14908,7 @@ cron.* /var/l newsyslog 會讀取其設定檔 /etc/newsyslog.conf 來決定其要採取的動作，每個要由 newsyslog 所管理的日誌檔案會在此設定檔中設定一行，每一行要說明檔案的擁有者、權限、何時要翻轉該檔案、選用的日誌翻轉旗標，如：壓縮，以及日誌翻轉時要通知的程式。以下為 FreeBSD 的預設設定： # configuration file for newsyslog -# $FreeBSD$ +# $FreeBSD$ # # Entries which do not specify the '/pid_file' field will cause the # syslogd process to be signalled when that log file is rotated. This @@ -15306,7 +15325,7 @@ nameserver 147.11.100.30 /etc/hosts 是簡單的文字資料庫，會與 DNS 及 NIS 一併使用來提供主機名稱與 IP 位址的對應。可將透過 LAN 所連結的在地電腦項目加入到這個檔案做最簡單的命名，來替代設定一個 named8 伺服器。除此之外 /etc/hosts 可以用來提供本地的網際網路名稱記錄，來減少常用名稱向外部 DNS 伺服器查詢的需求。 - # $FreeBSD$ + # $FreeBSD$ # # # Host Database @@ -17505,7 +17524,7 @@ Enter new password: rootkit 指的是嘗試未經授權取得系統 root 存取權的軟體。一旦安裝之後，這個惡意軟體將可以光明正大的開啟給另一個給攻擊者進入的大門。現實上，一但系統已被 rootkit 滲透且執行了搜索動作之後，該系統就應該從頭重新安裝，因為即使非常謹真的資安或系統工程式也可能會遺漏攻擊者留下的動西。 - rootkit 所做過的事可提供管理者一個非常有用的資訊：一但偵測到，便代表某處已經被滲透，但這類的應用程式躲藏的非常好，本節將會示範一個可以用來偵測 rootkit 的工具，security/rkhunter。 + rootkit 對管理者而言唯一有幫助的是：一但偵測到，便代表某處已經被滲透，但這類型的應用程式躲藏的非常好，本節將會示範一個可以用來偵測 rootkit 的工具，security/rkhunter。 安裝此套件或 Port 之後，系統便可使用以下指令檢查。該指令提供許多資訊且會需要手動按下 ENTER 確認： @@ -18270,9 +18289,7 @@ kadmin> exit GSSAPIAuthentication yes - After making this change, sshd8 must be restared - for the new configuration to take effect: - service sshd restart. + 做完了這個變更之後，必須重新啟動 sshd8 來使新的設定值生效：service sshd restart。 @@ -18941,9 +18958,7 @@ Connection closed by foreign host. information on the IPsec subsystem in FreeBSD. - To add IPsec support to the kernel, add - the following options to the custom kernel configuration file - and rebuild the kernel using the instructions in : + 在 FreeBSD 11 與之後的版本預設會開啟 IPsec 功能，先前版本的 FreeBSD 可在自訂核心設定檔中加入以下選項然後依 的指示來重新編譯核心： 核心選項 IPSEC @@ -19072,10 +19087,10 @@ round-trip min/avg/max/stddev = 28.106/94.594/154.524/ network. The following commands will achieve this goal: - # corp-net# route add 10.0.0.0 10.0.0.5 255.255.255.0 -# corp-net# route add net 10.0.0.0: gateway 10.0.0.5 -# priv-net# route add 10.246.38.0 10.246.38.1 255.255.255.0 -# priv-net# route add host 10.246.38.0: gateway 10.246.38.1 + corp-net# route add 10.0.0.0 10.0.0.5 255.255.255.0 +corp-net# route add net 10.0.0.0: gateway 10.0.0.5 +priv-net# route add 10.246.38.0 10.246.38.1 255.255.255.0 +priv-net# route add host 10.246.38.0: gateway 10.246.38.1 At this point, internal machines should be reachable from each gateway as well as from machines behind the gateways. @@ -19386,8 +19401,8 @@ The key's randomart image is: 要在 Shell 使用 ssh-agent，使用 Shell 做為參數來啟動 ssh-agent。執行 ssh-add 來加入識別碼，然後輸入私鑰的密碼。使用者將可使用 ssh 連線到任何有安裝對應公鑰的主機，例如： - % ssh-agent csh -% ssh-add + % ssh-agent csh +% ssh-add Enter passphrase for key '/usr/home/user/.ssh/id_rsa': Identity added: /usr/home/user/.ssh/id_rsa (/usr/home/user/.ssh/id_rsa) % @@ -19777,7 +19792,7 @@ drwxr-xr-x 2 robert robert 512 Nov 10 11:54 public_ Affected package: cups-base-1.1.22.0_1 Type of problem: cups-base -- HPGL buffer overflow vulnerability. -Reference: <http://www.FreeBSD.org/ports/portaudit/40a3bca2-6809-11d9-a9e7-0001020eed82.html> +Reference: <https://www.FreeBSD.org/ports/portaudit/40a3bca2-6809-11d9-a9e7-0001020eed82.html> 1 problem(s) in your installed packages found. @@ -19917,7 +19932,7 @@ b) Execute the following commands as root: # patch < /path/to/patch Recompile the operating system using buildworld and installworld as -described in <URL:http://www.FreeBSD.org/handbook/makeworld.html>. +described in <URL:https://www.FreeBSD.org/handbook/makeworld.html>. Restart the applicable daemons, or reboot the system. @@ -26311,7 +26326,7 @@ scsibus1: 在安全的地方保存這份列印結果與安裝媒體的複本，在緊急還原時可能會需要，接著開機進入安裝媒體並選擇 Live CD 以存取救援 Shell (Rescue shell)，這個救援模式可以用來檢視目前系統的狀態，若有需要，可重新格式化磁碟然後自備份還原資料。 - FreeBSD/i386 10.3-RELEASE 的安裝媒體未含救援 Shell，針對該版本，可改自 ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/ISO-IMAGES/10.3/FreeBSD-10.3-RELEASE-i386-livefs.iso 下載 CD 映像檔並燒錄。 + FreeBSD/i386 10.4-RELEASE 的安裝媒體未含救援 Shell，針對該版本，可改自 ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/ISO-IMAGES/10.4/FreeBSD-10.4-RELEASE-i386-livefs.iso 下載 Livefs CD 映像檔並燒錄。 然後，測試救援 Shell 下的備份。記錄下整個程序，將這份記錄隨媒體、列印結果、備份檔一併保存，這份記錄可以避免在緊張壓力下做緊急還原時因不慎造成備份的毀壞。 @@ -26860,7 +26875,8 @@ Quotas for user test: UFS file system, set the sector_size to 2048: - # gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock# $FreeBSD$ + # gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock +# $FreeBSD$ # # Sector size is the smallest unit of data which can be read or written. # Making it too small decreases performance and decreases available space. @@ -27292,7 +27308,7 @@ geli_da2_flags="-k /root/da2.key - This example configures an encryped swap partition using + This example configures an encrypted swap partition using the Blowfish algorithm with a key length of 128 bits and a sectorsize of 4 kilobytes: @@ -30500,7 +30516,7 @@ errors: No known data errors 匯入與匯出儲存池 - 儲存池在移動到其他系統之前需要做匯出 (Export)，會卸載所有的資料集，然後標記每個裝置為已匯出，為了避免被其他磁碟子系統存取，因此仍會鎖定這些裝置。這個動作讓儲存池可以在支援 ZFS 的其他機器、其他作業系統做匯入 (Import)，甚至是不同的硬體架構 (有一些注意事項，請參考 zpool8)。當資料集有被開啟的檔案，可使用 zpool export -f 來強制匯出儲存池，使用這個指令需要小心，資料集是被強制卸載的，因此有可能造成在該資料集開啟檔案的應用程式發生無法預期的結果。 + 儲存池在移動到其他系統之前需要做匯出 (Export)，會卸載所有的資料集，然後標記每個裝置為已匯出，為了避免被其他磁碟子系統存取，因此仍會鎖定這些裝置。這個動作讓儲存池可以在支援 ZFS 的其他機器、其他作業系統做匯入 (Import)，甚至是不同的硬體架構 (有一些注意事項，請參考 zpool8)。當資料集有被開啟的檔案，可使用 zpool export -f 來強制匯出儲存池，使用這個指令需要小心，資料集是被強制卸載的，因此有可能造成在該資料集開啟檔案的應用程式發生無法預期的結果。 匯出未使用的儲存池： @@ -30888,6 +30904,37 @@ NAME PROPERTY VALUE SOURCE tank custom:costcenter - - # zfs get all tank | grep custom:costcenter # + + + 取得與設定共享屬性 + + Two commonly used and useful dataset properties are the + NFS and SMB share + options. Setting these define if and how + ZFS datasets may be shared on the network. + At present, only setting sharing via NFS is + supported on FreeBSD. To get the current status of + a share, enter: + + # zfs get sharenfs mypool/usr/home +NAME PROPERTY VALUE SOURCE +mypool/usr/home sharenfs on local +# zfs get sharesmb mypool/usr/home +NAME PROPERTY VALUE SOURCE +mypool/usr/home sharesmb off local + + To enable sharing of a dataset, enter: + + # zfs set sharenfs=on mypool/usr/home + + It is also possible to set additional options for sharing + datasets through NFS, such as + , and + . To set additional options to a + dataset shared through NFS, enter: + + # zfs set sharenfs="-alldirs,-maproot=root,-network=192.168.1.0/24" mypool/usr/home + @@ -31036,17 +31083,16 @@ mypool/var/tmp 262K 93.2G 1 mypool/var/tmp@my_recursive_snapshot 88K - 152K - mypool/var/tmp@after_cp 53.5K - 118K - mypool/var/tmp@diff_snapshot 0 - 120K - -% ls /var/tmp -passwd passwd.copy -% rm /var/tmp/passwd* -% ls /var/tmp -vi.recover -% +# ls /var/tmp +passwd passwd.copy vi.recover +# rm /var/tmp/passwd* +# ls /var/tmp +vi.recover 在此時，使用者發現到刪除了太多檔案並希望能夠還原。ZFS 提供了簡單的方可以取回檔案，便是使用還原 (Rollback)，但這只在有定期對重要的資料使用快照時可用。要拿回檔案並從最後一次快照重新開始，可執行以下指令： # zfs rollback mypool/var/tmp@diff_snapshot -% ls /var/tmp +# ls /var/tmp passwd passwd.copy vi.recover 還原操作會將資料集還原為最後一次快照的狀態。這也可以還原到更早之前，有其他在其之後建立的快照。要這麼做時，ZFS 會發出這個警告： @@ -31068,7 +31114,7 @@ mypool/var/tmp@diff_snapshot # zfs list -rt snapshot mypool/var/tmp NAME USED AVAIL REFER MOUNTPOINT mypool/var/tmp@my_recursive_snapshot 8K - 152K - -% ls /var/tmp +# ls /var/tmp vi.recover 可從 zfs list -t snapshot 的結果來確認 zfs rollback -r 會移除的快照。 @@ -31082,16 +31128,16 @@ vi.recover # zfs get snapdir mypool/var/tmp NAME PROPERTY VALUE SOURCE mypool/var/tmp snapdir hidden default -% ls -a /var/tmp +# ls -a /var/tmp . .. passwd vi.recover # zfs set snapdir=visible mypool/var/tmp -% ls -a /var/tmp +# ls -a /var/tmp . .. .zfs passwd vi.recover 要還原個別檔案到先前的狀態非常簡單，只要從快照中複製檔案到父資料集。在 .zfs/snapshot 目錄結構下有一個與先前所做的快照名稱相同的目錄，可以很容易的找到。在下個範例中，我們會示範從隱藏的 .zfs 目錄還原一個檔案，透過從含有該檔案的最新版快照複製： # rm /var/tmp/passwd -% ls -a /var/tmp +# ls -a /var/tmp . .. .zfs vi.recover # ls /var/tmp/.zfs/snapshot after_cp my_recursive_snapshot @@ -31277,18 +31323,18 @@ mypool@replica2 0 在傳送端系統上： - # zfs allow -u someuser send,snapshot mypool + # zfs allow -u someuser send,snapshot mypool 要掛載儲存池，無權限的使用者必須擁有該目錄且必須允許一般的使用者掛載檔案系統。在接收端系統上： - # sysctl vfs.usermount=1 + # sysctl vfs.usermount=1 vfs.usermount: 0 -> 1 -# echo vfs.usermount=1 >> /etc/sysctl.conf +# sysrc -f /etc/sysctl.conf vfs.usermount=1 # zfs create recvpool/backup # zfs allow -u someuser create,mount,receive recvpool/backup -# chown someuser /recvpool/backup +# chown someuser /recvpool/backup @@ -31406,7 +31452,7 @@ mypool/compressed_dataset compressratio 1.11x mypool/compressed_dataset compression lz4 local mypool/compressed_dataset logicalused 496G - - 資料集目前使用了 449 GB 的空間 (在 used 屬性)。在尚未壓縮前，該資料集應該會使用 496 GB 的空間 (於 logicallyused 屬性)，這個結果顯示目前的壓縮比為 1.11:1。 + 資料集目前使用了 449 GB 的空間 (在 used 屬性)。在尚未壓縮前，該資料集應該會使用 496 GB 的空間 (於 logicalused 屬性)，這個結果顯示目前的壓縮比為 1.11:1。 壓縮功能在與使用者配額 (User Quota) 一併使用時可能會產生無法預期的副作用。使用者配額會限制一個使用者在一個資料集上可以使用多少空間，但衡量的依據是以 壓縮後 所使用的空間，因此，若一個使用者有 10 GB 的配額，寫入了 10 GB 可壓縮的資料，使用者將還會有空間儲存額外的資料。若使用者在之後更新了一個檔案，例如一個資料庫，可能有更多或較少的可壓縮資料，那麼剩餘可用的空間量也會因此而改變，這可能會造成奇怪的現象便是，一個使用者雖然沒有增加實際的資料量 (於 logicalused 屬性)，但因為更改影響了壓縮率，導致使用者達到配額的上限。 @@ -31430,10 +31476,9 @@ pool 2.84G 2.19M 2.83G 0% 1.00x ONLINE - DEDUP 欄位會顯示儲存池的實際去重複率，數值為 1.00x 代表資料尚未被去重複。在下一個例子會在前面所建立的去重複儲存池中複製三份 Port 樹到不同的目錄中。 - # zpool list -for d in dir1 dir2 dir3; do -for> mkdir $d && cp -R /usr/ports $d & -for> done + # for d in dir1 dir2 dir3; do +> mkdir $d && cp -R /usr/ports $d & +> done 已經偵測到重複的資料並做去重複： @@ -32277,7 +32322,7 @@ vfs.zfs.vdev.cache.size="5M" XXXTR: Though! The disks chapter, covers a bit of this and devfs under it's USB devices. It leaves a lot to be desired though, see: -http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/usb-disks.html +https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/usb-disks.html It may be better to flesh out that section a bit more. Add the word "camera" to it so that others can easily notice. @@ -32333,6 +32378,16 @@ http://www.freebsd.org/doc/en_US.ISO8859-1/books/handb bhyve section by + + + + + Benedict + Reuschling + + Xen section by + + @@ -32947,9 +33002,22 @@ perm vboxnetctl 0660 <trademark>VirtualBox</trademark> USB 支援 - VirtualBox 擴充包目前不支援 FreeBSD 主端系統，沒有這個擴充包，FreeBSD 主端系統無法傳遞 USB 埠給客端作業系統。 - + VirtualBox can be configured + to pass USB devices through to the guest + operating system. The host controller of the OSE version is + limited to emulating USB 1.1 devices until + the extension pack supporting USB 2.0 and 3.0 + devices becomes available on FreeBSD. + For VirtualBox to be + aware of USB devices attached to the + machine, the user needs to be a member of the operator group. + + # pw groupmod operator -m yourusername + + 重新啟動登作階段與 VirtualBox 來讓這些變更生效，且建立必要的 USB 的過濾器。 + + <trademark>VirtualBox</trademark> Host <acronym>DVD</acronym>/<acronym>CD</acronym> 存取 @@ -33066,7 +33134,7 @@ FreeBSD-10.3-RELEASE-amd64-bootonly.iso 100% of machine, used to track the running machines. This example starts the virtual machine in installation mode: - # sh /usr/share/examples/bhyve/vmrun.sh -c 4 -m 1024M -t tap0 -d guest.img -i -I FreeBSD-10.3-RELEASE-amd64-bootonly.iso guestname + # sh /usr/share/examples/bhyve/vmrun.sh -c 1 -m 1024M -t tap0 -d guest.img -i -I FreeBSD-10.3-RELEASE-amd64-bootonly.iso guestname The virtual machine will boot and start the installer. After installing a system in the virtual machine, when the @@ -33320,7 +33388,7 @@ crw------- 1 root wheel 0x1a1 Mar 17 12:19 othergu A specified virtual machine can be destroyed using bhyvectl: - # bhyvectl --destroy --vm=guestname + # bhyvectl --destroy --vm=guestname @@ -33355,18 +33423,332 @@ ifconfig_bridge0="addm igb0 - + Xen can migrate VMs between different Xen servers. When + the two xen hosts share the same underlying storage, the + migration can be done without having to shut the VM down first. + Instead, the migration is performed live while the DomU is + running and there is no need to restart it or plan a downtime. + This is useful in maintenance scenarios or upgrade windows to + ensure that the services provided by the DomU are still + provided. Many more features of Xen are listed on the Xen + Wiki Overview page. Note that not all features are + supported on FreeBSD yet. + + + Hardware Requirements for <trademark>Xen</trademark> Dom0 + + To run the Xen hypervisor on a host, certain hardware + functionality is required. Hardware virtualized domains + require Extended Page Table (EPT) + and Input/Output Memory Management Unit (IOMMU) + support in the host processor. + + + + <trademark>Xen</trademark> Dom0 Control Domain Setup + + The emulators/xen package works with + FreeBSD 11 amd64 binary snapshots and equivalent systems + built from source. This example assumes VNC output for + unprivileged domains which is accessed from a another system + using a tool such as net/tightvnc. + + Install emulators/xen: + + # pkg install xen + + Configuration files must be edited to prepare the host + for the Dom0 integration. An entry to + /etc/sysctl.conf disables the limit on + how many pages of memory are allowed to be wired. Otherwise, + DomU VMs with higher memory requirements will not run. + + # sysrc -f /etc/sysctl.conf vm.max_wired=-1 + + Another memory-related setting involves changing + /etc/login.conf, setting the + memorylocked option to + unlimited. Otherwise, creating DomU + domains may fail with Cannot allocate + memory errors. After making the change to + /etc/login.conf, run + cap_mkdb to update the capability database. + See for + details. + + # sed -i '' -e 's/memorylocked=64K/memorylocked=unlimited/' /etc/login.conf +# cap_mkdb /etc/login.conf + + Add an entry for the Xen console to + /etc/ttys: + + # echo 'xc0 "/usr/libexec/getty Pc" xterm on secure' >> /etc/ttys + + Selecting a Xen kernel in + /boot/loader.conf activates the Dom0. + Xen also requires resources like CPU and memory from the + host machine for itself and other DomU domains. How much CPU + and memory depends on the individual requirements and hardware + capabilities. In this example, 8 GB of memory and 4 + virtual CPUs are made available for the Dom0. The serial + console is also activated and logging options are + defined. + + # sysrc -f /boot/loader.conf hw.pci.mcfg=0 +# sysrc -f /boot/loader.conf xen_kernel="/boot/xen" +# sysrc -f /boot/loader.conf xen_cmdline="dom0_mem=8192M dom0_max_vcpus=4 dom0pvh=1 console=com1,vga com1=115200,8n1 guest_loglvl=all loglvl=all" + + Log files that Xen creates for the Dom0 and DomU VMs + are stored in /var/log/xen. This + directory does not exist by default and must be + created. + + # mkdir -p /var/log/xen +# chmod 644 /var/log/xen + + Xen provides a boot menu to activate and de-activate + the hypervisor on demand in + /boot/menu.rc.local: + + # echo "try-include /boot/xen.4th" >> /boot/menu.rc.local + + Activate the xencommons service during system + startup: + + # sysrc xencommons_enable=yes + + These settings are enough to start a Dom0-enabled + system. However, it lacks network functionality for the + DomU machines. To fix that, define a bridged interface with + the main NIC of the system which the DomU VMs can use to + connect to the network. Replace + igb0 with the host network + interface name. + + # sysrc autobridge_interfaces=bridge0 +# sysrc autobridge_bridge0=igb0 +# sysrc ifconfig_bridge0=SYNCDHCP + + Restart the host to load the Xen kernel and start the + Dom0. + + # reboot + + After successfully booting the Xen kernel and logging + into the system again, the Xen management tool + xl is used to show information about the + domains. + + # xl list +Name ID Mem VCPUs State Time(s) +Domain-0 0 8192 4 r----- 962.0 + + The output confirms that the Dom0 (called + Domain-0) has the ID 0 + and is running. It also has the memory and virtual CPUs + that were defined in /boot/loader.conf + earlier. More information can be found in the Xen + Documentation. DomU guest VMs can now be + created. + + + + <trademark>Xen</trademark> DomU 客端 VM 設置 + + Unprivileged domains consist of a configuration file and + virtual or physical hard disks. Virtual disk storage for + the DomU can be files created by truncate1 or ZFS + volumes as described in . + In this example, a 20 GB volume is used. A VM is + created with the ZFS volume, a FreeBSD ISO image, 1 GB of + RAM and two virtual CPUs. The ISO installation file is + retrieved with fetch1 and saved locally in a file + called freebsd.iso. + + # fetch ftp://ftp.freebsd.org/pub/FreeBSD/releases/ISO-IMAGES/10.3/FreeBSD-10.3-RELEASE-amd64-bootonly.iso -o freebsd.iso + + A ZFS volume of 20 GB called + xendisk0 is created to serve as the disk + space for the VM. + + # zfs create -V20G -o volmode=dev zroot/xendisk0 + + The new DomU guest VM is defined in a file. Some specific + definitions like name, keymap, and VNC connection details are + also defined. The following freebsd.cfg + contains a minimum DomU configuration for this example: + + # cat freebsd.cfg +builder = "hvm" +name = "freebsd" +memory = 1024 +vcpus = 2 +vif = [ 'mac=00:16:3E:74:34:32,bridge=bridge0' ] +disk = [ +'/dev/zvol/tank/xendisk0,raw,hda,rw', +'/root/freebsd.iso,raw,hdc:cdrom,r' + ] +vnc = 1 +vnclisten = "0.0.0.0" +serial = "pty" +usbdevice = "tablet" + + These lines are explained in more detail: + + + + This defines what kind of virtualization to use. + hvm refers to hardware-assisted + virtualization or hardware virtual machine. Guest + operating systems can run unmodified on CPUs with + virtualization extensions, providing nearly the same + performance as running on physical hardware. + generic is the default value and + creates a PV domain. + + + + Name of this virtual machine to distinguish it from + others running on the same Dom0. Required. + + + + Quantity of RAM in megabytes to make available to the + VM. This amount is subtracted from the hypervisor's total + available memory, not the memory of the Dom0. + + + + Number of virtual CPUs available to the guest VM. For + best performance, do not create guests with more virtual + CPUs than the number of physical CPUs on the host. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@freebsd.org Thu Oct 26 22:59:09 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 300E7E54F58; Thu, 26 Oct 2017 22:59:09 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D197C6D422; Thu, 26 Oct 2017 22:59:08 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9QMx7iL009976; Thu, 26 Oct 2017 22:59:07 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9QMx7EP009975; Thu, 26 Oct 2017 22:59:07 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201710262259.v9QMx7EP009975@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Thu, 26 Oct 2017 22:59:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51148 - head/en_US.ISO8859-1/articles/contributors X-SVN-Group: doc-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/contributors X-SVN-Commit-Revision: 51148 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2017 22:59:09 -0000 Author: ultima (ports committer) Date: Thu Oct 26 22:59:07 2017 New Revision: 51148 URL: https://svnweb.freebsd.org/changeset/doc/51148 Log: Add Manish Jain to contributors Manish Jain is the creator and maintainer of sysutils/mkdesktop Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Modified: head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Thu Oct 26 15:25:09 2017 (r51147) +++ head/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Thu Oct 26 22:59:07 2017 (r51148) @@ -6259,6 +6259,11 @@ + Manish Jain + bourne.identity@hotmail.com + + + Mantas Kaulakys stone@tainet.lt From owner-svn-doc-head@freebsd.org Fri Oct 27 04:01:52 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7BC0E5ADB9; Fri, 27 Oct 2017 04:01:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BC0E7591B; Fri, 27 Oct 2017 04:01:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9R41pRr037853; Fri, 27 Oct 2017 04:01:51 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9R41pLP037852; Fri, 27 Oct 2017 04:01:51 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201710270401.v9R41pLP037852@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 27 Oct 2017 04:01:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51149 - head/en_US.ISO8859-1/books/porters-handbook/versions X-SVN-Group: doc-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/porters-handbook/versions X-SVN-Commit-Revision: 51149 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Oct 2017 04:01:52 -0000 Author: jhb Date: Fri Oct 27 04:01:51 2017 New Revision: 51149 URL: https://svnweb.freebsd.org/changeset/doc/51149 Log: Document FreeBSD versions 1200044 through 1200052. Modified: head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml Thu Oct 26 22:59:07 2017 (r51148) +++ head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml Fri Oct 27 04:01:51 2017 (r51149) @@ -429,6 +429,86 @@ bytes. (r322989). + + + 1200044 + r323349 + September 8, 2017 + 12.0-CURRENT after implementing poll_wait() in the + LinuxKPI. + (r323349). + + + + 1200045 + r323706 + September 18, 2017 + 12.0-CURRENT after adding shared memory support to + LinuxKPI. + (r323703). + + + + 1200046 + r323910 + September 22, 2017 + 12.0-CURRENT after adding support for 32-bit + compatibility IOCTLs to LinuxKPI. + (r323910). + + + + 1200047 + r324053 + September 26, 2017 + 12.0-CURRENT after removing + M_HASHTYPE_RSS_UDP_IPV4_EX. + (r324052). + + + + 1200048 + r324227 + October 2, 2017 + 12.0-CURRENT after hiding struct socket and struct + unpcb from userland. + (r324227). + + + + 1200049 + r324281 + October 4, 2017 + 12.0-CURRENT after adding the value.u16 field to + struct diocgattr_arg. + (r324281). + + + + 1200050 + r324342 + October 5, 2017 + 12.0-CURRENT after adding the armv7 MACHINE_ARCH. + (r324340). + + + + 1200051 + r324455 + October 9, 2017 + 12.0-CURRENT after removing libstand.a as a public + interface. + (r324454). + + + + 1200052 + r325028 + October 26, 2017 + 12.0-CURRENT after fixing ptrace() to always clear + the correct thread event when resuming. + (r325028). + From owner-svn-doc-head@freebsd.org Sat Oct 28 06:26:10 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73351E5CF78; Sat, 28 Oct 2017 06:26:10 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3BC6265096; Sat, 28 Oct 2017 06:26:10 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9S6Q95M096788; Sat, 28 Oct 2017 06:26:09 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9S6Q9n4096787; Sat, 28 Oct 2017 06:26:09 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710280626.v9S6Q9n4096787@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 28 Oct 2017 06:26:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51150 - head/en_US.ISO8859-1/books/faq X-SVN-Group: doc-head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/faq X-SVN-Commit-Revision: 51150 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Oct 2017 06:26:10 -0000 Author: eadler Date: Sat Oct 28 06:26:09 2017 New Revision: 51150 URL: https://svnweb.freebsd.org/changeset/doc/51150 Log: Remove references to old versions of FreeBSD Versions prior to 9.0 are no longer supported and should not be documented. Modified: head/en_US.ISO8859-1/books/faq/book.xml Modified: head/en_US.ISO8859-1/books/faq/book.xml ============================================================================== --- head/en_US.ISO8859-1/books/faq/book.xml Fri Oct 27 04:01:51 2017 (r51149) +++ head/en_US.ISO8859-1/books/faq/book.xml Sat Oct 28 06:26:09 2017 (r51150) @@ -3745,7 +3745,7 @@ kern.sched.name: ULE In order to use a full screen editor such as &man.vi.1; or &man.emacs.1;, run - export TERM=xterm on &os; 9.0+ + export TERM=xterm so that these editors can load the correct data from the &man.termcap.5; database. @@ -4603,14 +4603,6 @@ ttyvb "/usr/libexec/getty Pc" xterm on secu problematic on systems with 8 MB RAM or less. Consider changing secure to insecure. - - - Versions of &os; prior to 9.0 used the - cons25 terminal type, and not - xterm. Use the format of existing entries in - when adding entries to - /etc/ttys. - In order to run an X server, at least one virtual From owner-svn-doc-head@freebsd.org Sat Oct 28 07:20:23 2017 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CD143E5DC78; Sat, 28 Oct 2017 07:20:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9984C66305; Sat, 28 Oct 2017 07:20:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9S7KMIk017579; Sat, 28 Oct 2017 07:20:22 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9S7KMEO017577; Sat, 28 Oct 2017 07:20:22 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201710280720.v9S7KMEO017577@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 28 Oct 2017 07:20:22 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51151 - head/en_US.ISO8859-1/articles/contributors X-SVN-Group: doc-head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/contributors X-SVN-Commit-Revision: 51151 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Oct 2017 07:20:23 -0000 Author: eadler Date: Sat Oct 28 07:20:22 2017 New Revision: 51151 URL: https://svnweb.freebsd.org/changeset/doc/51151 Log: Migate ache@ to develinmemoriam. RIP :( Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml head/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Modified: head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sat Oct 28 06:26:09 2017 (r51150) +++ head/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sat Oct 28 07:20:22 2017 (r51151) @@ -197,10 +197,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5. - &a.ache.email; - - - &a.melifaro.email; Modified: head/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Sat Oct 28 06:26:09 2017 (r51150) +++ head/en_US.ISO8859-1/articles/contributors/contrib.develinmemoriam.xml Sat Oct 28 07:20:22 2017 (r51151) @@ -4,6 +4,14 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> + Andrey A. Chernov (1993 - 2017; RIP 2017) + + Andrey contributions to &os; can not be overstated. Having + been involved for a long there is hardly an area which he did + not touch. + + + Jürgen Lock (2006 - 2015; RIP 2015) Jürgen made a number of contributions to &os;,