diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/audacious/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/chromaprint/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/gnome-vfs-perl/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/gnutls/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/libbonobo/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/libmpeg2/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/mono-basic/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/mono-tools/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/openjdk6/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/postfix/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/qt/Drop-read-write-perms-for-users.patch | 145 | ||||
-rw-r--r-- | extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch | 80 | ||||
-rw-r--r-- | extra/qt/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/rarian/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/vc/PKGBUILD | 34 | ||||
-rw-r--r-- | extra/wpa_supplicant_gui/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/xpdf/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/xpdf/desktop | 2 |
18 files changed, 338 insertions, 57 deletions
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 3ca5d4296..65e47dd71 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173106 2012-12-11 04:42:07Z bisson $ +# $Id: PKGBUILD 177006 2013-02-04 00:32:16Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=audacious -pkgver=3.3.3 +pkgver=3.3.4 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f0f954a6c08dbe840df70f24a1ac82cdecc58c66') +sha1sums=('d1050fb88a59b46c0c9bbb1af0e7efc2b02f2b4d') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index 6a6b563bb..e20caef80 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170160 2012-11-03 19:43:21Z heftig $ +# $Id: PKGBUILD 177077 2013-02-05 22:13:13Z bisson $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=1 +pkgrel=2 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,11 @@ sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXAMPLES=ON \ + . make } diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index c5d0ce7c0..7807693af 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160475 2012-06-02 10:26:04Z bluewind $ +# $Id: PKGBUILD 177009 2013-02-04 08:18:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=5 +pkgrel=6 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -19,5 +19,9 @@ build() { cd "${srcdir}/${_realname}-${pkgver}" perl Makefile.PL INSTALLDIRS=vendor make +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 97cc1b82a..cdf5292c7 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174275 2013-01-03 18:00:22Z andyrtr $ +# $Id: PKGBUILD 177035 2013-02-04 17:30:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.6 +pkgver=3.1.7 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -15,8 +15,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p1 makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('835a5d20def765cd49ad7274ff3e7493' - '9f8569a4fcb65809a369df1575f10138') +md5sums=('95c96dfaba0e82e9e6bcb67eab5abf49' + 'ea9d8c24c1ac2654ae9fe87f69b45e17') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD index 2f5386137..582deca83 100644 --- a/extra/libbonobo/PKGBUILD +++ b/extra/libbonobo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 151065 2012-02-24 17:44:58Z ibiru $ +# $Id: PKGBUILD 177011 2013-02-04 08:29:28Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libbonobo pkgver=2.32.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') depends=('orbit2' 'libxml2' 'glib2') -makedepends=('intltool' 'pkgconfig' 'flex') +makedepends=('intltool' 'pkgconfig') options=('!libtool') backup=('etc/bonobo-activation/bonobo-activation-config.xml') url="http://www.gnome.org" @@ -24,6 +24,10 @@ build() { --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/bonobo make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m644 "${srcdir}/bonobo-activation-config.xml" "${pkgdir}/etc/bonobo-activation/" } diff --git a/extra/libmpeg2/PKGBUILD b/extra/libmpeg2/PKGBUILD index 36792c233..2954e7bd1 100644 --- a/extra/libmpeg2/PKGBUILD +++ b/extra/libmpeg2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 134366 2011-08-03 07:11:36Z jgc $ +# $Id: PKGBUILD 177015 2013-02-04 08:35:17Z jgc $ # Contributor: Sarah Hay <sarah@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libmpeg2 pkgver=0.5.1 -pkgrel=3.1 +pkgrel=4 pkgdesc="Library for decoding MPEG-1 and MPEG-2 video streams." arch=('i686' 'x86_64' 'mips64el') url="http://libmpeg2.sourceforge.net/" depends=('glibc') makedepends=('sdl' 'libxv') -optdepends=('sdl: requiered for mpeg2dec' - 'libxv: requiered for mpeg2dec') +optdepends=('sdl: required for mpeg2dec' + 'libxv: required for mpeg2dec') source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz libmpeg2-0.5.1-gcc4.6.patch) license=('GPL2') @@ -31,5 +31,9 @@ build() { make OPT_CFLAGS="${CFLAGS}" \ MPEG2DEC_CFLAGS="${CFLAGS}" \ LIBMPEG2_CFLAGS="" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/mono-basic/PKGBUILD b/extra/mono-basic/PKGBUILD index 585dafaf1..4bd63337e 100644 --- a/extra/mono-basic/PKGBUILD +++ b/extra/mono-basic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 176982 2013-02-03 10:15:27Z allan $ +# $Id: PKGBUILD 177067 2013-02-05 18:04:09Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=mono-basic @@ -10,23 +10,24 @@ license=('GPL') url="http://www.mono-project.com/" depends=('mono>=2.10.1') makedepends=('pkgconfig') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +#source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('b459890e5447419ab1a5ea43d9b8afe8') build() { # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR=${startdir}/src/weird + export MONO_SHARED_DIR="${srcdir}/weird" mkdir -p "${MONO_SHARED_DIR}" # build mono - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/mono-tools/PKGBUILD b/extra/mono-tools/PKGBUILD index a7dc49bf1..b987b5233 100644 --- a/extra/mono-tools/PKGBUILD +++ b/extra/mono-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145315 2011-12-21 19:09:51Z daniel $ +# $Id: PKGBUILD 177070 2013-02-05 18:08:20Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> @@ -24,7 +24,7 @@ md5sums=('da178df2c119c696c08c09dc9eb01994') build() { # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="${startdir}/src/weird" + export MONO_SHARED_DIR="${srcdir}/weird" mkdir -p "${MONO_SHARED_DIR}" cd "$srcdir/$pkgname-$pkgver" autoreconf -fi diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index e2c636e1c..49d078cc0 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 176318 2013-01-29 17:04:23Z andyrtr $ +# $Id: PKGBUILD 177074 2013-02-05 19:26:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.12.0 +_icedteaver=1.12.1 _openjdk_version=b27 _openjdk_date=26_oct_2012 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} @@ -33,8 +33,8 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_04.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced' - 'e1cf397644e039402c0f86a9fc1a4690d747e0ce347d1d4e8afb8bc5c797f6a2' +sha256sums=('8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157' + 'a4d9d3e427943efc8715688d58eca6e8e111907f962524af78dd9a71e6892d60' '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0' '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 3f19a9ca6..a8b69f599 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173220 2012-12-13 22:30:06Z bisson $ +# $Id: PKGBUILD 177039 2013-02-05 03:00:26Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.9.5 +pkgver=2.9.6 pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' @@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p 'aliases.patch' 'service' 'rc.d') -sha1sums=('8602cd54e63b1af02a8f994b5da69d01d73ec8cc' +sha1sums=('9d7af8670fd13fd5e5290ff2e3f00d724178f0fb' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/qt/Drop-read-write-perms-for-users.patch b/extra/qt/Drop-read-write-perms-for-users.patch new file mode 100644 index 000000000..c3f56e65e --- /dev/null +++ b/extra/qt/Drop-read-write-perms-for-users.patch @@ -0,0 +1,145 @@ +From 20b26bdb3dd5e46b01b9a7e1ce8342074df3c89c Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Sat, 22 Dec 2012 08:32:12 -0800 +Subject: [PATCH] Change all shmget calls to user-only memory + +Drop the read and write permissions for group and other users in the +system. + +Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 +(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) +Reviewed-by: Richard J. Moore <rich@kde.org> +--- + src/corelib/kernel/qsharedmemory_unix.cpp | 6 +++--- + src/corelib/kernel/qsystemsemaphore_unix.cpp | 4 ++-- + src/gui/image/qnativeimage.cpp | 2 +- + src/gui/image/qpixmap_x11.cpp | 2 +- + src/plugins/platforms/xcb/qxcbwindowsurface.cpp | 2 +- + src/plugins/platforms/xlib/qxlibwindowsurface.cpp | 2 +- + .../auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 2 +- + tools/qvfb/qvfbshmem.cpp | 4 ++-- + 8 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp +index 20d76e3..4cf3acf 100644 +--- a/src/corelib/kernel/qsharedmemory_unix.cpp ++++ b/src/corelib/kernel/qsharedmemory_unix.cpp +@@ -238,7 +238,7 @@ bool QSharedMemoryPrivate::create(int size) + } + + // create +- if (-1 == shmget(unix_key, size, 0666 | IPC_CREAT | IPC_EXCL)) { ++ if (-1 == shmget(unix_key, size, 0600 | IPC_CREAT | IPC_EXCL)) { + QString function = QLatin1String("QSharedMemory::create"); + switch (errno) { + case EINVAL: +@@ -293,7 +293,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) + { + #ifndef QT_POSIX_IPC + // grab the shared memory segment id +- int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0444 : 0660)); ++ int id = shmget(unix_key, 0, (mode == QSharedMemory::ReadOnly ? 0400 : 0600)); + if (-1 == id) { + setErrorString(QLatin1String("QSharedMemory::attach (shmget)")); + return false; +@@ -381,7 +381,7 @@ bool QSharedMemoryPrivate::detach() + size = 0; + + // Get the number of current attachments +- int id = shmget(unix_key, 0, 0444); ++ int id = shmget(unix_key, 0, 0400); + cleanHandle(); + + struct shmid_ds shmid_ds; +diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp +index fad9acc..e77456b 100644 +--- a/src/corelib/kernel/qsystemsemaphore_unix.cpp ++++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp +@@ -153,10 +153,10 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) + } + + // Get semaphore +- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT | IPC_EXCL); ++ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT | IPC_EXCL); + if (-1 == semaphore) { + if (errno == EEXIST) +- semaphore = semget(unix_key, 1, 0666 | IPC_CREAT); ++ semaphore = semget(unix_key, 1, 0600 | IPC_CREAT); + if (-1 == semaphore) { + setErrorString(QLatin1String("QSystemSemaphore::handle")); + cleanHandle(); +diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp +index 9654afe..fef38c5 100644 +--- a/src/gui/image/qnativeimage.cpp ++++ b/src/gui/image/qnativeimage.cpp +@@ -176,7 +176,7 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* + + bool ok; + xshminfo.shmid = shmget(IPC_PRIVATE, xshmimg->bytes_per_line * xshmimg->height, +- IPC_CREAT | 0777); ++ IPC_CREAT | 0700); + ok = xshminfo.shmid != -1; + if (ok) { + xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); +diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp +index 280d8bd..88c9b7b 100644 +--- a/src/gui/image/qpixmap_x11.cpp ++++ b/src/gui/image/qpixmap_x11.cpp +@@ -193,7 +193,7 @@ static bool qt_create_mitshm_buffer(const QPaintDevice* dev, int w, int h) + bool ok; + xshminfo.shmid = shmget(IPC_PRIVATE, + xshmimg->bytes_per_line * xshmimg->height, +- IPC_CREAT | 0777); ++ IPC_CREAT | 0700); + ok = xshminfo.shmid != -1; + if (ok) { + xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); +diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp +index b6a42d8..0d56821 100644 +--- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp ++++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp +@@ -98,7 +98,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QI + 0); + + m_shm_info.shmid = shmget (IPC_PRIVATE, +- m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0777); ++ m_xcb_image->stride * m_xcb_image->height, IPC_CREAT|0600); + + m_shm_info.shmaddr = m_xcb_image->data = (quint8 *)shmat (m_shm_info.shmid, 0, 0); + m_shm_info.shmseg = xcb_generate_id(xcb_connection()); +diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp +index bf003eb..46a2f97 100644 +--- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp ++++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp +@@ -99,7 +99,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height) + + + image_info->shminfo.shmid = shmget (IPC_PRIVATE, +- image->bytes_per_line * image->height, IPC_CREAT|0777); ++ image->bytes_per_line * image->height, IPC_CREAT|0700); + + image_info->shminfo.shmaddr = image->data = (char*)shmat (image_info->shminfo.shmid, 0, 0); + image_info->shminfo.readOnly = False; +diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp +index 7f9671f..84b6ebe 100644 +--- a/tools/qvfb/qvfbshmem.cpp ++++ b/tools/qvfb/qvfbshmem.cpp +@@ -176,13 +176,13 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s, + uint data_offset_value = sizeof(QVFbHeader); + + int dataSize = bpl * h + data_offset_value; +- shmId = shmget(key, dataSize, IPC_CREAT | 0666); ++ shmId = shmget(key, dataSize, IPC_CREAT | 0600); + if (shmId != -1) + data = (unsigned char *)shmat(shmId, 0, 0); + else { + struct shmid_ds shm; + shmctl(shmId, IPC_RMID, &shm); +- shmId = shmget(key, dataSize, IPC_CREAT | 0666); ++ shmId = shmget(key, dataSize, IPC_CREAT | 0600); + if (shmId == -1) { + perror("QShMemViewProtocol::QShMemViewProtocol"); + qFatal("Cannot get shared memory 0x%08x", key); +-- +1.7.1 + diff --git a/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch b/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch new file mode 100644 index 000000000..5f56edd8d --- /dev/null +++ b/extra/qt/Fix-binary-incompatibility-between-openssl-versions.patch @@ -0,0 +1,80 @@ +From 691e78e5061d4cbc0de212d23b06c5dffddf2098 Mon Sep 17 00:00:00 2001 +From: Shane Kearns <dbgshane@gmail.com> +Date: Thu, 6 Dec 2012 17:03:18 +0000 +Subject: [PATCH 54/79] Fix binary incompatibility between openssl versions + +OpenSSL changed the layout of X509_STORE_CTX between 0.9 and 1.0 +So we have to consider this struct as private implementation, and use +the access functions instead. + +This bug would cause certificate verification problems if a different +version of openssl is loaded at runtime to the headers Qt was compiled +against. + +Task-number: QTBUG-28343 +Change-Id: I47fc24336f7d9c80f08f9c8ba6debc51a5591258 +Reviewed-by: Richard J. Moore <rich@kde.org> +(cherry picked from commit eb2688c4c4f257d0a4d978ba4bf57d6347b15252) +--- + src/network/ssl/qsslsocket_openssl.cpp | 2 +- + src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++++++ + src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 ++++ + 3 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index b7ca290..e912abac 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -236,7 +236,7 @@ static int q_X509Callback(int ok, X509_STORE_CTX *ctx) + { + if (!ok) { + // Store the error and at which depth the error was detected. +- _q_sslErrorList()->errors << qMakePair<int, int>(ctx->error, ctx->error_depth); ++ _q_sslErrorList()->errors << qMakePair<int, int>(q_X509_STORE_CTX_get_error(ctx), q_X509_STORE_CTX_get_error_depth(ctx)); + } + // Always return OK to allow verification to continue. We're handle the + // errors gracefully after collecting all errors, after verification has +diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp +index 2d6a25b..2e6ccd0 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -267,6 +267,10 @@ DEFINEFUNC2(int, X509_STORE_add_cert, X509_STORE *a, a, X509 *b, b, return 0, re + DEFINEFUNC(void, X509_STORE_CTX_free, X509_STORE_CTX *a, a, return, DUMMYARG) + DEFINEFUNC4(int, X509_STORE_CTX_init, X509_STORE_CTX *a, a, X509_STORE *b, b, X509 *c, c, STACK_OF(X509) *d, d, return -1, return) + DEFINEFUNC2(int, X509_STORE_CTX_set_purpose, X509_STORE_CTX *a, a, int b, b, return -1, return) ++DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) ++DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) ++DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) ++DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) + DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) + #ifdef SSLEAY_MACROS + DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) +@@ -832,6 +836,10 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(X509_STORE_CTX_init) + RESOLVEFUNC(X509_STORE_CTX_new) + RESOLVEFUNC(X509_STORE_CTX_set_purpose) ++ RESOLVEFUNC(X509_STORE_CTX_get_error) ++ RESOLVEFUNC(X509_STORE_CTX_get_error_depth) ++ RESOLVEFUNC(X509_STORE_CTX_get_current_cert) ++ RESOLVEFUNC(X509_STORE_CTX_get_chain) + RESOLVEFUNC(X509_cmp) + #ifndef SSLEAY_MACROS + RESOLVEFUNC(X509_dup) +diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h +index fa9a157..87f3697 100644 +--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h ++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h +@@ -374,6 +374,10 @@ int q_X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, + X509 *x509, STACK_OF(X509) *chain); + X509_STORE_CTX *q_X509_STORE_CTX_new(); + int q_X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); ++int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx); ++int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx); ++X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx); ++STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx); + + #define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp) + #define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) +-- +1.8.0.2 + diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index f55d78823..80c9f2acc 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175874 2013-01-23 00:13:11Z eric $ +# $Id: PKGBUILD 177062 2013-02-05 13:17:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -21,7 +21,9 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'qtconfig.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch' - 'fix-crash-in-assistant.patch') + 'fix-crash-in-assistant.patch' + 'Fix-binary-incompatibility-between-openssl-versions.patch' + 'Drop-read-write-perms-for-users.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'f1837a03fd0ebbd2da58975845f278e3' '480fea1ed076992b688373c8db274be0' @@ -29,7 +31,9 @@ md5sums=('89c5ecba180cae74c66260ac732dc5cb' '824a3b77a25e98567f640e0441ccdebc' 'c439c7731c25387352d8453ca7574971' 'aac963d05a9d5733e2bfce9e26607f51' - '57590084078b6379f0501f7728b02ae2') + '57590084078b6379f0501f7728b02ae2' + 'abd18c8a71e08167270b8ec6de61254a' + 'db29b7dd44c56f6026b53b57bbfd9ea3') build() { cd ${_pkgfqn} @@ -43,6 +47,10 @@ build() { # (FS#29469) patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch + # Security fixes + patch -p1 -i "${srcdir}"/Fix-binary-incompatibility-between-openssl-versions.patch + patch -p1 -i "${srcdir}"/Drop-read-write-perms-for-users.patch + export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/rarian/PKGBUILD b/extra/rarian/PKGBUILD index ac4dfc1c2..390256406 100644 --- a/extra/rarian/PKGBUILD +++ b/extra/rarian/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137591 2011-09-09 23:51:24Z allan $ +# $Id: PKGBUILD 177017 2013-02-04 08:40:59Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=rarian pkgver=0.8.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper." arch=('i686' 'x86_64' 'mips64el') url="http://rarian.freedesktop.org/" @@ -17,14 +17,14 @@ md5sums=('75091185e13da67a0ff4279de1757b94' '457e9827197009cfa360911fe49a5ad7') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/user-segfault.patch + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i ../user-segfault.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD new file mode 100644 index 000000000..e5d26a114 --- /dev/null +++ b/extra/vc/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 177033 2013-02-04 15:56:42Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: PedsXing <pedsxing at gmx dot net> + +pkgname=vc +pkgver=0.6.1 +pkgrel=1 +pkgdesc="A library to ease explicit vectorization of C++ code" +url='http://code.compeng.uni-frankfurt.de/projects/vc/' +arch=('x86_64' 'i686') +license=('LGPL3') +makedepends=('cmake') +source=("http://code.compeng.uni-frankfurt.de/attachments/download/147/Vc-${pkgver}.tar.gz") +md5sums=('8b9885b58872a11131d2818ec54f838a') + +build() { + mkdir build + cd build + cmake ../Vc-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +check() { + cd build + make test +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} + diff --git a/extra/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD index 0a9edeaac..9f679c671 100644 --- a/extra/wpa_supplicant_gui/PKGBUILD +++ b/extra/wpa_supplicant_gui/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 162910 2012-07-03 19:17:02Z dreisner $ +# $Id: PKGBUILD 177075 2013-02-05 19:47:31Z eric $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant_gui -pkgver=1.0 +pkgver=2.0 pkgrel=1 pkgdesc="A Qt frontend to wpa_supplicant" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') -depends=('qt' "wpa_supplicant=$pkgver") +depends=('qt' "wpa_supplicant") license=('GPL') -source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz" - compile-fix.patch) -sha256sums=('91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c' - '044be1032faf93c5f0abf22d7ae77dc0d1d1fef0c2c30646d54950b86601709f') +source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz") +sha256sums=('2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09') build() { cd wpa_supplicant-${pkgver} - patch -p1 <../compile-fix.patch cd wpa_supplicant/wpa_gui-qt4 - qmake + qmake QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" make } diff --git a/extra/xpdf/PKGBUILD b/extra/xpdf/PKGBUILD index 14030a227..efd7710a0 100644 --- a/extra/xpdf/PKGBUILD +++ b/extra/xpdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159716 2012-05-26 07:54:51Z andyrtr $ +# $Id: PKGBUILD 177029 2013-02-04 13:10:00Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> @@ -6,7 +6,7 @@ pkgname=xpdf #pkgver=3.03_pl1 pkgver=3.03 -pkgrel=2 +pkgrel=3 pkgdesc='Viewer for Portable Document Format (PDF) files' url='http://www.foolabs.com/xpdf/' license=('GPL2') @@ -20,7 +20,7 @@ source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz" 'desktop') sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248' '5c471944685a6b24a2b0c0e000562d1a3263aeeb' - '3b6fe01636253676ffa0efe1b237a75af4721f6d') + '17ebbfe457cb92e97b12b7362e8ce961526012d9') install=install backup=('etc/xpdfrc') diff --git a/extra/xpdf/desktop b/extra/xpdf/desktop index 06830ecda..956323427 100644 --- a/extra/xpdf/desktop +++ b/extra/xpdf/desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Xpdf Comment=Views Adobe PDF (acrobat) files -Exec=xpdf +Exec=xpdf %f Terminal=false Type=Application Icon=xpdf |