Date: Wed, 5 Dec 2007 05:21:49 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 130240 for review Message-ID: <200712050521.lB55LnGi026818@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=130240 Change 130240 by jb@jb_freebsd1 on 2007/12/05 05:21:47 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#51 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/mail/chapter.sgml#4 integrate .. //depot/projects/dtrace/ports/MOVED#52 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#9 integrate .. //depot/projects/dtrace/src/Makefile.inc1#33 integrate .. //depot/projects/dtrace/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 integrate .. //depot/projects/dtrace/src/lib/csu/common/crtbrand.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#8 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/_ldtoa.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisQ.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisx.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/closedir.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/gen/readdir.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/seekdir.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/gen/telldir.c#5 integrate .. //depot/projects/dtrace/src/lib/libc/i386/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/ia64/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libc/nameser/ns_parse.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/resolv/res_data.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/resolv/res_init.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/sparc64/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmc.3#6 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmclog.c#4 integrate .. //depot/projects/dtrace/src/lib/libpmc/pmclog.h#4 integrate .. //depot/projects/dtrace/src/release/Makefile#16 integrate .. //depot/projects/dtrace/src/share/misc/iso3166#6 integrate .. //depot/projects/dtrace/src/share/zoneinfo/asia#9 integrate .. //depot/projects/dtrace/src/share/zoneinfo/northamerica#8 integrate .. //depot/projects/dtrace/src/share/zoneinfo/southamerica#8 integrate .. //depot/projects/dtrace/src/share/zoneinfo/zone.tab#7 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#17 integrate .. //depot/projects/dtrace/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/dtrace/src/sys/compat/ndis/subr_ntoskrnl.c#9 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#34 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#17 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/snp/snp.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pcm/channel.c#8 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/init_main.c#22 integrate .. //depot/projects/dtrace/src/sys/kern/kern_conf.c#8 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mbuf.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mib.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/subr_stack.c#6 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#20 integrate .. //depot/projects/dtrace/src/sys/net/if_lagg.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/if_ether.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp.h#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#14 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/dtrace/src/sys/pc98/include/stack.h#1 branch .. //depot/projects/dtrace/src/sys/security/audit/audit.c#12 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#26 integrate .. //depot/projects/dtrace/src/sys/sys/pmc.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/pmclog.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/proc.h#27 integrate .. //depot/projects/dtrace/src/sys/sys/systm.h#15 integrate .. //depot/projects/dtrace/src/tools/regression/lib/libc/stdio/test-printfloat.c#4 integrate .. //depot/projects/dtrace/src/tools/regression/lib/libc/stdio/test-scanfloat.c#5 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athdebug/athdebug.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#6 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#7 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.h#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanwatch/wlanwatch.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/Makefile#12 integrate .. //depot/projects/dtrace/src/usr.bin/procstat/Makefile#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat.1#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat.h#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_args.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_basic.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_bin.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_cred.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_files.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_kstack.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_threads.c#1 branch .. //depot/projects/dtrace/src/usr.bin/procstat/procstat_vm.c#1 branch .. //depot/projects/dtrace/src/usr.sbin/pmcstat/pmcstat_log.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/zic/zic.c#4 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#20 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#16 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#51 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.740 2007/12/01 18:11:06 chinsan Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.741 2007/12/04 12:41:22 chinsan Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -3673,6 +3673,11 @@ </listitem> <listitem> + <para>Hung-Yi Chen + <email>gaod.chen@gmail.com</email></para> + </listitem> + + <listitem> <para>Hyogeol Lee <email>hyogeollee@gmail.com</email></para> </listitem> @@ -10095,11 +10100,6 @@ </listitem> <listitem> - <para>gaod - <email>gaod.chen@gmail.com</email></para> - </listitem> - - <listitem> <para>rossiya <email>rossiya@gmail.com</email></para> </listitem> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/faq/book.sgml#6 (text+ko) ==== @@ -29,7 +29,7 @@ <corpauthor>FreeBSD 文件計畫</corpauthor> - <pubdate>$FreeBSD: doc/zh_TW.Big5/books/faq/book.sgml,v 1.23 2007/09/18 12:52:27 chinsan Exp $</pubdate> + <pubdate>$FreeBSD: doc/zh_TW.Big5/books/faq/book.sgml,v 1.24 2007/12/04 12:11:29 chinsan Exp $</pubdate> <copyright> <year>1995</year> @@ -1047,7 +1047,7 @@ <literal>#BSDChat</literal> 頻道，可由 <hostid>irc.seed.net.tw</hostid> 或 <hostid>irc.csie.nctu.edu.tw</hostid> 或 - <hostid>irc.tw.freebsd.org</hostid> 進入 + <hostid>irc.tw.freebsd.org</hostid> 進入， 這是台灣的 &os; 使用者頻道。(Big5 編碼)</para> </listitem> </itemizedlist> @@ -1055,7 +1055,8 @@ <para>上述每個頻道都不一樣，風格迥異而各具特色，且並沒有相連， 因此，你得多方嘗試才能找到適合自己的頻道。 而有些地方與所有的 IRC 文化類似，就是請注意自己言行是否恰當， - 另外可能跟頻道內一些年輕/老一輩的，會有些代溝需要適應。 + 另外可能跟頻道內一些年輕/老一輩的會有些代溝需要適應， + 總之請多保持禮貌。</para> </answer> </qandaentry> ==== //depot/projects/dtrace/doc/zh_TW.Big5/books/handbook/mail/chapter.sgml#4 (text+ko) ==== @@ -1,8 +1,8 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/zh_TW.Big5/books/handbook/mail/chapter.sgml,v 1.3 2007/11/24 14:38:35 chinsan Exp $ - Original revision: 1.132 + $FreeBSD: doc/zh_TW.Big5/books/handbook/mail/chapter.sgml,v 1.4 2007/12/03 18:17:47 chinsan Exp $ + Original revision: 1.136 --> <chapter id="mail"> @@ -30,127 +30,120 @@ <title>概述</title> <indexterm><primary>email</primary></indexterm> - <para><quote>Electronic Mail</quote>, better known as email, is one of the - most widely used forms of communication today. This chapter provides - a basic introduction to running a mail server on &os;, as well as an - introduction to sending and receiving email using &os;; however, - it is not a complete reference and in fact many important - considerations are omitted. For more complete coverage of the - subject, the reader is referred to the many excellent books listed - in <xref linkend="bibliography">.</para> + <para><quote>電子郵件</quote>或者俗稱的 email， + 乃是現今使用最廣泛的溝通方式之一。 本章主要介紹如何在 &os; 上安裝、 + 設定 email 服務，以及如何在 &os; 收發信件； 然而這並不是完整的參考手冊， + 實際上許多需考量的重要事項並未提及，若欲瞭解細節請參閱 <xref + linkend="bibliography"> 內的參考書籍。</para> - <para>After reading this chapter, you will know:</para> + <para>讀完這章，您將了解︰</para> <itemizedlist> <listitem> - <para>What software components are involved in sending and receiving - electronic mail.</para> + <para>哪些軟體元件與收發電子郵件有關。</para> </listitem> <listitem> - <para>Where basic <application>sendmail</application> configuration - files are located in FreeBSD.</para> + <para>FreeBSD 內的 <application>sendmail</application> + 基本設定檔在哪。</para> </listitem> <listitem> - <para>The difference between remote and - local mailboxes.</para> + <para>遠端信箱與本機信箱的區別。</para> </listitem> <listitem> - <para>How to block spammers from illegally using your mail server as a - relay.</para> + <para>如何阻擋 spammer(垃圾郵件製造者)非法運用您的郵件伺服器作為 + relay(轉發中繼點)。</para> </listitem> <listitem> - <para>How to install and configure an alternate Mail Transfer Agent on - your system, replacing <application>sendmail</application>.</para> + <para>如何安裝、設定其他 Mail Transfer Agent(MTA) 來取代 + <application>sendmail</application>。</para> </listitem> <listitem> - <para>How to troubleshoot common mail server problems.</para> + <para>如何處理常見的郵件伺服器問題。</para> </listitem> <listitem> - <para>How to use SMTP with UUCP.</para> + <para>如何使用 UUCP 來進行 SMTP。</para> </listitem> <listitem> - <para>How to set up the system to send mail only.</para> + <para>如何設定系統，使其只能發送郵件。</para> </listitem> <listitem> - <para>How to use mail with a dialup connection.</para> + <para>如何在撥接上網環境中，收發郵件。</para> </listitem> <listitem> - <para>How to configure SMTP Authentication for added security.</para> + <para>如何設定 SMTP 驗證，以加強安全性。</para> </listitem> <listitem> - <para>How to install and use a Mail User Agent, such as - <application>mutt</application> to send and receive email.</para> + <para>如何安裝、使用 Mail User Agent(MUA) 程式，比如 + <application>mutt</application> 來收發郵件。</para> </listitem> <listitem> - <para>How to download your mail from a remote <acronym>POP</acronym> - or <acronym>IMAP</acronym> server.</para> + <para>如何從遠端 <acronym>POP</acronym> 或 <acronym>IMAP</acronym> + 主機去下載郵件。</para> </listitem> <listitem> - <para>How to automatically apply filters and rules to incoming - email.</para> + <para>如何在收信方面，自動套用郵件過濾。</para> </listitem> </itemizedlist> - <para>Before reading this chapter, you should:</para> + <para>在開始閱讀這章之前，您需要︰</para> <itemizedlist> <listitem> - <para>Properly set up your network connection - (<xref linkend="advanced-networking">).</para> + <para>先設好你的網路 + (<xref linkend="advanced-networking">)。</para> </listitem> <listitem> - <para>Properly set up the DNS information for your mail host - (<xref linkend="network-servers">).</para> + <para>能正確為郵件伺服器設定 DNS + (<xref linkend="network-servers">)。</para> </listitem> <listitem> - <para>Know how to install additional third-party software - (<xref linkend="ports">).</para></listitem> + <para>知道如何透過 port/package 安裝軟體 + (<xref linkend="ports">)。</para></listitem> </itemizedlist> </sect1> <sect1 id="mail-using"> - <title>Using Electronic Mail</title> + <title>使用電子郵件</title> <indexterm><primary>POP</primary></indexterm> <indexterm><primary>IMAP</primary></indexterm> <indexterm><primary>DNS</primary></indexterm> - <para>There are five major parts involved in an email exchange. They - are: <link linkend="mail-mua">the user program</link>, <link - linkend="mail-mta">the server daemon</link>, <link - linkend="mail-dns">DNS</link>, <link linkend="mail-receive">a - remote or local mailbox</link>, and of course, <link linkend="mail-host">the - mailhost itself</link>.</para> + <para>在 email 交換的過程中有 5 個主要部分，分別是：<link + linkend="mail-mua">MUA</link>、<link linkend="mail-mta">MTA</link>、 + <link linkend="mail-dns">DNS</link>、<link linkend="mail-receive"> + 遠端或本機的信箱</link>，當然還有 <link linkend="mail-host">郵件主機本身 + </link>。</para> <sect2 id="mail-mua"> - <title>The User Program</title> + <title>MUA 程式</title> - <para>This includes command line programs such as - <application>mutt</application>, - <application>pine</application>, <application>elm</application>, - and <command>mail</command>, and <acronym>GUI</acronym> programs such as - <application>balsa</application>, - <application>xfmail</application> to name a few, and something - more <quote>sophisticated</quote> like a WWW browser. These - programs simply pass off the email transactions to the local - <link linkend="mail-host"><quote>mailhost</quote></link>, either - by calling one of the <link linkend="mail-mta">server - daemons</link> available, or delivering it over <acronym>TCP</acronym>.</para> - </sect2> + <para>包括一些文字介面的程式，像是 + <application>mutt</application>、 + <application>pine</application>、<application>elm</application>、 + and <command>mail</command>，以及 <acronym>GUI</acronym> 介面的程式， + 像是 <application>balsa</application>、 + <application>xfmail</application> 等等。 此外，還有更 + <quote>複雜的</quote> 像是 WWW 瀏覽器。 + 這些程式會郵件處理交給 <link + linkend="mail-host"><quote>郵件主機</quote></link>，或者透過呼叫 + <link linkend="mail-mta">MTA</link>(若有的話)或者是透過 + <acronym>TCP</acronym> 來傳遞郵件。</para> + </sect2> <sect2 id="mail-mta"> <title>Mailhost Server Daemon</title> @@ -1336,17 +1329,7 @@ via &man.m4.1; preprocessing, where the actual configuration occurs on a higher abstraction level. The &man.m4.1; configuration files can be found under - <filename>/usr/src/usr.sbin/sendmail/cf</filename>.</para> - - <para>If you did not install your system with full sources, the - <application>sendmail</application> configuration set has been broken out into a separate source - distribution tarball. Assuming you have your FreeBSD source code - CDROM mounted, do:</para> - - <screen>&prompt.root; <userinput>cd /cdrom/src</userinput> -&prompt.root; <userinput>cat scontrib.?? | tar xzf - -C /usr/src/contrib/sendmail</userinput></screen> - - <para>This extracts to only a few hundred kilobytes. The file + <filename>/usr/share/sendmail/cf</filename>. The file <filename>README</filename> in the <filename>cf</filename> directory can serve as a basic introduction to &man.m4.1; configuration.</para> @@ -1357,13 +1340,13 @@ <para>First, you have to create your <filename>.mc</filename> file. The directory - <filename>/usr/src/usr.sbin/sendmail/cf/cf</filename> contains a + <filename>/usr/share/sendmail/cf/cf</filename> contains a few examples. Assuming you have named your file <filename>foo.mc</filename>, all you need to do in order to convert it into a valid <filename>sendmail.cf</filename> is:</para> - <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail/cf/cf</userinput> + <screen>&prompt.root; <userinput>cd /etc/mail</userinput> &prompt.root; <userinput>make foo.cf</userinput> &prompt.root; <userinput>cp foo.cf /etc/mail/sendmail.cf</userinput></screen> @@ -1656,26 +1639,38 @@ <procedure> <step> - <para>Install <filename role="package">security/cyrus-sasl</filename> + <para>Install <filename role="package">security/cyrus-sasl2</filename> from the ports. You can find this port in - <filename role="package">security/cyrus-sasl</filename>. - <filename role="package">security/cyrus-sasl</filename> has - a number of compile time options to choose from and, for - the method we will be using here, make sure to select the - <option>pwcheck</option> option.</para> + <filename role="package">security/cyrus-sasl2</filename>. The + <filename role="package">security/cyrus-sasl2</filename> port + supports a number of compile-time options. For the SMTP + Authentication method we will be using here, make sure that + the <option>LOGIN</option> option is not disabled.</para> </step> <step> - <para>After installing <filename role="package">security/cyrus-sasl</filename>, - edit <filename>/usr/local/lib/sasl/Sendmail.conf</filename> + <para>After installing <filename role="package">security/cyrus-sasl2</filename>, + edit <filename>/usr/local/lib/sasl2/Sendmail.conf</filename> (or create it if it does not exist) and add the following line:</para> - <programlisting>pwcheck_method: passwd</programlisting> + <programlisting>pwcheck_method: saslauthd</programlisting> + </step> + + <step> + <para>Next, install <filename role="package">security/cyrus-sasl2-saslauthd</filename>, + edit <filename>/etc/rc.conf</filename> to add the following + line:</para> + + <programlisting>saslauthd_enable="YES"</programlisting> + + <para>and finally start the saslauthd daemon:</para> + + <screen>&prompt.root; <userinput>/usr/local/etc/rc.d/saslauthd start</userinput></screen> - <para>This method will enable <application>sendmail</application> - to authenticate against your FreeBSD <filename>passwd</filename> + <para>This daemon serves as a broker for <application>sendmail</application> to + authenticate against your FreeBSD <filename>passwd</filename> database. This saves the trouble of creating a new set of usernames and passwords for each user that needs to use <acronym>SMTP</acronym> authentication, and keeps the login @@ -1686,14 +1681,14 @@ <para>Now edit <filename>/etc/make.conf</filename> and add the following lines:</para> - <programlisting>SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL + <programlisting>SENDMAIL_CFLAGS=-I/usr/local/include/sasl -DSASL SENDMAIL_LDFLAGS=-L/usr/local/lib -SENDMAIL_LDADD=-lsasl</programlisting> +SENDMAIL_LDADD=-lsasl2</programlisting> <para>These lines will give <application>sendmail</application> the proper configuration options for linking - to <filename role="package">cyrus-sasl</filename> at compile time. - Make sure that <filename role="package">cyrus-sasl</filename> + to <filename role="package">cyrus-sasl2</filename> at compile time. + Make sure that <filename role="package">cyrus-sasl2</filename> has been installed before recompiling <application>sendmail</application>.</para> </step> @@ -1701,11 +1696,12 @@ <step> <para>Recompile <application>sendmail</application> by executing the following commands:</para> - <screen>&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput> -&prompt.root; <userinput>make cleandir</userinput> -&prompt.root; <userinput>make obj</userinput> -&prompt.root; <userinput>make</userinput> -&prompt.root; <userinput>make install</userinput></screen> + <screen>&prompt.root; <userinput>cd /usr/src/lib/libsmutil</userinput> +&prompt.root; <userinput>make cleandir && make obj && make</userinput> +&prompt.root; <userinput>cd /usr/src/lib/libsm</userinput> +&prompt.root; <userinput>make cleandir && make obj && make</userinput> +&prompt.root; <userinput>cd /usr/src/usr.sbin/sendmail</userinput> +&prompt.root; <userinput>make cleandir && make obj && make && make install</userinput></screen> <para>The compile of <application>sendmail</application> should not have any problems if <filename>/usr/src</filename> has not been changed extensively @@ -1721,8 +1717,7 @@ <programlisting>dnl set SASL options TRUST_AUTH_MECH(`GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl -define(`confAUTH_MECHANISMS', `GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl -define(`confDEF_AUTH_INFO', `/etc/mail/auth-info')dnl</programlisting> +define(`confAUTH_MECHANISMS', `GSSAPI DIGEST-MD5 CRAM-MD5 LOGIN')dnl</programlisting> <para>These options configure the different methods available to <application>sendmail</application> for authenticating users. @@ -1750,14 +1745,6 @@ <application>sendmail</application> to 13 and watch <filename>/var/log/maillog</filename> for any errors.</para> - <para>You may wish to add the following line to <filename>/etc/rc.conf</filename> - so this service will be available after every system boot:</para> - - <programlisting>cyrus_pwcheck_enable="YES"</programlisting> - - <para>This will ensure the initialization of <acronym>SMTP_AUTH</acronym> upon system - boot.</para> - <para>For more information, please see the <application>sendmail</application> page regarding <ulink url="http://www.sendmail.org/~ca/email/auth.html">; @@ -1840,7 +1827,7 @@ that should be displayed. In this example, we will read the first email:</para> - <screen>& <userinput>t 1</userinput> + <screen>& <userinput>t 1</userinput> Message 1: From root@localhost Mon Mar 8 14:05:52 2004 X-Original-To: marcs@localhost @@ -1870,7 +1857,7 @@ single <keycap>.</keycap> on a new line. An example can be seen below:</para> - <screen>& <userinput>R 1</userinput> + <screen>& <userinput>R 1</userinput> To: root@localhost Subject: Re: test @@ -1887,7 +1874,7 @@ be specified by putting a single <keycap>.</keycap> on a new line.</para> - <screen>& <userinput>mail root@localhost</userinput> + <screen>& <userinput>mail root@localhost</userinput> Subject: <userinput>I mastered mail Now I can send and receive email using mail ... :) @@ -1995,7 +1982,11 @@ &man.vi.1; command as an editor for creating and replying to emails. This may be customized by the user by creating or editing their own <filename>.muttrc</filename> file in their home directory and setting the - <literal>editor</literal> variable.</para> + <literal>editor</literal> variable or by setting the + <envar>EDITOR</envar> environment variable. See + <ulink url="http://www.mutt.org/"></ulink>; for more + information about configuring + <application>mutt</application>.</para> </note> <para>In order to compose a new mail message, press @@ -2018,6 +2009,7 @@ help, which can be accessed from most of the menus by pressing the <keycap>?</keycap> key. The top line also displays the keyboard shortcuts where appropriate.</para> + </sect2> <sect2 id="pine-command"> @@ -2281,7 +2273,7 @@ address of <email role="nolink">goodmail@example2.com</email>:</para> <programlisting>:0 -* < 1000 +* < 1000 ! goodmail@example2.com</programlisting> <para>Send all mail sent to <email>alternate@example.com</email> ==== //depot/projects/dtrace/ports/MOVED#52 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1512 2007/11/03 23:36:39 gerald Exp $ +# $FreeBSD: ports/MOVED,v 1.1513 2007/12/03 09:43:40 dougb Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3325,3 +3325,7 @@ devel/py-qt4-qct|devel/qct|2007-10-26|Since it's an application but not a Py/Qt library the port was renamed net-mgmt/wispy-tools|net-mgmt/spectools|2007-10-29|project renamed lang/gcc40|lang/gcc42|2007-11-04|Superseded by gcc41 and later, gcc42 being the recommended update path +chinese/bind8||2007-12-03|EOL: Use dns/bind94 instead +dns/bind8||2007-12-03|EOL: Use dns/bind94 instead +dns/bind84||2007-12-03|EOL: Use dns/bind94 instead +mail/smc-milter||2007-12-03|Relies on BIND 8, which is EOL ==== //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#9 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA <knu@FreeBSD.org> # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.164 2007/10/30 11:24:58 stas Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.165 2007/12/04 12:26:06 stas Exp $ # .if !defined(Ruby_Include) @@ -162,7 +162,7 @@ .if defined(RUBY_VER) && ${RUBY_VER} == 1.8 RUBY_RELVERSION= 1.8.6 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 111 ==== //depot/projects/dtrace/src/Makefile.inc1#33 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.590 2007/10/31 09:26:42 yar Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -606,17 +606,25 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in ${ITOOLS}; do \ + progs=$$(for prog in ${ITOOLS}; do \ if progpath=`which $$prog`; then \ - progs="$$progs $$progpath"; \ + echo $$progpath; \ else \ echo "Required tool $$prog not found in PATH." >&2; \ exit 1; \ fi; \ - done; \ - cp $$progs ${INSTALLTMP}; \ - cp `ldd -f "%p\n" -f "%p\n" $$progs 2>/dev/null | \ - sort -u` ${INSTALLTMP} + done); \ + libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \ + while read line; do \ + set -- $$line; \ + if [ "$$2 $$3" != "not found" ]; then \ + echo $$2; \ + else \ + echo "Required library $$1 not found." >&2; \ + exit 1; \ + fi; \ + done); \ + cp $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ ${IMAKEENV} rm -rf ${INSTALLTMP} ==== //depot/projects/dtrace/src/contrib/bind9/lib/isc/arm/include/isc/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.1 2007/06/05 22:15:38 dougb Exp $ + * $FreeBSD: src/contrib/bind9/lib/isc/arm/include/isc/atomic.h,v 1.1.1.2 2007/12/03 08:26:34 dougb Exp $ */ #ifndef ISC_ATOMIC_H @@ -49,7 +49,29 @@ static inline isc_int32_t isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) { - return atomic_cmpset_int(p, cmpval, val); + register int done, ras_start; + + __asm __volatile("1:\n" + "adr %1, 1b\n" + "mov %0, #0xe0000004\n" + "str %1, [%0]\n" + "mov %0, #0xe0000008\n" + "adr %1, 2f\n" + "str %1, [%0]\n" + "ldr %1, [%2]\n" + "cmp %1, %3\n" + "streq %4, [%2]\n" + "2:\n" + "mov %3, #0\n" + "mov %0, #0xe0000004\n" + "str %3, [%0]\n" + "mov %3, #0xffffffff\n" + "mov %0, #0xe0000008\n" + "str %3, [%0]\n" + : "=r" (ras_start), "=r" (done) + ,"+r" (p), "+r" (cmpval), "+r" (val) : : "memory"); + return (done); + } #else /* !FreeBSD */ ==== //depot/projects/dtrace/src/lib/csu/common/crtbrand.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.4 2003/10/17 15:43:13 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/csu/common/crtbrand.c,v 1.6 2007/12/04 12:18:43 kib Exp $"); #include <sys/param.h> @@ -43,7 +43,7 @@ int32_t type; char name[sizeof ABI_VENDOR]; int32_t desc; -} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = { +} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __used = { sizeof ABI_VENDOR, sizeof(int32_t), ABI_NOTETYPE, ==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.15 2007/10/12 04:08:28 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.16 2007/12/04 06:32:12 kientzle Exp $"); #ifdef HAVE_ERRNO_H #include <errno.h> @@ -336,7 +336,8 @@ zip->entry_offset = 0; /* If there's no body, force read_data() to return EOF immediately. */ - if (zip->entry_bytes_remaining < 1) + if (0 == (zip->flags & ZIP_LENGTH_AT_END) + && zip->entry_bytes_remaining < 1) zip->end_of_entry = 1; /* Set up a more descriptive format name. */ ==== //depot/projects/dtrace/src/lib/libc/amd64/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.5 2006/03/16 14:22:19 ru Exp $ +# $FreeBSD: src/lib/libc/amd64/Makefile.inc,v 1.6 2007/12/03 07:17:32 das Exp $ # # Machine dependent definitions for the amd64 architecture. # # Long double is 80 bits -GDTOASRCS+=strtopx.c +GDTOASRCS+=strtorx.c MDSRCS+=machdep_ldisx.c SYM_MAPS+=${.CURDIR}/amd64/Symbol.map ==== //depot/projects/dtrace/src/lib/libc/gdtoa/_ldtoa.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.3 2007/11/21 01:10:42 jb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.4 2007/12/03 07:17:32 das Exp $"); #include <float.h> #include <inttypes.h> @@ -46,11 +46,11 @@ __ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign, char **rve) { - static FPI fpi = { + FPI fpi = { LDBL_MANT_DIG, /* nbits */ LDBL_MIN_EXP - LDBL_MANT_DIG, /* emin */ LDBL_MAX_EXP - LDBL_MANT_DIG, /* emax */ - FPI_Round_near, /* rounding */ + FLT_ROUNDS, /* rounding */ #ifdef Sudden_Underflow /* unused, but correct anyway */ 1 #else @@ -64,7 +64,15 @@ void *vbits = bits; u.e = *ld; + + /* + * gdtoa doesn't know anything about the sign of the number, so + * if the number is negative, we need to swap rounding modes of + * 2 (upwards) and 3 (downwards). + */ *sign = u.bits.sign; + fpi.rounding ^= (fpi.rounding >> 1) & u.bits.sign; + be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1); LDBL_TO_ARRAY32(u, bits); ==== //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisQ.c#4 (text+ko) ==== @@ -31,7 +31,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.2 2003/04/09 05:58:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisQ.c,v 1.3 2007/12/03 07:17:32 das Exp $"); + +#include <float.h> #include "gdtoaimp.h" @@ -40,6 +42,6 @@ { long double result; - strtopQ(s, sp, &result); + strtorQ(s, sp, FLT_ROUNDS, &result); return result; } ==== //depot/projects/dtrace/src/lib/libc/gdtoa/machdep_ldisx.c#4 (text+ko) ==== @@ -31,7 +31,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.3 2007/12/03 07:17:32 das Exp $"); + +#include <float.h> #include "gdtoaimp.h" @@ -40,6 +42,6 @@ { long double result; - strtopx(s, sp, &result); + strtorx(s, sp, FLT_ROUNDS, &result); return result; } ==== //depot/projects/dtrace/src/lib/libc/gen/closedir.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)closedir.c 8.1 (Berkeley) 6/10/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.12 2007/11/19 21:57:28 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.13 2007/12/03 14:33:50 des Exp $"); #include "namespace.h" #include <sys/types.h> @@ -54,7 +54,7 @@ int fd; if (__isthreaded) - _pthread_mutex_lock((void *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); _seekdir(dirp, dirp->dd_rewind); /* free seekdir storage */ fd = dirp->dd_fd; dirp->dd_fd = -1; @@ -62,8 +62,8 @@ free((void *)dirp->dd_buf); _reclaim_telldir(dirp); if (__isthreaded) { - _pthread_mutex_unlock((void *)&dirp->dd_lock); - _pthread_mutex_destroy((void *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); + _pthread_mutex_destroy(&dirp->dd_lock); } free((void *)dirp); return(_close(fd)); ==== //depot/projects/dtrace/src/lib/libc/gen/readdir.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.13 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.14 2007/12/03 14:33:50 des Exp $"); #include "namespace.h" #include <sys/param.h> @@ -87,9 +87,9 @@ struct dirent *dp; if (__isthreaded) { - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); dp = _readdir_unlocked(dirp); - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); } else dp = _readdir_unlocked(dirp); @@ -108,10 +108,10 @@ saved_errno = errno; errno = 0; if (__isthreaded) { - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); if ((dp = _readdir_unlocked(dirp)) != NULL) memcpy(entry, dp, _GENERIC_DIRSIZ(dp)); - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); } else if ((dp = _readdir_unlocked(dirp)) != NULL) memcpy(entry, dp, _GENERIC_DIRSIZ(dp)); ==== //depot/projects/dtrace/src/lib/libc/gen/seekdir.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)seekdir.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.6 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.7 2007/12/03 14:33:51 des Exp $"); #include "namespace.h" #include <sys/param.h> @@ -52,8 +52,8 @@ long loc; { if (__isthreaded) - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); _seekdir(dirp, loc); if (__isthreaded) - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); } ==== //depot/projects/dtrace/src/lib/libc/gen/telldir.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)telldir.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.9 2007/01/09 00:27:55 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.10 2007/12/03 14:33:51 des Exp $"); #include "namespace.h" #include <sys/param.h> @@ -64,13 +64,13 @@ if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL) return (-1); if (__isthreaded) - _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_lock(&dirp->dd_lock); lp->loc_index = dirp->dd_td->td_loccnt++; lp->loc_seek = dirp->dd_seek; lp->loc_loc = dirp->dd_loc; LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe); if (__isthreaded) - _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock); + _pthread_mutex_unlock(&dirp->dd_lock); return (lp->loc_index); } ==== //depot/projects/dtrace/src/lib/libc/i386/Makefile.inc#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.2 2006/03/13 01:14:57 deischen Exp $ +# $FreeBSD: src/lib/libc/i386/Makefile.inc,v 1.3 2007/12/03 07:17:32 das Exp $ # Long double is 80 bits -GDTOASRCS+=strtopx.c +GDTOASRCS+=strtorx.c MDSRCS+=machdep_ldisx.c SYM_MAPS+=${.CURDIR}/i386/Symbol.map ==== //depot/projects/dtrace/src/lib/libc/ia64/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.7 2006/03/16 14:27:17 ru Exp $ +# $FreeBSD: src/lib/libc/ia64/Makefile.inc,v 1.8 2007/12/03 07:17:32 das Exp $ # # Machine dependent definitions for the ia64 architecture. # # Long double is 80 bits -GDTOASRCS+=strtopx.c +GDTOASRCS+=strtorx.c MDSRCS+=machdep_ldisx.c SYM_MAPS+=${.CURDIR}/ia64/Symbol.map ==== //depot/projects/dtrace/src/lib/libc/nameser/ns_parse.c#4 (text) ==== @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp $"; +static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $"; #endif /* Import. */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712050521.lB55LnGi026818>