Changeset 02d46cb

Timestamp:

03/31/2016 11:44:28 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

9ea9aa7

Parents:

dce6561

Message:

Add upstream security fixes for PCRE. Merged from trunk r17122.

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

Files:

• general.ent (modified) (1 diff)
• general/genlib/pcre.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "03">                   <!-- Always 2 digits -->
+<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS systemd Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 31st, &year;">
+<!ENTITY releasedate  "April 1st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">                  <!-- svn|[release #] -->

general/genlib/pcre.xml

@@ -74 +74 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -81 +81 @@
         url="&patch-root;/pcre-&pcre-version;-upstream_fixes-1.patch"/></para>
       </listitem>
-    </itemizedlist>-->
+    </itemizedlist>
 
     <bridgehead renderas="sect3">PCRE Dependencies</bridgehead>
@@ -103 +103 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr                     \
+<screen><userinput>patch -Np1 -i ../pcre-&pcre-version;-upstream_fixes-1.patch &amp;&amp;
+./configure --prefix=/usr                     \
             --docdir=/usr/share/doc/pcre-&pcre-version; \
             --enable-unicode-properties       \

introduction/welcome/changelog.xml

@@ -45 +45 @@
 -->
     <listitem>
+      <para>April 1st, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add upstream security fixes for PCRE. Merged from
+          trunk r17122.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem> 
+   
+    <listitem>
       <para>March 31st, 2016</para>
       <itemizedlist>