diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 23:55:37 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-28 23:55:37 -0300 |
| commit | 2d0e587bd1c7ac060a95a0e20cfe00ab19db7e14 (patch) | |
| tree | 66a82d2834fe42b3411c09ad9fdcc4bd6af079ac /testing | |
| parent | 6aa1c22fe01ff4df6c5f75fd04d551b53f7df389 (diff) | |
| parent | 44ded298ebb49500d321ac79b7d0d8bb4d5058ec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gnupg/PKGBUILD
core/openldap/PKGBUILD
gnome-unstable/evince/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/farstream/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-menus/PKGBUILD
gnome-unstable/gnome-panel/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libwacom/PKGBUILD
gnome-unstable/libwnck3/PKGBUILD
gnome-unstable/network-manager-applet/PKGBUILD
gnome-unstable/networkmanager-openconnect/PKGBUILD
gnome-unstable/networkmanager-openvpn/PKGBUILD
gnome-unstable/networkmanager-pptp/PKGBUILD
gnome-unstable/networkmanager-vpnc/PKGBUILD
gnome-unstable/networkmanager/PKGBUILD
gnome-unstable/pidgin/PKGBUILD
testing/gnupg/PKGBUILD
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/expat/CVE-2009-3560.patch | 13 | ||||
| -rw-r--r-- | testing/expat/CVE-2009-3720.patch | 12 | ||||
| -rw-r--r-- | testing/expat/PKGBUILD | 32 | ||||
| -rw-r--r-- | testing/gnupg/install | 20 |
4 files changed, 77 insertions, 0 deletions
diff --git a/testing/expat/CVE-2009-3560.patch b/testing/expat/CVE-2009-3560.patch new file mode 100644 index 000000000..5fe9c36c8 --- /dev/null +++ b/testing/expat/CVE-2009-3560.patch @@ -0,0 +1,13 @@ +diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c +--- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200 ++++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100 +@@ -3703,6 +3703,9 @@ + return XML_ERROR_UNCLOSED_TOKEN; + case XML_TOK_PARTIAL_CHAR: + return XML_ERROR_PARTIAL_CHAR; ++ case -XML_TOK_PROLOG_S: ++ tok = -tok; ++ break; + case XML_TOK_NONE: + #ifdef XML_DTD + /* for internal PE NOT referenced between declarations */ diff --git a/testing/expat/CVE-2009-3720.patch b/testing/expat/CVE-2009-3720.patch new file mode 100644 index 000000000..65d16431f --- /dev/null +++ b/testing/expat/CVE-2009-3720.patch @@ -0,0 +1,12 @@ +diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c +--- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100 ++++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200 +@@ -1744,7 +1744,7 @@ + const char *end, + POSITION *pos) + { +- while (ptr != end) { ++ while (ptr < end) { + switch (BYTE_TYPE(enc, ptr)) { + #define LEAD_CASE(n) \ + case BT_LEAD ## n: \ diff --git a/testing/expat/PKGBUILD b/testing/expat/PKGBUILD new file mode 100644 index 000000000..b727138dc --- /dev/null +++ b/testing/expat/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 154410 2012-03-28 00:03:38Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Committer: Judd Vinet <jvinet@zeroflux.org> + +pkgname=expat +pkgver=2.1.0 +pkgrel=1 +pkgdesc="An XML parser library" +arch=('i686' 'x86_64') +url="http://expat.sourceforge.net/" +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz) +md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/gnupg/install b/testing/gnupg/install new file mode 100644 index 000000000..3a5dc9fd6 --- /dev/null +++ b/testing/gnupg/install @@ -0,0 +1,20 @@ +info_dir=/usr/share/info +info_files=(gnupg.info gnupg.info-1 gnupg.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} |