diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/dovecot/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/dovecot/pop3_Access_sequence_numbers_correctly.diff | 36 | ||||
-rw-r--r-- | extra/evolution-data-server/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/evolution/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/gtk3/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/libkscreen/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/libkscreen/fix-crash.patch | 53 | ||||
-rw-r--r-- | extra/libomxil-bellagio/PKGBUILD | 38 | ||||
-rw-r--r-- | extra/libomxil-bellagio/fedora-fixes.patch | 199 | ||||
-rw-r--r-- | extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch | 121 | ||||
-rw-r--r-- | extra/libxcb/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/mpd/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/perl-net-dns/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/pigeonhole/PKGBUILD | 8 |
14 files changed, 399 insertions, 136 deletions
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index fac1cc4b8..27546531c 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205903 2014-02-13 16:52:18Z andyrtr $ +# $Id: PKGBUILD 212317 2014-05-12 18:20:13Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.11 +pkgver=2.2.13 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -23,21 +23,16 @@ optdepends=('libldap: ldap plugin' provides=('imap-server' 'pop3-server') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} - dovecot.tmpfilesd - pop3_Access_sequence_numbers_correctly.diff) -md5sums=('d53d207727df99e4362a3787223c6fa3' + dovecot.tmpfilesd) +md5sums=('a3eb1c0b1822c4f2b0fe9247776baa71' 'SKIP' - '342a28251d40f983c98c0d1f1bf3d07d' - 'c8096d3966651222accd7f6bc678d08d') + '342a28251d40f983c98c0d1f1bf3d07d') prepare() { cd $pkgname-$pkgver # fix path in helper script sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh - - # post release segfault fix - patch -Np1 -i ${srcdir}/pop3_Access_sequence_numbers_correctly.diff } build() { diff --git a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff b/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff deleted file mode 100644 index d415a0eff..000000000 --- a/extra/dovecot/pop3_Access_sequence_numbers_correctly.diff +++ /dev/null @@ -1,36 +0,0 @@ - -diff -r 59decc957b39 -r d20059f7d3a1 src/pop3/pop3-commands.c ---- a/src/pop3/pop3-commands.c Fri Feb 07 15:03:33 2014 -0500 -+++ b/src/pop3/pop3-commands.c Thu Feb 13 05:33:13 2014 +0200 -@@ -253,7 +253,7 @@ - for (msgnum = 0; msgnum < client->messages_count; msgnum++) { - bit = 1 << (msgnum % CHAR_BIT); - if ((client->deleted_bitmask[msgnum / CHAR_BIT] & bit) != 0) -- seq_range_array_add(&deleted_msgs, client->msgnum_to_seq_map[msgnum]); -+ seq_range_array_add(&deleted_msgs, msgnum_to_seq(client, msgnum)); - } - } - t_array_init(&seen_msgs, 8); -@@ -261,7 +261,7 @@ - for (msgnum = 0; msgnum < client->messages_count; msgnum++) { - bit = 1 << (msgnum % CHAR_BIT); - if ((client->seen_bitmask[msgnum / CHAR_BIT] & bit) != 0) -- seq_range_array_add(&seen_msgs, client->msgnum_to_seq_map[msgnum]); -+ seq_range_array_add(&seen_msgs, msgnum_to_seq(client, msgnum)); - } - } - -@@ -826,7 +826,7 @@ - client->messages_count+1); - for (msgnum = 0; msgnum < client->messages_count; msgnum++) { - client->message_uidls[msgnum] = -- seq_uidls[client->msgnum_to_seq_map[msgnum]]; -+ seq_uidls[msgnum_to_seq(client, msgnum)]; - } - i_free(seq_uidls); - } - - - - - diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 1fa8c174c..119edfc33 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 211322 2014-04-18 17:28:24Z andyrtr $ +# $Id: PKGBUILD 212324 2014-05-12 18:57:52Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.12.1 -pkgrel=2 +pkgver=3.12.2 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=(i686 x86_64) depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) @@ -12,7 +12,7 @@ install=$pkgname.install url="https://wiki.gnome.org/Apps/Evolution" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('8c794d7f3e5241cc8856ab1d9fccab29487c575d3a3b7d9b884064864b96caa3') +sha256sums=('91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 11d478451..aaed7d775 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 210429 2014-04-14 20:06:05Z jgc $ +# $Id: PKGBUILD 212328 2014-05-12 19:10:53Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.12.1 +pkgver=3.12.2 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=(i686 x86_64) @@ -19,7 +19,7 @@ options=('!emptydirs') install=evolution.install url=https://wiki.gnome.org/Apps/Evolution source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('a4b5058a82949e883956863d23fd65cd4e89d6a1fb18d4d35b3ddaf4464bf52a') +sha256sums=('60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948') build() { cd $pkgname-$pkgver @@ -30,7 +30,6 @@ build() { --enable-nss=yes \ --with-openldap=yes \ --enable-smime=yes \ - --with-krb5=/usr \ --disable-schemas-compile sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index fbd159046..f559604c8 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 211871 2014-04-28 15:12:02Z jgc $ +# $Id: PKGBUILD 212320 2014-05-12 18:48:47Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gtk3 -pkgver=3.12.1 -pkgrel=2 +pkgver=3.12.2 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64) url="http://www.gtk.org/" @@ -17,7 +17,7 @@ optdepends=('gnome-themes-standard: Default widget theme' license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('719aae5fdb560f64cadb7e968c8c85c0823664de890c9f765ff4c0efeb0277cd' +sha256sums=('61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0' '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119') build() { diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD index 94a2da31f..9bf01ef93 100644 --- a/extra/libkscreen/PKGBUILD +++ b/extra/libkscreen/PKGBUILD @@ -1,26 +1,21 @@ -# $Id: PKGBUILD 212107 2014-05-07 15:48:41Z andrea $ +# $Id: PKGBUILD 212291 2014-05-12 02:55:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=libkscreen -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="KDE's screen management library" arch=('i686' 'x86_64') url='https://projects.kde.org/libkscreen' license=('GPL') depends=('kdelibs' 'qjson') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-crash.patch') -md5sums=('7048db071d669193f8dafc9a1319998b' - 'fef9233861b848d569c015f6095d390a') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('802ba357e1e802d6773405bc54b47145') prepare() { mkdir build - - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/fix-crash.patch } build() { diff --git a/extra/libkscreen/fix-crash.patch b/extra/libkscreen/fix-crash.patch deleted file mode 100644 index a385edc5b..000000000 --- a/extra/libkscreen/fix-crash.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Aleix Pol <aleixpol@kde.org> -Date: Mon, 05 May 2014 13:13:25 +0000 -Subject: Fix crash -X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=221dff2e2f9fbd1c18eae9b59f23b1dbbdb1870b ---- -Fix crash - -If we don't have a primary output, don't query it. Set a new primary -output instead. - -Reviewed by Alex Fiestas ---- - - ---- a/backends/xrandr/xrandrconfig.cpp -+++ b/backends/xrandr/xrandrconfig.cpp -@@ -157,7 +157,7 @@ - output->updateKScreenOutput(kscreenOutput); - } - -- if (config->primaryOutput()->id() != m_primaryOutput) { -+ if (!config->primaryOutput() || config->primaryOutput()->id() != m_primaryOutput) { - config->setPrimaryOutput(config->output(m_primaryOutput)); - } - } - -From: Aleix Pol <aleixpol@kde.org> -Date: Tue, 06 May 2014 13:55:16 +0000 -Subject: Don't crash when printing a null KScreen::Output* from qDebug -X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=31f07fd26e6091dfd37c54fef3352a95182e5bba ---- -Don't crash when printing a null KScreen::Output* from qDebug - -Reviewed by Alex Fiestas ---- - - ---- a/src/output.cpp -+++ b/src/output.cpp -@@ -425,7 +425,11 @@ - - QDebug operator<<(QDebug dbg, const KScreen::Output *output) - { -- dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")"; -+ if(output) { -+ dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name() << ")"; -+ } else { -+ dbg << "KScreen::Output(NULL)"; -+ } - return dbg; - } - - diff --git a/extra/libomxil-bellagio/PKGBUILD b/extra/libomxil-bellagio/PKGBUILD new file mode 100644 index 000000000..66e970a4b --- /dev/null +++ b/extra/libomxil-bellagio/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 212302 2014-05-12 12:09:47Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Fly-away <flyaaway@gmail.com> + +pkgname=libomxil-bellagio +pkgver=0.9.3 +pkgrel=1 +pkgdesc="An opensource implementation of the OpenMAX Integration Layer API" +arch=('i686' 'x86_64') +url="http://omxil.sourceforge.net" +license=('LGPL') +depends=('glibc') +source=("http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%200.9.3/${pkgname}-${pkgver}.tar.gz" + fedora-fixes.patch) +md5sums=('a1de827fdb75c02c84e55f740ca27cb8' + 'c34f9facf0cf26171c81f2fc3d562ec6') + +prepare() { + cd ${srcdir}/${pkgname}-$pkgver + + # Fixes from fedora repo + patch -Np1 -i ../fedora-fixes.patch + autoreconf -fiv +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/${pkgname} + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + diff --git a/extra/libomxil-bellagio/fedora-fixes.patch b/extra/libomxil-bellagio/fedora-fixes.patch new file mode 100644 index 000000000..2ae3c3c87 --- /dev/null +++ b/extra/libomxil-bellagio/fedora-fixes.patch @@ -0,0 +1,199 @@ +When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved. +Link explicitly against omxil-bellagio so that ld.so can find the reference. + +Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> + +--- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 ++++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 +@@ -3,7 +3,7 @@ + omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la + libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h + +-libomxdynamicloader_la_LDFLAGS = ++libomxdynamicloader_la_LDFLAGS = -L$(abs_top_srcdir)/src/.libs -lomxil-bellagio + libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/base \ +Fix dependency issue to allow parallel build + +Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> + +Index: bellagio-0.9.3/src/Makefile.am +=================================================================== +--- bellagio-0.9.3.orig/src/Makefile.am ++++ bellagio-0.9.3/src/Makefile.am +@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist + omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ + -I$(top_srcdir)/include + omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) ++omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la + + lib_LTLIBRARIES = libomxil-bellagio.la + libomxil_bellagio_la_SOURCES = component_loader.h \ +We always access globalComponentList[] at indexComponent=-1 which causes a +segfault. Use i as the index instead. + +Signed-off-by: Qais Yousef <qais.yousef@imgtec.com> + +--- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 ++++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 +@@ -485,7 +485,6 @@ + OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { + omx_base_component_PrivateType* omx_base_component_Private; + int i = 0; +- int indexComponent = -1; + + DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__); + omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate; +@@ -493,16 +492,13 @@ + while(listOfcomponentRegistered[i].component_name != NULL ) { + if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) { + // found component in the list of the resource manager +- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp); +- break; ++ removeElemFromList(&globalComponentList[i], openmaxStandComp); ++ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); ++ return OMX_ErrorNone; + } + i++; + } +- if (indexComponent <0) { +- // No resource to be handled +- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); +- return OMX_ErrorNone; +- } +- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); ++ // No resource to be handled ++ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); + return OMX_ErrorNone; + } + OMX_INDEXTYPE/OMX_INDEXVENDORTYPE in one switch + src/base/omx_base_component.c | 54 ++++++++++++++++++++++------------------- + 1 files changed, 29 insertions(+), 25 deletions(-) +--- a/src/base/omx_base_component.c ++++ a/src/base/omx_base_component.c +@@ -915,14 +915,6 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( + return OMX_ErrorBadParameter; + } + switch(nParamIndex) { +- case OMX_IndexParameterThreadsID: +- if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { +- break; +- } +- threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; +- threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; +- threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; +- break; + case OMX_IndexParamAudioInit: + case OMX_IndexParamVideoInit: + case OMX_IndexParamImageInit: +@@ -988,28 +980,40 @@ OSCL_EXPORT_REF OSCL_EXPORT_REF OMX_ERRORTYPE omx_base_component_GetParameter( + } + } + break; +- case OMX_IndexVendorCompPropTunnelFlags: +- pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; ++ default: ++ /* additional switch statement for extended OMX_INDEXTYPE */ ++ switch((OMX_INDEXVENDORTYPE) nParamIndex) { ++ case OMX_IndexParameterThreadsID: ++ if ((err = checkHeader(ComponentParameterStructure, sizeof(OMX_PARAM_BELLAGIOTHREADS_ID))) != OMX_ErrorNone) { ++ break; ++ } ++ threadID = (OMX_PARAM_BELLAGIOTHREADS_ID *)ComponentParameterStructure; ++ threadID->nThreadBufferMngtID = omx_base_component_Private->bellagioThreads->nThreadBufferMngtID; ++ threadID->nThreadMessageID = omx_base_component_Private->bellagioThreads->nThreadMessageID; ++ break; ++ case OMX_IndexVendorCompPropTunnelFlags: ++ pPropTunnelSetup = (OMX_VENDOR_PROP_TUNNELSETUPTYPE*)ComponentParameterStructure; + +- if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + +- omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { ++ if (pPropTunnelSetup->nPortIndex >= (omx_base_component_Private->sPortTypesParam[OMX_PortDomainAudio].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainVideo].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainImage].nPorts + ++ omx_base_component_Private->sPortTypesParam[OMX_PortDomainOther].nPorts)) { + +- DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", +- __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); ++ DEBUG(DEB_LEV_ERR,"In %s OMX_IndexVendorCompPropTunnelFlags nPortIndex=%d Line=%d \n", ++ __func__,(int)pPropTunnelSetup->nPortIndex,__LINE__); + +- return OMX_ErrorBadPortIndex; +- } ++ return OMX_ErrorBadPortIndex; ++ } + +- pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; ++ pPort = omx_base_component_Private->ports[pPropTunnelSetup->nPortIndex]; + +- pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; +- pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; +- break; +- default: +- err = OMX_ErrorUnsupportedIndex; +- break; ++ pPropTunnelSetup->nTunnelSetup.nTunnelFlags = pPort->nTunnelFlags; ++ pPropTunnelSetup->nTunnelSetup.eSupplier = pPort->eBufferSupplier; ++ break; ++ default: ++ err = OMX_ErrorUnsupportedIndex; ++ break; ++ } + } + DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s for component %p\n", __func__, hComponent); + return err; +diff -up libomxil-bellagio-0.9.3/Makefile.am.nodoc libomxil-bellagio-0.9.3/Makefile.am +--- libomxil-bellagio-0.9.3/Makefile.am.nodoc 2011-01-12 08:53:26.000000000 +0100 ++++ libomxil-bellagio-0.9.3/Makefile.am 2012-04-23 13:46:15.410823381 +0200 +@@ -7,7 +7,6 @@ EXTRA_DIST = libomxil-bellagio.spec + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libomxil-bellagio.pc + +-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ + doc_DATA = README \ + ChangeLog \ + TODO +diff -up libomxil-bellagio-0.9.3/src/omxregister.c.unused libomxil-bellagio-0.9.3/src/omxregister.c +--- libomxil-bellagio-0.9.3/src/omxregister.c.unused 2011-01-12 08:53:26.000000000 +0100 ++++ libomxil-bellagio-0.9.3/src/omxregister.c 2012-12-10 22:02:28.621695659 +0100 +@@ -248,7 +248,15 @@ static int buildComponentsList(FILE* omx + } + fptr(stComponents); + err = fwrite(lib_absolute_path, 1, strlen(lib_absolute_path), omxregistryfp); +- err = fwrite("\n", 1, 1, omxregistryfp); ++ if (err != strlen(lib_absolute_path)) { ++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(lib_absolute_path), fileno(omxregistryfp)); ++ continue; ++ } ++ err = fwrite("\n", 1, strlen(buffer), omxregistryfp); ++ if (err != strlen(buffer)) { ++ DEBUG(DEB_LEV_ERR, "Failed to write %zu bytes to fd %d\n", strlen(buffer), fileno(omxregistryfp)); ++ continue; ++ } + + + for (i = 0; i<num_of_comp; i++) { +--- libomxil-bellagio-0.9.3/include/OMX_Types.h.orig 2011-01-12 08:53:26.000000000 +0100 ++++ libomxil-bellagio-0.9.3/include/OMX_Types.h 2013-02-25 09:53:55.000000000 +0100 +@@ -314,6 +314,18 @@ + * platform & operating specific object used to reference the window */ + typedef void* OMX_NATIVE_WINDOWTYPE; + ++ ++/** Define the OMX IL version that corresponds to this set of header files. ++ * We also define a combined version that can be used to write or compare ++ * values of the 32bit nVersion field, assuming a little endian architecture */ ++#define OMX_VERSION_MAJOR 1 ++#define OMX_VERSION_MINOR 1 ++#define OMX_VERSION_REVISION 2 ++#define OMX_VERSION_STEP 0 ++ ++#define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR) ++ ++ + /** The OMX_VERSIONTYPE union is used to specify the version for + a structure or component. For a component, the version is entirely + specified by the component vendor. Components doing the same function diff --git a/extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch b/extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch new file mode 100644 index 000000000..90a236816 --- /dev/null +++ b/extra/libxcb/Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch @@ -0,0 +1,121 @@ +From be0fe56c3bcad5124dcc6c47a2fad01acd16f71a Mon Sep 17 00:00:00 2001 +From: Keith Packard <keithp@keithp.com> +Date: Mon, 23 Dec 2013 21:15:20 -0800 +Subject: [PATCH] Ensure xcb owns socket and no other threads are writing + before send_request + +send_request may only write to out.queue if no other thread is busy +writing to the network (as that thread may be writing from out.queue). + +send_request may only allocate request sequence numbers if XCB owns +the socket. + +Therefore, send_request must make sure that both conditions are true +when it holds iolock, which can only be done by looping until both +conditions are true without having dropped the lock waiting for the +second condition. + +We choose to get the socket back from Xlib first as get_socket_back +has a complicated test and checking for other threads writing is a +simple in-lined check. + +This also changes the sequence number checks (64k requests with no +reply, 4M request wrapping) to ensure that both conditions are true +before queueing the request. + +Signed-off-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Uli Schlachter <psychon@znc.in> +--- + src/xcb_out.c | 57 ++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 40 insertions(+), 17 deletions(-) + +diff --git a/src/xcb_out.c b/src/xcb_out.c +index 18bb5f9..dc42954 100644 +--- a/src/xcb_out.c ++++ b/src/xcb_out.c +@@ -103,6 +103,33 @@ static void get_socket_back(xcb_connection_t *c) + _xcb_in_replies_done(c); + } + ++static void prepare_socket_request(xcb_connection_t *c) ++{ ++ /* We're about to append data to out.queue, so we need to ++ * atomically test for an external socket owner *and* some other ++ * thread currently writing. ++ * ++ * If we have an external socket owner, we have to get the socket back ++ * before we can use it again. ++ * ++ * If some other thread is writing to the socket, we assume it's ++ * writing from out.queue, and so we can't stick data there. ++ * ++ * We satisfy this condition by first calling get_socket_back ++ * (which may drop the lock, but will return when XCB owns the ++ * socket again) and then checking for another writing thread and ++ * escaping the loop if we're ready to go. ++ */ ++ for (;;) { ++ if(c->has_error) ++ return; ++ get_socket_back(c); ++ if (!c->out.writing) ++ break; ++ pthread_cond_wait(&c->out.cond, &c->iolock); ++ } ++} ++ + /* Public interface */ + + void xcb_prefetch_maximum_request_length(xcb_connection_t *c) +@@ -236,24 +263,23 @@ unsigned int xcb_send_request(xcb_connection_t *c, int flags, struct iovec *vect + + /* get a sequence number and arrange for delivery. */ + pthread_mutex_lock(&c->iolock); +- /* wait for other writing threads to get out of my way. */ +- while(c->out.writing) +- pthread_cond_wait(&c->out.cond, &c->iolock); +- get_socket_back(c); ++ ++ prepare_socket_request(c); + + /* send GetInputFocus (sync_req) when 64k-2 requests have been sent without +- * a reply. */ +- if(req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) +- send_sync(c); +- /* Also send sync_req (could use NoOp) at 32-bit wrap to avoid having ++ * a reply. ++ * Also send sync_req (could use NoOp) at 32-bit wrap to avoid having + * applications see sequence 0 as that is used to indicate +- * an error in sending the request */ +- if((unsigned int) (c->out.request + 1) == 0) ++ * an error in sending the request ++ */ ++ ++ while ((req->isvoid && c->out.request == c->in.request_expected + (1 << 16) - 2) || ++ (unsigned int) (c->out.request + 1) == 0) ++ { + send_sync(c); ++ prepare_socket_request(c); ++ } + +- /* The above send_sync calls could drop the I/O lock, but this +- * thread will still exclude any other thread that tries to write, +- * so the sequence number postconditions still hold. */ + send_request(c, req->isvoid, workaround, flags, vector, veclen); + request = c->has_error ? 0 : c->out.request; + pthread_mutex_unlock(&c->iolock); +@@ -373,10 +399,7 @@ int _xcb_out_send(xcb_connection_t *c, struct iovec *vector, int count) + + void _xcb_out_send_sync(xcb_connection_t *c) + { +- /* wait for other writing threads to get out of my way. */ +- while(c->out.writing) +- pthread_cond_wait(&c->out.cond, &c->iolock); +- get_socket_back(c); ++ prepare_socket_request(c); + send_sync(c); + } + +-- +1.9.2 + diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 523084ba5..a52a31b5c 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 202710 2013-12-25 21:25:44Z andyrtr $ +# $Id: PKGBUILD 212300 2014-05-12 07:59:16Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=('i686' 'x86_64') url="http://xcb.freedesktop.org/" @@ -13,14 +13,19 @@ depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau') makedepends=('pkgconfig' 'libxslt' 'python') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) + libxcb-1.1-no-pthread-stubs.patch + Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch) sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5' - '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356') + '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356' + '47de1025bb16446b9e69ff7b6b262a0a1af957d350afe897421b9105c89befeb') prepare() { cd "$pkgname-$pkgver" patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch autoreconf -vfi + + # fix FS#40289 merged upstream + patch -Np1 -i ../Ensure-xcb-owns-socket-and-no-other-threads-are-writ.patch } build() { diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 5937f6fe5..43a6ac263 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 210174 2014-04-10 16:28:59Z bisson $ +# $Id: PKGBUILD 212312 2014-05-12 17:53:26Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.18.10 +pkgver=0.18.11 pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' @@ -18,7 +18,7 @@ makedepends=('doxygen') source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig} 'tmpfiles.d' 'conf') -sha1sums=('0923318cfda033bb4f89c219e6effa9d5b330c1d' 'SKIP' +sha1sums=('34585fcb49107508b198798b5657df07c86157f0' 'SKIP' 'f4d5922abb69abb739542d8e93f4dfd748acdad7' '67c145c046cddd885630d72ce8ebe71f8321ff3b') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index 7cf976226..735ec5fd9 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 205927 2014-02-14 03:29:23Z eric $ -# Maintainer: +# $Id: PKGBUILD 212310 2014-05-12 17:45:02Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=perl-net-dns -pkgver=0.74 +pkgver=0.75 pkgrel=1 pkgdesc="Perl Module: Interface to the DNS resolver" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('perl-digest-hmac' 'perl-net-ip' 'perl') checkdepends=('perl-test-pod') options=('!emptydirs') source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz) -sha1sums=('1b183448d22ea49bca0c4b85c365af527101a2ae') +sha1sums=('e57d08cfe61962d9de3cd78ec705a954e05f36bd') build() { cd Net-DNS-${pkgver} diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index f53743521..619858837 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 205904 2014-02-13 16:52:19Z andyrtr $ +# $Id: PKGBUILD 212318 2014-05-12 18:20:14Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,19 +7,19 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.11 +_dcpkgver=2.2.13 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.2 -pkgrel=6 +pkgrel=7 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64') url="http://pigeonhole.dovecot.org/" license=('LGPL') depends=('dovecot='$_dcpkgver) conflicts=('dovecot-sieve' 'pigeonhole-hg') -source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig} +source=("http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") sha256sums=('0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13' 'SKIP' |