Changeset 248bac5


Ignore:
Timestamp:
02/07/2016 06:51:58 AM (9 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
f60f672
Parents:
6ef90edf
Message:

Merge r16908, r16909, r16911, and r16912 from trunk. Update to cups-2.1.3, openldap-2.4.44, and vlc-2.2.2.

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

Files:
10 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r6ef90edf r248bac5  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "06">                   <!-- Always 2 digits -->
     3<!ENTITY day          "07">                   <!-- Always 2 digits -->
    44<!ENTITY month        "02">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2016">
     
    77<!ENTITY copyholder   "The BLFS systemd Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "February 6th, &year;">
     9<!ENTITY releasedate  "February 7th, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->
  • general/genlib/liblinear.xml

    r6ef90edf r248bac5  
    55  %general-entities;
    66
     7<!--
    78  <!ENTITY liblinear-download-http "http://www.csie.ntu.edu.tw/~cjlin/liblinear/oldfiles/liblinear-&liblinear-version;.tar.gz">
     9  HTTP request sent, awaiting response... 403 Forbidden
     10  2016-02-04 09:39:51 ERROR 403: Forbidden. -->
     11  <!ENTITY liblinear-download-http "https://github.com/cjlin1/liblinear/archive/v&liblinear-version;.tar.gz">
    812  <!ENTITY liblinear-download-ftp  " ">
    9   <!ENTITY liblinear-md5sum        "0d87a71d054ed17c5ee7656efba06e89">
     13  <!ENTITY liblinear-md5sum        "b48c811243eae0e4d144f21424294fcc">
    1014  <!ENTITY liblinear-size          "376 KB">
    1115  <!ENTITY liblinear-buildsize     "1.2 MB">
     
    8387    </itemizedlist>
    8488
     89    <note>
     90      <para>
     91        The <application>liblinear</application> source tarball shown above
     92        downloads with the correct name, liblinear-&liblinear-version;.tar.gz,
     93        if using a browser such as Firefox. If you prefer to use a command line
     94        program such as wget, you normally would obtain
     95        v&liblinear-version;.tar.gz. To obtain this package with the proper
     96        filename, run:
     97
     98<screen><userinput>wget -c https://github.com/cjlin1/liblinear/archive/v&liblinear-version;.tar.gz \
     99     -O liblinear-&liblinear-version;.tar.gz</userinput></screen>.
     100        </para>
     101      </note>
     102
    85103    <para condition="html" role="usernotes">
    86104      User Notes: <ulink url="&blfs-wiki;/liblinear"/>
  • general/genutils/tidy.xml

    r6ef90edf r248bac5  
    6262    <note>
    6363      <para>
    64         <application>Tidy HTML5</application> source tarball shown above
    65         downloads with the correct name tidy-html5-&tidy-version;.tar.gz, if
     64        The <application>Tidy HTML5</application> source tarball shown above
     65        downloads with the correct name, tidy-html5-&tidy-version;.tar.gz, if
    6666        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>.
     67        program such as wget, you normally would obtain &tidy-version;.tar.gz.
     68        To obtain this package with the proper filename, run:
     69
     70<screen><userinput>wget -c https://github.com/htacg/tidy-html5/archive/&tidy-version;.tar.gz \
     71     -O tidy-html5-&tidy-version;.tar.gz</userinput></screen>
    7072        </para>
    7173      </note>
  • general/prog/expect.xml

    r6ef90edf r248bac5  
    3232    <para>The <application>Expect</application> package was installed in the
    3333    LFS temporary tools directory for testing other packages.  These
    34     procedures install it in a prmanent location.  It contains tools for
     34    procedures install it in a permanent location.  It contains tools for
    3535    automating interactive applications such as <command>telnet</command>,
    3636    <command>ftp</command>, <command>passwd</command>,
  • introduction/welcome/changelog.xml

    r6ef90edf r248bac5  
    4545-->
    4646    <listitem>
     47      <para>February 7th, 2016</para>
     48      <itemizedlist>
     49        <listitem>
     50          <para>[dj] - Update to openldap-2.4.44. Merged from trunk
     51          r16912.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[dj] - Update to cups-2.1.3. Merged from trunk r16912.</para>
     55        </listitem>
     56        <listitem>
     57          <para>[dj] - Update to vlc-2.2.2. Merged from trunk r16912.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[dj] - Merge text fixes from trunk (r16908, r16909, and
     61          r16911).</para>
     62        </listitem>
     63      </itemizedlist>
     64    </listitem>
     65
     66    <listitem>
    4767      <para>February 6th, 2016</para>
    4868      <itemizedlist>
  • multimedia/libdriv/v4l-utils.xml

    r6ef90edf r248bac5  
    122122
    123123    <para>
    124       Again, if both Qt4 and 5 installed at /opt and you chose to build against
    125       Qt4, restore <envar>PKG_CONFIG_PATH</envar>:
     124      Again, if both Qt4 and 5 are installed and you chose to build against Qt4,
     125      restore <envar>PKG_CONFIG_PATH</envar>:
    126126    </para>
    127127
  • multimedia/videoutils/vlc.xml

    r6ef90edf r248bac5  
    88      <!ENTITY vlc-download-ftp " ">
    99<!--  <!ENTITY vlc-download-ftp "ftp://ftp.videolan.org/pub/videolan/vlc/&vlc-version;/vlc-&vlc-version;.tar.xz">-->
    10   <!ENTITY vlc-md5sum        "42273945758b521c408fabc7fd6d9946">
    11   <!ENTITY vlc-size          "20 MB">
    12   <!ENTITY vlc-buildsize     "697 MB">
    13   <!ENTITY vlc-time          "4.5 SBU">
     10  <!ENTITY vlc-md5sum        "f98d60f0f59ef72b6e3407f2ff09bda6">
     11  <!ENTITY vlc-size          "22 MB">
     12  <!ENTITY vlc-buildsize     "679 MB (with tests)">
     13  <!ENTITY vlc-time          "4.4 SBU (with tests)">
    1414]>
    1515
     
    107107      <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
    108108      <ulink url="http://sourceforge.net/projects/libcddb/">libcddb</ulink>,
    109       <ulink url="http://code.google.com/p/libproxy/">libproxy</ulink>,
     109      <ulink url="https://github.com/libproxy/libproxy">libproxy</ulink>,
    110110      <ulink url="http://www.live555.com/">Live555</ulink>, and
    111111      <ulink url="http://www.gnu.org/software/vcdimager/">VCDImager</ulink>
     
    116116    <para role="optional">
    117117      <xref linkend="libogg"/>,
    118       <ulink url="http://code.google.com/p/game-music-emu/">Game Music Emu</ulink>,
     118      <ulink url="https://github.com/kode54/Game_Music_Emu">Game Music Emu</ulink>,
    119119      <ulink url="http://www.videolan.org/developers/libdvbpsi.html">libdvbpsi</ulink>,
    120120      <ulink url="http://downloads.xiph.org/releases/libshout/">libshout</ulink>,
     
    123123      <ulink url="http://sourceforge.net/projects/modplug-xmms/">libmodplug</ulink>,
    124124      <ulink url="http://www.musepack.net/">Musepack</ulink>, and
    125       <ulink url="http://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>,
     125      <ulink url="http://sourceforge.net/projects/sidplay2/">sidplay-libs</ulink>
    126126    </para>
    127127
     
    139139      <xref linkend="speex"/>,
    140140      <xref linkend="x264"/>,
    141       <ulink url="http://diracvideo.org/download/dirac-research/">Dirac</ulink>,
     141      <ulink url="http://sourceforge.net/projects/dirac/">Dirac</ulink>,
    142142      <ulink url="http://sourceforge.net/projects/fluidsynth/">FluidSynth</ulink>,
    143143      <ulink url="http://www.videolan.org/developers/libdca.html">libdca</ulink>,
    144144      <ulink url="http://code.google.com/p/libkate/">libkate</ulink>,
    145       <ulink url="http://code.google.com/p/libtiger/">libtiger</ulink>,
     145      <!--<ulink url="http://code.google.com/p/libtiger/">libtiger</ulink>,-->
    146146      <ulink url="http://www.khronos.org/openmax/">OpenMAX</ulink>,
    147       <ulink url="http://diracvideo.org/download/schroedinger/">Schroedinger</ulink>,
     147      <ulink url="http://sourceforge.net/projects/schrodinger/">Schroedinger</ulink>,
    148148      <ulink url="http://wiki.xiph.org/Tremor">Tremor</ulink>,
    149149      <ulink url="http://www.twolame.org/">Twolame</ulink>, and
     
    174174    <para role="optional">
    175175      <xref linkend="qt4"/> (required for the graphical user interface),
    176       <xref linkend="qt5"/> (for some plugins),
     176      <xref linkend="qt5"/> (for some plugins, but currently broken with
     177      Qt-5.5),
    177178      <ulink url="http://pkgbuild.com/~giovanni/libtar/">libtar</ulink>, and
    178179      <ulink url="http://www.lirc.org/">LIRC</ulink>
     
    211212
    212213    <para>
     214      If both Qt4 and Qt5 are installed, Qt5 has to be hidden from
     215      <envar>PKG_CONFIG_PATH</envar>, due to a bug. Temporarily do it, issuing:
     216    </para>
     217
     218<screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
     219PKG_CONFIG_PATH="\
     220`echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
     221
     222    <para>
    213223      Install <application>VLC</application> by running the following commands:
    214224    </para>
     
    237247
    238248    <para>
    239       To test the results, issue: <command>make check</command>. Tests must be
    240       run from an active X session.
     249      Again, if both Qt4 and 5 are installed, restore
     250      <envar>PKG_CONFIG_PATH</envar>:
     251    </para>
     252
     253<screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
     254unset SAVEPATH</userinput></screen>
     255
     256    <para>
     257      To test the results, issue: <command>make -k check</command>. Tests must be
     258      run from an active X session. One test fails for unknown reasons.
    241259    </para>
    242260
     
    382400        </seg>
    383401        <seg>
    384           /usr/include/vlc,
    385           /usr/lib/vlc,
    386           /usr/share/vlc and
     402          /usr/{include,lib,share}/vlc and
    387403          /usr/share/doc/vlc-&vlc-version;
    388404        </seg>
  • packages.ent

    r6ef90edf r248bac5  
    466466
    467467<!-- Chapter 23 -->
    468 <!ENTITY openldap-version             "2.4.43">
     468<!ENTITY openldap-version             "2.4.44">
    469469<!ENTITY soprano-version              "2.9.4">
    470470<!ENTITY unbound-version              "1.5.7">
     
    763763<!ENTITY xine-ui-version              "0.99.9">
    764764<!ENTITY transcode-version            "1.1.7">
    765 <!ENTITY vlc-version                  "2.2.1">
     765<!ENTITY vlc-version                  "2.2.2">
    766766
    767767<!-- Chapter 41 -->
     
    776776<!-- Part XII -->
    777777<!-- Chapter 42 -->
    778 <!ENTITY cups-version                 "2.1.0">
     778<!ENTITY cups-version                 "2.1.3">
    779779<!ENTITY cups-filters-version         "1.0.74">
    780780<!ENTITY gs-version                   "9.16">
  • pst/printing/cups.xml

    r6ef90edf r248bac5  
    77  <!ENTITY cups-download-http "http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2">
    88  <!ENTITY cups-download-ftp  " ">
    9   <!ENTITY cups-md5sum        "c4e57a66298bfsba66bb3d5bedd317a4">
    10   <!ENTITY cups-size          "8.4 MB">
    11   <!ENTITY cups-buildsize     "92 MB">
    12   <!ENTITY cups-time          "0.8 SBU">
     9  <!ENTITY cups-md5sum        "62b8fafd590e75f72316915790b0850a">
     10  <!ENTITY cups-size          "8.5 MB">
     11  <!ENTITY cups-buildsize     "72 MB (116 MB with tests)">
     12  <!ENTITY cups-time          "0.5 SBU (5.6 SBU for tests)">
    1313]>
    1414
     
    3737    </para>
    3838
    39     &lfs77_checked;
     39    &lfs78_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8383    <para role="recommended">
    8484      <xref linkend="colord"/>,
    85       <xref linkend="dbus"/> and
     85      <xref linkend="dbus"/>, and
    8686      <xref linkend="libusb"/>
    8787    </para>
     
    9292      <xref linkend="libpaper"/>,
    9393      <xref linkend="linux-pam"/>,
    94       <xref linkend="llvm"/> (with Clang),
    9594      <xref linkend="mitkrb"/>,
    9695      <xref linkend="openjdk"/>,
    9796      <xref linkend="php"/>,
    98       <xref linkend="python2"/> and
     97      <xref linkend="python2"/>, and
    9998      <xref linkend="xdg-utils"/>
    100     </para>
    101 
    102     <bridgehead renderas="sect4">Required (Runtime)</bridgehead>
    103     <para role="optional">
     99
     100    </para>
     101
     102    <bridgehead renderas="sect4">Required (Postinstall)</bridgehead>
     103    <para role="required runtime">
    104104      <xref linkend="cups-filters"/>
    105105    </para>
    106106
    107     <bridgehead renderas="sect4">Optional (Runtime)</bridgehead>
    108     <para role="optional">
    109       <ulink url="https://www.openprinting.org/download/foomatic/">Foomatic</ulink>,
     107    <bridgehead renderas="sect4">Optional (Postinstall)</bridgehead>
     108    <para role="optional runtime">
    110109      <xref linkend="gutenprint"/> and
    111       <ulink url="http://hplipopensource.com/hplip-web/index.html">HPLIP</ulink> (HP printers)
     110      <ulink url="http://hplipopensource.com/hplip-web/index.html">hplip</ulink> (HP printers)
    112111    </para>
    113112
     
    124123        There used to be a conflict between the <application>Cups</application>
    125124        <application>libusb</application> backend and the usblp kernel driver.
    126         This is no longer the case and Cups will work with both of these
     125        This is no longer the case and cups will work with both of these
    127126        enabled.
    128127      </para>
     
    216215    </para>
    217216
    218 <screen><userinput>sed -i "s:555:755:g;s:444:644:g" Makedefs.in                 &amp;&amp;
    219 sed -i "/MAN.*.EXT/s:.gz::g" config-scripts/cups-manpages.m4 &amp;&amp;
    220 sed -i "/LIBGCRYPTCONFIG/d" config-scripts/cups-ssl.m4       &amp;&amp;
    221 sed -i 's@else /\* HAVE_AVAHI \*/@elif defined (HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
    222 
     217<screen><userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in                                  &amp;&amp;
     218sed -i '/MAN.EXT/s:.gz::g' configure config-scripts/cups-manpages.m4          &amp;&amp;
     219sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4                        &amp;&amp;
     220<!--sed -i 's@else /\* HAVE_AVAHI \*/@elif defined(HAVE_AVAHI)@' test/ippserver.c &amp;&amp;
     221-->
    223222aclocal  -I config-scripts &amp;&amp;
    224223autoconf -I config-scripts &amp;&amp;
    225224
     225CC=gcc \
    226226./configure --libdir=/usr/lib            \
     227            --disable-systemd            \
    227228            --with-rcdir=/tmp/cupsinit   \
    228229            --with-system-groups=lpadmin \
     
    230231make</userinput></screen>
    231232
    232    <para>
    233      To test the results, issue: <command>make -k check</command> from
    234      an X terminal emulator.
    235    </para>
     233    <para>
     234      To test the results, issue: <command>make -k check</command>. An already
     235      active graphical session with bus address is necessary to run the tests.
     236      Some tests fail for unknown reasons.
     237    </para>
    236238
    237239    <para>
     
    243245<screen role="root"><userinput>make install &amp;&amp;
    244246rm -rf /tmp/cupsinit &amp;&amp;
    245 ln -sfnv ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
     247ln -svnf ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
    246248
    247249    <para>
     
    253255<screen role="root"><userinput>echo "ServerName /var/run/cups/cups.sock" > /etc/cups/client.conf</userinput></screen>
    254256
    255     <para>
    256       Remove filters that are now part of the <application>Cups
    257       Filters</application> package by running the following commands as the
    258       <systemitem class="username">root</systemitem> user:
    259     </para>
    260 
    261 <screen role="root"><userinput>rm -rf /usr/share/cups/banners &amp;&amp;
    262 rm -rf /usr/share/cups/data/testprint</userinput></screen>
    263 
    264     <note>
    265       <para>
    266         If you reinstall or update <application>Cups</application>, commands
    267         above will break <xref linkend="cups-filters"/>, so it needs to be
    268         reinstalled.
    269       </para>
    270     </note>
    271 
    272257    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    273258      href="../../xincludes/gtk-update-icon-cache.xml"/>
     
    279264
    280265    <para>
    281       <command>sed -i ... Makedefs.in</command>: This sed fixes
    282       permissions of the installed files and directories.
    283     </para>
    284 
    285     <para>
    286       <command>sed -i ... cups-manpages.m4</command>: This sed
    287       prevents compression of the man pages by default.
    288     </para>
    289 
    290     <para>
    291       <command>sed -i ... cups-ssl.m4</command>: This sed prevents
    292       <command>configure</command> from looking for
    293       <command>libgcrypt-config</command> because
    294       <application>libgcrypt</application> is not required by the
     266      <command>sed ... Makedefs.in</command>: Fix files and directories
     267      permissions.
     268    </para>
     269
     270    <para>
     271      <command>sed ... cups-manpages.m4</command>: This sed prevents
     272      compression of the man pages by default.
     273    </para>
     274
     275    <para>
     276      <command>sed ... cups-ssl.m4</command>: Prevent
     277      <command>configure</command> script from searching
     278      <command>libgcrypt-config</command>, because
     279      <application>libgcrypt</application> is not used anywere else in the
    295280      package.
    296281    </para>
    297282
    298283    <para>
    299       <command>sed -i ... test/ippserver.c</command>: This sed fixes a bug that
    300       shows up when <xref linkend="avahi"/> is not present.
    301     </para>
     284      <envar>CC=gcc</envar>: This environment variable ensures that gcc is used,
     285      if clang is installed. Remove it, if you prefer to use clang. Using clang
     286      almost doubles build time and slightly decreases build disk space.
     287      Installed disk space is not appreciably modified.
     288    </para>
     289<!--
     290    <para>
     291      <command>sed ... test/ippserver.c</command>: This sed fixes a bug,
     292      which shows up when <application>avahi</application> is not present.
     293    </para>-->
     294
     295    <para>
     296      <parameter>--disable-systemd</parameter>: Systemd is not supported by
     297      BLFS.
     298    </para>
     299
    302300    <para>
    303301      <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
     
    314312
    315313    <para>
     314      <option>--disable-libusb</option>: Use this switch if you have installed
     315      <xref linkend="libusb"/>, but wish to use the kernel usblp driver.
     316    </para>
     317
     318    <para>
    316319      <option>--enable-libpaper</option>: Use this switch if you have installed
    317320      <application>libpaper</application> and wish to use it with
     
    339342
    340343      <para>
    341         The <application>Cups</application> web interface can be accessed
    342         via <ulink url="http://localhost:631"/>. From there, printers
    343         and print jobs can be managed, and the server configuration
    344         can be changed. Configuration can also be done from the command
    345         line using the  <command>lpadmin</command>,
    346         <command>lpoptions</command> and <command>lpstat</command>
    347         commands.
     344        Normally, printers are set up via a web browser.  The
     345        <application>Cups</application> server will connect via
     346        the url http://localhost:631.  From there, printers, print
     347        jobs, and the server configuration can be set up and managed.
     348        Remote system administration can also be set up.  Configuration
     349        can also be done from the command line via the
     350        <command>lpadmin</command>, <command>lpoptions</command>,
     351        and <command>lpstat</command> commands.
    348352      </para>
    349353
     
    353357        are easier. For detailed instructions on configuration and use of
    354358        <application>Cups</application>, see <ulink
    355         url="http://www.cups.org/documentation.php"/>. 
     359        url="http://www.cups.org/documentation.php"/>.
    356360      </para>
    357361
     
    432436          cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
    433437          lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
    434           ppdpo and reject
     438          ppdpo, and reject
    435439        </seg>
    436440        <seg>
    437441          libcupscgi.so, libcupsimage.so, libcupsmime.so,
    438           libcupsppdc.so and libcups.so
     442          libcupsppdc.so, and libcups.so
    439443        </seg>
    440444        <seg>
    441445          /etc/cups,
    442           /usr/include/cups,
    443           /usr/lib/cups,
    444           /usr/share/cups,
    445           /usr/share/doc/cups-&cups-version;,
    446           /var/cache/cups,
    447           /var/log/cups,
    448           /var/run/cups and
    449           /var/spool/cups
     446          /usr/{include,lib,share}/cups,
     447          /usr/share/doc/cups-&cups-version;, and
     448          /var/{cache,log,run,spool}/cups
    450449        </seg>
    451450      </seglistitem>
  • server/other/openldap.xml

    r6ef90edf r248bac5  
    77  <!ENTITY openldap-download-http " ">
    88  <!ENTITY openldap-download-ftp  "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-&openldap-version;.tgz">
    9   <!ENTITY openldap-md5sum        "49ca65e27891fcf977d78c10f073c705">
     9  <!ENTITY openldap-md5sum        "693ac26de86231f8dcae2b4e9d768e51">
    1010  <!ENTITY openldap-size          "5.4 MB">
    11   <!ENTITY openldap-buildsize     "53 MB (client), 103 MB (server)">
    12   <!ENTITY openldap-time          "0.7 SBU (client), 1.3 SBU (server)">
     11  <!ENTITY openldap-buildsize     "53 MB (client), 102 MB (server)">
     12  <!ENTITY openldap-time          "0.7 SBU (client), 1.2 SBU (server)">
    1313]>
    1414
     
    126126            --disable-debug   \
    127127            --disable-slapd &amp;&amp;
     128
    128129make depend &amp;&amp;
    129130make</userinput></screen>
     
    208209
    209210install -v -dm700 -o ldap -g ldap /var/lib/openldap     &amp;&amp;
     211
    210212install -v -dm700 -o ldap -g ldap /etc/openldap/slapd.d &amp;&amp;
    211213chmod   -v    640     /etc/openldap/slapd.{conf,ldif}   &amp;&amp;
Note: See TracChangeset for help on using the changeset viewer.