From owner-p4-projects@FreeBSD.ORG Mon Jan 21 20:13:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8521216A420; Mon, 21 Jan 2008 20:13:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AC4316A41A for ; Mon, 21 Jan 2008 20:13:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 131DC13C442 for ; Mon, 21 Jan 2008 20:13:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0LKCx4T090106 for ; Mon, 21 Jan 2008 20:12:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0LKCrmR090097 for perforce@freebsd.org; Mon, 21 Jan 2008 20:12:53 GMT (envelope-from jb@freebsd.org) Date: Mon, 21 Jan 2008 20:12:53 GMT Message-Id: <200801212012.m0LKCrmR090097@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 133810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2008 20:13:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=133810 Change 133810 by jb@jb_freebsd1 on 2008/01/21 20:12:48 IFC Affected files ... .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/faq/Makefile#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/faq/book.sgml#1 branch .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#19 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/ports/GIDs#14 integrate .. //depot/projects/dtrace/ports/MOVED#63 integrate .. //depot/projects/dtrace/ports/Mk/bsd.php.mk#12 integrate .. //depot/projects/dtrace/ports/UIDs#17 integrate .. //depot/projects/dtrace/ports/UPDATING#47 integrate .. //depot/projects/dtrace/src/Makefile.inc1#37 integrate .. //depot/projects/dtrace/src/etc/defaults/rc.conf#26 integrate .. //depot/projects/dtrace/src/etc/rc.firewall#8 integrate .. //depot/projects/dtrace/src/lib/msun/src/k_rem_pio2.c#4 integrate .. //depot/projects/dtrace/src/lib/msun/src/k_rem_pio2f.c#4 delete .. //depot/projects/dtrace/src/lib/msun/src/math_private.h#6 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_exp2.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_exp2f.c#5 integrate .. //depot/projects/dtrace/src/lib/msun/src/s_log1pf.c#5 integrate .. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#15 integrate .. //depot/projects/dtrace/src/release/fixit.profile#5 integrate .. //depot/projects/dtrace/src/sbin/ipfw/ipfw2.c#15 integrate .. //depot/projects/dtrace/src/share/man/man4/axe.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/sf.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/vlan.4#8 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/dtrace/src/sys/conf/files#66 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sf/if_sf.c#1 branch .. //depot/projects/dtrace/src/sys/dev/sf/if_sfreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sf/starfire_rx.h#1 branch .. //depot/projects/dtrace/src/sys/dev/sf/starfire_tx.h#1 branch .. //depot/projects/dtrace/src/sys/kern/init_sysent.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/syscalls.master#17 integrate .. //depot/projects/dtrace/src/sys/kern/systrace_args.c#14 integrate .. //depot/projects/dtrace/src/sys/modules/sf/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/netinet6/in6_src.c#11 integrate .. //depot/projects/dtrace/src/sys/pci/amdsmb.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/if_sf.c#7 delete .. //depot/projects/dtrace/src/sys/pci/if_sfreg.h#6 delete .. //depot/projects/dtrace/src/sys/pci/nfsmb.c#10 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/dtrace/src/sys/sys/signal.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.h#18 integrate .. //depot/projects/dtrace/src/sys/sys/syscall.mk#18 integrate .. //depot/projects/dtrace/src/sys/sys/sysproto.h#18 integrate .. //depot/projects/dtrace/src/sys/sys/user.h#7 integrate .. //depot/projects/dtrace/src/tools/build/Makefile#4 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_files.c#3 integrate .. //depot/projects/dtrace/www/en/security/security.sgml#12 integrate .. //depot/projects/dtrace/www/share/sgml/events.xml#19 integrate Differences ... ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/Makefile#3 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/books/Makefile,v 1.2 2008/01/14 14:19:43 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/books/Makefile,v 1.3 2008/01/20 23:05:16 keramida Exp $ # # %SOURCE% en_US.ISO8859-1/books/Makefile -# %SRCID% 1.1 +# %SRCID% 1.14 -SUBDIR = handbook +SUBDIR = faq +SUBDIR+= handbook -ROOT_SYMLINKS= handbook +ROOT_SYMLINKS= faq handbook DOC_PREFIX?= ${.CURDIR}/../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml#3 (text+ko) ==== @@ -4,7 +4,7 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml,v 1.3 2008/01/14 22:42:25 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/virtualization/chapter.sgml,v 1.4 2008/01/20 22:53:02 keramida Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml %SRCID% 1.11 @@ -82,7 +82,7 @@ - &os; + &os; Parallels MacOS ==== //depot/projects/dtrace/doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml#3 (text+ko) ==== @@ -4,10 +4,10 @@ The FreeBSD Greek Documentation Project - $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.2 2008/01/14 14:19:47 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/books/handbook/x11/chapter.sgml,v 1.3 2008/01/20 22:57:42 keramida Exp $ - %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml - %SRCID% 1.1 + %SOURCE% en_US.ISO8859-1/books/handbook/x11/chapter.sgml + %SRCID% 1.184 --> @@ -26,54 +26,53 @@ - X Windows + X Window - FreeBSD X11 - . X11 + FreeBSD X11 + . X11 X Window &xorg; - &xfree86;. &os; - &os; 5.2.1-RELEASE - - &xfree86;, X11 server - The &xfree86; Project, Inc. &os; 5.3-RELEASE, - X11 - &xorg;, X11 server - X.Org Foundation - &os;. X servers &os;. - + &xfree86;. &os; + &os; 5.2.1-RELEASE + &xfree86;, + X11 server &xfree86; Project, Inc. + &os; 5.3-RELEASE , + X11 &xorg;, + X11 server X.Org Foundation + &os;. + X servers &os;. - - X11 &xorg;. - &xfree86; - (.. &os; - &xfree86; X11), - - &os; Handbook . + X11 + &xorg.version; &xorg; + &xorg.version;. + &xfree86; (.. + &os; &xfree86; + X11), + &os; + . - X11, &xorg;. + X11, + &xorg;. , : - X Windows, + X Window, . - X11. + X11. - - window managers. + window + managers. @@ -81,85 +80,94 @@ - logins - (XDM). + (login) + ((XDM). , : - - (). + + + (). + - Understanding X + X11 - Using X for the first time can be somewhat of a shock to someone - familiar with other graphical environments, such as µsoft.windows; or - &macos;. + X11 + , + µsoft.windows; &macos;. - While it is not necessary to understand all of the details of various - X components and how they interact, some basic knowledge makes - it possible to take advantage of X's strengths. + , + X11 . + , , + X11 . - Why X? + X11 ; - X is not the first window system written for &unix;, but it is the - most popular of them. X's original development team had worked on another - window system prior to writing X. That system's name was - W (for Window). X was just the next - letter in the Roman alphabet. + X + &unix;, . + X X. + W ( + window). X + . - X can be called X, X Window System, - X11, and a number of other terms. You may find - that using the term X Windows to describe X11 - can be offensive to some people; for a bit more insight on - this, see &man.X.7;. + X + X, X Window + System, X11, + . : + X Windows. + , manpage &man.X.7;. - The X Client/Server Model + / X11 + + X11 + , + -. - X was designed from the beginning to be network-centric, and - adopts a client-server model. - In the X model, the - X server runs on the computer that has the keyboard, - monitor, and mouse attached. The server's responsibility includes tasks such as managing - the display, handling input from the keyboard and mouse, and so on. - Each X application (such as XTerm, or - &netscape;) is a client. A - client sends messages to the server such as Please draw a - window at these coordinates, and the server sends back - messages such as The user just clicked on the OK - button. + X11, X + , + . X + , , , + . X (.. XTerm + &netscape;) + . + + , + OK. - In a home or small - office environment, the X server and the X clients commonly run on - the same computer. However, it is perfectly possible to run the X - server on a less powerful desktop computer, and run X applications - (the clients) on, say, the powerful and expensive machine that serves - the office. In this scenario the communication between the X client - and server takes place over the network. + , X + . , + X + , X ( ) , + , . + X + . - This confuses some people, because the X terminology is - exactly backward to what they expect. They expect the X - server to be the big powerful machine down the hall, and - the X client to be the machine on their desk. + , X + . + X + X + . - It is important to remember that the X server is the machine with the monitor and - keyboard, and the X clients are the programs that display the - windows. + X + , X + . - There is nothing in the protocol that forces the client and - server machines to be running the same operating system, or even to - be running on the same type of computer. It is certainly possible to - run an X server on µsoft.windows; or Apple's &macos;, and there are - various free and commercial applications available that do exactly - that. + + + , . + X + µsoft.windows; &macos; Apple, + . + @@ -1152,7 +1160,7 @@ Xaccess The protocol for connecting to - XDM controlled displays is called + XDM-controlled displays is called the X Display Manager Connection Protocol (XDMCP). This file is a ruleset for controlling XDMCP connections from remote machines. It is ignored unless the xdm-config @@ -1163,7 +1171,7 @@ Xresources This is an application-defaults file for the display - chooser and the login screens. This is where the appearance + chooser and login screens. In it, the appearance of the login program can be modified. The format is identical to the app-defaults file described in the X11 documentation. @@ -1218,7 +1226,7 @@ Running a Network Display Server In order for other clients to connect to the display - server, edit the access control rules, and enable the connection + server, you must edit the access control rules and enable the connection listener. By default these are set to conservative values. To make XDM listen for connections, first comment out a line in the xdm-config @@ -1231,9 +1239,9 @@ and then restart XDM. Remember that comments in app-defaults files begin with a ! character, not the usual #. More strict - access controls may be desired. Look at the example + access controls may be desired — look at the example entries in Xaccess, and refer to the - &man.xdm.1; manual page. + &man.xdm.1; manual page for further information. @@ -1433,7 +1441,7 @@ - Centralized consisted dialog driven desktop + Centralized, consistent, dialog-driven desktop configuration @@ -1444,13 +1452,13 @@ KDE comes with a web browser called - Konqueror, which represents + Konqueror, which is a solid competitor to other existing web browsers on &unix; systems. More information on KDE can be found on the KDE website. For FreeBSD specific information and resources on KDE, consult - the FreeBSD-KDE + the KDE on FreeBSD team's website. @@ -1559,7 +1567,7 @@ Fully configurable via mouse, with drag and - drop, etc + drop, etc. @@ -1569,8 +1577,7 @@ Integrated window manager, file manager, sound manager, - GNOME compliance module, and other - things + GNOME compliance module, and more @@ -1625,12 +1632,13 @@ ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -368,24 +368,19 @@ the wheel mechanism is better than having nothing at all, it is not necessarily the safest option. - + To lock an account completely, the &man.pw.8; command should + be used: + + &prompt.root;pw lock staff - An indirect way to secure staff accounts, and ultimately - root access is to use an alternative - login access method and - do what is known as starring out the encrypted - password for the staff accounts. Using the &man.vipw.8; - command, one can replace each instance of an encrypted password - with a single * character. - This command will update the /etc/master.passwd - file and user/password database to disable password-authenticated - logins. + This will prevent the user from logging in using any + mechanism, including &man.ssh.1;. - A staff account entry such as: + Another method of blocking access to accounts would be to + replace the encrypted password with a single + * character. This character + would never match the encrypted password and thus block user + access. For example, the following staff account: foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh @@ -393,29 +388,13 @@ foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh - This change will prevent normal logins from occurring, - since the encrypted password will never match - *. With this done, - staff members must use - another mechanism to authenticate themselves such as - &man.kerberos.1; or &man.ssh.1; using a public/private key - pair. When using something like Kerberos, one generally must - secure the machines which run the Kerberos servers and your - desktop workstation. When using a public/private key pair - with ssh, one must generally secure - the machine used to login from (typically - one's workstation). An additional layer of protection can be - added to the key pair by password protecting the key pair when - creating it with &man.ssh-keygen.1;. Being able to - star out the passwords for staff accounts also - guarantees that staff members can only login through secure - access methods that you have set up. This forces all staff - members to use secure, encrypted connections for all of their - sessions, which closes an important hole used by many - intruders: sniffing the network from an unrelated, - less secure machine. + This will prevent the foobar user + from logging in using conventional methods. This method for + access restriction is flawed on sites using + Kerberos or in situations where the + user has set up keys with &man.ssh.1;. - The more indirect security mechanisms also assume that you are + These security mechanisms also assume that you are logging in from a more restrictive server to a less restrictive server. For example, if your main box is running all sorts of servers, your workstation should not be running any. In order for ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -122,7 +122,10 @@ In the X model, the X server runs on the computer that has the keyboard, monitor, and mouse attached. The server's responsibility includes tasks such as managing - the display, handling input from the keyboard and mouse, and so on. + the display, handling input from the keyboard and mouse, and other + input or output devices (i.e. a tablet can be used as + an input device, and a video projector may be an alternative output + device). Each X application (such as XTerm, or &netscape;) is a client. A client sends messages to the server such as Please draw a ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/security/chapter.sgml#4 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -363,22 +363,19 @@ байхаас илүү боловч энэ нь заавал ч үгүй хамгийн аюулгүй сонголт бас биш юм. - + Бүртгэлийг бүрэн түгжихийн тулд &man.pw.8; тушаалыг ашиглах + хэрэгтэй: + + &prompt.root;pw lock staff - Staff бүртгэлүүд болон эцсийн эцэст root хандалтыг - шууд бусаар аюулгүй болгохын тулд өөр нэвтрэх хандалтын аргыг ашиглаж - staff бүртгэлүүдийн шифрлэсэн нууц үгийг од болгож - өгдөг. &man.vipw.8; тушаалыг ашиглан шифрлэсэн нууц үг бүрийг ганц - * тэмдэгтээр сольж өгч болно. - Энэ тушаал нь /etc/master.passwd файл болон - хэрэглэгч/нууц үгийн мэдээллийн баазыг нууц үгээр шалгагдан нэвтрэх нэвтрэлтүүдийг - хаан шинэчлэх болно. + Энэ нь &man.ssh.1;-ийг оролцуулаад хэрэглэгчийг ямар ч + арга ашиглан нэвтрэн орохыг хориглоно. - Иймэрхүү staff бүртгэлийн эрхийг: + Бүртгэлүүдэд хандахыг хориглох өөр нэг арга бол + нууцлагдсан нууц үгийг ганц * + тэмдэгтээр солих явдал юм. Энэ тэмдэгт нь нууцлагдсан + нууц үгтэй хэзээ ч таарахгүй бөгөөд хэрэглэгчийн + хандалтыг хаах болно. Жишээ нь доор дурдсан staff бүртгэлийг: foobar:R9DT/Fa1/LV9U:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh @@ -386,26 +383,13 @@ foobar:*:1000:1000::0:0:Foo Bar:/home/foobar:/usr/local/bin/tcsh - Шифрлэсэн нууц үг * - тэмдэгттэй хэзээ ч таарахгүй болохоор энэ өөрчлөлт нь ердийн нэвтрэлтүүдийг - болиулдаг. Ийм болсон staff-ийн гишүүд &man.kerberos.1; эсвэл - нийтийн/хувийн түлхүүр хослолыг ашиглан &man.ssh.1; зэрэг өөрсдийгөө - таниулан нэвтрэх өөр арга хэрэглэх шаардлагатай. Kerberos-той адилыг - ашиглаж байгаа үед ерөнхийдөө Kerberos сервер ажиллаж байгаа машинууд болон - өөрийн ширээний ажлын компьютерийг аюулгүй болгох шаардлагатай. - Нийтийн/хувийн түлхүүр хослолыг ssh-тэй ашиглаж байгаа үед ерөнхийдөө - нэвтрэлтийг эхлүүлж байгаа машиныг (ихэвчлэн - хэрэглэгчийн ажлын компьютер) аюулгүй болгох шаардлагатай. &man.ssh-keygen.1;-р - түлхүүр хослолыг үүсгэх үедээ түлхүүр хослолыг хамгаалан нэмэлт давхарга - хамгаалалт хийж өгч болох юм. Staff бүртгэлүүдийн нууц үгүүдийг - од болгох боломж нь бас staff-ийн гишүүд зөвхөн - таны тохируулсан аюулгүй хандалтын аргуудаар дамжин нэвтрэхийг - баталгаажуулдаг. Энэ нь бүх staff-ийн гишүүдэд аюулгүй, шифрлэгдсэн - холболтуудыг тэдгээрийн бүх сессүүдэд хүчээр ашиглуулдаг бөгөөд энэ нь олон - халдагчдын ашиглаж байсан хамааралгүй, аюулгүй биш машинаас сүлжээг - шиншлэх ноцтой цоорхойг хаадаг. + Энэ нь foobar хэрэглэгчийг ердийн + аргууд ашиглан нэвтрэн орох боломжийг хаадаг. Энэ хандалт + хязгаарлах арга нь Kerberos ашиглаж + байгаа сайтууд эсвэл хэрэглэгч &man.ssh.1; ашиглан түлхүүрүүд + тохируулсан тохиолдлууд зэрэгт ажилладаггүй. - Арай илүү шууд бус аюулгүй байдлын арга замууд нь бас таныг илүү хязгаарласан + Эдгээр аюулгүй байдлын арга замууд нь бас таныг илүү хязгаарласан серверээс арай бага хязгаарласан машин уруу нэвтрэн орж байна гэж тооцдог. Жишээ нь хэрэв таны гол хайрцаг чинь бүх л төрлийн серверүүд ажиллуулж байвал таны ажлын компьютер чинь ямрыг ч ажиллуулах ёсгүй. Өөрийн компьютерийг ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/x11/chapter.sgml#3 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -125,10 +125,13 @@ X загварт X сервер нь хулгана, гар, дэлгэцтэй ажилладаг. Энэ үед - серверийн үүрэг бол гар болон хулганаас оруулсан мэдээллийг - хүлээж аван зохицуулах зэрэг дэлгэц дээрх үйлдлүүдийг хариуцаж - ажиллаж байдаг. X програм болгон (XTerm - эсвэл &netscape; гэх мэт) уг серверийн + серверийн үүрэг бол дэлгэцийг удирдах, гар ба хулгана болон + бусад оролт эсвэл гаралтын төхөөрөмжүүдээс (жишээ нь tablet нь + оролтын төхөөрөмж маягаар ашиглагдаж видео проектор нь + гаралтын төхөөрөмж байж болох юм) мэдээллийг хүлээж аван + зохицуулах үйлдлүүдийг хариуцаж ажиллаж байдаг. + X програм болгон (XTerm + эсвэл &netscape; гэх мэт) уг серверийн үйлчлүүлэгч нь юм. Үйлчлүүлэгч нь сервер уруу жишээлбэл энэ байрлалд цонх зурна уу гэх мэтийн хүсэлт илгээж болдог байхад серверээс үйлчлүүлэгч рүү жишээлбэл ==== //depot/projects/dtrace/ports/GIDs#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.48 2008/01/11 15:46:29 rafan Exp $ +$FreeBSD: ports/GIDs,v 1.49 2008/01/20 23:04:50 kuriyama Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -118,3 +118,4 @@ netdisco:*:840: bacula:*:910: iserv:*:911: +_relayd:*:913: ==== //depot/projects/dtrace/ports/MOVED#63 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1529 2008/01/18 21:19:47 beech Exp $ +# $FreeBSD: ports/MOVED,v 1.1532 2008/01/21 11:36:15 miwi Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3355,3 +3355,5 @@ audio/akode-plugins-polypaudio||2008-01-01|Polypaudio is obsolete in favor of pulseaudio audio/teknap|net-p2p/teknap|2008-01-09|moved to net-p2p category net/freeradius-devel|net/freeradius2|2008-01-18|Development version no longer necessary +devel/p5-gearmand|devel/p5-Gearman-Server|2008-01-20|Replaced by p5-Gearman-Server +database/mysqltoolkit|database/maatkit|2008-01-21|project was renamed ==== //depot/projects/dtrace/ports/Mk/bsd.php.mk#12 (text+ko) ==== @@ -7,7 +7,7 @@ # Please send all suggested changes to the maintainer instead of committing # them to CVS yourself. # -# $FreeBSD: ports/Mk/bsd.php.mk,v 1.44 2007/12/27 06:52:45 ale Exp $ +# $FreeBSD: ports/Mk/bsd.php.mk,v 1.45 2008/01/21 07:19:24 ale Exp $ # # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk. # If the port requires a predefined set of PHP extensions, they can be @@ -37,9 +37,10 @@ _PHPMKINCLUDED= yes -.if exists(${LOCALBASE}/etc/php.conf) -.include "${LOCALBASE}/etc/php.conf" -PHP_EXT_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${LOCALBASE}/lib/php/\(.*\),\1,p' +PHPBASE?= ${LOCALBASE} +.if exists(${PHPBASE}/etc/php.conf) +.include "${PHPBASE}/etc/php.conf" +PHP_EXT_DIR!= ${PHPBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${PHPBASE}/lib/php/\(.*\),\1,p' .else DEFAULT_PHP_VER?= 5 @@ -138,18 +139,18 @@ PHP_PORT= ${PORTSDIR}/lang/php${PHP_VER} .if defined(USE_PHP_BUILD) -BUILD_DEPENDS+= ${LOCALBASE}/include/php/main/php.h:${PHP_PORT} +BUILD_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} .endif -RUN_DEPENDS+= ${LOCALBASE}/include/php/main/php.h:${PHP_PORT} +RUN_DEPENDS+= ${PHPBASE}/include/php/main/php.h:${PHP_PORT} PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR} SUB_LIST+= PHP_EXT_DIR=${PHP_EXT_DIR} .if defined(USE_PHPIZE) || defined(USE_PHPEXT) -BUILD_DEPENDS+= phpize:${PHP_PORT} -GNU_CONFIGURE= YES +BUILD_DEPENDS+= ${PHPBASE}/bin/phpize:${PHP_PORT} +GNU_CONFIGURE= yes USE_AUTOTOOLS+= autoconf:261:env -CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config +CONFIGURE_ARGS+=--with-php-config=${PHPBASE}/bin/php-config configure-message: phpize-message do-phpize @@ -157,7 +158,7 @@ @${ECHO_MSG} "===> PHPizing for ${PKGNAME}" do-phpize: - @(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${LOCALBASE}/bin/phpize) + @(cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${PHPBASE}/bin/phpize) .endif .if defined(USE_PHPEXT) @@ -336,9 +337,9 @@ . if ${_USE_PHP_VER${PHP_VER}:M${extension}} != "" . if ${PHP_EXT_INC:M${extension}} == "" . if defined(USE_PHP_BUILD) -BUILD_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS} +BUILD_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS} . endif -RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS} +RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/${${extension}_DEPENDS} . endif . else isyes= ${extension} ==== //depot/projects/dtrace/ports/UIDs#17 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.54 2008/01/19 11:47:16 edwin Exp $ +$FreeBSD: ports/UIDs,v 1.56 2008/01/21 10:58:19 miwi Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin @@ -100,6 +100,7 @@ prelude:*:281:281:Prelude user:/nonexistent:/usr/sbin/nologin _sphinx:*:312:312:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin dkfilter:*:325:325:DK Filter Owner:/nonexistent:/usr/sbin/nologin +_pma:*:336:80:phpMyAdmin Owner:/nonexistent:/sbin/nologin wildfire:*:340:340:Wildfire Daemon:/nonexistent:/usr/sbin/nologin stunnel:*:341:341:Stunnel Daemon:/nonexistent:/usr/sbin/nologin _iodined:*:353:353:Iodine Daemon:/nonexistent:/usr/sbin/nologin @@ -127,3 +128,4 @@ bacula:*:910:910:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin iserv:*:911:911:Iserv Daemon:/nonexistent:/usr/sbin/nologin _sj3:*:912:912:SJ3 Daemon:/nonexistent:/usr/sbin/nologin +_relayd:*:913:913:Relay Daemon:/var/empty:/usr/sbin/nologin ==== //depot/projects/dtrace/ports/UPDATING#47 (text+ko) ==== @@ -6,6 +6,24 @@ time you update your ports collection, before attempting any port upgrades. +20080120: + AFFECTS: users of www/apache20 + AUTHOR: clement@FreeBSD.org + + BDB framework provided by bsd.database.mk is now used by www/apache20 + port. WITH_BERKELEYDB knob is deprecated in favor of WITH_BDB and + WITH_BDB_VER/WITH_BDB_BASE, see documentation for more details. + ('make show-options'). + +20080120: + AFFECTS: users of www/apache22 + AUTHOR: clement@FreeBSD.org + + BDB framework provided by bsd.database.mk is now used by www/apache22 + port. WITH_BERKELEYDB knob is deprecated in favor of WITH_BDB and + WITH_BDB_VER/WITH_BDB_BASE, see documentation for more details. + ('make show-options'). + 20080118: AFFECTS: users of net/freeradius AUTHOR: David Wood @@ -5987,4 +6005,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.575 2008/01/18 21:46:50 beech Exp $ +$FreeBSD: ports/UPDATING,v 1.578 2008/01/20 15:00:32 clement Exp $ ==== //depot/projects/dtrace/src/Makefile.inc1#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.592 2008/01/16 15:05:49 brueffer Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.593 2008/01/21 18:44:54 obrien Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -861,10 +861,6 @@ # legacy: Build compatibility shims for the next three targets # legacy: -.if ${BOOTSTRAPPING} < 503000 - @echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \ - false -.endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -891,26 +887,6 @@ .endif .endif -.if ${BOOTSTRAPPING} < 600029 -_texinfo= gnu/usr.bin/texinfo -.endif - -.if ${BOOTSTRAPPING} < 600015 -_cap_mkdb= usr.bin/cap_mkdb -.endif - -.if ${BOOTSTRAPPING} < 600018 -_colldef= usr.bin/colldef -.endif - -.if ${BOOTSTRAPPING} < 600017 -_gencat= usr.bin/gencat -.endif - -.if ${BOOTSTRAPPING} < 600016 -_mklocale= usr.bin/mklocale -.endif - .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -920,10 +896,6 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif -.if ${BOOTSTRAPPING} < 600020 -_pwd_mkdb= usr.sbin/pwd_mkdb -.endif - .if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \ lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge ==== //depot/projects/dtrace/src/etc/defaults/rc.conf#26 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.322 2008/01/12 20:52:30 maxim Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.323 2008/01/21 04:41:18 rafan Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -119,6 +119,9 @@ firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports # for which denied incoming packets are not # logged. +firewall_nat_enable="NO" # Enable kernel NAT (if firewall_enable == YES) +firewall_nat_interface="" # Public interface or IPaddress to use +firewall_nat_flags="" # Additional configuration parameters ip_portrange_first="NO" # Set first dynamically allocated port ip_portrange_last="NO" # Set last dynamically allocated port ike_enable="NO" # Enable IKE daemon (usually racoon or isakmpd) ==== //depot/projects/dtrace/src/etc/rc.firewall#8 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.53 2008/01/12 19:02:09 maxim Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.54 2008/01/21 04:41:17 rafan Exp $ # # @@ -131,7 +131,13 @@ case ${firewall_nat_enable} in [Yy][Ee][Ss]) if [ -n "${firewall_nat_interface}" ]; then - ${fwcmd} nat 123 config if ${firewall_nat_interface} log + if echo "${firewall_nat_interface}" | \ + grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then + firewall_nat_flags="ip ${firewall_nat_interface} ${firewall_nat_flags}" + else + firewall_nat_flags="if ${firewall_nat_interface} ${firewall_nat_flags}" + fi + ${fwcmd} nat 123 config log ${firewall_nat_flags} ${fwcmd} add 50 nat 123 ip4 from any to any via ${firewall_nat_interface} fi ;; ==== //depot/projects/dtrace/src/lib/msun/src/k_rem_pio2.c#4 (text+ko) ==== @@ -11,9 +11,8 @@ * ==================================================== */ -#ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.7 2005/02/04 18:26:06 das Exp $"; -#endif +#include +__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.9 2008/01/20 04:09:44 bde Exp $"); /* * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2) @@ -131,6 +130,8 @@ * to produce the hexadecimal values shown. */ +#include + #include "math.h" #include "math_private.h" @@ -277,6 +278,7 @@ case 2: fw = 0.0; for (i=jz;i>=0;i--) fw += fq[i]; + STRICT_ASSIGN(double,fw,fw); y[0] = (ih==0)? fw: -fw; fw = fq[0]-fw; for (i=1;i<=jz;i++) fw += fq[i]; ==== //depot/projects/dtrace/src/lib/msun/src/math_private.h#6 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.22 2008/01/17 17:02:11 bde Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.23 2008/01/19 22:05:14 bde Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -164,8 +164,12 @@ #define STRICT_ASSIGN(type, lval, rval) do { \ >>> TRUNCATED FOR MAIL (1000 lines) <<<