Changeset af73a280


Ignore:
Timestamp:
06/05/2013 09:28:44 AM (11 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
5b00a2a
Parents:
13e0a61
Message:

Merge trunk and systemd branch.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@11264 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
1 added
1 deleted
44 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r13e0a61 raf73a280  
    44-->
    55
    6 <!ENTITY day          "01">                   <!-- Always 2 digits -->
     6<!ENTITY day          "05">                   <!-- Always 2 digits -->
    77<!ENTITY month        "06">                   <!-- Always 2 digits -->
    88<!ENTITY year         "2013">
    … …  
    164164<!ENTITY nss-minor-version            "3">
    165165<!ENTITY nss-version                  "3.&nss-major-version;.&nss-minor-version;">
    166 <!ENTITY openssh-version              "6.2p1">
     166<!ENTITY openssh-version              "6.2p2">
    167167<!ENTITY openssl-version              "1.0.1e">
    168168<!ENTITY p11-kit-version              "0.18.2">
    … …  
    170170<!ENTITY shadow-version               "4.1.5.1">
    171171<!ENTITY stunnel-version              "4.54">
    172 <!ENTITY sudo-version                 "1.8.6p3">
     172<!ENTITY sudo-version                 "1.8.6p8">
    173173<!ENTITY tripwire-version             "2.4.2.2">
    174174
    … …  
    223223
    224224<!ENTITY icu-major                    "51">
    225 <!ENTITY icu-minor                    "1">
     225<!ENTITY icu-minor                    "2">
    226226<!ENTITY icu-patch                    "0">
    227227<!ENTITY icu-version                  "&icu-major;.&icu-minor;"><!-- .&icu-patch;-->
    … …  
    262262<!ENTITY nspr-version                 "4.9.6">
    263263<!ENTITY openobex-version             "1.7">
    264 <!ENTITY pcre-version                 "8.32">
     264<!ENTITY pcre-version                 "8.33">
    265265<!ENTITY popt-version                 "1.16">
    266266<!ENTITY pth-version                  "2.0.7">
    … …  
    286286<!ENTITY gegl-version                 "0.2.0">
    287287<!ENTITY giflib-version               "4.1.6">
    288 <!ENTITY harfbuzz-version             "0.9.16">
     288<!ENTITY harfbuzz-version             "0.9.18">
    289289<!ENTITY ijs-version                  "0.35">
    290290<!ENTITY imlib2-version               "1.4.5">
    … …  
    295295<!ENTITY libexif-version              "0.6.21">
    296296<!ENTITY libjpeg-version              "8d">
    297 <!ENTITY libjpeg-turbo-version        "1.2.1">
     297<!ENTITY libjpeg-turbo-version        "1.3.0">
    298298<!ENTITY libmng-version               "1.0.10">
    299299<!ENTITY libpng-version               "1.6.2">
    … …  
    379379<!ENTITY gc-version                   "7.2d">
    380380<!ENTITY gdb-version                  "7.6">
    381 <!ENTITY git-version                  "1.8.2.3">
     381<!ENTITY git-version                  "1.8.3">
    382382<!ENTITY guile-version                "2.0.9">
    383383<!ENTITY icedtea-version              "2.3.3">
    … …  
    386386<!ENTITY librep-version               "0.92.2.1">
    387387<!ENTITY llvm-version                 "3.2">
    388 <!ENTITY mercurial-version            "2.5.2">
     388<!ENTITY mercurial-version            "2.6.2">
    389389<!ENTITY NASM-version                 "2.10.07">
    390390<!ENTITY php-version                  "5.4.11">
    … …  
    392392<!ENTITY python2-version              "2.7.5">
    393393<!ENTITY python3-version              "3.3.2">
    394 <!ENTITY ruby-version                 "1.9.3-p429">
     394<!ENTITY ruby-version                 "2.0.0">
     395<!ENTITY ruby-patch-version           "195">
    395396<!ENTITY slang-version                "2.2.4">
    396 <!ENTITY subversion-version           "1.7.8">
     397<!ENTITY subversion-version           "1.7.10">
    397398<!ENTITY tcl-version                  "8.6.0">
    398399<!ENTITY tk-version                   "8.6.0">
    … …  
    456457<!-- Chapter 16 -->
    457458<!ENTITY avahi-version                "0.6.31">
    458 <!ENTITY bind-version                 "9.9.2-P2">
     459<!ENTITY bind-version                 "9.9.3">
    459460<!ENTITY mod_dnssd-version            "0.6">
    460461<!ENTITY NetworkManager-version       "0.9.8.0">
    461 <!ENTITY nmap-version                 "6.01">
     462<!ENTITY nmap-version                 "6.25">
    462463<!ENTITY traceroute-version           "2.0.19">
    463464<!ENTITY whois-version                "5.0.25">
    … …  
    510511<!ENTITY mysql-version                "5.6.11">
    511512<!ENTITY postgresql-version           "9.2.4">
    512 <!ENTITY sqlite-version               "3.7.16.2">
     513<!ENTITY sqlite-version               "3.7.17">
    513514
    514515<!-- Chapter 23 -->
    … …  
    574575<!ENTITY pangox-version               "0.0.2">
    575576<!ENTITY pangomm-version              "2.28.4">
    576 <!ENTITY qt-version                   "4.8.4">
     577<!ENTITY qt4-version                  "4.8.4">
    577578<!ENTITY shared-mime-info-version     "1.1">
    578579<!ENTITY startup-notification-version "0.12">
    … …  
    581582
    582583<!ENTITY gtk2-libdir                  "2.0/2.10.0">
    583 <!ENTITY qt-dir                       "$QTDIR">
     584<!ENTITY qt4-dir                      "$QTDIR">
    584585
    585586<!-- Removed
    … …  
    819820<!ENTITY faad2-version                "2.7">
    820821<!ENTITY farstream-version            "0.2.3">
    821 <!ENTITY flac-version                 "1.2.1">
     822<!ENTITY flac-version                 "1.3.0">
    822823<!ENTITY gstreamer-version            "0.10.36">
    823824<!ENTITY gst-plugins-base-version     "0.10.36">
    … …  
    846847<!ENTITY libmusicbrainz3-version      "3.0.3">
    847848<!ENTITY libmusicbrainz5-version      "5.0.1">
    848 <!ENTITY libogg-version               "1.3.0">
     849<!ENTITY libogg-version               "1.3.1">
    849850<!ENTITY libquicktime-version         "1.2.4">
    850851<!ENTITY libsamplerate-version        "0.1.8">

  • general/genlib/icu.xml

    r13e0a61 raf73a280  
    88           "http://download.icu-project.org/files/icu4c/&icu-version;/icu4c-&icu-dl-version;-src.tgz">
    99  <!ENTITY icu-download-ftp  " ">
    10   <!ENTITY icu-md5sum        "6eef33b229d0239d654983028c9c7053">
     10  <!ENTITY icu-md5sum        "072e501b87065f3a0ca888f1b5165709">
    1111  <!ENTITY icu-size          "21 MB">
    12   <!ENTITY icu-buildsize     "285 MB">
    13   <!ENTITY icu-time          "1.5 SBU">
     12  <!ENTITY icu-buildsize     "288 MB">
     13  <!ENTITY icu-time          "1.0 SBU">
    1414]>
    1515

  • general/genlib/libdbusmenuqt.xml

    r13e0a61 raf73a280  
    7070    <bridgehead renderas="sect4">Required</bridgehead>
    7171    <para role="required">
    72     <xref linkend="qt"/>
     72    <xref linkend="qt4"/>
    7373    </para>
    7474
    … …  
    9292<screen><userinput>mkdir build &amp;&amp;
    9393cd build &amp;&amp;
    94 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     94cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9595      -DWITH_DOC=OFF .. &amp;&amp;
    9696make</userinput></screen>
    … …  
    126126        <seg>None</seg>
    127127        <seg>libdbusmenu-qt.so</seg>
    128         <seg>&qt-dir;/include/dbusmenu-qt</seg>
     128        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
    129129      </seglistitem>
    130130    </segmentedlist>

  • general/genlib/pcre.xml

    r13e0a61 raf73a280  
    77  <!ENTITY pcre-download-http "&sourceforge-repo;/pcre/pcre-&pcre-version;.tar.bz2">
    88  <!ENTITY pcre-download-ftp  "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
    9   <!ENTITY pcre-md5sum        "62f02a76bb57a40bc66681760ed511d5">
    10   <!ENTITY pcre-size          "1.3 MB">
    11   <!ENTITY pcre-buildsize     "16 MB">
    12   <!ENTITY pcre-time          "0.3 SBU">
     9  <!ENTITY pcre-md5sum        "21514018448ac10062ece7a668fca949">
     10  <!ENTITY pcre-size          "1.4 MB">
     11  <!ENTITY pcre-buildsize     "18 MB">
     12  <!ENTITY pcre-time          "0.2 SBU">
    1313]>
    1414
    … …  
    7979    <para role="optional">
    8080      <ulink url="http://valgrind.org/">Valgrind</ulink>
     81<!-- -&#45;enable-pcretest-libedit (redundant as long as LFS installs libreadline
     82      and <ulink url="http://www.thrysoee.dk/editline/">libedit</ulink>
     83-->
    8184    </para>
    8285
    … …  
    100103            --enable-pcregrep-libz            \
    101104            --enable-pcregrep-libbz2          \
     105            --enable-pcretest-libreadline     \
    102106            --disable-static                 &amp;&amp;
    103107make</userinput></screen>
    … …  
    113117<screen role="root"><userinput>make install                     &amp;&amp;
    114118mv -v /usr/lib/libpcre.so.* /lib &amp;&amp;
    115 ln -sfv ../../lib/libpcre.so.1.2.0 /usr/lib/libpcre.so</userinput></screen>
     119ln -sfv ../../lib/libpcre.so.1.2.1 /usr/lib/libpcre.so</userinput></screen>
    116120
    117121  </sect2>
    … …  
    142146      support to <command>pcregrep</command> to read
    143147      <filename class="extension">.bz2</filename> compressed files.
     148    </para>
     149
     150    <para>
     151      <option>--enable-pcretest-libreadline</option>: This switch adds line
     152      editing and history features to <command>pcretest</command> program.
    144153    </para>
    145154

  • general/genlib/qca.xml

    r13e0a61 raf73a280  
    7272    <bridgehead renderas="sect4">Required</bridgehead>
    7373    <para role="required">
    74     <xref linkend="qt"/> and
     74    <xref linkend="qt4"/> and
    7575    <xref linkend="which"/>
    7676    </para>
    … …  
    8888
    8989<screen><userinput>sed -i '217s@set@this->set@' src/botantools/botan/botan/secmem.h &amp;&amp;
    90 ./configure --prefix=&qt-dir; \
     90./configure --prefix=&qt4-dir; \
    9191            --certstore-path=/etc/ssl/ca-bundle.crt &amp;&amp;
    9292make</userinput></screen>
    … …  
    124124        <seg>qcatool2 and qcatool2.debug</seg>
    125125        <seg>libqca.so and libqca.so.&qca-version;.debug</seg>
    126         <seg>&qt-dir;/include/QtCrypto and &qt-dir;/share/qca</seg>
     126        <seg>&qt4-dir;/include/QtCrypto and &qt4-dir;/share/qca</seg>
    127127      </seglistitem>
    128128    </segmentedlist>

  • general/genlib/qjson.xml

    r13e0a61 raf73a280  
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="qt"/> and
     77      <xref linkend="qt4"/> and
    7878      <xref linkend="cmake"/>
    7979    </para>   
    … …  
    9494<screen><userinput>mkdir build &amp;&amp;
    9595cd build &amp;&amp;
    96 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     96cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9797      -DCMAKE_BUILD_TYPE=Release \
    9898      .. &amp;&amp;
    … …  
    126126        </seg>
    127127        <seg>
    128           &qt-dir;/include/json and &qt-dir;/lib/cmake/qjson
     128          &qt4-dir;/include/json and &qt4-dir;/lib/cmake/qjson
    129129        </seg>
    130130      </seglistitem>

  • general/genutils/graphviz.xml

    r13e0a61 raf73a280  
    101101      <xref linkend="gs"/>,
    102102      <xref linkend="gtk2"/> and
    103       <xref linkend="qt"/>
     103      <xref linkend="qt4"/>
    104104    </para>
    105105

  • general/genutils/pinentry.xml

    r13e0a61 raf73a280  
    7272      <xref linkend="gtk2"/>,
    7373      <xref linkend="libcap2"/> and
    74       <xref linkend="qt"/>
     74      <xref linkend="qt4"/>
    7575    </para>
    7676

  • general/graphlib/harfbuzz.xml

    r13e0a61 raf73a280  
    88           "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-&harfbuzz-version;.tar.bz2">
    99  <!ENTITY harfbuzz-download-ftp  " ">
    10   <!ENTITY harfbuzz-md5sum        "90855e670c790c1fec4592908be3c0b8">
    11   <!ENTITY harfbuzz-size          "884 KB">
    12   <!ENTITY harfbuzz-buildsize     "32 MB">
    13   <!ENTITY harfbuzz-time          "0.3 SBU">
     10  <!ENTITY harfbuzz-md5sum        "0bff05fafef4894031b2b64a65ac1899">
     11  <!ENTITY harfbuzz-size          "882 KB">
     12  <!ENTITY harfbuzz-buildsize     "24 MB">
     13  <!ENTITY harfbuzz-time          "0.2 SBU">
    1414]>
    1515
    … …  
    137137        </seg>
    138138        <seg>
    139           libharfbuzz.so
     139          libharfbuzz.so and libharfbuzz-icu.so
    140140        </seg>
    141141        <seg>

  • general/graphlib/libjpeg-turbo.xml

    r13e0a61 raf73a280  
    77  <!ENTITY libjpeg-download-http "&sourceforge-repo;/libjpeg-turbo/libjpeg-turbo-&libjpeg-turbo-version;.tar.gz">
    88  <!ENTITY libjpeg-download-ftp  " ">
    9   <!ENTITY libjpeg-md5sum        "f61e60ff01381ece4d2fe65eeb52669e">
    10   <!ENTITY libjpeg-size          "1.7 MB">
    11   <!ENTITY libjpeg-buildsize     "15 MB">
    12   <!ENTITY libjpeg-time          "0.4 SBU">
     9  <!ENTITY libjpeg-md5sum        "e1e65cc711a1ade1322c06ad4a647741">
     10  <!ENTITY libjpeg-size          "1.3 MB">
     11  <!ENTITY libjpeg-buildsize     "13 MB">
     12  <!ENTITY libjpeg-time          "0.3 SBU">
    1313]>
    1414

  • general/graphlib/poppler.xml

    r13e0a61 raf73a280  
    132132      <xref linkend="libxml2"/>,
    133133      <xref linkend="openjpeg"/> and
    134       <xref linkend="qt"/> (the <filename>libpoppler-qt4.so</filename> library
     134      <xref linkend="qt4"/> (the <filename>libpoppler-qt4.so</filename> library
    135135      is needed for PDF support in <application>Okular</application>).
    136136    </para>

  • general/prog/cmake.xml

    r13e0a61 raf73a280  
    8787    <para role="optional">
    8888      <xref linkend="subversion"/> (for testing) and
    89       <xref linkend="qt"/> (for the Qt-based GUI)
     89      <xref linkend="qt4"/> (for the Qt-based GUI)
    9090    </para>
    9191

  • general/prog/doxygen.xml

    r13e0a61 raf73a280  
    9494      <xref linkend="gs"/>,
    9595      <xref linkend="python2"/>,
    96       <xref linkend="qt"/> (for doxywizard) and
     96      <xref linkend="qt4"/> (for doxywizard) and
    9797      <xref linkend="texlive"/>
    9898    </para>

  • general/prog/git.xml

    r13e0a61 raf73a280  
    77  <!ENTITY git-download-http "http://git-core.googlecode.com/files/git-&git-version;.tar.gz">
    88  <!ENTITY git-download-ftp  " ">
    9   <!ENTITY git-md5sum        "03ebfd403a8cf355da0e3f15e53b8925">
     9  <!ENTITY git-md5sum        "d91b6099fb6763cf92c696977a247060">
    1010  <!ENTITY git-size          "4.3 MB">
    11   <!ENTITY git-buildsize     "225 MB">
    12   <!ENTITY git-time          "5.0 SBU (including tests)">
     11  <!ENTITY git-buildsize     "217 MB">
     12  <!ENTITY git-time          "0.6 SBU (additional 2.9 SBU for tests)">
    1313]>
    1414

  • general/prog/mercurial.xml

    r13e0a61 raf73a280  
    77  <!ENTITY mercurial-download-http "http://mercurial.selenic.com/release/mercurial-&mercurial-version;.tar.gz">
    88  <!ENTITY mercurial-download-ftp  " ">
    9   <!ENTITY mercurial-md5sum        "6b467f41a262e2537cf927ed42d0fdda">
    10   <!ENTITY mercurial-size          "3.7 MB">
    11   <!ENTITY mercurial-buildsize     "40 MB">
    12   <!ENTITY mercurial-time          "0.1 SBU (additional 8.5 SBU for tests)">
     9  <!ENTITY mercurial-md5sum        "55f6ea5982cf87836113376174826e8c">
     10  <!ENTITY mercurial-size          "3.6 MB">
     11  <!ENTITY mercurial-buildsize     "43 MB">
     12  <!ENTITY mercurial-time          "0.1 SBU (additional 12 SBU for tests)">
    1313]>
    1414
    … …  
    3131
    3232    <para><application>Mercurial</application> is a distributed source control
    33     management tool similar to <application>CVS</application>,
    34     <application>Subversion</application> and <application>Git</application>.
    35     <application>Mercurial</application> is written in
    36     <application>Python</application> and is used by projects such as Mozilla,
    37     Vim and Audacious.</para>
     33    management tool similar to <application>Git</application> and
     34    <application>Bazaar</application>. <application>Mercurial</application> is
     35    written in <application>Python</application> and is used by projects such as
     36    Mozilla and Vim.</para>
    3837
    3938    &lfs73_checked;
    … …  
    8281    <ulink url="http://docutils.sourceforge.net/">Docutils</ulink> (required to build the documentation),
    8382    <xref linkend="git"/>,
    84     <xref linkend="gpg2"/> (with Python bindings),
     83    <xref linkend="gnupg2"/> (<command>gpg2</command> with Python bindings),
    8584    <xref linkend="subversion"/> (with Python bindings),
    8685    <xref linkend="bazaar"/>,

  • general/prog/ruby.xml

    r13e0a61 raf73a280  
    66
    77  <!ENTITY ruby-download-http " ">
    8   <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-&ruby-version;.tar.bz2">
    9   <!ENTITY ruby-md5sum        "c2b2de5ef15ea9b1aaa3152f9112af1b">
    10   <!ENTITY ruby-size          "9.6 MB">
    11   <!ENTITY ruby-buildsize     "890 MB">
    12   <!ENTITY ruby-time          "4.0 SBU">
     8  <!ENTITY ruby-download-ftp  "ftp://ftp.ruby-lang.org/pub/ruby/2.0/ruby-&ruby-version;-p&ruby-patch-version;.tar.bz2">
     9  <!ENTITY ruby-md5sum        "2f54faea6ee1ca500632ec3c0cb59cb6">
     10  <!ENTITY ruby-size          "11 MB">
     11  <!ENTITY ruby-buildsize     "515 MB">
     12  <!ENTITY ruby-time          "3.6 SBU">
    1313]>
    1414
    … …  
    9797    </para>
    9898
    99 <screen><userinput>./configure --prefix=/usr --enable-shared &amp;&amp;
     99<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/ruby-&ruby-version; --enable-shared &amp;&amp;
    100100make</userinput></screen>
    101101
    … …  
    139139        </seg>
    140140        <seg>
    141           /usr/include/ruby-1.9.1,
     141          /usr/include/ruby-&ruby-version;,
    142142          /usr/lib/ruby,
    143           /usr/share/doc/ruby and
     143          /usr/share/doc/ruby-&ruby-version; and
    144144          /usr/share/ri
    145145        </seg>

  • general/prog/subversion.xml

    r13e0a61 raf73a280  
    88  "http://archive.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2">
    99  <!ENTITY subversion-download-ftp  " ">
    10   <!ENTITY subversion-md5sum        "454b9f398415c3504435bf8c3f6ed127">
    11   <!ENTITY subversion-size          "5.8 MB">
    12   <!ENTITY subversion-buildsize     "115 MB (additional 585 MB for tests)">
    13   <!ENTITY subversion-time          "0.9 SBU (additional 19 SBU for tests)">
     10  <!ENTITY subversion-md5sum        "4088a77e14232876c9b4ff1541e6e200">
     11  <!ENTITY subversion-size          "5.7 MB">
     12  <!ENTITY subversion-buildsize     "127 MB (additional 586 MB for tests)">
     13  <!ENTITY subversion-time          "0.8 SBU (additional 20 SBU for tests)">
    1414]>
    1515
    … …  
    9090    <bridgehead renderas="sect4">Required</bridgehead>
    9191    <para role="required">
    92       <xref linkend="sqlite"/>,
    93       <xref linkend="apr-util"/> and
     92      <xref linkend="apr-util"/>,
    9493      <xref linkend="neon"/> or
    95       <ulink url="http://code.google.com/p/serf/">serf</ulink>
    96     </para>
    97 
    98     <para>
    99       If you require the <application>Berkeley DB</application> back-end hooks
    100       in <application>Subversion</application> to build or support BDB based
    101       repositories, you must have <application>APR-util</application> linked to
    102       the <application>Berkeley DB</application> library.
    103     </para>
     94      <ulink url="http://code.google.com/p/serf/">serf</ulink>, and
     95      <xref linkend="sqlite"/>
     96    </para>
     97
     98    <note>
     99      <para>
     100        If you require the <application>Berkeley DB</application> back-end hooks
     101        in <application>Subversion</application> to build or support BDB based
     102        repositories, you must have <application>APR-util</application> linked to
     103        the <application>Berkeley DB</application> library.
     104      </para>
     105    </note>
    104106
    105107    <bridgehead renderas="sect4">Optional</bridgehead>
    106108    <para role="optional">
    107       <xref linkend="python2"/> (required to run the test suite),
     109      <xref linkend="apache"/>
    108110      <xref linkend="db"/>,
    109111      <xref linkend="cyrus-sasl"/>,
    110       <xref linkend="openssl"/>,
    111112      <xref linkend="dbus-glib"/>,
    112113      <xref linkend="gnome-keyring"/>,
    113       <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support) and
    114       <xref linkend="apache"/>
     114      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support),
     115      <xref linkend="openssl"/>,
     116      <xref linkend="python2"/> (required to run the test suite) and
     117      <xref linkend="ruby"/> (version 1.8.x)
    115118    </para>
    116119
    … …  
    118121    <para role="optional">
    119122      One of <xref linkend="openjdk"/>,
    120       <ulink url="http://www.inet.no/dante/">Dante</ulink>, or
     123      <ulink url="http://www.inet.no/dante/">Dante</ulink> or
    121124      <ulink url="http://oss.software.ibm.com/developerworks/opensource/jikes/">Jikes</ulink>,
    122125      and <xref linkend="junit"/> (to test the Java bindings)
    … …  
    125128    <bridgehead renderas="sect4">Optional (for the SWIG Bindings)</bridgehead>
    126129    <para role="optional">
    127       <ulink url="http://www.swig.org">SWIG</ulink> and
    128       <xref linkend="python2"/>
     130      <ulink url="http://www.swig.org">SWIG</ulink>
    129131    </para>
    130132
    … …  
    157159
    158160<screen><userinput>make javahl</userinput></screen>
    159 
    160     <para>
    161       <application>Perl</application> and/or <application>Python</application>
    162       <!-- ruby is currently b0rken <application>Ruby</application> -->
    163     </para>
    164161
    165162    <para>
    … …  
    174171
    175172    <para>
    176       To compile the <application>Perl</application> and/or
    177       <application>Python</application> bindings issue any or all of the
    178       following commands:
     173      To compile the <application>Perl</application>,
     174      <application>Python</application> or <application>Ruby</application>
     175      bindings issue any of the following commands:
    179176    </para>
    180177<screen><userinput>make swig-pl &amp;&amp;
    181 make swig-py</userinput></screen>
    182 
    183 <!-- &amp;&amp;
    184 make swig-rb -->
     178make swig-py &amp;&amp;
     179make swig-rb</userinput></screen>
    185180
    186181    <para>
    … …  
    195190
    196191    <para>
    197       To test the results of any or all of the <application>SWIG</application>
    198       bindings, you can use the following commands:
     192      To test the results of any of the <application>SWIG</application>
     193      bindings, you can use any of the following commands:
    199194    </para>
    200195
    201196<screen><userinput>make check-swig-pl &amp;&amp;
    202 make check-swig-py</userinput></screen>
    203 
    204 <!-- &amp;&amp;
    205 make check-swig-rb -->
     197make check-swig-py &amp;&amp;
     198make check-swig-rb </userinput></screen>
    206199
    207200    <para>
    … …  
    223216    <para>
    224217      If you built any of the <application>SWIG</application> bindings, issue
    225       any or all of the following commands as the
     218      any of the following commands as the
    226219      <systemitem class="username">root</systemitem> user to install them:
    227220    </para>
    228221
    229222<screen role="root"><userinput>make install-swig-pl &amp;&amp;
    230 make install-swig-py</userinput></screen>
    231 
    232 <!-- &amp;&amp;
    233 make install-swig-rb -->
     223make install-swig-py &amp;&amp;
     224make install-swig-rb</userinput></screen>
    234225
    235226    <para>
    … …  
    308299      <seglistitem>
    309300        <seg>
    310           svn, svnadmin, svndumpfilter, svnlook, svnserve, svnsync and
     301          svn, svnadmin, svndumpfilter, svnlook, svnrdump, svnserve, svnsync and
    311302          svnversion
    312303        </seg>
    313304        <seg>
    314           libsvn*.so and optionally, a Java library, the mod_dav_svn.so, and
     305          libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
    315306          and mod_authz_svn.so <application>Apache HTTP</application> DSO
    316307          modules and various <application>Perl</application> and
    … …  
    439430      </varlistentry>
    440431
    441       <varlistentry id="libsvn_star">
    442         <term><filename class="libraryfile">libsvn_*.so</filename></term>
     432      <varlistentry id="libsvn_star-1">
     433        <term><filename class="libraryfile">libsvn_*-1.so</filename></term>
    443434        <listitem>
    444435          <para>
    … …  
    446437            <application>Subversion</application> programs.
    447438          </para>
    448           <indexterm zone="subversion libsvn_star">
    449             <primary sortas="c-libsvn_star">libsvn_*.so</primary>
     439          <indexterm zone="subversion libsvn_star-1">
     440            <primary sortas="c-libsvn_star-1">libsvn_*-1.so</primary>
    450441          </indexterm>
    451442        </listitem>

  • general/sysutils/strigi.xml

    r13e0a61 raf73a280  
    6666    <bridgehead renderas="sect4">Recommended</bridgehead>
    6767    <para role="recommended">
    68     <xref linkend="qt"/> and
     68    <xref linkend="qt4"/> and
    6969    <xref linkend="dbus"/>
    7070    </para>

  • introduction/welcome/changelog.xml

    r13e0a61 raf73a280  
    4444
    4545-->
     46
     47    <listitem>
     48      <para>June 5th, 2013</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[igor] - Nmap-6.25.</para>
     52        </listitem>
     53      </itemizedlist>
     54    </listitem>
     55
     56    <listitem>
     57      <para>June 2nd, 2013</para>
     58      <itemizedlist>
     59        <listitem>
     60          <para>[igor] - OpenSSH-6.2p2.</para>
     61        </listitem>
     62        <listitem>
     63          <para>[igor] - Sudo-1.8.6p8.</para>
     64        </listitem>
     65        <listitem>
     66          <para>[igor] - mercurial-2.6.2.</para>
     67        </listitem>
     68        <listitem>
     69          <para>[igor] - Subversion-1.7.10.</para>
     70        </listitem>
     71        <listitem>
     72          <para>[igor] - Ruby-2.0.0.</para>
     73        </listitem>
     74        <listitem>
     75          <para>[igor] - Git-1.8.3.</para>
     76        </listitem>
     77        <listitem>
     78          <para>[igor] - Harfbuzz-0.9.18.</para>
     79        </listitem>
     80        <listitem>
     81          <para>[igor] - ICU-51.2.</para>
     82        </listitem>
     83        <listitem>
     84          <para>[igor] - libjpeg-turbo-1.3.0.</para>
     85        </listitem>
     86        <listitem>
     87          <para>[igor] - SQLite-3.7.17.</para>
     88        </listitem>
     89        <listitem>
     90          <para>[igor] - FLAC-1.3.0.</para>
     91        </listitem>
     92        <listitem>
     93          <para>[igor] - BIND-9.9.3.</para>
     94        </listitem>
     95        <listitem>
     96          <para>[igor] - PCRE-8.33.</para>
     97        </listitem>
     98        <listitem>
     99          <para>[igor] - libogg-1.3.1.</para>
     100        </listitem>
     101      </itemizedlist>
     102    </listitem>
     103
    46104    <listitem>
    47105      <para>May 30th, 2013</para>

  • kde/core/akonadi.xml

    r13e0a61 raf73a280  
    9999cd build &amp;&amp;
    100100cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    101       -DCMAKE_PREFIX_PATH=&qt-dir; \
     101      -DCMAKE_PREFIX_PATH=&qt4-dir; \
    102102      -DCMAKE_BUILD_TYPE=Release \
    103103      -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
    … …  
    116116    <title>Command Explanations</title>
    117117
    118     <para><option>-DCMAKE_PREFIX_PATH=&qt-dir;</option>: This switch is used to
     118    <para><option>-DCMAKE_PREFIX_PATH=&qt4-dir;</option>: This switch is used to
    119119    help <command>cmake</command> find <command>automoc4</command>.</para>
    120120

  • kde/core/attica.xml

    r13e0a61 raf73a280  
    7171    <bridgehead renderas="sect4">Required</bridgehead>
    7272    <para role="required">
    73     <xref linkend="qt"/> and
     73    <xref linkend="qt4"/> and
    7474    <xref linkend="cmake"/>
    7575    </para>

  • kde/core/automoc4.xml

    r13e0a61 raf73a280  
    7373    <para role="required">
    7474    <xref linkend="cmake"/> and
    75     <xref linkend="qt"/>
     75    <xref linkend="qt4"/>
    7676    </para>
    7777
    … …  
    8989<screen><userinput>mkdir build &amp;&amp;
    9090cd build &amp;&amp;
    91 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; .. &amp;&amp;
     91cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; .. &amp;&amp;
    9292make</userinput></screen>
    9393

  • kde/core/config.xml

    r13e0a61 raf73a280  
    6767    <title>Installing further KDE packages</title>
    6868    <para>Every subsequent package can be built while having <application>KDE</application> up and
    69     running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt-dir;</envar> set.</para>
     69    running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
    7070  </sect2>
    7171

  • kde/core/phonon.xml

    r13e0a61 raf73a280  
    9090    <title>Installation of Phonon</title>
    9191
    92     <para>Make sure that <xref linkend="qt"/> is compiled without the bundled
     92    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
    9393    <application>Phonon</application> library. This package provides
    9494    a better implementation.</para>
    … …  
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
     101cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    102102      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
    103103      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \

  • kde/core/polkit-qt.xml

    r13e0a61 raf73a280  
    8787<screen><userinput>mkdir build &amp;&amp;
    8888cd build &amp;&amp;
    89 CMAKE_PREFIX_PATH=&qt-dir; \
     89CMAKE_PREFIX_PATH=&qt4-dir; \
    9090      cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9191make</userinput></screen>
    … …  
    104104    <title>Command Explanations</title>
    105105
    106     <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to
     106    <para><option>CMAKE_PREFIX_PATH=&qt4-dir;</option>: This option is set to
    107107    find <command>automoc4</command>.</para>
    108108

  • kde/core/qimageblitz.xml

    r13e0a61 raf73a280  
    7171    <bridgehead renderas="sect4">Required</bridgehead>
    7272    <para role="required">
    73     <xref linkend="qt"/> and
     73    <xref linkend="qt4"/> and
    7474    <xref linkend="cmake"/>
    7575    </para>

  • multimedia/libdriv/flac.xml

    r13e0a61 raf73a280  
    55  %general-entities;
    66
    7   <!ENTITY flac-download-http "&sourceforge-repo;/flac/flac-&flac-version;.tar.gz">
    8   <!ENTITY flac-download-ftp  " ">
    9   <!ENTITY flac-md5sum        "153c8b15a54da428d1f0fadc756c22c7">
    10   <!ENTITY flac-size          "1.9 MB">
    11   <!ENTITY flac-buildsize     "205 MB (includes running the test suite)">
    12   <!ENTITY flac-time          "0.6 SBU (additional 8 SBU to run the test suite)">
     7  <!ENTITY flac-download-http "http://downloads.xiph.org/releases/flac/flac-&flac-version;.tar.xz">
     8  <!ENTITY flac-download-ftp  "ftp://downloads.xiph.org/pub/xiph/releases/flac/flac-&flac-version;.tar.xz">
     9  <!ENTITY flac-md5sum        "13b5c214cee8373464d3d65dee362cdd">
     10  <!ENTITY flac-size          "1.1 MB">
     11  <!ENTITY flac-buildsize     "22 MB (additional 77 MB to run the test suite)">
     12  <!ENTITY flac-time          "0.3 SBU (additional 0.9 SBU to run the test suite)">
    1313]>
    1414
    … …  
    8989    following commands:</para>
    9090
    91 <screen><userinput>sed -i 's/#include &lt;stdio.h&gt;/&amp;\n#include &lt;string.h&gt;/' \
    92     examples/cpp/encode/file/main.cpp &amp;&amp;
    93 
    94 ./configure --prefix=/usr \
    95             --mandir=/usr/share/man \
    96             --disable-static \
     91<screen><userinput>./configure --prefix=/usr \
    9792            --disable-thorough-tests &amp;&amp;
    9893make</userinput></screen>
    … …  
    113108  <sect2 role="commands">
    114109    <title>Command Explanations</title>
    115 
    116     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    117       href="../../xincludes/static-libraries.xml"/>
    118110
    119111    <para><parameter>--disable-thorough-tests</parameter>: This parameter is

  • multimedia/libdriv/libogg.xml

    r13e0a61 raf73a280  
    66
    77  <!ENTITY libogg-download-http "http://downloads.xiph.org/releases/ogg/libogg-&libogg-version;.tar.xz">
    8   <!ENTITY libogg-download-ftp  " ">
    9   <!ENTITY libogg-md5sum        "84a35715170f2cd4c77a4448772b95d5">
    10   <!ENTITY libogg-size          "288 KB">
     8  <!ENTITY libogg-download-ftp  "ftp://downloads.xiph.org/pub/xiph/releases/ogg/libogg-&libogg-version;.tar.xz">
     9  <!ENTITY libogg-md5sum        "ca25d8da0ddfc8c6cbbf78d847a209fe">
     10  <!ENTITY libogg-size          "398 KB">
    1111  <!ENTITY libogg-buildsize     "4 MB">
    1212  <!ENTITY libogg-time          "less than 0.1 SBU">
    … …  
    6969    commands:</para>
    7070
    71 <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
     71<screen><userinput>./configure --prefix=/usr --docdir=/usr/share/doc/libogg-&libogg-version; --disable-static &amp;&amp;
    7272make</userinput></screen>
    7373
    … …  
    111111        <term><filename class='libraryfile'>libogg.so</filename></term>
    112112        <listitem>
    113           <para>libraries provide the functions required for programs to
     113          <para>provides the functions required for programs to
    114114          read or write Ogg formatted bit streams.</para>
    115115          <indexterm zone="libogg libogg-lib">

  • multimedia/videoutils/vlc.xml

    r13e0a61 raf73a280  
    102102      <xref linkend="libgcrypt"/>,
    103103      <xref linkend="libmad"/> and
    104       <xref linkend="qt"/> (<application>Qt</application> is required for the
     104      <xref linkend="qt4"/> (<application>Qt</application> is required for the
    105105      graphical user interface; without <application>Qt</application> you will
    106106      only be able to use the command line or <application>ncurses</application>

  • networking/netprogs/wpa_supplicant.xml

    r13e0a61 raf73a280  
    8989      <xref linkend="dbus"/>,
    9090      <xref linkend="libxml2"/> and
    91       <xref linkend="qt"/>
     91      <xref linkend="qt4"/>
    9292    </para>
    9393
    … …  
    190190
    191191    <para>
    192       If you have installed <xref linkend="qt"/> and wish to build
     192      If you have installed <xref linkend="qt4"/> and wish to build
    193193      the <application>WPA Supplicant</application> GUI program, run
    194194      the following commands:

  • networking/netutils/avahi.xml

    r13e0a61 raf73a280  
    9191    <bridgehead renderas="sect4">Optional</bridgehead>
    9292    <para role="optional">
    93       <xref linkend="qt"/>
     93      <xref linkend="qt4"/>
    9494    </para>
    9595

  • networking/netutils/bind-utils.xml

    r13e0a61 raf73a280  
    66  <!ENTITY bind-download-http   " ">
    77  <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
    8   <!ENTITY bind-md5sum          "2be7763c99b7e7b42ac3a18a267ce1aa">
    9   <!ENTITY bind-size            "7.0 MB">
    10   <!ENTITY bind-utils-buildsize "128 MB">
    11   <!ENTITY bind-utils-time      "0.5 SBU">
     8  <!ENTITY bind-md5sum          "7baa8359f0773e04f63d7e694db1909c">
     9  <!ENTITY bind-size            "7.2 MB">
     10  <!ENTITY bind-utils-buildsize "138 MB">
     11  <!ENTITY bind-utils-time      "0.8 SBU">
    1212]>
    1313
    … …  
    6666
    6767    <bridgehead renderas="sect4">Optional</bridgehead>
    68     <para role="optional"><xref linkend="openssl"/></para>
     68    <para role="optional">
     69      <xref linkend="libcap2"/>,
     70      <xref linkend="libxml2"/> and
     71      <xref linkend="openssl"/>
     72    </para>
    6973
    7074    <para condition="html" role="usernotes">User Notes:

  • networking/netutils/nmap.xml

    r13e0a61 raf73a280  
    55  %general-entities;
    66
    7   <!ENTITY nmap-download-http "&sources-anduin-http;/n/nmap-&nmap-version;.tar.bz2">
     7  <!ENTITY nmap-download-http "http://nmap.org/dist/nmap-&nmap-version;.tar.bz2">
    88  <!ENTITY nmap-download-ftp  "&gentoo-ftp-repo;/nmap-&nmap-version;.tar.bz2">
    9   <!ENTITY nmap-md5sum        "a1a71940f238abb835dbf3ee7412bcea">
    10   <!ENTITY nmap-size          "21 MB">
    11   <!ENTITY nmap-buildsize     "115 MB">
     9  <!ENTITY nmap-md5sum        "fcc80f94ff3adcb11eedf91092ea6f5e">
     10  <!ENTITY nmap-size          "7.4 MB">
     11  <!ENTITY nmap-buildsize     "124 MB">
    1212  <!ENTITY nmap-time          "0.9 SBU">
    1313]>
    … …  
    6060    <bridgehead renderas="sect3">Nmap Dependencies</bridgehead>
    6161
     62    <bridgehead renderas="sect4">Recommended</bridgehead>
     63    <note>
     64      <para>
     65        These packages are recommended because if they're not installed, the
     66        build process will compile and link against its own (often older)
     67        version.
     68      </para>
     69    </note>
     70
     71    <para role="recommended">
     72      <xref linkend="libpcap"/>,
     73      <xref linkend="pcre"/>,
     74<!-- This is not recommended, see: http://nmap.org/svn/libdnet-stripped/NMAP_MODIFICATIONS
     75      <ulink url="http://code.google.com/p/libdnet/">libdnet</ulink>,
     76-->
     77      <ulink url="http://www.csie.ntu.edu.tw/~cjlin/liblinear/">liblinear</ulink> and
     78      <ulink url="http://www.lua.org/">Lua</ulink>
     79    </para>
     80
    6281    <bridgehead renderas="sect4">Optional</bridgehead>
    63     <para role="optional"><xref linkend="openssl"/>,
    64     <xref linkend="pcre"/>,
    65     <xref linkend="libpcap"/>,
    66     <xref linkend="gtk2"/> (run time dependency), and
    67     <ulink url="http://sourceforge.net/projects/libdnet/">libdnet</ulink></para>
     82    <para role="optional">
     83      <xref linkend="openssl"/>,
     84      <xref linkend="pygtk"/> (required for <command>zenmap</command>),
     85      <xref linkend="python2"/> (required for <command>ndiff</command>) and
     86      <xref linkend="subversion"/> (required for <command>nmap-update</command>)
     87    </para>
    6888
    6989    <para condition="html" role="usernotes">User Notes:
    … …  
    95115      <segtitle>Installed Programs</segtitle>
    96116      <segtitle>Installed Libraries</segtitle>
    97       <segtitle>Installed Directory</segtitle>
     117      <segtitle>Installed Directories</segtitle>
    98118
    99119      <seglistitem>
    100         <seg>ncat, ndiff, nmap, nmapfe, nping, uninstall_zenmap, xnmap, and zenmap</seg>
     120        <seg>ncat, ndiff, nmap, nmapfe, nmap-update, nping, uninstall_zenmap,
     121        xnmap and zenmap</seg>
    101122        <seg>/usr/lib/python&python2-version;/site-packages/</seg>
    102         <seg>/usr/share/nmap</seg>
     123        <seg>/usr/share/ncat, /usr/share/nmap and /usr/share/zenmap</seg>
    103124      </seglistitem>
    104125    </segmentedlist>
    … …  
    145166        <term><command>nmapfe</command></term>
    146167        <listitem>
    147           <para>is a symbolic link to <command>zenmap.</command>.</para>
     168          <para>is a symbolic link to <command>zenmap</command>.</para>
    148169          <indexterm zone="nmap nmapfe">
    149170            <primary sortas="b-nmapfe">nmapfe</primary>
    … …  
    152173      </varlistentry>
    153174
     175      <varlistentry id="nmap-update">
     176        <term><command>nmap-update</command></term>
     177        <listitem>
     178          <para>is an updater for Nmap architecture-independent files.</para>
     179          <indexterm zone="nmap nmap-update">
     180            <primary sortas="b-nmap-update">nmap-update</primary>
     181          </indexterm>
     182        </listitem>
     183      </varlistentry>
     184
    154185      <varlistentry id="xnmap">
    155186        <term><command>xnmap</command></term>
    156187        <listitem>
    157           <para>is a symbolic link to <command>zenmap.</command>.</para>
     188          <para>is a symbolic link to <command>zenmap</command>.</para>
    158189          <indexterm zone="nmap xnmap">
    159190            <primary sortas="f-xnmap">xnmap</primary>

  • postlfs/security/libcap2.xml

    r13e0a61 raf73a280  
    165165
    166166      <varlistentry id="libcap2-lib">
    167         <term><filename class='libraryfile'>libcap2.{so,a}</filename></term>
     167        <term><filename class='libraryfile'>libcap.{so,a}</filename></term>
    168168        <listitem>
    169169          <para>contains the <application>libcap2</application> API functions.</para>
    170170          <indexterm zone="libcap2 libcap2-lib">
    171             <primary sortas="c-libcap2">libcap2.{so,a}</primary>
     171            <primary sortas="c-libcap2">libcap.{so,a}</primary>
    172172          </indexterm>
    173173        </listitem>

  • postlfs/security/openssh.xml

    r13e0a61 raf73a280  
    99  <!ENTITY openssh-download-ftp
    1010    "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz">
    11   <!ENTITY openssh-md5sum        "7b2d9dd75b5cf267ea1737ec75500316">
     11  <!ENTITY openssh-md5sum        "be46174dcbb77ebb4ea88ef140685de1">
    1212  <!ENTITY openssh-size          "1.2 MB">
    13   <!ENTITY openssh-buildsize     "32 MB (plus 10MB if running the tests)">
     13  <!ENTITY openssh-buildsize     "31 MB (additional 10 MB if running the tests)">
    1414  <!ENTITY openssh-time          "0.4 SBU (running the tests takes at least 10 minutes, irrespective of processor speed)">
    1515]>
    … …  
    127127    </para>
    128128
    129 <screen><userinput>./configure --prefix=/usr             \
    130             --sysconfdir=/etc/ssh     \
    131             --datadir=/usr/share/sshd \
    132             --with-md5-passwords      \
     129<screen><userinput>./configure --prefix=/usr                     \
     130            --libexecdir=/usr/lib/openssh     \
     131            --sysconfdir=/etc/ssh             \
     132            --datadir=/usr/share/sshd         \
     133            --with-md5-passwords              \
    133134            --with-privsep-path=/var/lib/sshd &amp;&amp;
    134135make</userinput></screen>
    … …  
    143144
    144145    <para>
    145       To test the results, issue: <command>make test</command>.
     146      To test the results, issue: <command>make tests</command>.
    146147    </para>
    147148
    … …  
    164165
    165166<screen role="root"><userinput>make install &amp;&amp;
     167install -v -m755 contrib/ssh-copy-id /usr/bin &amp;&amp;
     168install -v -m644 contrib/ssh-copy-id.1 /usr/share/man/man1 &amp;&amp;
    166169install -v -m755 -d /usr/share/doc/openssh-&openssh-version; &amp;&amp;
    167170install -v -m644 INSTALL LICENCE OVERVIEW README* \
    … …  
    329332        <seg>
    330333          scp, sftp, sftp-server, slogin, ssh, sshd, ssh-add, ssh-agent,
    331           ssh-keygen, ssh-keyscan and ssh-keysign
     334          ssh-copy-id, ssh-keygen, ssh-keyscan, ssh-keysign and
     335          ssh-pkcs11-helper
    332336        </seg>
    333337        <seg>
    … …  
    447451      </varlistentry>
    448452
     453      <varlistentry id="ssh-copy-id">
     454        <term><command>ssh-copy-id</command></term>
     455        <listitem>
     456          <para>
     457            is a script that enables logins on remote machine using local keys.
     458          </para>
     459          <indexterm zone="openssh ssh-copy-id">
     460            <primary sortas="b-ssh-copy-id">ssh-copy-id</primary>
     461          </indexterm>
     462        </listitem>
     463      </varlistentry>
     464
    449465      <varlistentry id="ssh-keygen">
    450466        <term><command>ssh-keygen</command></term>
    … …  
    485501        </listitem>
    486502      </varlistentry>
     503
     504      <varlistentry id="ssh-pkcs11-helper">
     505        <term><command>ssh-pkcs11-helper</command></term>
     506        <listitem>
     507          <para>
     508            is a <command>ssh-agent</command> helper program for PKCS#11 support.
     509          </para>
     510          <indexterm zone="openssh ssh-pkcs11-helper">
     511            <primary sortas="b-ssh-pkcs11-helper">ssh-pkcs11-helper</primary>
     512          </indexterm>
     513        </listitem>
     514      </varlistentry>
     515
    487516    </variablelist>
    488517  </sect2>

  • postlfs/security/sudo.xml

    r13e0a61 raf73a280  
    77  <!ENTITY sudo-download-http "http://www.sudo.ws/sudo/dist/sudo-&sudo-version;.tar.gz">
    88  <!ENTITY sudo-download-ftp  "ftp://ftp.twaren.net/Unix/Security/Sudo/sudo-&sudo-version;.tar.gz">
    9   <!ENTITY sudo-md5sum        "a7b5c39a904721956eccddd30689250f">
     9  <!ENTITY sudo-md5sum        "6dac48c73c8e0932980efcddafa569af">
    1010  <!ENTITY sudo-size          "1.8 MB">
    11   <!ENTITY sudo-buildsize     "19 MB">
    12   <!ENTITY sudo-time          "0.2 SBU">
     11  <!ENTITY sudo-buildsize     "23 MB">
     12  <!ENTITY sudo-time          "0.3 SBU">
    1313]>
    1414
    … …  
    102102    </para>
    103103
    104 <screen><userinput>./configure --prefix=/usr                   \
    105             --libexecdir=/usr/lib/sudo      \
     104<screen><userinput>./configure --prefix=/usr                        \
     105            --libexecdir=/usr/lib/sudo           \
    106106            --docdir=/usr/share/doc/sudo-&sudo-version; \
    107             --with-all-insults              \
    108             --with-env-editor               \
    109             --without-pam                   \
    110             --without-sendmail &amp;&amp;
     107            --with-all-insults                   \
     108            --with-env-editor                    &amp;&amp;
    111109make</userinput></screen>
    112110
    … …  
    136134    </para>
    137135
    138     <para>
    139       <option>--without-pam</option>: This switch disables the use of
     136<!--
     137    <para>
     138      <option>-&#45;without-pam</option>: This switch disables the use of
    140139      <application>PAM</application> authentication. Omit if you have
    141140      <application>Linux PAM</application> installed.
    … …  
    143142
    144143    <para>
    145       <option>--without-sendmail</option>: This switch disables the use of
     144      <option>-&#45;without-sendmail</option>: This switch disables the use of
    146145      sendmail. Remove if you have a sendmail compatible MTA.
    147146   </para>
    148147
     148-->
    149149    <note>
    150150      <para>

  • server/databases/sqlite.xml

    r13e0a61 raf73a280  
    55  %general-entities;
    66
    7   <!ENTITY sqlite-dl-version    "3071602">
    8   <!ENTITY sqlite-doc-version   "3071602">
     7  <!ENTITY sqlite-dl-version    "3071700">
     8  <!ENTITY sqlite-doc-version   "3071700">
    99
    1010  <!ENTITY sqlite-download-http
    1111           "http://sqlite.org/2013/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
    1212  <!ENTITY sqlite-download-ftp  " ">
    13   <!ENTITY sqlite-md5sum        "ce7d2bc0d9b8dd18995b888c6b0b220f">
     13  <!ENTITY sqlite-md5sum        "18c285053e9562b848209cb0ee16d4ab">
    1414  <!ENTITY sqlite-size          "1.8 MB">
    15   <!ENTITY sqlite-buildsize     "35 MB (includes optional documentation)">
    16   <!ENTITY sqlite-time          "0.2 SBU">
     15  <!ENTITY sqlite-buildsize     "40 MB (includes optional documentation)">
     16  <!ENTITY sqlite-time          "0.3 SBU">
    1717
    1818  <!ENTITY sqlite-docs-download
    1919           "http://sqlite.org/2013/sqlite-doc-&sqlite-doc-version;.zip">
    20   <!ENTITY sqlite-docs-md5sum   "2561853991248a951cd15347d51375d0">
     20  <!ENTITY sqlite-docs-md5sum   "f8a99a3db44c9564b32fc47eca6d8cf0">
    2121  <!ENTITY sqlite-docs-size     "4.0 MB">
    2222]>

  • server/major/bind.xml

    r13e0a61 raf73a280  
    88  <!ENTITY bind-download-ftp
    99  "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
    10   <!ENTITY bind-md5sum "2be7763c99b7e7b42ac3a18a267ce1aa">
    11   <!ENTITY bind-size "7.0 MB">
    12   <!ENTITY bind-buildsize "178 (additional 162 MB to run the test suite)">
    13   <!ENTITY bind-time "1.7 SBU (additional 15 minutes, processor independent, to
     10  <!ENTITY bind-md5sum "7baa8359f0773e04f63d7e694db1909c">
     11  <!ENTITY bind-size "7.2 MB">
     12  <!ENTITY bind-buildsize "110 MB (additional 50 MB to run the test suite)">
     13  <!ENTITY bind-time "1.3 SBU (additional 15 minutes, processor independent, to
    1414  run the complete test suite)">
    1515]>
    … …  
    7373    <bridgehead renderas="sect4">Optional</bridgehead>
    7474    <para role="optional">
     75      <xref linkend="libcap2"/>,
     76      <xref linkend="libxml2"/>,
     77      <xref linkend="mitkrb"/> and
    7578      <xref linkend="openssl"/>
    7679    </para>
    … …  
    119122            --mandir=/usr/share/man \
    120123            --enable-threads        \
    121             --with-libtool          &amp;&amp;
     124            --with-libtool          \
     125            --disable-static        &amp;&amp;
    122126make</userinput></screen>
    123127
    … …  
    137141<screen role="root"><userinput>bin/tests/system/ifconfig.sh down</userinput></screen>
    138142
    139     <para>Issue the following command to check that all 179 tests
     143    <para>Issue the following command to check that all 185 tests
    140144    ran successfully:</para>
    141145
    … …  
    170174    building of dynamic libraries and links the installed binaries to these
    171175    libraries.</para>
     176
     177    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     178      href="../../xincludes/static-libraries.xml"/>
    172179
    173180    <para><command>chmod 755
    … …  
    351358B.ROOT-SERVERS.NET.     6D  IN      A       192.228.79.201
    352359C.ROOT-SERVERS.NET.     6D  IN      A       192.33.4.12
    353 D.ROOT-SERVERS.NET.     6D  IN      A       128.8.10.90
     360D.ROOT-SERVERS.NET.     6D  IN      A       199.7.91.13
    354361E.ROOT-SERVERS.NET.     6D  IN      A       192.203.230.10
    355362F.ROOT-SERVERS.NET.     6D  IN      A       192.5.5.241
    … …  
    444451
    445452      <seglistitem>
    446         <seg>dig, dnssec-keygen, dnssec-signzone, host, isc-config.sh, lwresd,
    447         named, named-checkconf, named-checkzone, nslookup, nsupdate, rndc, and
    448         rndc-confgen</seg>
    449         <seg>libbind9.{so,a}, libdns.{so,a}, libisc.{so,a}, libisccc.{so,a},
    450         libisccfg.{so,a}, and liblwres.{so,a}</seg>
     453        <seg>arpaname, ddns-confgen, dig, dnssec-checkds, dnssec-coverage,
     454        dnssec-dsfromkey, dnssec-keyfromlabel, dnssec-keygen, dnssec-revoke,
     455        dnssec-settime, dnssec-signzone, dnssec-verify, genrandom, host,
     456        isc-config.sh, isc-hmac-fixup, lwresd, named, named-checkconf,
     457        named-checkzone, named-journalprint, nsec3hash, nslookup, nsupdate, rndc
     458        and rndc-confgen</seg>
     459        <seg>libbind9.so, libdns.so, libisccc.so, libisccfg.so, libisc.so and
     460        liblwres.so</seg>
    451461        <seg>/srv/named, /usr/include/bind9, /usr/include/dns, /usr/include/dst,
    452462        /usr/include/isc, /usr/include/isccc, /usr/include/isccfg,
    453         /usr/include/lwres, and /usr/share/doc/bind-&bind-version;</seg>
     463        /usr/include/lwres and /usr/share/doc/bind-&bind-version;</seg>
    454464      </seglistitem>
    455465    </segmentedlist>

  • server/other/soprano.xml

    r13e0a61 raf73a280  
    7979      <xref linkend="dbus"/>,
    8080      <xref linkend="cmake"/>,
    81       <xref linkend="qt"/> and
     81      <xref linkend="qt4"/> and
    8282      <xref linkend="redland"/>
    8383    </para>

  • x/lib/cairo.xml

    r13e0a61 raf73a280  
    106106      <xref linkend="libdrm"/>,
    107107      <xref linkend="mesalib"/>,
    108       <xref linkend="qt"/>,
     108      <xref linkend="qt4"/>,
    109109      <ulink url="http://code.google.com/p/skia/">Skia</ulink> and
    110110      <ulink url="http://www.valgrind.org">Valgrind</ulink>

  • x/lib/lib.xml

    r13e0a61 raf73a280  
    5353  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
    5454  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
    55   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt.xml"/>
     55  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
    5656  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
    5757  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>

  • x/wm/openbox.xml

    r13e0a61 raf73a280  
    7272    <para role="required">
    7373      <xref linkend="x-window-system"/> and
    74       <xref linkend="pango"/> (compiled with support for libXft).
     74      <xref linkend="pango"/> (compiled with support for libXft)
    7575    </para>
    7676
    7777    <bridgehead renderas="sect4">Optional</bridgehead>
    7878    <para role="optional">
    79       <xref linkend="imlib2"/> (to enable icons in the right click menu).
     79      <xref linkend="imlib2"/> (to enable icons in the right click menu) and
     80      <ulink url="http://freedesktop.org/wiki/Software/pyxdg">PyXDG</ulink>
    8081    </para>
    8182
    … …  
    99100    </para>
    100101
    101 <screen><userinput>./configure -&#45;prefix=/usr -&#45;sysconfdir=/etc -&#45;disable-static \
    102   -&#45;docdir=/usr/share/doc/openbox-&openbox-version; &amp;&amp;
     102<screen><userinput>./configure --prefix=/usr                         /
     103            --libexecdir=/usr/lib/openbox         /
     104            --sysconfdir=/etc                     /
     105            --docdir=/usr/share/doc/openbox-&openbox-version; /
     106            --disable-static                      &amp;&amp;
    103107make</userinput></screen>
    104108
    … …  
    118122
    119123    <para>
    120       <option>-&#45;sysconfdir=/etc</option>: This option puts
     124      <option>--sysconfdir=/etc</option>: This option puts
    121125      <application>Openbox</application>'s configuration files in
    122126      /etc/xdg/openbox instead of /usr/etc/xdg/openbox.
    … …  
    124128
    125129    <para>
    126       <option>-&#45;disable-static</option>: This option stops it compiling
    127       static versions of the libraries.
    128     </para>
    129 
    130     <para>
    131       <option>-&#45;docdir=/usr/share/doc/openbox-&openbox-version;</option>:
     130      <option>--docdir=/usr/share/doc/openbox-&openbox-version;</option>:
    132131      this puts a few files in a versioned directory in
    133132      <filename class="directory">/usr/share/doc</filename>.
    134133    </para>
     134
     135    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     136      href="../../xincludes/static-libraries.xml"/>
     137
    135138  </sect2>
    136139
    … …  
    142145
    143146      <para>
    144         /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
    145         ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
    146       </para>
     147        /etc/xdg/openbox/autostart, /etc/xdg/openbox/menu.xml, /etc/xdg/openbox/rc.xml,
     148        ~/.config/openbox/autostart, ~/.config/openbox/menu.xml and ~/.config/openbox/rc.xml
     149      </para>
     150
     151      <indexterm zone="openbox openbox-config">
     152        <primary sortas="e-AA.autostart">~/.config/openbox/autostart</primary>
     153      </indexterm>
    147154
    148155      <indexterm zone="openbox openbox-config">
    … …  
    152159      <indexterm zone="openbox openbox-config">
    153160        <primary sortas="e-AA.rc">~/.config/openbox/rc.xml</primary>
     161      </indexterm>
     162
     163      <indexterm zone="openbox openbox-config">
     164        <primary sortas="e-etc-path-autostart">/etc/xdg/openbox/autostart</primary>
    154165      </indexterm>
    155166
    … …  
    227238      </para>
    228239
    229 <screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
    230 display -backdrop -window root /path/to/beautiful/picture.jpeg
    231 exec openbox
    232 HERE_DOC</userinput></screen>
     240<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     241<literal>display -backdrop -window root /path/to/beautiful/picture.jpeg
     242exec openbox</literal>
     243EOF</userinput></screen>
    233244
    234245      <para>
    … …  
    238249      </para>
    239250
    240 <screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
    241 # make an array which lists the pictures:
     251<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     252<literal># make an array which lists the pictures:
    242253picture_list=(~/.config/backgrounds/*)
    243254# create a random integer between 0 and the number of pictures:
    … …  
    245256# display the chosen picture:
    246257display -backdrop -window root "${picture_list[${random_number}]}"
    247 exec openbox
    248 HERE_DOC</userinput></screen>
     258exec openbox</literal>
     259EOF</userinput></screen>
    249260
    250261      <para>
    … …  
    255266      </para>
    256267
    257 <screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "HERE_DOC"
    258 . /etc/profile
     268<screen role="user"><userinput>cat &gt; ~/.xinitrc &lt;&lt; "EOF"
     269<literal>. /etc/profile
    259270picture_list=(~/.config/backgrounds/*)
    260271random_number=$(( ${RANDOM} % ${#picture_list[*]} ))
    … …  
    263274eval $(dbus-launch --auto-syntax --exit-with-session)
    264275lxpanel &amp;
    265 exec openbox
    266 HERE_DOC</userinput></screen>
     276exec openbox</literal>
     277EOF</userinput></screen>
    267278    </sect3>
    268279  </sect2>
    … …  
    278289      <seglistitem>
    279290        <seg>
    280           gdm-control, gnome-panel-control, obxprop, openbox,
    281           openbox-gnome-session, openbox-kde-session and openbox-session
     291          gdm-control, gnome-panel-control, obxprop, openbox, openbox-autostart,
     292          openbox-gnome-session, openbox-kde-session, openbox-session and
     293          openbox-xdg-autostart
    282294        </seg>
    283295        <seg>
    … …  
    349361      </varlistentry>
    350362
     363      <varlistentry id="openbox-autostart">
     364        <term><command>openbox-autostart</command></term>
     365        <listitem>
     366          <para>
     367            is a script that runs commands and applications at Openbox startup.
     368          </para>
     369          <indexterm zone="openbox openbox-autostart">
     370            <primary sortas="b-openbox-autostart">openbox-autostart</primary>
     371          </indexterm>
     372        </listitem>
     373      </varlistentry>
     374
     375      <varlistentry id="openbox-xdg-autostart">
     376        <term><command>openbox-xdg-autostart</command></term>
     377        <listitem>
     378          <para>
     379            is a script that runs xdg autostart .desktop files.
     380          </para>
     381          <indexterm zone="openbox openbox-xdg-autostart">
     382            <primary sortas="b-openbox-xdg-autostart">openbox-xdg-autostart</primary>
     383          </indexterm>
     384        </listitem>
     385      </varlistentry>
     386
    351387      <varlistentry id="openbox-gnome-session">
    352388        <term><command>openbox-gnome-session</command></term>
    … …  
    354390          <para>
    355391            is a script to launch an <application>Gnome</application> session
    356             with openbox as your window manager from your
    357             <filename>~/.xinitrc</filename>.
     392            with <application>Openbox</application> as your window manager from
     393            your <filename>~/.xinitrc</filename>.
    358394          </para>
    359395          <indexterm zone="openbox openbox-gnome-session">

  • xsoft/other/gnash.xml

    r13e0a61 raf73a280  
    104104      <xref linkend="libogg"/>,
    105105      <xref linkend="libvorbis"/>,
    106       <xref linkend="qt"/>,
     106      <xref linkend="qt4"/>,
    107107      <xref linkend="speex"/>,
    108108      <xref linkend="wget"/>,

  • xsoft/other/transmission.xml

    r13e0a61 raf73a280  
    8787    <para role="recommended">
    8888      <xref linkend="gtk3"/> or
    89       <xref linkend="qt"/>
     89      <xref linkend="qt4"/>
    9090    </para>
    9191
    … …  
    112112
    113113    <para>
    114       If you have installed <xref linkend="qt"/> and would like to compile the
     114      If you have installed <xref linkend="qt4"/> and would like to compile the
    115115      Qt GUI, run the following commands:
    116116    </para>
Note: See TracChangeset for help on using the changeset viewer.