Index: general/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
+++ general/genlib/libarchive.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -7,6 +7,6 @@
   <!ENTITY libarchive-download-http "http://www.libarchive.org/downloads/libarchive-&libarchive-version;.tar.gz">
   <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "efad5a503f66329bb9d2f4308b5de98a">
-  <!ENTITY libarchive-size          "4.4 MB">
+  <!ENTITY libarchive-md5sum        "596210b5a9c2ff74a0f7ca34838d655f">
+  <!ENTITY libarchive-size          "5.2 MB">
   <!ENTITY libarchive-buildsize     "60 MB">
   <!ENTITY libarchive-time          "0.5 SBU">
@@ -67,15 +67,4 @@
         <para>
           Estimated build time: &libarchive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink
-            url="&patch-root;/libarchive-&libarchive-version;-upstream_fixes-1.patch"/>
         </para>
       </listitem>
@@ -105,7 +94,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../libarchive-&libarchive-version;-upstream_fixes-1.patch &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 
 make</userinput></screen>
@@ -151,5 +138,5 @@
       <seglistitem>
         <seg>
-          bsdcpio and bsdtar
+          bsdcat. bsdcpio and bsdtar
         </seg>
         <seg>
@@ -167,4 +154,16 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="bsdcat">
+        <term><command>bsdcat</command></term>
+        <listitem>
+          <para>
+            expands files to standard output.
+          </para>
+          <indexterm zone="libarchive bsdcat">
+            <primary sortas="b-bsdcat">bsdcat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="bsdcpio">
         <term><command>bsdcpio</command></term>
Index: general/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
+++ general/genlib/libgpg-error.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -7,6 +7,6 @@
   <!ENTITY libgpg-error-download-http " ">
   <!ENTITY libgpg-error-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
-  <!ENTITY libgpg-error-md5sum        "ab0b5aba6d0a185b41d07bda804fd8b2">
-  <!ENTITY libgpg-error-size          "748 KB">
+  <!ENTITY libgpg-error-md5sum        "83c686abe3fa223ec89f3b51da830770">
+  <!ENTITY libgpg-error-size          "759 KB">
   <!ENTITY libgpg-error-buildsize     "9 MB (with tests)">
   <!ENTITY libgpg-error-time          "less than 0.1 SBU (with tests)">
Index: general/genlib/libinput.xml
===================================================================
--- general/genlib/libinput.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
+++ general/genlib/libinput.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -5,8 +5,10 @@
   %general-entities;
 
+  <!ENTITY libinput-version "1.2.4">
+
   <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
   <!ENTITY libinput-download-ftp  " ">
-  <!ENTITY libinput-md5sum        "2b36d32362111c3e99f19c83bc535332">
-  <!ENTITY libinput-size          "844 KB">
+  <!ENTITY libinput-md5sum        "1cbaa34f04a336f2703906d564e0a37a">
+  <!ENTITY libinput-size          "840 KB">
   <!ENTITY libinput-buildsize     "31 MB (with documentation)">
   <!ENTITY libinput-time          "0.3 SBU (with documentation)">
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 37191af795d1a020663e3eebb4e7b7943d8460a7)
+++ general/genlib/ptlib.xml	(revision d7bee48efde6b53c4260d9677973e48d83832d6e)
@@ -78,5 +78,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-1.patch"/>
+          <ulink url="&patch-root;/ptlib-&ptlib-version;-bison_fixes-2.patch"/>
         </para>
       </listitem>
@@ -117,5 +117,5 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../ptlib-&ptlib-version;-bison_fixes-2.patch &amp;&amp;
 
 ./configure --prefix=/usr &amp;&amp;
