summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/empathy/PKGBUILD6
-rw-r--r--extra/freetype2/PKGBUILD6
-rw-r--r--extra/git/PKGBUILD12
-rw-r--r--extra/grilo-plugins/PKGBUILD9
-rw-r--r--extra/icedtea-web-java7/PKGBUILD97
-rw-r--r--extra/icedtea-web-java7/icedtea-web-java7.install11
-rw-r--r--extra/libgweather/PKGBUILD6
-rw-r--r--extra/smb4k/PKGBUILD8
-rw-r--r--extra/smb4k/smb4k.install6
-rw-r--r--extra/soprano/PKGBUILD6
-rw-r--r--extra/xorg-server/PKGBUILD12
-rw-r--r--extra/xorg-server/git-fixes.patch332
-rw-r--r--extra/xorg-sessreg/PKGBUILD8
-rw-r--r--extra/xorg-xdpyinfo/PKGBUILD8
14 files changed, 200 insertions, 327 deletions
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index a81bb963b..5e4cc8fc1 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 140851 2011-10-20 05:41:55Z ibiru $
+# $Id: PKGBUILD 141134 2011-10-24 16:36:03Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=empathy
-pkgver=3.2.1
+pkgver=3.2.1.1
pkgrel=1
pkgdesc="A GNOME instant messaging client using the Telepathy framework."
arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ options=('!libtool')
groups=('gnome-extra')
install=empathy.install
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d50e9b0e31df0e8d137c120c61c5aeaaad06fb24bb208d105b186a01b3f1de0a')
+sha256sums=('2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 4f19b7144..c7094a53a 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $
+# $Id: PKGBUILD 141107 2011-10-24 08:04:06Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=freetype2
-pkgver=2.4.6
+pkgver=2.4.7
pkgrel=1
pkgdesc="TrueType font rendering library"
arch=(i686 x86_64)
@@ -13,7 +13,7 @@ options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
freetype-2.3.0-enable-spr.patch
freetype-2.2.1-enable-valid.patch)
-md5sums=('5e6510613f612809d2d7862592b92ab7'
+md5sums=('dbadce8f0c5e70a0b7c51eadf2dd9394'
'816dc8619a6904a7385769433c0a8653'
'214119610444c9b02766ccee5e220680')
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index a1f5cef60..c80532694 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $
+# $Id: PKGBUILD 141151 2011-10-24 22:00:23Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.7
+pkgver=1.7.7.1
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
@@ -80,11 +80,11 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-md5sums=('5d645884e688921e773186783b65ce33'
- '2ee47bd79dfd391bc7d1b466539b9734'
+md5sums=('7cfb3e7ea585037272a7ad8e35f4ac0a'
+ 'b6ec6c3a08855b7393284675643be95c'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6'
- 'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb'
+sha256sums=('6a7909226b2b249c7970b0d36054dbcfe58e6558cc4d671ea1f5ac6a69d8cf4f'
+ '28904942a0e91d601d731a9fe0bf26c2fe595d8a69a9c2a4da3ec66286c50db5'
'2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index b57eefce4..6c9daaaa4 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $
+# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
pkgname=grilo-plugins
pkgver=0.1.17
-pkgrel=2
+pkgrel=3
pkgdesc="Plugins for Grilo"
url="http://www.gnome.org"
arch=('i686' 'x86_64')
license=('LGPL')
depends=('grilo')
-makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql')
+makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt'
+ 'rest' 'libtracker-sparql')
optdepends=('gupnp-av: uPnP plugin'
'libgdata: Youtube plugin'
- 'quvi: Youtube plugin'
+ 'libquvi: Youtube plugin'
'sqlite3: Podcasts plugin'
'gmime: Podcasts plugin'
'sqlite3: Bookmarks plugin'
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
new file mode 100644
index 000000000..5aa4b468f
--- /dev/null
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -0,0 +1,97 @@
+# $Id: PKGBUILD 136836 2011-09-02 07:59:01Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase=icedtea-web-java7
+pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
+pkgver=1.1.3
+#_date=20110925
+#pkgrel=0.${_date}.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://icedtea.classpath.org/wiki/IcedTea-Web"
+license=('GPL2')
+makedepends=('jdk7-openjdk' 'zip' 'xulrunner')
+source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz
+ http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
+ #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz
+md5sums=('0e2e653c7436d81edcbc1d4255571ab6')
+sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37')
+
+_javaver=7
+_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
+
+mksource() {
+ mkdir /tmp/${pkgbase}-${_date}
+ pushd /tmp/${pkgbase}-${_date}
+ hg clone http://icedtea.classpath.org/hg/icedtea-web ${pkgbase}-${_date}
+ rm -rf ${pkgbase}-${_date}/.hg*
+ tar -cvJf /tmp/${pkgbase}-${_date}/${pkgbase}-${_date}.tar.xz *
+ popd
+}
+
+build() {
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+
+ #. /etc/profile.d/jre.sh
+ . /etc/profile.d/jre7-openjdk.sh
+ #. /etc/profile.d/jdk.sh
+ . /etc/profile.d/jdk7-openjdk.sh
+
+ autoreconf --force --install
+
+ ./configure --prefix=${_jvmdir} \
+ --datarootdir=/usr/share \
+ --with-jdk-home=${_jvmdir}
+ make
+}
+
+check() {
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ make -k check
+}
+
+
+package_icedtea-web-java7() {
+
+ pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
+ depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+ install=${pkgname}.install
+
+ cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
+ # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
+ make DESTDIR="${pkgdir}" install-exec-local install-data-local
+
+ # Install desktop files.
+ install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+ install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
+ # remove splitted doc files
+ rm -rf ${pkgdir}/usr/share/doc
+
+ # link binaries into /usr/bin + jre/bin
+ install -m755 -d ${pkgdir}/usr/bin
+ install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
+ pushd ${pkgdir}/${_jvmdir}/bin
+ for file in *; do
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
+ ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
+ done
+ popd
+
+ # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
+ install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
+}
+
+package_icedtea-web-java7-doc() {
+
+ pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
+
+ cd "${srcdir}"/icedtea-web* #${pkgbase}-${_date}"
+# install -m755 -d ${pkgdir}/${_jvmdir}/jre/lib
+ make DESTDIR="${pkgdir}" install-data-local
+ # remove javaws about and man page
+ rm -rf ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/share/man
+ rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
+}
diff --git a/extra/icedtea-web-java7/icedtea-web-java7.install b/extra/icedtea-web-java7/icedtea-web-java7.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/extra/icedtea-web-java7/icedtea-web-java7.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ update-desktop-database -q
+}
+
+post_remove() {
+ update-desktop-database -q
+}
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index c677ddefe..d4b3b4e3b 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 139379 2011-10-01 18:59:56Z ibiru $
+# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libgweather
-pkgver=3.2.0
+pkgver=3.2.1
pkgrel=1
pkgdesc="Provides access to weather information from the net"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org/"
install=libgweather.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
gettext-not-xml.patch)
-sha256sums=('7fdae4aad787759ed0d0124d66991311a24c8c9a3c9a46c56f62e4cc4575aea9'
+sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5'
'5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3')
build() {
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index ec3d45edd..c0cd4dfbb 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136927 2011-09-03 00:05:20Z giovanni $
+# $Id: PKGBUILD 141128 2011-10-24 13:35:44Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
pkgname=smb4k
-pkgver=0.10.73
+pkgver=0.10.90
pkgrel=1
pkgdesc="A KDE program that browses samba shares"
arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('GPL')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'docbook-xsl')
install=smb4k.install
-source=("http://download.berlios.de/smb4k/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8f161a1b1146dc44217826901deb35c8')
+source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28development%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('6e166eead700e0a21d4f324be4471e11')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/smb4k/smb4k.install b/extra/smb4k/smb4k.install
index c5e097f49..91d7da03d 100644
--- a/extra/smb4k/smb4k.install
+++ b/extra/smb4k/smb4k.install
@@ -1,14 +1,10 @@
-# $Id: smb4k.install,v 1.2 2009/02/23 03:09:26 travis Exp $
-# arg 1: the new package version
post_install() {
echo "==> Note: To enable mounting and unmounting of smb/cifs shares as"
echo "==> user, you will need to issue the following command as root:"
- echo "# chmod +s \$(which mount.cifs) \$(which umount.cifs)"
+ echo "# chmod +s \$(which mount.cifs)"
echo "==> These command will need to be re-run every upgrade of smbclient"
}
-# arg 1: the new package version
-# arg 2: the old package version
post_upgrade() {
post_install $1
}
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index bad4099ab..0a0be625e 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134583 2011-08-06 08:22:40Z andrea $
+# $Id: PKGBUILD 141136 2011-10-24 17:18:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=soprano
-pkgver=2.7.0
+pkgver=2.7.2
pkgrel=1
pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL')
depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
makedepends=('cmake' 'openjdk6' 'doxygen')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('52f216c82e731499bb25bf3b4cf0eecb')
+md5sums=('0cc853aee90e40db49ac7cb25cdf3619')
build() {
cd "${srcdir}"
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index ca5f1f4f8..2eecae26d 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140277 2011-10-11 21:28:03Z jgc $
+# $Id: PKGBUILD 141122 2011-10-24 13:18:15Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.11.1
-pkgrel=2
+pkgver=1.11.1.901
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -18,11 +18,11 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
xvfb-run
xvfb-run.1
10-quirks.conf)
-sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd'
+sha1sums=('bc72d860c34868aa6b1823230cb7f13136ceb092'
'0249b892f27243d8fe6fe6d226bf4c2391cedf49'
'962fecc159c128728f14e8ba231c5b00391ff4ac'
'd9f7d9553e772c2682c15079019d30c658a4f83b'
- 'd73125bf93aea09b0beb55e75c510b9f72f5d21a'
+ 'cd9291fe1fa1b497aa74675afeeb025fe6b23b95'
'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
'6838fc00ef4618c924a77e0fb03c05346080908a'
'993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -42,7 +42,7 @@ build() {
# Add post-release patches from 1.11 branch
patch -Np1 -i "${srcdir}/git-fixes.patch"
- autoreconf
+ autoreconf -fi
./configure --prefix=/usr \
--enable-ipv6 \
--enable-dri \
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index 3c59c27c9..a62524bdb 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,288 +1,56 @@
-From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Wed, 15 Sep 2010 01:35:21 +0000
-Subject: Fix pixmap double-frees on error paths.
-
-If AddResource fails, it will automatically free the object that was
-passed to it by calling the appropriate deleteFunc; and of course
-FreeResource also calls the deleteFunc. In both cases it's wrong to call
-the destroy hook manually.
-
-Commit by Jamey Sharp and Josh Triplett.
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Josh Triplett <josh@joshtriplett.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467)
----
-diff --git a/Xext/shm.c b/Xext/shm.c
-index b08af82..4141a8f 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -991,7 +991,6 @@ CreatePmap:
- pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
- pMap->drawable.id = newPix->info[j].id;
- if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) {
-- (*pScreen->DestroyPixmap)(pMap);
- result = BadAlloc;
- break;
- }
-@@ -1002,10 +1001,8 @@ CreatePmap:
- }
-
- if(result == BadAlloc) {
-- while(j--) {
-- (*pScreen->DestroyPixmap)(pMap);
-+ while(j--)
- FreeResource(newPix->info[j].id, RT_NONE);
-- }
- free(newPix);
- } else
- AddResource(stuff->pid, XRT_PIXMAP, newPix);
-@@ -1110,7 +1107,6 @@ CreatePmap:
- {
- return Success;
- }
-- pDraw->pScreen->DestroyPixmap(pMap);
- }
- return BadAlloc;
- }
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 192c8c3..f8200b1 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -1419,7 +1419,6 @@ CreatePmap:
- }
- if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
- return Success;
-- (*pDraw->pScreen->DestroyPixmap)(pMap);
- }
- return BadAlloc;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Tue, 30 Aug 2011 22:46:52 +0000
-Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices
-
-The corresponding DeviceIntPtr wasn't being gotten properly,
-resulting in BadDevice from dixLookupDevice().
-
-Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit f52d5cd374563544dafe29587411f345e31bbdf8)
----
-diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
-index ae43433..5cdd8ac 100644
---- a/Xi/xipassivegrab.c
-+++ b/Xi/xipassivegrab.c
-@@ -261,9 +261,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
- REQUEST(xXIPassiveUngrabDeviceReq);
- REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
-
-- rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
-- if (rc != Success)
-- return rc;
-+ if (stuff->deviceid == XIAllDevices)
-+ dev = inputInfo.all_devices;
-+ else if (stuff->deviceid == XIAllMasterDevices)
-+ dev = inputInfo.all_master_devices;
-+ else
-+ {
-+ rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
-+ if (rc != Success)
-+ return rc;
-+ }
-
- if (stuff->grab_type != XIGrabtypeButton &&
- stuff->grab_type != XIGrabtypeKeycode &&
---
-cgit v0.9.0.2-2-gbebe
-From e9ae33316012ffe9acfeeb7303ab3392c2ca2a2b Mon Sep 17 00:00:00 2001
-From: Sam Spilsbury <sam.spilsbury@canonical.com>
-Date: Wed, 14 Sep 2011 01:58:34 +0000
-Subject: Remove the SendEvent bit (0x80) before doing range checks on event type.
-
-Some extension libraries may set this bit before converting the event to
-wire protocol and as such range checking the event will cause an invalid
-BadValue error to result. As the documentation suggests the the bit
-should be "forced on", remove it before doing range checks and continue
-to force it on in the server.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39)
----
-diff --git a/dix/events.c b/dix/events.c
-index 8a4c6b9..9e58edb 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -5224,6 +5224,8 @@ CloseDownEvents(void)
- InputEventList = NULL;
- }
-
-+#define SEND_EVENT_BIT 0x80
-+
- /**
- * Server-side protocol handling for SendEvent request.
- *
-@@ -5241,6 +5243,16 @@ ProcSendEvent(ClientPtr client)
-
- REQUEST_SIZE_MATCH(xSendEventReq);
-
-+ /* libXext and other extension libraries may set the bit indicating
-+ * that this event came from a SendEvent request so remove it
-+ * since otherwise the event type may fail the range checks
-+ * and cause an invalid BadValue error to be returned.
-+ *
-+ * This is safe to do since we later add the SendEvent bit (0x80)
-+ * back in once we send the event to the client */
-+
-+ stuff->event.u.u.type &= ~(SEND_EVENT_BIT);
-+
- /* The client's event type must be a core event type or one defined by an
- extension. */
-
-@@ -5298,7 +5310,7 @@ ProcSendEvent(ClientPtr client)
- client->errorValue = stuff->propagate;
- return BadValue;
- }
-- stuff->event.u.u.type |= 0x80;
-+ stuff->event.u.u.type |= SEND_EVENT_BIT;
- if (stuff->propagate)
- {
- for (;pWin; pWin = pWin->parent)
---
-cgit v0.9.0.2-2-gbebe
-From b45e22675364915c32560c26404cf30d77ab68aa Mon Sep 17 00:00:00 2001
-From: Alan Hourihane <alanh@vmware.com>
-Date: Wed, 05 Oct 2011 02:42:46 +0000
-Subject: dixfonts: Don't overwrite local c variable until new_closure is safely initialized.
-
-Signed-off-by: Alan Hourihane <alanh@vmware.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit 7a33c5b934382b5554f41ab1502514e91c9bc52e)
+From f80d23357874db19bc124dee70239fb182977883 Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 17 Oct 2011 20:26:12 +0000
+Subject: Fix CVE-2011-4028: File disclosure vulnerability.
+
+use O_NOFOLLOW to open the existing lock file, so symbolic links
+aren't followed, thus avoid revealing if it point to an existing
+file.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+(cherry picked from commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34)
---
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index fbac124..d2bcb84 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c)
- goto bail;
- }
- *new_closure = *c;
-- c = new_closure;
-
-- len = c->endReq - c->pElt;
-- c->data = malloc(len);
-- if (!c->data)
-+ len = new_closure->endReq - new_closure->pElt;
-+ new_closure->data = malloc(len);
-+ if (!new_closure->data)
- {
-- free(c);
-+ free(new_closure);
- err = BadAlloc;
- goto bail;
- }
-- memmove(c->data, c->pElt, len);
-- c->pElt = c->data;
-- c->endReq = c->pElt + len;
-+ memmove(new_closure->data, new_closure->pElt, len);
-+ new_closure->pElt = new_closure->data;
-+ new_closure->endReq = new_closure->pElt + len;
-
- /* Step 2 */
-
-- pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen);
-+ pGC = GetScratchGC(new_closure->pGC->depth, new_closure->pGC->pScreen);
- if (!pGC)
- {
-- free(c->data);
-- free(c);
-+ free(new_closure->data);
-+ free(new_closure);
- err = BadAlloc;
- goto bail;
- }
-- if ((err = CopyGC(c->pGC, pGC, GCFunction |
-+ if ((err = CopyGC(new_closure->pGC, pGC, GCFunction |
- GCPlaneMask | GCForeground |
- GCBackground | GCFillStyle |
- GCTile | GCStipple |
-@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c)
- Success)
- {
- FreeScratchGC(pGC);
-- free(c->data);
-- free(c);
-+ free(new_closure->data);
-+ free(new_closure);
- err = BadAlloc;
- goto bail;
- }
-+ c = new_closure;
- origGC = c->pGC;
- c->pGC = pGC;
- ValidateGC(c->pDraw, c->pGC);
--
-+
- ClientSleep(client, (ClientSleepProcPtr)doPolyText, c);
-
- /* Set up to perform steps 3 and 4 */
---
-cgit v0.9.0.2-2-gbebe
-From bec15eb73a17fb47963ff6b747ea504f7dc05deb Mon Sep 17 00:00:00 2001
-From: Kirill Elagin <kirelagin@gmail.com>
-Date: Tue, 04 Oct 2011 19:02:20 +0000
-Subject: Fix server crash due to invalid images
-
-See https://bugs.freedesktop.org/show_bug.cgi?id=39383
-
-Signed-off-by: Kirill Elagin <kirelagin@gmail.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit 53611213396479abfdce0f7752681572e0d26d78)
----
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index d1fd0cb..57c93fd 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -163,7 +163,9 @@ create_bits_picture (PicturePtr pict,
- (pixman_format_code_t)pict->format,
- pixmap->drawable.width, pixmap->drawable.height,
- (uint32_t *)bits, stride * sizeof (FbStride));
--
-+
-+ if (!image)
-+ return NULL;
-
- #ifdef FB_ACCESS_WRAPPER
- #if FB_SHIFT==5
+diff --git a/os/utils.c b/os/utils.c
+index 36cb46f..9e0acb6 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -316,7 +316,7 @@ LockServer(void)
+ /*
+ * Read the pid from the existing file
+ */
+- lfd = open(LockFile, O_RDONLY);
++ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+ if (lfd < 0) {
+ unlink(tmp);
+ FatalError("Can't read lock file %s\n", LockFile);
--
cgit v0.9.0.2-2-gbebe
-From 65469f5ea98074ab27ce0a2d482157b9d5c2cbc7 Mon Sep 17 00:00:00 2001
-From: vdb@picaros.org <vdb@picaros.org>
-Date: Sat, 17 Sep 2011 16:55:47 +0000
-Subject: Fix a rare memory leak
-
-Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit e4cddf509e1729e8ff40354275b65455111ad2bd)
+From 12f65819ffb04103f170ecd7e281348de618fc4c Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 17 Oct 2011 20:27:35 +0000
+Subject: Fix CVE-2011-4029: File permission change vulnerability.
+
+Use fchmod() to change permissions of the lock file instead
+of chmod(), thus avoid the race that can be exploited to set
+a symbolic link to any file or directory in the system.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+(cherry picked from commit b67581cf825940fdf52bf2e0af4330e695d724a4)
---
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index c2814d4..3fae039 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -133,6 +133,7 @@ xf86CrtcCreate (ScrnInfoPtr scrn,
- crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
- if (!crtcs)
- {
-+ free(crtc->gamma_red);
- free(crtc);
- return NULL;
- }
+diff --git a/os/utils.c b/os/utils.c
+index 9e0acb6..d9aa65e 100644
+--- a/os/utils.c
++++ b/os/utils.c
+@@ -295,7 +295,7 @@ LockServer(void)
+ FatalError("Could not create lock file in %s\n", tmp);
+ (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+ (void) write(lfd, pid_str, 11);
+- (void) chmod(tmp, 0444);
++ (void) fchmod(lfd, 0444);
+ (void) close(lfd);
+
+ /*
--
cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index 4cd6d1e86..aa97c8ffd 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113683 2011-03-10 14:43:23Z jgc $
+# $Id: PKGBUILD 141120 2011-10-24 12:17:34Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-sessreg
-pkgver=1.0.6
-pkgrel=2
+pkgver=1.0.7
+pkgrel=1
pkgdesc="Register X sessions in system utmp/utmpx databases"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('glibc')
makedepends=('xorg-util-macros' 'xproto')
groups=('xorg-apps' 'xorg')
source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2)
-sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a')
+sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52')
build() {
cd "${srcdir}/sessreg-${pkgver}"
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index 4ec899376..b4101251d 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 113736 2011-03-10 15:06:24Z jgc $
+# $Id: PKGBUILD 141118 2011-10-24 12:15:25Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xdpyinfo
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
pkgdesc="Display information utility for X"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -12,7 +12,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l
makedepends=('xorg-util-macros')
groups=('xorg-apps' 'xorg')
source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2)
-sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2')
+sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f')
build() {
cd "${srcdir}/xdpyinfo-${pkgver}"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-25 21:37:00 +0000