Author: krejzi Date: Fri Mar 1 11:29:01 2013 New Revision: 11039 Log: Git 1.8.1.4, Ruby 1.9.3-p392, XScreenSaver 5.21.
Modified: trunk/BOOK/general.ent trunk/BOOK/general/genutils/xscreensaver.xml trunk/BOOK/general/prog/git.xml trunk/BOOK/general/prog/ruby.xml trunk/BOOK/introduction/welcome/changelog.xml Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Fri Mar 1 10:28:52 2013 (r11038) +++ trunk/BOOK/general.ent Fri Mar 1 11:29:01 2013 (r11039) @@ -352,7 +352,7 @@ <!ENTITY spidermonkey-version "1.0.0"> <!ENTITY tidy-version "cvs_20101110"> <!ENTITY unixodbc-version "2.3.1"> -<!ENTITY xscreensaver-version "5.20"> +<!ENTITY xscreensaver-version "5.21"> <!-- Chapter 12 --> <!ENTITY apache-ant-version "1.8.4"> @@ -402,7 +402,7 @@ <!ENTITY gcc-version "4.7.2"> <!ENTITY gc-version "7.2d"> <!ENTITY gdb-version "7.5"> -<!ENTITY git-version "1.8.0"> +<!ENTITY git-version "1.8.1.4"> <!ENTITY guile-version "2.0.7"> <!ENTITY icedtea-version "2.3.3"> <!ENTITY openjdk-version "1.7.0.9"> @@ -415,7 +415,7 @@ <!ENTITY pkgconfig-version "0.27.1"> <!ENTITY python2-version "2.7.3"> <!ENTITY python3-version "3.3.0"> -<!ENTITY ruby-version "1.9.3-p374"> +<!ENTITY ruby-version "1.9.3-p392"> <!ENTITY slang-version "2.2.4"> <!ENTITY subversion-version "1.7.7"> <!ENTITY tcl-version "8.6.0"> Modified: trunk/BOOK/general/genutils/xscreensaver.xml ============================================================================== --- trunk/BOOK/general/genutils/xscreensaver.xml Fri Mar 1 10:28:52 2013 (r11038) +++ trunk/BOOK/general/genutils/xscreensaver.xml Fri Mar 1 11:29:01 2013 (r11039) @@ -6,9 +6,9 @@ <!ENTITY xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz";> <!ENTITY xscreensaver-download-ftp " "> - <!ENTITY xscreensaver-md5sum "1faec61c61e29dc11f6ec9e4750ab877"> + <!ENTITY xscreensaver-md5sum "1e9828ab7146d443c9d109cf2a1a4ed2"> <!ENTITY xscreensaver-size "7.1 MB"> - <!ENTITY xscreensaver-buildsize "175 MB"> + <!ENTITY xscreensaver-buildsize "205 MB"> <!ENTITY xscreensaver-time "2.0 SBU"> ]> Modified: trunk/BOOK/general/prog/git.xml ============================================================================== --- trunk/BOOK/general/prog/git.xml Fri Mar 1 10:28:52 2013 (r11038) +++ trunk/BOOK/general/prog/git.xml Fri Mar 1 11:29:01 2013 (r11039) @@ -4,12 +4,11 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %general-entities; - <!ENTITY git-download-http - "http://git-core.googlecode.com/files/git-&git-version;.tar.gz";> + <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz";> <!ENTITY git-download-ftp " "> - <!ENTITY git-md5sum "12f4d20f34ae37086d86dd3b9d037bba"> - <!ENTITY git-size "4.0 MB"> - <!ENTITY git-buildsize "124 MB"> + <!ENTITY git-md5sum "60f32ef4a6b3fa2143b81a28704333ed"> + <!ENTITY git-size "4.2 MB"> + <!ENTITY git-buildsize "200 MB"> <!ENTITY git-time "3.3 SBU (including tests)"> ]> @@ -24,61 +23,77 @@ <title>Git-&git-version;</title> <indexterm zone="git"> - <primary sortas="a-git">Git</primary> + <primary sortas="a-Git">Git</primary> </indexterm> <sect2 role="package"> <title>Introduction to Git</title> - <para><application>Git</application> is a free and open source, distributed - version control system designed to handle everything from small to very - large projects with speed and efficiency. Every - <application>Git</application> clone is a full-fledged repository with - complete history and full revision tracking capabilities, not dependent on - network access or a central server. Branching and merging are fast and easy - to do. <application>Git</application> is used for version control of files, - much like tools such as <application>Mercurial</application>, - <application>Bazaar</application>, <xref linkend="subversion"/>, - <xref linkend="cvs"/>, <application>Perforce</application>, and - <application>Team Foundation Server</application>.</para> + <para> + <application>Git</application> is a free and open source, distributed + version control system designed to handle everything from small to very + large projects with speed and efficiency. Every + <application>Git</application> clone is a full-fledged repository with + complete history and full revision tracking capabilities, not dependent on + network access or a central server. Branching and merging are fast and easy + to do. <application>Git</application> is used for version control of files, + much like tools such as <application>Mercurial</application>, + <application>Bazaar</application>, <xref linkend="subversion"/>, + <xref linkend="cvs"/>, <application>Perforce</application>, and + <application>Team Foundation Server</application>. + </para> &lfs72_checked; <bridgehead renderas="sect3">Package Information</bridgehead> <itemizedlist spacing="compact"> <listitem> - <para>Download (HTTP): <ulink url="&git-download-http;"/></para> + <para> + Download (HTTP): <ulink url="&git-download-http;"/> + </para> </listitem> <listitem> - <para>Download (FTP): <ulink url="&git-download-ftp;"/></para> + <para> + Download (FTP): <ulink url="&git-download-ftp;"/> + </para> </listitem> <listitem> - <para>Download MD5 sum: &git-md5sum;</para> + <para> + Download MD5 sum: &git-md5sum; + </para> </listitem> <listitem> - <para>Download size: &git-size;</para> + <para> + Download size: &git-size; + </para> </listitem> <listitem> - <para>Estimated disk space required: &git-buildsize;</para> + <para> + Estimated disk space required: &git-buildsize; + </para> </listitem> <listitem> - <para>Estimated build time: &git-time;</para> + <para> + Estimated build time: &git-time; + </para> </listitem> </itemizedlist> <bridgehead renderas="sect3">Additional Downloads</bridgehead> <itemizedlist spacing="compact"> <listitem> - <para><ulink - url="http://git-core.googlecode.com/files/git-manpages-&git-version;.tar.gz";> - http://git-core.googlecode.com/files/git-manpages-&git-version;.tar.gz</ulink> - (only needed if you've not installed asciidoc and xmlto)</para> + <para> + <ulink url="http://git-core.googlecode.com/files/git-manpages-&git-version;.tar.gz";> + http://git-core.googlecode.com/files/git-manpages-&git-version;.tar.gz</ulink> + (only needed if you've not installed asciidoc and xmlto) + </para> </listitem> <listitem> - <para><ulink - url="http://git-core.googlecode.com/files/git-htmldocs-&git-version;.tar.gz";> - http://git-core.googlecode.com/files/git-htmldocs-&git-version;.tar.gz</ulink> - and other docs (only needed if you've not installed asciidoc).</para> + <para> + <ulink url="http://git-core.googlecode.com/files/git-htmldocs-&git-version;.tar.gz";> + http://git-core.googlecode.com/files/git-htmldocs-&git-version;.tar.gz</ulink> + and other docs (only needed if you've not installed asciidoc). + </para> </listitem> </itemizedlist> @@ -86,16 +101,16 @@ <bridgehead renderas="sect4">Recommended</bridgehead> <para role="recommended"> - <xref linkend="python2"/> and <xref linkend="curl"/> (needed to use <application>Git</application> over http, - https, ftp or ftps) + https, ftp or ftps), + <xref linkend="expat"/>, + <xref linkend="openssl"/> and + <xref linkend="python2"/> </para> <bridgehead renderas="sect4">Optional</bridgehead> <para role="optional"> - <xref linkend="pcre"/>, - <xref linkend="openssl"/>, - <xref linkend="expat"/>, and + <xref linkend="pcre"/> and <xref linkend="tk"/> (gitk, a simple <application>Git</application> repository viewer, uses <application>Tk</application> at runtime) </para> @@ -107,46 +122,59 @@ </para> <para condition="html" role="usernotes">User Notes: - <ulink url="&blfs-wiki;/git"/></para> + <ulink url="&blfs-wiki;/git"/> + </para> </sect2> <sect2 role="installation"> <title>Installation of Git</title> - <para>Install <application>Git</application> by running the following - commands:</para> + <para> + Install <application>Git</application> by running the following + commands: + </para> -<screen><userinput>./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --with-gitconfig=/etc/gitconfig && +<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib && make</userinput></screen> - <para>If you have installed <ulink - url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> you can create - the html version of the man pages and other docs:</para> + <para> + If you have installed <ulink + url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> you can + create the html version of the man pages and other docs: + </para> <screen><userinput>make html</userinput></screen> - <para>If you have installed <ulink - url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> and - <xref linkend="xmlto"/> you can create the man pages:</para> + <para> + If you have installed <ulink + url="http://www.methods.co.nz/asciidoc/";>AsciiDoc</ulink> and + <xref linkend="xmlto"/> you can create the man pages: + </para> <screen><userinput>make man</userinput></screen> - <para>To check the results, issue: <command>make test</command>.</para> + <para> + To check the results, issue: <command>make test</command>. + </para> - <para>Now, as the <systemitem class="username">root</systemitem> - user:</para> + <para> + Now, as the <systemitem class="username">root</systemitem> + user: + </para> <screen role="root"><userinput>make install</userinput></screen> - <para>If you created the man pages, install them as the - <systemitem class="username">root</systemitem> user:</para> + <para> + If you created the man pages, install them as the + <systemitem class="username">root</systemitem> user: + </para> <screen role="root"><userinput>make install-man</userinput></screen> - <para>If you created the html docs, install them as the - <systemitem class="username">root</systemitem> user:</para> + <para> + If you created the html docs, install them as the + <systemitem class="username">root</systemitem> user: + </para> <screen role="root"><userinput>make htmldir=/usr/share/doc/git-&git-version; install-html && mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text} && @@ -159,13 +187,17 @@ mv /usr/share/doc/git-&git-version;/howto/{*.txt,text} && mv /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen> - <para>Alternatively, If you downloaded the man pages untar them as the - <systemitem class="username">root</systemitem> user:</para> + <para> + Alternatively, If you downloaded the man pages untar them as the + <systemitem class="username">root</systemitem> user: + </para> <screen role="root"><userinput>tar -xf ../git-manpages-&git-version;.tar.gz -C /usr/share/man --no-same-owner</userinput></screen> - <para>If you downloaded the html docs untar them as the - <systemitem class="username">root</systemitem> user:</para> + <para> + If you downloaded the html docs untar them as the + <systemitem class="username">root</systemitem> user: + </para> <screen role="root"><userinput>mkdir -p /usr/share/doc/git-&git-version;/man-pages/{html,text} && @@ -180,37 +212,40 @@ mkdir /usr/share/doc/git-&git-version;/howto/{html,text} && mv /usr/share/doc/git-&git-version;/howto/{*.txt,text} && mv /usr/share/doc/git-&git-version;/howto/{*.,}html</userinput></screen> + </sect2> <sect2 role="commands"> <title>Command Explanations</title> - <para><option>--libexecdir=/usr/lib</option>: Place git library files - correctly.</para> + <para> + <option>--without-python</option>: Use this switch if + <application>Python</application> is not installed. + </para> + + <para> + <option>--with-libpcre</option>: Use this switch if + <application>PCRE</application> is installed. + </para> + + <para> + <command>tar -xf ../git-manpages-&git-version;.tar.gz -C + /usr/share/man --no-same-owner</command>: This untars + <filename>git-manpages-&git-version;.tar.gz</filename>. The + <option>-C</option> option makes tar change directory to + <filename class="directory">/usr/share/man</filename> before + it starts to decompress the docs. The <option>--no-same-owner</option> + option stops tar from preserving the user and group details of the + files. This is useful as that user or group may not exist on your + system; this could (potentially) be a security risk. + </para> + + <para> + <command>mv /usr/share/doc/git-&git-version; ...</command>: These + commands move some of the files into subfolders to make it easier to sort + through the docs and find what you're looking for. + </para> - <para><option>--with-gitconfig=/etc/gitconfig</option>: This sets - <filename>/etc/gitconfig</filename> as the file that stores the default, - system wide, <application>Git</application> settings.</para> - - <para><option>--without-python</option>: Use this option if python is - not installed.</para> - - <para><option>--with-libpcre</option>: Use this option if PCRE is - installed.</para> - - <para><command>tar -xf ../git-manpages-&git-version;.tar.gz -C - /usr/share/man --no-same-owner</command>: This untars - <filename>git-manpages-&git-version;.tar.gz</filename>. The - <option>-C</option> option makes tar change directory to - <filename class="directory">/usr/share/man</filename> before it starts to - decompress the docs. The <option>--no-same-owner</option> option stops tar - from preserving the user and group details of the files. This is useful as - that user or group may not exist on your system; this could - (potentially) be a security risk.</para> - - <para><command>mv /usr/share/doc/git-&git-version; ...</command>: These - commands move some of the files into subfolders to make it easier to sort - through the docs and find what you're looking for.</para> </sect2> <sect2 role="configuration"> @@ -218,8 +253,10 @@ <sect3 id="git-config"> <title>Config Files</title> - <para><filename>~/.gitconfig</filename> and - <filename>/etc/gitconfig</filename></para> + <para> + <filename>~/.gitconfig</filename> and + <filename>/etc/gitconfig</filename> + </para> <indexterm zone="git git-config"> <primary sortas="e-AA.gitconfig">~/.gitconfig</primary> @@ -228,20 +265,27 @@ <indexterm zone="git git-config"> <primary sortas="e-etc-gitconfig">/etc/gitconfig</primary> </indexterm> + </sect3> <sect3><title>Configuration Information</title> - <para>If you want to use <command>git svn</command> you will need to - install <xref linkend="subversion"/> and its Perl bindings.</para> - - <para>To be able to use git to pull from a https source you need first - install the <xref linkend="cacerts"/> and then configure git to know where - they are. To set the default location of the SSL certificates, as the - <systemitem class="username">root</systemitem> user:</para> + <para> + If you want to use <command>git svn</command> you will need to + install <xref linkend="subversion"/> and its Perl bindings. + </para> + + <para> + To be able to use git to pull from a https source you need first install + the <xref linkend="cacerts"/> and then configure git to know where they + are. To set the default location of the SSL certificates, as the + <systemitem class="username">root</systemitem> user: + </para> <screen role="root"><userinput>git config --system http.sslCAPath /etc/ssl/certs</userinput></screen> + </sect3> + </sect2> <sect2 role="content"> @@ -253,12 +297,21 @@ <segtitle>Installed Directories</segtitle> <seglistitem> - <seg>git, git-cvsserver, gitk, git-receive-pack, git-shell, - git-upload-archive and git-upload-pack</seg> - <seg>None</seg> - <seg>/usr/libexec/git-core, /usr/share/git-&git-version;, - /usr/share/git-core, /usr/share/git-gui, /usr/share/gitk and - /usr/share/gitweb</seg> + <seg> + git, git-cvsserver, gitk, git-receive-pack, git-shell, + git-upload-archive and git-upload-pack + </seg> + <seg> + None + </seg> + <seg> + /usr/lib/git-core, + /usr/share/doc/git-&git-version;, + /usr/share/git-core, + /usr/share/git-gui, + /usr/share/gitk and + /usr/share/gitweb + </seg> </seglistitem> </segmentedlist> @@ -270,7 +323,9 @@ <varlistentry id="git-prog"> <term><command>git</command></term> <listitem> - <para>is the stupid content tracker.</para> + <para> + is the stupid content tracker. + </para> <indexterm zone="git git-prog"> <primary sortas="b-git">git</primary> </indexterm> @@ -280,7 +335,9 @@ <varlistentry id="git-cvsserver"> <term><command>git-cvsserver</command></term> <listitem> - <para>is a CVS server emulator for git.</para> + <para> + is a CVS server emulator for <application>Git</application>. + </para> <indexterm zone="git git-cvsserver"> <primary sortas="b-git-cvsserver">git-cvsserver</primary> </indexterm> @@ -290,7 +347,10 @@ <varlistentry id="gitk"> <term><command>gitk</command></term> <listitem> - <para>is a git repository browser (needs <xref linkend="tk"/>).</para> + <para> + is a graphical <application>Git</application> repository browser + (needs <xref linkend="tk"/>). + </para> <indexterm zone="git gitk"> <primary sortas="b-gitk">gitk</primary> </indexterm> @@ -300,8 +360,10 @@ <varlistentry id="git-receive-pack"> <term><command>git-receive-pack</command></term> <listitem> - <para>is invoked by <command>git send-pack</command> and updates the - repository with the information fed from the remote end.</para> + <para> + is invoked by <command>git send-pack</command> and updates the + repository with the information fed from the remote end. + </para> <indexterm zone="git git-receive-pack"> <primary sortas="b-git-receive-pack">git-receive-pack</primary> </indexterm> @@ -311,8 +373,10 @@ <varlistentry id="git-shell"> <term><command>git-shell</command></term> <listitem> - <para>is a login shell for SSH accounts to provide restricted Git - access.</para> + <para> + is a login shell for SSH accounts to provide restricted Git + access. + </para> <indexterm zone="git git-shell"> <primary sortas="b-git-shell">git-shell</primary> </indexterm> @@ -322,8 +386,10 @@ <varlistentry id="git-upload-archive"> <term><command>git-upload-archive</command></term> <listitem> - <para>is invoked by <command>git archive --remote</command> and sends - a generated archive to the other end over the git protocol.</para> + <para> + is invoked by <command>git archive --remote</command> and sends + a generated archive to the other end over the git protocol. + </para> <indexterm zone="git git-upload-archive"> <primary sortas="b-git-upload-archive">git-upload-archive</primary> </indexterm> @@ -333,14 +399,19 @@ <varlistentry id="git-upload-pack"> <term><command>git-upload-pack</command></term> <listitem> - <para>is invoked by <command>git fetch-pack</command>, it discovers - what objects the other side is missing, and sends them after - packing.</para> + <para> + is invoked by <command>git fetch-pack</command>, it discovers + what objects the other side is missing, and sends them after + packing. + </para> <indexterm zone="git git-upload-pack"> <primary sortas="b-git-upload-pack">git-upload-pack</primary> </indexterm> </listitem> </varlistentry> + </variablelist> + </sect2> + </sect1> Modified: trunk/BOOK/general/prog/ruby.xml ============================================================================== --- trunk/BOOK/general/prog/ruby.xml Fri Mar 1 10:28:52 2013 (r11038) +++ trunk/BOOK/general/prog/ruby.xml Fri Mar 1 11:29:01 2013 (r11039) @@ -6,9 +6,9 @@ <!ENTITY ruby-download-http " "> <!ENTITY ruby-download-ftp "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2";> - <!ENTITY ruby-md5sum "944e73eba9ee9e1f2647ff32ec0b14b2"> + <!ENTITY ruby-md5sum "a810d64e2255179d2f334eb61fb8519c"> <!ENTITY ruby-size "9.6 MB"> - <!ENTITY ruby-buildsize "350 MB"> + <!ENTITY ruby-buildsize "940 MB"> <!ENTITY ruby-time "4.0 SBU"> ]> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Fri Mar 1 10:28:52 2013 (r11038) +++ trunk/BOOK/introduction/welcome/changelog.xml Fri Mar 1 11:29:01 2013 (r11039) @@ -59,6 +59,9 @@ <para>[krejzi] - Gimp 2.8.4.</para> </listitem> <listitem> + <para>[krejzi] - Git 1.8.1.4.</para> + </listitem> + <listitem> <para>[krejzi] - Gnumeric 1.12.0.</para> </listitem> <listitem> @@ -109,6 +112,9 @@ <listitem> <para>[krejzi] - Poppler 0.22.1.</para> </listitem> + <listitem> + <para>[krejzi] - Ruby 1.9.3-p392.</para> + </listitem> <listitem> <para>[krejzi] - XKeyboard Config 2.8.</para> </listitem> @@ -118,6 +124,9 @@ <listitem> <para>[krejzi] - Xorg Intel Driver 2.21.3.</para> </listitem> + <listitem> + <para>[krejzi] - XScreenSaver 5.21.</para> + </listitem> </itemizedlist> </listitem> -- http://linuxfromscratch.org/mailman/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
