Changeset d6e4445


Ignore:
Timestamp:
02/01/2016 06:52:00 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
2f034e7
Parents:
12fbef3
Message:

Merge changes from trunk r16889, r16890, and r16892.

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

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • archive/kde/devel/kdewebdev.xml

    r12fbef3 rd6e4445  
    8080    <para>The <application>Quanta</application> application included in
    8181    <application>kdewebdev</application> can use several other utilities
    82     at run time.  <xref linkend="html-tidy"/> can be used to check the validity
     82    at run time.  <xref linkend="tidy-html"/> can be used to check the validity
    8383    of HTML documents. <ulink url="http://gubed.sf.net">Gubed</ulink> is
    8484    useful for debugging PHP scripts. <xref linkend="gnupg"/> or

  • general.ent

    r12fbef3 rd6e4445  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "31">                   <!-- Always 2 digits -->
    4 <!ENTITY month        "01">                   <!-- Always 2 digits -->
     3<!ENTITY day          "01">                   <!-- Always 2 digits -->
     4<!ENTITY month        "02">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2016">
    66<!ENTITY copyrightdate "2001-&year;">
    77<!ENTITY copyholder   "The BLFS systemd Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "January 31st, &year;">
     9<!ENTITY releasedate  "February 1st, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->

  • general/genutils/tidy.xml

    r12fbef3 rd6e4445  
    55  %general-entities;
    66
    7   <!ENTITY tidy-download-http "&sources-anduin-http;/tidy/tidy-&tidy-version;.tar.bz2">
     7  <!ENTITY tidy-download-http "https://github.com/htacg/tidy-html5/archive/&tidy-version;.tar.gz">
    88  <!ENTITY tidy-download-ftp  " ">
    9   <!ENTITY tidy-md5sum        "dd1fe109b4259ad3f364b175787ad5e9">
    10   <!ENTITY tidy-size          "807 KB">
    11   <!ENTITY tidy-buildsize     "12 MB">
    12   <!ENTITY tidy-time          "0.2 SBU">
     9  <!ENTITY tidy-md5sum        "5fd96deef635ab8cea3dc74079f54d95">
     10  <!ENTITY tidy-size          "632 KB">
     11  <!ENTITY tidy-buildsize     "16 MB">
     12  <!ENTITY tidy-time          "0.1 SBU">
    1313]>
    1414
    15 <sect1 id="html-tidy" xreflabel="HTML Tidy-&tidy-version;">
     15<sect1 id="tidy-html" xreflabel="tidy-html5-&tidy-version;">
    1616  <?dbhtml filename="tidy.html"?>
    1717
    … …  
    2121  </sect1info>
    2222
    23   <title>HTML Tidy-&tidy-version;</title>
    24 
    25   <indexterm zone="html-tidy">
    26     <primary sortas="a-HTML-Tidy">HTML Tidy</primary>
     23  <title>tidy-html5-&tidy-version;</title>
     24
     25  <indexterm zone="tidy-html">
     26    <primary sortas="a-Tidy-HTML">Tidy HTML5</primary>
    2727  </indexterm>
    2828
    2929  <sect2 role="package">
    30     <title>Introduction to HTML Tidy</title>
    31 
    32     <para>The <application>HTML Tidy</application> package contains a
     30    <title>Introduction to Tidy HTML5</title>
     31
     32    <para>The <application>Tidy HTML5</application> package contains a
    3333    command line tool and libraries used to read HTML, XHTML and XML files
    3434    and write cleaned up markup. It detects and corrects many common coding
    … …  
    6060    </itemizedlist>
    6161
    62     <para><application>HTML Tidy</application> tarballs are no longer generated
    63     by the maintainers. To build from source, the
    64     <application>HTML Tidy</application> developers recommend using current
    65     CVS. The source tarball shown above was created by the BLFS team by pulling
    66     a CVS version, then generating the autotool components and documentation.
    67     BLFS made no changes to the existing source files.</para>
    68 
    69     <bridgehead renderas="sect3">HTML Tidy Dependencies</bridgehead>
     62    <note>
     63      <para>
     64        <application>Tidy HTML5</application> source tarball shown above
     65        downloads with the correct name tidy-html5-&tidy-version;.tar.gz, if
     66        using a browser such as Firefox. If you prefer to use a command line
     67        program, such as wget, you obtain &tidy-version;.tar.gz. To
     68        change the filename, run: <command>mv -vi
     69        &tidy-version;.tar.gz tidy-html5-&tidy-version;.tar.gz</command>.
     70        </para>
     71      </note>
     72
     73    <bridgehead renderas="sect3">Tidy HTML5 Dependencies</bridgehead>
     74
     75    <bridgehead renderas="sect4">Required</bridgehead>
     76    <para role="required"><xref linkend="cmake"/></para>
     77
     78    <bridgehead renderas="sect4">Recommended</bridgehead>
     79    <para role="recommended"><xref linkend="libxslt"/></para>
    7080
    7181    <bridgehead renderas="sect4">Optional</bridgehead>
    72     <para role="optional"><ulink url="http://dmalloc.com/">Dmalloc</ulink></para>
     82    <para role="optional"><xref linkend="doxygen"/></para>
    7383
    7484    <para condition="html" role="usernotes">User Notes:
    … …  
    7888
    7989  <sect2 role="installation">
    80     <title>Installation of HTML Tidy</title>
    81 
    82     <para>Install <application>HTML Tidy</application> by
    83     running the following commands:</para>
    84 
    85 <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
     90    <title>Installation of Tidy HTML5</title>
     91
     92    <para>Install <application>Tidy HTML5</application> by running the following
     93    commands:</para>
     94
     95<screen><userinput>cd build/cmake &amp;&amp;
     96
     97cmake -DCMAKE_INSTALL_PREFIX=/usr \
     98      -DCMAKE_BUILD_TYPE=Release  \
     99      -DBUILD_TAB2SPACE=ON        \
     100      ../..    &amp;&amp;
     101
    86102make</userinput></screen>
    87103
    88104    <para>This package does not come with a test suite.</para>
    89     <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
    90 
    91     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
     105
     106    <para>Now, as the <systemitem class="username">root</systemitem> user:
     107    </para>
    92108
    93109<screen role="root"><userinput>make install &amp;&amp;
    94 
    95 install -v -m644 -D htmldoc/tidy.1 \
    96                     /usr/share/man/man1/tidy.1 &amp;&amp;
    97 install -v -m755 -d /usr/share/doc/tidy-&tidy-version; &amp;&amp;
    98 install -v -m644    htmldoc/*.{html,gif,css} \
    99                     /usr/share/doc/tidy-&tidy-version;</userinput></screen>
    100 
    101     <para>If you wish to install the API documentation you must have
    102     <xref linkend="doxygen"/> installed, then change directories into the
    103     <filename class='directory'>htmldoc</filename> of the source tree and
    104     issue the command <command>doxygen</command>. Then as the
    105     <systemitem class="username">root</systemitem> user copy
    106     the <filename class='directory'>api</filename> directory to
    107     <filename class='directory'>/usr/share/doc/tidy-&tidy-version;.</filename></para>
     110install -v -m755 tab2space /usr/bin</userinput></screen>
     111
     112    <para>If you wish to install the API documentation you must have <xref
     113    linkend="doxygen"/> installed, then change directories into the <filename
     114    class='directory'>documentation</filename> directory of the source tree and
     115    issue the command <command>doxygen doxygen.cfg</command>. Then as the
     116    <systemitem class="username">root</systemitem> user copy the <filename
     117    class='directory'>documentation/temp/tidylib_api</filename> directory to
     118    <filename
     119    class='directory'>/usr/share/doc/tidy-&tidy-version;.</filename></para>
    108120
    109121  </sect2>
    … …  
    112124    <title>Command Explanations</title>
    113125
    114     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115       href="../../xincludes/static-libraries.xml"/>
     126    <para>
     127      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
     128      build the release library without any debug `assert` in the code.
     129    </para>
     130
     131    <para>
     132      <parameter>-DBUILD_TAB2SPACE=ON</parameter>: This switch is used to enable
     133      building the <command>tab2space</command> utility.
     134    </para>
    116135
    117136  </sect2>
    118137
    119138  <sect2 role="configuration">
    120     <title>Configuring HTML Tidy</title>
     139    <title>Configuring Tidy HTML5</title>
    121140
    122141    <sect3>
    … …  
    149168    <seglistitem>
    150169    <seg>tab2space and tidy</seg>
    151     <seg>libtidy.so</seg>
     170    <seg>libtidy.so and libtidys.a</seg>
    152171    <seg>/usr/share/doc/tidy-&tidy-version;</seg>
    153172    </seglistitem>
    … …  
    164183          <para>is a utility to expand tabs and ensure consistent line
    165184          endings.</para>
    166           <indexterm zone="html-tidy tab2space">
     185          <indexterm zone="tidy-html tab2space">
    167186            <primary sortas="b-tab2space">tab2space</primary>
    168187          </indexterm>
    … …  
    174193        <listitem>
    175194          <para>validates, corrects, and pretty-prints HTML files.</para>
    176           <indexterm zone="html-tidy tidy">
     195          <indexterm zone="tidy-html tidy">
    177196            <primary sortas="b-tidy">tidy</primary>
    178197          </indexterm>
    … …  
    181200
    182201      <varlistentry id="libtidy">
    183         <term><filename class='libraryfile'>libtidy.so</filename></term>
     202        <term>
     203          <filename class='libraryfile'>libtidy.so and libtidys.a</filename>
     204        </term>
    184205        <listitem>
    185           <para>library provides the <application>HTML Tidy</application> API
     206          <para>library provides the <application>Tidy HTML5</application> API
    186207          functions to <command>tidy</command> and can also be called by other
    187208          programs.</para>
    188           <indexterm zone="html-tidy libtidy">
     209          <indexterm zone="tidy-html libtidy">
    189210            <primary sortas="c-libtidy">libtidy.so</primary>
    190211          </indexterm>

  • general/prog/php.xml

    r12fbef3 rd6e4445  
    125125    <para role="optional">
    126126      <xref linkend="curl"/>,
    127       <xref linkend="html-tidy"/>,
     127      <xref linkend="tidy-html"/>,
    128128      <ulink url="http://sourceforge.net/projects/caudium/">Caudium</ulink>,
    129129      <ulink url="http://www.hyperwave.com/">Hyperwave</ulink>,

  • introduction/welcome/changelog.xml

    r12fbef3 rd6e4445  
    4545-->
    4646    <listitem>
     47      <para>February 1st, 2016</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[dj] - Updated to libcap-2.25. Merged from trunk r16892.</para>
     51        </listitem>
     52        <listitem>
     53          <para>[dj] - Updated to mariadb-10.1.11. Merged from trunk
     54          r16892.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[dj] - Updated to x265_1.9 (x265-1.9). Merged from trunk
     58          r16892.</para>
     59        </listitem>
     60        <listitem>
     61          <para>[dj] - Updated to mpg123-1.23.0. Merged from trunk
     62          r16892.</para>
     63        </listitem>
     64        <listitem>
     65          <para>[dj] - Replace HTML Tidy-cvs_20101110 with tidy-html5-5.1.25.
     66          Merged from trunk r16889.</para>
     67        </listitem>
     68      </itemizedlist>
     69    </listitem>
     70
     71    <listitem>
    4772      <para>January 31st, 2016</para>
    4873      <itemizedlist>

  • kde/core/kde-baseapps.xml

    r12fbef3 rd6e4445  
    7676    <para role="optional">
    7777      <xref linkend="glib2"/> and
    78       <xref linkend="html-tidy"/>
     78      <xref linkend="tidy-html"/>
    7979    </para>
    8080

  • multimedia/audioutils/mpg123.xml

    r12fbef3 rd6e4445  
    77  <!ENTITY mpg123-download-http "&sourceforge-repo;/mpg123/mpg123-&mpg123-version;.tar.bz2">
    88  <!ENTITY mpg123-download-ftp  " ">
    9   <!ENTITY mpg123-md5sum        "2dfafae3bbc532b4c8b04a77c6a6de89">
    10   <!ENTITY mpg123-size          "852 KB">
    11   <!ENTITY mpg123-buildsize     "14 MB">
     9  <!ENTITY mpg123-md5sum        "a489e1e54de58cb1509582ffc28cf582">
     10  <!ENTITY mpg123-size          "872 KB">
     11  <!ENTITY mpg123-buildsize     "15 MB">
    1212  <!ENTITY mpg123-time          "0.2 SBU">
    1313]>
    … …  
    132132    <segmentedlist>
    133133      <segtitle>Installed Programs</segtitle>
    134       <segtitle>Installed Library</segtitle>
     134      <segtitle>Installed Libraries</segtitle>
    135135      <segtitle>Installed Directory</segtitle>
    136136
    … …  
    140140        </seg>
    141141        <seg>
    142           libmpg123.so
     142          libmpg123.so and libout123.so
    143143        </seg>
    144144        <seg>
    … …  
    201201      </varlistentry>
    202202
    203 
    204203      <varlistentry id="libmpg123">
    205204        <term><filename class="libraryfile">libmpg123.so</filename></term>
    … …  
    214213      </varlistentry>
    215214
     215      <varlistentry id="libout123">
     216        <term><filename class="libraryfile">libout123.so</filename></term>
     217        <listitem>
     218          <para>
     219            contains the <application>out123</application> API functions.
     220          </para>
     221          <indexterm zone="mpg123 libout123">
     222            <primary sortas="c-libout123">libout123.so</primary>
     223          </indexterm>
     224        </listitem>
     225      </varlistentry>
     226
    216227    </variablelist>
    217228

  • multimedia/libdriv/x265.xml

    r12fbef3 rd6e4445  
    77  <!ENTITY x265-download-http "https://bitbucket.org/multicoreware/x265/downloads/x265_&x265-version;.tar.gz">
    88  <!ENTITY x265-download-ftp  " ">
    9   <!ENTITY x265-md5sum        "8b7ef9bc0b5bd26965d05a4508effeed">
    10   <!ENTITY x265-size          "897 KB">
    11   <!ENTITY x265-buildsize     "29 MB">
    12   <!ENTITY x265-time          "0.8 SBU">
     9  <!ENTITY x265-md5sum        "f34a1c4c660ff07511365cb0983cf164">
     10  <!ENTITY x265-size          "936 KB">
     11  <!ENTITY x265-buildsize     "25 MB">
     12  <!ENTITY x265-time          "0.7 SBU">
    1313]>
    1414
    … …  
    9191    <para role="recommended">
    9292      <xref linkend="yasm"/>
     93    </para>
     94
     95    <bridgehead renderas="sect4">Optional</bridgehead>
     96    <para role="optional">
     97      <ulink url="http://oss.sgi.com/projects/libnuma/">numactl</ulink>
    9398    </para>
    9499

  • packages.ent

    r12fbef3 rd6e4445  
    1818<!ENTITY haveged-version              "1.9.1">
    1919<!ENTITY iptables-version             "1.6.0">
    20 <!ENTITY libcap-version               "2.24">
     20<!ENTITY libcap-version               "2.25">
    2121<!ENTITY liboauth-version             "1.0.3">
    2222<!ENTITY libpwquality-version         "1.3.0">
    … …  
    224224<!ENTITY screen-version               "4.3.1">
    225225<!ENTITY sharutils-version            "4.15.2">
    226 <!ENTITY tidy-version                 "cvs_20101110">
     226<!ENTITY tidy-version                 "5.1.25">
    227227<!ENTITY time-version                 "1.7">
    228228<!ENTITY tree-version                 "1.7.0">
    … …  
    460460<!ENTITY db-version                   "6.1.26">
    461461<!ENTITY lmdb-version                 "0.9.17">
    462 <!ENTITY mariadb-version              "10.1.10">
     462<!ENTITY mariadb-version              "10.1.11">
    463463<!ENTITY postgresql-version           "9.5.0">
    464464<!ENTITY sqlite-version               "3.10.2">
    … …  
    735735<!ENTITY v4l-utils-version            "1.10.0">
    736736<!ENTITY x264-version                 "20150908-2245">
    737 <!ENTITY x265-version                 "1.8">
     737<!ENTITY x265-version                 "1.9">
    738738<!ENTITY xine-lib-version             "1.2.6">
    739739<!ENTITY xvid-version                 "1.3.3">
    … …  
    747747
    748748<!-- Chapter 39 -->
    749 <!ENTITY mpg123-version               "1.22.4">
     749<!ENTITY mpg123-version               "1.23.0">
    750750<!ENTITY vorbistools-version          "1.4.0">
    751751<!ENTITY lame-version                 "3.99.5">

  • postlfs/filesystems/initramfs.xml

    r12fbef3 rd6e4445  
    5656    <screen role="root"><userinput>cat &gt; /sbin/mkinitramfs &lt;&lt; "EOF"
    5757#!/bin/bash
    58 # This file based in part on the mkinitrafms script for the LFS LiveCD
     58# This file based in part on the mkinitramfs script for the LFS LiveCD
    5959# written by Alexander E. Patrakov and Jeremy Huntwork.
    6060

  • postlfs/security/libcap.xml

    r12fbef3 rd6e4445  
    77  <!ENTITY libcap-download-http "https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
    88  <!ENTITY libcap-download-ftp  "ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
    9   <!ENTITY libcap-md5sum        "d43ab9f680435a7fff35b4ace8d45b80">
    10   <!ENTITY libcap-size          "62 KB">
    11   <!ENTITY libcap-buildsize     "1.5 MB">
    12   <!ENTITY libcap-time          "0.1 SBU">
     9  <!ENTITY libcap-md5sum        "6666b839e5d46c2ad33fc8aa2ceb5f77">
     10  <!ENTITY libcap-size          "64 KB">
     11  <!ENTITY libcap-buildsize     "1.7 MB">
     12  <!ENTITY libcap-time          "less than 0.1 SBU">
    1313]>
    1414

  • server/databases/mariadb.xml

    r12fbef3 rd6e4445  
    77  <!ENTITY mariadb-download-http "https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
    88  <!ENTITY mariadb-download-ftp  "ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz">
    9   <!ENTITY mariadb-md5sum        "9aa4d68b24c1ddd8cb56923a920684b3">
     9  <!ENTITY mariadb-md5sum        "c199608ae4282f16007dc8c270ff2439">
    1010  <!ENTITY mariadb-size          "53 MB">
    1111  <!ENTITY mariadb-buildsize     "1.6 GB (with tests)">
    12   <!ENTITY mariadb-time          "3.8 SBU, (with tests - all using parallelism=4)">
     12  <!ENTITY mariadb-time          "4 SBU, (with tests - all using parallelism=4)">
    1313]>
    1414
    … …  
    9494      <xref linkend="libxml2"/>,
    9595      <xref linkend="linux-pam"/>,
     96      <xref linkend="mitkrb"/>,
    9697      <xref linkend="pcre"/>,
    9798      <xref linkend="ruby"/>,
    … …  
    391392        <seg>
    392393          aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
    393           innochecksum, msql2mysql, my_print_defaults, myisam_ftdump, myisamchk,
    394           myisamlog, myisampack, mysql, mysql_client_test,
    395           mysql_client_test_embedded, mysql_config, mysql_convert_table_format,
    396           mysql_embedded, mysql_find_rows, mysql_fix_extensions,
    397           mysql_install_db, mysql_plugin, mysql_secure_installation,
    398           mysql_setpermission, mysql_tzinfo_to_sql, mysql_upgrade,
    399           mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin, mysqlbinlog,
    400           mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe, mysqldump,
    401           mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow, mysqlslap,
    402           mysqltest, mysqltest_embedded, mytop, perror, replace,
     394          innochecksum, maria_add_gis_sp.sql, msql2mysql, my_print_defaults,
     395          myisam_ftdump, myisamchk, myisamlog, myisampack, mysql,
     396          mysql_client_test, mysql_client_test_embedded, mysql_config,
     397          mysql_convert_table_format, mysql_embedded, mysql_find_rows,
     398          mysql_fix_extensions, mysql_install_db, mysql_plugin,
     399          mysql_secure_installation, mysql_setpermission, mysql_tzinfo_to_sql,
     400          mysql_upgrade, mysql_waitpid, mysql_zap, mysqlaccess, mysqladmin,
     401          mysqlbinlog, mysqlbug, mysqlcheck, mysqld, mysqld_multi, mysqld_safe,
     402          mysqldump, mysqldumpslow, mysqlhotcopy, mysqlimport, mysqlshow,
     403          mysqlslap, mysqltest, mysqltest_embedded, mytop, perror, replace,
    403404          resolve_stack_dump, resolveip, wsrep_sst_common, wsrep_sst_mysqldump,
    404405          wsrep_sst_rsync, wsrep_sst_xtrabackup, and wsrep_sst_xtrabackup-v2
    … …  
    512513      </varlistentry>
    513514
     515      <varlistentry id="maria_add_gis_sp.sql-mariadb">
     516        <term><command>maria_add_gis_sp.sql</command></term>
     517        <listitem>
     518          <para>
     519            this script creates stored procedures required by the OpenGIS
     520            standards, and is is prepared to be run with the --bootstrap server
     521            option.
     522          </para>
     523          <indexterm zone="mariadb maria_add_gis_sp.sql-mariadb">
     524            <primary sortas="b-maria_add_gis_sp.sql-mariadb">maria_add_gis_sp.sql</primary>
     525          </indexterm>
     526        </listitem>
     527      </varlistentry>
     528
    514529      <varlistentry id="msql2mysql-mariadb">
    515530        <term><command>msql2mysql</command></term>

  • server/major/vsftpd.xml

    r12fbef3 rd6e4445  
    8989useradd -c "vsftpd User"  -d /dev/null -g vsftpd -s /bin/false -u 47 vsftpd &amp;&amp;
    9090useradd -c anonymous_user -d /home/ftp -g ftp    -s /bin/false -u 45 ftp</userinput></screen>
    91 
     91<!--
    9292    <para>If you did not install the optional <application>libcap2</application> package,
    9393    run the following to avoid a build error:</para>
    9494
    95 <screen><userinput>sed -i -e 's|#define VSF_SYSDEP_HAVE_LIBCAP|//&amp;|' sysdeputil.c</userinput></screen>
     95<screen><userinput>sed -i -e 's|#define VSF_SYSDEP_HAVE_LIBCAP|//&amp;|' sysdeputil.c</userinput></screen>-->
    9696
    9797    <para>Build <application>vsftpd</application> as an unprivileged user
    … …  
    207207        <seg>vsftpd</seg>
    208208        <seg>None</seg>
    209         <seg>//usr/share/vsftpd, /home/ftp</seg>
     209        <seg>/usr/share/vsftpd, /home/ftp</seg>
    210210      </seglistitem>
    211211    </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.