From owner-svn-doc-head@FreeBSD.ORG Sun Mar 15 00:28:13 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 740C9963; Sun, 15 Mar 2015 00:28:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5F1AA6B9; Sun, 15 Mar 2015 00:28:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2F0SCtc082918; Sun, 15 Mar 2015 00:28:12 GMT (envelope-from gavin@FreeBSD.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2F0SC2T082917; Sun, 15 Mar 2015 00:28:12 GMT (envelope-from gavin@FreeBSD.org) Message-Id: <201503150028.t2F0SC2T082917@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gavin set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson Date: Sun, 15 Mar 2015 00:28:12 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46343 - head/en_US.ISO8859-1/htdocs/projects X-SVN-Group: doc-head 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.18-1 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, 15 Mar 2015 00:28:13 -0000 Author: gavin Date: Sun Mar 15 00:28:12 2015 New Revision: 46343 URL: https://svnweb.freebsd.org/changeset/doc/46343 Log: Update flyer to include registered trademark symbols where appropriate. Submitted by: Anne Dickinson (FreeBSD Foundation) Modified: head/en_US.ISO8859-1/htdocs/projects/2015-freebsd-gsoc.pdf Modified: head/en_US.ISO8859-1/htdocs/projects/2015-freebsd-gsoc.pdf ============================================================================== Binary file (source and/or target). No diff available. From owner-svn-doc-head@FreeBSD.ORG Sun Mar 15 03:08:17 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB0A9B9E; Sun, 15 Mar 2015 03:08:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 95F5BF5A; Sun, 15 Mar 2015 03:08:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2F38HLV058339; Sun, 15 Mar 2015 03:08:17 GMT (envelope-from ryusuke@FreeBSD.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2F38H5s058338; Sun, 15 Mar 2015 03:08:17 GMT (envelope-from ryusuke@FreeBSD.org) Message-Id: <201503150308.t2F38H5s058338@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to ryusuke@FreeBSD.org using -f From: Ryusuke SUZUKI Date: Sun, 15 Mar 2015 03:08:17 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46344 - head/ja_JP.eucJP/share/xml X-SVN-Group: doc-head 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.18-1 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, 15 Mar 2015 03:08:17 -0000 Author: ryusuke Date: Sun Mar 15 03:08:16 2015 New Revision: 46344 URL: https://svnweb.freebsd.org/changeset/doc/46344 Log: - Merge the following from the English version: r46301 -> r46335 head/ja_JP.eucJP/share/xml/news.xml Modified: head/ja_JP.eucJP/share/xml/news.xml Modified: head/ja_JP.eucJP/share/xml/news.xml ============================================================================== --- head/ja_JP.eucJP/share/xml/news.xml Sun Mar 15 00:28:12 2015 (r46343) +++ head/ja_JP.eucJP/share/xml/news.xml Sun Mar 15 03:08:16 2015 (r46344) @@ -23,7 +23,7 @@ would like to work on. *** $FreeBSD$ - Original revision: r46301 + Original revision: r46335 --> @@ -34,6 +34,24 @@ 2015 + 3 + + + 8 + + +

¿·¥³¥ß¥Ã¥¿½¢Ç¤: + Eric van Gyzen (src)

+
+ + +

¿·¥³¥ß¥Ã¥¿½¢Ç¤: + Jason Harmening (src)

+
+
+
+ + 2 From owner-svn-doc-head@FreeBSD.ORG Sun Mar 15 13:38:30 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A7BFD607; Sun, 15 Mar 2015 13:38:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 928B51BC; Sun, 15 Mar 2015 13:38:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FDcUql058109; Sun, 15 Mar 2015 13:38:30 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FDcUnE058108; Sun, 15 Mar 2015 13:38:30 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201503151338.t2FDcUnE058108@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 15 Mar 2015 13:38:30 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46345 - head/en_US.ISO8859-1/books/porters-handbook/versions X-SVN-Group: doc-head 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.18-1 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, 15 Mar 2015 13:38:30 -0000 Author: dim (src committer) Date: Sun Mar 15 13:38:29 2015 New Revision: 46345 URL: https://svnweb.freebsd.org/changeset/doc/46345 Log: Document __FreeBSD_version 1100063 through 1100065. 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 Sun Mar 15 03:08:16 2015 (r46344) +++ head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml Sun Mar 15 13:38:29 2015 (r46345) @@ -5783,6 +5783,27 @@ API and &man.ioctl.2; additions (rev 279221). + + + 1100063 + March 7, 2015 + 11.0-CURRENT after adding mutex support to the pps_ioctl() API + in the kernel (rev 279728). + + + + 1100064 + March 7, 2015 + 11.0-CURRENT after adding PPS support to USB serial drivers + (rev 279729). + + + + 1100065 + March 15, 2015 + 11.0-CURRENT after upgrading clang, llvm and lldb to 3.6.0 + (rev 280031). + From owner-svn-doc-head@FreeBSD.ORG Mon Mar 16 15:32:16 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 845B7E09; Mon, 16 Mar 2015 15:32:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 6FDCA33F; Mon, 16 Mar 2015 15:32:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2GFWGqC074850; Mon, 16 Mar 2015 15:32:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2GFWGwi074848; Mon, 16 Mar 2015 15:32:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201503161532.t2GFWGwi074848@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 16 Mar 2015 15:32:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46346 - head/share/xml X-SVN-Group: doc-head 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.18-1 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, 16 Mar 2015 15:32:16 -0000 Author: gjb Date: Mon Mar 16 15:32:15 2015 New Revision: 46346 URL: https://svnweb.freebsd.org/changeset/doc/46346 Log: Add uefisign(8). Sponsored by: The FreeBSD Foundation Modified: head/share/xml/man-refs.ent Modified: head/share/xml/man-refs.ent ============================================================================== --- head/share/xml/man-refs.ent Sun Mar 15 13:38:29 2015 (r46345) +++ head/share/xml/man-refs.ent Mon Mar 16 15:32:15 2015 (r46346) @@ -5861,6 +5861,7 @@ tzsetup8"> uathload8"> uefi8"> +uefisign8"> ugidfw8"> umount8"> unbound8"> From owner-svn-doc-head@FreeBSD.ORG Mon Mar 16 15:40:11 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2D9C35F; Mon, 16 Mar 2015 15:40:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 BDEFC3F7; Mon, 16 Mar 2015 15:40:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2GFeBfv076727; Mon, 16 Mar 2015 15:40:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2GFeB1v076726; Mon, 16 Mar 2015 15:40:11 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201503161540.t2GFeB1v076726@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 16 Mar 2015 15:40:11 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46347 - head/share/xml X-SVN-Group: doc-head 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.18-1 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, 16 Mar 2015 15:40:11 -0000 Author: gjb Date: Mon Mar 16 15:40:10 2015 New Revision: 46347 URL: https://svnweb.freebsd.org/changeset/doc/46347 Log: Add iovctl(8). Sponsored by: The FreeBSD Foundation Modified: head/share/xml/man-refs.ent Modified: head/share/xml/man-refs.ent ============================================================================== --- head/share/xml/man-refs.ent Mon Mar 16 15:32:15 2015 (r46346) +++ head/share/xml/man-refs.ent Mon Mar 16 15:40:10 2015 (r46347) @@ -5444,6 +5444,7 @@ init8"> intro8"> iostat8"> +iovctl8"> ip6addrctl8"> ip6fw8"> ipf8"> From owner-svn-doc-head@FreeBSD.ORG Mon Mar 16 16:18:00 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 20D1B33D; Mon, 16 Mar 2015 16:18:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 07FFCB91; Mon, 16 Mar 2015 16:18:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2GGHx57096747; Mon, 16 Mar 2015 16:17:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2GGHx87096746; Mon, 16 Mar 2015 16:17:59 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201503161617.t2GGHx87096746@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 16 Mar 2015 16:17:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46348 - head/share/xml X-SVN-Group: doc-head 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.18-1 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, 16 Mar 2015 16:18:00 -0000 Author: gjb Date: Mon Mar 16 16:17:58 2015 New Revision: 46348 URL: https://svnweb.freebsd.org/changeset/doc/46348 Log: Add the manual page references for: - mt(3) - ds3231(4) - iovctl.conf(5) - as(7) - binutils(7) - diff(7) - ld(7) - ldint(7) - PCI_ADD_VF(9) - PCI_INIT_IOV(9) - PCI_UNINIT_IOV(9) - pci_iov_schema(9) Sponsored by: The FreeBSD Foundation Modified: head/share/xml/man-refs.ent Modified: head/share/xml/man-refs.ent ============================================================================== --- head/share/xml/man-refs.ent Mon Mar 16 15:40:10 2015 (r46347) +++ head/share/xml/man-refs.ent Mon Mar 16 16:17:58 2015 (r46348) @@ -2955,6 +2955,7 @@ msgget3"> msgrcv3"> msgsnd3"> +mt3"> multibyte3"> mvaddch3"> mvaddchnstr3"> @@ -4266,6 +4267,7 @@ divert4"> dpms4"> dpt4"> +ds32314"> dummynet4"> ebus4"> ed4"> @@ -4988,6 +4990,7 @@ info5"> inode5"> intro5"> +iovctl_conf5"> ipf5"> ipfilter5"> ipnat5"> @@ -5162,14 +5165,17 @@ X7"> adding_user7"> +as7"> ascii7"> atf7"> +binutils7"> bsd_snmpmod_mk7"> build7"> c997"> clocks7"> crypto7"> development7"> +diff7"> ditroff7"> environ7"> eqn7"> @@ -5192,6 +5198,8 @@ hier7"> hostname7"> intro7"> +ld7"> +ldint7"> lint7"> maclabel7"> mailaddr7"> @@ -5972,6 +5980,9 @@ MODULE_DEPEND9"> MODULE_VERSION9"> PCBGROUP9"> +PCI_ADD_VF9"> +PCI_INIT_IOV9"> +PCI_UNINIT_IOV9"> SDT9"> SETSETNEQ9"> SETSETOR9"> @@ -6405,6 +6416,7 @@ panic9"> pbuf9"> pci9"> +pci_iov_schema9"> pfctlinput9"> pfctlinput29"> pffindproto9"> From owner-svn-doc-head@FreeBSD.ORG Tue Mar 17 14:08:58 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7469FF38; Tue, 17 Mar 2015 14:08:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 5E3D519A; Tue, 17 Mar 2015 14:08:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2HE8wvD012687; Tue, 17 Mar 2015 14:08:58 GMT (envelope-from ryusuke@FreeBSD.org) Received: (from ryusuke@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2HE8wCI012686; Tue, 17 Mar 2015 14:08:58 GMT (envelope-from ryusuke@FreeBSD.org) Message-Id: <201503171408.t2HE8wCI012686@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ryusuke set sender to ryusuke@FreeBSD.org using -f From: Ryusuke SUZUKI Date: Tue, 17 Mar 2015 14:08:58 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46349 - head/ja_JP.eucJP/books/handbook/bsdinstall X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Tue, 17 Mar 2015 14:18:30 +0000 X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Tue, 17 Mar 2015 14:08:58 -0000 Author: ryusuke Date: Tue Mar 17 14:08:57 2015 New Revision: 46349 URL: https://svnweb.freebsd.org/changeset/doc/46349 Log: - Merge the following from the English version: r44654 -> r44655 head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml Modified: head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml ============================================================================== --- head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml Mon Mar 16 16:17:58 2015 (r46348) +++ head/ja_JP.eucJP/books/handbook/bsdinstall/chapter.xml Tue Mar 17 14:08:57 2015 (r46349) @@ -3,7 +3,7 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: r44654 + Original revision: r44655 $FreeBSD$ --> sysinstall ¤È¸Æ¤Ð¤ì¤ë¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤ò»È¤¤¤Þ¤¹¡£ ¤³¤Î¾Ï¤Ç¤Ï¡¢bsdinstall ¤Î»È¤¤Êý¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Þ¤¹¡£ - sysinstall ¤ÎÍøÍѤˤĤ¤¤Æ¤Ï¡¢ - ¤ÇÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + sysinstall ¤ÎÍøÍѤˤĤ¤¤Æ¤Ï¡¢ ¤ÇÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ ¤³¤Î¾Ï¤òÆɤà¤È¡¢°Ê²¼¤Î¤³¤È¤¬¤ï¤«¤ê¤Þ¤¹¡£ @@ -162,8 +162,8 @@ &os;/&arch.amd64; ¤ò¼Â¹Ô²Äǽ¤Ê¥×¥í¥»¥Ã¥µ¤Ë¤Ï 2 ¤Ä¤Î¥¯¥é¥¹¤¬¤¢¤ê¤Þ¤¹¡£ - 1 ¤ÄÌܤΥ¯¥é¥¹¤Ï¡¢&amd.athlon;64, &amd.athlon;64-FX, &amd.opteron; - ¤ä¤½¤ì¤è¤ê¿·¤·¤¤¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£ + 1 ¤ÄÌܤΥ¯¥é¥¹¤Ï¡¢&amd.athlon;64, &amd.athlon;64-FX, + &amd.opteron; ¤ä¤½¤ì¤è¤ê¿·¤·¤¤¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£ ¤â¤¦ 1 ¤Ä¤Î¥¯¥é¥¹¤Ï¡¢ &intel; EM64T ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤òºÎÍѤ·¤Æ¤¤¤ë¥×¥í¥»¥Ã¥µ¤Ç¤¹¡£ @@ -175,24 +175,25 @@ nVidia nForce3 Pro-150 ¥Ù¡¼¥¹¤Î¥³¥ó¥Ô¥å¡¼¥¿¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢ BIOS ¤Î¥»¥Ã¥È¥¢¥Ã¥×¤ò»È¤Ã¤Æ¡¢ - IO APIC ¤ò̵¸ú¤Ë¤¹¤ë - ɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - ¤â¤·¡¢BIOS ¥ª¥×¥·¥ç¥ó¤¬¤Ê¤±¤ì¤Ð¡¢ - Âå¤ï¤ê¤Ë ACPI ¤ò̵¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£ - Pro-150 ¥Á¥Ã¥×¥»¥Ã¥È¤Ë¤Ï²óÈòºö¤¬¸«¤Ä¤«¤Ã¤Æ¤¤¤Ê¤¤¥Ð¥°¤¬¤¢¤ê¤Þ¤¹¡£ + IO APIC + ¤ò̵¸ú¤Ë¤¹¤ë ɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + ¤â¤·¡¢BIOS ¥ª¥×¥·¥ç¥ó¤¬¤Ê¤±¤ì¤Ð¡¢Âå¤ï¤ê¤Ë + ACPI ¤ò̵¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£Pro-150 + ¥Á¥Ã¥×¥»¥Ã¥È¤Ë¤Ï²óÈòºö¤¬¸«¤Ä¤«¤Ã¤Æ¤¤¤Ê¤¤¥Ð¥°¤¬¤¢¤ê¤Þ¤¹¡£ &os;/&arch.powerpc; &apple; &macintosh; - ¤¹¤Ù¤Æ¤Î USB Æ⢤ΠNew World &apple; &macintosh; - ¥·¥¹¥Æ¥à¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ + ¤¹¤Ù¤Æ¤Î USB Æ⢤Π+ New World &apple; &macintosh; ¥·¥¹¥Æ¥à¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ Ê£¿ô¤Î CPI ¤ò»ý¤Ä¥³¥ó¥Ô¥å¡¼¥¿¤Ï SMP ¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ 32-bit ¥«¡¼¥Í¥ë¤Ï¡¢RAM ¤ÎºÇ½é¤Î 2 GB ¤À¤±¤òÍøÍѤǤ­¤Þ¤¹¡£ - Blue & White PowerMac G3 ¤Ç¤Ï¡¢&firewire; ¤ËÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£ + Blue & White PowerMac G3 ¤Ç¤Ï¡¢ + &firewire; ¤ËÂбþ¤·¤Æ¤¤¤Þ¤»¤ó¡£ @@ -289,8 +290,8 @@ &os; ¤Îɸ½à¤Î¥Ö¡¼¥È¥í¡¼¥À¤Ï¡¢¥×¥é¥¤¥Þ¥ê¤Þ¤¿¤Ï GPT ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹ - &os; ¤Îµ¯Æ°¥×¥í¥»¥¹¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢ - ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ + &os; ¤Îµ¯Æ°¥×¥í¥»¥¹¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢ ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£ ¥Ç¥£¥¹¥¯¾å¤Î¤¹¤Ù¤Æ¤Î¥×¥é¥¤¥Þ¥ê¡¢¤â¤·¤¯¤Ï GPT ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤¬»È¤ï¤ì¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ ¤½¤Î¤Ò¤È¤Ä¤ò &os; ¤Î¤¿¤á¤Ë³«Êü¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -449,7 +450,8 @@ ¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Î½àÈ÷ &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï¡¢ - ¥¤¥ó¥¹¥È¡¼¥ëÍѤΠCD, DVD ¤Þ¤¿¤Ï USB + ¥¤¥ó¥¹¥È¡¼¥ëÍѤΠCD, + DVD ¤Þ¤¿¤Ï USB ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤È¤È¤â¤Ë¡¢¥³¥ó¥Ô¥å¡¼¥¿¤òµ¯Æ°¤¹¤ë¤È¤³¤í¤«¤é»Ï¤Þ¤ê¤Þ¤¹¡£ ¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ç¼Â¹Ô¤Ç¤­¤ë¤è¤¦¤Ê¥×¥í¥°¥é¥à¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ @@ -461,8 +463,8 @@ ¤Þ¤¿¡¢¥¤¥ó¥¹¥È¡¼¥ëÃæ¤ËɬÍפʥե¡¥¤¥ë¤À¤±¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤Î¤Ç¡¢ »ÈÍѤ¹¤ë¥Ð¥ó¥ÉÉý¤ò¸º¤é¤¹¤³¤È¤¬½ÐÍè¤Þ¤¹¡£ - &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Ï - www.freebsd.org/ja/where.html#download + &os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Ï www.freebsd.org/ja/where.html#download ¤«¤éÆþ¼ê¤Ç¤­¤Þ¤¹¡£ ¤Þ¤¿¥¤¥á¡¼¥¸¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Ç¥£¥ì¥¯¥È¥ê¤«¤é CHECKSUM.SHA256 ¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢ @@ -477,8 +479,8 @@ ¥Õ¥¡¥¤¥ë¤Ï²õ¤ì¤Æ¤¤¤ë¤Î¤Çºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£ - &os; ¤ÎÆþ¤Ã¤Æ¤¤¤ë CD ¤ä - DVD, + &os; ¤ÎÆþ¤Ã¤Æ¤¤¤ë + CD ¤ä DVD, USB ¥á¥â¥ê¥¹¥Æ¥£¥Ã¥¯¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ ¤³¤Î¾Ï¤òÈô¤Ð¤·¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£ @@ -488,7 +490,8 @@ ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤Ï¡¢°ìËç¤Î CD ¤Þ¤¿¤Ï DVD ¤¬¤¢¤ì¤Ð½½Ê¬¤Ç¤¹¡£ ¸½ºß»ÈÍѤ·¤Æ¤¤¤ë¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤ë¡¢ - ISO ¥¤¥á¡¼¥¸¤ò CD ¤Ë½ñ¤­¹þ¤à¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍѤ¤¤Æ¡¢ + ISO ¥¤¥á¡¼¥¸¤ò CD + ¤Ë½ñ¤­¹þ¤à¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤òÍѤ¤¤Æ¡¢ µ¯Æ°²Äǽ¤Ê CD ¤Þ¤¿¤Ï DVD ¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£ &os; ¤Ç¤Ï¡¢Ports Collection ¤Î @@ -645,7 +648,8 @@ commit your changes? ¥¹¥Æ¥£¥Ã¥¯¤ò»ÈÍѤ¹¤ë¾ì¹ç¤Ë¤Ï¡¢¥³¥ó¥Ô¥å¡¼¥¿¤òΩ¤Á¾å¤²¤ëÁ°¤Ë¡¢ USB ¥¹¥Æ¥£¥Ã¥¯¤òÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤¡£ - CD ¤«¤éµ¯Æ°¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢¥³¥ó¥Ô¥å¡¼¥¿¤òΩ¤Á¾å¤²¡¢ + CD ¤«¤éµ¯Æ°¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢ + ¥³¥ó¥Ô¥å¡¼¥¿¤òΩ¤Á¾å¤²¡¢ ¤¹¤°¤Ë CD ¤òÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -773,10 +777,9 @@ Loading /boot/defaults/loader.conf ¤Û¤È¤ó¤É¤Î &sparc64; ¥·¥¹¥Æ¥à¤Ï¡¢ ¥Ç¥£¥¹¥¯¤«¤é¼«Æ°Åª¤Ëµ¯Æ°¤¹¤ë¤è¤¦¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£ - &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤Þ¤¿¤Ï CD - ¤«¤éµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¡¢¤½¤Î¤¿¤á¤Ë¤Ï - PROM - (OpenFirmware) ¤ËÆþ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + &os; ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤Þ¤¿¤Ï + CD ¤«¤éµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¡¢¤½¤Î¤¿¤á¤Ë¤Ï + PROM (OpenFirmware) ¤ËÆþ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ PROM ¤ËÆþ¤ë¤Ë¤Ï¥·¥¹¥Æ¥à¤òºÆµ¯Æ°¤·¡¢ ¥Ö¡¼¥È¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤ë¤Þ¤ÇÂԤäƤ¯¤À¤µ¤¤¡£ @@ -788,17 +791,13 @@ OpenBoot 4.2, 128 MB memory installed, S Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4. ¤â¤·¥·¥¹¥Æ¥à¤¬¤³¤Î»þÅÀ¤Ç¥Ç¥£¥¹¥¯¤«¤éµ¯Æ°¤¹¤ë¤è¤¦¤Ç¤·¤¿¤é¡¢ - ¥­¡¼¥Ü¡¼¥É¤«¤é - L1A - ¤Þ¤¿¤Ï - StopA ¤ò²¡¤¹¤«¡¢¥·¥ê¥¢¥ë¥³¥ó¥½¡¼¥ë¤«¤é BREAK (¤¿¤È¤¨¤Ð¡¢&man.tip.1; ¤Þ¤¿¤Ï &man.cu.1; ¤Ç¤Ï ~#) - ¤òÁ÷¿®¤·¤Æ¡¢ - PROM - ¥×¥í¥ó¥×¥È¤òɽ¼¨¤·¤Æ¤¯¤À¤µ¤¤¡£ + ¤òÁ÷¿®¤·¤Æ¡¢PROM ¥×¥í¥ó¥×¥È¤òɽ¼¨¤·¤Æ¤¯¤À¤µ¤¤¡£ ¼¡¤Î¤è¤¦¤Êɽ¼¨¤Ç¤¹¡£ ok @@ -827,10 +826,12 @@ Ethernet address 0:3:ba:b:92:d4, Host ID ²èÌ̤Ëɽ¼¨¤µ¤ì¤ë¿ôÉ´¹Ô¤Îʸ»úÎó¤Ï (¥Ð¥Ã¥Õ¥¡¤Ë) µ­²±¤µ¤ì¤Æ¤ª¤ê¡¢ ºÆɽ¼¨¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡£ - ¥Ð¥Ã¥Õ¥¡¤òºÆɽ¼¨¤¹¤ë¤Ë¤Ï¡¢Scroll Lock ¥­¡¼¤ò²¡¤·¤Þ¤¹¡£ - ¤³¤ì¤Ç²èÌ̤ò¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Þ¤¹¡£·ë²Ì¤ò¸«¤ë¤¿¤á¤Ë¤Ï¡¢Ìð°õ¥­¡¼¤â¤·¤¯¤Ï - PageUp ¤« PageDown ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£ - Scroll Lock ¤ò¤â¤¦°ìÅÙ²¡¤¹¤È¡¢¥¹¥¯¥í¡¼¥ë¤òÄä»ß¤·¤Þ¤¹¡£ + ¥Ð¥Ã¥Õ¥¡¤òºÆɽ¼¨¤¹¤ë¤Ë¤Ï¡¢Scroll Lock + ¥­¡¼¤ò²¡¤·¤Þ¤¹¡£¤³¤ì¤Ç²èÌ̤ò¥¹¥¯¥í¡¼¥ë¤Ç¤­¤Þ¤¹¡£ + ·ë²Ì¤ò¸«¤ë¤¿¤á¤Ë¤Ï¡¢Ìð°õ¥­¡¼¤â¤·¤¯¤Ï PageUp ¤« + PageDown ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£ + Scroll Lock ¤ò¤â¤¦°ìÅÙ²¡¤¹¤È¡¢ + ¥¹¥¯¥í¡¼¥ë¤òÄä»ß¤·¤Þ¤¹¡£ ľ¤Á¤Ë¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¡¢¥«¡¼¥Í¥ë¤¬¥Ç¥Ð¥¤¥¹¸¡½Ð¤ò¼Â¹Ô¤·¤Æ¤¤¤ë»þ¤Ë ²èÌ̤γ°¤Ëή¤ì¤¿Ê¸»úÎó¤òºÆɽ¼¨¤·¤Æ¤¯¤À¤µ¤¤¡£ @@ -993,14 +994,13 @@ Trying to mount root from cd9660:/dev/is ðǰ¤Ë¸¡½Ð·ë²Ì¤ò¥Á¥§¥Ã¥¯¤·¤Æ¡¢ &os; ¤¬¤¹¤Ù¤Æ¤Î¥Ç¥Ð¥¤¥¹¤ò¸¡½Ð¤Ç¤­¤¿»ö¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢ - ¸¡½Ð·ë²Ì¤Øɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£ - - ¤Ë¤Ï¡¢GENERIC + ¥Ç¥Ð¥¤¥¹¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¡¢¸¡½Ð·ë²Ì¤Øɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£ ¤Ë¤Ï¡¢ + GENERIC ¥«¡¼¥Í¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¥Ç¥Ð¥¤¥¹¤ËÂбþ¤¹¤ëÊýË¡¤¬ÀâÌÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - ¥Ç¥Ð¥¤¥¹¸¡½Ð¸å¡¢ - ¤Ë¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£ + ¥Ç¥Ð¥¤¥¹¸¡½Ð¸å¡¢ + ¤Ë¼¨¤µ¤ì¤ë¥á¥Ë¥å¡¼¤¬É½¼¨¤µ¤ì¤Þ¤¹¡£ ¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤Ï¡¢&os; ¤Î¥¤¥ó¥¹¥È¡¼¥ë¡¢ ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë live CD¡¢¤Þ¤¿¤Ï @@ -1161,7 +1161,8 @@ Trying to mount root from cd9660:/dev/is games - fortune, rot13 - ¤Ê¤É¤ÎÅÁÅýŪ¤Ê BSD ¥²¡¼¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ + ¤Ê¤É¤ÎÅÁÅýŪ¤Ê BSD + ¥²¡¼¥à¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¡£ @@ -1328,59 +1329,59 @@ Trying to mount root from cd9660:/dev/is ³µ¤·¤Æ¡¢¤Û¤È¤ó¤É¤Î¥æ¡¼¥¶¤Ï¡¢/var ¤Ë¥®¥¬¥Ð¥¤¥È°Ê¾å¤Î¶õ¤­ÍÆÎ̤òɬÍפȤϤ·¤Ê¤¤¤Ç¤·¤ç¤¦¡£ - - »þ¤Ë¤Ï¡¢¤¿¤¯¤µ¤ó¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬ - /var/tmp ¤ËɬÍפˤʤë¤È¤­¤¬¤¢¤ê¤Þ¤¹¡£ - ¿·¤·¤¤¥½¥Õ¥È¥¦¥§¥¢¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¡¢ - package ¤Î¥Ä¡¼¥ë¤Ï¡¢package ¤Î°ì»þŪ¤Ê¥³¥Ô¡¼¤ò - /var/tmp °Ê²¼¤ËŸ³«¤·¤Þ¤¹¡£ - /var/tmp - °Ê²¼¤Ë½½Ê¬¤Ê¥Ç¥£¥¹¥¯ÍÆÎ̤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢ - Firefox, - OpenOffice ¤ä - LibreOffice ¤Î¤è¤¦¤Ê¡¢ - Â礭¤Ê¥½¥Õ¥È¥¦¥§¥¢ package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¡¢ - º¤Æñ¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£ - + + »þ¤Ë¤Ï¡¢¤¿¤¯¤µ¤ó¤Î¥Ç¥£¥¹¥¯ÍÆÎ̤¬ + /var/tmp ¤ËɬÍפˤʤë¤È¤­¤¬¤¢¤ê¤Þ¤¹¡£ + ¿·¤·¤¤¥½¥Õ¥È¥¦¥§¥¢¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëºÝ¡¢ + package ¤Î¥Ä¡¼¥ë¤Ï¡¢package ¤Î°ì»þŪ¤Ê¥³¥Ô¡¼¤ò + /var/tmp °Ê²¼¤ËŸ³«¤·¤Þ¤¹¡£ + /var/tmp + °Ê²¼¤Ë½½Ê¬¤Ê¥Ç¥£¥¹¥¯ÍÆÎ̤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Ê¤¤¤È¡¢ + Firefox, + OpenOffice ¤ä + LibreOffice ¤Î¤è¤¦¤Ê¡¢ + Â礭¤Ê¥½¥Õ¥È¥¦¥§¥¢ package ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤¬¡¢ + º¤Æñ¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£ + - /usr ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¤Ï¡¢ - &os; Ports Collection ¤ª¤è¤Ó¥·¥¹¥Æ¥à¤Î¥½¡¼¥¹¥³¡¼¥É¤ò´Þ¤à¡¢ - ¥·¥¹¥Æ¥à¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤Î¤ËɬÍפÊ¿¤¯¤Î¥Õ¥¡¥¤¥ë·²¤¬ÃÖ¤«¤ì¤Þ¤¹¡£ - ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¤Ï¡¢¾¯¤Ê¤¯¤È¤â 2 ¥®¥¬¥Ð¥¤¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£ - - ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥µ¥¤¥º¤ò¹Í¤¨¤ë»þ¡¢ - ɬÍ×Î̤òǰƬ¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£ - Ê̤Υѡ¼¥Æ¥£¥·¥ç¥ó¤Ë¤Ï½áÂô¤Ë¥¹¥Ú¡¼¥¹¤¬Í¾¤Ã¤Æ¤¤¤ë¤Î¤Ë¡¢ - ¤¢¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ç¥¹¥Ú¡¼¥¹¤¬Â­¤é¤Ê¤¤¤Þ¤Þ¤È¤¤¤¦¤Î¤Ï¡¢ - ¥Õ¥é¥¹¥È¥ì¡¼¥·¥ç¥ó¤¬¤¿¤Þ¤ë¤â¤Î¤Ç¤¹¡£ - - - swap sizing - - - swap partition - - - ·Ð¸³¤«¤é¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥µ¥¤¥º¤ÏʪÍý¥á¥â¥ê - (RAM) ¤Î 2 ÇܤȤ¤¤¦¤Î¤¬°ìÈÌŪ¤Ç¤¹¡£ - RAM ¤Î¾¯¤Ê¤¤¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ - ¤â¤Ã¤È¥¹¥ï¥Ã¥×¤òÁý¤·¤¿Êý¤¬À­Ç½¤¬¤è¤¯¤Ê¤ê¤Þ¤¹¡£ - ¥¹¥ï¥Ã¥×¤¬¾¯¤Ê¤¹¤®¤ëÀßÄê¤Ï¡¢ - ¤¢¤Ê¤¿¤¬¸å¤Ë¥á¥â¥ê¤òÁýÀߤ·¤¿¤È¤­¤ËÌäÂê¤òµ¯¤¹¤Ð¤«¤ê¤Ç¤Ï¤Ê¤¯¡¢ - VM ¥Ú¡¼¥¸¥¹¥­¥ã¥Ë¥ó¥°¥³¡¼¥É¤ÎǽΨ¤òÍ¤Þ¤¹¡£ - - Ê£¿ô¤Î SCSI - ¥Ç¥£¥¹¥¯¤ä°Û¤Ê¤ë¥³¥ó¥È¥í¡¼¥é¤ÇÁàºî¤µ¤ì¤ëÊ£¿ô¤Î - IDE ¥Ç¥£¥¹¥¯¤ò»ý¤ÄÂ絬ÌϤʥ·¥¹¥Æ¥à¤Ç¤Ï¡¢ - ¤½¤ì¤¾¤ì¤Î¥É¥é¥¤¥Ö (4 Âæ¤Þ¤Ç) ¤Ë¥¹¥ï¥Ã¥×¤òÀßÄꤹ¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£ - ³Æ¥É¥é¥¤¥Ö¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¤Û¤ÜƱ°ì¥µ¥¤¥º¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹¡£ - ¥«¡¼¥Í¥ë¤ÏǤ°Õ¤Î¥µ¥¤¥º¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢ - ÆâÉô¤Î¥Ç¡¼¥¿¹½Â¤¤ÏºÇÂç¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î 4 ÇܤËÄ´Àᤵ¤ì¤Þ¤¹¡£ - ¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¤Û¤ÜƱ°ì¤Î¥µ¥¤¥º¤Ë¤·¤Æ¤ª¤¯¤³¤È¤Ç¡¢ - ¥«¡¼¥Í¥ë¤Ï¥¹¥ï¥Ã¥×¥¹¥Ú¡¼¥¹¤òºÇŬ¤Ê¤«¤¿¤Á¤Ç¥Ç¥£¥¹¥¯¤ò¤Þ¤¿¤¤¤Ç¥¹¥È¥é¥¤¥×¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ - ¤¢¤Ê¤¿¤¬Ä̾凉¥ï¥Ã¥×¤ò¤¿¤¯¤µ¤ó»È¤ï¤Ê¤¤¤È¤·¤Æ¤â¡¢ - ¿¤¯¤Î¥¹¥ï¥Ã¥×¥µ¥¤¥º¤òÍÑ°Õ¤·¤Æ¤ª¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£ - ¥×¥í¥°¥é¥à¤¬Ë½Áö¤·¤Æ¤âºÆµ¯Æ°¤µ¤»¤é¤ì¤ëÁ°¤Ë²óÉü¤¹¤ë¤³¤È¤¬Íưפˤʤê¤Þ¤¹¡£ + /usr ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¤Ï¡¢ + &os; Ports Collection ¤ª¤è¤Ó¥·¥¹¥Æ¥à¤Î¥½¡¼¥¹¥³¡¼¥É¤ò´Þ¤à¡¢ + ¥·¥¹¥Æ¥à¤ò¥µ¥Ý¡¼¥È¤¹¤ë¤Î¤ËɬÍפÊ¿¤¯¤Î¥Õ¥¡¥¤¥ë·²¤¬ÃÖ¤«¤ì¤Þ¤¹¡£ + ¤³¤Î¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¤Ï¡¢¾¯¤Ê¤¯¤È¤â 2 ¥®¥¬¥Ð¥¤¥È¤òÍÑ°Õ¤¹¤ë¤³¤È¤ò¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£ + + ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥µ¥¤¥º¤ò¹Í¤¨¤ë»þ¡¢ + ɬÍ×Î̤òǰƬ¤ËÃÖ¤¤¤Æ¤¯¤À¤µ¤¤¡£ + Ê̤Υѡ¼¥Æ¥£¥·¥ç¥ó¤Ë¤Ï½áÂô¤Ë¥¹¥Ú¡¼¥¹¤¬Í¾¤Ã¤Æ¤¤¤ë¤Î¤Ë¡¢ + ¤¢¤ë¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ç¥¹¥Ú¡¼¥¹¤¬Â­¤é¤Ê¤¤¤Þ¤Þ¤È¤¤¤¦¤Î¤Ï¡¢ + ¥Õ¥é¥¹¥È¥ì¡¼¥·¥ç¥ó¤¬¤¿¤Þ¤ë¤â¤Î¤Ç¤¹¡£ + + + swap sizing + + + swap partition + + + ·Ð¸³¤«¤é¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î¥µ¥¤¥º¤ÏʪÍý¥á¥â¥ê + (RAM) ¤Î 2 ÇܤȤ¤¤¦¤Î¤¬°ìÈÌŪ¤Ç¤¹¡£ + RAM ¤Î¾¯¤Ê¤¤¥·¥¹¥Æ¥à¤Ç¤Ï¡¢ + ¤â¤Ã¤È¥¹¥ï¥Ã¥×¤òÁý¤·¤¿Êý¤¬À­Ç½¤¬¤è¤¯¤Ê¤ê¤Þ¤¹¡£ + ¥¹¥ï¥Ã¥×¤¬¾¯¤Ê¤¹¤®¤ëÀßÄê¤Ï¡¢ + ¤¢¤Ê¤¿¤¬¸å¤Ë¥á¥â¥ê¤òÁýÀߤ·¤¿¤È¤­¤ËÌäÂê¤òµ¯¤¹¤Ð¤«¤ê¤Ç¤Ï¤Ê¤¯¡¢ + VM ¥Ú¡¼¥¸¥¹¥­¥ã¥Ë¥ó¥°¥³¡¼¥É¤ÎǽΨ¤òÍ¤Þ¤¹¡£ + + Ê£¿ô¤Î SCSI + ¥Ç¥£¥¹¥¯¤ä°Û¤Ê¤ë¥³¥ó¥È¥í¡¼¥é¤ÇÁàºî¤µ¤ì¤ëÊ£¿ô¤Î + IDE ¥Ç¥£¥¹¥¯¤ò»ý¤ÄÂ絬ÌϤʥ·¥¹¥Æ¥à¤Ç¤Ï¡¢ + ¤½¤ì¤¾¤ì¤Î¥É¥é¥¤¥Ö (4 Âæ¤Þ¤Ç) ¤Ë¥¹¥ï¥Ã¥×¤òÀßÄꤹ¤ë¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£ + ³Æ¥É¥é¥¤¥Ö¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ï¤Û¤ÜƱ°ì¥µ¥¤¥º¤Ç¤¢¤ë¤Ù¤­¤Ç¤¹¡£ + ¥«¡¼¥Í¥ë¤ÏǤ°Õ¤Î¥µ¥¤¥º¤ò°·¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¤¬¡¢ + ÆâÉô¤Î¥Ç¡¼¥¿¹½Â¤¤ÏºÇÂç¤Î¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Î 4 ÇܤËÄ´Àᤵ¤ì¤Þ¤¹¡£ + ¥¹¥ï¥Ã¥×¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤ò¤Û¤ÜƱ°ì¤Î¥µ¥¤¥º¤Ë¤·¤Æ¤ª¤¯¤³¤È¤Ç¡¢ + ¥«¡¼¥Í¥ë¤Ï¥¹¥ï¥Ã¥×¥¹¥Ú¡¼¥¹¤òºÇŬ¤Ê¤«¤¿¤Á¤Ç¥Ç¥£¥¹¥¯¤ò¤Þ¤¿¤¤¤Ç¥¹¥È¥é¥¤¥×¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ + ¤¢¤Ê¤¿¤¬Ä̾凉¥ï¥Ã¥×¤ò¤¿¤¯¤µ¤ó»È¤ï¤Ê¤¤¤È¤·¤Æ¤â¡¢ + ¿¤¯¤Î¥¹¥ï¥Ã¥×¥µ¥¤¥º¤òÍÑ°Õ¤·¤Æ¤ª¤¯¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡£ + ¥×¥í¥°¥é¥à¤¬Ë½Áö¤·¤Æ¤âºÆµ¯Æ°¤µ¤»¤é¤ì¤ëÁ°¤Ë²óÉü¤¹¤ë¤³¤È¤¬Íưפˤʤê¤Þ¤¹¡£ ¥·¥¹¥Æ¥à¤òŬÀڤ˥ѡ¼¥Æ¥£¥·¥ç¥ó²½¤¹¤ë¤³¤È¤Ç¡¢ ¾®¤µ¤¤¤¬½ñ¤­¹þ¤ß¤Î·ã¤·¤¤¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¤Ë¤è¤Ã¤Æ°ú¤­µ¯¤³¤µ¤ì¤ë¥Õ¥é¥°¥á¥ó¥È²½¤ò¡¢ @@ -1502,7 +1503,8 @@ Trying to mount root from cd9660:/dev/is APM - &powerpc; &macintosh; ¤Ç»È¤ï¤ì¤Æ¤¤¤ë Apple Partition Map (&powerpc; &macintosh; ¤Ç»È¤ï¤ì¤Æ¤¤¤ë + Apple Partition Map (http://support.apple.com/kb/TA21692) @@ -1564,8 +1566,8 @@ Trying to mount root from cd9660:/dev/is - freebsd-ufs - &os; - UFS ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡£ + freebsd-ufs - &os; UFS + ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¡£ @@ -1587,7 +1589,8 @@ Trying to mount root from cd9660:/dev/is /, /var, /tmp ¤½¤·¤Æ /usr ¤È¤¤¤Ã¤¿ÅÁÅýŪ¤Ê¥Ñ¡¼¥Æ¥£¥·¥ç¥óʬ³ä¤Î¥ì¥¤¥¢¥¦¥È¤ò¹¥¤à¿Í¤â¤¤¤Þ¤¹¡£ - ¥ì¥¤¥¢¥¦¥È¤ÎÎ㤬 ¤Ë¤¢¤ê¤Þ¤¹¡£ + ¥ì¥¤¥¢¥¦¥È¤ÎÎ㤬 ¤Ë¤¢¤ê¤Þ¤¹¡£ ¥µ¥¤¥º¤òÆþÎϤ¹¤ëºÝ¤Ë¡¢ K (¥­¥í¥Ð¥¤¥È)¡¢M (¥á¥¬¥Ð¥¤¥È)¡¢ @@ -1764,8 +1767,7 @@ Trying to mount root from cd9660:/dev/is ¤è¤êÊ£»¨¤Ê¥×¡¼¥ë¤òºîÀ®¤¹¤ë¤Ë¤Ï¡¢Shell Mode ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ëÊýË¡¤Ç¥×¡¼¥ë¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£ - ¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢ - ¥¹¥È¥é¥¤¥× (¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£¾éĹÀ­¤Ê¤·)¡¢¥ß¥é¡¼ + ¥¤¥ó¥¹¥È¡¼¥é¤Ï¡¢¥¹¥È¥é¥¤¥× (¿ä¾©¤µ¤ì¤Þ¤»¤ó¡£¾éĹÀ­¤Ê¤·)¡¢¥ß¥é¡¼ (¥Ù¥¹¥È¤Ê¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¡£»ÈÍѤǤ­¤ëÍÆÎ̤ϺǾ®) ¤ª¤è¤Ó RAID-Z 1, 2 ¤ª¤è¤Ó 3 (¤½¤ì¤¾¤ì 1, 2 ¤ª¤è¤Ó 3 ¥Ç¥£¥¹¥¯¤ÎƱ»þ¾ã³²¤ØÂбþ)¡¢ ¤È¤¤¤Ã¤¿¤µ¤Þ¤¶¤Þ¤Ê¥¿¥¤¥×¤Î¥×¡¼¥ë¤ÎºîÀ®¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£ @@ -1799,7 +1801,8 @@ Trying to mount root from cd9660:/dev/is - + @@ -1809,7 +1812,8 @@ Trying to mount root from cd9660:/dev/is - + @@ -1840,7 +1844,8 @@ Trying to mount root from cd9660:/dev/is ¤È MBR ¤ÎÀÚ¤êÂؤ¨¡¢ ¥¹¥ï¥Ã¥×Îΰè¤ÎÍÆÎ̤òÁªÂò¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£ ¤¹¤Ù¤Æ¤Î¥ª¥×¥·¥ç¥ó¤¬Å¬ÀÚ¤ÊÃͤËÀßÄꤵ¤ì¤¿¤é¡¢ - ¥á¥Ë¥å¡¼¤Î¥È¥Ã¥×¤Ë¤¢¤ë >>> Install + ¥á¥Ë¥å¡¼¤Î¥È¥Ã¥×¤Ë¤¢¤ë + >>> Install ¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ &man.geli.8; ¥Ç¥£¥¹¥¯°Å¹æ²½¤òÍ­¸ú¤Ë¤·¤Æ¤¤¤¿¤é¡¢ @@ -1851,7 +1856,8 @@ Trying to mount root from cd9660:/dev/is - + @@ -1912,7 +1918,8 @@ Trying to mount root from cd9660:/dev/is ¤â¤·Êѹ¹¤¬É¬ÍפǤ¢¤ì¤Ð¡¢ [ Back ] ¤òÁªÂò¤·¤Æ¥Ñ¡¼¥Æ¥£¥·¥ç¥ó¥¨¥Ç¥£¥¿¤Þ¤ÇÌá¤Ã¤Æ¤¯¤À¤µ¤¤¡£ - [ Revert & Exit ] ¤òÁªÂò¤¹¤ë¤È¡¢ + [ Revert & Exit ] + ¤òÁªÂò¤¹¤ë¤È¡¢ ¥Ï¡¼¥É¥É¥é¥¤¥Ö¤Ø¤ÎÊѹ¹¤Ê¤·¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤ò½ªÎ»¤Ç¤­¤Þ¤¹¡£ ¥¤¥ó¥¹¥È¡¼¥ë¤Ë¤«¤«¤ë»þ´Ö¤Ï¡¢¤É¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤òÁª¤ó¤À¤«¡¢ @@ -2034,8 +2041,8 @@ Trying to mount root from cd9660:/dev/is ¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¤Ï Service Set Identifier (SSID) ¤Ë¤è¤Ã¤Æ¼±Ê̤µ¤ì¤Þ¤¹¡£ - SSID - ¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤ËÍ¿¤¨¤é¤ì¤ë¡¢Ã»¤¯¡¢°ì°ÕŪ¤Ê̾Á°¤Ç¤¹¡£ + SSID ¤Ï¡¢¤½¤ì¤¾¤ì¤Î¥Í¥Ã¥È¥ï¡¼¥¯¤ËÍ¿¤¨¤é¤ì¤ë¡¢ + û¤¯¡¢°ì°ÕŪ¤Ê̾Á°¤Ç¤¹¡£ ¤Û¤È¤ó¤É¤Î¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¤Ï¡¢ Á÷¿®¥Ç¡¼¥¿¤ò°Å¹æ²½¤·¤Æ¡¢¾ðÊó¤òÅðÄ°¤«¤éÊݸ¤Þ¤¹¡£ @@ -2079,10 +2086,10 @@ Trying to mount root from cd9660:/dev/is ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÁªÂò¸å¡¢¥ï¥¤¥ä¥ì¥¹¥Í¥Ã¥È¥ï¡¼¥¯¤ËÀܳ¤¹¤ë¤¿¤á¤Î°Å¹æ¾ðÊó¤òÆþÎϤ·¤Þ¤¹¡£ - WPA2 ¤Ç¤Ï¡¢ - ¥Ñ¥¹¥ï¡¼¥É (Pre-Shared Key ¤Þ¤¿¤Ï + WPA2 ¤Ç¤Ï¡¢¥Ñ¥¹¥ï¡¼¥É (Pre-Shared Key ¤Þ¤¿¤Ï PSK ¤È¤â¸Æ¤Ð¤ì¤Þ¤¹) ¤Î¤ß¤¬É¬ÍפǤ¹¡£ - ¥»¥­¥å¥ê¥Æ¥£¾å¤Î´ÑÅÀ¤«¤é¡¢ÆþÎϥܥ寥¹¤ËÆþÎϤ·¤¿Ê¸»ú¤Ï¥¢¥¹¥¿¥ê¥¹¥¯¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£ + ¥»¥­¥å¥ê¥Æ¥£¾å¤Î´ÑÅÀ¤«¤é¡¢ + ÆþÎϥܥ寥¹¤ËÆþÎϤ·¤¿Ê¸»ú¤Ï¥¢¥¹¥¿¥ê¥¹¥¯¤Çɽ¼¨¤µ¤ì¤Þ¤¹¡£
WPA2 ¤Î¥»¥Ã¥È¥¢¥Ã¥× @@ -2101,7 +2108,8 @@ Trying to mount root from cd9660:/dev/is IPv4 ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê - IPv4 ¥Í¥Ã¥È¥ï¡¼¥¯¤ò»È¤¦¤«¤É¤¦¤«¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ + IPv4 + ¥Í¥Ã¥È¥ï¡¼¥¯¤ò»È¤¦¤«¤É¤¦¤«¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ ¤³¤ì¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯Àܳ¤ÎºÇ¤â°ìÈÌŪ¤Ê¥¿¥¤¥×¤Ç¤¹¡£
@@ -2124,19 +2132,22 @@ Trying to mount root from cd9660:/dev/is ŬÅö¤Ê¥Í¥Ã¥È¥ï¡¼¥¯¾ðÊó¤òÆþÎϤ·¤Æ¤âÆ°¤«¤Ê¤¤¤Î¤Ç¡¢ - ¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¼Ô¤Þ¤¿¤Ï¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤«¤é + ¥Í¥Ã¥È¥ï¡¼¥¯´ÉÍý¼Ô¤Þ¤¿¤Ï¥µ¡¼¥Ó¥¹¥×¥í¥Ð¥¤¥À¤«¤é ¤Ë¼¨¤µ¤ì¤Æ¤¤¤ë¾ðÊó¤òÆþ¼ê¤·¤Æ¤¯¤À¤µ¤¤¡£ - <acronym>IPv4</acronym> <acronym>DHCP</acronym> ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê + <acronym>IPv4</acronym> <acronym>DHCP</acronym> + ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê DHCP ¥µ¡¼¥Ð¤òÍøÍѤǤ­¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢ [ Yes ] ¤òÁªÂò¤·¤Æ¡¢ ¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÀßÄê¤ò¼«Æ°Åª¤Ë¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
- <acronym>IPv4</acronym> <acronym>DHCP</acronym> ÀßÄê¤ÎÁªÂò + <acronym>IPv4</acronym> + <acronym>DHCP</acronym> ÀßÄê¤ÎÁªÂò @@ -2151,7 +2162,8 @@ Trying to mount root from cd9660:/dev/is ÀÅŪ¤Ê <acronym>IPv4</acronym> ¥Í¥Ã¥È¥ï¡¼¥¯¤ÎÀßÄê ÀÅŪ¤Ê¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ÎÀßÄê¤Ç¤Ï¡¢ - ¤¤¤¯¤Ä¤«¤Î IPv4 ¾ðÊó¤òÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + ¤¤¤¯¤Ä¤«¤Î IPv4 + ¾ðÊó¤òÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
<acronym>IPv4</acronym> Static ÀßÄê @@ -2167,7 +2179,8 @@ Trying to mount root from cd9660:/dev/is IP Address - - ¥³¥ó¥Ô¥å¡¼¥¿¤Ë¼êÆ°¤ÇÍ¿¤¨¤ë IPv4 ¥¢¥É¥ì¥¹¤Ç¤¹¡£ + ¥³¥ó¥Ô¥å¡¼¥¿¤Ë¼êÆ°¤ÇÍ¿¤¨¤ë IPv4 + ¥¢¥É¥ì¥¹¤Ç¤¹¡£ ¤³¤Î¥¢¥É¥ì¥¹¤Ï°ì°ÕŪ¤Ê¤â¤Î¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¡¢ ¥í¡¼¥«¥ë¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯µ¡´ï¤Ç»È¤ï¤ì¤Æ¤¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£ @@ -2216,12 +2229,13 @@ Trying to mount root from cd9660:/dev/is ÀßÄê¤Ç¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾ðÊó¤ò¼êÆ°¤ÇÆþÎϤ¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - <acronym>IPv6</acronym> Stateless Address Autoconfiguration + <acronym>IPv6</acronym> Stateless Address + Autoconfiguration SLAAC ¤Ç¤Ï¡¢IPv6 ¥Í¥Ã¥È¥ï¡¼¥¯¥³¥ó¥Ý¡¼¥Í¥ó¥È¤¬¥í¡¼¥«¥ë¥ë¡¼¥¿¤«¤é¼«Æ°ÀßÄê¤Ë´Ø¤¹¤ë¾ðÊó¤ò¥ê¥¯¥¨¥¹¥È¤Ç¤­¤ë¤è¤¦¤Ë¤·¤Þ¤¹¡£ ¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢http://tools.ietf.org/html/rfc4862 + xlink:href="http://tools.ietf.org/html/rfc4862">http://tools.ietf.org/html/rfc4862 ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
@@ -2636,8 +2650,9 @@ Trying to mount root from cd9660:/dev/is - Network - - ¤ÇÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ + Network - + ¤ÇÀâÌÀ¤·¤Æ¤¤¤Þ¤¹¡£ @@ -2721,18 +2736,19 @@ Trying to mount root from cd9660:/dev/is ¤ò¤â¤¦°ìÅÙ²¡¤¹¤È¡¢²èÌ̤Υí¥Ã¥¯¤ò³°¤·¡¢ Ä̾ï¤Î²èÌ̤ËÌá¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ - login: ¥×¥í¥ó¥×¥È¤Ç¡¢ - ¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÄɲä·¤¿¥æ¡¼¥¶Ì¾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ - ¤³¤ÎÎã¤Ç¤Ï¡¢asample ¤Ç¤¹¡£ - ɬÍפΤʤ¤¸Â¤ê¡¢root - ¤Ç¤Î¥í¥°¥¤¥ó¤òÈò¤±¤Æ¤¯¤À¤µ¤¤¡£ + login: ¥×¥í¥ó¥×¥È¤Ç¡¢ + ¥¤¥ó¥¹¥È¡¼¥ë»þ¤ËÄɲä·¤¿¥æ¡¼¥¶Ì¾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£ + ¤³¤ÎÎã¤Ç¤Ï¡¢asample ¤Ç¤¹¡£ + ɬÍפΤʤ¤¸Â¤ê¡¢root + ¤Ç¤Î¥í¥°¥¤¥ó¤òÈò¤±¤Æ¤¯¤À¤µ¤¤¡£ ¾å¤Ç¼¨¤·¤¿ scroll-back buffer ¤Ç¤Ï¡¢¥Ð¥Ã¥Õ¥¡¤ÎÍÆÎÌÀ©¸Â¤Ë¤è¤ê¡¢ ¤¹¤Ù¤Æ¤¬É½¼¨¤µ¤ì¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£ ¥í¥°¥¤¥ó¤Î¸å¤Ë¥×¥í¥ó¥×¥È¤«¤é¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç dmesg | less ¤ÈÆþÎϤ¹¤ë¤³¤È¤Ë¤è¤Ã¤Æ¡¢¤¹¤Ù¤Æ¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£ - ³Îǧ¸å¤Ë q ¤ò²¡¤¹¤È¡¢¥³¥Þ¥ó¥É¥é¥¤¥ó¤ËÌá¤ê¤Þ¤¹¡£ + ³Îǧ¸å¤Ë q ¤ò²¡¤¹¤È¡¢ + ¥³¥Þ¥ó¥É¥é¥¤¥ó¤ËÌá¤ê¤Þ¤¹¡£ ŵ·¿Åª¤Ê¥Ö¡¼¥È¥á¥Ã¥»¡¼¥¸ (¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Ï¾Êά¤·¤Æ¤¤¤Þ¤¹) @@ -2923,8 +2939,8 @@ login: ¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤é su ¤ÈÆþÎϤ·¡¢ root ¥Ñ¥¹¥ï¡¼¥É¤òÆþÎϤ·¤Æ root ¤È¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£ - ¤Þ¤¿¤Ï root ¤È¤·¤Æ¥í¥°¥¤¥ó¤·¡¢ - shutdown -p now + ¤Þ¤¿¤Ï root + ¤È¤·¤Æ¥í¥°¥¤¥ó¤·¡¢shutdown -p now ¤ò»ÈÍѤ·¤Þ¤¹¡£¥·¥¹¥Æ¥à¤ÏÀµ¤·¤¯¥·¥ã¥Ã¥È¥À¥¦¥ó¤·¡¢ÅŸ»¤¬Íî¤Á¤Þ¤¹¡£ @@ -2968,7 +2984,8 @@ login: ¥«¡¼¥Í¥ë¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Ê¤¤¥Ç¥Ð¥¤¥¹¤Ø¤Î¥µ¥Ý¡¼¥È¤òÄɲ䷤Ƥ¯¤À¤µ¤¤¡£ µ¯Æ°¥Ç¥£¥¹¥¯¤Î¥«¡¼¥Í¥ë¤Ç¤Ï¡¢¤Û¤È¤ó¤É¤Î¥Ï¡¼¥É¥¦¥§¥¢¥Ç¥Ð¥¤¥¹¤Î IRQ, I/O ¥¢¥É¥ì¥¹¡¢ - DMA ¥Á¥ã¥Í¥ë¤¬¹©¾ì½Ð²Ù»þ¤Î¾õÂ֤Ǥ¢¤ë¤ÈÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£ + DMA + ¥Á¥ã¥Í¥ë¤¬¹©¾ì½Ð²Ù»þ¤Î¾õÂ֤Ǥ¢¤ë¤ÈÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£ ¤â¤·¥Ï¡¼¥É¥¦¥§¥¢¤ÎÀßÄ꤬Êѹ¹¤µ¤ì¤Æ¤¤¤ë¤È¡¢ ¥«¡¼¥Í¥ë¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¡¢ ºÆ¥³¥ó¥Ñ¥¤¥ë¤ò¹Ô¤Ê¤Ã¤Æ¡¢¤³¤ì¤é¤ÎÃͤò @@ -3031,7 +3048,9 @@ login: Live <acronym>CD</acronym> ¤ò»È¤¦ - &os; ¤Î live CD ¤Ï¡¢¥á¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤ÈƱ¤¸ CD ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ + &os; ¤Î live CD ¤Ï¡¢ + ¥á¥¤¥ó¤Î¥¤¥ó¥¹¥È¡¼¥ë¥×¥í¥°¥é¥à¤ÈƱ¤¸ + CD ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£ ¥ª¥Ú¥ì¡¼¥Æ¥£¥ó¥°¥·¥¹¥Æ¥à¤Ë &os; ¤ò»È¤ª¤¦¤«¤É¤¦¤«¹Í¤¨¤Æ¤¤¤ëÊý¤ä¡¢ ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ëÁ°¤Ëµ¡Ç½¤ò»î¤·¤Æ¸«¤¿¤¤¤È»×¤Ã¤Æ¤¤¤ëÊý¤ËÍ­ÍѤǤ¹¡£ @@ -3051,7 +3070,8 @@ login: - live CD ¤Î¥æ¡¼¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È¤Ç¤¹¡£ + live CD + ¤Î¥æ¡¼¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È¤Ç¤¹¡£ ¥°¥é¥Õ¥£¥«¥ë¤Ê¥æ¡¼¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£ From owner-svn-doc-head@FreeBSD.ORG Tue Mar 17 19:04:06 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57A31FAF; Tue, 17 Mar 2015 19:04:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 412F6A9B; Tue, 17 Mar 2015 19:04:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2HJ46ou053724; Tue, 17 Mar 2015 19:04:06 GMT (envelope-from bhd@FreeBSD.org) Received: (from bhd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2HJ46Ck053723; Tue, 17 Mar 2015 19:04:06 GMT (envelope-from bhd@FreeBSD.org) Message-Id: <201503171904.t2HJ46Ck053723@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org using -f From: Bjoern Heidotting Date: Tue, 17 Mar 2015 19:04:06 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46350 - head/de_DE.ISO8859-1/books/handbook/disks X-SVN-Group: doc-head 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.18-1 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: Tue, 17 Mar 2015 19:04:06 -0000 Author: bhd Date: Tue Mar 17 19:04:05 2015 New Revision: 46350 URL: https://svnweb.freebsd.org/changeset/doc/46350 Log: Update to r38762: - Fix URLs for the livefs ISO image. - Add a note that the livefs ISOs are not available for 9.0-RELEASE and later, and that the standard install CDROM as well as the memstick image may be used to recover a system. Approved by: bcr (mentor) Modified: head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Modified: head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Tue Mar 17 14:08:57 2015 (r46349) +++ head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Tue Mar 17 19:04:05 2015 (r46350) @@ -5,7 +5,7 @@ $FreeBSD$ $FreeBSDde: de-docproj/books/handbook/disks/chapter.xml,v 1.187 2012/04/26 19:32:48 bcr Exp $ - basiert auf: r38003 + basiert auf: r38762 --> Speichermedien @@ -2949,17 +2949,30 @@ cd0: Attempt to query device size failed Live-CD - Zweitens brennen Sie eine livefs-CD. Diese - CD-ROM enthält alle nötigen Programme, um in einen + Zweitens, brennen Sie eine livefs-CD. + Diese CD-ROM enthält alle nötigen Programme, um in einen Reperaturmodus zu starten, aus dem heraus Sie unter anderem - &man.dump.8;, &man.restore.8;, &man.fdisk.8;, &man.bsdlabel.8;, - &man.newfs.8; sowie &man.mount.8; starten können. - ISO-Abbilder für das livefs-System finden - Sie unter ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-livefs.iso. - - Drittens, machen Sie oft Backups auf Band. Jede Änderung - seit Ihrem letzten Backup kann unwiederbringlich verloren gehen. - Versehen Sie die Backup-Bänder mit Schreibschutz. + &man.dump.8;, &man.restore.8;, &man.fdisk.8;, + &man.bsdlabel.8;, &man.newfs.8; sowie &man.mount.8; starten + können. ISO-Abbilder für das livefs-System + finden Sie unter ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-livefs.iso. + + + Seit &os; 9.0-RELEASE sind ISO-Abbilder + für das livefs-System nicht mehr verfügbar. + Neben den ISO-Abbildern für CD-ROM können auch Abbilder + für USB-Datenspeicher verwendet werden, um ein System + wiederherzustellen. Das memstick-Abbild + für &os;/&arch.i386; &rel.current;-RELEASE finden Sie + unter ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img. + + + Drittens, machen Sie regelmäßig Backups auf Band. + Jede Änderung seit Ihrem letzten Backup kann + unwiederbringlich verloren gehen. Versehen Sie die + Backup-Bänder mit Schreibschutz. Viertens, testen Sie das in Schritt 2 erstellte livefs-System sowie die für das Backup From owner-svn-doc-head@FreeBSD.ORG Tue Mar 17 20:10:30 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3C8191F8; Tue, 17 Mar 2015 20:10:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 26F5E2DF; Tue, 17 Mar 2015 20:10:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2HKATi6086275; Tue, 17 Mar 2015 20:10:29 GMT (envelope-from bhd@FreeBSD.org) Received: (from bhd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2HKATZq086274; Tue, 17 Mar 2015 20:10:29 GMT (envelope-from bhd@FreeBSD.org) Message-Id: <201503172010.t2HKATZq086274@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org using -f From: Bjoern Heidotting Date: Tue, 17 Mar 2015 20:10:29 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46351 - head/de_DE.ISO8859-1/books/handbook/disks X-SVN-Group: doc-head 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.18-1 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: Tue, 17 Mar 2015 20:10:30 -0000 Author: bhd Date: Tue Mar 17 20:10:28 2015 New Revision: 46351 URL: https://svnweb.freebsd.org/changeset/doc/46351 Log: Update to r38941: Make the dump-over-ssh example not depend on root's shell being a Bourne derivative (particularly poignant given that root's default shell is csh!). Approved by: bcr (mentor) Modified: head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Modified: head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Tue Mar 17 19:04:05 2015 (r46350) +++ head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Tue Mar 17 20:10:28 2015 (r46351) @@ -5,7 +5,7 @@ $FreeBSD$ $FreeBSDde: de-docproj/books/handbook/disks/chapter.xml,v 1.187 2012/04/26 19:32:48 bcr Exp $ - basiert auf: r38762 + basiert auf: r38941 --> Speichermedien @@ -2730,7 +2730,7 @@ cd0: Attempt to query device size failed <command>dump</command> über <application>ssh</application> mit gesetzter <envar>RSH</envar> benutzen - &prompt.root; RSH=/usr/bin/ssh /sbin/dump -0uan -f tatargetuser@targetmachine.example.com:/dev/sa0 /usr + &prompt.root; env RSH=/usr/bin/ssh /sbin/dump -0uan -f tatargetuser@targetmachine.example.com:/dev/sa0 /usr From owner-svn-doc-head@FreeBSD.ORG Wed Mar 18 20:07:19 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 18870268; Wed, 18 Mar 2015 20:07:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DBEDF238; Wed, 18 Mar 2015 20:07:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2IK7Ins061663; Wed, 18 Mar 2015 20:07:18 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2IK7I0k061662; Wed, 18 Mar 2015 20:07:18 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201503182007.t2IK7I0k061662@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Wed, 18 Mar 2015 20:07:18 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46352 - head/en_US.ISO8859-1/books/handbook/x11 X-SVN-Group: doc-head 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.18-1 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, 18 Mar 2015 20:07:19 -0000 Author: allanjude Date: Wed Mar 18 20:07:17 2015 New Revision: 46352 URL: https://svnweb.freebsd.org/changeset/doc/46352 Log: Fix a changed path to x11-fonts/urwfonts in the X11 chapter of the handbook PR: 196996 Differential Revision: https://reviews.freebsd.org/D2091 Submitted by: Luca Ferraresi Approved by: bcr (mentor) Sponsored by: ScaleEngine Inc. Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/x11/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/x11/chapter.xml Tue Mar 17 20:10:28 2015 (r46351) +++ head/en_US.ISO8859-1/books/handbook/x11/chapter.xml Wed Mar 18 20:07:17 2015 (r46352) @@ -585,12 +585,12 @@ dbus_enable="YES" to the X server configuration file (/etc/X11/xorg.conf), which reads: - FontPath "/usr/local/lib/X11/fonts/URW/" + FontPath "/usr/local/lib/X11/fonts/urwfonts/" Alternatively, at the command line in the X session run: - &prompt.user; xset fp+ /usr/local/lib/X11/fonts/URW + &prompt.user; xset fp+ /usr/local/lib/X11/fonts/urwfonts &prompt.user; xset fp rehash This will work but will be lost when the X session is @@ -653,8 +653,8 @@ dbus_enable="YES" or add a FontPath line to xorg.conf. - That's it. Now Gimp, - Apache OpenOffice, and all of the + Now Gimp, + OpenOffice, and all of the other X applications should now recognize the installed &truetype; fonts. Extremely small fonts (as with text in a high resolution display on a web page) and extremely large @@ -1301,9 +1301,9 @@ DisplayManager.requestPort: 0&prompt.user; setxkbmap -model pc102 -layout fr - The + /usr/local/share/X11/xkb/rules/base.lst - file lists the various keyboard, layouts and options + lists the various keyboard, layouts and options available. From owner-svn-doc-head@FreeBSD.ORG Wed Mar 18 20:52:47 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A56A016E; Wed, 18 Mar 2015 20:52:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 8DD879D2; Wed, 18 Mar 2015 20:52:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2IKqlZW084835; Wed, 18 Mar 2015 20:52:47 GMT (envelope-from bhd@FreeBSD.org) Received: (from bhd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2IKqlSB084834; Wed, 18 Mar 2015 20:52:47 GMT (envelope-from bhd@FreeBSD.org) Message-Id: <201503182052.t2IKqlSB084834@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bhd set sender to bhd@FreeBSD.org using -f From: Bjoern Heidotting Date: Wed, 18 Mar 2015 20:52:47 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46353 - head/de_DE.ISO8859-1/books/handbook/disks X-SVN-Group: doc-head 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.18-1 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, 18 Mar 2015 20:52:47 -0000 Author: bhd Date: Wed Mar 18 20:52:46 2015 New Revision: 46353 URL: https://svnweb.freebsd.org/changeset/doc/46353 Log: Update to r40676: Update the Using Tapes section to more closely reflect modern reality. Approved by: bcr (mentor) Modified: head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Modified: head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml ============================================================================== --- head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Wed Mar 18 20:07:17 2015 (r46352) +++ head/de_DE.ISO8859-1/books/handbook/disks/chapter.xml Wed Mar 18 20:52:46 2015 (r46353) @@ -5,7 +5,7 @@ $FreeBSD$ $FreeBSDde: de-docproj/books/handbook/disks/chapter.xml,v 1.187 2012/04/26 19:32:48 bcr Exp $ - basiert auf: r38941 + basiert auf: r40676 --> Speichermedien @@ -2158,259 +2158,103 @@ cd0: Attempt to query device size failed Bandmedien benutzen Bandmedien - Die wichtigsten Bandmedien sind 4mm, 8mm, QIC, - Mini-Cartridge und DLT. - - 4mm (DDS: Digital Data Storage) + Bandmedien haben sich mit der Zeit weiterentwickelt, werden + jedoch in heutigen Systemen immer weniger verwendet. Moderne + Backup-Systeme verwenden + Offsite-Backups in Verbindung mit + lokalen Wechseldatenträgern. Weiterhin unterstützt &os; + SCSI-Bandlaufwerke, wie etwa LTO und die älteren DAT-Laufwerke. + Zusätzlich gibt es begrenzte Unterstützung für SATA- und + USB-Bandlaufwerke. + + + Serieller Zugriff mit &man.sa.4; + + + Bandlaufwerke + + + &os; nutzt den &man.sa.4; Treiber, der die Schnittstellen + /dev/sa0, + /dev/nsa0 und + /dev/esa0 bereitstellt. Im üblichen + Gebrauch wird jedoch meist nur + /dev/sa0 benötigt. + /dev/nsa0 bezeichnet das selbe + pysikalische Laufwerk wie /dev/sa0, + aber nach dem Schreiben einer Datei wird das Band nicht + zurückgespult, was es erlaubt, mehr als eine Datei auf ein + Band zu schreiben. Die Verwendung von + /dev/esa0 wirft das Band aus, + nachdem das Gerät geschlossen wurde. + + + + Steuerung des Bandlaufwerks mit &man.mt.1; Bandmedien - DDS (4mm) Bänder - - - Bandmedien - QIC Bänder + mt - Die 4mm-Bänder ersetzen mehr und mehr das QIC-Format als - Backupmedium der Wahl für Workstations. Dieser Trend nahm stark - zu, als Conner die Firma Archive, einen führenden Hersteller von - QIC-Laufwerken, aufkaufte und die Produktion von QIC-Laufwerken - stoppte. 4mm-Laufwerke sind klein und ruhig, haben aber nicht den - gleichen Ruf der Zuverlässigkeit, den die 8mm-Laufwerke - genießen. Die 4mm-Kassetten sind preiswerter und mit den - Maßen 76,2 x 50,8 x 12,7 mm - (3 x 2 x 0,5 Inch) kleiner als die - 8mm-Kassetten. Sowohl die 4mm- als auch die 8mm-Magnetköpfe - haben eine relativ kurze Lebensdauer, weil beide die gleiche - Helical-Scan-Technik benutzen. - - Der Datendurchsatz dieser Laufwerke beginnt bei etwa - 150 kByte/s, Spitzenwerte liegen bei etwa 500 kByte/s. - Die Datenkapazität liegt zwischen 1,3 GB und 2 GB. - Die meisten Geräte haben eine Hardwarekompression eingebaut, - die die Kapazität ungefähr verdoppelt. Es gibt - Multi-Drive-Einheiten für Bandbibliotheken mit bis zu 6 - Laufwerken in einem Gehäuse und automatischem Bandwechsel. Die - Kapazität einer solchen Bibliothek liegt bei 240 GB. - - Der Standard DDS-3 unterstützt nun Bandkapazitäten bis - zu 12 GB (oder komprimiert 24 GB). - - 4mm-Laufwerke, ebenso wie 8mm-Laufwerke, verwenden Helical-Scan. - Alle Vor- und Nachteile von Helical-Scan gelten sowohl für 4mm- - als auch für 8mm-Laufwerke. + &man.mt.1; ist das &os; Dienstprogramm für die Steuerung + weiterer Optionen des Bandlaufwerks, wie zum Beispiel die + Suche nach Dateien auf dem Band, oder um Kontrollmarkierungen + auf das Band zu schreiben. - Bänder sollten nach 2.000 Banddurchläufen oder 100 - vollen Backups ersetzt werden. - + Beispielsweise können die ersten drei Dateien auf einem + Band erhalten bleiben, indem diese übersprungen werden, + bevor eine neue Datei geschrieben wird: - - 8mm (Exabyte) - - Bandmedien - Exabyte (8mm) Bänder - - - 8mm-Bänder sind die verbreitetsten SCSI-Bandlaufwerke; sie - sind das geeignetste Bandformat zum Austausch von Bändern. - Fast an jedem Standort gibt es ein 8mm-Bandlaufwerk mit 2 GB. - 8mm-Bänder sind zuverlässig, gut zu handhaben und - arbeiten leise. Bandkassetten sind preiswert und klein mit - 122 x 84 x 15 mm - (4,8 x 3,3 x 0,6 Inch). Ein Nachteil - der 8mm-Technik ist die relativ kurze Lebensdauer des - Schreib-/Lesekopfs und der Bänder auf Grund der hohen - Relativgeschwindigkeit des Bandes über die Köpfe - hinweg. - - Der Datendurchsatz liegt ungefähr zwischen - 250 kByte/s und 500 kByte/s. Die Datenkapazität - beginnt bei 300 MB und erreicht bis zu 7 GB bei den - Spitzengeräten. Die meisten Geräte - haben eine Hardwarekompression eingebaut, die die Kapazität - ungefähr verdoppelt. Diese Laufwerke sind erhältlich in - Form von Einzelgeräten oder als Multi-Drive-Bandbibliotheken mit - 6 Laufwerken und 120 Bändern in einem Gehäuse. Die - Bänder werden von der Geräteeinheit automatisch gewechselt. - Die Kapazität einer solchen Bibliothek liegt bei 840 GB und - mehr. - - Das Exabyte-Modell Mammoth unterstützt - 12 GB auf einem Band (24 GB mit Kompression) und kostet - etwa doppelt so viel wie ein konventionelles Bandlaufwerk. - - Die Daten werden mittels Helical-Scan auf das Band - aufgezeichnet, die Köpfe sind leicht schräg zum Medium - angebracht (mit einem Winkel von etwa 6 Grad). Das Band wickelt - sich 270 Grad um die Spule, die die Köpfe trägt. - Die Spule dreht sich, während das Band darüber läuft. - Das Resultat ist eine hohe Datendichte und eng gepackte Spuren, - die von einem Rand des Bands zum gegenüberliegenden quer - über das Band abgewinkelt verlaufen. + &prompt.root; mt -f /dev/nsa0 fsf 3 - - QIC - - - Bandmedien - QIC-150 - + + Benutzung von &man.tar.1; zum Lesen + und Schreiben von Bandsicherungen - QIC-150-Bänder und -Laufwerke sind wohl der am weitesten - verbreitete Bandtyp überhaupt. QIC-Bandlaufwerke sind die - preiswertesten seriösen Backupgeräte, - die angeboten werden. Der Nachteil dabei ist der hohe Preis - der Bänder. QIC-Bänder sind im Vergleich zu 8mm- oder - 4mm-Bändern bis zu fünf Mal teurer, wenn man den Preis - auf 1 GB Datenkapazität umrechnet. Aber wenn Ihr Bedarf - mit einem halben Dutzend Bänder abgedeckt werden kann, - mag QIC die richtige Wahl sein. - - QIC ist der gängigste - Bandlaufwerkstyp. Jeder Standort hat ein QIC-Laufwerk der einen oder - anderen Dichte. Aber gerade das ist der Haken an der Sache, QIC - bietet eine große Anzahl verschiedener Datendichten auf - physikalisch ähnlichen (manchmal gleichen) Bändern. - QIC-Laufwerke sind nicht leise. Diese Laufwerke suchen lautstark die - richtige Bandstelle, bevor sie mit der Datenaufzeichnung beginnen. - Sie sind während des Lesens, Schreibens und Suchens deutlich - hörbar. - - Die Abmessungen der QIC-Kassetten betragen - 152 x 102 x 17 mm - (6 x 4 x 0,7 Inch). - - Der Datendurchsatz liegt ungefähr zwischen - 150 kByte/s und 500 kByte/s. Die Datenkapazität - reicht von 40 MB bis zu 15 GB. - Hardwarekompression ist in vielen der neueren QIC-Laufwerke eingebaut. - QIC-Laufwerke werden heute seltener eingesetzt; sie werden von den - DAT-Laufwerken abgelöst. - - Die Daten werden auf dem Band in Spuren aufgezeichnet. Die - Spuren verlaufen entlang der Längsachse des Bandmediums von einem - Ende zum anderen. Die Anzahl der Spuren, und damit auch die Breite - einer Spur, variiert mit der Kapazität des Laufwerks. Die - meisten, wenn nicht alle neueren Laufwerke sind - rückwärtskompatibel, zumindest zum Lesen (aber oft auch zum - Schreiben). QIC hat einen guten Ruf bezüglich der - Datensicherheit (die Mechanik ist einfacher und robuster als diejenige - der Helical-Scan-Laufwerke). + Hier ein Beispiel, wie eine einzelne Datei mittels + &man.tar.1; auf ein Band geschrieben wird: - Bänder sollten nach 5,000 Backups ersetzt werden. - + &prompt.root; tar cvf /dev/sa0 file - - DLT - - Bandmedien - DLT - + Wiederherstellung von Dateien aus dem &man.tar.1;-Archiv + von Band in das aktuelle Verzeichnis: - DLT hat die schnellste Datentransferrate von allen hier - aufgelisteten Gerätetypen. Das 1/2-Inch-Band (12,7 mm) - befindet sich in einer Spulkassette mit den Abmessungen - 101,6 x 101,6 x 25,4 mm - (4 x 4 x 1 Inch). Die eine Seite - der Kassette hat eine bewegliche Abdeckung. Der Laufwerksmechanismus - öffnet diese Abdeckung und zieht die Bandführung heraus. - Die Bandführung trägt ein ovales Loch, die das Laufwerk - zum Einhängen des Bandes benutzt. Die - Aufwickelspule befindet sich im Innern des Bandlaufwerks. Bei allen - anderen hier besprochenen Bandkassetten (9-Spur-Bänder - sind die einzige Ausnahme) befinden sich sowohl die Auf- als auch - die Abwickelspule im Inneren der Bandkassette. - - Der Datendurchsatz liegt bei etwa 1,5 MBytes/s, der dreifache - Durchsatz der 4mm-, 8mm- oder QIC-Bandlaufwerke. Die - Datenkapazität reicht von 10 GB bis 20 GB für - Einfachlaufwerke. Auch Mehrfachbandgeräte sind erhältlich, - sowohl als Bandwechsler wie auch als Multi-Drive-Bandbibliotheken, die - Platz für 5 bis 900 Bänder verteilt auf 1 bis 20 Laufwerke - enthalten, mit einer Speicherkapazität von 50 GB bis - 9 TB. - - Mit Kompression unterstützt das Format DLT Type IV bis zu - 70 GB Kapazität. - - Die Daten werden auf dem Band in Spuren aufgezeichnet, die - parallel zur Bewegungsrichtung verlaufen (gerade so wie bei den - QIC-Bändern). Zwei Spuren werden dabei gleichzeitig beschrieben. - Die Lebenszeit der Lese- und Schreibköpfe sind relativ lang; denn - sobald das Band anhält, gibt es keine Relativbewegung mehr - zwischen den Köpfen und dem Band. + &prompt.root; tar xvf /dev/sa0 - AIT - - Bandmedien - AIT - + Die Benutzung von &man.dump.8; + und &man.restore.8; zum Erstellen und Wiederherstellen von + Sicherungen. - AIT ist ein neues Format von Sony, das (mit Kompression) bis zu - 50 GB pro Band speichern kann. Die Bänder haben einen - Speicherchip, der einen Index mit dem Inhalt des Bandes anlegt. - Dieser Index kann vom Bandlaufwerk zur schnellen Bestimmung der Lage - von Dateien auf dem Band benutzt werden, während andere - Bänder einige Minuten zur Lokalisierung benötigen. - - Entsprechende Software wie etwa - SAMS:Alexandria können 40 - oder mehr AIT-Bandbibliotheken verarbeiten, indem sie - direkt mit dem Speicherchip des Bandes kommunizieren, wenn der - Bandinhalt am Bildschirm dargestellt werden soll oder bestimmt werden - soll, welche Dateien auf welchem Band gespeichert sind, oder um das - richtige Band zu lokalisieren, zu laden und Daten vom Band - zurückzuspielen. Bibliotheken dieser Art liegen in der - Preiskategorie von $20,000, womit sie etwas aus dem Hobbymarkt - herausfallen. - + Ein einfache Sicherung von + /usr mit + &man.dump.8;: - - Die erste Benutzung eines neuen Bands - - Der Versuch ein neues, vollkommen leeres Band ohne weiteres zu - lesen oder zu beschreiben wird schief gehen. Auf der Konsole werden - dann Meldungen ähnlich wie folgt ausgegeben: - - sa0(ncr1:4:0): NOT READY asc:4,1 -0(ncr1:4:0): Logical unit is in process of becoming ready - - Das Band enthält nämlich keinen Identifier-Block - (Blocknummer 0). Alle QIC-Bandlaufwerke seit der Einführung des - QIC-525-Standards schreiben einen Identifier-Block auf das Band. Es - gibt zwei Lösungen: + &prompt.root; dump -0aL -b64 -f /dev/nsa0 /usr - - - mt fsf 1 veranlasst das Bandlaufwerk - einen Identifier-Block auf das Band zu schreiben. - - - - Das Band durch Drücken des Bandauswurfknopfs an der - Vorderseite des Bandgeräts auswerfen. + Interaktive Wiederherstellung von Dateien aus einer + &man.dump.8;-Datei von Band in das aktuelle + Verzeichnis: - Danach das Band wieder einlegen und mit - dump Daten auf das Band - übertragen. - - Das Kommando dump gibt die Meldung - DUMP: End of tape detected zurück - und die Konsole zeigt: - HARDWARE FAILURE info:280 asc:80,96. + &prompt.root; restore -i -f /dev/nsa0 + - Das Band zurückspulen mit dem Kommando: - mt rewind. + + Weitere Software zur + Bandsicherung - Nachfolgende Bandoperationen werden dann erfolgreich - ausgeführt. - - + Es stehen weitere Programme zur Vereinfachung von + Bandsicherungen zur Verfügung. Zu den bekanntesten gehören + AMANDA und + Bacula. Diese Programme zielen + darauf ab, Sicherungen einfacher und bequemer zu machen, oder + um komplexe Sicherungen mehrerer Maschinen zu automatisieren. + Die Ports-Sammlung enthält sowohl diese, als auch weitere + Programme für die Bandsicherung. From owner-svn-doc-head@FreeBSD.ORG Wed Mar 18 22:36:23 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B6682EB; Wed, 18 Mar 2015 22:36:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 450057C5; Wed, 18 Mar 2015 22:36:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2IMaNrQ033155; Wed, 18 Mar 2015 22:36:23 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2IMaNR1033154; Wed, 18 Mar 2015 22:36:23 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201503182236.t2IMaNR1033154@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Wed, 18 Mar 2015 22:36:23 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46354 - head/en_US.ISO8859-1/books/porters-handbook/makefiles X-SVN-Group: doc-head 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.18-1 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, 18 Mar 2015 22:36:23 -0000 Author: brd Date: Wed Mar 18 22:36:22 2015 New Revision: 46354 URL: https://svnweb.freebsd.org/changeset/doc/46354 Log: Clean up all the formatting in blocks for The Porters Handbook Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Wed Mar 18 20:52:46 2015 (r46353) +++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml Wed Mar 18 22:36:22 2015 (r46354) @@ -261,7 +261,7 @@ collection: PORTNAME= gtkmumble - PORTVERSION= 0.10 +PORTVERSION= 0.10 PKGNAME becomes gtkmumble-0.10. @@ -271,8 +271,8 @@ accordingly. PORTNAME= gtkmumble - PORTVERSION= 0.10 - PORTREVISION= 1 +PORTVERSION= 0.10 +PORTREVISION= 1 PKGNAME becomes gtkmumble-0.10_1 @@ -291,8 +291,8 @@ removed from the Makefile). PORTNAME= gtkmumble - PORTVERSION= 0.2 - PORTEPOCH= 1 +PORTVERSION= 0.2 +PORTEPOCH= 1 PKGNAME becomes gtkmumble-0.2,1 @@ -302,8 +302,8 @@ variables are now: PORTNAME= gtkmumble - PORTVERSION= 0.3 - PORTEPOCH= 1 +PORTVERSION= 0.3 +PORTEPOCH= 1 PKGNAME becomes gtkmumble-0.3,1 @@ -1657,7 +1657,7 @@ really is no reason to do so: MASTER_SITES= ${MASTER_SITE_GNU} - MASTER_SITE_SUBDIR= make +MASTER_SITE_SUBDIR= make These values and variables are defined in /usr/ports/Mk/bsd.sites.mk. There are @@ -1679,7 +1679,7 @@ This can also be written as MASTER_SITES= SF - MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${PORTVERSION} +MASTER_SITE_SUBDIR= stardict/WyabdcRealPeopleTTS/${PORTVERSION} Popular Magic <varname>MASTER_SITES</varname> @@ -1860,11 +1860,11 @@ this (slightly stripped for the example):</para> <programlisting>PORTNAME= pkg - PORTVERSION= 1.2.7 +PORTVERSION= 1.2.7 - USE_GITHUB= yes - GH_ACCOUNT= freebsd - GH_COMMIT= f53e577</programlisting> +USE_GITHUB= yes +GH_ACCOUNT= freebsd +GH_COMMIT= f53e577</programlisting> <para>It will automatically have <varname>MASTER_SITES</varname> set to <literal>GH @@ -1884,13 +1884,13 @@ this (slightly stripped for the example):</para> <programlisting>PORTNAME= pkg-devel - PORTVERSION= 1.3.0.a.20140411 +PORTVERSION= 1.3.0.a.20140411 - USE_GITHUB= yes - GH_ACCOUNT= freebsd - GH_PROJECT= pkg - GH_TAGNAME= ${GH_COMMIT} - GH_COMMIT= 6dbb17b</programlisting> +USE_GITHUB= yes +GH_ACCOUNT= freebsd +GH_PROJECT= pkg +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 6dbb17b</programlisting> <para>It will automatically have <varname>MASTER_SITES</varname> set to <literal>GH @@ -1913,7 +1913,7 @@ <filename>foo.tar.gz</filename>, write:</para> <programlisting>DISTNAME= foo - EXTRACT_SUFX= .tar.gzip</programlisting> +EXTRACT_SUFX= .tar.gzip</programlisting> <para>The <literal>USES=tar[:<replaceable>xxx</replaceable>]</literal>, @@ -1960,7 +1960,7 @@ <varname>EXTRACT_ONLY</varname>.</para> <programlisting>DISTFILES= source.tar.gz manual.html - EXTRACT_ONLY= source.tar.gz</programlisting> +EXTRACT_ONLY= source.tar.gz</programlisting> <para>When none of the <varname>DISTFILES</varname> need to be uncompressed, set <varname>EXTRACT_ONLY</varname> to the empty @@ -2123,10 +2123,10 @@ <title>Simplified Use of <literal>MASTER_SITES:n</literal> with One File Per Site - MASTER_SITES= ftp://ftp.example1.com/:source1 \ - ftp://ftp.example2.com/:source2 - DISTFILES= source1.tar.gz:source1 \ - source2.tar.gz:source2 + MASTER_SITES= ftp://ftp1.example.com/:source1 \ + http://www.example.com/:source2 +DISTFILES= source1.tar.gz:source1 \ + source2.tar.gz:source2Multiple distribution files can have the same tag. @@ -2144,11 +2144,11 @@ Simplified Use of <literal>MASTER_SITES:n</literal> with More Than One File Per Site - MASTER_SITES= ftp://ftp.example1.com/:source1 \ - ftp://ftp.example2.com/:source2 - DISTFILES= source1.tar.gz:source1 \ - source2.tar.gz:source2 \ - source3.tar.gz:source2 + MASTER_SITES= ftp://ftp.example.com/:source1 \ + http://www.example.com/:source2 +DISTFILES= source1.tar.gz:source1 \ + source2.tar.gz:source2 \ + source3.tar.gz:source2 @@ -2325,17 +2325,17 @@ Multiple Subdirectories MASTER_SITES= http://site1/%SUBDIR%/ http://site2/:DEFAULT \ - http://site3/:group3 http://site4/:group4 \ - http://site5/:group5 http://site6/:group6 \ - http://site7/:DEFAULT,group6 \ - http://site8/%SUBDIR%/:group6,group7 \ - http://site9/:group8 - DISTFILES= file1 file2:DEFAULT file3:group3 \ - file4:group4,group5,group6 file5:grouping \ - file6:group7 - MASTER_SITE_SUBDIR= directory-trial:1 directory-n/:groupn \ - directory-one/:group6,DEFAULT \ - directory + http://site3/:group3 http://site4/:group4 \ + http://site5/:group5 http://site6/:group6 \ + http://site7/:DEFAULT,group6 \ + http://site8/%SUBDIR%/:group6,group7 \ + http://site9/:group8 +DISTFILES= file1 file2:DEFAULT file3:group3 \ + file4:group4,group5,group6 file5:grouping \ + file6:group7 +MASTER_SITE_SUBDIR= directory-trial:1 directory-n/:groupn \ + directory-one/:group6,DEFAULT \ + directory The previous example results in this fine grained fetching. Sites are listed in the @@ -2522,7 +2522,7 @@ MASTER_SITE_SOURCEFORGE MASTER_SITES= http://site1/ ${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge,TEST/} - DISTFILES= something.tar.gz:sourceforge +DISTFILES= something.tar.gz:sourceforge something.tar.gz will be @@ -2549,7 +2549,7 @@ PATCH_SITES PATCH_SITES= http://site1/ http://site2/:test - PATCHFILES= patch1:test +PATCHFILES= patch1:test @@ -2727,9 +2727,9 @@ ALWAYS_KEEP_DISTFILES .if defined(PACKAGE_BUILDING) - DISTFILES+= foo.tar.gz - ALWAYS_KEEP_DISTFILES= yes - .endif +DISTFILES+= foo.tar.gz +ALWAYS_KEEP_DISTFILES= yes +.endif When adding extra files to DISTFILES, @@ -2992,7 +2992,7 @@ For example, RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \ - xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr +xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr will check if the file or directory /usr/local/news/bin/innd exists, and @@ -3362,9 +3362,9 @@ Correct Declaration of an Optional Dependency OPTIONS_DEFINE= BAR - BAR_DESC= Calling cellphones via bar +BAR_DESC= Calling cellphones via bar - BAR_LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar +BAR_LIB_DEPENDS= libbar.so:${PORTSDIR}/foo/bar Testing option variables is the correct method. It will @@ -3432,18 +3432,18 @@ of japanese/xdvi300/Makefile; PORTNAME= xdvi - PORTVERSION= 17 - PKGNAMEPREFIX= ja- - PKGNAMESUFFIX= ${RESOLUTION} - : - # default - RESOLUTION?= 300 - .if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \ - ${RESOLUTION} != 300 && ${RESOLUTION} != 400 - @${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" - @${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400." - @${FALSE} - .endif +PORTVERSION= 17 +PKGNAMEPREFIX= ja- +PKGNAMESUFFIX= ${RESOLUTION} + +# default +RESOLUTION?= 300 +.if ${RESOLUTION} != 118 && ${RESOLUTION} != 240 && \ +${RESOLUTION} != 300 && ${RESOLUTION} != 400 +@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" +@${ECHO_MSG} "Possible values are: 118, 240, 300 (default) and 400." +@${FALSE} +.endif japanese/xdvi300 also has all the regular patches, package files, etc. Running @@ -3455,9 +3455,9 @@ xdvi118/Makefile: RESOLUTION= 118 - MASTERDIR= ${.CURDIR}/../xdvi300 +MASTERDIR= ${.CURDIR}/../xdvi300 - .include "${MASTERDIR}/Makefile" +.include "${MASTERDIR}/Makefile" (xdvi240/Makefile and xdvi400/Makefile are similar). @@ -3572,11 +3572,11 @@ described (optional, but strongly recommended): OPT1_DESC= Describe OPT1 - OPT2_DESC= Describe OPT2 - OPT3_DESC= Describe OPT3 - OPT4_DESC= Describe OPT4 - OPT5_DESC= Describe OPT5 - OPT6_DESC= Describe OPT6 +OPT2_DESC= Describe OPT2 +OPT3_DESC= Describe OPT3 +OPT4_DESC= Describe OPT4 +OPT5_DESC= Describe OPT5 +OPT6_DESC= Describe OPT6 ports/Mk/bsd.options.desc.mk has descriptions for many common OPTIONS. @@ -3607,7 +3607,7 @@ allowed: OPTIONS_SINGLE= SG1 - OPTIONS_SINGLE_SG1= OPT3 OPT4 +OPTIONS_SINGLE_SG1= OPT3 OPT4 There must be one of each @@ -4382,7 +4382,7 @@ CFLAGS+= -DTEST For example: OPTIONS_DEFINE= OPT1 -OPT1_USES_OFF=gmake +OPT1_USES_OFF= gmake is equivalent to: @@ -4638,16 +4638,16 @@ PORTVERSION= 1.0 target. post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) This example will install the contents of the examples directory in the vendor distfile to the proper examples location of the port. post-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/summer - (cd ${WRKSRC}/temperatures && ${COPYTREE_SHARE} "June July August" ${STAGEDIR}${DATADIR}/summer) + ${MKDIR} ${STAGEDIR}${DATADIR}/summer + (cd ${WRKSRC}/temperatures && ${COPYTREE_SHARE} "June July August" ${STAGEDIR}${DATADIR}/summer) And this example will install the data of summer months to the summer subdirectory of a @@ -4660,7 +4660,7 @@ PORTVERSION= 1.0 these commands. post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile") @@ -4698,8 +4698,8 @@ PORTVERSION= 1.0 enough to cause significant I/O overhead. post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/docs/xvdocs.ps ${STAGEDIR}${DOCSDIR} Here are some handy variables and how they are expanded by default when used in the Makefile: From owner-svn-doc-head@FreeBSD.ORG Wed Mar 18 23:21:07 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFB61B2E; Wed, 18 Mar 2015 23:21:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 CA489CCD; Wed, 18 Mar 2015 23:21:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2INL7n9054886; Wed, 18 Mar 2015 23:21:07 GMT (envelope-from allanjude@FreeBSD.org) Received: (from allanjude@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2INL7NL054885; Wed, 18 Mar 2015 23:21:07 GMT (envelope-from allanjude@FreeBSD.org) Message-Id: <201503182321.t2INL7NL054885@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: allanjude set sender to allanjude@FreeBSD.org using -f From: Allan Jude Date: Wed, 18 Mar 2015 23:21:07 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46355 - head/en_US.ISO8859-1/books/handbook/zfs X-SVN-Group: doc-head 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.18-1 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, 18 Mar 2015 23:21:08 -0000 Author: allanjude Date: Wed Mar 18 23:21:06 2015 New Revision: 46355 URL: https://svnweb.freebsd.org/changeset/doc/46355 Log: Fixup typo and improve grammar in ZFS chapter of handbook PR: 197804 Differential Revision: https://reviews.freebsd.org/D1213 Submitted by: Mike M (original) Approved by: wblock (mentor) Sponsored by: ScaleEngine Inc. Modified: head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Wed Mar 18 22:36:22 2015 (r46354) +++ head/en_US.ISO8859-1/books/handbook/zfs/chapter.xml Wed Mar 18 23:21:06 2015 (r46355) @@ -1278,9 +1278,10 @@ errors: No known data errors resilver operation, the pool can grow to use the capacity of the new device. For example, consider a mirror of a 1 TB drive and a - 2 drive. The usable space is 1 TB. Then the - 1 TB is replaced with another 2 TB drive, and the - resilvering process duplicates existing data. Because + 2 TB drive. The usable space is 1 TB. When the + 1 TB drive is replaced with another 2 TB drive, the + resilvering process copies the existing data onto the new + drive. Because both of the devices now have 2 TB capacity, the mirror's available space can be grown to 2 TB. From owner-svn-doc-head@FreeBSD.ORG Thu Mar 19 11:52:34 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A94F681; Thu, 19 Mar 2015 11:52:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 557C6609; Thu, 19 Mar 2015 11:52:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JBqYTU005465; Thu, 19 Mar 2015 11:52:34 GMT (envelope-from rwatson@FreeBSD.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JBqY2E005464; Thu, 19 Mar 2015 11:52:34 GMT (envelope-from rwatson@FreeBSD.org) Message-Id: <201503191152.t2JBqY2E005464@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rwatson set sender to rwatson@FreeBSD.org using -f From: Robert Watson Date: Thu, 19 Mar 2015 11:52:34 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46356 - head/en_US.ISO8859-1/books/porters-handbook/versions X-SVN-Group: doc-head 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.18-1 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, 19 Mar 2015 11:52:34 -0000 Author: rwatson Date: Thu Mar 19 11:52:33 2015 New Revision: 46356 URL: https://svnweb.freebsd.org/changeset/doc/46356 Log: Document __FreeBSD_version 1001511: capability.h -> capsicum.h. Sponsored by: Google, Inc. 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 Wed Mar 18 23:21:06 2015 (r46355) +++ head/en_US.ISO8859-1/books/porters-handbook/versions/chapter.xml Thu Mar 19 11:52:33 2015 (r46356) @@ -5288,6 +5288,14 @@ + 1001511 + 19 March, 2015 + 10-STABLE after sys/capability.h is + renamed to sys/capsicum.h (rev + 280224/). + + + 1100000 October 10, 2013 11.0-CURRENT From owner-svn-doc-head@FreeBSD.ORG Thu Mar 19 17:48:03 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F0D6D34; Thu, 19 Mar 2015 17:48:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 57937875; Thu, 19 Mar 2015 17:48:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JHm3v5076714; Thu, 19 Mar 2015 17:48:03 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JHm2Yq076705; Thu, 19 Mar 2015 17:48:02 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201503191748.t2JHm2Yq076705@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 19 Mar 2015 17:48:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46358 - in head/share: security/advisories security/patches/SA-15:06 xml X-SVN-Group: doc-head 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.18-1 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, 19 Mar 2015 17:48:03 -0000 Author: delphij Date: Thu Mar 19 17:48:01 2015 New Revision: 46358 URL: https://svnweb.freebsd.org/changeset/doc/46358 Log: Add SA-15:06.openssl. Added: head/share/security/advisories/FreeBSD-SA-15:06.openssl.asc (contents, props changed) head/share/security/patches/SA-15:06/ head/share/security/patches/SA-15:06/openssl-0.9.8.patch (contents, props changed) head/share/security/patches/SA-15:06/openssl-0.9.8.patch.asc (contents, props changed) head/share/security/patches/SA-15:06/openssl-1.0.1.patch (contents, props changed) head/share/security/patches/SA-15:06/openssl-1.0.1.patch.asc (contents, props changed) Modified: head/share/xml/advisories.xml Added: head/share/security/advisories/FreeBSD-SA-15:06.openssl.asc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/security/advisories/FreeBSD-SA-15:06.openssl.asc Thu Mar 19 17:48:01 2015 (r46358) @@ -0,0 +1,197 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +============================================================================= +FreeBSD-SA-15:06.openssl Security Advisory + The FreeBSD Project + +Topic: Multiple OpenSSL vulnerabilities + +Category: contrib +Module: openssl +Announced: 2015-03-19 +Affects: All supported versions of FreeBSD. +Corrected: 2015-03-19 17:40:43 UTC (stable/10, 10.1-STABLE) + 2015-03-19 17:42:38 UTC (releng/10.1, 10.1-RELEASE-p7) + 2015-03-19 17:40:43 UTC (stable/9, 9.3-STABLE) + 2015-03-19 17:42:38 UTC (releng/9.3, 9.3-RELEASE-p11) + 2015-03-19 17:40:43 UTC (stable/8, 8.4-STABLE) + 2015-03-19 17:42:38 UTC (releng/8.4, 8.4-RELEASE-p25) +CVE Name: CVE-2015-0209, CVE-2015-0286, CVE-2015-0287, CVE-2015-0288, + CVE-2015-0289, CVE-2015-0293 + +For general information regarding FreeBSD Security Advisories, +including descriptions of the fields above, security branches, and the +following sections, please visit . + +I. Background + +FreeBSD includes software from the OpenSSL Project. The OpenSSL Project is +a collaborative effort to develop a robust, commercial-grade, full-featured +Open Source toolkit implementing the Secure Sockets Layer (SSL v2/v3) +and Transport Layer Security (TLS v1) protocols as well as a full-strength +general purpose cryptography library. + +Abstract Syntax Notation One (ASN.1) is a standard and notation that +describes rules and structures for representing, encoding, transmitting, +and decoding data in telecommunications and computer networking, which +enables representation of objects that are independent of machine-specific +encoding technique. + +II. Problem Description + +A malformed elliptic curve private key file could cause a use-after-free +condition in the d2i_ECPrivateKey function. [CVE-2015-0209] + +An attempt to compare ASN.1 boolean types will cause the ASN1_TYPE_cmp +function to crash with an invalid read. [CVE-2015-0286] + +Reusing a structure in ASN.1 parsing may allow an attacker to cause memory +corruption via an invalid write. [CVE-2015-0287] + +The function X509_to_X509_REQ will crash with a NULL pointer dereference if +the certificate key is invalid. [CVE-2015-0288] + +The PKCS#7 parsing code does not handle missing outer ContentInfo correctly. +[CVE-2015-0289] + +A malicious client can trigger an OPENSSL_assert in servers that both support +SSLv2 and enable export cipher suites by sending a specially crafted SSLv2 +CLIENT-MASTER-KEY message. [CVE-2015-0293] + +III. Impact + +A malformed elliptic curve private key file can cause server daemons using +OpenSSL to crash, resulting in a Denial of Service. [CVE-2015-0209] + +A remote attacker who is able to send specifically crafted certificates +may be able to crash an OpenSSL client or server. [CVE-2015-0286] + +An attacker who can cause invalid writes with applications that parse +structures containing CHOICE or ANY DEFINED BY components and reusing +the structures may be able to cause them to crash. Such reuse is believed +to be rare. OpenSSL clients and servers are not affected. [CVE-2015-0287] + +An attacker may be able to crash applications that create a new certificate +request with subject name the same as in an existing, specifically crafted +certificate. This usage is rare in practice. [CVE-2015-0288] + +An attacker may be able to crash applications that verify PKCS#7 signatures, +decrypt PKCS#7 data or otherwise parse PKCS#7 structures with specifically +crafted certificates. [CVE-2015-0289] + +A malicious client can trigger an OPENSSL_assert in servers that both support +SSLv2 and enable export cipher suites by sending a carefully crafted SSLv2 +CLIENT-MASTER-KEY message, resulting in a Denial of Service. [CVE-2015-0293] + +Note that two issues in the original OpenSSL advisory, CVE-2015-0204 and +CVE-2015-0292, were already addressed by FreeBSD-SA-15:01.openssl and +FreeBSD-EN-15:02.openssl. + +IV. Workaround + +No workaround is available. + +V. Solution + +Perform one of the following: + +1) Upgrade your vulnerable system to a supported FreeBSD stable or +release / security branch (releng) dated after the correction date. + +2) To update your vulnerable system via a binary patch: + +Systems running a RELEASE version of FreeBSD on the i386 or amd64 +platforms can be updated via the freebsd-update(8) utility: + +# freebsd-update fetch +# freebsd-update install + +3) To update your vulnerable system via a source code patch: + +The following patches have been verified to apply to the applicable +FreeBSD release branches. + +a) Download the relevant patch from the location below, and verify the +detached PGP signature using your PGP utility. + +[FreeBSD 8.4 and FreeBSD 9.3] +# fetch https://security.FreeBSD.org/patches/SA-15:06/openssl-0.9.8.patch +# fetch https://security.FreeBSD.org/patches/SA-15:06/openssl-0.9.8.patch.asc +# gpg --verify openssl-0.9.8.patch.asc + +[FreeBSD 10.1] +# fetch https://security.FreeBSD.org/patches/SA-15:06/openssl-1.0.1.patch +# fetch https://security.FreeBSD.org/patches/SA-15:06/openssl-1.0.1.patch.asc +# gpg --verify openssl-1.0.1.patch.asc + +b) Apply the patch. Execute the following commands as root: + +# cd /usr/src +# patch < /path/to/patch + +c) Recompile the operating system using buildworld and installworld as +described in . + +Restart all deamons using the library, or reboot the system. + +VI. Correction details + +The following list contains the correction revision numbers for each +affected branch. + +Branch/path Revision +- ------------------------------------------------------------------------- +stable/8/ r280266 +releng/8.4/ r280268 +stable/9/ r280266 +releng/9.3/ r280268 +stable/10/ r280266 +releng/10.1/ r280268 +- ------------------------------------------------------------------------- + +To see which files were modified by a particular revision, run the +following command, replacing NNNNNN with the revision number, on a +machine with Subversion installed: + +# svn diff -cNNNNNN --summarize svn://svn.freebsd.org/base + +Or visit the following URL, replacing NNNNNN with the revision number: + + + +VII. References + + + + + + + + + + + + + + + +The latest revision of this advisory is available at + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.1.2 (FreeBSD) + +iQIcBAEBCgAGBQJVCwr1AAoJEO1n7NZdz2rnayEP/0w3Pba5k/1G0mJ1T9APNAns +hhXm0YuR/rNJ1XBooWEOctrijlsVChcIt8KvJCU9apOZWjDvm/nvaQ077GCi5RSp +jhQBs8MLVfXzwMbJ0/uBpp6ChF8uafk5O+gr8ulb2jG6VIaLkGOWPYv61aRYSGxy +R7+6FxD8M0lLbGOQGETy1HxKzeWztA2p0ILORNAsi+bF8GSJpxGhSxqDDi4+ic/C +3oEw0zT/E6DhxJovOPebKq0eGcRbv7ETqDmtNQdqbOddV+0FY1E+nHtrAo6B/Kln +rL+meBJHmLeEREROFk4OvCynuROUJGmXJGKwjN3uOVM05qcEZS4NkVhFNrxt6S5H +t3wQ02SesbA3pbmce5OuXmlJgdL57DVlMb5sQjkqPeoJ6pn6Rz7VLSgLNfXDUSxs +x/Lgx0+qLQUubMud7zT97UIvZmDqFTWXfJu5S/0Qt8BPFunmoNJttJ5Cr+brzEtu +5RLjcvkC1giVCpSXS96QbeT67uqSkMZa8gtII8bA77HBGA0Ky8AOwTAXbCiUovuH +sLwsI8KUC3lsKUh7eyLsSm2+wRHn0e6dZ1PE0JRazCnCRboTvMWK2d4R7ANdrwsq +CgtCWLRz6vbB9J4XTNupcEoZGhIA4RuOBqx43eQmaRw1HoV3vn85QP94oL5jzXBd +UQg3YfrXHDlxCsqEzN7o +=wi0T +-----END PGP SIGNATURE----- Added: head/share/security/patches/SA-15:06/openssl-0.9.8.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/security/patches/SA-15:06/openssl-0.9.8.patch Thu Mar 19 17:48:01 2015 (r46358) @@ -0,0 +1,387 @@ +Index: crypto/openssl/crypto/asn1/a_type.c +=================================================================== +--- crypto/openssl/crypto/asn1/a_type.c (revision 280181) ++++ crypto/openssl/crypto/asn1/a_type.c (working copy) +@@ -121,6 +121,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_T + case V_ASN1_OBJECT: + result = OBJ_cmp(a->value.object, b->value.object); + break; ++ case V_ASN1_BOOLEAN: ++ result = a->value.boolean - b->value.boolean; ++ break; + case V_ASN1_NULL: + result = 0; /* They do not have content. */ + break; +Index: crypto/openssl/crypto/asn1/tasn_dec.c +=================================================================== +--- crypto/openssl/crypto/asn1/tasn_dec.c (revision 280181) ++++ crypto/openssl/crypto/asn1/tasn_dec.c (working copy) +@@ -125,16 +125,23 @@ unsigned long ASN1_tag2bit(int tag) + + ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval, + const unsigned char **in, long len, const ASN1_ITEM *it) +- { ++{ + ASN1_TLC c; + ASN1_VALUE *ptmpval = NULL; +- if (!pval) +- pval = &ptmpval; + c.valid = 0; +- if (ASN1_item_ex_d2i(pval, in, len, it, -1, 0, 0, &c) > 0) +- return *pval; ++ if (pval && *pval && it->itype == ASN1_ITYPE_PRIMITIVE) ++ ptmpval = *pval; ++ ++ if (ASN1_item_ex_d2i(&ptmpval, in, len, it, -1, 0, 0, &c) > 0) { ++ if (pval && it->itype != ASN1_ITYPE_PRIMITIVE) { ++ if (*pval) ++ ASN1_item_free(*pval, it); ++ *pval = ptmpval; ++ } ++ return ptmpval; ++ } + return NULL; +- } ++} + + int ASN1_template_d2i(ASN1_VALUE **pval, + const unsigned char **in, long len, const ASN1_TEMPLATE *tt) +@@ -309,13 +316,20 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsi + if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it)) + goto auxerr; + +- /* Allocate structure */ +- if (!*pval && !ASN1_item_ex_new(pval, it)) +- { ++ if (*pval) { ++ /* Free up and zero CHOICE value if initialised */ ++ i = asn1_get_choice_selector(pval, it); ++ if ((i >= 0) && (i < it->tcount)) { ++ tt = it->templates + i; ++ pchptr = asn1_get_field_ptr(pval, tt); ++ ASN1_template_free(pchptr, tt); ++ asn1_set_choice_selector(pval, -1, it); ++ } ++ } else if (!ASN1_item_ex_new(pval, it)) { + ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, + ERR_R_NESTED_ASN1_ERROR); + goto err; +- } ++ } + /* CHOICE type, try each possibility in turn */ + p = *in; + for (i = 0, tt=it->templates; i < it->tcount; i++, tt++) +@@ -405,6 +419,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsi + if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it)) + goto auxerr; + ++ /* Free up and zero any ADB found */ ++ for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) { ++ if (tt->flags & ASN1_TFLG_ADB_MASK) { ++ const ASN1_TEMPLATE *seqtt; ++ ASN1_VALUE **pseqval; ++ seqtt = asn1_do_adb(pval, tt, 1); ++ pseqval = asn1_get_field_ptr(pval, seqtt); ++ ASN1_template_free(pseqval, seqtt); ++ } ++ } ++ + /* Get each field entry */ + for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) + { +Index: crypto/openssl/crypto/pkcs7/pk7_doit.c +=================================================================== +--- crypto/openssl/crypto/pkcs7/pk7_doit.c (revision 280181) ++++ crypto/openssl/crypto/pkcs7/pk7_doit.c (working copy) +@@ -151,6 +151,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) + EVP_PKEY *pkey; + ASN1_OCTET_STRING *os=NULL; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER); ++ return NULL; ++ } ++ /* ++ * The content field in the PKCS7 ContentInfo is optional, but that really ++ * only applies to inner content (precisely, detached signatures). ++ * ++ * When reading content, missing outer content is therefore treated as an ++ * error. ++ * ++ * When creating content, PKCS7_content_new() must be called before ++ * calling this method, so a NULL p7->d is always an error. ++ */ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT); ++ return NULL; ++ } ++ + i=OBJ_obj2nid(p7->type); + p7->state=PKCS7_S_HEADER; + +@@ -344,6 +363,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, B + STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; + PKCS7_RECIP_INFO *ri=NULL; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER); ++ return NULL; ++ } ++ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT); ++ return NULL; ++ } ++ + i=OBJ_obj2nid(p7->type); + p7->state=PKCS7_S_HEADER; + +@@ -637,6 +666,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL; + ASN1_OCTET_STRING *os=NULL; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER); ++ return 0; ++ } ++ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT); ++ return 0; ++ } ++ + EVP_MD_CTX_init(&ctx_tmp); + i=OBJ_obj2nid(p7->type); + p7->state=PKCS7_S_HEADER; +@@ -668,6 +707,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + /* If detached data then the content is excluded */ + if(PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) { + M_ASN1_OCTET_STRING_free(os); ++ os = NULL; + p7->d.sign->contents->d.data = NULL; + } + break; +@@ -678,6 +718,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + if(PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) + { + M_ASN1_OCTET_STRING_free(os); ++ os = NULL; + p7->d.digest->contents->d.data = NULL; + } + break; +@@ -813,8 +854,13 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); + } + +- if (!PKCS7_is_detached(p7)) +- { ++ if (!PKCS7_is_detached(p7)) { ++ /* ++ * NOTE(emilia): I think we only reach os == NULL here because detached ++ * digested data support is broken. ++ */ ++ if (os == NULL) ++ goto err; + btmp=BIO_find_type(bio,BIO_TYPE_MEM); + if (btmp == NULL) + { +@@ -849,6 +895,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_ + STACK_OF(X509) *cert; + X509 *x509; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER); ++ return 0; ++ } ++ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT); ++ return 0; ++ } ++ + if (PKCS7_type_is_signed(p7)) + { + cert=p7->d.sign->cert; +Index: crypto/openssl/crypto/pkcs7/pk7_lib.c +=================================================================== +--- crypto/openssl/crypto/pkcs7/pk7_lib.c (revision 280181) ++++ crypto/openssl/crypto/pkcs7/pk7_lib.c (working copy) +@@ -70,6 +70,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, cha + + switch (cmd) + { ++ /* NOTE(emilia): does not support detached digested data. */ + case PKCS7_OP_SET_DETACHED_SIGNATURE: + if (nid == NID_pkcs7_signed) + { +@@ -473,6 +474,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md) + + STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7) + { ++ if (p7 == NULL || p7->d.ptr == NULL) ++ return NULL; + if (PKCS7_type_is_signed(p7)) + { + return(p7->d.sign->signer_info); +Index: crypto/openssl/doc/crypto/d2i_X509.pod +=================================================================== +--- crypto/openssl/doc/crypto/d2i_X509.pod (revision 280181) ++++ crypto/openssl/doc/crypto/d2i_X509.pod (working copy) +@@ -199,6 +199,12 @@ B<*px> is valid is broken and some parts of the re + persist if they are not present in the new one. As a result the use + of this "reuse" behaviour is strongly discouraged. + ++Current versions of OpenSSL will not modify B<*px> if an error occurs. ++If parsing succeeds then B<*px> is freed (if it is not NULL) and then ++set to the value of the newly decoded structure. As a result B<*px> ++B be allocated on the stack or an attempt will be made to ++free an invalid pointer. ++ + i2d_X509() will not return an error in many versions of OpenSSL, + if mandatory fields are not initialized due to a programming error + then the encoded structure may contain invalid data or omit the +@@ -210,7 +216,9 @@ always succeed. + + d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B structure + or B if an error occurs. The error code that can be obtained by +-L. ++L. If the "reuse" capability has been used ++with a valid X509 structure being passed in via B then the object is not ++modified in the event of error. + + i2d_X509() returns the number of bytes successfully encoded or a negative + value if an error occurs. The error code can be obtained by +Index: crypto/openssl/ssl/s2_lib.c +=================================================================== +--- crypto/openssl/ssl/s2_lib.c (revision 280181) ++++ crypto/openssl/ssl/s2_lib.c (working copy) +@@ -410,7 +410,7 @@ int ssl2_generate_key_material(SSL *s) + + OPENSSL_assert(s->session->master_key_length >= 0 + && s->session->master_key_length +- < (int)sizeof(s->session->master_key)); ++ <= (int)sizeof(s->session->master_key)); + EVP_DigestUpdate(&ctx,s->session->master_key,s->session->master_key_length); + EVP_DigestUpdate(&ctx,&c,1); + c++; +Index: crypto/openssl/ssl/s2_srvr.c +=================================================================== +--- crypto/openssl/ssl/s2_srvr.c (revision 280181) ++++ crypto/openssl/ssl/s2_srvr.c (working copy) +@@ -446,9 +446,6 @@ static int get_client_master_key(SSL *s) + SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_NO_PRIVATEKEY); + return(-1); + } +- i=ssl_rsa_private_decrypt(s->cert,s->s2->tmp.enc, +- &(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]), +- (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING); + + is_export=SSL_C_IS_EXPORT(s->session->cipher); + +@@ -467,23 +464,61 @@ static int get_client_master_key(SSL *s) + else + ek=5; + ++ /* ++ * The format of the CLIENT-MASTER-KEY message is ++ * 1 byte message type ++ * 3 bytes cipher ++ * 2-byte clear key length (stored in s->s2->tmp.clear) ++ * 2-byte encrypted key length (stored in s->s2->tmp.enc) ++ * 2-byte key args length (IV etc) ++ * clear key ++ * encrypted key ++ * key args ++ * ++ * If the cipher is an export cipher, then the encrypted key bytes ++ * are a fixed portion of the total key (5 or 8 bytes). The size of ++ * this portion is in |ek|. If the cipher is not an export cipher, ++ * then the entire key material is encrypted (i.e., clear key length ++ * must be zero). ++ */ ++ if ((!is_export && s->s2->tmp.clear != 0) || ++ (is_export && s->s2->tmp.clear + ek != EVP_CIPHER_key_length(c))) { ++ ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR); ++ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH); ++ return -1; ++ } ++ /* ++ * The encrypted blob must decrypt to the encrypted portion of the key. ++ * Decryption can't be expanding, so if we don't have enough encrypted ++ * bytes to fit the key in the buffer, stop now. ++ */ ++ if ((is_export && s->s2->tmp.enc < ek) || ++ (!is_export && s->s2->tmp.enc < EVP_CIPHER_key_length(c))) { ++ ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR); ++ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT); ++ return -1; ++ } ++ ++ i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc, ++ &(p[s->s2->tmp.clear]), ++ &(p[s->s2->tmp.clear]), ++ (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING : ++ RSA_PKCS1_PADDING); ++ + /* bad decrypt */ + #if 1 + /* If a bad decrypt, continue with protocol but with a + * random master secret (Bleichenbacher attack) */ +- if ((i < 0) || +- ((!is_export && (i != EVP_CIPHER_key_length(c))) +- || (is_export && ((i != ek) || (s->s2->tmp.clear+(unsigned int)i != +- (unsigned int)EVP_CIPHER_key_length(c)))))) +- { ++ if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c)) ++ || (is_export && i != ek))) { + ERR_clear_error(); + if (is_export) + i=ek; + else + i=EVP_CIPHER_key_length(c); +- if (RAND_pseudo_bytes(p,i) <= 0) ++ if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0) + return 0; +- } ++ } + #else + if (i < 0) + { +@@ -505,7 +540,8 @@ static int get_client_master_key(SSL *s) + } + #endif + +- if (is_export) i+=s->s2->tmp.clear; ++ if (is_export) ++ i = EVP_CIPHER_key_length(c); + + if (i > SSL_MAX_MASTER_KEY_LENGTH) + { +Index: secure/lib/libcrypto/man/d2i_X509.3 +=================================================================== +--- secure/lib/libcrypto/man/d2i_X509.3 (revision 280181) ++++ secure/lib/libcrypto/man/d2i_X509.3 (working copy) +@@ -342,6 +342,12 @@ In some versions of OpenSSL the \*(L"reuse\*(R" be + persist if they are not present in the new one. As a result the use + of this \*(L"reuse\*(R" behaviour is strongly discouraged. + .PP ++Current versions of OpenSSL will not modify \fB*px\fR if an error occurs. ++If parsing succeeds then \fB*px\fR is freed (if it is not \s-1NULL\s0) and then ++set to the value of the newly decoded structure. As a result \fB*px\fR ++\&\fBmust not\fR be allocated on the stack or an attempt will be made to ++free an invalid pointer. ++.PP + \&\fIi2d_X509()\fR will not return an error in many versions of OpenSSL, + if mandatory fields are not initialized due to a programming error + then the encoded structure may contain invalid data or omit the +@@ -352,7 +358,9 @@ always succeed. + .IX Header "RETURN VALUES" + \&\fId2i_X509()\fR, \fId2i_X509_bio()\fR and \fId2i_X509_fp()\fR return a valid \fBX509\fR structure + or \fB\s-1NULL\s0\fR if an error occurs. The error code that can be obtained by +-\&\fIERR_get_error\fR\|(3). ++\&\fIERR_get_error\fR\|(3). If the \*(L"reuse\*(R" capability has been used ++with a valid X509 structure being passed in via \fBpx\fR then the object is not ++modified in the event of error. + .PP + \&\fIi2d_X509()\fR returns the number of bytes successfully encoded or a negative + value if an error occurs. The error code can be obtained by Added: head/share/security/patches/SA-15:06/openssl-0.9.8.patch.asc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/security/patches/SA-15:06/openssl-0.9.8.patch.asc Thu Mar 19 17:48:01 2015 (r46358) @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.1.2 (FreeBSD) + +iQIcBAABCgAGBQJVCwsCAAoJEO1n7NZdz2rnWy4P+QGq5XsN4+SQb4B66MJeemw8 +5ogrKICDpYb5QciOxqaF/99XxheKvIFRQkc8Av/VMJrMrx7JJ2HKdMUD+ZrzlNYs +kAMEKBsgS4wj8bACWYCRN8zhztOVLNwzKSNPjjFQZOiQ7cDYI9U27Jj/uPb27/KJ +fSPQCoYCN47xrbWBuxbeJFqdSk3f9xSp3ZVMRkCUfMvme6LDdenqcZkGm6vE0128 +T3b9KHmk2RgwHklkrhiuR8u+27TjkgqL3KGgF2iKR28rkplgoupGpo/grp0kQQZU +u9AQQOQV7QrDkVdOVVEpo76z+qaZX8x/z3JPuxDcMxACa1SqKdGXYXlrEcn8e7xD +IAFAQRBMUnlr3WzxSGAFd2B2m8F0/7t2FPCKoqI2QzLmnte2zLUlpk5s5Ystx5ea +Y2sxgMC+19PfJZg+nlG5fj4sWRZVQqZ98Nob7e7naZySbC/G7W9VqhhwQm7f0yXI +dLjzBilVwJ7/6/EeXhms6N4IExULBx5sNKMyXJAWT7yhP2L9DOxffiyLLDM/WQV1 +IBWeDFTZs0rJtwurafU82zO1RWSLp8MmnAI3v8AeqUFzXUyWK6HhBQtXjBAOK+6j +6v49GPC4DKUUXVPu5K72pXQDv0KcCkRBS80EML+wHBe0NaMPWhwDf1KNL4p1uTOT +ueRwW6tDMa+DWPjUMqxN +=0rs2 +-----END PGP SIGNATURE----- Added: head/share/security/patches/SA-15:06/openssl-1.0.1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/security/patches/SA-15:06/openssl-1.0.1.patch Thu Mar 19 17:48:01 2015 (r46358) @@ -0,0 +1,428 @@ +Index: crypto/openssl/crypto/asn1/a_type.c +=================================================================== +--- crypto/openssl/crypto/asn1/a_type.c (revision 280181) ++++ crypto/openssl/crypto/asn1/a_type.c (working copy) +@@ -124,6 +124,9 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_T + case V_ASN1_OBJECT: + result = OBJ_cmp(a->value.object, b->value.object); + break; ++ case V_ASN1_BOOLEAN: ++ result = a->value.boolean - b->value.boolean; ++ break; + case V_ASN1_NULL: + result = 0; /* They do not have content. */ + break; +Index: crypto/openssl/crypto/asn1/tasn_dec.c +=================================================================== +--- crypto/openssl/crypto/asn1/tasn_dec.c (revision 280181) ++++ crypto/openssl/crypto/asn1/tasn_dec.c (working copy) +@@ -127,16 +127,22 @@ unsigned long ASN1_tag2bit(int tag) + + ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval, + const unsigned char **in, long len, const ASN1_ITEM *it) +- { ++{ + ASN1_TLC c; + ASN1_VALUE *ptmpval = NULL; +- if (!pval) +- pval = &ptmpval; + asn1_tlc_clear_nc(&c); +- if (ASN1_item_ex_d2i(pval, in, len, it, -1, 0, 0, &c) > 0) +- return *pval; ++ if (pval && *pval && it->itype == ASN1_ITYPE_PRIMITIVE) ++ ptmpval = *pval; ++ if (ASN1_item_ex_d2i(&ptmpval, in, len, it, -1, 0, 0, &c) > 0) { ++ if (pval && it->itype != ASN1_ITYPE_PRIMITIVE) { ++ if (*pval) ++ ASN1_item_free(*pval, it); ++ *pval = ptmpval; ++ } ++ return ptmpval; ++ } + return NULL; +- } ++} + + int ASN1_template_d2i(ASN1_VALUE **pval, + const unsigned char **in, long len, const ASN1_TEMPLATE *tt) +@@ -311,13 +317,20 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsi + if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) + goto auxerr; + +- /* Allocate structure */ +- if (!*pval && !ASN1_item_ex_new(pval, it)) +- { ++ if (*pval) { ++ /* Free up and zero CHOICE value if initialised */ ++ i = asn1_get_choice_selector(pval, it); ++ if ((i >= 0) && (i < it->tcount)) { ++ tt = it->templates + i; ++ pchptr = asn1_get_field_ptr(pval, tt); ++ ASN1_template_free(pchptr, tt); ++ asn1_set_choice_selector(pval, -1, it); ++ } ++ } else if (!ASN1_item_ex_new(pval, it)) { + ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, + ERR_R_NESTED_ASN1_ERROR); + goto err; +- } ++ } + /* CHOICE type, try each possibility in turn */ + p = *in; + for (i = 0, tt=it->templates; i < it->tcount; i++, tt++) +@@ -407,6 +420,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsi + if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL)) + goto auxerr; + ++ /* Free up and zero any ADB found */ ++ for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) { ++ if (tt->flags & ASN1_TFLG_ADB_MASK) { ++ const ASN1_TEMPLATE *seqtt; ++ ASN1_VALUE **pseqval; ++ seqtt = asn1_do_adb(pval, tt, 1); ++ pseqval = asn1_get_field_ptr(pval, seqtt); ++ ASN1_template_free(pseqval, seqtt); ++ } ++ } ++ + /* Get each field entry */ + for (i = 0, tt = it->templates; i < it->tcount; i++, tt++) + { +Index: crypto/openssl/crypto/pkcs7/pk7_doit.c +=================================================================== +--- crypto/openssl/crypto/pkcs7/pk7_doit.c (revision 280181) ++++ crypto/openssl/crypto/pkcs7/pk7_doit.c (working copy) +@@ -272,6 +272,25 @@ BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio) + PKCS7_RECIP_INFO *ri=NULL; + ASN1_OCTET_STRING *os=NULL; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_INVALID_NULL_POINTER); ++ return NULL; ++ } ++ /* ++ * The content field in the PKCS7 ContentInfo is optional, but that really ++ * only applies to inner content (precisely, detached signatures). ++ * ++ * When reading content, missing outer content is therefore treated as an ++ * error. ++ * ++ * When creating content, PKCS7_content_new() must be called before ++ * calling this method, so a NULL p7->d is always an error. ++ */ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAINIT, PKCS7_R_NO_CONTENT); ++ return NULL; ++ } ++ + i=OBJ_obj2nid(p7->type); + p7->state=PKCS7_S_HEADER; + +@@ -433,6 +452,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, B + unsigned char *ek = NULL, *tkey = NULL; + int eklen = 0, tkeylen = 0; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_INVALID_NULL_POINTER); ++ return NULL; ++ } ++ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATADECODE, PKCS7_R_NO_CONTENT); ++ return NULL; ++ } ++ + i=OBJ_obj2nid(p7->type); + p7->state=PKCS7_S_HEADER; + +@@ -752,6 +781,16 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + STACK_OF(PKCS7_SIGNER_INFO) *si_sk=NULL; + ASN1_OCTET_STRING *os=NULL; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_INVALID_NULL_POINTER); ++ return 0; ++ } ++ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_NO_CONTENT); ++ return 0; ++ } ++ + EVP_MD_CTX_init(&ctx_tmp); + i=OBJ_obj2nid(p7->type); + p7->state=PKCS7_S_HEADER; +@@ -796,6 +835,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + /* If detached data then the content is excluded */ + if(PKCS7_type_is_data(p7->d.sign->contents) && p7->detached) { + M_ASN1_OCTET_STRING_free(os); ++ os = NULL; + p7->d.sign->contents->d.data = NULL; + } + break; +@@ -806,6 +846,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + if(PKCS7_type_is_data(p7->d.digest->contents) && p7->detached) + { + M_ASN1_OCTET_STRING_free(os); ++ os = NULL; + p7->d.digest->contents->d.data = NULL; + } + break; +@@ -866,8 +907,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + } + } + } +- else if (i == NID_pkcs7_digest) +- { ++ else if (i == NID_pkcs7_digest) { + unsigned char md_data[EVP_MAX_MD_SIZE]; + unsigned int md_len; + if (!PKCS7_find_digest(&mdc, bio, +@@ -878,24 +918,31 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio) + M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len); + } + +- if (!PKCS7_is_detached(p7) && !(os->flags & ASN1_STRING_FLAG_NDEF)) +- { +- char *cont; +- long contlen; +- btmp=BIO_find_type(bio,BIO_TYPE_MEM); +- if (btmp == NULL) +- { +- PKCS7err(PKCS7_F_PKCS7_DATAFINAL,PKCS7_R_UNABLE_TO_FIND_MEM_BIO); +- goto err; ++ if (!PKCS7_is_detached(p7)) { ++ /* ++ * NOTE(emilia): I think we only reach os == NULL here because detached ++ * digested data support is broken. ++ */ ++ if (os == NULL) ++ goto err; ++ if (!(os->flags & ASN1_STRING_FLAG_NDEF)) { ++ char *cont; ++ long contlen; ++ btmp = BIO_find_type(bio, BIO_TYPE_MEM); ++ if (btmp == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAFINAL, PKCS7_R_UNABLE_TO_FIND_MEM_BIO); ++ goto err; + } +- contlen = BIO_get_mem_data(btmp, &cont); +- /* Mark the BIO read only then we can use its copy of the data +- * instead of making an extra copy. +- */ +- BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY); +- BIO_set_mem_eof_return(btmp, 0); +- ASN1_STRING_set0(os, (unsigned char *)cont, contlen); ++ contlen = BIO_get_mem_data(btmp, &cont); ++ /* ++ * Mark the BIO read only then we can use its copy of the data ++ * instead of making an extra copy. ++ */ ++ BIO_set_flags(btmp, BIO_FLAGS_MEM_RDONLY); ++ BIO_set_mem_eof_return(btmp, 0); ++ ASN1_STRING_set0(os, (unsigned char *)cont, contlen); + } ++ } + ret=1; + err: + EVP_MD_CTX_cleanup(&ctx_tmp); +@@ -971,6 +1018,16 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_ + STACK_OF(X509) *cert; + X509 *x509; + ++ if (p7 == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_INVALID_NULL_POINTER); ++ return 0; ++ } ++ ++ if (p7->d.ptr == NULL) { ++ PKCS7err(PKCS7_F_PKCS7_DATAVERIFY, PKCS7_R_NO_CONTENT); ++ return 0; ++ } ++ + if (PKCS7_type_is_signed(p7)) + { + cert=p7->d.sign->cert; +Index: crypto/openssl/crypto/pkcs7/pk7_lib.c +=================================================================== +--- crypto/openssl/crypto/pkcs7/pk7_lib.c (revision 280181) ++++ crypto/openssl/crypto/pkcs7/pk7_lib.c (working copy) +@@ -71,6 +71,7 @@ long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, cha + + switch (cmd) + { ++ /* NOTE(emilia): does not support detached digested data. */ + case PKCS7_OP_SET_DETACHED_SIGNATURE: + if (nid == NID_pkcs7_signed) + { +@@ -459,6 +460,8 @@ int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md) + + STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7) + { ++ if (p7 == NULL || p7->d.ptr == NULL) ++ return NULL; + if (PKCS7_type_is_signed(p7)) + { + return(p7->d.sign->signer_info); +Index: crypto/openssl/doc/crypto/d2i_X509.pod +=================================================================== +--- crypto/openssl/doc/crypto/d2i_X509.pod (revision 280181) ++++ crypto/openssl/doc/crypto/d2i_X509.pod (working copy) +@@ -199,6 +199,12 @@ B<*px> is valid is broken and some parts of the re + persist if they are not present in the new one. As a result the use + of this "reuse" behaviour is strongly discouraged. + ++Current versions of OpenSSL will not modify B<*px> if an error occurs. ++If parsing succeeds then B<*px> is freed (if it is not NULL) and then ++set to the value of the newly decoded structure. As a result B<*px> ++B be allocated on the stack or an attempt will be made to ++free an invalid pointer. ++ + i2d_X509() will not return an error in many versions of OpenSSL, + if mandatory fields are not initialized due to a programming error + then the encoded structure may contain invalid data or omit the +@@ -210,7 +216,9 @@ always succeed. + + d2i_X509(), d2i_X509_bio() and d2i_X509_fp() return a valid B structure + or B if an error occurs. The error code that can be obtained by +-L. ++L. If the "reuse" capability has been used ++with a valid X509 structure being passed in via B then the object is not ++modified in the event of error. + + i2d_X509() returns the number of bytes successfully encoded or a negative + value if an error occurs. The error code can be obtained by +Index: crypto/openssl/ssl/s2_lib.c +=================================================================== +--- crypto/openssl/ssl/s2_lib.c (revision 280181) ++++ crypto/openssl/ssl/s2_lib.c (working copy) +@@ -488,7 +488,7 @@ int ssl2_generate_key_material(SSL *s) + + OPENSSL_assert(s->session->master_key_length >= 0 + && s->session->master_key_length +- < (int)sizeof(s->session->master_key)); ++ <= (int)sizeof(s->session->master_key)); + EVP_DigestUpdate(&ctx,s->session->master_key,s->session->master_key_length); + EVP_DigestUpdate(&ctx,&c,1); + c++; +Index: crypto/openssl/ssl/s2_srvr.c +=================================================================== +--- crypto/openssl/ssl/s2_srvr.c (revision 280181) ++++ crypto/openssl/ssl/s2_srvr.c (working copy) +@@ -454,9 +454,6 @@ static int get_client_master_key(SSL *s) + SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_NO_PRIVATEKEY); + return(-1); + } +- i=ssl_rsa_private_decrypt(s->cert,s->s2->tmp.enc, +- &(p[s->s2->tmp.clear]),&(p[s->s2->tmp.clear]), +- (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING); + + is_export=SSL_C_IS_EXPORT(s->session->cipher); + +@@ -475,23 +472,61 @@ static int get_client_master_key(SSL *s) + else + ek=5; + ++ /* ++ * The format of the CLIENT-MASTER-KEY message is ++ * 1 byte message type ++ * 3 bytes cipher ++ * 2-byte clear key length (stored in s->s2->tmp.clear) ++ * 2-byte encrypted key length (stored in s->s2->tmp.enc) ++ * 2-byte key args length (IV etc) ++ * clear key ++ * encrypted key ++ * key args ++ * ++ * If the cipher is an export cipher, then the encrypted key bytes ++ * are a fixed portion of the total key (5 or 8 bytes). The size of ++ * this portion is in |ek|. If the cipher is not an export cipher, ++ * then the entire key material is encrypted (i.e., clear key length ++ * must be zero). ++ */ ++ if ((!is_export && s->s2->tmp.clear != 0) || ++ (is_export && s->s2->tmp.clear + ek != EVP_CIPHER_key_length(c))) { ++ ssl2_return_error(s, SSL2_PE_UNDEFINED_ERROR); ++ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_BAD_LENGTH); ++ return -1; ++ } ++ /* ++ * The encrypted blob must decrypt to the encrypted portion of the key. ++ * Decryption can't be expanding, so if we don't have enough encrypted ++ * bytes to fit the key in the buffer, stop now. ++ */ ++ if ((is_export && s->s2->tmp.enc < ek) || ++ (!is_export && s->s2->tmp.enc < EVP_CIPHER_key_length(c))) { ++ ssl2_return_error(s,SSL2_PE_UNDEFINED_ERROR); ++ SSLerr(SSL_F_GET_CLIENT_MASTER_KEY,SSL_R_LENGTH_TOO_SHORT); ++ return -1; ++ } ++ ++ i = ssl_rsa_private_decrypt(s->cert, s->s2->tmp.enc, ++ &(p[s->s2->tmp.clear]), ++ &(p[s->s2->tmp.clear]), ++ (s->s2->ssl2_rollback) ? RSA_SSLV23_PADDING : ++ RSA_PKCS1_PADDING); ++ + /* bad decrypt */ + #if 1 + /* If a bad decrypt, continue with protocol but with a + * random master secret (Bleichenbacher attack) */ +- if ((i < 0) || +- ((!is_export && (i != EVP_CIPHER_key_length(c))) +- || (is_export && ((i != ek) || (s->s2->tmp.clear+(unsigned int)i != +- (unsigned int)EVP_CIPHER_key_length(c)))))) +- { ++ if ((i < 0) || ((!is_export && i != EVP_CIPHER_key_length(c)) ++ || (is_export && i != ek))) { + ERR_clear_error(); + if (is_export) + i=ek; + else + i=EVP_CIPHER_key_length(c); +- if (RAND_pseudo_bytes(p,i) <= 0) ++ if (RAND_pseudo_bytes(&p[s->s2->tmp.clear], i) <= 0) + return 0; +- } ++ } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-doc-head@FreeBSD.ORG Thu Mar 19 19:20:22 2015 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EEDA77D; Thu, 19 Mar 2015 19:20:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 3F1039CD; Thu, 19 Mar 2015 19:20:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2JJKM5Y025869; Thu, 19 Mar 2015 19:20:22 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2JJKLUO025866; Thu, 19 Mar 2015 19:20:21 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201503191920.t2JJKLUO025866@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 19 Mar 2015 19:20:21 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46359 - in head/en_US.ISO8859-1/books/porters-handbook: plist uses X-SVN-Group: doc-head 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.18-1 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, 19 Mar 2015 19:20:22 -0000 Author: mat (ports committer) Date: Thu Mar 19 19:20:20 2015 New Revision: 46359 URL: https://svnweb.freebsd.org/changeset/doc/46359 Log: Catch up with USES and Keywords. Differential Revision: https://reviews.freebsd.org/D2099 Approved by: brd Sponsored by: Absolight Modified: head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml Modified: head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Thu Mar 19 17:48:01 2015 (r46358) +++ head/en_US.ISO8859-1/books/porters-handbook/plist/chapter.xml Thu Mar 19 19:20:20 2015 (r46359) @@ -313,7 +313,17 @@ etc/orbit.conf-dist @sample(,games,660) etc/config.sample - + + + + <literal>@desktop-file-utils</literal> + + Will run update-desktop-database -q + after installation and deinstallation. + <literal>@fc</literal> @@ -355,6 +365,13 @@ etc/orbit.conf-dist empty.</para> </sect2> + <sect2 xml:id="plist-keywords-glib-schemas"> + <title><literal>@glib-schemas</literal> + + Runs glib-compile-schemas on + installation and deinstallation. + + <literal>@info</literal> <replaceable>file</replaceable> @@ -365,6 +382,23 @@ etc/orbit.conf-dist deinstallation. + + <literal>@kld</literal> + <replaceable>directory</replaceable> + + Runs kldxref on the directory + on installation and deinstallation. Additionally, on + deinstallation, it will remove the directory if empty. + + + + <literal>@rmtry</literal> + <replaceable>file</replaceable> + + Will remove the file on deinstallation, and not give an + error if the file is not there. + + <literal>@sample</literal> <replaceable>file</replaceable> @@ -380,6 +414,14 @@ etc/orbit.conf-dist information. + + <literal>@shared-mime-info</literal> + <replaceable>directory</replaceable> + + Runs update-mime-database on the + directory on installation and deinstallation. + + <literal>@shell</literal> <replaceable>file</replaceable> Modified: head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml Thu Mar 19 17:48:01 2015 (r46358) +++ head/en_US.ISO8859-1/books/porters-handbook/uses/chapter.xml Thu Mar 19 19:20:20 2015 (r46359) @@ -8,7 +8,7 @@