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

Evangelos Foutras foutrelis at archlinux.org
Mon Oct 22 23:20:42 UTC 2018


    Date: Monday, October 22, 2018 @ 23:20:41
  Author: foutrelis
Revision: 398597

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

Modified:
  lib32-libxml2/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-22 23:20:23 UTC (rev 398596)
+++ PKGBUILD	2018-10-22 23:20:41 UTC (rev 398597)
@@ -12,10 +12,8 @@
 makedepends=(gcc-multilib git)
 url="http://www.xmlsoft.org/"
 _commit=18890f471c420411aa3c989e104d090966ec9dbf # tags/v2.9.8^0
-source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit
-        CVE-2018-9251.patch::https://gitlab.gnome.org/GNOME/libxml2/commit/2240fbf5912054af025fb6e01e26375100275e74.patch)
-md5sums=('SKIP'
-         'dac448e6a689319afae0008f6e2cf592')
+source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit)
+md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgbasename}"
@@ -22,6 +20,12 @@
   git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgbasename}"
+  git cherry-pick -n 2240fbf5912054af025fb6e01e26375100275e74
+  NOCONFIGURE=1 ./autogen.sh
+}
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -29,10 +33,6 @@
 
   cd "${srcdir}/${_pkgbasename}"
 
-  patch -Np1 -i ${srcdir}/CVE-2018-9251.patch
-
-  autoreconf -fi
-
   ./configure --prefix=/usr --with-threads --with-history --with-icu --libdir=/usr/lib32 --without-lzma
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
 



More information about the arch-commits mailing list