[arch-commits] Commit in libxml2/trunk (PKGBUILD)

Jan de Groot jgc at archlinux.org
Thu Oct 11 21:45:26 UTC 2018


    Date: Thursday, October 11, 2018 @ 21:45:26
  Author: jgc
Revision: 336400

Replace patch from git.gnome.org with a cherry-pick command

Modified:
  libxml2/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-11 19:29:28 UTC (rev 336399)
+++ PKGBUILD	2018-10-11 21:45:26 UTC (rev 336400)
@@ -13,11 +13,9 @@
 makedepends=(python2 python git)
 _commit=18890f471c420411aa3c989e104d090966ec9dbf  # tags/v2.9.8^0
 source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
-        https://www.w3.org/XML/Test/xmlts20130923.tar.gz
-        CVE-2018-9251.patch::https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch)
+        https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
 sha256sums=('SKIP'
-            '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f'
-            'd534592b690798ea0eb8ff9b9e1b6ea82d9e3761f7717bbdf277c68ee73271cb')
+            '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f')
 
 pkgver() {
   cd $pkgname
@@ -28,7 +26,7 @@
   mkdir build-py{2,3}
 
   cd $pkgname
-  patch -Np1 -i ${srcdir}/CVE-2018-9251.patch
+  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
 
   NOCONFIGURE=1 ./autogen.sh
 }



More information about the arch-commits mailing list