Ignore:
Timestamp:
12/16/2020 05:21:20 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
qt5new
Children:
eca919c
Parents:
6929000d (diff), f0acf55 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge trunk at r23984

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • postlfs/security/p11-kit.xml

    r6929000d rc9f0cc0  
    77  <!ENTITY p11-kit-download-http "https://github.com/p11-glue/p11-kit/releases/download/&p11-kit-version;/p11-kit-&p11-kit-version;.tar.xz">
    88  <!ENTITY p11-kit-download-ftp  " ">
    9   <!ENTITY p11-kit-md5sum        "db8d5509f61c73ab2ea03cc4d7bc5eef">
    10   <!ENTITY p11-kit-size          "808 KB">
     9  <!ENTITY p11-kit-md5sum        "03f93a4eb62127b5d40e345c624a0665">
     10  <!ENTITY p11-kit-size          "812 KB">
    1111  <!ENTITY p11-kit-buildsize     "47 MB (add 169 MB for tests)">
    12   <!ENTITY p11-kit-time          "0.3 SBU (add 0.6 SBU for tests)">
     12  <!ENTITY p11-kit-time          "0.2 SBU (add 0.6 SBU for tests)">
    1313]>
    1414
     
    100100    </para>
    101101
    102 <screen><userinput>sed '20,$ d' -i trust/trust-extract-compat.in &amp;&amp;
    103 cat &gt;&gt; trust/trust-extract-compat.in &lt;&lt; "EOF"
     102<screen><userinput>sed '20,$ d' -i trust/trust-extract-compat &amp;&amp;
     103cat &gt;&gt; trust/trust-extract-compat &lt;&lt; "EOF"
    104104<literal># Copy existing anchor modifications to /etc/ssl/local
    105105/usr/libexec/make-ca/copy-trust-modifications
Note: See TracChangeset for help on using the changeset viewer.