Changeset a1b18af2


Ignore:
Timestamp:
08/12/2014 11:57:07 AM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485
Children:
87222ab
Parents:
55b442a7
Message:

Merged trunk.

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

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/boost.xml

    r55b442a7 ra1b18af2  
    77  <!ENTITY boost-download-http "&sourceforge-repo;/boost/boost_&boost-dl-version;.tar.bz2">
    88  <!ENTITY boost-download-ftp  " ">
    9   <!ENTITY boost-md5sum        "d6eef4b4cacb2183f2bf265a5a03a354">
    10   <!ENTITY boost-size          "56 MB">
    11   <!ENTITY boost-buildsize     "828 MB">
    12   <!ENTITY boost-time          "11.7 SBU">
     9  <!ENTITY boost-md5sum        "a744cf167b05d72335f27c88115f211d">
     10  <!ENTITY boost-size          "90 MB">
     11  <!ENTITY boost-buildsize     "955 MB">
     12  <!ENTITY boost-time          "7.1 SBU">
    1313]>
    1414
  • introduction/welcome/changelog.xml

    r55b442a7 ra1b18af2  
    4646
    4747    <listitem>
     48      <para>August 12th, 2014</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[igor] - Update to boost-1.56.0. Fixes
     52          <ulink url="&blfs-ticket-root;5344">#5344</ulink>.</para>
     53        </listitem>
     54      </itemizedlist>
     55    </listitem>
     56
     57    <listitem>
    4858      <para>August 11th, 2014</para>
    4959      <itemizedlist>
     60        <listitem>
     61          <para>[bdubbs] - Clean up CA Certificate install instructions. Fixes
     62          <ulink url="&blfs-ticket-root;5350">#5350</ulink>.</para>
     63        </listitem>
     64        <listitem>
     65          <para>[bdubbs] - Update to lvm2.2.02.109. Fixes
     66          <ulink url="&blfs-ticket-root;5333">#5333</ulink>.</para>
     67        </listitem>
    5068        <listitem>
    5169          <para>[igor] - Update to unrar-5.1.7. Fixes
  • packages.ent

    r55b442a7 ra1b18af2  
    3939<!ENTITY fuse-version                 "2.9.3">
    4040<!ENTITY jfsutils-version             "1.1.15">
    41 <!ENTITY lvm2-version                 "2.02.108">
     41<!ENTITY lvm2-version                 "2.02.109">
    4242<!ENTITY mdadm-version                "3.3.1">
    4343<!ENTITY ntfs-3g-version              "2014.2.15">
     
    7171
    7272<!ENTITY boost-major                  "1">
    73 <!ENTITY boost-minor                  "55">
     73<!ENTITY boost-minor                  "56">
    7474<!ENTITY boost-patch                  "0">
    7575<!ENTITY boost-version                "&boost-major;.&boost-minor;.&boost-patch;">
  • postlfs/filesystems/lvm2.xml

    r55b442a7 ra1b18af2  
    77  <!ENTITY lvm2-download-http " ">
    88  <!ENTITY lvm2-download-ftp  "ftp://sources.redhat.com/pub/lvm2/LVM2.&lvm2-version;.tgz">
    9   <!ENTITY lvm2-md5sum        "6834647fcf9b950a92f3acd12b4f427e">
     9  <!ENTITY lvm2-md5sum        "8fec006327b266fa611b165d8ec0b008">
    1010  <!ENTITY lvm2-size          "1.4 MB">
    11   <!ENTITY lvm2-buildsize     "26 MB (additional 8 MB to run the test suite)">
     11  <!ENTITY lvm2-buildsize     "24 MB (additional 8 MB to run the test suite)">
    1212  <!ENTITY lvm2-time          "0.4 SBU (additional 5.4 SBU to run the test suite)">
    1313]>
     
    127127            --enable-cmdlib     \
    128128            --enable-pkgconfig  \
    129             --enable-udev_sync &amp;&amp;
     129            --enable-udev_sync  &amp;&amp;
    130130make</userinput></screen>
    131131
  • postlfs/security/cacerts.xml

    r55b442a7 ra1b18af2  
    8282    class="username">root</systemitem> user:</para>
    8383
    84 <screen role="root"><userinput>cat > /bin/make-cert.pl &lt;&lt; "EOF"
     84<screen role="root"><userinput>cat > /usr/bin/make-cert.pl &lt;&lt; "EOF"
    8585<literal>#!/usr/bin/perl -w
    8686
     
    134134EOF
    135135
    136 chmod +x /bin/make-cert.pl</userinput></screen>
     136chmod +x /usr/bin/make-cert.pl</userinput></screen>
    137137
    138138   <para>The following script creates the certificates and a bundle of all the
     
    142142   user:</para>
    143143
    144 <screen role="root"><userinput>cat > /bin/make-ca.sh &lt;&lt; "EOF"
     144<screen role="root"><userinput>cat > /usr/bin/make-ca.sh &lt;&lt; "EOF"
    145145<literal>#!/bin/sh
    146146# Begin make-ca.sh
     
    174174TRUSTATTRIBUTES="CKA_TRUST_SERVER_AUTH"
    175175BUNDLE="BLFS-ca-bundle-${VERSION}.crt"
    176 CONVERTSCRIPT="/bin/make-cert.pl"
     176CONVERTSCRIPT="/usr/bin/make-cert.pl"
    177177SSLDIR="/etc/ssl"
    178178
     
    240240EOF
    241241
    242 chmod +x /bin/make-ca.sh</userinput></screen>
     242chmod +x /usr/bin/make-ca.sh</userinput></screen>
    243243
    244244   <para>Add a short script to remove expired certificates from a directory.
     
    246246   class="username">root</systemitem> user:</para>
    247247
    248 <screen role="root"><userinput>cat > /bin/remove-expired-certs.sh &lt;&lt; "EOF"
     248<screen role="root"><userinput>cat > /usr/bin/remove-expired-certs.sh &lt;&lt; "EOF"
    249249<literal>#!/bin/sh
    250 # Begin /bin/remove-expired-certs.sh
     250# Begin /usr/bin/remove-expired-certs.sh
    251251#
    252252# Version 20120211
     
    302302EOF
    303303
    304 chmod +x /bin/remove-expired-certs.sh</userinput></screen>
     304chmod +x /usr/bin/remove-expired-certs.sh</userinput></screen>
    305305
    306306   <para>The following commands will fetch the certificates and convert them to
     
    310310   necessary to update the CA Certificates.</para>
    311311
    312    <screen><userinput>certhost='http://mxr.mozilla.org'                        &amp;&amp;
    313 certdir='/mozilla/source/security/nss/lib/ckfw/builtins' &amp;&amp;
    314 url="$certhost$certdir/certdata.txt?raw=1"               &amp;&amp;
    315 
    316 wget --output-document certdata.txt $url &amp;&amp;
    317 unset certhost certdir url               &amp;&amp;
    318 make-ca.sh                               &amp;&amp;
     312   <screen><userinput>URL=&sources-anduin-other-http;/certdata.txt &amp;&amp;
     313rm -f certdata.txt &amp;&amp;
     314wget $URL          &amp;&amp;
     315make-ca.sh         &amp;&amp;
    319316remove-expired-certs.sh certs</userinput></screen>
    320317
    321318   <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
    322319
    323 <screen role="root"><userinput>SSLDIR=/etc/ssl                                             &amp;&amp;
    324 install -d ${SSLDIR}/certs                                  &amp;&amp;
    325 cp -v certs/*.pem ${SSLDIR}/certs                           &amp;&amp;
    326 c_rehash                                                    &amp;&amp;
    327 install BLFS-ca-bundle*.crt ${SSLDIR}/ca-bundle.crt         &amp;&amp;
    328 ln -sv ../ca-bundle.crt ${SSLDIR}/certs/ca-certificates.crt &amp;&amp;
     320<screen role="root"><userinput>SSLDIR=/etc/ssl                                              &amp;&amp;
     321install -d ${SSLDIR}/certs                                   &amp;&amp;
     322cp -v certs/*.pem ${SSLDIR}/certs                            &amp;&amp;
     323c_rehash                                                     &amp;&amp;
     324install BLFS-ca-bundle*.crt ${SSLDIR}/ca-bundle.crt          &amp;&amp;
     325ln -sfv ../ca-bundle.crt ${SSLDIR}/certs/ca-certificates.crt &amp;&amp;
    329326unset SSLDIR</userinput></screen>
    330327
  • postlfs/virtualization/qemu-systemd.xml

    r55b442a7 ra1b18af2  
    181181
    182182<screen role="root"><userinput>cat > /lib/udev/rules.d/65-kvm.rules &lt;&lt; "EOF"
    183 <literal>KERNEL=="kvm", NAME="%k", GROUP="kvm", MODE="0660"</literal>
     183<literal>KERNEL=="kvm", GROUP="kvm", MODE="0660"</literal>
    184184EOF</userinput></screen>
    185185
Note: See TracChangeset for help on using the changeset viewer.