[arch-commits] Commit in xerces-c/repos (8 files)
Lukas Fleischer
lfleischer at archlinux.org
Sat Jun 25 12:04:01 UTC 2016
Date: Saturday, June 25, 2016 @ 12:04:01
Author: lfleischer
Revision: 270638
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xerces-c/repos/extra-i686/PKGBUILD
(from rev 270637, xerces-c/trunk/PKGBUILD)
xerces-c/repos/extra-i686/xerces-c-cve-2016-2099.patch
(from rev 270637, xerces-c/trunk/xerces-c-cve-2016-2099.patch)
xerces-c/repos/extra-x86_64/PKGBUILD
(from rev 270637, xerces-c/trunk/PKGBUILD)
xerces-c/repos/extra-x86_64/xerces-c-cve-2016-2099.patch
(from rev 270637, xerces-c/trunk/xerces-c-cve-2016-2099.patch)
Deleted:
xerces-c/repos/community-i686/
xerces-c/repos/community-x86_64/
xerces-c/repos/extra-i686/PKGBUILD
xerces-c/repos/extra-x86_64/PKGBUILD
-------------------------------------------+
/PKGBUILD | 70 ++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 28 -----------
extra-i686/xerces-c-cve-2016-2099.patch | 19 +++++++
extra-x86_64/PKGBUILD | 28 -----------
extra-x86_64/xerces-c-cve-2016-2099.patch | 19 +++++++
5 files changed, 108 insertions(+), 56 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-06-25 11:51:25 UTC (rev 270637)
+++ extra-i686/PKGBUILD 2016-06-25 12:04:01 UTC (rev 270638)
@@ -1,28 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-
-pkgname=xerces-c
-pkgver=3.1.3
-pkgrel=1
-pkgdesc="A validating XML parser written in a portable subset of C++"
-arch=('i686' 'x86_64')
-url="http://xerces.apache.org/xerces-c/"
-license=('APACHE')
-depends=('gcc-libs' 'curl')
-source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz")
-md5sums=('70320ab0e3269e47d978a6ca0c0e1e2d')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2"
- ./configure --prefix=/usr --sysconfdir=/etc ${SSE2}
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}/" install
-}
Copied: xerces-c/repos/extra-i686/PKGBUILD (from rev 270637, xerces-c/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-06-25 12:04:01 UTC (rev 270638)
@@ -0,0 +1,35 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+
+pkgname=xerces-c
+pkgver=3.1.3
+pkgrel=2
+pkgdesc="A validating XML parser written in a portable subset of C++"
+arch=('i686' 'x86_64')
+url="http://xerces.apache.org/xerces-c/"
+license=('APACHE')
+depends=('gcc-libs' 'curl')
+source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz"
+ xerces-c-cve-2016-2099.patch)
+md5sums=('70320ab0e3269e47d978a6ca0c0e1e2d'
+ '382aa993dc070be469e2ff2b2a9bad09')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -p1 -i ../xerces-c-cve-2016-2099.patch
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2"
+ ./configure --prefix=/usr --sysconfdir=/etc ${SSE2}
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+}
Copied: xerces-c/repos/extra-i686/xerces-c-cve-2016-2099.patch (from rev 270637, xerces-c/trunk/xerces-c-cve-2016-2099.patch)
===================================================================
--- extra-i686/xerces-c-cve-2016-2099.patch (rev 0)
+++ extra-i686/xerces-c-cve-2016-2099.patch 2016-06-25 12:04:01 UTC (rev 270638)
@@ -0,0 +1,19 @@
+--- a/src/xercesc/validators/DTD/DTDScanner.cpp
++++ b/src/xercesc/validators/DTD/DTDScanner.cpp
+@@ -2509,7 +2509,15 @@ void DTDScanner::scanExtSubsetDecl(const
+ {
+ while (true)
+ {
+- const XMLCh nextCh = fReaderMgr->peekNextChar();
++ XMLCh nextCh;
++
++ try {
++ nextCh = fReaderMgr->peekNextChar();
++ }
++ catch (XMLException& ex) {
++ fScanner->emitError(XMLErrs::XMLException_Fatal, ex.getCode(), ex.getMessage(), NULL, NULL);
++ nextCh = chNull;
++ }
+
+ if (!nextCh)
+ {
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-06-25 11:51:25 UTC (rev 270637)
+++ extra-x86_64/PKGBUILD 2016-06-25 12:04:01 UTC (rev 270638)
@@ -1,28 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-
-pkgname=xerces-c
-pkgver=3.1.3
-pkgrel=1
-pkgdesc="A validating XML parser written in a portable subset of C++"
-arch=('i686' 'x86_64')
-url="http://xerces.apache.org/xerces-c/"
-license=('APACHE')
-depends=('gcc-libs' 'curl')
-source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz")
-md5sums=('70320ab0e3269e47d978a6ca0c0e1e2d')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2"
- ./configure --prefix=/usr --sysconfdir=/etc ${SSE2}
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}/" install
-}
Copied: xerces-c/repos/extra-x86_64/PKGBUILD (from rev 270637, xerces-c/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-06-25 12:04:01 UTC (rev 270638)
@@ -0,0 +1,35 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy at archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+
+pkgname=xerces-c
+pkgver=3.1.3
+pkgrel=2
+pkgdesc="A validating XML parser written in a portable subset of C++"
+arch=('i686' 'x86_64')
+url="http://xerces.apache.org/xerces-c/"
+license=('APACHE')
+depends=('gcc-libs' 'curl')
+source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz"
+ xerces-c-cve-2016-2099.patch)
+md5sums=('70320ab0e3269e47d978a6ca0c0e1e2d'
+ '382aa993dc070be469e2ff2b2a9bad09')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -p1 -i ../xerces-c-cve-2016-2099.patch
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ [[ "${CARCH}" = "i686" ]] && SSE2="--disable-sse2"
+ ./configure --prefix=/usr --sysconfdir=/etc ${SSE2}
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}/" install
+}
Copied: xerces-c/repos/extra-x86_64/xerces-c-cve-2016-2099.patch (from rev 270637, xerces-c/trunk/xerces-c-cve-2016-2099.patch)
===================================================================
--- extra-x86_64/xerces-c-cve-2016-2099.patch (rev 0)
+++ extra-x86_64/xerces-c-cve-2016-2099.patch 2016-06-25 12:04:01 UTC (rev 270638)
@@ -0,0 +1,19 @@
+--- a/src/xercesc/validators/DTD/DTDScanner.cpp
++++ b/src/xercesc/validators/DTD/DTDScanner.cpp
+@@ -2509,7 +2509,15 @@ void DTDScanner::scanExtSubsetDecl(const
+ {
+ while (true)
+ {
+- const XMLCh nextCh = fReaderMgr->peekNextChar();
++ XMLCh nextCh;
++
++ try {
++ nextCh = fReaderMgr->peekNextChar();
++ }
++ catch (XMLException& ex) {
++ fScanner->emitError(XMLErrs::XMLException_Fatal, ex.getCode(), ex.getMessage(), NULL, NULL);
++ nextCh = chNull;
++ }
+
+ if (!nextCh)
+ {
More information about the arch-commits
mailing list