Changeset 75d2616


Ignore:
Timestamp:
01/21/2024 07:21:08 PM (4 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc
Children:
24d03240
Parents:
3baf03a
git-author:
Xi Ruoyao <xry111@…> (01/21/2024 05:19:31 PM)
git-committer:
Xi Ruoyao <xry111@…> (01/21/2024 07:21:08 PM)
Message:

pkgconf: Update the fix for modversion regression (#5414)

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    r3baf03a r75d2616  
    4545      <itemizedlist>
    4646        <listitem>
     47          <para>[xry111] - Apply upstream fix for pkgconf-2.1.0 regression.
     48          Fixes <ulink url='&lfs-ticket-root;5414'>#5414</ulink>.</para>
     49        </listitem>
     50        <listitem>
    4751          <para>[xry111] - Update to jinja2-3.1.3 (security fix).  Fixes
    4852          <ulink url='&lfs-ticket-root;5411'>#5411</ulink>.</para>

  • chapter01/whatsnew.xml

    r3baf03a r75d2616  
    300300
    301301    <listitem>
     302      <para>&pkgconf-upstream-fix-patch;</para>
     303    </listitem>
     304
     305    <listitem>
    302306      <para>&readline-fixes-patch;</para>
    303307    </listitem>

  • chapter03/patches.xml

    r3baf03a r75d2616  
    118118    </varlistentry>
    119119-->
    120 <!--
     120
    121121    <varlistentry>
    122       <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
     122      <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
    123123      <listitem>
    124         <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
    125         <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
     124        <para>Download: <ulink url="&patches-root;&pkgconf-upstream-fix-patch;"/></para>
     125        <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
    126126      </listitem>
    127127    </varlistentry>
    128 -->
    129128
    130129    <varlistentry>

  • chapter08/pkgconf.xml

    r3baf03a r75d2616  
    4646
    4747    <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
    48     <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
     48    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
    4949
    50     <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
     50    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
    5151
    5252    <para>Prepare Pkgconf for compilation:</para>

  • patches.ent

    r3baf03a r75d2616  
    2323<!ENTITY kbd-backspace-patch-size "12 KB">
    2424
     25<!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
     26<!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
     27<!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
     28
    2529<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-2.patch">
    2630<!ENTITY readline-fixes-patch-md5 "d2477ebe908cc99763d90dde7fd9549a">
Note: See TracChangeset for help on using the changeset viewer.