mirror of
https://gitdl.cn/https://github.com/chakralinux/lib32.git
synced 2025-02-03 03:17:15 +08:00
expat, libxdamage, zlib --lib32 changes
This commit is contained in:
abveritas
parent
b33a6dc152
commit
627b7c177b
13
lib32-expat/CVE-2009-3560.patch
Normal file
13
lib32-expat/CVE-2009-3560.patch
Normal file
@ -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 */
|
||||
12
lib32-expat/CVE-2009-3720.patch
Normal file
12
lib32-expat/CVE-2009-3720.patch
Normal file
@ -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: \
|
||||
@ -3,21 +3,40 @@
|
||||
# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
|
||||
# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
|
||||
|
||||
_pkgsourcename=expat
|
||||
pkgname=lib32-$_pkgsourcename
|
||||
_pkgbasename=expat
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=2.0.1
|
||||
pkgrel=5
|
||||
pkgdesc="An XML Parser library written in C"
|
||||
pkgrel=6
|
||||
pkgdesc="An XML Parser library written in C (32 bit)"
|
||||
arch=('x86_64')
|
||||
url="http://expat.sourceforge.net/"
|
||||
license=('custom')
|
||||
arch=(x86_64)
|
||||
groups=('lib32')
|
||||
depends=('lib32-glibc')
|
||||
source=(http://www.chakra-project.org/repo/core/i686/${pkgname/lib32-/}-${pkgver}-${pkgrel}-i686.pkg.tar.xz)
|
||||
makedepends=('gcc-multilib')
|
||||
depends=('lib32-glibc' "${_pkgbasename}")
|
||||
options=('!libtool')
|
||||
source=(http://downloads.sourceforge.net/sourceforge/expat/${_pkgbasename}-${pkgver}.tar.gz
|
||||
CVE-2009-3560.patch
|
||||
CVE-2009-3720.patch)
|
||||
md5sums=('ee8b492592568805593f81f8cdf2a04c'
|
||||
'50603cac0f03aabc7087415251f592be'
|
||||
'f3eeb796f28945899216b815e5901996')
|
||||
|
||||
build() {
|
||||
cd $startdir/src
|
||||
mkdir -p $startdir/pkg/opt/lib32/usr/lib
|
||||
cp -dp usr/lib/*.so* $startdir/pkg/opt/lib32/usr/lib
|
||||
cd "${srcdir}/${_pkgbasename}-${pkgver}"
|
||||
patch -Np1 -i $srcdir/CVE-2009-3560.patch
|
||||
patch -Np1 -i $srcdir/CVE-2009-3720.patch
|
||||
export CC='gcc -m32'
|
||||
export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
|
||||
./configure --prefix=/usr --libdir=/usr/lib32 --mandir=/usr/share/man
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${_pkgbasename}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
install -d -m755 "${pkgdir}/usr/share/licenses/"
|
||||
ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}"
|
||||
|
||||
# Clean up lib32 package
|
||||
rm -rf "${pkgdir}"/usr/{bin,include,share/man}
|
||||
}
|
||||
md5sums=('29e56e1ac3c8534ef0d7d62239a9a322')
|
||||
|
||||
@ -3,21 +3,35 @@
|
||||
# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
|
||||
# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
|
||||
|
||||
_pkgsourcename=libxdamage
|
||||
pkgname=lib32-$_pkgsourcename
|
||||
_pkgbasename=libxdamage
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=1.1.2
|
||||
pkgrel=1
|
||||
pkgdesc="X11 damaged region extension library"
|
||||
pkgrel=2
|
||||
pkgdesc="X11 damaged region extension library (32-bit)"
|
||||
arch=(x86_64)
|
||||
url="http://xorg.freedesktop.org/"
|
||||
license=('GPL')
|
||||
arch=('x86_64')
|
||||
groups=('lib32')
|
||||
depends=('lib32-glibc' 'lib32-libxfixes')
|
||||
source=(http://chakra-project.org/repo/platform/i686/$_pkgsourcename-$pkgver-$pkgrel-i686.pkg.tar.xz)
|
||||
license=('custom')
|
||||
depends=('lib32-libxfixes>=4.0.4' $_pkgbasename)
|
||||
makedepends=('pkg-config' 'damageproto>=1.2.0' gcc-multilib)
|
||||
options=('!libtool')
|
||||
source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2)
|
||||
md5sums=('b42780bce703ec202a33e5693991c09d')
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
mkdir -p $pkgdir/opt/lib32/usr/lib
|
||||
cp -dp usr/lib/*.so* $pkgdir/opt/lib32/usr/lib
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
|
||||
|
||||
cd "${srcdir}/libXdamage-${pkgver}"
|
||||
./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/libXdamage-${pkgver}"
|
||||
|
||||
make DESTDIR="${pkgdir}" install || return 1
|
||||
rm -rf "${pkgdir}"/usr/{include,share,bin}
|
||||
mkdir -p "$pkgdir/usr/share/licenses"
|
||||
ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
|
||||
}
|
||||
md5sums=('9be40ff0badec91e6fa8e98ca4a886a6')
|
||||
|
||||
@ -3,25 +3,34 @@
|
||||
# maintainer (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
|
||||
# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
|
||||
|
||||
_pkgsourcename=zlib
|
||||
pkgname=lib32-$_pkgsourcename
|
||||
_pkgbasename=zlib
|
||||
pkgname=lib32-$_pkgbasename
|
||||
pkgver=1.2.5
|
||||
pkgrel=1
|
||||
pkgdesc="A compression/decompression Library"
|
||||
url="http://www.gzip.org/zlib"
|
||||
license=('custom:zlib')
|
||||
arch=(x86_64)
|
||||
groups=('lib32')
|
||||
depends=('lib32-glibc')
|
||||
source=(http://www.chakra-project.org/repo/core/i686/${pkgname/lib32-/}-${pkgver}-${pkgrel}-i686.pkg.tar.xz)
|
||||
pkgrel=2
|
||||
pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
url="http://www.zlib.net/"
|
||||
depends=('lib32-glibc' $_pkgbasename)
|
||||
makedepends=(gcc-multilib)
|
||||
options=('!makeflags')
|
||||
source=("http://zlib.net/zlib-${pkgver}.tar.gz"
|
||||
'zlib-1.2.5-lfs-decls.patch')
|
||||
md5sums=('c735eab2d659a96e5a594c9e8541ad63'
|
||||
'4cb279ea3beab621f3526bf7b7ab99e5')
|
||||
|
||||
build() {
|
||||
cd $startdir/src
|
||||
mkdir -p $startdir/pkg/opt/lib32/usr/lib
|
||||
# mkdir -p $startdir/pkg/opt/lib32/lib
|
||||
cp -dp usr/lib/*.so* $startdir/pkg/opt/lib32/usr/lib
|
||||
# 1.2.3.3 does not have stuff in /lib, keep in comments
|
||||
# cp -dp lib/*.so* $startdir/pkg/opt/lib32/lib
|
||||
}
|
||||
md5sums=('af7e0284905458836b6140c483ea06ae')
|
||||
export CC="gcc -m32"
|
||||
export CXX="g++ -m32"
|
||||
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
|
||||
|
||||
cd ${srcdir}/zlib-$pkgver
|
||||
# see http://bugs.archlinux.org/task/19280
|
||||
patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch
|
||||
# work around gcc bug; see https://bugs.archlinux.org/task/20647
|
||||
export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK"
|
||||
./configure --prefix=/usr \
|
||||
--libdir=/usr/lib32
|
||||
make
|
||||
make check
|
||||
}
|
||||
|
||||
13
lib32-zlib/zlib-1.2.5-lfs-decls.patch
Normal file
13
lib32-zlib/zlib-1.2.5-lfs-decls.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: zlib-1.2.5/zlib.h
|
||||
===================================================================
|
||||
--- zlib-1.2.5.orig/zlib.h
|
||||
+++ zlib-1.2.5/zlib.h
|
||||
@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF(
|
||||
# define gzoffset gzoffset64
|
||||
# define adler32_combine adler32_combine64
|
||||
# define crc32_combine crc32_combine64
|
||||
-# ifdef _LARGEFILE64_SOURCE
|
||||
+# ifndef _LARGEFILE64_SOURCE
|
||||
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
|
||||
ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
|
||||
ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
|
||||
Loading…
Reference in New Issue
Block a user