From 71ac83dbf7f36d10f39f3a3fe907b674d1abcb62 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Tue, 7 Aug 2012 14:13:01 -0500 Subject: xorg update part2 libs --- abs/core/libxcomposite/PKGBUILD | 14 +++++--- abs/core/libxcursor/PKGBUILD | 13 +++---- abs/core/libxdamage/PKGBUILD | 19 +++++----- abs/core/libxdmcp/PKGBUILD | 16 ++++----- abs/core/libxext/PKGBUILD | 16 ++++----- abs/core/libxfixes/PKGBUILD | 23 ++++++------ abs/core/libxfixes/xfixes_coverity576.patch | 16 --------- abs/core/libxfont/PKGBUILD | 10 ++++-- abs/core/libxft/PKGBUILD | 12 ++++--- abs/core/libxi/PKGBUILD | 6 ++-- abs/core/libxinerama/PKGBUILD | 17 ++++----- abs/core/libxkbfile/PKGBUILD | 16 ++++----- abs/core/libxmu/PKGBUILD | 11 +++--- abs/core/libxpm/PKGBUILD | 17 ++++----- abs/core/libxrandr/PKGBUILD | 15 +++++--- abs/core/libxrender/PKGBUILD | 19 +++++----- abs/core/libxres/PKGBUILD | 13 +++---- abs/core/libxslt/CVE-2011-1202.patch | 56 +++++++++++++++++++++++++++++ abs/core/libxslt/PKGBUILD | 31 ++++++++++------ abs/core/libxss/PKGBUILD | 16 +++++---- abs/core/libxss/libxss-1.2.2-1.src.tar.gz | 1 + abs/core/libxt/PKGBUILD | 14 +++++--- abs/core/libxtst/PKGBUILD | 12 +++---- abs/core/libxv/PKGBUILD | 11 +++--- abs/core/libxxf86dga/PKGBUILD | 14 ++++---- abs/core/libxxf86vm/PKGBUILD | 14 +++++--- 26 files changed, 256 insertions(+), 166 deletions(-) delete mode 100644 abs/core/libxfixes/xfixes_coverity576.patch create mode 100644 abs/core/libxslt/CVE-2011-1202.patch create mode 120000 abs/core/libxss/libxss-1.2.2-1.src.tar.gz diff --git a/abs/core/libxcomposite/PKGBUILD b/abs/core/libxcomposite/PKGBUILD index 854af09..23cec88 100644 --- a/abs/core/libxcomposite/PKGBUILD +++ b/abs/core/libxcomposite/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 97802 2010-11-01 22:21:28Z jgc $ +# $Id: PKGBUILD 151410 2012-02-26 10:37:09Z pierre $ # Maintainer: Jan de Groot pkgname=libxcomposite pkgver=0.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 Composite extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxfixes' 'compositeproto') makedepends=('xorg-util-macros') -options=(!libtool) -source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2) +options=('!libtool') +source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2") sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec') build() { cd "${srcdir}/libXcomposite-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXcomposite-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/libxcursor/PKGBUILD b/abs/core/libxcursor/PKGBUILD index 9e37fa7..16d6470 100644 --- a/abs/core/libxcursor/PKGBUILD +++ b/abs/core/libxcursor/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 97807 2010-11-01 22:23:46Z jgc $ +# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck + pkgname=libxcursor -pkgver=1.1.11 +pkgver=1.1.13 pkgrel=1 pkgdesc="X cursor management library" arch=(i686 x86_64) @@ -12,18 +13,18 @@ depends=('libxfixes' 'libxrender') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('35491bd17cbcdda712e1a064c67ccbc523e2702c') +sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47') build() { cd "${srcdir}/libXcursor-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXcursor-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxdamage/PKGBUILD b/abs/core/libxdamage/PKGBUILD index 231b4ce..c33c0b6 100644 --- a/abs/core/libxdamage/PKGBUILD +++ b/abs/core/libxdamage/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82169 2010-06-09 06:52:23Z jgc $ +# $Id: PKGBUILD 150392 2012-02-17 11:26:19Z allan $ # Maintainer: Jan de Groot pkgname=libxdamage pkgver=1.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 damaged region extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxfixes>=4.0.4' 'damageproto>=1.2.0') @@ -16,9 +16,12 @@ sha1sums=('7d96e8de107fede16951cb47d5e147630fbc7dee') build() { cd "${srcdir}/libXdamage-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/libXdamage-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libxdmcp/PKGBUILD b/abs/core/libxdmcp/PKGBUILD index 1c6c2fd..541f81e 100644 --- a/abs/core/libxdmcp/PKGBUILD +++ b/abs/core/libxdmcp/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 97611 2010-10-31 16:26:42Z jgc $ +# $Id: PKGBUILD 152771 2012-03-09 16:07:19Z andyrtr $ #Maintainer: Jan de Groot pkgname=libxdmcp -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 Display Manager Control Protocol library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('xproto' 'glibc') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2) -sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f') +source=("${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2") +sha1sums=('3b63e8fc1600c51d9897d017da190fc6c16245b6') build() { cd "${srcdir}/libXdmcp-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXdmcp-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxext/PKGBUILD b/abs/core/libxext/PKGBUILD index 2bebe1c..cfc998d 100644 --- a/abs/core/libxext/PKGBUILD +++ b/abs/core/libxext/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 97797 2010-11-01 22:17:28Z jgc $ +# $Id: PKGBUILD 152773 2012-03-09 16:10:15Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxext -pkgver=1.2.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="X11 miscellaneous extensions library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2) -sha1sums=('090d7109c5fffde8a0063e10f22f3e2ec48cf19e') +source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2") +sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa') build() { cd "${srcdir}/libXext-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXext-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxfixes/PKGBUILD b/abs/core/libxfixes/PKGBUILD index 5565ebb..535bfba 100644 --- a/abs/core/libxfixes/PKGBUILD +++ b/abs/core/libxfixes/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 82357 2010-06-10 12:31:08Z jgc $ +# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $ #Maintainer: Jan de Groot pkgname=libxfixes -pkgver=4.0.5 -pkgrel=3 +pkgver=5.0 +pkgrel=2 pkgdesc="X11 miscellaneous 'fixes' extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11>=1.3.4' 'fixesproto>=4.1.1') -makedepends=('pkg-config') +depends=('libx11' 'fixesproto>=5.0') +makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2) -sha1sums=('255dfb9a8c50d795c60711ec4764f76cd0620cbf') +source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2") +sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') build() { cd "${srcdir}/libXfixes-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make } + package() { cd "${srcdir}/libXfixes-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxfixes/xfixes_coverity576.patch b/abs/core/libxfixes/xfixes_coverity576.patch deleted file mode 100644 index f759ecc..0000000 --- a/abs/core/libxfixes/xfixes_coverity576.patch +++ /dev/null @@ -1,16 +0,0 @@ -=================================================================== -RCS file: /srv/anoncvs.freedesktop.org/cvs/xorg/lib/Xfixes/src/Xfixes.c,v -rcsdiff: /srv/anoncvs.freedesktop.org/cvs/xorg/lib/Xfixes/src/Xfixes.c,v: warning: Unknown phrases like `commitid ...;' are present. -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- src/Xfixes.c 2005/05/17 17:02:24 1.3 -+++ src/Xfixes.c 2006/04/03 00:58:13 1.4 -@@ -86,6 +86,7 @@ - { - UnlockDisplay (dpy); - SyncHandle (); -+ Xfree(info); - return 0; - } - info->major_version = rep.majorVersion; diff --git a/abs/core/libxfont/PKGBUILD b/abs/core/libxfont/PKGBUILD index d42d1ed..41ab3ec 100644 --- a/abs/core/libxfont/PKGBUILD +++ b/abs/core/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $ +# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxfont -pkgver=1.4.3 +pkgver=1.4.5 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64) @@ -12,12 +12,16 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7') +sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e') build() { cd "${srcdir}/libXfont-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXfont-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxft/PKGBUILD b/abs/core/libxft/PKGBUILD index 4759400..b38f5ee 100644 --- a/abs/core/libxft/PKGBUILD +++ b/abs/core/libxft/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 160629 2012-06-02 21:27:53Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxft -pkgver=2.2.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="FreeType-based font drawing library for X" arch=('i686' 'x86_64') @@ -11,13 +11,17 @@ url="http://xorg.freedesktop.org/" depends=('fontconfig' 'libxrender') makedepends=('pkgconfig') options=('!libtool') -source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') +source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2") +sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd') build() { cd "${srcdir}/libXft-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXft-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxi/PKGBUILD b/abs/core/libxi/PKGBUILD index 42fabdc..045880e 100644 --- a/abs/core/libxi/PKGBUILD +++ b/abs/core/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 158868 2012-05-12 16:25:29Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxi -pkgver=1.4.3 +pkgver=1.6.1 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') +sha1sums=('4b53b41fdaa3acc86606c696c68d5eed11454612') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/abs/core/libxinerama/PKGBUILD b/abs/core/libxinerama/PKGBUILD index de37eac..043cf6f 100644 --- a/abs/core/libxinerama/PKGBUILD +++ b/abs/core/libxinerama/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 97812 2010-11-01 22:26:22Z jgc $ +# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck + pkgname=libxinerama -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 Xinerama extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') -options=(!libtool) -source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2) -sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4') +options=('!libtool') +source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") +sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') build() { cd "${srcdir}/libXinerama-${pkgver}" ./configure --prefix=/usr make - make DESTDIR="${pkgdir}" install } + package() { cd "${srcdir}/libXinerama-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxkbfile/PKGBUILD b/abs/core/libxkbfile/PKGBUILD index 369cb10..a4fb52c 100644 --- a/abs/core/libxkbfile/PKGBUILD +++ b/abs/core/libxkbfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97571 2010-10-31 16:00:12Z jgc $ +# $Id: PKGBUILD 152781 2012-03-09 16:19:36Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxkbfile -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 keyboard file manipulation library" arch=('i686' 'x86_64') license=('custom') @@ -11,19 +11,19 @@ url="http://xorg.freedesktop.org/" depends=('libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('0fed539ffbc05859bc666b425fafa42e046bef5f') +source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('05139829837c26e3a14a40a700f058c018bc71f5') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxmu/PKGBUILD b/abs/core/libxmu/PKGBUILD index b6c556c..6ff36c5 100644 --- a/abs/core/libxmu/PKGBUILD +++ b/abs/core/libxmu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97601 2010-10-31 16:17:53Z jgc $ +# $Id: PKGBUILD 152301 2012-03-06 15:00:25Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxmu -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="X11 miscellaneous micro-utility library" arch=('i686' 'x86_64') @@ -11,14 +11,15 @@ depends=('libxext' 'libxt') makedepends=('xorg-util-macros') license=('custom') options=('!libtool') -source=(${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2) -sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd') +source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2") +sha1sums=('3e280aa927d78c05f94db6c7ae606f7ad132b495') build() { cd "${srcdir}/libXmu-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXmu-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libxpm/PKGBUILD b/abs/core/libxpm/PKGBUILD index a9b489a..9fe0bc1 100644 --- a/abs/core/libxpm/PKGBUILD +++ b/abs/core/libxpm/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 97596 2010-10-31 16:14:25Z jgc $ +# $Id: PKGBUILD 152783 2012-03-09 16:22:06Z andyrtr $ # Maintainer: Jan de Groot + pkgname=libxpm -pkgver=3.5.9 +pkgver=3.5.10 pkgrel=1 pkgdesc="X11 pixmap library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxt' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2) -sha1sums=('38258a1d589d3f157e0338d0fd13eec11bc4a39b') +source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2") +sha1sums=('eca9dbfa6253f7d6cc7d593dc83110c6c4876d7c') build() { cd "${srcdir}/libXpm-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXpm-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } - diff --git a/abs/core/libxrandr/PKGBUILD b/abs/core/libxrandr/PKGBUILD index 8839b6b..94a99d0 100644 --- a/abs/core/libxrandr/PKGBUILD +++ b/abs/core/libxrandr/PKGBUILD @@ -1,9 +1,11 @@ -# $Id$ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot +# $Id: PKGBUILD 143893 2011-11-30 19:05:26Z andrea $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke +# Contributor: Alexander Baldeck + pkgname=libxrandr pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') license=('custom') @@ -18,7 +20,12 @@ build() { cd "${srcdir}/libXrandr-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/libXrandr-${pkgver}" make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/abs/core/libxrender/PKGBUILD b/abs/core/libxrender/PKGBUILD index 3c53091..66025d5 100644 --- a/abs/core/libxrender/PKGBUILD +++ b/abs/core/libxrender/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 82164 2010-06-09 06:48:35Z jgc $ +# $Id: PKGBUILD 152786 2012-03-09 16:24:03Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxrender -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="X Rendering Extension client library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libx11>=1.3.4' 'renderproto') makedepends=('pkgconfig') options=('!libtool') source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('65bd96dc17da6b064f95109da02d9c9d14cb06dc') +sha1sums=('6e4d75d8316d5217324258f555eba3a5d383feb2') build() { cd "${srcdir}/libXrender-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 + ./configure --prefix=/usr --disable-static + make } + package() { cd "${srcdir}/libXrender-${pkgver}" - make DESTDIR=${pkgdir} install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + make DESTDIR=${pkgdir} install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/abs/core/libxres/PKGBUILD b/abs/core/libxres/PKGBUILD index 016f446..b2b1847 100644 --- a/abs/core/libxres/PKGBUILD +++ b/abs/core/libxres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97782 2010-11-01 22:08:57Z jgc $ +# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxres -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="X11 Resource extension library" arch=('i686' 'x86_64') @@ -10,15 +10,16 @@ url="http://xorg.freedesktop.org" license=('custom') depends=('libxext') makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros') -options=(!libtool) -source=(${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2) -sha1sums=('d3a36f9b6ae430da91f2cbae409916f605074195') +options=('!libtool') +source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2") +sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f') build() { cd "${srcdir}/libXres-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXres-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libxslt/CVE-2011-1202.patch b/abs/core/libxslt/CVE-2011-1202.patch new file mode 100644 index 0000000..61ea213 --- /dev/null +++ b/abs/core/libxslt/CVE-2011-1202.patch @@ -0,0 +1,56 @@ +From ecb6bcb8d1b7e44842edde3929f412d46b40c89f Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 22 Feb 2011 02:14:23 +0000 +Subject: Fix generate-id() to not expose object addresses + +As pointed out by Chris Evans it's better +security wise to not expose object addresses directly, use a diff +w.r.t. the document root own address to avoid this +* libxslt/functions.c: fix IDs generation code +--- +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 4720c7a..de962f4 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -654,8 +654,9 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) + void + xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + xmlNodePtr cur = NULL; +- unsigned long val; +- xmlChar str[20]; ++ long val; ++ xmlChar str[30]; ++ xmlDocPtr doc; + + if (nargs == 0) { + cur = ctxt->context->node; +@@ -694,9 +695,24 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ + * Okay this is ugly but should work, use the NodePtr address + * to forge the ID + */ +- val = (unsigned long)((char *)cur - (char *)0); +- val /= sizeof(xmlNode); +- sprintf((char *)str, "id%ld", val); ++ if (cur->type != XML_NAMESPACE_DECL) ++ doc = cur->doc; ++ else { ++ xmlNsPtr ns = (xmlNsPtr) cur; ++ ++ if (ns->context != NULL) ++ doc = ns->context; ++ else ++ doc = ctxt->context->doc; ++ ++ } ++ ++ val = (long)((char *)cur - (char *)doc); ++ if (val >= 0) { ++ sprintf((char *)str, "idp%ld", val); ++ } else { ++ sprintf((char *)str, "idm%ld", -val); ++ } + valuePush(ctxt, xmlXPathNewString(str)); + } + +-- +cgit v0.9.0.2 diff --git a/abs/core/libxslt/PKGBUILD b/abs/core/libxslt/PKGBUILD index 33c4cdd..7cdc5e9 100644 --- a/abs/core/libxslt/PKGBUILD +++ b/abs/core/libxslt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87866 2010-08-18 15:17:10Z ibiru $ +# $Id: PKGBUILD 149384 2012-02-07 12:34:45Z jgc $ # Maintainer: Eric Belanger # Contributor: John Proctor @@ -9,23 +9,34 @@ pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') url="http://xmlsoft.org/XSLT/" license=('custom') -depends=('libxml2>=2.7.7' 'libgcrypt>=1.4.6') +depends=('libxml2' 'libgcrypt') makedepends=('python2') +checkdepends=('docbook-xml') options=('!libtool') -source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz) -md5sums=('e61d0364a30146aaa3001296f853b2b9') +source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz + CVE-2011-1202.patch) +md5sums=('e61d0364a30146aaa3001296f853b2b9' + 'ce9744943575efaa6b5501668899b753') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-python=/usr/bin/python2.7 + patch -Np1 -i "${srcdir}/CVE-2011-1202.patch" + sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py + ./configure --prefix=/usr --with-python=/usr/bin/python2 make - make DESTDIR="${pkgdir}" install +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} - for f in pyxsltproc.py extfunc.py exslt.py extelem.py basic.py; do - sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -i ${pkgdir}/usr/share/doc/libxslt-python-1.1.26/examples/${f} - done +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + + rm -f "${pkgdir}"/usr/lib/python*/site-packages/*.a } diff --git a/abs/core/libxss/PKGBUILD b/abs/core/libxss/PKGBUILD index 5bf80a4..5fafc2d 100644 --- a/abs/core/libxss/PKGBUILD +++ b/abs/core/libxss/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 97566 2010-10-31 15:57:08Z jgc $ +# $Id: PKGBUILD 152791 2012-03-09 16:28:04Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck + pkgname=libxss -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="X11 Screen Saver extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxext' 'scrnsaverproto') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2) -sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19') +source=("${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2") +sha1sums=('7b8298eec371c33a71232e3653370a98f03c6c88') build() { cd "${srcdir}/libXScrnSaver-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } + package() { cd "${srcdir}/libXScrnSaver-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/abs/core/libxss/libxss-1.2.2-1.src.tar.gz b/abs/core/libxss/libxss-1.2.2-1.src.tar.gz new file mode 120000 index 0000000..040aa82 --- /dev/null +++ b/abs/core/libxss/libxss-1.2.2-1.src.tar.gz @@ -0,0 +1 @@ +/data/pkg_repo/src_packages/libxss-1.2.2-1.src.tar.gz \ No newline at end of file diff --git a/abs/core/libxt/PKGBUILD b/abs/core/libxt/PKGBUILD index a8126f0..8fd5b91 100644 --- a/abs/core/libxt/PKGBUILD +++ b/abs/core/libxt/PKGBUILD @@ -1,23 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ #Maintainer: Jan de Groot pkgname=libxt -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 toolkit intrinsics library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2) -sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') +source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") +sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') build() { cd "${srcdir}/libXt-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --disable-static make +} + +package() { + cd "${srcdir}/libXt-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/abs/core/libxtst/PKGBUILD b/abs/core/libxtst/PKGBUILD index be55b65..810b6d1 100644 --- a/abs/core/libxtst/PKGBUILD +++ b/abs/core/libxtst/PKGBUILD @@ -1,18 +1,18 @@ -# $Id$ +# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxtst -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('libxext' 'libxi' 'recordproto' 'inputproto') makedepends=('xorg-util-macros') options=('!libtool') -source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2) -sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72') +source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2") +sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2') build() { cd "${srcdir}/libXtst-${pkgver}" diff --git a/abs/core/libxv/PKGBUILD b/abs/core/libxv/PKGBUILD index 4ac69a9..4484ad5 100644 --- a/abs/core/libxv/PKGBUILD +++ b/abs/core/libxv/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97586 2010-10-31 16:08:34Z jgc $ +# $Id: PKGBUILD 152795 2012-03-09 16:32:25Z andyrtr $ # Maintainer: Jan de Groot pkgname=libxv -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64') @@ -11,14 +11,15 @@ url="http://xorg.freedesktop.org/" depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') -source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2) -sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c') +source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") +sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd') build() { cd "${srcdir}/libXv-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXv-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/abs/core/libxxf86dga/PKGBUILD b/abs/core/libxxf86dga/PKGBUILD index 182a2a8..c5be1ac 100644 --- a/abs/core/libxxf86dga/PKGBUILD +++ b/abs/core/libxxf86dga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97581 2010-10-31 16:05:58Z jgc $ +# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxxf86dga -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="X11 Direct Graphics Access extension library" arch=('i686' 'x86_64') @@ -13,17 +13,17 @@ depends=('libxext' 'xf86dgaproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('333a9f5c61eba896f420969561606551174645cd') +sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56') build() { cd "${srcdir}/libXxf86dga-${pkgver}" ./configure --prefix=/usr --disable-static - make || return 1 + make } + package() { cd "${srcdir}/libXxf86dga-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/abs/core/libxxf86vm/PKGBUILD b/abs/core/libxxf86vm/PKGBUILD index d652897..0be6a06 100644 --- a/abs/core/libxxf86vm/PKGBUILD +++ b/abs/core/libxxf86vm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $ #Maintainer: Jan de Groot pkgname=libxxf86vm -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686') @@ -12,14 +12,18 @@ depends=('libxext' 'xf86vidmodeproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') +sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f') build() { cd "${srcdir}/libXxf86vm-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() +{ + cd "${srcdir}/libXxf86vm-${pkgver}" make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } -- cgit v0.12