[arch-commits] Commit in lib32-libxml2/repos/multilib-x86_64 (PKGBUILD PKGBUILD)

[Jelle van der Waa]

    Date: Wednesday, September 26, 2018 @ 19:03:36
  Author: jelle
Revision: 385589

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-libxml2/repos/multilib-x86_64/PKGBUILD
    (from rev 385588, lib32-libxml2/trunk/PKGBUILD)
Deleted:
  lib32-libxml2/repos/multilib-x86_64/PKGBUILD

----------+
 PKGBUILD |   94 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-26 19:03:21 UTC (rev 385588)
+++ PKGBUILD	2018-09-26 19:03:36 UTC (rev 385589)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-_pkgbasename=libxml2
-pkgname=lib32-$_pkgbasename
-pkgver=2.9.8
-pkgrel=3
-pkgdesc="XML parsing library, version 2 (32-bit)"
-arch=(x86_64)
-license=('custom')
-depends=(lib32-zlib lib32-readline lib32-ncurses lib32-icu libxml2)
-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)
-md5sums=('SKIP')
-
-+pkgver() {
-  cd "${srcdir}/${_pkgbasename}"
-  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
-}
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}"
-  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
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh"
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}

Copied: lib32-libxml2/repos/multilib-x86_64/PKGBUILD (from rev 385588, lib32-libxml2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-09-26 19:03:36 UTC (rev 385589)
@@ -0,0 +1,49 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+_pkgbasename=libxml2
+pkgname=lib32-$_pkgbasename
+pkgver=2.9.8
+pkgrel=4
+pkgdesc="XML parsing library, version 2 (32-bit)"
+arch=(x86_64)
+license=('custom')
+depends=(lib32-zlib lib32-readline lib32-ncurses lib32-icu libxml2)
+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')
+
+pkgver() {
+  cd "${srcdir}/${_pkgbasename}"
+  git describe --tags | sed 's/-rc/rc/;s/^v//;s/-/+/g'
+}
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  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
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}"
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh"
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}