diff options
26 files changed, 205 insertions, 867 deletions
diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index d1ac36dd1..756f7921a 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93867 2013-07-11 15:30:19Z alucryd $ +# $Id: PKGBUILD 98552 2013-10-13 10:52:56Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: zhuqin <zhuqin83@gmail.com> @@ -6,8 +6,8 @@ # Contributor: snoopy33 <snoopy33@no-log.org> pkgname=cairo-dock-plugins -pkgver=3.2.1 -pkgrel=4 +pkgver=3.3.1 +pkgrel=1 pkgdesc="Plugins for Cairo-Dock" url="https://launchpad.net/cairo-dock" license=('GPL') @@ -34,16 +34,8 @@ optdepends=('alsa-lib: Sound Control, Sound Effects applets' 'vte3: Terminal applet' 'webkitgtk3: Weblets applet') options=('!libtool') -source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" - 'python.patch') -sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01' - 'f33ff6f2b93936c5050ae369d1b08c41bd17f5a2fb4ce46da5436d78d0b3fa8e') - -prepare() { - cd ${pkgname}-${pkgver} - - patch -Np1 -i ../python.patch -} +source=("http://launchpad.net/cairo-dock-plug-ins/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('21d41ffeac6848dced05280641d764709445cad4c4e19082404b74ecd6436fd4') build() { cd ${pkgname}-${pkgver} @@ -53,7 +45,7 @@ build() { fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' make } diff --git a/community/cairo-dock-plugins/python.patch b/community/cairo-dock-plugins/python.patch deleted file mode 100644 index 413ff0fa9..000000000 --- a/community/cairo-dock-plugins/python.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -rupN cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/bash/BashInstall.cmake.in cairo-dock-plugins-3.2.1/Dbus/interfaces/bash/BashInstall.cmake.in ---- cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/bash/BashInstall.cmake.in 2013-07-11 17:09:45.165345967 +0200 -+++ cairo-dock-plugins-3.2.1/Dbus/interfaces/bash/BashInstall.cmake.in 2013-07-11 17:10:22.238469121 +0200 -@@ -2,7 +2,7 @@ IF ("@PYTHON2_FOUND@" STREQUAL "TRUE") - IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS - "setup.py" "install" -- "--prefix=${CMAKE_INSTALL_PREFIX}" -+ "--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}" - "@DEBIAN_INSTALL_LAYOUT@") - ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS -@@ -20,7 +20,7 @@ IF ("@PYTHON3_FOUND@" STREQUAL "TRUE") - IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS - "setup.py" "install" -- "--prefix=${CMAKE_INSTALL_PREFIX}" -+ "--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}" - "@DEBIAN_INSTALL_LAYOUT@") - ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS -diff -rupN cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/python/PythonInstall.cmake.in cairo-dock-plugins-3.2.1/Dbus/interfaces/python/PythonInstall.cmake.in ---- cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/python/PythonInstall.cmake.in 2013-07-11 17:09:45.162012653 +0200 -+++ cairo-dock-plugins-3.2.1/Dbus/interfaces/python/PythonInstall.cmake.in 2013-07-11 17:10:56.581607933 +0200 -@@ -2,7 +2,7 @@ if ("@PYTHON2_FOUND@" STREQUAL "TRUE") - IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS - "setup.py" "install" -- "--prefix=${CMAKE_INSTALL_PREFIX}" -+ "--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}" - "@DEBIAN_INSTALL_LAYOUT@") - ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS -@@ -20,7 +20,7 @@ if ("@PYTHON3_FOUND@" STREQUAL "TRUE") - IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS - "setup.py" "install" -- "--prefix=${CMAKE_INSTALL_PREFIX}" -+ "--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}" - "@DEBIAN_INSTALL_LAYOUT@") - ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS -@@ -32,4 +32,4 @@ if ("@PYTHON3_FOUND@" STREQUAL "TRUE") - "setup.py" "install" - "--root=@ROOT_PREFIX@") - ENDIF() --ENDIF() -\ No newline at end of file -+ENDIF() diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index 8f910fe66..e3968e4b2 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88925 2013-04-24 21:20:34Z alucryd $ +# $Id: PKGBUILD 98550 2013-10-13 10:48:27Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Tofe <chris.chapuis@gmail.com> # Contributor: erm67 <erm67@yahoo.it> pkgname=cairo-dock -pkgver=3.2.1 -pkgrel=3 +pkgver=3.3.1 +pkgrel=1 pkgdesc="Light eye-candy fully themable animated dock" arch=('i686' 'x86_64') url="https://launchpad.net/cairo-dock-core" @@ -14,30 +14,23 @@ depends=('curl' 'dbus-glib' 'gtk3' 'librsvg') makedepends=('cmake') optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock') options=('!libtool') -source=("http://launchpad.net/${pkgname}-core/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" 'gldit-rpath.patch') -sha256sums=('441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543' - '5a5fbc67aaa210387ef4410701747fe741942c99c4bd84ae771b96a3bdd1c4cc') - -prepare() { - cd "${srcdir}"/${pkgname}-${pkgver} - - patch -Np1 -i ../gldit-rpath.patch -} +source=("http://launchpad.net/${pkgname}-core/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") +sha256sums=('4d7c5c58606ac1e22dcbe6d80404e38d747c2c846102df09f25d5b97943f0459') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} if [[ -d build ]]; then rm -rf build fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' make } package() { - cd "${srcdir}"/${pkgname}-${pkgver}/build + cd ${pkgname}-${pkgver}/build make DESTDIR="${pkgdir}" install } diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD index e0813a136..be0e0130a 100644 --- a/community/sleuthkit/PKGBUILD +++ b/community/sleuthkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86192 2013-03-12 21:51:33Z jlichtblau $ +# $Id: PKGBUILD 98535 2013-10-13 00:21:07Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=sleuthkit -pkgver=4.0.2 +pkgver=4.1.2 pkgrel=1 pkgdesc='File system and media management forensic analysis tools' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('perl') options=('!libtool') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('112f80fbc6a868c18c7a924f756b35c79eed9d0cc8923a4f973646f00e546e62') +sha256sums=('58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3') build() { cd ${pkgname}-${pkgver} diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog index 6ab1ba102..7c9c63ae0 100644 --- a/community/sleuthkit/sleuthkit.changelog +++ b/community/sleuthkit/sleuthkit.changelog @@ -1,3 +1,6 @@ +2013-10-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sleuthkit 4.1.2-1 + 2013-03-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * sleuthkit 4.0.2-1 diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 1b18beed2..461151d3c 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94994 2013-08-02 22:19:28Z cinelli $ +# $Id: PKGBUILD 98538 2013-10-13 01:30:22Z cinelli $ #Maintainer: Federico Cinelli <cinelli@aur.archlinux.org> pkgname=texmaker -pkgver=4.0.3 +pkgver=4.0.4 pkgrel=1 pkgdesc='Free cross-platform LaTeX editor' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('ghostscript: LaTeX to HTML conversion command' 'poppler: PDF rendering support') install="$pkgname.install" source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('fe33120eef6d6ae6dcbf949d5d5c7a4f') +md5sums=('5abe8618367bd7923f792378751648f7') build() { cd "$pkgname-$pkgver" diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD index 1d4e62015..558234af2 100644 --- a/extra/bijiben/PKGBUILD +++ b/extra/bijiben/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196018 2013-10-07 11:50:31Z jgc $ +# $Id: PKGBUILD 196446 2013-10-13 21:34:11Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=bijiben -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Write out notes, every detail matters" arch=(i686 x86_64) @@ -11,9 +11,10 @@ license=(GPL) depends=(tracker clutter-gtk zeitgeist webkitgtk hicolor-icon-theme desktop-file-utils gnome-online-accounts) makedepends=(intltool itstool) options=(!emptydirs) +groups=(gnome-extra) install=bijiben.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('82817151d7a69190944447bcc7cd12306160c2edce2d0e2ddbfd15ae2d2a6d10') +sha256sums=('ad32057baa58bf236e8f04cf7746e0d917927f8af5c49cc5a0910fc0078f775c') build() { cd $pkgname-$pkgver diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD new file mode 100644 index 000000000..f9f23f615 --- /dev/null +++ b/extra/claws-mail/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 196416 2013-10-13 09:18:09Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=claws-mail +pkgver=3.9.2 +pkgrel=4 +pkgdesc="A GTK+ based e-mail client." +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.claws-mail.org" +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' + 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' + # dependencies for plugins + 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') + #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +optdepends=('python2: needed for some tools and python plugin' + 'perl: needed for some tools and perl plugin' + 'spamassassin: adds support for spamfiltering' + 'bogofilter: adds support for spamfiltering' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin and various other plugins' + 'libytnef: for tnef_parse plugin' + 'webkitgtk2: for the fancy webkit html plugin' + 'libsoup: for the fancy webkit html plugin' + 'libgdata: for gdata plugin' + 'poppler-glib: for pdf viewer plugin' + 'ghostscript: for pdf viewer plugin') +replaces=('sylpheed-claws' 'claws-mail-extra-plugins') +conflicts=('claws-mail-extra-plugins') +provides=('claws') +options=(!libtool) +install=claws-mail.install +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('90de2a265e65fbd9dffdbf428bb0ee28' + 'SKIP') + +build() { + cd ${pkgname}-${pkgver} + + # fixes for python2 + export PYTHON="/usr/bin/python2" + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py + sed -i 's:python -c:python2 -c:g' configure + + ./configure --prefix=/usr --disable-static \ + --enable-enchant \ + --enable-gnutls \ + --enable-ldap \ + --enable-crash-dialog \ + --enable-pgpmime-plugin \ + --enable-spamassassin-plugin \ + --enable-bogofilter-plugin \ + #--help + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # build and install extra tools + cd tools + make + # all executables and .conf files ; only top directory + find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do + install -D -m755 ${i} \ + ${pkgdir}/usr/lib/claws-mail/tools/${i} + done +} diff --git a/nonprism/claws-mail-libre-nonprism/claws-mail.install b/extra/claws-mail/claws-mail.install index 4d2f155d4..4d2f155d4 100644 --- a/nonprism/claws-mail-libre-nonprism/claws-mail.install +++ b/extra/claws-mail/claws-mail.install diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 0a07a2a2e..431a6cb96 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196034 2013-10-07 11:50:48Z jgc $ +# $Id: PKGBUILD 196437 2013-10-13 19:32:48Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=(i686 x86_64) @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27') +sha256sums=('a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution-data-server/fix-google-2fa-1.patch b/extra/evolution-data-server/fix-google-2fa-1.patch deleted file mode 100644 index 530996898..000000000 --- a/extra/evolution-data-server/fix-google-2fa-1.patch +++ /dev/null @@ -1,402 +0,0 @@ -From fa0d18fcf2d8084d2a41f24f50f689eed8e3e241 Mon Sep 17 00:00:00 2001 -From: Matthew Barnes <mbarnes@redhat.com> -Date: Tue, 09 Jul 2013 18:23:04 +0000 -Subject: Add ESoupAuthBearer. - -SoupAuth subclass for use with OAuth 2.0 HTTP authentication. - -See http://tools.ietf.org/html/rfc6750 - -EBackends should use e_source_get_oauth2_access_token() to obtain -the access token and token expiry for an ESource, then pass them to -e_soup_auth_bearer_set_access_token(). ---- -diff --git a/docs/reference/libebackend/libebackend-docs.xml b/docs/reference/libebackend/libebackend-docs.xml -index fa9ab92..f54d3d6 100644 ---- a/docs/reference/libebackend/libebackend-docs.xml -+++ b/docs/reference/libebackend/libebackend-docs.xml -@@ -34,6 +34,7 @@ - <title>Miscellaneous Utilities</title> - <xi:include href="xml/e-file-cache.xml"/> - <xi:include href="xml/e-db3-utils.xml"/> -+ <xi:include href="xml/e-soup-auth-bearer.xml"/> - <xi:include href="xml/e-sqlite3-vfs.xml"/> - <xi:include href="xml/e-user-prompter.xml"/> - <xi:include href="xml/e-user-prompter-server.xml"/> -diff --git a/docs/reference/libebackend/libebackend-sections.txt b/docs/reference/libebackend/libebackend-sections.txt -index 6c604bf..189f002 100644 ---- a/docs/reference/libebackend/libebackend-sections.txt -+++ b/docs/reference/libebackend/libebackend-sections.txt -@@ -397,6 +397,24 @@ EServerSideSourcePrivate - </SECTION> - - <SECTION> -+<FILE>e-soup-auth-bearer</FILE> -+<TITLE>ESoupAuthBearer</TITLE> -+ESoupAuthBearer -+e_soup_auth_bearer_set_access_token -+<SUBSECTION Standard> -+E_SOUP_AUTH_BEARER -+E_IS_SOUP_AUTH_BEARER -+E_TYPE_SOUP_AUTH_BEARER -+E_SOUP_AUTH_BEARER_CLASS -+E_IS_SOUP_AUTH_BEARER_CLASS -+E_SOUP_AUTH_BEARER_GET_CLASS -+ESoupAuthBearerClass -+e_soup_auth_bearer_get_type -+<SUBSECTION Private> -+ESoupAuthBearerPrivate -+</SECTION> -+ -+<SECTION> - <FILE>e-source-registry-server</FILE> - <TITLE>ESourceRegistryServer</TITLE> - E_SOURCE_REGISTRY_SERVER_OBJECT_PATH -diff --git a/docs/reference/libebackend/libebackend.types b/docs/reference/libebackend/libebackend.types -index aeb38dc..1d7fe96 100644 ---- a/docs/reference/libebackend/libebackend.types -+++ b/docs/reference/libebackend/libebackend.types -@@ -15,6 +15,7 @@ e_module_get_type - e_oauth2_support_get_type - e_offline_listener_get_type - e_server_side_source_get_type -+e_soup_auth_bearer_get_type - e_source_registry_server_get_type - e_user_prompter_get_type - e_user_prompter_server_get_type -diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am -index c77b470..783732e 100644 ---- a/libebackend/Makefile.am -+++ b/libebackend/Makefile.am -@@ -35,6 +35,7 @@ libebackend_1_2_la_CPPFLAGS = \ - $(E_BACKEND_CFLAGS) \ - $(GCR_BASE_CFLAGS) \ - $(GIO_UNIX_CFLAGS) \ -+ $(SOUP_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - $(NULL) - -@@ -56,6 +57,7 @@ libebackend_1_2_la_SOURCES = \ - e-db3-utils.c \ - e-module.c \ - e-server-side-source.c \ -+ e-soup-auth-bearer.c \ - e-source-registry-server.c \ - e-sqlite3-vfs.c \ - e-user-prompter.c \ -@@ -71,6 +73,7 @@ libebackend_1_2_la_LIBADD = \ - $(SQLITE3_LIBS) \ - $(GCR_BASE_LIBS) \ - $(GIO_UNIX_LIBS) \ -+ $(SOUP_LIBS) \ - $(DB_LIBS) - - libebackend_1_2_la_LDFLAGS = \ -@@ -100,6 +103,7 @@ libebackendinclude_HEADERS = \ - e-dbhash.h \ - e-module.h \ - e-server-side-source.h \ -+ e-soup-auth-bearer.h \ - e-source-registry-server.h \ - e-sqlite3-vfs.h \ - e-user-prompter.h \ -diff --git a/libebackend/e-soup-auth-bearer.c b/libebackend/e-soup-auth-bearer.c -new file mode 100644 -index 0000000..1d5f804 ---- /dev/null -+++ b/libebackend/e-soup-auth-bearer.c -@@ -0,0 +1,196 @@ -+/* -+ * e-soup-auth-bearer.c -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) version 3. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with the program; if not, see <http://www.gnu.org/licenses/> -+ * -+ */ -+ -+/** -+ * SECTION: e-soup-auth-bearer -+ * @include: libebackend/libebackend.h -+ * @short_description: OAuth 2.0 support for libsoup -+ * -+ * #ESoupAuthBearer adds libsoup support for the use of bearer tokens in -+ * HTTP requests to access OAuth 2.0 protected resources, as defined in -+ * <ulink url="http://tools.ietf.org/html/rfc6750">RFC 6750</ulink>. -+ * -+ * An #EBackend should integrate #ESoupAuthBearer first by adding it as a -+ * feature to a #SoupSession's #SoupAuthManager, then from a #SoupSession -+ * #SoupSession::authenticate handler call e_source_get_oauth2_access_token() -+ * and pass the results to e_soup_auth_bearer_set_access_token(). -+ **/ -+ -+#include "e-soup-auth-bearer.h" -+ -+#include <time.h> -+ -+#define E_SOUP_AUTH_BEARER_GET_PRIVATE(obj) \ -+ (G_TYPE_INSTANCE_GET_PRIVATE \ -+ ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerPrivate)) -+ -+#define AUTH_STRENGTH 1 -+ -+#define EXPIRY_INVALID ((time_t) -1) -+ -+struct _ESoupAuthBearerPrivate { -+ gchar *access_token; -+ time_t expiry; -+}; -+ -+G_DEFINE_TYPE ( -+ ESoupAuthBearer, -+ e_soup_auth_bearer, -+ SOUP_TYPE_AUTH) -+ -+static gboolean -+e_soup_auth_bearer_is_expired (ESoupAuthBearer *bearer) -+{ -+ gboolean expired = FALSE; -+ -+ if (bearer->priv->expiry != EXPIRY_INVALID) -+ expired = (bearer->priv->expiry < time (NULL)); -+ -+ return expired; -+} -+ -+static void -+e_soup_auth_bearer_finalize (GObject *object) -+{ -+ ESoupAuthBearerPrivate *priv; -+ -+ priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (object); -+ -+ g_free (priv->access_token); -+ -+ /* Chain up to parent's finalize() method. */ -+ G_OBJECT_CLASS (e_soup_auth_bearer_parent_class)->finalize (object); -+} -+ -+static gboolean -+e_soup_auth_bearer_update (SoupAuth *auth, -+ SoupMessage *message, -+ GHashTable *auth_header) -+{ -+ /* XXX Not sure what to do here. Discard the access token? */ -+ -+ return TRUE; -+} -+ -+static GSList * -+e_soup_auth_bearer_get_protection_space (SoupAuth *auth, -+ SoupURI *source_uri) -+{ -+ /* XXX Not sure what to do here. Need to return something. */ -+ -+ return g_slist_prepend (NULL, g_strdup ("")); -+} -+ -+static gboolean -+e_soup_auth_bearer_is_authenticated (SoupAuth *auth) -+{ -+ ESoupAuthBearer *bearer; -+ gboolean authenticated = FALSE; -+ -+ bearer = E_SOUP_AUTH_BEARER (auth); -+ -+ if (!e_soup_auth_bearer_is_expired (bearer)) -+ authenticated = (bearer->priv->access_token != NULL); -+ -+ return authenticated; -+} -+ -+static gchar * -+e_soup_auth_bearer_get_authorization (SoupAuth *auth, -+ SoupMessage *message) -+{ -+ ESoupAuthBearer *bearer; -+ -+ bearer = E_SOUP_AUTH_BEARER (auth); -+ -+ return g_strdup_printf ("Bearer %s", bearer->priv->access_token); -+} -+ -+static void -+e_soup_auth_bearer_class_init (ESoupAuthBearerClass *class) -+{ -+ GObjectClass *object_class; -+ SoupAuthClass *auth_class; -+ -+ g_type_class_add_private (class, sizeof (ESoupAuthBearerPrivate)); -+ -+ /* Keep the "e" prefix on private methods -+ * so we don't step on libsoup's namespace. */ -+ -+ object_class = G_OBJECT_CLASS (class); -+ object_class->finalize = e_soup_auth_bearer_finalize; -+ -+ auth_class = SOUP_AUTH_CLASS (class); -+ auth_class->scheme_name = "Bearer"; -+ auth_class->strength = AUTH_STRENGTH; -+ auth_class->update = e_soup_auth_bearer_update; -+ auth_class->get_protection_space = e_soup_auth_bearer_get_protection_space; -+ auth_class->is_authenticated = e_soup_auth_bearer_is_authenticated; -+ auth_class->get_authorization = e_soup_auth_bearer_get_authorization; -+} -+ -+static void -+e_soup_auth_bearer_init (ESoupAuthBearer *bearer) -+{ -+ bearer->priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (bearer); -+ bearer->priv->expiry = EXPIRY_INVALID; -+} -+ -+/** -+ * e_soup_auth_bearer_set_access_token: -+ * @bearer: an #ESoupAuthBearer -+ * @access_token: an OAuth 2.0 access token -+ * @expires_in_seconds: expiry for @access_token, or 0 if unknown -+ * -+ * This function is analogous to soup_auth_authenticate() for "Basic" HTTP -+ * authentication, except it takes an OAuth 2.0 access token instead of a -+ * username and password. -+ * -+ * If @expires_in_seconds is greater than zero, soup_auth_is_authenticated() -+ * will return %FALSE after the given number of seconds have elapsed. -+ * -+ * Since: 3.10 -+ **/ -+void -+e_soup_auth_bearer_set_access_token (ESoupAuthBearer *bearer, -+ const gchar *access_token, -+ gint expires_in_seconds) -+{ -+ gboolean was_authenticated; -+ gboolean now_authenticated; -+ -+ g_return_if_fail (E_IS_SOUP_AUTH_BEARER (bearer)); -+ -+ was_authenticated = soup_auth_is_authenticated (SOUP_AUTH (bearer)); -+ -+ g_free (bearer->priv->access_token); -+ bearer->priv->access_token = g_strdup (access_token); -+ -+ if (expires_in_seconds > 0) -+ bearer->priv->expiry = time (NULL) + expires_in_seconds; -+ else -+ bearer->priv->expiry = EXPIRY_INVALID; -+ -+ now_authenticated = soup_auth_is_authenticated (SOUP_AUTH (bearer)); -+ -+ if (was_authenticated != now_authenticated) -+ g_object_notify ( -+ G_OBJECT (bearer), -+ SOUP_AUTH_IS_AUTHENTICATED); -+} -+ -diff --git a/libebackend/e-soup-auth-bearer.h b/libebackend/e-soup-auth-bearer.h -new file mode 100644 -index 0000000..83746a4 ---- /dev/null -+++ b/libebackend/e-soup-auth-bearer.h -@@ -0,0 +1,79 @@ -+/* -+ * e-soup-auth-bearer.h -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) version 3. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with the program; if not, see <http://www.gnu.org/licenses/> -+ * -+ */ -+ -+#if !defined (__LIBEBACKEND_H_INSIDE__) && !defined (LIBEBACKEND_COMPILATION) -+#error "Only <libebackend/libebackend.h> should be included directly." -+#endif -+ -+#ifndef E_SOUP_AUTH_BEARER_H -+#define E_SOUP_AUTH_BEARER_H -+ -+#include <libsoup/soup.h> -+ -+/* Standard GObject macros */ -+#define E_TYPE_SOUP_AUTH_BEARER \ -+ (e_soup_auth_bearer_get_type ()) -+#define E_SOUP_AUTH_BEARER(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST \ -+ ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearer)) -+#define E_SOUP_AUTH_BEARER_CLASS(cls) \ -+ (G_TYPE_CHECK_CLASS_CAST \ -+ ((cls), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerClass)) -+#define E_IS_SOUP_AUTH_BEARER(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE \ -+ ((obj), E_TYPE_SOUP_AUTH_BEARER)) -+#define E_IS_SOUP_AUTH_BEARER_CLASS(cls) \ -+ (G_TYPE_CHECK_CLASS_TYPE \ -+ ((cls), E_TYPE_SOUP_AUTH_BEARER)) -+#define E_SOUP_AUTH_BEARER_GET_CLASS(obj) \ -+ (G_TYPE_INSTANCE_GET_CLASS \ -+ ((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerClass)) -+ -+G_BEGIN_DECLS -+ -+typedef struct _ESoupAuthBearer ESoupAuthBearer; -+typedef struct _ESoupAuthBearerClass ESoupAuthBearerClass; -+typedef struct _ESoupAuthBearerPrivate ESoupAuthBearerPrivate; -+ -+/** -+ * ESoupAuthBearer: -+ * -+ * Contains only private data that should be read and manipulated using the -+ * functions below. -+ * -+ * Since: 3.10 -+ **/ -+struct _ESoupAuthBearer { -+ SoupAuth parent; -+ ESoupAuthBearerPrivate *priv; -+}; -+ -+struct _ESoupAuthBearerClass { -+ SoupAuthClass parent_class; -+}; -+ -+GType e_soup_auth_bearer_get_type (void) G_GNUC_CONST; -+void e_soup_auth_bearer_set_access_token -+ (ESoupAuthBearer *bearer, -+ const gchar *access_token, -+ gint expires_in_seconds); -+ -+G_END_DECLS -+ -+#endif /* E_SOUP_AUTH_BEARER_H */ -+ -diff --git a/libebackend/libebackend.h b/libebackend/libebackend.h -index f7f0157..0aac5d4 100644 ---- a/libebackend/libebackend.h -+++ b/libebackend/libebackend.h -@@ -42,6 +42,7 @@ - #include <libebackend/e-oauth2-support.h> - #include <libebackend/e-offline-listener.h> - #include <libebackend/e-server-side-source.h> -+#include <libebackend/e-soup-auth-bearer.h> - #include <libebackend/e-source-registry-server.h> - #include <libebackend/e-sqlite3-vfs.h> - #include <libebackend/e-user-prompter.h> - diff --git a/extra/evolution-data-server/fix-google-2fa-2.patch b/extra/evolution-data-server/fix-google-2fa-2.patch deleted file mode 100644 index d178cd0af..000000000 --- a/extra/evolution-data-server/fix-google-2fa-2.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 54e876d3fc25ec59c58beda915a8c9d1f8d5f101 Mon Sep 17 00:00:00 2001 -From: Matthew Barnes <mbarnes@redhat.com> -Date: Tue, 09 Jul 2013 21:06:16 +0000 -Subject: CalDAV: Add support for OAuth 2.0 authentication. - ---- -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index 58c70b6..58f0654 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -968,6 +968,32 @@ parse_propfind_response (SoupMessage *message, - /* Authentication helpers for libsoup */ - - static void -+soup_authenticate_bearer (SoupSession *session, -+ SoupMessage *message, -+ SoupAuth *auth, -+ ESource *source) -+{ -+ gchar *access_token = NULL; -+ gint expires_in_seconds = -1; -+ GError *local_error = NULL; -+ -+ e_source_get_oauth2_access_token_sync ( -+ source, NULL, &access_token, -+ &expires_in_seconds, &local_error); -+ -+ e_soup_auth_bearer_set_access_token ( -+ E_SOUP_AUTH_BEARER (auth), -+ access_token, expires_in_seconds); -+ -+ if (local_error != NULL) { -+ g_warning ("%s: %s", G_STRFUNC, local_error->message); -+ g_error_free (local_error); -+ } -+ -+ g_free (access_token); -+} -+ -+static void - soup_authenticate (SoupSession *session, - SoupMessage *msg, - SoupAuth *auth, -@@ -985,8 +1011,14 @@ soup_authenticate (SoupSession *session, - extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; - auth_extension = e_source_get_extension (source, extension_name); - -+ if (retrying) -+ return; -+ -+ if (E_IS_SOUP_AUTH_BEARER (auth)) { -+ soup_authenticate_bearer (session, msg, auth, source); -+ - /* do not send same password twice, but keep it for later use */ -- if (!retrying && cbdav->priv->password != NULL) { -+ } else if (cbdav->priv->password != NULL) { - gchar *user; - - user = e_source_authentication_dup_user (auth_extension); -@@ -5194,6 +5226,8 @@ cal_backend_caldav_constructed (GObject *object) - static void - e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) - { -+ SoupSessionFeature *feature; -+ - cbdav->priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav); - cbdav->priv->session = soup_session_sync_new (); - g_object_set ( -@@ -5203,6 +5237,16 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav) - SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, - NULL); - -+ /* XXX SoupAuthManager is public API as of libsoup 2.42, but -+ * this isn't worth bumping our libsoup requirement over. -+ * So get the SoupAuthManager GType by its type name. */ -+ feature = soup_session_get_feature ( -+ cbdav->priv->session, -+ g_type_from_name ("SoupAuthManager")); -+ -+ /* Add the "Bearer" auth type to support OAuth 2.0. */ -+ soup_session_feature_add_feature (feature, E_TYPE_SOUP_AUTH_BEARER); -+ - cbdav->priv->proxy = e_proxy_new (); - e_proxy_setup_proxy (cbdav->priv->proxy); - g_signal_connect (cbdav->priv->proxy, "changed", G_CALLBACK (proxy_settings_changed), cbdav->priv); - diff --git a/extra/evolution-data-server/fix-google-2fa-3.patch b/extra/evolution-data-server/fix-google-2fa-3.patch deleted file mode 100644 index a5c6ca324..000000000 --- a/extra/evolution-data-server/fix-google-2fa-3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From cc9fb7d15ce3983fc36487d2856e5fd14b341725 Mon Sep 17 00:00:00 2001 -From: Matthew Barnes <mbarnes@redhat.com> -Date: Tue, 09 Jul 2013 15:49:09 +0000 -Subject: google: Minor module cleanups. - ---- -diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c -index d5684bb..cbd7bd2 100644 ---- a/modules/google-backend/module-google-backend.c -+++ b/modules/google-backend/module-google-backend.c -@@ -100,19 +100,17 @@ google_backend_contacts_update_auth_method (ESource *source) - EOAuth2Support *oauth2_support; - ESourceAuthentication *extension; - const gchar *extension_name; -- -- extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; -- extension = e_source_get_extension (source, extension_name); -+ const gchar *method; - - oauth2_support = e_server_side_source_ref_oauth2_support ( - E_SERVER_SIDE_SOURCE (source)); -- if (oauth2_support != NULL) { -- e_source_authentication_set_method (extension, "OAuth2"); -- g_object_unref (oauth2_support); -- return; -- } - -- e_source_authentication_set_method (extension, "ClientLogin"); -+ extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; -+ extension = e_source_get_extension (source, extension_name); -+ method = (oauth2_support != NULL) ? "OAuth2" : "ClientLogin"; -+ e_source_authentication_set_method (extension, method); -+ -+ g_clear_object (&oauth2_support); - } - - static void -@@ -178,7 +176,8 @@ google_backend_add_calendar (ECollectionBackend *backend) - - g_get_current_time (&today_tv); - today = g_time_val_to_iso8601 (&today_tv); -- e_source_alarms_set_last_notified (E_SOURCE_ALARMS (extension), today); -+ e_source_alarms_set_last_notified ( -+ E_SOURCE_ALARMS (extension), today); - g_free (today); - } - - diff --git a/extra/evolution-data-server/fix-google-2fa-4.patch b/extra/evolution-data-server/fix-google-2fa-4.patch deleted file mode 100644 index 26b64763e..000000000 --- a/extra/evolution-data-server/fix-google-2fa-4.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 13afda757c4ba8d558eaa64853849f2ad00a9806 Mon Sep 17 00:00:00 2001 -From: Matthew Barnes <mbarnes@redhat.com> -Date: Tue, 09 Jul 2013 15:42:17 +0000 -Subject: google: Use CalDAV v2 if OAuth 2.0 support is available. - ---- -diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c -index cbd7bd2..4ded74d 100644 ---- a/modules/google-backend/module-google-backend.c -+++ b/modules/google-backend/module-google-backend.c -@@ -45,10 +45,16 @@ - - /* Calendar Configuration Details */ - #define GOOGLE_CALENDAR_BACKEND_NAME "caldav" --#define GOOGLE_CALENDAR_HOST "www.google.com" --#define GOOGLE_CALENDAR_CALDAV_PATH "/calendar/dav/%s/events" - #define GOOGLE_CALENDAR_RESOURCE_ID "Calendar" - -+/* CalDAV v1 Configuration Details */ -+#define GOOGLE_CALDAV_V1_HOST "www.google.com" -+#define GOOGLE_CALDAV_V1_PATH "/calendar/dav/%s/events" -+ -+/* CalDAV v2 Configuration Details */ -+#define GOOGLE_CALDAV_V2_HOST "apidata.googleusercontent.com" -+#define GOOGLE_CALDAV_V2_PATH "/caldav/v2/%s/events" -+ - /* Contacts Configuration Details */ - #define GOOGLE_CONTACTS_BACKEND_NAME "google" - #define GOOGLE_CONTACTS_HOST "www.google.com" -@@ -95,6 +101,52 @@ G_DEFINE_DYNAMIC_TYPE ( - E_TYPE_COLLECTION_BACKEND_FACTORY) - - static void -+google_backend_calendar_update_auth_method (ESource *source) -+{ -+ EOAuth2Support *oauth2_support; -+ ESourceAuthentication *auth_extension; -+ ESourceWebdav *webdav_extension; -+ const gchar *extension_name; -+ const gchar *host; -+ const gchar *method; -+ const gchar *path_format; -+ gchar *path; -+ gchar *user; -+ -+ oauth2_support = e_server_side_source_ref_oauth2_support ( -+ E_SERVER_SIDE_SOURCE (source)); -+ -+ /* The host name and WebDAV resource path depend on the -+ * authentication method used, so update those here too. */ -+ -+ if (oauth2_support != NULL) { -+ method = "OAuth2"; -+ host = GOOGLE_CALDAV_V2_HOST; -+ path_format = GOOGLE_CALDAV_V2_PATH; -+ } else { -+ method = "plain/password"; -+ host = GOOGLE_CALDAV_V1_HOST; -+ path_format = GOOGLE_CALDAV_V1_PATH; -+ } -+ -+ extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; -+ auth_extension = e_source_get_extension (source, extension_name); -+ e_source_authentication_set_host (auth_extension, host); -+ e_source_authentication_set_method (auth_extension, method); -+ -+ extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND; -+ webdav_extension = e_source_get_extension (source, extension_name); -+ -+ user = e_source_authentication_dup_user (auth_extension); -+ path = g_strdup_printf (path_format, (user != NULL) ? user : ""); -+ e_source_webdav_set_resource_path (webdav_extension, path); -+ g_free (path); -+ g_free (user); -+ -+ g_clear_object (&oauth2_support); -+} -+ -+static void - google_backend_contacts_update_auth_method (ESource *source) - { - EOAuth2Support *oauth2_support; -@@ -123,14 +175,16 @@ google_backend_add_calendar (ECollectionBackend *backend) - ESourceCollection *collection_extension; - const gchar *backend_name; - const gchar *extension_name; -- const gchar *identity; - const gchar *resource_id; -- gchar *path; - - /* FIXME As a future enhancement, we should query Google - * for a list of user calendars and add them to the - * collection with matching display names and colors. */ - -+ /* NOTE: Host name and WebDAV resource path are set in -+ * google_backend_calendar_update_auth_method(), -+ * since they depend on the auth method used. */ -+ - collection_source = e_backend_get_source (E_BACKEND (backend)); - - resource_id = GOOGLE_CALENDAR_RESOURCE_ID; -@@ -153,15 +207,15 @@ google_backend_add_calendar (ECollectionBackend *backend) - extension_name = E_SOURCE_EXTENSION_AUTHENTICATION; - extension = e_source_get_extension (source, extension_name); - -- e_source_authentication_set_host ( -- E_SOURCE_AUTHENTICATION (extension), -- GOOGLE_CALENDAR_HOST); -- - g_object_bind_property ( - collection_extension, "identity", - extension, "user", - G_BINDING_SYNC_CREATE); - -+ /* Make sure the WebDAV resource path is up-to-date, since -+ * it's built from the "user" property that we just set. */ -+ google_backend_calendar_update_auth_method (source); -+ - extension_name = E_SOURCE_EXTENSION_SECURITY; - extension = e_source_get_extension (source, extension_name); - -@@ -181,15 +235,6 @@ google_backend_add_calendar (ECollectionBackend *backend) - g_free (today); - } - -- extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND; -- extension = e_source_get_extension (source, extension_name); -- -- identity = e_source_collection_get_identity (collection_extension); -- path = g_strdup_printf (GOOGLE_CALENDAR_CALDAV_PATH, identity); -- e_source_webdav_set_resource_path ( -- E_SOURCE_WEBDAV (extension), path); -- g_free (path); -- - server = e_collection_backend_ref_server (backend); - e_source_registry_server_add_source (server, source); - g_object_unref (server); -@@ -336,6 +381,20 @@ google_backend_child_added (ECollectionBackend *backend, - collection_identity); - } - -+ /* Keep the calendar authentication method up-to-date. -+ * -+ * XXX Not using a property binding here in case I end up adding -+ * other "support" interfaces which influence authentication. -+ * Many-to-one property bindinds tend not to work so well. */ -+ extension_name = E_SOURCE_EXTENSION_CALENDAR; -+ if (e_source_has_extension (child_source, extension_name)) { -+ google_backend_calendar_update_auth_method (child_source); -+ g_signal_connect ( -+ child_source, "notify::oauth2-support", -+ G_CALLBACK (google_backend_calendar_update_auth_method), -+ NULL); -+ } -+ - /* Keep the contacts authentication method up-to-date. - * - * XXX Not using a property binding here in case I end up adding - diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index 0ffa9360f..9924c9b83 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 196035 2013-10-07 11:50:49Z jgc $ +# $Id: PKGBUILD 196440 2013-10-13 19:40:37Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('689ad1908d750a6004ee7ce997543a1b5481849aafeb923edebe3f766efa4b46') +sha256sums=('018bf22f5fd88bb80f88c8f1feb696c7a7c216ab1367b7b50d02b4e313d858c9') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 26d266514..619587431 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196033 2013-10-07 11:50:47Z jgc $ +# $Id: PKGBUILD 196438 2013-10-13 19:38:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=(i686 x86_64) @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('e64fabc07e1126b80ef8354411d8232aee6e45cfece040a99d494d77df040064') +sha256sums=('da1aacab365f27feed74cb89d03c2f4847fef7c5370d0fd84b04ab24ada83546') build() { cd $pkgname-$pkgver diff --git a/extra/fontconfig/29-replace-bitmap-fonts.conf b/extra/fontconfig/29-replace-bitmap-fonts.conf deleted file mode 100644 index 391ffef94..000000000 --- a/extra/fontconfig/29-replace-bitmap-fonts.conf +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <!-- Prefer Microsoft versions of PostScript fonts, as these typically render a lot better on-screen - 30-metric-aliases.conf will then also add the free clones of these fonts --> - <alias binding="same"> - <family>Helvetica</family> - <prefer><family>Arial</family></prefer> - </alias> - <alias binding="same"> - <family>Times</family> - <prefer><family>Times New Roman</family></prefer> - </alias> - <alias binding="same"> - <family>Courier</family> - <prefer><family>Courier New</family></prefer> - </alias> -</fontconfig> diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 5d709fcd9..f2b9b1c86 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193795 2013-09-01 09:03:59Z andyrtr $ +# $Id: PKGBUILD 196411 2013-10-13 09:02:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.95 +pkgver=2.11.0 pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) @@ -11,16 +11,14 @@ license=('custom') depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install -source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 29-replace-bitmap-fonts.conf) -sha256sums=('abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b' - '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6') +source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2) +sha256sums=('cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467') # a nice page to test font matching: # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f @@ -38,19 +36,12 @@ build() { } check() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make -k check } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" - ln -s ../conf.avail/29-replace-bitmap-fonts.conf \ - "$pkgdir/etc/fonts/conf.d/29-replace-bitmap-fonts.conf" - - #Install license - 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/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD index 3e5f2ecf8..23213f229 100644 --- a/extra/libdmapsharing/PKGBUILD +++ b/extra/libdmapsharing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183628 2013-04-25 17:51:21Z ioni $ +# $Id: PKGBUILD 196441 2013-10-13 19:42:19Z heftig $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libdmapsharing -pkgver=2.9.17 +pkgver=2.9.23 pkgrel=1 pkgdesc="A library that implements the DMAP family of protocols" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('libsoup' 'avahi' 'gst-plugins-base-libs' 'gdk-pixbuf2') options=('!libtool') source=(http://www.flyn.org/projects/libdmapsharing/$pkgname-$pkgver.tar.gz) -md5sums=('089e70ed4fb3b92dcd956b80dbf3ffc9') +md5sums=('7e6bb71f614392e340cac782586072a7') build() { cd $pkgname-$pkgver diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index f1668a6da..70c11de6e 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194427 2013-09-16 10:28:35Z jgc $ +# $Id: PKGBUILD 196412 2013-10-13 09:02:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.46 -pkgrel=2 +pkgver=2.4.47 +pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) license=('custom') @@ -15,7 +15,7 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 COPYING) -sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1' +sha256sums=('c2dac2250adbcea23efb18fa8cf484c0f43c8ffbf5064ec82678bc410084f8e7' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 2da968474..83d2fed64 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 196133 2013-10-07 11:53:23Z jgc $ +# $Id: PKGBUILD 196442 2013-10-13 19:45:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=3.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="An iTunes-like music playback and management application" arch=(i686 x86_64) license=(GPL) url="http://www.rhythmbox.org" -depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject) +depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject gnome-icon-theme) makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp) optdepends=('gst-plugins-ugly: Extra media codecs' 'gst-plugins-bad: Extra media codecs' @@ -23,8 +23,8 @@ optdepends=('gst-plugins-ugly: Extra media codecs' 'zeitgeist: Zeitgeist plugin') options=('!libtool' '!emptydirs') install=rhythmbox.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz) -sha256sums=('bf6f35c1a46867d16e45969f97f01630d936bfa92baf940c442f3a19fb6820e4') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('75072b093284e9f5696fbb590d719a9e16340a5a91d73e3ccd876ce21329bdcf') build() { cd "$pkgname-$pkgver" diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index bd2820343..41ef21e4e 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194375 2013-09-15 08:00:33Z andyrtr $ +# $Id: PKGBUILD 196443 2013-10-13 20:05:28Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -7,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.13.9 -pkgrel=2 +pkgrel=3 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -30,17 +30,22 @@ provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} - hp-mkuri.patch) + hp-mkuri.patch + hplip-CVE-2013-4325.patch) md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9' 'SKIP' - '0bd7779fdbc4d7a9386df04dce2cb8d4') + '0bd7779fdbc4d7a9386df04dce2cb8d4' + '947db41ee8556c78dd027a2f107957e6') -build() { - cd "$srcdir/$_pkgname-$pkgver" +prepare() { + cd $_pkgname-$pkgver # fix linking libnotify, FS#34283 patch -Np0 -i ${srcdir}/hp-mkuri.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2013-4325 + patch -Np1 -i ${srcdir}/hplip-CVE-2013-4325.patch + export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + @@ -65,7 +70,10 @@ build() { export AUTOMAKE='automake --foreign' autoreconf --force --install +} +build() { + cd $_pkgname-$pkgver ./configure --prefix=/usr \ --enable-qt4 \ --disable-foomatic-rip-hplip-install \ @@ -83,15 +91,19 @@ build() { } package() { - #cd "$srcdir/$_pkgname-$pkgver" - cd "$srcdir/$_pkgname-${pkgver/.a/a}" + #cd $_pkgname-$pkgver + cd $_pkgname-${pkgver/.a/a} make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon rm -rf "$pkgdir"/etc/{sane.d,xdg} + # remove HAL .fdi file because HAL is no longer used rm -rf "$pkgdir"/usr/share/hal + # log dir should not be world writeable chmod 775 "$pkgdir"/var/log/hp{,/tmp} + # remove rc script rm -rf "$pkgdir"/etc/init.d } diff --git a/libre/hplip-libre/hplip-CVE-2013-4325.patch b/libre/hplip-libre/hplip-CVE-2013-4325.patch new file mode 100644 index 000000000..85bff893b --- /dev/null +++ b/libre/hplip-libre/hplip-CVE-2013-4325.patch @@ -0,0 +1,22 @@ +diff -up hplip-3.13.7/base/pkit.py.CVE-2013-4325 hplip-3.13.7/base/pkit.py +--- hplip-3.13.7/base/pkit.py.CVE-2013-4325 2013-07-23 06:18:29.000000000 +0100 ++++ hplip-3.13.7/base/pkit.py 2013-09-11 10:54:13.252419283 +0100 +@@ -176,15 +176,10 @@ class PolicyKitService(dbus.service.Obje + "/org/freedesktop/PolicyKit1/Authority", + "org.freedesktop.PolicyKit1.Authority") + policy_kit = dbus.Interface(obj, "org.freedesktop.PolicyKit1.Authority") +- info = dbus.Interface(connection.get_object("org.freedesktop.DBus", +- "/org/freedesktop/DBus/Bus", +- False), +- "org.freedesktop.DBus") +- pid = info.GetConnectionUnixProcessID(sender) + + subject = ( +- 'unix-process', +- { 'pid' : dbus.UInt32(pid, variant_level = 1) } ++ 'system-bus-name', ++ { 'name' : dbus.String(sender, variant_level = 1) } + ) + details = { '' : '' } + flags = dbus.UInt32(1) # AllowUserInteraction = 0x00000001 + diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD index 76e4b58bd..b6cbcc4cc 100644 --- a/libre/ruby-rdiscount/PKGBUILD +++ b/libre/ruby-rdiscount/PKGBUILD @@ -4,24 +4,18 @@ _gemname=rdiscount pkgname=ruby-$_gemname -pkgver=1.6.5 +pkgver=2.1.6 pkgdesc="C implementation of John Gruber's Markdown." url="http://dafoster.net/projects/rdiscount/" -# About the license: It is a 4-clause BSD license with the 3rd clause modified -# to mention documentation instead of advertising. Not to be confused with -# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license -# (dropping the 3rd clause). Because of the way it is modified, it doesn't have -# the problems normally associated with the 4-clause BSD license. -license=('custom:modified-BSD4') +license=('BSD3') -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64') depends=('ruby') makedepends=('rubygems') source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) noextract=($_gemname-$pkgver.gem) -md5sums=('2de321f1ba826f80b84fe45c0d013fcf') package() { cd "${srcdir}" @@ -36,3 +30,5 @@ package() { install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} done } + +md5sums=('99c5a8f33f6796e766f0b8e73b0519c6') diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD index 099b6e1a0..4df1a5e5f 100644 --- a/nonprism/claws-mail-libre-nonprism/PKGBUILD +++ b/nonprism/claws-mail-nonprism/PKGBUILD @@ -1,17 +1,17 @@ -# $Id$ +# $Id: PKGBUILD 196415 2013-10-13 09:17:50Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=claws-mail -pkgname=$_pkgname-libre-nonprism +pkgname=$_pkgname-nonprism pkgver=3.9.2 -pkgrel=3.1 -pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support' +pkgrel=4 +pkgdesc="A GTK+ based e-mail client, without libgdata support" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://www.$_pkgname.org" -depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' - 'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') +depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' + 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' # dependencies for plugins 'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') @@ -31,7 +31,7 @@ optdepends=('python2: needed for some tools and python plugin' 'libsoup: for the fancy webkit html plugin' 'poppler-glib: for pdf viewer plugin' 'ghostscript: for pdf viewer plugin') -replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre") +replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism") conflicts=("$_pkgname" "$_pkgname-extra-plugins") provides=("$_pkgname=$pkgver" 'claws') options=(!libtool) @@ -41,7 +41,7 @@ md5sums=('90de2a265e65fbd9dffdbf428bb0ee28' 'SKIP') build() { - cd $srcdir/$_pkgname-$pkgver + cd $_pkgname-$pkgver # fixes for python2 export PYTHON="/usr/bin/python2" @@ -56,14 +56,13 @@ build() { --enable-pgpmime-plugin \ --enable-spamassassin-plugin \ --enable-bogofilter-plugin \ - --disable-jpilot \ --disable-gdata-plugin #--help setarch $CARCH make } package() { - cd $srcdir/$_pkgname-$pkgver + cd $_pkgname-$pkgver setarch $CARCH make DESTDIR=$pkgdir install # build and install extra tools @@ -71,6 +70,7 @@ package() { setarch $CARCH make # all executables and .conf files ; only top directory find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do - install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i + install -D -m755 $i \ + $pkgdir/usr/lib/$_pkgname/tools/$i done } diff --git a/nonprism/claws-mail-nonprism/claws-mail.install b/nonprism/claws-mail-nonprism/claws-mail.install new file mode 100644 index 000000000..4d2f155d4 --- /dev/null +++ b/nonprism/claws-mail-nonprism/claws-mail.install @@ -0,0 +1,16 @@ +post_install() { + echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin" + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + |