Changeset c9087280

Timestamp:

07/28/2014 10:58:36 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

e050b6a

Parents:

99d528c

Message:

Merge trunk.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/security/cacerts.xml (modified) (4 diffs)
• x/lib/libdrm.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "27">                   <!-- Always 2 digits -->
+<!ENTITY day          "28">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 27th, &year;">
+<!ENTITY releasedate  "July 28th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "systemd">              <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+
+    <listitem>
+      <para>July 28th, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[igor] - Update to libdrm-2.4.55. Fixes
+          <ulink url="&blfs-ticket-root;5300">#5300</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

packages.ent

@@ -106 +106 @@
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY libdbusmenu-qt-version       "0.9.2">
-<!ENTITY libdrm-version               "2.4.54">
+<!ENTITY libdrm-version               "2.4.55">
 <!ENTITY libesmtp-version             "1.0.6">
 <!ENTITY libffi-version               "3.1">

postlfs/security/cacerts.xml

@@ -143 +143 @@
 
 <screen role="root"><userinput>cat > /bin/make-ca.sh &lt;&lt; "EOF"
-<literal>#!/bin/bash
+<literal>#!/bin/sh
 # Begin make-ca.sh
 # Script to populate OpenSSL's CApath from a bundle of PEM formatted CAs
@@ -247 +247 @@
 
 <screen role="root"><userinput>cat > /bin/remove-expired-certs.sh &lt;&lt; "EOF"
-<literal>#!/bin/bash
+<literal>#!/bin/sh
 # Begin /bin/remove-expired-certs.sh
 #
@@ -253 +253 @@
 
 # Make sure the date is parsed correctly on all systems
-function mydate()
+mydate()
 {
   local y=$( echo $1 | cut -d" " -f4 )
@@ -362 +362 @@
         <term><command>make-ca.sh</command></term>
         <listitem>
-          <para>is a <application>bash</application> script that reformats
+          <para>is a shell script that reformats
           the <filename>certdata.txt</filename> file for use by
           <application>openssl</application>.</para>

x/lib/libdrm.xml

@@ -7 +7 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "56e98a9c2073c3fab7f95e003b657f46">
-  <!ENTITY libdrm-size          "632 KB">
-  <!ENTITY libdrm-buildsize     "11 MB (additional 1 MB for the tests)">
+  <!ENTITY libdrm-md5sum        "cf2d77b0324479b428fcc98e92eea87e">
+  <!ENTITY libdrm-size          "576 KB">
+  <!ENTITY libdrm-buildsize     "10 MB (additional 1 MB for the tests)">
   <!ENTITY libdrm-time          "0.2 SBU (additional less than 0.1 SBU for the tests)">
 ]>