Changeset e005f99c

Timestamp:

04/30/2021 07:41:33 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f45ae67

Parents:

8d9de85 (diff), efa50b8 (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:

Upgrade nano-5.7

Files:

• introduction/welcome/changelog.xml (modified) (2 diffs)
• multimedia/libdriv/pulseaudio.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)
• server/major/apache.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -41 +41 @@
     </listitem>
     -->
-   
    <listitem>
      <para>April 30th, 2021</para>
@@ -49 +48 @@
          <ulink url="&blfs-ticket-root;14954">#14954</ulink>.</para>
        </listitem>
-     </itemizedlist>
-   </listitem>
+       <listitem>
+         <para>[timtas] - Update to httpd-2.4.47. Fixes
+         <ulink url="&blfs-ticket-root;14952">#14952</ulink>.</para>
+       </listitem>
+      </itemizedlist>
+    </listitem>
 
    <listitem>

multimedia/libdriv/pulseaudio.xml

@@ -97 +97 @@
       <xref linkend="avahi"/>,
       <xref linkend="bluez"/>,
+      <xref linkend="doxygen"/> (for documentation),
       <xref linkend="fftw"/>,
       <xref linkend="GConf"/>,
@@ -121 +122 @@
   <sect2 role="installation">
     <title>Installation of PulseAudio</title>
+
+    <para>
+      If <xref linkend="doxygen"/> is not installed, workaround a building
+      issue because of the changes in meson-0.57.2:
+    </para>
+
+<screen><userinput>sed '/doxygen/d' -i meson.build</userinput></screen>
 
     <para>

packages.ent

@@ -655 +655 @@
 <!-- Part V -->
 <!-- Chapter 20 -->
-<!ENTITY apache-version               "2.4.46">
+<!ENTITY apache-version               "2.4.47">
 <!ENTITY proftpd-version              "1.3.7a">
 <!ENTITY vsftpd-version               "3.0.3">

server/major/apache.xml

@@ -8 +8 @@
            "https://archive.apache.org/dist/httpd/httpd-&apache-version;.tar.bz2">
   <!ENTITY apache-download-ftp  " ">
-  <!ENTITY apache-md5sum        "7d661ea5e736dac5e2761d9f49fe8361">
+  <!ENTITY apache-md5sum        "a7b999d501b746201ff1379477701522">
   <!ENTITY apache-size          "6.9 MB">
   <!ENTITY apache-buildsize     "130 MB">
@@ -129 +129 @@
 useradd -c "Apache Server" -d /srv/www -g apache \
         -s /bin/false -u 25 apache</userinput></screen>
-
-    <para>
-      Adapt the Lua module to API changes in Lua-5.4:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/lua_resume(a, NULL, b)/lua_resume(a, NULL, b, NULL)/' modules/lua/mod_lua.h</userinput></screen>
 
     <para>