diff options
Diffstat (limited to 'community-testing')
56 files changed, 0 insertions, 4579 deletions
diff --git a/community-testing/balsa/PKGBUILD b/community-testing/balsa/PKGBUILD deleted file mode 100644 index 43eae5357..000000000 --- a/community-testing/balsa/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 62015 2012-01-14 12:24:56Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=balsa -pkgver=2.4.11 -pkgrel=1 -pkgdesc="An e-mail client for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -url='http://pawsa.fedorapeople.org/balsa/' -depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils') -makedepends=('perlxml' 'gnome-doc-utils' 'intltool') -install=balsa.install -source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - gmime26.patch) -md5sums=('915c622b6385aa4f83d5eee8f31ee8e8' - '108d33f533558a371189441edce7d7e6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/gmime26.patch" - autoreconf -fi - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-ssl \ - --with-gpgme=gpgme-config \ - --with-gss \ - --with-ldap \ - --with-gtksourceview \ - --with-gtkspell \ - --with-rubrica \ - --with-sqlite \ - --without-nm \ - --without-gnome \ - --with-html-widget=webkit - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install -} diff --git a/community-testing/balsa/balsa.install b/community-testing/balsa/balsa.install deleted file mode 100644 index 1f167b5e9..000000000 --- a/community-testing/balsa/balsa.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/balsa/gmime26.patch b/community-testing/balsa/gmime26.patch deleted file mode 100644 index fe4e6a9fa..000000000 --- a/community-testing/balsa/gmime26.patch +++ /dev/null @@ -1,1372 +0,0 @@ -From 393d0077495cb750ee47bab6ec44a60906a95179 Mon Sep 17 00:00:00 2001 -From: Peter Bloomfield <PeterBloomfield@bellsouth.net> -Date: Mon, 28 Nov 2011 03:00:55 +0000 -Subject: Build with GMime 2.6.0 - - * configure.in: check for GMime >= 2.5.7 - * libbalsa/gmime-application-pkcs7.c - (g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify), - (g_mime_application_pkcs7_encrypt), - (g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7. - * libbalsa/gmime-application-pkcs7.h: ditto. - * libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type), - (g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize), - (g_mime_gpgme_digest_id): ditto. - * libbalsa/gmime-gpgme-context.h: ditto. - * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt), - (g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt): - ditto. - * libbalsa/gmime-part-rfc2440.h: ditto. - * libbalsa/rfc3156.c (password_request_func), - (libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object), - (libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto. ---- -diff --git a/ChangeLog b/ChangeLog -index bd95e68..d5c62f5 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,25 @@ -+2011-11-27 Peter Bloomfield -+ -+ Build with GMime 2.6.0 -+ -+ * configure.in: check for GMime >= 2.5.7 -+ * libbalsa/gmime-application-pkcs7.c -+ (g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify), -+ (g_mime_application_pkcs7_encrypt), -+ (g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7. -+ * libbalsa/gmime-application-pkcs7.h: ditto. -+ * libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type), -+ (g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize), -+ (g_mime_gpgme_digest_id): ditto. -+ * libbalsa/gmime-gpgme-context.h: ditto. -+ * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt), -+ (g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt): -+ ditto. -+ * libbalsa/gmime-part-rfc2440.h: ditto. -+ * libbalsa/rfc3156.c (password_request_func), -+ (libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object), -+ (libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto. -+ - 2011-11-22 Pawel Salek - - * NEWS, configure.in: release balsa-2.4.11 -diff --git a/configure.in b/configure.in -index 4a8320e..64d99f3 100644 ---- a/configure.in -+++ b/configure.in -@@ -307,7 +307,12 @@ fi - case "$with_gmime" in - 2.4) ;; - 2.6) AC_DEFINE([HAVE_GMIME_2_6], [1], -- [Defined to build with GMime version 2.5 or 2.6]) ;; -+ [Defined to build with GMime version 2.5 or 2.6]) -+ if $PKG_CONFIG --atleast-version=2.5.7 gmime-2.6; then -+ AC_DEFINE([HAVE_GMIME_2_5_7], [1], -+ [Defined when GMime version is at least 2.5.7]) -+ fi -+ ;; - *) AC_MSG_ERROR([unknown GMime version $with_gmime]) ;; - esac - -diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c -index 12f4f8f..63b8087 100644 ---- a/libbalsa/gmime-application-pkcs7.c -+++ b/libbalsa/gmime-application-pkcs7.c -@@ -96,8 +96,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - GMimeFilter *crlf_filter, *from_filter; - - g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1); - g_return_val_if_fail (ctx->sign_protocol != NULL, -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1); -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol(ctx) -+ != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail (GMIME_IS_OBJECT (content), -1); - - /* Prepare all the parts for signing... */ -@@ -127,7 +133,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - sig_data_stream = g_mime_stream_mem_new (); - - /* get the signed content */ -- if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_sign -+ (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, -+ sig_data_stream, err) == -1) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref (filtered_stream); - g_object_unref (sig_data_stream); - g_object_unref (stream); -@@ -168,9 +181,15 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - * decrypting it again. In this case, validity is undefined. - */ - GMimeObject * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_verify(GMimePart * pkcs7, - GMimeSignatureValidity ** validity, - GMimeCipherContext * ctx, GError ** err) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_application_pkcs7_verify(GMimePart * pkcs7, -+ GMimeSignatureList ** list, -+ GMimeCryptoContext * ctx, GError ** err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeObject *decrypted; - GMimeDataWrapper *wrapper; -@@ -181,8 +200,14 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - const char *smime_type; - - g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL); - g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some sanity checks */ - smime_type = -@@ -208,9 +233,16 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - g_object_unref(crlf_filter); - - /* get the cleartext */ -+#ifndef HAVE_GMIME_2_5_7 - *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT, - ciphertext, filtered_stream, err); -- if (!*validity) { -+ if (!*validity) -+#else /* HAVE_GMIME_2_5_7 */ -+ *list = g_mime_crypto_context_verify(ctx, GMIME_CIPHER_ALGO_DEFAULT, -+ ciphertext, filtered_stream, err); -+ if (!*list) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(filtered_stream); - g_object_unref(ciphertext); - g_object_unref(stream); -@@ -248,7 +280,12 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - */ - int - g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *ctx, GPtrArray *recipients, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *ctx, -+ GPtrArray *recipients, -+#endif /* HAVE_GMIME_2_5_7 */ - GError **err) - { - GMimeDataWrapper *wrapper; -@@ -257,8 +294,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - GMimeFilter *crlf_filter; - - g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1); - g_return_val_if_fail (ctx->encrypt_protocol != NULL, -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail (GMIME_IS_OBJECT (content), -1); - - /* get the cleartext */ -@@ -279,7 +322,15 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - - /* encrypt the content stream */ - ciphertext = g_mime_stream_mem_new (); -- if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_encrypt -+ (ctx, FALSE, NULL, -+ GMIME_CIPHER_ALGO_DEFAULT, -+ recipients, stream, ciphertext, err) == -1) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref (ciphertext); - g_object_unref (stream); - return -1; -@@ -313,8 +364,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - * err with more information about the reason. - */ - GMimeObject * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - GError **err) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, -+ GMimeCryptoContext *ctx, -+ GError **err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeObject *decrypted; - GMimeDataWrapper *wrapper; -@@ -325,8 +382,14 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - const char *smime_type; - - g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL); - g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some sanity checks */ - smime_type = -@@ -353,7 +416,13 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - g_object_unref(crlf_filter); - - /* get the cleartext */ -- if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_decrypt -+ (ctx, ciphertext, filtered_stream, err) == NULL) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(filtered_stream); - g_object_unref(ciphertext); - g_object_unref(stream); -diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h -index 03fa401..6678ff5 100644 ---- a/libbalsa/gmime-application-pkcs7.h -+++ b/libbalsa/gmime-application-pkcs7.h -@@ -28,7 +28,11 @@ extern "C" { - #endif /* __cplusplus */ - - #include <gmime/gmime-part.h> -+#ifndef HAVE_GMIME_2_5_7 - #include <gmime/gmime-cipher-context.h> -+#else /* HAVE_GMIME_2_5_7 */ -+#include <gmime/gmime-crypto-context.h> -+#endif /* HAVE_GMIME_2_5_7 */ - - #undef HAS_APPLICATION_PKCS7_MIME_SIGNED_SUPPORT - -@@ -39,21 +43,40 @@ extern "C" { - * Balsa always encodes S/MIME signed stuff as multipart/signed. */ - int g_mime_application_pkcs7_sign(GMimePart * pkcs7, - GMimeObject * content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * ctx, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext * ctx, -+#endif /* HAVE_GMIME_2_5_7 */ - const char *userid, GError ** err); - #endif - -+#ifndef HAVE_GMIME_2_5_7 - GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7, - GMimeSignatureValidity ** validity, - GMimeCipherContext * ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7, -+ GMimeSignatureList ** validity, -+ GMimeCryptoContext * ctx, GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - int g_mime_application_pkcs7_encrypt(GMimePart * pkcs7, - GMimeObject * content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * ctx, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext * ctx, -+#endif /* HAVE_GMIME_2_5_7 */ - GPtrArray * recipients, GError ** err); - -+#ifndef HAVE_GMIME_2_5_7 - GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7, - GMimeCipherContext * ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7, -+ GMimeCryptoContext * ctx, GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - #ifdef __cplusplus - } -diff --git a/libbalsa/gmime-gpgme-context.c b/libbalsa/gmime-gpgme-context.c -index 24b140b..0c56f94 100644 ---- a/libbalsa/gmime-gpgme-context.c -+++ b/libbalsa/gmime-gpgme-context.c -@@ -27,6 +27,9 @@ - #include <unistd.h> - #include <glib.h> - #include <gmime/gmime.h> -+#ifdef HAVE_GMIME_2_5_7 -+#include <gmime/gmime-certificate.h> -+#endif /* HAVE_GMIME_2_5_7 */ - #include <gpgme.h> - #include <time.h> - #include <glib/gi18n.h> -@@ -44,6 +47,7 @@ static gboolean g_mime_gpgme_context_check_protocol(GMimeGpgmeContextClass - protocol, - GError ** error); - -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherHash g_mime_gpgme_hash_id(GMimeCipherContext * ctx, - const char *hash); - -@@ -70,6 +74,46 @@ static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext * - GMimeStream * istream, - GMimeStream * ostream, - GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDigestAlgo g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, -+ const char *hash); -+ -+static const char *g_mime_gpgme_digest_name(GMimeCryptoContext * ctx, -+ GMimeDigestAlgo hash); -+ -+static const char -+ *g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context); -+static const char -+ *g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context); -+static const char -+ *g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context); -+ -+static int g_mime_gpgme_sign(GMimeCryptoContext * ctx, -+ const char * userid, -+ GMimeDigestAlgo hash, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+ -+static GMimeSignatureList *g_mime_gpgme_verify(GMimeCryptoContext * ctx, -+ GMimeDigestAlgo hash, -+ GMimeStream * istream, -+ GMimeStream * sigstream, -+ GError ** err); -+ -+static int g_mime_gpgme_encrypt(GMimeCryptoContext * ctx, -+ gboolean sign, -+ const char *userid, -+ GMimeDigestAlgo digest, -+ GPtrArray * recipients, -+ GMimeStream * istream, -+ GMimeStream * ostream, GError ** err); -+ -+static GMimeDecryptResult *g_mime_gpgme_decrypt(GMimeCryptoContext * ctx, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - - /* internal passphrase callback */ -@@ -102,7 +146,11 @@ static void g_set_error_from_gpgme(GError ** error, gpgme_error_t gpgme_err, - const gchar * message); - - -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherContextClass *parent_class = NULL; -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeCryptoContextClass *parent_class = NULL; -+#endif /* HAVE_GMIME_2_5_7 */ - - - GType -@@ -124,8 +172,13 @@ g_mime_gpgme_context_get_type(void) - }; - - type = -+#ifndef HAVE_GMIME_2_5_7 - g_type_register_static(GMIME_TYPE_CIPHER_CONTEXT, - "GMimeGpgmeContext", &info, 0); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_type_register_static(GMIME_TYPE_CRYPTO_CONTEXT, -+ "GMimeGpgmeContext", &info, 0); -+#endif /* HAVE_GMIME_2_5_7 */ - } - - return type; -@@ -136,19 +189,39 @@ static void - g_mime_gpgme_context_class_init(GMimeGpgmeContextClass * klass) - { - GObjectClass *object_class = G_OBJECT_CLASS(klass); -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContextClass *cipher_class = - GMIME_CIPHER_CONTEXT_CLASS(klass); -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContextClass *crypto_class = -+ GMIME_CRYPTO_CONTEXT_CLASS(klass); -+#endif /* HAVE_GMIME_2_5_7 */ - - parent_class = g_type_class_ref(G_TYPE_OBJECT); - - object_class->finalize = g_mime_gpgme_context_finalize; - -+#ifndef HAVE_GMIME_2_5_7 - cipher_class->hash_id = g_mime_gpgme_hash_id; - cipher_class->hash_name = g_mime_gpgme_hash_name; - cipher_class->sign = g_mime_gpgme_sign; - cipher_class->verify = g_mime_gpgme_verify; - cipher_class->encrypt = g_mime_gpgme_encrypt; - cipher_class->decrypt = g_mime_gpgme_decrypt; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto_class->digest_id = g_mime_gpgme_digest_id; -+ crypto_class->digest_name = g_mime_gpgme_digest_name; -+ crypto_class->get_signature_protocol = -+ g_mime_gpgme_get_signature_protocol; -+ crypto_class->get_encryption_protocol = -+ g_mime_gpgme_get_encryption_protocol; -+ crypto_class->get_key_exchange_protocol = -+ g_mime_gpgme_get_key_exchange_protocol; -+ crypto_class->sign = g_mime_gpgme_sign; -+ crypto_class->verify = g_mime_gpgme_verify; -+ crypto_class->encrypt = g_mime_gpgme_encrypt; -+ crypto_class->decrypt = g_mime_gpgme_decrypt; -+#endif /* HAVE_GMIME_2_5_7 */ - - if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) == - GPG_ERR_NO_ERROR) -@@ -190,7 +263,11 @@ g_mime_gpgme_context_finalize(GObject * object) - } - - #if !defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - g_object_unref(GMIME_CIPHER_CONTEXT(ctx)->session); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(GMIME_CRYPTO_CONTEXT(ctx)->session); -+#endif /* HAVE_GMIME_2_5_7 */ - #endif /* HAVE_GMIME_2_6 */ - - G_OBJECT_CLASS(parent_class)->finalize(object); -@@ -200,15 +277,26 @@ g_mime_gpgme_context_finalize(GObject * object) - /* - * Convert a hash algorithm name to a number - */ -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherHash - g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDigestAlgo -+g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, const char *hash) -+#endif /* HAVE_GMIME_2_5_7 */ - { -+#ifndef HAVE_GMIME_2_5_7 - if (hash == NULL) - return GMIME_CIPHER_HASH_DEFAULT; -+#else /* HAVE_GMIME_2_5_7 */ -+ if (hash == NULL) -+ return GMIME_DIGEST_ALGO_DEFAULT; -+#endif /* HAVE_GMIME_2_5_7 */ - - if (!g_ascii_strcasecmp(hash, "pgp-")) - hash += 4; - -+#ifndef HAVE_GMIME_2_5_7 - if (!g_ascii_strcasecmp(hash, "md2")) - return GMIME_CIPHER_HASH_MD2; - else if (!g_ascii_strcasecmp(hash, "md5")) -@@ -223,6 +311,22 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) - return GMIME_CIPHER_HASH_HAVAL5160; - - return GMIME_CIPHER_HASH_DEFAULT; -+#else /* HAVE_GMIME_2_5_7 */ -+ if (!g_ascii_strcasecmp(hash, "md2")) -+ return GMIME_DIGEST_ALGO_MD2; -+ else if (!g_ascii_strcasecmp(hash, "md5")) -+ return GMIME_DIGEST_ALGO_MD5; -+ else if (!g_ascii_strcasecmp(hash, "sha1")) -+ return GMIME_DIGEST_ALGO_SHA1; -+ else if (!g_ascii_strcasecmp(hash, "ripemd160")) -+ return GMIME_DIGEST_ALGO_RIPEMD160; -+ else if (!g_ascii_strcasecmp(hash, "tiger192")) -+ return GMIME_DIGEST_ALGO_TIGER192; -+ else if (!g_ascii_strcasecmp(hash, "haval-5-160")) -+ return GMIME_DIGEST_ALGO_HAVAL5160; -+ -+ return GMIME_DIGEST_ALGO_DEFAULT; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -230,7 +334,11 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) - * Convert a hash algorithm number to a string - */ - static const char * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_digest_name(GMimeCryptoContext * context, GMimeDigestAlgo hash) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); - char *p; -@@ -239,6 +347,7 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - g_return_val_if_fail(ctx->gpgme_ctx, NULL); - - /* note: this is only a subset of the hash algorithms gpg(me) supports */ -+#ifndef HAVE_GMIME_2_5_7 - switch (hash) { - case GMIME_CIPHER_HASH_MD2: - p = "pgp-md2"; -@@ -258,6 +367,27 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - case GMIME_CIPHER_HASH_HAVAL5160: - p = "pgp-haval-5-160"; - break; -+#else /* HAVE_GMIME_2_5_7 */ -+ switch (hash) { -+ case GMIME_DIGEST_ALGO_MD2: -+ p = "pgp-md2"; -+ break; -+ case GMIME_DIGEST_ALGO_MD5: -+ p = "pgp-md5"; -+ break; -+ case GMIME_DIGEST_ALGO_SHA1: -+ p = "pgp-sha1"; -+ break; -+ case GMIME_DIGEST_ALGO_RIPEMD160: -+ p = "pgp-ripemd160"; -+ break; -+ case GMIME_DIGEST_ALGO_TIGER192: -+ p = "pgp-tiger192"; -+ break; -+ case GMIME_DIGEST_ALGO_HAVAL5160: -+ p = "pgp-haval-5-160"; -+ break; -+#endif /* HAVE_GMIME_2_5_7 */ - default: - if (!(p = ctx->micalg)) - return p; -@@ -270,6 +400,29 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - return p; - } - -+#ifdef HAVE_GMIME_2_5_7 -+static const char * -+g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->sign_protocol; -+} -+ -+static const char * -+g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->encrypt_protocol; -+} -+ -+static const char * -+g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->key_protocol; -+} -+ -+#endif /* HAVE_GMIME_2_5_7 */ - - /* - * Wrapper to convert the passphrase returned from the gmime session to gpgme. -@@ -279,7 +432,11 @@ g_mime_session_passphrase(void *HOOK, const char *UID_HINT, - const char *PASSPHRASE_INFO, int PREV_WAS_BAD, - int FD) - { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *ctx = GMIME_CIPHER_CONTEXT(HOOK); -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *ctx = GMIME_CRYPTO_CONTEXT(HOOK); -+#endif /* HAVE_GMIME_2_5_7 */ - #if defined(HAVE_GMIME_2_6) - GMimeStream *stream; - gboolean rc; -@@ -366,9 +523,15 @@ cb_data_release(void *handle) - * arg, but set the value in the context. - */ - static int -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid, - GMimeCipherHash hash, GMimeStream * istream, - GMimeStream * ostream, GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_sign(GMimeCryptoContext * context, const char *userid, -+ GMimeDigestAlgo hash, GMimeStream * istream, -+ GMimeStream * ostream, GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_sig_mode_t sig_mode; -@@ -460,6 +623,7 @@ g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid, - } - - -+#ifndef HAVE_GMIME_2_5_7 - /* - * In standard mode, verify that sigstream contains a detached signature for - * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime), -@@ -471,13 +635,33 @@ static GMimeSignatureValidity * - g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - GMimeStream * istream, GMimeStream * sigstream, - GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+/* -+ * In standard mode, verify that sigstream contains a detached signature for -+ * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime), -+ * istream contains clearsigned data, and sigstream will be filled with the -+ * verified plaintext. The routine returns a GMimeSignatureList object. -+ * More information is saved in the context's signature object. -+ * On error error is set accordingly. -+ */ -+static GMimeSignatureList * -+g_mime_gpgme_verify(GMimeCryptoContext * context, GMimeDigestAlgo hash, -+ GMimeStream * istream, GMimeStream * sigstream, -+ GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; - gpgme_protocol_t protocol; - gpgme_error_t err; - gpgme_data_t msg, sig; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *list; -+ GMimeSignature *signature; -+ -+#endif /* HAVE_GMIME_2_5_7 */ - struct gpgme_data_cbs cbs = { - (gpgme_data_read_cb_t) g_mime_gpgme_stream_rd, /* read method */ - (gpgme_data_write_cb_t) g_mime_gpgme_stream_wr, /* write method */ -@@ -521,6 +705,7 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - ctx->sig_state = - g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_5_7 - validity = g_mime_signature_validity_new(); - if (ctx->sig_state) { - switch (ctx->sig_state->status) -@@ -536,12 +721,44 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - } - } else - g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); -+#else /* HAVE_GMIME_2_5_7 */ -+ list = g_mime_signature_list_new(); -+ signature = g_mime_signature_new(); -+ g_mime_signature_list_add(list, signature); -+ -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, -+ GMIME_SIGNATURE_ERROR_NONE); -+ break; -+ default: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else { -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE); -+ } -+#endif /* HAVE_GMIME_2_5_7 */ - - /* release gmgme data buffers */ - gpgme_data_release(msg); - gpgme_data_release(sig); - -+#ifndef HAVE_GMIME_2_5_7 - return validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ return list; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -549,10 +766,19 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - * Encrypt istream to ostream for recipients. If sign is set, sign by userid. - */ - static int -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign, - const char *userid, GPtrArray * recipients, - GMimeStream * istream, GMimeStream * ostream, - GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_encrypt(GMimeCryptoContext * context, gboolean sign, -+ const char *userid, -+ GMimeDigestAlgo digest, -+ GPtrArray * recipients, -+ GMimeStream * istream, GMimeStream * ostream, -+ GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; -@@ -653,9 +879,15 @@ g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign, - * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included - * signature (if any). - */ -+#ifndef HAVE_GMIME_2_5_7 - static GMimeSignatureValidity * - g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - GMimeStream * ostream, GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDecryptResult * -+g_mime_gpgme_decrypt(GMimeCryptoContext * context, GMimeStream * istream, -+ GMimeStream * ostream, GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; -@@ -668,7 +900,13 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - NULL, /* seek method */ - cb_data_release /* release method */ - }; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeDecryptResult *result; -+ GMimeSignatureList *list; -+ GMimeSignature *signature; -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some paranoia checks */ - g_return_val_if_fail(ctx, NULL); -@@ -716,6 +954,7 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - /* try to get information about the signature (if any) */ - ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_5_7 - validity = g_mime_signature_validity_new(); - if (ctx->sig_state) { - switch (ctx->sig_state->status) -@@ -733,14 +972,57 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); - - return validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ list = g_mime_signature_list_new(); -+ signature = g_mime_signature_new(); -+ g_mime_signature_list_add(list, signature); -+ result = g_mime_decrypt_result_new(); -+ g_mime_decrypt_result_set_signatures(result, list); -+ -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, -+ GMIME_SIGNATURE_ERROR_NONE); -+ break; -+ default: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else { -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE); -+ } -+ -+ return result; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -+#ifndef HAVE_GMIME_2_5_7 - /* - * Create a new gpgme cipher context with protocol. If anything fails, return - * NULL and set error. - */ -+#else /* HAVE_GMIME_2_5_7 */ -+/* -+ * Create a new gpgme crypto context with protocol. If anything fails, return -+ * NULL and set error. -+ */ -+#endif /* HAVE_GMIME_2_5_7 */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeCryptoContext * -+#endif /* HAVE_GMIME_2_5_7 */ - #if defined(HAVE_GMIME_2_6) - g_mime_gpgme_context_new(GMimePasswordRequestFunc request_passwd, - gpgme_protocol_t protocol, GError ** error) -@@ -749,7 +1031,11 @@ g_mime_gpgme_context_new(GMimeSession * session, - gpgme_protocol_t protocol, GError ** error) - #endif /* HAVE_GMIME_2_6 */ - { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *cipher; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *crypto; -+#endif /* HAVE_GMIME_2_5_7 */ - GMimeGpgmeContext *ctx; - gpgme_error_t err; - gpgme_ctx_t gpgme_ctx; -@@ -766,14 +1052,22 @@ g_mime_gpgme_context_new(GMimeSession * session, - return NULL; - } - -+#ifndef HAVE_GMIME_2_5_7 - /* create the cipher context */ -+#else /* HAVE_GMIME_2_5_7 */ -+ /* create the crypto context */ -+#endif /* HAVE_GMIME_2_5_7 */ - ctx = g_object_new(GMIME_TYPE_GPGME_CONTEXT, NULL, NULL); - if (!ctx) { - gpgme_release(gpgme_ctx); - return NULL; - } else - ctx->gpgme_ctx = gpgme_ctx; -+#ifndef HAVE_GMIME_2_5_7 - cipher = (GMimeCipherContext *) ctx; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto = (GMimeCryptoContext *) ctx; -+#endif /* HAVE_GMIME_2_5_7 */ - - /* check if the requested protocol is available */ - if (!g_mime_gpgme_context_check_protocol -@@ -785,23 +1079,47 @@ g_mime_gpgme_context_new(GMimeSession * session, - - /* setup according to requested protocol */ - #if defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - cipher->request_passwd = request_passwd; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto->request_passwd = request_passwd; -+#endif /* HAVE_GMIME_2_5_7 */ - #else /* HAVE_GMIME_2_6 */ -+#ifndef HAVE_GMIME_2_5_7 - cipher->session = session; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto->session = session; -+#endif /* HAVE_GMIME_2_5_7 */ - g_object_ref(session); - #endif /* HAVE_GMIME_2_6 */ - gpgme_set_protocol(gpgme_ctx, protocol); - if (protocol == GPGME_PROTOCOL_OpenPGP) { -+#ifndef HAVE_GMIME_2_5_7 - cipher->sign_protocol = "application/pgp-signature"; - cipher->encrypt_protocol = "application/pgp-encrypted"; - cipher->key_protocol = NULL; /* FIXME */ -+#else /* HAVE_GMIME_2_5_7 */ -+ ctx->sign_protocol = "application/pgp-signature"; -+ ctx->encrypt_protocol = "application/pgp-encrypted"; -+ ctx->key_protocol = NULL; /* FIXME */ -+#endif /* HAVE_GMIME_2_5_7 */ - } else { -+#ifndef HAVE_GMIME_2_5_7 - cipher->sign_protocol = "application/pkcs7-signature"; - cipher->encrypt_protocol = "application/pkcs7-mime"; - cipher->key_protocol = NULL; /* FIXME */ -+#else /* HAVE_GMIME_2_5_7 */ -+ ctx->sign_protocol = "application/pkcs7-signature"; -+ ctx->encrypt_protocol = "application/pkcs7-mime"; -+ ctx->key_protocol = NULL; /* FIXME */ -+#endif /* HAVE_GMIME_2_5_7 */ - } - -+#ifndef HAVE_GMIME_2_5_7 - return cipher; -+#else /* HAVE_GMIME_2_5_7 */ -+ return crypto; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -diff --git a/libbalsa/gmime-gpgme-context.h b/libbalsa/gmime-gpgme-context.h -index 585d927..19c5fae 100644 ---- a/libbalsa/gmime-gpgme-context.h -+++ b/libbalsa/gmime-gpgme-context.h -@@ -63,7 +63,11 @@ typedef gboolean(*GMimeGpgmeKeyTrustCB) (const gchar * name, - GMimeGpgmeContext * ctx); - - struct _GMimeGpgmeContext { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext parent_object; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext parent_object; -+#endif /* HAVE_GMIME_2_5_7 */ - - gpgme_ctx_t gpgme_ctx; /* gpgme context */ - gboolean singlepart_mode; /* set context to single-part mode (RFC 2440, 2633) */ -@@ -73,11 +77,21 @@ struct _GMimeGpgmeContext { - GMimeGpgmeKeySelectCB key_select_cb; /* key selection callback */ - GMimeGpgmeKeyTrustCB key_trust_cb; /* low trust key cb */ - gpgme_passphrase_cb_t passphrase_cb; /* passphrase callback */ -+#ifdef HAVE_GMIME_2_5_7 -+ -+ const gchar *sign_protocol; -+ const gchar *encrypt_protocol; -+ const gchar *key_protocol; -+#endif /* HAVE_GMIME_2_5_7 */ - }; - - - struct _GMimeGpgmeContextClass { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContextClass parent_class; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContextClass parent_class; -+#endif /* HAVE_GMIME_2_5_7 */ - - gboolean has_proto_openpgp; - gboolean has_proto_cms; -@@ -86,10 +100,17 @@ struct _GMimeGpgmeContextClass { - - GType g_mime_gpgme_context_get_type(void); - #if defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc - request_passwd, - gpgme_protocol_t protocol, - GError ** error); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeCryptoContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc -+ request_passwd, -+ gpgme_protocol_t protocol, -+ GError ** error); -+#endif /* HAVE_GMIME_2_5_7 */ - #else /* HAVE_GMIME_2_6 */ - GMimeCipherContext *g_mime_gpgme_context_new(GMimeSession * session, - gpgme_protocol_t protocol, -diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c -index 795d2e1..e79c4cb 100644 ---- a/libbalsa/gmime-part-rfc2440.c -+++ b/libbalsa/gmime-part-rfc2440.c -@@ -112,8 +112,13 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - - g_return_val_if_fail(GMIME_IS_PART(part), -1); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL, - -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail(recipients != NULL || sign_userid != NULL, -1); - - /* get the raw content */ -@@ -131,14 +136,27 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - ctx->singlepart_mode = TRUE; - if (recipients == NULL) - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid, - GMIME_CIPHER_HASH_DEFAULT, stream, - cipherstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_sign(GMIME_CRYPTO_CONTEXT(ctx), sign_userid, -+ GMIME_CIPHER_ALGO_DEFAULT, stream, -+ cipherstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - else - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx), - sign_userid != NULL, sign_userid, - recipients, stream, cipherstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_encrypt(GMIME_CRYPTO_CONTEXT(ctx), -+ sign_userid != NULL, sign_userid, -+ GMIME_CIPHER_ALGO_DEFAULT, -+ recipients, stream, cipherstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - if (result == -1) { - g_object_unref(cipherstream); - return -1; -@@ -202,18 +220,31 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - * set on err to provide more information. Upon success, the content - * of part is replaced by the verified output of the crypto engine. - */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeSignatureList * -+#endif /* HAVE_GMIME_2_5_7 */ - g_mime_part_rfc2440_verify(GMimePart * part, - GMimeGpgmeContext * ctx, GError ** err) - { - GMimeStream *stream, *plainstream; - GMimeDataWrapper * wrapper; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *list; -+#endif /* HAVE_GMIME_2_5_7 */ - - g_return_val_if_fail(GMIME_IS_PART(part), NULL); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL, - NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* get the raw content */ - wrapper = g_mime_part_get_content_object(GMIME_PART(part)); -@@ -227,13 +258,25 @@ g_mime_part_rfc2440_verify(GMimePart * part, - - /* verify the signature */ - ctx->singlepart_mode = TRUE; -+#ifndef HAVE_GMIME_2_5_7 - valid = - g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx), - GMIME_CIPHER_HASH_DEFAULT, stream, - plainstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ list = -+ g_mime_crypto_context_verify(GMIME_CRYPTO_CONTEXT(ctx), -+ GMIME_CIPHER_ALGO_DEFAULT, stream, -+ plainstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* upon success, replace the signed content by the checked one */ -- if (valid) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (valid) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (list) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - GMimeDataWrapper *wrapper = g_mime_data_wrapper_new(); - - g_mime_data_wrapper_set_stream(wrapper, plainstream); -@@ -242,7 +285,11 @@ g_mime_part_rfc2440_verify(GMimePart * part, - } - g_object_unref(plainstream); - -+#ifndef HAVE_GMIME_2_5_7 - return valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ return list; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -255,19 +302,32 @@ g_mime_part_rfc2440_verify(GMimePart * part, - * verified and the result is placed in ctx by the underlying gpgme - * context. - */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeDecryptResult * -+#endif /* HAVE_GMIME_2_5_7 */ - g_mime_part_rfc2440_decrypt(GMimePart * part, - GMimeGpgmeContext * ctx, GError ** err) - { - GMimeStream *stream, *plainstream; - GMimeDataWrapper * wrapper; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *result; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeDecryptResult *result; -+#endif /* HAVE_GMIME_2_5_7 */ - gchar *headbuf = g_malloc0(1024); - - g_return_val_if_fail(GMIME_IS_PART(part), NULL); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol != - NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* get the raw content */ - wrapper = g_mime_part_get_content_object(part); -@@ -284,8 +344,13 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, - - /* decrypt and (if possible) verify the input */ - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream, - plainstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_decrypt(GMIME_CRYPTO_CONTEXT(ctx), stream, -+ plainstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - - if (result != NULL) { - GMimeStream *filter_stream; -diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h -index 48be5a4..cc1901a 100644 ---- a/libbalsa/gmime-part-rfc2440.h -+++ b/libbalsa/gmime-part-rfc2440.h -@@ -53,12 +53,21 @@ int g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - GPtrArray * recipients, - const char *sign_userid, - GError ** err); -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part, - GMimeGpgmeContext * ctx, - GError ** err); - GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part, - GMimeGpgmeContext * - ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeSignatureList *g_mime_part_rfc2440_verify(GMimePart * part, -+ GMimeGpgmeContext * ctx, -+ GError ** err); -+GMimeDecryptResult *g_mime_part_rfc2440_decrypt(GMimePart * part, -+ GMimeGpgmeContext * ctx, -+ GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - #ifdef __cplusplus - } -diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c -index a56e12c..df4a2e1 100644 ---- a/libbalsa/rfc3156.c -+++ b/libbalsa/rfc3156.c -@@ -268,9 +268,15 @@ libbalsa_message_body_protection(LibBalsaMessageBody * body) - - #if defined(HAVE_GMIME_2_6) - static gboolean -+#ifndef HAVE_GMIME_2_5_7 - password_request_func(GMimeCipherContext * ctx, const char *user_id, - const char *prompt_ctx, gboolean reprompt, - GMimeStream * response, GError ** err) -+#else /* HAVE_GMIME_2_5_7 */ -+password_request_func(GMimeCryptoContext * ctx, const char *user_id, -+ const char *prompt_ctx, gboolean reprompt, -+ GMimeStream * response, GError ** err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - gint fd; - gchar *name_used; -@@ -366,9 +372,16 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for, - return FALSE; - } - -+#ifndef HAVE_GMIME_2_5_7 - if (g_mime_multipart_signed_sign - (mps, *content, GMIME_CIPHER_CONTEXT(ctx), rfc822_for, -- GMIME_CIPHER_HASH_DEFAULT, error) != 0) { -+ GMIME_CIPHER_HASH_DEFAULT, error) != 0) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_multipart_signed_sign -+ (mps, *content, GMIME_CRYPTO_CONTEXT(ctx), rfc822_for, -+ GMIME_DIGEST_ALGO_DEFAULT, error) != 0) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(mps); - g_object_unref(ctx); - #if !defined(HAVE_GMIME_2_6) -@@ -458,10 +471,18 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for, - - encrypted_obj = GMIME_OBJECT(mpe); - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_multipart_encrypted_encrypt(mpe, *content, - GMIME_CIPHER_CONTEXT(ctx), - FALSE, NULL, - recipients, error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_multipart_encrypted_encrypt(mpe, *content, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ FALSE, NULL, -+ GMIME_DIGEST_ALGO_DEFAULT, -+ recipients, error); -+#endif /* HAVE_GMIME_2_5_7 */ - } - #ifdef HAVE_SMIME - else { -@@ -471,9 +492,15 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for, - encrypted_obj = GMIME_OBJECT(pkcs7); - ctx->singlepart_mode = TRUE; - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_encrypt(pkcs7, *content, - GMIME_CIPHER_CONTEXT(ctx), - recipients, error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_application_pkcs7_encrypt(pkcs7, *content, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ recipients, error); -+#endif /* HAVE_GMIME_2_5_7 */ - } - #endif - -@@ -565,8 +592,14 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - #if !defined(HAVE_GMIME_2_6) - GMimeSession *session; - #endif /* HAVE_GMIME_2_6 */ -- GMimeCipherContext *ctx; -+#ifndef HAVE_GMIME_2_5_7 -+ GMimeCipherContext *g_mime_ctx; - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *g_mime_ctx; -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ -+ GMimeGpgmeContext *ctx; - GError *error = NULL; - - /* paranoia checks */ -@@ -592,12 +625,12 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - /* try to create GMimeGpgMEContext */ - #if !defined(HAVE_GMIME_2_6) - session = g_object_new(g_mime_session_get_type(), NULL, NULL); -- ctx = g_mime_gpgme_context_new(session, protocol, &error); -+ g_mime_ctx = g_mime_gpgme_context_new(session, protocol, &error); - #else /* HAVE_GMIME_2_6 */ -- ctx = -+ g_mime_ctx = - g_mime_gpgme_context_new(password_request_func, protocol, &error); - #endif /* HAVE_GMIME_2_6 */ -- if (ctx == NULL) { -+ if (g_mime_ctx == NULL) { - if (error) { - libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s", - _("creating a gpgme context failed"), -@@ -613,6 +646,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - body->parts->next->sig_info->status = GPGME_SIG_STAT_ERROR; - return FALSE; - } -+ ctx = GMIME_GPGME_CONTEXT(g_mime_ctx); - - /* S/MIME uses the protocol application/pkcs7-signature, but some ancient - mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature, -@@ -622,14 +656,19 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part), - "protocol"); - if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature")) -+#ifndef HAVE_GMIME_2_5_7 -+ g_mime_ctx->sign_protocol = cms_protocol; -+#else /* HAVE_GMIME_2_5_7 */ - ctx->sign_protocol = cms_protocol; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - /* verify the signature */ - - libbalsa_mailbox_lock_store(body->message->mailbox); - valid = g_mime_multipart_signed_verify(GMIME_MULTIPART_SIGNED -- (body->mime_part), ctx, &error); -+ (body->mime_part), g_mime_ctx, -+ &error); - libbalsa_mailbox_unlock_store(body->message->mailbox); - - if (valid == NULL) { -@@ -642,12 +681,16 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - libbalsa_information(LIBBALSA_INFORMATION_ERROR, - _("signature verification failed")); - } -- if (GMIME_GPGME_CONTEXT(ctx)->sig_state) { -- body->parts->next->sig_info = GMIME_GPGME_CONTEXT(ctx)->sig_state; -+ if (ctx->sig_state) { -+ body->parts->next->sig_info = ctx->sig_state; - g_object_ref(G_OBJECT(body->parts->next->sig_info)); - } -+#ifndef HAVE_GMIME_2_5_7 - g_mime_signature_validity_free(valid); -- g_object_unref(ctx); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(valid); -+#endif /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(g_mime_ctx); - #if !defined(HAVE_GMIME_2_6) - g_object_unref(session); - #endif /* HAVE_GMIME_2_6 */ -@@ -747,14 +790,26 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body, - libbalsa_mailbox_lock_store(body->message->mailbox); - if (protocol == GPGME_PROTOCOL_OpenPGP) - mime_obj = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part), - GMIME_CIPHER_CONTEXT(ctx), - &error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part), -+ GMIME_CRYPTO_CONTEXT(ctx), -+ NULL, -+ &error); -+#endif /* HAVE_GMIME_2_5_7 */ - #ifdef HAVE_SMIME - else if (smime_signed) { -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ - - ctx->singlepart_mode = TRUE; -+#ifndef HAVE_GMIME_2_5_7 - mime_obj = - g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part), - &valid, -@@ -766,6 +821,19 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body, - g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part), - GMIME_CIPHER_CONTEXT(ctx), - &error); -+#else /* HAVE_GMIME_2_5_7 */ -+ mime_obj = -+ g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part), -+ &valid, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ &error); -+ g_object_unref(valid); -+ } else -+ mime_obj = -+ g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part), -+ GMIME_CRYPTO_CONTEXT(ctx), -+ &error); -+#endif /* HAVE_GMIME_2_5_7 */ - #endif - libbalsa_mailbox_unlock_store(body->message->mailbox); - -@@ -906,7 +974,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info) - GMimeSession *session; - #endif /* HAVE_GMIME_2_6 */ - GMimeGpgmeContext *ctx; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ - GError *error = NULL; - gpgme_error_t retval; - -@@ -978,7 +1050,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info) - } - - /* clean up */ -+#ifndef HAVE_GMIME_2_5_7 - g_mime_signature_validity_free(valid); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(valid); -+#endif /* HAVE_GMIME_2_5_7 */ - retval = ctx->sig_state->status; - g_object_unref(ctx); - #if !defined(HAVE_GMIME_2_6) --- -cgit v0.9.0.2 diff --git a/community-testing/dbmail/PKGBUILD b/community-testing/dbmail/PKGBUILD deleted file mode 100644 index e7fd4b3ad..000000000 --- a/community-testing/dbmail/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 62080 2012-01-15 19:14:39Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> - -pkgname=dbmail -pkgver=3.0.0_rc3 -pkgrel=1 -pkgdesc="Fast and scalable sql based mail services" -arch=('i686' 'x86_64') -depends=('gmime' 'libzdb' 'mhash' 'libevent') -makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') -optdepends=('postgresql-libs: for PostgreSQL storage backend' - 'sqlite3: for SQLite storage backend' - 'libmysqlclient: for MySQL storage backend' - 'libldap: for LDAP authentication' - 'libsieve: for dbmail-sieve') -url="http://www.dbmail.org" -license=('GPL') -options=('!libtool' 'zipman') -backup=(etc/conf.d/dbmail) -conflicts=('dbmail') -provides=('dbmail') -source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz - dbmail.conf.d - dbmail.rc.d) -md5sums=('52c3b9aad310efc90a6a2fff0552f73e' - 'e7f72bc360decdb2475266391ad12329' - '099225611da20ec194c092ac9befc33c') - -build() { - cd $srcdir/dbmail-${pkgver/_/-}/ - - [ -f Makefile ] || ./configure --prefix=/usr \ - --with-mysql --with-pgsql --with-sqlite --with-ldap --with-sieve - make -} - -package() { - cd $srcdir/dbmail-${pkgver/_/-}/ - make DESTDIR=$pkgdir install - (cd man && make && make install DESTDIR=$pkgdir) - - mkdir $pkgdir/etc - install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample - install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail - install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail - mkdir $pkgdir/usr/share/dbmail - cp -r sql/* $pkgdir/usr/share/dbmail/ - cp dbmail.schema $pkgdir/usr/share/dbmail/ -} diff --git a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch b/community-testing/dbmail/dbmail-2.2.10-pam-support.patch deleted file mode 100644 index 805a7f609..000000000 --- a/community-testing/dbmail/dbmail-2.2.10-pam-support.patch +++ /dev/null @@ -1,251 +0,0 @@ -diff -wbBur dbmail-2.2.10/configure.in dbmail-2.2.10.pam/configure.in ---- dbmail-2.2.10/configure.in 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/configure.in 2008-09-18 16:43:04.000000000 +0400 -@@ -78,6 +78,13 @@ - - AC_SUBST(CRYPTLIB) - -+dnl Check for PAM -+AC_SUBST(PAMLIBS,"") -+AC_CHECK_HEADERS(security/pam_appl.h, -+ [AC_CHECK_LIB(pam,pam_start, -+ [AC_DEFINE(HAVE_PAM,1,[Define if you have PAN including devel headers]) -+ PAMLIBS="-lpam"],,)]) -+ - AC_SUBST(MYSQLLIB) - AC_SUBST(MYSQLALIB) - AC_SUBST(MYSQLLTLIB) -diff -wbBur dbmail-2.2.10/dbmail-user.c dbmail-2.2.10.pam/dbmail-user.c ---- dbmail-2.2.10/dbmail-user.c 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/dbmail-user.c 2008-09-18 16:43:04.000000000 +0400 -@@ -157,7 +157,7 @@ - "md5", "md5-raw", "md5sum", "md5sum-raw", - "md5-hash", "md5-hash-raw", "md5-digest", "md5-digest-raw", - "md5-base64", "md5-base64-raw", "md5base64", "md5base64-raw", -- "shadow", "", NULL -+ "shadow", "pam", "", NULL - }; - - /* These must correspond to the easy text names. */ -@@ -166,7 +166,7 @@ - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, - MD5_BASE64, MD5_BASE64_RAW, MD5_BASE64, MD5_BASE64_RAW, -- SHADOW, PLAINTEXT, PWTYPE_NULL -+ SHADOW, PWTYPE_PAM, PLAINTEXT, PWTYPE_NULL - }; - - memset(pw, 0, 50); -@@ -251,6 +251,12 @@ - *enctype = "crypt"; - } - break; -+#ifdef HAVE_PAM -+ case PWTYPE_PAM: -+ null_strncpy(pw, passwd, 49); -+ *enctype = "pam"; -+ break; -+#endif - default: - qerrorf("Error: password type not supported [%s].\n", - passwdtype); -diff -wbBur dbmail-2.2.10/dbmail-user.h dbmail-2.2.10.pam/dbmail-user.h ---- dbmail-2.2.10/dbmail-user.h 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/dbmail-user.h 2008-09-18 16:43:04.000000000 +0400 -@@ -34,7 +34,7 @@ - typedef enum { - PLAINTEXT = 0, PLAINTEXT_RAW, CRYPT, CRYPT_RAW, - MD5_HASH, MD5_HASH_RAW, MD5_DIGEST, MD5_DIGEST_RAW, -- MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_NULL -+ MD5_BASE64, MD5_BASE64_RAW, SHADOW, PWTYPE_PAM, PWTYPE_NULL - } pwtype_t; - - int mkpassword(const char * const user, const char * const passwd, -diff -wbBur dbmail-2.2.10/modules/authsql.c dbmail-2.2.10.pam/modules/authsql.c ---- dbmail-2.2.10/modules/authsql.c 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/modules/authsql.c 2008-09-18 16:43:04.000000000 +0400 -@@ -27,6 +27,19 @@ - #include "dbmail.h" - #define THIS_MODULE "auth" - -+#ifdef HAVE_PAM -+#include <security/pam_appl.h> -+ -+#ifndef DEFAULT_DBMAIL_PAM_SERVICE -+#define DEFAULT_DBMAIL_PAM_SERVICE "dbmail" -+#endif -+ -+#ifndef DEFAULT_DBMAIL_PAM_TTL -+#define DEFAULT_DBMAIL_PAM_TTL 60 -+#endif -+ -+#endif -+ - extern db_param_t _db_params; - #define DBPFX _db_params.pfx - -@@ -49,17 +62,80 @@ - */ - static int __auth_query(const char *thequery); - -+#ifdef HAVE_PAM -+ -+static char *pam_password = NULL; /* Workaround for Solaris 2.6 brokenness */ -+static pam_handle_t *pamh = NULL; -+static int pam_ttl = DEFAULT_DBMAIL_PAM_TTL; -+static char *pam_service = DEFAULT_DBMAIL_PAM_SERVICE; -+static time_t pamh_created = 0; -+/* -+ * A simple "conversation" function returning the supplied password. -+ * Has a bit to much error control, but this is my first PAM application -+ * so I'd rather check everything than make any mistakes. The function -+ * expects a single converstation message of type PAM_PROMPT_ECHO_OFF. -+ */ -+static int -+password_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) -+{ -+ if (num_msg != 1 || msg[0]->msg_style != PAM_PROMPT_ECHO_OFF) { -+ TRACE(TRACE_ERROR, "Unexpected PAM converstaion '%d/%s'", msg[0]->msg_style, msg[0]->msg); -+ return PAM_CONV_ERR; -+ } -+ if (!appdata_ptr) { -+ /* Workaround for Solaris 2.6 where the PAM library is broken -+ * and does not pass appdata_ptr to the conversation routine -+ */ -+ appdata_ptr = pam_password; -+ } -+ if (!appdata_ptr) { -+ TRACE(TRACE_ERROR, "ERROR: No password available to password_converstation!"); -+ return PAM_CONV_ERR; -+ } -+ *resp = calloc(num_msg, sizeof(struct pam_response)); -+ if (!*resp) { -+ TRACE(TRACE_ERROR, "Out of memory!"); -+ return PAM_CONV_ERR; -+ } -+ (*resp)[0].resp = strdup((char *) appdata_ptr); -+ (*resp)[0].resp_retcode = 0; -+ -+ return ((*resp)[0].resp ? PAM_SUCCESS : PAM_CONV_ERR); -+} -+ -+static struct pam_conv conv = -+{ -+ &password_conversation, -+ NULL -+}; -+ -+#endif -+ -+ - int auth_connect() - { - /* this function is only called after a connection has been made - * if, in the future this is not the case, db.h should export a - * function that enables checking for the database connection - */ -+#ifdef HAVE_PAM -+ -+#endif - return 0; - } - - int auth_disconnect() - { -+#ifdef HAVE_PAM -+ int retval=PAM_SUCCESS; -+ if (pamh) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ pamh = NULL; -+ TRACE(TRACE_ERROR, "failed to release PAM authenticator"); -+ } -+ } -+#endif - return 0; - } - -@@ -458,7 +534,71 @@ - is_validated = (strncmp(md5str, query_result, 32) == 0) ? 1 : 0; - g_free(md5str); - } -+#ifdef HAVE_PAM -+ else if (strcasecmp(query_result, "pam") == 0) { -+ int retval=0; -+ TRACE(TRACE_DEBUG, "validating using pam for user [%s] pass:[%s]",real_username,password); -+ conv.appdata_ptr = (char *) password; -+ pam_password= password; -+ if (pam_ttl == 0) { -+ /* Create PAM connection */ -+ retval = pam_start(pam_service, real_username, &conv, &pamh); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_ERROR, "failed to create PAM authenticator"); -+ goto pam_error; -+ } -+ } else if (!pamh || (time(NULL) - pamh_created) >= pam_ttl || pamh_created > time(NULL)) { -+ /* Close previous PAM connection */ -+ if (pamh) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_WARNING, "failed to release PAM authenticator"); -+ } -+ pamh = NULL; -+ } -+ /* Initialize persistent PAM connection */ -+ retval = pam_start(pam_service, "dbmail@", &conv, &pamh); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_ERROR, "failed to create PAM authenticator"); -+ goto pam_error; -+ } -+ pamh_created = time(NULL); -+ } -+ retval = PAM_SUCCESS; -+ if (pam_ttl != 0) { -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_USER, real_username); -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_CONV, &conv); -+ } -+ if (retval == PAM_SUCCESS) -+ retval = pam_authenticate(pamh, 0); -+ if (retval == PAM_SUCCESS ) //&& !no_acct_mgmt -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_SUCCESS) { -+ is_validated=1; -+ } else { -+pam_error: -+ is_validated=0; -+ } -+ /* cleanup */ -+ retval = PAM_SUCCESS; -+#ifdef PAM_AUTHTOK -+ if (pam_ttl != 0) { -+ if (retval == PAM_SUCCESS) -+ retval = pam_set_item(pamh, PAM_AUTHTOK, NULL); -+ } -+#endif -+ if (pam_ttl == 0 || retval != PAM_SUCCESS) { -+ retval = pam_end(pamh, retval); -+ if (retval != PAM_SUCCESS) { -+ TRACE(TRACE_WARNING, "failed to release PAM authenticator\n"); -+ } -+ pamh = NULL; -+ } - -+ } -+#endif - if (is_validated) { - db_user_log_login(*user_idnr); - } else { -diff -wbBur dbmail-2.2.10/modules/Makefile.am dbmail-2.2.10.pam/modules/Makefile.am ---- dbmail-2.2.10/modules/Makefile.am 2008-03-24 17:49:33.000000000 +0300 -+++ dbmail-2.2.10.pam/modules/Makefile.am 2008-09-18 16:44:53.000000000 +0400 -@@ -60,7 +60,7 @@ - - # This one is always built. - libauth_sql_la_SOURCES = authsql.c --libauth_sql_la_LIBADD = @CRYPTLIB@ -+libauth_sql_la_LIBADD = @CRYPTLIB@ @PAMLIBS@ - - if LDAP - libauth_ldap_la_SOURCES = authldap.c diff --git a/community-testing/dbmail/dbmail.conf.d b/community-testing/dbmail/dbmail.conf.d deleted file mode 100644 index 73309a4a2..000000000 --- a/community-testing/dbmail/dbmail.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Parameters to be passed to dbmail -# -# -# Select the service you want started with dbmail -# -# Available options : -# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved -# -DBMAIL_DAEMONS="dbmail-imapd" diff --git a/community-testing/dbmail/dbmail.rc.d b/community-testing/dbmail/dbmail.rc.d deleted file mode 100644 index 92c34e5d2..000000000 --- a/community-testing/dbmail/dbmail.rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - add_daemon dbmail - ;; - stop) - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/${daemon}.pid) - kill $pid - sleep 4 - stat_done - done - rm_daemon dbmail - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac - -exit 0 diff --git a/community-testing/dsniff/PKGBUILD b/community-testing/dsniff/PKGBUILD deleted file mode 100644 index d705f8887..000000000 --- a/community-testing/dsniff/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 61872 2012-01-09 18:49:25Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: ViNS <gladiator@fastwebnet.it> - -pkgname=dsniff -pkgver=2.4b1 -pkgrel=21 -pkgdesc="Collection of tools for network auditing and penetration testing" -url="http://www.monkey.org/~dugsong/dsniff/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids') -source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz" - "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz") -md5sums=('2f761fa3475682a7512b0b43568ee7d6' - 'fbc9f62f9ab2f98f24f53ad497c1ce5d') - -build() { - cd $srcdir/$pkgname-2.4 - patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff - for i in *.dpatch; do - patch -N < "$i" - done - - LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir"/$pkgname-2.4 - make prefix="$pkgdir"/usr install - install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE - - install -d "$pkgdir"/usr/share - mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ -} diff --git a/community-testing/exim/ChangeLog b/community-testing/exim/ChangeLog deleted file mode 100644 index 80a101472..000000000 --- a/community-testing/exim/ChangeLog +++ /dev/null @@ -1,29 +0,0 @@ -2011-10-10 Angel Velasquez <angvp@archlinux.org> - * Updated to 4.77 - -2011-07-15 Angel Velasquez <angvp@archlinux.org> - * Rebuilt without tcp_wrappers - * Fixing logrotate issue FS#25094 - * ChangeLog file changed name from exim.changelog to ChangeLog - -2011-06-16 Angel Velasquez <angvp@archlinux.org> - * Rebuilt against db 5.2.28 - -2010-05-09 Angel Velasquez <angvp@archlinux.org> - * Updated to 4.76 - * Removed previous patch since is no longer needed - * Removed newaliases script FS#22744 - * Removed sudo dependency - -2010-05-07 Angel Velasquez <angvp@archlinux.org> - * Adding patch for security issue see: http://goo.gl/QBict - -2010-05-06 Angel Velasquez <angvp@archlinux.org> - * Setting sticky id to deliver mail. Closes FS#24109 - -2010-04-30 Angel Velasquez <angvp@archlinux.org> - * exim 4.75 - * Config updated with the aliases path. Closes FS#22743 - * Removed sed hackings and added a exim.Makefile . Closes FS#22744 - * Replaced creation of the user at build time. Closes FS#22745 - diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD deleted file mode 100644 index 31ad9632f..000000000 --- a/community-testing/exim/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 61874 2012-01-09 18:49:46Z stephane $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: judd <jvinet@zeroflux.org> -pkgname=exim -pkgver=4.77 -pkgrel=2 -pkgdesc="Message Transfer Agent" -arch=('x86_64' 'i686') -url="http://www.exim.org/" -license=('GPL') -backup=(etc/mail/aliases etc/mail/exim.conf \ - etc/logrotate.d/exim etc/conf.d/exim) -install=exim.install -changelog=ChangeLog -depends=('db' 'pcre' 'pam' 'openssl' 'libldap') -provides=('smtp-server') -conflicts=('smtp-server') -options=('!makeflags') -source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2" - aliases - exim - exim.logrotate - exim.conf.d - exim.Makefile) -sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475' - '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' - '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' - '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' - '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01' - '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cp "$srcdir/$pkgname.Makefile" Local/Makefile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim - install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim - install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8 - install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim - mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \ - ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin} - chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim - cd build-Linux-* - for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\ - exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\ - exim_fixdb eximstats exinext exiqgrep exiwhat; do - install -m 0755 "$i" "$pkgdir/usr/sbin" - done - - cd "$srcdir/exim-$pkgver/src" - sed -e "s|/etc/aliases|/etc/mail/aliases|g" \ - -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \ - >"$pkgdir/etc/mail/exim.conf" - - cp "$srcdir/aliases" "$pkgdir/etc/mail" - cd "$pkgdir/usr/sbin" - for i in mailq rmail rsmtp runq sendmail; do - ln -s exim "$i" - done - # fhs compliancy - ln -s ../sbin/exim ../lib/sendmail - - mkdir -p "$pkgdir/etc/rc.d" - cp "$srcdir/exim" "$pkgdir/etc/rc.d" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases deleted file mode 100644 index 5a76ff7d5..000000000 --- a/community-testing/exim/aliases +++ /dev/null @@ -1,35 +0,0 @@ -# -# /etc/mail/aliases -# -# NOTE: Make sure you run 'newaliases' after modifying this file -# - -# Basic system aliases -- these MUST be present. -MAILER-DAEMON: postmaster -postmaster: root -hostmaster: root -webmaster: hostmaster -ftpmaster: hostmaster -admin: hostmaster -administrator: hostmaster - -# General redirections for pseudo accounts. -bin: root -daemon: root -games: root -ingres: root -nobody: root -system: root -toor: root -uucp: root - -# Well-known aliases. -manager: root -dumper: root -operator: root - -# trap decode to catch security attacks -decode: root - -# Person who should get root's mail -#root: diff --git a/community-testing/exim/exim b/community-testing/exim/exim deleted file mode 100644 index 8e9640b32..000000000 --- a/community-testing/exim/exim +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/exim` - -case "$1" in - start) - stat_busy "Starting Exim" - [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon exim - stat_done - fi - ;; - stop) - stat_busy "Stopping Exim" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/exim.pid - rm_daemon exim - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile deleted file mode 100644 index a304ce829..000000000 --- a/community-testing/exim/exim.Makefile +++ /dev/null @@ -1,1227 +0,0 @@ -# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ - -################################################## -# The Exim mail transport agent # -################################################## - -# This is the template for Exim's main build-time configuration file. It -# contains settings that are independent of any operating system. These are -# things that are mostly sysadmin choices. The items below are divided into -# those you must specify, those you probably want to specify, those you might -# often want to specify, and those that you almost never need to mention. - -# Edit this file and save the result to a file called Local/Makefile within the -# Exim distribution directory before running the "make" command. - -# Things that depend on the operating system have default settings in -# OS/Makefile-Default, but these are overridden for some OS by files called -# called OS/Makefile-<osname>. You can further override these by creating files -# called Local/Makefile-<osname>, where "<osname>" stands for the name of your -# operating system - look at the names in the OS directory to see which names -# are recognized. - -# However, if you are building Exim for a single OS only, you don't need to -# worry about setting up Local/Makefile-<osname>. Any build-time configuration -# settings you require can in fact be placed in the one file called -# Local/Makefile. It is only if you are building for several OS from the same -# source files that you need to worry about splitting off your own OS-dependent -# settings into separate files. (There's more explanation about how this all -# works in the toplevel README file, under "Modifying the building process", as -# well as in the Exim specification.) - -# One OS-specific thing that may need to be changed is the command for running -# the C compiler; the overall default is gcc, but some OS Makefiles specify cc. -# You can override anything that is set by putting CC=whatever in your -# Local/Makefile. - -# NOTE: You should never need to edit any of the distributed Makefiles; all -# overriding can be done in your Local/Makefile(s). This will make it easier -# for you when the next release comes along. - -# The location of the X11 libraries is something else that is quite variable -# even between different versions of the same operating system (and indeed -# there are different versions of X11 as well, of course). The four settings -# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB -# (dynamic run-time library). You need not worry about X11 unless you want to -# compile the Exim monitor utility. Exim itself does not use X11. - -# Another area of variability between systems is the type and location of the -# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB. -# By default the code assumes ndbm; this often works with gdbm or DB, provided -# they are correctly installed, via their compatibility interfaces. However, -# Exim can also be configured to use the native calls for Berkeley DB (obsolete -# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm. - -# For some operating systems, a default DBM library (other than ndbm) is -# selected by a setting in the OS-specific Makefile. Most modern OS now have -# a DBM library installed as standard, and in many cases this will be selected -# for you by the OS-specific configuration. If Exim compiles without any -# problems, you probably do not have to worry about the DBM library. If you -# do want or need to change it, you should first read the discussion in the -# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's -# interface to the DBM library. - -# In Local/Makefiles blank lines and lines starting with # are ignored. It is -# also permitted to use the # character to add a comment to a setting, for -# example -# -# EXIM_GID=42 # the "mail" group -# -# However, with some versions of "make" this works only if there is no white -# space between the end of the setting and the #, so perhaps it is best -# avoided. A consequence of this facility is that it is not possible to have -# the # character present in any setting, but I can't think of any cases where -# this would be wanted. -############################################################################### - - - -############################################################################### -# THESE ARE THINGS YOU MUST SPECIFY # -############################################################################### - -# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and -# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number. - -# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it -# really is a very good idea to specify it here rather than at run time. This -# is particularly true if you let the logs go to their default location in the -# spool directory, because it means that the location of the logs is known -# before Exim has read the run time configuration file. - -#------------------------------------------------------------------------------ -# BIN_DIRECTORY defines where the exim binary will be installed by "make -# install". The path is also used internally by Exim when it needs to re-invoke -# itself, either to send an error message, or to recover root privilege. Exim's -# utility binaries and scripts are also installed in this directory. There is -# no "standard" place for the binary directory. Some people like to keep all -# the Exim files under one directory such as /usr/exim; others just let the -# Exim binaries go into an existing directory such as /usr/sbin or -# /usr/local/sbin. The installation script will try to create this directory, -# and any superior directories, if they do not exist. - -BIN_DIRECTORY=/usr/sbin - - -#------------------------------------------------------------------------------ -# CONFIGURE_FILE defines where Exim's run time configuration file is to be -# found. It is the complete pathname for the file, not just a directory. The -# location of all other run time files and directories can be changed in the -# run time configuration file. There is a lot of variety in the choice of -# location in different OS, and in the preferences of different sysadmins. Some -# common locations are in /etc or /etc/mail or /usr/local/etc or -# /usr/local/etc/mail. Another possibility is to keep all the Exim files under -# a single directory such as /usr/exim. Whatever you choose, the installation -# script will try to make the directory and any superior directories if they -# don't exist. It will also install a default runtime configuration if this -# file does not exist. - -CONFIGURE_FILE=/etc/mail/exim.conf - -# It is possible to specify a colon-separated list of files for CONFIGURE_FILE. -# In this case, Exim will use the first of them that exists when it is run. -# However, if a list is specified, the installation script no longer tries to -# make superior directories or to install a default runtime configuration. - - -#------------------------------------------------------------------------------ -# The Exim binary must normally be setuid root, so that it starts executing as -# root, but (depending on the options with which it is called) it does not -# always need to retain the root privilege. These settings define the user and -# group that is used for Exim processes when they no longer need to be root. In -# particular, this applies when receiving messages and when doing remote -# deliveries. (Local deliveries run as various non-root users, typically as the -# owner of a local mailbox.) Specifying these values as root is not supported. - -EXIM_USER=ref:exim - -# If you specify EXIM_USER as a name, this is looked up at build time, and the -# uid number is built into the binary. However, you can specify that this -# lookup is deferred until runtime. In this case, it is the name that is built -# into the binary. You can do this by a setting of the form: - -# EXIM_USER=ref:exim - -# In other words, put "ref:" in front of the user name. If you set EXIM_USER -# like this, any value specified for EXIM_GROUP is also passed "by reference". -# Although this costs a bit of resource at runtime, it is convenient to use -# this feature when building binaries that are to be run on multiple systems -# where the name may refer to different uids. It also allows you to build Exim -# on a system where there is no Exim user defined. - -# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must -# also be a setting of EXIM_GROUP. If, on the other hand, you use a name -# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless -# you want to use a group other than the default group for the given user. - -# EXIM_GROUP= - -# Many sites define a user called "exim", with an appropriate default group, -# and use -# -# EXIM_USER=exim -# -# while leaving EXIM_GROUP unspecified (commented out). - - -#------------------------------------------------------------------------------ -# SPOOL_DIRECTORY defines the directory where all the data for messages in -# transit is kept. It is strongly recommended that you define it here, though -# it is possible to leave this till the run time configuration. - -# Exim creates the spool directory if it does not exist. The owner and group -# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to -# all the files and directories that are created in the spool directory. - -# Almost all installations choose this: - -SPOOL_DIRECTORY=/var/spool/exim - - - -############################################################################### -# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # -############################################################################### - -# If you need extra header file search paths on all compiles, put the -I -# options in INCLUDE. If you want the extra searches only for certain -# parts of the build, see more specific xxx_INCLUDE variables below. - -# INCLUDE=-I/example/include - -# You need to specify some routers and transports if you want the Exim that you -# are building to be capable of delivering mail. You almost certainly need at -# least one type of lookup. You should consider whether you want to build -# the Exim monitor or not. - - -#------------------------------------------------------------------------------ -# These settings determine which individual router drivers are included in the -# Exim binary. There are no defaults in the code; those routers that are wanted -# must be defined here by setting the appropriate variables to the value "yes". -# Including a router in the binary does not cause it to be used automatically. -# It has also to be configured in the run time configuration file. By -# commenting out those you know you don't want to use, you can make the binary -# a bit smaller. If you are unsure, leave all of these included for now. - -ROUTER_ACCEPT=yes -ROUTER_DNSLOOKUP=yes -ROUTER_IPLITERAL=yes -ROUTER_MANUALROUTE=yes -ROUTER_QUERYPROGRAM=yes -ROUTER_REDIRECT=yes - -# This one is very special-purpose, so is not included by default. - -# ROUTER_IPLOOKUP=yes - - -#------------------------------------------------------------------------------ -# These settings determine which individual transport drivers are included in -# the Exim binary. There are no defaults; those transports that are wanted must -# be defined here by setting the appropriate variables to the value "yes". -# Including a transport in the binary does not cause it to be used -# automatically. It has also to be configured in the run time configuration -# file. By commenting out those you know you don't want to use, you can make -# the binary a bit smaller. If you are unsure, leave all of these included for -# now. - -TRANSPORT_APPENDFILE=yes -TRANSPORT_AUTOREPLY=yes -TRANSPORT_PIPE=yes -TRANSPORT_SMTP=yes - -# This one is special-purpose, and commonly not required, so it is not -# included by default. - -TRANSPORT_LMTP=yes - - -#------------------------------------------------------------------------------ -# The appendfile transport can write messages to local mailboxes in a number -# of formats. The code for three specialist formats, maildir, mailstore, and -# MBX, is included only when requested. If you do not know what this is about, -# leave these settings commented out. - -SUPPORT_MAILDIR=yes -# SUPPORT_MAILSTORE=yes -# SUPPORT_MBX=yes - - -#------------------------------------------------------------------------------ -# See below for dynamic lookup modules. -# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/ -# If not using package management but using this anyway, then think about how -# you perform upgrades and revert them. You should consider the benefit of -# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can -# maintain two concurrent sets of modules. - -# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for -# your platform. Eg: -# CFLAGS_DYNAMIC=-shared -rdynamic -# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC - -#------------------------------------------------------------------------------ -# These settings determine which file and database lookup methods are included -# in the binary. See the manual chapter entitled "File and database lookups" -# for discussion. DBM and lsearch (linear search) are included by default. If -# you are unsure about the others, leave them commented out for now. -# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is -# for the specialist case of using the DNS as a general database facility (not -# common). -# If set to "2" instead of "yes" then the corresponding lookup will be -# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to -# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to -# EXTRALIBS so that dlopen() is available to Exim. You need to define -# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup -# modules. -# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and -# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS -# (where * is the name as given here in this list). That ensures that only -# the dynamic library and not the exim binary will be linked against the -# library. -# NOTE: LDAP cannot be built as a module! - -LOOKUP_DBM=yes -LOOKUP_LSEARCH=yes -LOOKUP_DNSDB=yes - -# LOOKUP_CDB=yes -LOOKUP_DSEARCH=yes -# LOOKUP_IBASE=yes -LOOKUP_LDAP=yes -# LOOKUP_MYSQL=yes -# LOOKUP_NIS=yes -# LOOKUP_NISPLUS=yes -# LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes -# LOOKUP_WHOSON=yes - -# These two settings are obsolete; all three lookups are compiled when -# LOOKUP_LSEARCH is enabled. However, we retain these for backward -# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set. - -# LOOKUP_WILDLSEARCH=yes -# LOOKUP_NWILDLSEARCH=yes - - -#------------------------------------------------------------------------------ -# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate -# which LDAP library you have. Unfortunately, though most of their functions -# are the same, there are minor differences. Currently Exim knows about four -# LDAP libraries: the one from the University of Michigan (also known as -# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes -# with Solaris 7 onwards. Uncomment whichever of these you are using. - -# LDAP_LIB_TYPE=OPENLDAP1 -LDAP_LIB_TYPE=OPENLDAP2 -# LDAP_LIB_TYPE=NETSCAPE -# LDAP_LIB_TYPE=SOLARIS - -# If you don't set any of these, Exim assumes the original University of -# Michigan (OpenLDAP 1) library. - - -#------------------------------------------------------------------------------ -# The PCRE library is required for exim. There is no longer an embedded -# version of the PCRE library included with the source code, instead you -# must use a system library or build your own copy of PCRE. -# In either case you must specify the library link info here. If the -# PCRE header files are not in the standard search path you must also -# modify the INCLUDE path (above) -# The default setting of PCRE_LIBS should work on the vast majority of -# systems - -PCRE_LIBS=-lpcre - - -#------------------------------------------------------------------------------ -# Additional libraries and include directories may be required for some -# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on -# the command for linking Exim itself, not on any auxiliary programs. You -# don't need to set LOOKUP_INCLUDE if the relevant directories are already -# specified in INCLUDE. The settings below are just examples; -lpq is for -# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. - -# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include -# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 - - -#------------------------------------------------------------------------------ -# Compiling the Exim monitor: If you want to compile the Exim monitor, a -# program that requires an X11 display, then EXIM_MONITOR should be set to the -# value "eximon.bin". Comment out this setting to disable compilation of the -# monitor. The locations of various X11 directories for libraries and include -# files are defaulted in the OS/Makefile-Default file, but can be overridden in -# local OS-specific make files. - - - - -#------------------------------------------------------------------------------ -# Compiling Exim with content scanning support: If you want to compile Exim -# with support for message body content scanning, set WITH_CONTENT_SCAN to -# the value "yes". This will give you malware and spam scanning in the DATA ACL, -# and the MIME ACL. Please read the documentation to learn more about these -# features. - -WITH_CONTENT_SCAN=yes - -# If you want to use the deprecated "demime" condition in the DATA ACL, -# uncomment the line below. Doing so will also explicitly turn on the -# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of -# the "demime" condition. - -WITH_OLD_DEMIME=yes - -# If you're using ClamAV and are backporting fixes to an old version, instead -# of staying current (which is the more usual approach) then you may need to -# use an older API which uses a STREAM command, now deprecated, instead of -# zINSTREAM. If you need to set this, please let the Exim developers know, as -# if nobody reports a need for it, we'll remove this option and clean up the -# code. zINSTREAM was introduced with ClamAV 0.95. -# -# WITH_OLD_CLAMAV_STREAM=yes - -#------------------------------------------------------------------------------ -# By default Exim includes code to support DKIM (DomainKeys Identified -# Mail, RFC4871) signing and verification. Verification of signatures is -# turned on by default. See the spec for information on conditionally -# disabling it. To disable the inclusion of the entire feature, set -# DISABLE_DKIM to "yes" - -# DISABLE_DKIM=yes - - -#------------------------------------------------------------------------------ -# Compiling Exim with experimental features. These are documented in -# experimental-spec.txt. "Experimental" means that the way these features are -# implemented may still change. Backward compatibility is not guaranteed. - -# Uncomment the following lines to add SPF support. You need to have libspf2 -# installed on your system (www.libspf2.org). Depending on where it is installed -# you may have to edit the CFLAGS and LDFLAGS lines. - -# EXPERIMENTAL_SPF=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lspf2 - -# Uncomment the following lines to add SRS (Sender rewriting scheme) support. -# You need to have libsrs_alt installed on your system (srs.mirtol.com). -# Depending on where it is installed you may have to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_SRS=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lsrs_alt - -# Uncomment the following lines to add Brightmail AntiSpam support. You need -# to have the Brightmail client SDK installed. Please check the experimental -# documentation for implementation details. You need to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_BRIGHTMAIL=yes -# CFLAGS += -I/opt/brightmail/bsdk-6.0/include -# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib - - - -############################################################################### -# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # -############################################################################### - -# The items in this section are those that are commonly changed according to -# the sysadmin's preferences, but whose defaults are often acceptable. The -# first five are concerned with security issues, where differing levels of -# paranoia are appropriate in different environments. Sysadmins also vary in -# their views on appropriate levels of defence in these areas. If you do not -# understand these issues, go with the defaults, which are used by many sites. - - -#------------------------------------------------------------------------------ -# Although Exim is normally a setuid program, owned by root, it refuses to run -# local deliveries as root by default. There is a runtime option called -# "never_users" which lists the users that must never be used for local -# deliveries. There is also the setting below, which provides a list that -# cannot be overridden at runtime. This guards against problems caused by -# unauthorized changes to the runtime configuration. You are advised not to -# remove "root" from this option, but you can add other users if you want. The -# list is colon-separated. It must NOT contain any spaces. - -# FIXED_NEVER_USERS=root:bin:daemon -FIXED_NEVER_USERS=root - - -#------------------------------------------------------------------------------ -# By default, Exim insists that its configuration file be owned by root. You -# can specify one additional permitted owner here. - -# CONFIGURE_OWNER= - -# If the configuration file is group-writeable, Exim insists by default that it -# is owned by root. You can specify one additional permitted group owner here. - -# CONFIGURE_GROUP= - -# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked -# up at build time, and the uid or gid number is built into the binary. -# However, you can specify that the lookup is deferred until runtime. In this -# case, it is the name that is built into the binary. You can do this by a -# setting of the form: - -# CONFIGURE_OWNER=ref:mail -# CONFIGURE_GROUP=ref:sysadmin - -# In other words, put "ref:" in front of the user or group name. Although this -# costs a bit of resource at runtime, it is convenient to use this feature when -# building binaries that are to be run on multiple systems where the names may -# refer to different uids or gids. It also allows you to build Exim on a system -# where the relevant user or group is not defined. - - -#------------------------------------------------------------------------------ -# The -C option allows Exim to be run with an alternate runtime configuration -# file. When this is used by root, root privilege is retained by the binary -# (for any other caller including the Exim user, it is dropped). You can -# restrict the location of alternate configurations by defining a prefix below. -# Any file used with -C must then start with this prefix (except that /dev/null -# is also permitted if the caller is root, because that is used in the install -# script). If the prefix specifies a directory that is owned by root, a -# compromise of the Exim account does not permit arbitrary alternate -# configurations to be used. The prefix can be more restrictive than just a -# directory (the second example). - -# ALT_CONFIG_PREFIX=/some/directory/ -# ALT_CONFIG_PREFIX=/some/directory/exim.conf- - - -#------------------------------------------------------------------------------ -# When a user other than root uses the -C option to override the configuration -# file (including the Exim user when re-executing Exim to regain root -# privileges for local message delivery), this will normally cause Exim to -# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which -# contains a list of trusted configuration filenames, one per line. If the -C -# option is used by the Exim user or by the user specified in the -# CONFIGURE_OWNER setting, to specify a configuration file which is listed in -# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. - -# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs - - -#------------------------------------------------------------------------------ -# Uncommenting this option disables the use of the -D command line option, -# which changes the values of macros in the runtime configuration file. -# This is another protection against somebody breaking into the Exim account. - -# DISABLE_D_OPTION=yes - - -#------------------------------------------------------------------------------ -# By contrast, you might be maintaining a system which relies upon the ability -# to override values with -D and assumes that these will be passed through to -# the delivery processes. As of Exim 4.73, this is no longer the case by -# default. Going forward, we strongly recommend that you use a shim Exim -# configuration file owned by root stored under TRUSTED_CONFIG_LIST. -# That shim can set macros before .include'ing your main configuration file. -# -# As a strictly transient measure to ease migration to 4.73, the -# WHITELIST_D_MACROS value definies a colon-separated list of macro-names -# which are permitted to be overridden from the command-line which will be -# honoured by the Exim user. So these are macros that can persist to delivery -# time. -# Examples might be -DTLS or -DSPOOL=/some/dir. The values on the -# command-line are filtered to only permit: [A-Za-z0-9_/.-]* -# -# This option is highly likely to be removed in a future release. It exists -# only to make 4.73 as easy as possible to migrate to. If you use it, we -# encourage you to schedule time to rework your configuration to not depend -# upon it. Most people should not need to use this. -# -# By default, no macros are whitelisted for -D usage. - -# WHITELIST_D_MACROS=TLS:SPOOL - -#------------------------------------------------------------------------------ -# Exim has support for the AUTH (authentication) extension of the SMTP -# protocol, as defined by RFC 2554. If you don't know what SMTP authentication -# is, you probably won't want to include this code, so you should leave these -# settings commented out. If you do want to make use of SMTP authentication, -# you must uncomment at least one of the following, so that appropriate code is -# included in the Exim binary. You will then need to set up the run time -# configuration to make use of the mechanism(s) selected. - -AUTH_CRAM_MD5=yes -# AUTH_CYRUS_SASL=yes -AUTH_DOVECOT=yes -AUTH_PLAINTEXT=yes -AUTH_SPA=yes - - -#------------------------------------------------------------------------------ -# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the -# Cyrus SASL library installed before trying to build Exim, and you probably -# want to uncomment the following line: - -# AUTH_LIBS=-lsasl2 - - -#------------------------------------------------------------------------------ -# When Exim is decoding MIME "words" in header lines, most commonly for use -# in the $header_xxx expansion, it converts any foreign character sets to the -# one that is set in the headers_charset option. The default setting is -# defined by this setting: - -HEADERS_CHARSET="ISO-8859-1" - -# If you are going to make use of $header_xxx expansions in your configuration -# file, or if your users are going to use them in filter files, and the normal -# character set on your host is something other than ISO-8859-1, you might -# like to specify a different default here. This value can be overridden in -# the runtime configuration, and it can also be overridden in individual filter -# files. -# -# IMPORTANT NOTE: The iconv() function is needed for character code -# conversions. Please see the next item... - - -#------------------------------------------------------------------------------ -# Character code conversions are possible only if the iconv() function is -# installed on your operating system. There are two places in Exim where this -# is relevant: (a) The $header_xxx expansion (see the previous item), and (b) -# the Sieve filter support. For those OS where iconv() is known to be installed -# as standard, the file in OS/Makefile-xxxx contains -# -# HAVE_ICONV=yes -# -# If you are not using one of those systems, but have installed iconv(), you -# need to uncomment that line above. In some cases, you may find that iconv() -# and its header file are not in the default places. You might need to use -# something like this: -# -# HAVE_ICONV=yes -# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -liconv -# -# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM -# as well. - - -#------------------------------------------------------------------------------ -# The passwords for user accounts are normally encrypted with the crypt() -# function. Comparisons with encrypted passwords can be done using Exim's -# "crypteq" expansion operator. (This is commonly used as part of the -# configuration of an authenticator for use with SMTP AUTH.) At least one -# operating system has an extended function called crypt16(), which uses up to -# 16 characters of a password (the normal crypt() uses only the first 8). Exim -# supports the use of crypt16() as well as crypt() but note the warning below. - -# You can always indicate a crypt16-encrypted password by preceding it with -# "{crypt16}". If you want the default handling (without any preceding -# indicator) to use crypt16(), uncomment the following line: - -# DEFAULT_CRYPT=crypt16 - -# If you do that, you can still access the basic crypt() function by preceding -# an encrypted password with "{crypt}". For more details, see the description -# of the "crypteq" condition in the manual chapter on string expansions. - -# Some operating systems do not include a crypt16() function, so Exim has one -# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will -# be set in an OS-specific Makefile for the OS that have such a function, so -# you should not need to bother with it. - -# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** -# It turns out that the above is not entirely accurate. As well as crypt16() -# there is a function called bigcrypt() that some operating systems have. This -# may or may not use the same algorithm, and both of them may be different to -# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined. -# -# However, since there is now a move away from the traditional crypt() -# functions towards using SHA1 and other algorithms, tidying up this area of -# Exim is seen as very low priority. In practice, if you need to, you can -# define DEFAULT_CRYPT to the name of any function that has the same interface -# as the traditional crypt() function. -# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** - - -#------------------------------------------------------------------------------ -# Exim can be built to support the SMTP STARTTLS command, which implements -# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you -# must install the OpenSSL library package or the GnuTLS library. Exim contains -# no cryptographic code of its own. Uncomment the following lines if you want -# to build Exim with TLS support. If you don't know what this is all about, -# leave these settings commented out. - -# This setting is required for any TLS support (either OpenSSL or GnuTLS) -SUPPORT_TLS=yes - -# Uncomment this setting if you are using OpenSSL -TLS_LIBS=-lssl -lcrypto - -# Uncomment these settings if you are using GnuTLS -# USE_GNUTLS=yes -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt - -# If you are running Exim as a server, note that just building it with TLS -# support is not all you need to do. You also need to set up a suitable -# certificate, and tell Exim about it by means of the tls_certificate -# and tls_privatekey run time options. You also need to set tls_advertise_hosts -# to specify the hosts to which Exim advertises TLS support. On the other hand, -# if you are running Exim only as a client, building it with TLS support -# is all you need to do. - -# Additional libraries and include files are required for both OpenSSL and -# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed -# with all your other libraries. If they are in a special directory, you may -# need something like - -# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -# or -# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt - -# TLS_LIBS is included only on the command for linking Exim itself, not on any -# auxiliary programs. If the include files are not in a standard place, you can -# set TLS_INCLUDE to specify where they are, for example: - -# TLS_INCLUDE=-I/usr/local/openssl/include/ -# or -# TLS_INCLUDE=-I/opt/gnu/include - -# You don't need to set TLS_INCLUDE if the relevant directories are already -# specified in INCLUDE. - - -#------------------------------------------------------------------------------ -# The default distribution of Exim contains only the plain text form of the -# documentation. Other forms are available separately. If you want to install -# the documentation in "info" format, first fetch the Texinfo documentation -# sources from the ftp directory and unpack them, which should create files -# with the extension "texinfo" in the doc directory. You may find that the -# version number of the texinfo files is different to your Exim version number, -# because the main documentation isn't updated as often as the code. For -# example, if you have Exim version 4.43, the source tarball upacks into a -# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40. -# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you -# have unpacked them. Then set INFO_DIRECTORY to the location of your info -# directory. This varies from system to system, but is often /usr/share/info. -# Once you have done this, "make install" will build the info files and -# install them in the directory you have defined. - -# INFO_DIRECTORY=/usr/share/info - - -#------------------------------------------------------------------------------ -# Exim log directory and files: Exim creates several log files inside a -# single log directory. You can define the directory and the form of the -# log file name here. If you do not set anything, Exim creates a directory -# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses -# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change -# this, you can set LOG_FILE_PATH to a path name containing one occurrence of -# %s. This will be replaced by one of the strings "main", "panic", or "reject" -# to form the final file names. Some installations may want something like this: - -LOG_FILE_PATH=/var/log/exim/%slog - -# which results in files with names /var/log/exim_mainlog, etc. The directory -# in which the log files are placed must exist; Exim does not try to create -# it for itself. It is also your responsibility to ensure that Exim is capable -# of writing files using this path name. The Exim user (see EXIM_USER above) -# must be able to create and update files in the directory you have specified. - -# You can also configure Exim to use syslog, instead of or as well as log -# files, by settings such as these - -# LOG_FILE_PATH=syslog -# LOG_FILE_PATH=syslog:/var/log/exim_%slog - -# The first of these uses only syslog; the second uses syslog and also writes -# to log files. Do not include white space in such a setting as it messes up -# the building process. - - -#------------------------------------------------------------------------------ -# When logging to syslog, the following option caters for syslog replacements -# that are able to accept log entries longer than the 1024 characters allowed -# by RFC 3164. It is up to you to make sure your syslog daemon can handle this. -# Non-printable characters are usually unacceptable regardless, so log entries -# are still split on newline characters. - -# SYSLOG_LONG_LINES=yes - -# If you are not interested in the process identifier (pid) of the Exim that is -# making the call to syslog, then comment out the following line. - -SYSLOG_LOG_PID=yes - - -#------------------------------------------------------------------------------ -# Cycling log files: this variable specifies the maximum number of old -# log files that are kept by the exicyclog log-cycling script. You don't have -# to use exicyclog. If your operating system has other ways of cycling log -# files, you can use them instead. The exicyclog script isn't run by default; -# you have to set up a cron job for it if you want it. - -EXICYCLOG_MAX=10 - - -#------------------------------------------------------------------------------ -# The compress command is used by the exicyclog script to compress old log -# files. Both the name of the command and the suffix that it adds to files -# need to be defined here. See also the EXICYCLOG_MAX configuration. - -COMPRESS_COMMAND=/bin/gzip -COMPRESS_SUFFIX=gz - - -#------------------------------------------------------------------------------ -# If the exigrep utility is fed compressed log files, it tries to uncompress -# them using this command. - -ZCAT_COMMAND=/bin/zcat - - -#------------------------------------------------------------------------------ -# Compiling in support for embedded Perl: If you want to be able to -# use Perl code in Exim's string manipulation language and you have Perl -# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded -# Perl costs quite a lot of resources. Only do this if you really need it. - -# EXIM_PERL=perl.o - - -#------------------------------------------------------------------------------ -# Support for dynamically-loaded string expansion functions via ${dlfunc. If -# you are using gcc the dynamically-loaded object must be compiled with the -# -shared option, and you will need to add -export-dynamic to EXTRALIBS so -# that the local_scan API is made available by the linker. You may also need -# to add -ldl to EXTRALIBS so that dlopen() is available to Exim. - -# EXPAND_DLFUNC=yes - - -#------------------------------------------------------------------------------ -# Exim has support for PAM (Pluggable Authentication Modules), a facility -# which is available in the latest releases of Solaris and in some GNU/Linux -# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim -# support, which is intended for use in conjunction with the SMTP AUTH -# facilities, is included only when requested by the following setting: - -SUPPORT_PAM=yes - -# You probably need to add -lpam to EXTRALIBS, and in some releases of -# GNU/Linux -ldl is also needed. - - -#------------------------------------------------------------------------------ -# Support for authentication via Radius is also available. The Exim support, -# which is intended for use in conjunction with the SMTP AUTH facilities, -# is included only when requested by setting the following parameter to the -# location of your Radius configuration file: - -# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf -# RADIUS_CONFIG_FILE=/etc/radius.conf - -# If you have set RADIUS_CONFIG_FILE, you should also set one of these to -# indicate which RADIUS library is used: - -# RADIUS_LIB_TYPE=RADIUSCLIENT -# RADIUS_LIB_TYPE=RADIUSCLIENTNEW -# RADIUS_LIB_TYPE=RADLIB - -# RADIUSCLIENT is the radiusclient library; you probably need to add -# -lradiusclient to EXTRALIBS. -# -# The API for the radiusclient library was changed at release 0.4.0. -# Unfortunately, the header file does not define a version number that clients -# can use to support both the old and new APIs. If you are using version 0.4.0 -# or later of the radiusclient library, you should use RADIUSCLIENTNEW. -# -# RADLIB is the Radius library that comes with FreeBSD (the header file is -# called radlib.h); you probably need to add -lradius to EXTRALIBS. -# -# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library, -# using the original API. - - -#------------------------------------------------------------------------------ -# Support for authentication via the Cyrus SASL pwcheck daemon is available. -# Note, however, that pwcheck is now deprecated in favour of saslauthd (see -# next item). The Exim support for pwcheck, which is intented for use in -# conjunction with the SMTP AUTH facilities, is included only when requested by -# setting the following parameter to the location of the pwcheck daemon's -# socket. -# -# There is no need to install all of SASL on your system. You just need to run -# ./configure --with-pwcheck, cd to the pwcheck directory within the sources, -# make and make install. You must create the socket directory (default -# /var/pwcheck) and chown it to exim's user and group. Once you have installed -# pwcheck, you should arrange for it to be started by root at boot time. - -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck - - -#------------------------------------------------------------------------------ -# Support for authentication via the Cyrus SASL saslauthd daemon is available. -# The Exim support, which is intented for use in conjunction with the SMTP AUTH -# facilities, is included only when requested by setting the following -# parameter to the location of the saslauthd daemon's socket. -# -# There is no need to install all of SASL on your system. You just need to run -# ./configure --with-saslauthd (and any other options you need, for example, to -# select or deselect authentication mechanisms), cd to the saslauthd directory -# within the sources, make and make install. You must create the socket -# directory (default /var/state/saslauthd) and chown it to exim's user and -# group. Once you have installed saslauthd, you should arrange for it to be -# started by root at boot time. - -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux - - -#------------------------------------------------------------------------------ -# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment -# this setting. See the manual section entitled "Use of tcpwrappers" in the -# chapter on building and installing Exim. -# -# USE_TCP_WRAPPERS=yes -# -# You may well also have to specify a local "include" file and an additional -# library for TCP wrappers, so you probably need something like this: -# -# USE_TCP_WRAPPERS=yes -# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap -# -# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM -# as well. -# -# To use a name other than exim in the tcpwrappers config file, -# e.g. if you're running multiple daemons with different access lists, -# or multiple MTAs with the same access list, define -# TCP_WRAPPERS_DAEMON_NAME accordingly -# -# TCP_WRAPPERS_DAEMON_NAME="exim" - - -#------------------------------------------------------------------------------ -# The default action of the exim_install script (which is run by "make -# install") is to install the Exim binary with a unique name such as -# exim-4.43-1, and then set up a symbolic link called "exim" to reference it, -# moving the symbolic link from any previous version. If you define NO_SYMLINK -# (the value doesn't matter), the symbolic link is not created or moved. You -# will then have to "turn Exim on" by setting up the link manually. - -# NO_SYMLINK=yes - - -#------------------------------------------------------------------------------ -# Another default action of the install script is to install a default runtime -# configuration file if one does not exist. This configuration has a router for -# expanding system aliases. The default assumes that these aliases are kept -# in the traditional file called /etc/aliases. If such a file does not exist, -# the installation script creates one that contains just comments (no actual -# aliases). The following setting can be changed to specify a different -# location for the system alias file. - -SYSTEM_ALIASES_FILE=/etc/mail/aliases - - -#------------------------------------------------------------------------------ -# There are some testing options (-be, -bt, -bv) that read data from the -# standard input when no arguments are supplied. By default, the input lines -# are read using the standard fgets() function. This does not support line -# editing during interactive input (though the terminal's "erase" character -# works as normal). If your operating system has the readline() function, and -# in addition supports dynamic loading of library functions, you can cause -# Exim to use readline() for the -be testing option (only) by uncommenting the -# following setting. Dynamic loading is used so that the library is loaded only -# when the -be testing option is given; by the time the loading occurs, -# Exim has given up its root privilege and is running as the calling user. This -# is the reason why readline() is NOT supported for -bt and -bv, because Exim -# runs as root or as exim, respectively, for those options. When USE_READLINE -# is "yes", as well as supporting line editing, a history of input lines in the -# current run is maintained. - -# USE_READLINE=yes - -# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. -# Note that this option adds to the size of the Exim binary, because the -# dynamic loading library is not otherwise included. - - - -############################################################################### -# THINGS YOU ALMOST NEVER NEED TO MENTION # -############################################################################### - -# The settings in this section are available for use in special circumstances. -# In the vast majority of installations you need not change anything below. - - -#------------------------------------------------------------------------------ -# The following commands live in different places in some OS. Either the -# ultimate default settings, or the OS-specific files should already point to -# the right place, but they can be overridden here if necessary. These settings -# are used when building various scripts to ensure that the correct paths are -# used when the scripts are run. They are not used in the Makefile itself. Perl -# is not necessary for running Exim unless you set EXIM_PERL (see above) to get -# it embedded, but there are some utilities that are Perl scripts. If you -# haven't got Perl, Exim will still build and run; you just won't be able to -# use those utilities. - -# CHOWN_COMMAND=/usr/bin/chown -# CHGRP_COMMAND=/usr/bin/chgrp -# CHMOD_COMMAND=/usr/bin/chmod -# MV_COMMAND=/bin/mv -# RM_COMMAND=/bin/rm -# TOUCH_COMMAND=/usr/bin/touch -# PERL_COMMAND=/usr/bin/perl - - -#------------------------------------------------------------------------------ -# The following macro can be used to change the command for building a library -# of functions. By default the "ar" command is used, with options "cq". -# Only in rare circumstances should you need to change this. - -# AR=ar cq - - -#------------------------------------------------------------------------------ -# In some operating systems, the value of the TMPDIR environment variable -# controls where temporary files are created. Exim does not make use of -# temporary files, except when delivering to MBX mailboxes. However, if Exim -# calls any external libraries (e.g. DBM libraries), they may use temporary -# files, and thus be influenced by the value of TMPDIR. For this reason, when -# Exim starts, it checks the environment for TMPDIR, and if it finds it is set, -# it replaces the value with what is defined here. Commenting this setting -# suppresses the check altogether. - -TMPDIR="/tmp" - - -#------------------------------------------------------------------------------ -# The following macros can be used to change the default modes that are used -# by the appendfile transport. In most installations the defaults are just -# fine, and in any case, you can change particular instances of the transport -# at run time if you want. - -# APPENDFILE_MODE=0600 -# APPENDFILE_DIRECTORY_MODE=0700 -# APPENDFILE_LOCKFILE_MODE=0600 - - -#------------------------------------------------------------------------------ -# In some installations there may be multiple machines sharing file systems, -# where a different configuration file is required for Exim on the different -# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look -# for a configuration file whose name is that defined by CONFIGURE_FILE, -# with the node name obtained by uname() tacked on the end, separated by a -# period (for example, /usr/exim/configure.host.in.some.domain). If this file -# does not exist, then the bare configuration file name is tried. - -# CONFIGURE_FILE_USE_NODE=yes - - -#------------------------------------------------------------------------------ -# In some esoteric configurations two different versions of Exim are run, -# with different setuid values, and different configuration files are required -# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then -# Exim will first look for a configuration file whose name is that defined -# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by -# a period (for eximple, /usr/exim/configure.0). If this file does not exist, -# then the bare configuration file name is tried. In the case when both -# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files -# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. - -# CONFIGURE_FILE_USE_EUID=yes - - -#------------------------------------------------------------------------------ -# The size of the delivery buffers: These specify the sizes (in bytes) of -# the buffers that are used when copying a message from the spool to a -# destination. There is rarely any need to change these values. - -# DELIVER_IN_BUFFER_SIZE=8192 -# DELIVER_OUT_BUFFER_SIZE=8192 - - -#------------------------------------------------------------------------------ -# The mode of the database directory: Exim creates a directory called "db" -# in its spool directory, to hold its databases of hints. This variable -# determines the mode of the created directory. The default value in the -# source is 0750. - -# EXIMDB_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# Database file mode: The mode of files created in the "db" directory defaults -# to 0640 in the source, and can be changed here. - -# EXIMDB_MODE=0640 - - -#------------------------------------------------------------------------------ -# Database lock file mode: The mode of zero-length files created in the "db" -# directory to use for locking purposes defaults to 0640 in the source, and -# can be changed here. - -# EXIMDB_LOCKFILE_MODE=0640 - - -#------------------------------------------------------------------------------ -# This parameter sets the maximum length of the header portion of a message -# that Exim is prepared to process. The default setting is one megabyte. The -# limit exists in order to catch rogue mailers that might connect to your SMTP -# port, start off a header line, and then just pump junk at it for ever. The -# message_size_limit option would also catch this, but it may not be set. -# The value set here is the default; it can be changed at runtime. - -# HEADER_MAXSIZE="(1024*1024)" - - -#------------------------------------------------------------------------------ -# The mode of the input directory: The input directory is where messages are -# kept while awaiting delivery. Exim creates it if necessary, using a mode -# which can be defined here (default 0750). - -# INPUT_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The mode of Exim's log directory, when it is created by Exim inside the spool -# directory, defaults to 0750 but can be changed here. - -# LOG_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The log files themselves are created as required, with a mode that defaults -# to 0640, but which can be changed here. - -# LOG_MODE=0640 - - -#------------------------------------------------------------------------------ -# The TESTDB lookup is for performing tests on the handling of lookup results, -# and is not useful for general running. It should be included only when -# debugging the code of Exim. - -# LOOKUP_TESTDB=yes - - -#------------------------------------------------------------------------------ -# /bin/sh is used by default as the shell in which to run commands that are -# defined in the makefiles. This can be changed if necessary, by uncommenting -# this line and specifying another shell, but note that a Bourne-compatible -# shell is expected. - -# MAKE_SHELL=/bin/sh - - -#------------------------------------------------------------------------------ -# The maximum number of named lists of each type (address, domain, host, and -# local part) can be increased by changing this value. It should be set to -# a multiple of 16. - -MAX_NAMED_LIST=16 - - -#------------------------------------------------------------------------------ -# Network interfaces: Unless you set the local_interfaces option in the runtime -# configuration file to restrict Exim to certain interfaces only, it will run -# code to find all the interfaces there are on your host. Unfortunately, -# the call to the OS that does this requires a buffer large enough to hold -# data for all the interfaces - it was designed in the days when a host rarely -# had more than three or four interfaces. Nowadays hosts can have very many -# virtual interfaces running on the same hardware. If you have more than 250 -# virtual interfaces, you will need to uncomment this setting and increase the -# value. - -# MAXINTERFACES=250 - - -#------------------------------------------------------------------------------ -# Per-message logs: While a message is in the process of being delivered, -# comments on its progress are written to a message log, for the benefit of -# human administrators. These logs are held in a directory called "msglog" -# in the spool directory. Its mode defaults to 0750, but can be changed here. -# The message log directory is also used for storing files that are used by -# transports for returning data to a message's sender (see the "return_output" -# option for transports). - -# MSGLOG_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# There are three options which are used when compiling the Perl interface and -# when linking with Perl. The default values for these are placed automatically -# at the head of the Makefile by the script which builds it. However, if you -# want to override them, you can do so here. - -# PERL_CC= -# PERL_CCOPTS= -# PERL_LIBS= - - -#------------------------------------------------------------------------------ -# Identifying the daemon: When an Exim daemon starts up, it writes its pid -# (process id) to a file so that it can easily be identified. The path of the -# file can be specified here. Some installations may want something like this: - -PID_FILE_PATH=/var/run/exim.pid - -# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory -# using the name "exim-daemon.pid". - -# If you start up a daemon without the -bd option (for example, with just -# the -q15m option), a pid file is not written. Also, if you override the -# configuration file with the -oX option, no pid file is written. In other -# words, the pid file is written only for a "standard" daemon. - - -#------------------------------------------------------------------------------ -# If Exim creates the spool directory, it is given this mode, defaulting in the -# source to 0750. - -# SPOOL_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The mode of files on the input spool which hold the contents of messages can -# be changed here. The default is 0640 so that information from the spool is -# available to anyone who is a member of the Exim group. - -# SPOOL_MODE=0640 - - -#------------------------------------------------------------------------------ -# Moving frozen messages: If the following is uncommented, Exim is compiled -# with support for automatically moving frozen messages out of the main spool -# directory, a facility that is found useful by some large installations. A -# run time option is required to cause the moving actually to occur. Such -# messages become "invisible" to the normal management tools. - -# SUPPORT_MOVE_FROZEN_MESSAGES=yes - - -#------------------------------------------------------------------------------ -# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you -# really, really, really know what you are doing. And even then, think again. -# You should never uncomment this when compiling a binary for distribution. -# Use it only when compiling Exim for your own use. -# -# Uncommenting this line enables the use of a runtime option called -# disable_fsync, which can be used to stop Exim using fsync() to ensure that -# files are written to disc before proceeding. When this is disabled, crashes -# and hardware problems such as power outages can cause data to be lost. This -# feature should only be used in very exceptional circumstances. YOU HAVE BEEN -# WARNED. - -# ENABLE_DISABLE_FSYNC=yes - -HAVE_IPV6=YES -LOOKUP_LIBS=-lldap -llber -EXTRALIBS_EXIM=-lpam -# End of EDITME for Exim 4. diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d deleted file mode 100644 index b9bec4335..000000000 --- a/community-testing/exim/exim.conf.d +++ /dev/null @@ -1 +0,0 @@ -EXIM_ARGS="-bd -q15m" diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install deleted file mode 100644 index 8ed329559..000000000 --- a/community-testing/exim/exim.install +++ /dev/null @@ -1,25 +0,0 @@ -# arg 1: the new package version -post_install() { - getent group exim >/dev/null 2>&1 || groupadd -g 79 exim - if getent passwd exim > /dev/null 2>&1; then - usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim - fi - passwd -l exim > /dev/null - chown root.exim /var/spool/exim /var/log/exim - chown exim.exim /var/spool/exim/db - chmod u+s /usr/sbin/exim -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - getent passwd exim >/dev/null 2>&1 && userdel exim -} - diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate deleted file mode 100644 index 070ba4747..000000000 --- a/community-testing/exim/exim.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/exim/*log { - su exim exim - missingok - notifempty - delaycompress -} diff --git a/community-testing/fcron/PKGBUILD b/community-testing/fcron/PKGBUILD deleted file mode 100644 index 2efb43d1e..000000000 --- a/community-testing/fcron/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 61839 2012-01-08 19:56:09Z ttopper $ -# Contributor: Giorgio Lando <lando at imap dot cc> -# Contributor: Sergej Pupykin -# Contributor: Thomas Bächler -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> - -pkgname=fcron -pkgver=3.0.6 -pkgrel=5 -pkgdesc="feature-rich cron implementation" -arch=(i686 x86_64) -url="http://fcron.free.fr" -license=('GPL') -depends=('pam') -makedepends=('smtp-server') -optdepends=('smtp-server: to receive mails from cron jobs') -provides=('cron') -conflicts=('dcron') -backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ - var/spool/fcron/systab var/spool/fcron/systab.orig) -options=('emptydirs' '!makeflags') -source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \ - systab systab.orig run-cron) -md5sums=('69ebcb41921e2a282f41ebecb3a27053' - 'e0c3f0bdc3c98fbbe46eff19001c18f2' - '938722c6654ef7b07f4aa10001905ba1' - 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc/fcron \ - --with-answer-all=no \ - --with-boot-install=no \ - --with-username=root \ - --with-groupname=root \ - --datarootdir=/usr/share \ - --datadir=/usr/share \ - --with-docdir=/usr/share/doc \ - --localstatedir=/var \ - --with-editor=/usr/bin/vi \ - --with-sendmail=/usr/sbin/sendmail - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron" - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" - # Install default fcrontab so that fcron can completely replace dcron - - install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" - # In order to preserve the systab crontab in any case it is better to have - # it in non-binary form too - install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" - - # Add cron.* directories - install -d -m755 "$pkgdir/etc/cron.daily" - install -d -m755 "$pkgdir/etc/cron.hourly" - install -d -m755 "$pkgdir/etc/cron.monthly" - install -d -m755 "$pkgdir/etc/cron.weekly" - - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/fcron/fcron.rc b/community-testing/fcron/fcron.rc deleted file mode 100644 index 880439a1d..000000000 --- a/community-testing/fcron/fcron.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/fcron` -case "$1" in - start) - stat_busy "Starting Fcron Daemon" - [ -z "$PID" ] && /usr/sbin/fcron -b - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon fcron - stat_done - fi - ;; - stop) - stat_busy "Stopping Fcron Daemon" - [ -n "$PID" ] && kill $PID >/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fcron - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/fcron/run-cron b/community-testing/fcron/run-cron deleted file mode 100644 index 51007a15a..000000000 --- a/community-testing/fcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - - -if [ -z $1 ]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in $1/* ; do - if [ -x $cron ]; then - $cron - fi -done -unset cron diff --git a/community-testing/fcron/systab b/community-testing/fcron/systab Binary files differdeleted file mode 100644 index 11c7e2fd0..000000000 --- a/community-testing/fcron/systab +++ /dev/null diff --git a/community-testing/fcron/systab.orig b/community-testing/fcron/systab.orig deleted file mode 100644 index 5b0045626..000000000 --- a/community-testing/fcron/systab.orig +++ /dev/null @@ -1,4 +0,0 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD deleted file mode 100644 index 1ba275a25..000000000 --- a/community-testing/gogglesmm/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 61833 2012-01-08 19:51:55Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=gogglesmm -pkgver=0.12.6 -pkgrel=1 -pkgdesc="Music Manager and Player" -arch=('i686' 'x86_64') -url="http://code.google.com/p/gogglesmm/" -license=('GPL3') -install=gogglesmm.install -depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') -makedepends=('pkgconfig' 'glproto' 'dri2proto') -replaces=('musicmanager') -conflicts=('musicmanager') -source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('19505ee514690fe3372621685666db4c') - -build() { - cd $srcdir/gogglesmm-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/gogglesmm-$pkgver - mkdir -p $pkgdir/usr/bin - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install deleted file mode 100644 index 04c026840..000000000 --- a/community-testing/gogglesmm/gogglesmm.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/libgda3/PKGBUILD b/community-testing/libgda3/PKGBUILD deleted file mode 100644 index 8505681d0..000000000 --- a/community-testing/libgda3/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 61876 2012-01-09 18:49:52Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=libgda3 -pkgver=3.1.5 -pkgrel=11 -pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" -arch=('i686' 'x86_64') -url="http://www.gnome-db.org/Download" -license=('GPL') -depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs' - 'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng') -options=('!libtool' '!distcc') -source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2) -md5sums=('eb7da5286a112e7cff3111c89fba4456') - -build() { - cd "$srcdir/libgda-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package(){ - cd "$srcdir/libgda-$pkgver" - make DESTDIR=$pkgdir install - cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \; -} diff --git a/community-testing/librcc/PKGBUILD b/community-testing/librcc/PKGBUILD deleted file mode 100644 index 121323dd8..000000000 --- a/community-testing/librcc/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 61878 2012-01-09 18:50:01Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=librcc -pkgver=0.2.6 -pkgrel=5 -pkgdesc="Charset Conversion Library" -arch=(i686 x86_64) -url="http://rusxmms.sourceforge.net/" -license=('GPL') -depends=(aspell enca libxml2 db librcd) -makedepends=(patch gtk gtk2) -install=librcc.install -options=('!libtool') -source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 - librcc-strnlen.patch) -md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' - '040313d1d8f166ccf2b128cea4c05f21') - -build() { - cd ${startdir}/src/$pkgname-${pkgver} - ./configure --prefix=/usr - patch -p1 <$srcdir/librcc-strnlen.patch - make -} - -package() { - cd ${startdir}/src/$pkgname-${pkgver} - mkdir -p $startdir/pkg/etc/rcc - mkdir -p $startdir/pkg/usr/lib/rcc/engines - mkdir -p $startdir/pkg/usr/bin - - make DESTDIR=$startdir/pkg install - - make -C examples - make -C examples install DESTDIR=$startdir/pkg - rm -f $startdir/pkg/usr/bin/example* - - install -m 644 examples/rcc.xml $startdir/pkg/etc - - if [ -f $startdir/pkg/usr/bin/rcc-gtk2-config ]; then - ln -s rcc-gtk2-config $startdir/pkg/usr/bin/rcc-config - elif [ -f $startdir/pkg/usr/bin/rcc-gtk-config ]; then - ln -s rcc-gtk-config $startdir/pkg/usr/bin/rcc-config - else - echo "#!/bin/bash" > $startdir/pkg/usr/bin/rcc-config - echo "echo \"Configuration UI is not available!\"" >> $startdir/pkg/usr/bin/rcc-config - fi -} diff --git a/community-testing/librcc/librcc-strnlen.patch b/community-testing/librcc/librcc-strnlen.patch deleted file mode 100644 index 9fc0e8b0b..000000000 --- a/community-testing/librcc/librcc-strnlen.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -wbBur librcc-0.2.6/src/rccstring.h librcc-0.2.6.qwe/src/rccstring.h ---- librcc-0.2.6/src/rccstring.h 2006-01-08 15:42:59.000000000 +0000 -+++ librcc-0.2.6.qwe/src/rccstring.h 2009-09-28 08:45:37.000000000 +0000 -@@ -18,13 +18,6 @@ - int rccStringFixID(rcc_string string, rcc_context ctx); - int rccStringChangeID(rcc_string string, rcc_language_id language_id); - --#ifdef HAVE_STRNLEN --# ifndef strnlen --int strnlen(const char *str, size_t size); --# endif /* !strnlen */ --#else --int rccStrnlen(const char *str, size_t size); --#endif /* HAVE_STRNLEN */ - int rccIsASCII(const char *str); - size_t rccStringSizedGetChars(const char *str, size_t size); - diff --git a/community-testing/librcc/librcc.install b/community-testing/librcc/librcc.install deleted file mode 100644 index 53b1d7ce7..000000000 --- a/community-testing/librcc/librcc.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { - echo "-- Don't forget to install gtk or/and gtk2 packages to enable librcc" - echo " gui features" - echo "-- Also you may change /usr/bin/rcc-config symlink to switch between" - echo " gtk and gtk2 (rcc-gtk-config and rcc-gtk2-config)" -} diff --git a/community-testing/libzdb/PKGBUILD b/community-testing/libzdb/PKGBUILD deleted file mode 100644 index 9e03c87cf..000000000 --- a/community-testing/libzdb/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 62082 2012-01-15 19:15:26Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=libzdb -pkgver=2.10 -pkgrel=1 -pkgdesc="Zild Database Library" -arch=(i686 x86_64) -url="http://www.tildeslash.com/libzdb/" -license=('GPL') -depends=('postgresql-libs' 'sqlite3' 'libmysqlclient') -options=(!libtool) -source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) -md5sums=('fdc04b4b7f33cdcdfc6b559ba9965825') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/lilypond/PKGBUILD b/community-testing/lilypond/PKGBUILD deleted file mode 100644 index 5742b97cd..000000000 --- a/community-testing/lilypond/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 62073 2012-01-15 17:13:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Robert Emil Berge <filoktetes@linuxophic.org> - -pkgname=lilypond -pkgver=2.14.2 -pkgrel=4 -pkgdesc="An automated music engraving system" -arch=('i686' 'x86_64') -url="http://lilypond.org" -license=('GPL') -depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') -makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' - 'gsfonts' 'texi2html') -options=('emptydirs') -install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz - texlive-workaround.patch) -md5sums=('4053a19e03181021893981280feb9aaa' - 'ff32863f3eed67ac744e50bc4fc67a87') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - rm -rf python/out/ - patch -p1 <$srcdir/texlive-workaround.patch - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/lilypond/lilypond.install b/community-testing/lilypond/lilypond.install deleted file mode 100644 index 934e7b435..000000000 --- a/community-testing/lilypond/lilypond.install +++ /dev/null @@ -1,48 +0,0 @@ -infodir=usr/share/info -filelist=(music-glossary.info - lilypond-web.info - lilypond-contributor.info - lilypond-contributor.info-1 - lilypond-contributor.info-2 - lilypond-internals.info-1 - lilypond-internals.info-2 - lilypond-internals.info-3 - lilypond-internals.info-4 - lilypond-internals.info-5 - lilypond-notation.info-1 - lilypond-notation.info-2 - lilypond-notation.info-3 - lilypond-notation.info-4 - lilypond-notation.info-5 - lilypond-notation.info-6 - lilypond-usage.info - lilypond-learning.info - lilypond-web.info-1 - lilypond-web.info-2 - lilypond-internals.info - lilypond-essay.info - lilypond-notation.info - lilypond-learning.info-1 - lilypond-learning.info-2 - lilypond-extending.info - lilypond-changes.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/lilypond/texlive-workaround.patch b/community-testing/lilypond/texlive-workaround.patch deleted file mode 100644 index 1eb262863..000000000 --- a/community-testing/lilypond/texlive-workaround.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf -index d5cbb7f..b25c4bc 100644 ---- a/mf/feta-autometric.mf -+++ b/mf/feta-autometric.mf -@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = - & to_bp (w) & " " - & to_bp (h); - special "% MF2PT1: font_size " & decimal designsize; -- special "% MF2PT1: font_slant " & decimal font_slant_; - - for fvar = "font_identifier", - "font_coding_scheme", -@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = - fi; - endfor; - -- special "% MF2PT1: font_fixed_pitch " -- & (if font_fixed_pitch_: "1" else: "0" fi); -- - % this must come after the `font_size' special - special "% MF2PT1: charwd " & decimal charwd; - fi; -diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp -index a8b45aa..c935628 100644 ---- a/mf/mf2pt1.mp -+++ b/mf/mf2pt1.mp -@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = - def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef; - special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h); - special "% MF2PT1: font_size " & decimal designsize; -- special "% MF2PT1: font_slant " & decimal font_slant_; - special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special| - for fvar = "font_identifier", "font_coding_scheme", "font_version", - "font_comment", "font_family", "font_weight", "font_unique_id", -@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = - scantokens ("decimal " & fvar & "_"); - fi; - endfor; -- special "% MF2PT1: font_fixed_pitch " & -- (if font_fixed_pitch_: "1" else: "0" fi); - enddef; - - -@@ -91,19 +88,6 @@ enddef; - - - %% \begin{explaincode} --%% Store the value of \mfcomment --% |font_slant_|, so we can recall it at each |beginchar|. --%% \end{explaincode} -- --font_slant_ := 0; -- --def font_slant expr x = -- font_slant_ := x; -- fontdimen 1: x --enddef; -- -- --%% \begin{explaincode} - %% Redefine \mfcomment - % |bpppix_|, the number of ``big'' points per pixel. \mfcomment - % This in turn redefines |mm|, |in|, |pt|, and other derived units. -@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness: - scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;"); - endfor; - --boolean font_fixed_pitch_; --font_fixed_pitch_ := false; --def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef; -- -- - %% \begin{explaincode} - %% We'd like to be able to use calligraphic pens. Normally, MetaPost's - %% output routine does all the work for us of converting these to filled -diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl -index 95df0f8..20f410b 100644 ---- a/scripts/build/mf2pt1.pl -+++ b/scripts/build/mf2pt1.pl -@@ -427,7 +427,7 @@ ENDHEADER - sub get_bboxes ($) - { - execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost", -- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile"); -+ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile"); - opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n"; - @charfiles = sort - { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] } diff --git a/community-testing/me-tv/PKGBUILD b/community-testing/me-tv/PKGBUILD deleted file mode 100644 index 4a97fb410..000000000 --- a/community-testing/me-tv/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -#Maintainer: jakob gruber <jakob.gruber@gmail.com> -#Contributor: gborzi -#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us> -#Previous Contributor: Heiko Baums <heiko@baums-on-web.de> -#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com> - -pkgname=me-tv -pkgver=2.0.1 -pkgrel=3 -pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" -arch=('i686' 'x86_64') -url="https://launchpad.net/me-tv" -license=('GPL') -depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') -makedepends=('intltool') -install='me-tv.install' -source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -options=('!emptydirs') -md5sums=('7cda820b795f2fea522ba3de5e312483') - -build() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr - make - -} - -package() { - - cd "${srcdir}/${pkgname}-${pkgver}" - - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ - --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas" - - rm -rf "${pkgdir}/usr/etc/" - -} diff --git a/community-testing/me-tv/me-tv.install b/community-testing/me-tv/me-tv.install deleted file mode 100644 index f701b4754..000000000 --- a/community-testing/me-tv/me-tv.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=me-tv - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD deleted file mode 100644 index d81e08908..000000000 --- a/community-testing/openscenegraph/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 61731 2012-01-07 05:11:14Z ebelanger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Hans Janssen <janserv@gmail.com> -# Contributor: my64 <packages@obordes.com> -# Contributor: Colin Pitrat <colin.pitrat@gmail.com> - -pkgname=openscenegraph -pkgver=3.0.1 -pkgrel=3 -pkgdesc="An Open Source, high performance real-time graphics toolkit" -arch=('i686' 'x86_64') -license=('custom:OSGPL') -url="http://www.openscenegraph.org" -depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver') -optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib') -conflicts=('openthreads') -provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - osg-xine-1.2.patch) -#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956' - 'b05a486fdc2aaf06b29efb5e0714672e') - -build() { - cd OpenSceneGraph-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp - patch -p1 <$srcdir/osg-xine-1.2.patch - make -} - -package() { - cd OpenSceneGraph-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true -} diff --git a/community-testing/openscenegraph/osg-xine-1.2.patch b/community-testing/openscenegraph/osg-xine-1.2.patch deleted file mode 100644 index c73b588dc..000000000 --- a/community-testing/openscenegraph/osg-xine-1.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c ---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 -+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 -@@ -2769,8 +2769,8 @@ - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -- rgb_class->driver_class.get_identifier = get_identifier; -- rgb_class->driver_class.get_description = get_description; -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); diff --git a/community-testing/perl-berkeleydb/PKGBUILD b/community-testing/perl-berkeleydb/PKGBUILD deleted file mode 100644 index d57c0ede6..000000000 --- a/community-testing/perl-berkeleydb/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 61880 2012-01-09 18:50:05Z stephane $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-berkeleydb -pkgver=0.50 -pkgrel=2 -pkgdesc="Interface to Berkeley DB version 2, 3 or 4" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/BerkeleyDB/" -license=('GPL' 'PerlArtistic') -depends=('perl' 'db') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('6afc8f49133c262c606d1b96e1412863') - -build() { - cd $srcdir/BerkeleyDB-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` - depends=('perl' "db=$_dbver") - - cd $srcdir/BerkeleyDB-$pkgver - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-testing/pinot/PKGBUILD b/community-testing/pinot/PKGBUILD deleted file mode 100644 index 8dd7c740a..000000000 --- a/community-testing/pinot/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 62017 2012-01-14 12:25:05Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=pinot -pkgver=0.98 -pkgrel=2 -pkgdesc='Personal search and metasearch tool' -arch=('i686' 'x86_64') -url='http://pinot.berlios.de/' -license=('GPL') -depends=('gtkmm' 'xapian-core' 'libtextcat' 'sqlite3' 'libxml++' 'curl' - 'gmime' 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' - 'hicolor-icon-theme' 'cairo' 'exiv2') -makedepends=('boost' 'desktop-file-utils') -optdepends=('unzip: ZIP files extraction' - 'poppler: PDF to text conversion' - 'catdvi: DVI to text conversion' - 'djvulibre: DjVu text extraction' - 'unrtf: RTF to HTML conversion' - 'antiword: MS Word to text conversion' - 'catdoc: XLS and PPT to text conversion' - 'deskbar-applet: Pinot Deskbar-Applet module') -options=('!emptydirs') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('8a89a73a48344074aa8f4534ce68fd18e3d84553645cef864c137ab21d8d341c') - -build() { - cd ${srcdir}/$pkgname-$pkgver - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt - sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ -/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ -/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat_conf.txt - - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install - - # Remove Deskbar-Applet handler - rm -rf ${pkgdir}/usr/lib/deskbar-applet/handlers -} diff --git a/community-testing/pinot/pinot.changelog b/community-testing/pinot/pinot.changelog deleted file mode 100644 index 7d899cdb0..000000000 --- a/community-testing/pinot/pinot.changelog +++ /dev/null @@ -1,2 +0,0 @@ -2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * pinot 0.98-1 diff --git a/community-testing/pinot/pinot.install b/community-testing/pinot/pinot.install deleted file mode 100644 index 55ab40426..000000000 --- a/community-testing/pinot/pinot.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "Starting with 0.63, the service is auto-started. " - echo "The file that enables this is located at " - echo "/etc/xdg/autostart/pinot-dbus-daemon.desktop" - echo "Delete this file if you don't want the auto-start." -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/poedit/PKGBUILD b/community-testing/poedit/PKGBUILD deleted file mode 100644 index 59e2358a5..000000000 --- a/community-testing/poedit/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 61882 2012-01-09 18:50:15Z stephane $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=poedit -pkgver=1.4.6.1 -pkgrel=6 -pkgdesc="Cross-platform gettext catalogs (.po files) editor" -arch=('i686' 'x86_64') -url="http://www.poedit.net/" -license=('custom') -depends=('wxgtk>=2.8.11' 'gtkspell' 'db>=5.1' 'hicolor-icon-theme' 'gettext') -makedepends=('pkgconfig') -install=poedit.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('c63ffd991b1a6085ef356a6922356e0a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/poedit/poedit.install b/community-testing/poedit/poedit.install deleted file mode 100644 index 21b79d2d4..000000000 --- a/community-testing/poedit/poedit.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE deleted file mode 100644 index 7d6035775..000000000 --- a/community-testing/python-bsddb/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2008-2009 Jesus Cea Avion - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.
\ No newline at end of file diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD deleted file mode 100644 index 8f7c2fb53..000000000 --- a/community-testing/python-bsddb/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 61884 2012-01-09 18:50:28Z stephane $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-bsddb -pkgname=('python2-bsddb' 'python-bsddb') -pkgver=5.2.0 -pkgrel=3 -pkgdesc="Python interface for BerkeleyDB" -license=('MIT') -arch=('i686' 'x86_64') -url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute') -source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz - db_5.3.patch - LICENSE) -sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8' - '150bb6ce1758ca29f55e876ac75dbac76c9d743d' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -build () { - cd "${srcdir}" - - pushd bsddb3-${pkgver} - patch -Np1 -i ../db_5.3.patch - popd - - cp -r bsddb3-${pkgver}{,-python2} - - # Build python 3 module - cd bsddb3-${pkgver} - python setup.py --berkeley-db=/usr build - - # Build python 2 module - cd ../bsddb3-${pkgver}-python2 - python2 setup.py --berkeley-db=/usr build -} - -package_python2-bsddb() { - depends=('db' 'python2>=2.7') - cd "${srcdir}/bsddb3-${pkgver}-python2" - - python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python-bsddb() { - depends=('db' 'python>=3.2') - cd "${srcdir}/bsddb3-${pkgver}" - - python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/python-bsddb/db_5.3.patch b/community-testing/python-bsddb/db_5.3.patch deleted file mode 100644 index 6ea4d18bb..000000000 --- a/community-testing/python-bsddb/db_5.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Jesus Cea <jcea@jcea.es> -# Date 1324876054 -3600 -# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12 -# Parent 670b1ec4472908a9dc745a338a9f595f92aba667 -Support Berkeley DB 5.3.x - -diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py ---- a/setup2.py Mon Dec 26 06:04:34 2011 +0100 -+++ b/setup2.py Mon Dec 26 06:07:34 2011 +0100 -@@ -128,7 +128,7 @@ - incdir = libdir = None - if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR: - # Supported Berkeley DB versions, in order of preference. -- db_ver_list = ((5, 2), (5, 1), (5, 0), -+ db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0), - (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2)) - - # construct a list of paths to look for the header file in on - diff --git a/community-testing/tomoyo-tools/PKGBUILD b/community-testing/tomoyo-tools/PKGBUILD deleted file mode 100644 index c2e406cd5..000000000 --- a/community-testing/tomoyo-tools/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 61687 2012-01-06 17:27:08Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> - -pkgname=tomoyo-tools -_basever=2.5.0 -_timestamp=20111025 -_file=53357 -pkgver=${_basever}.${_timestamp} -pkgrel=1 -pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0' -arch=('i686' 'x86_64') -url='http://tomoyo.sourceforge.jp' -#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' -license=('GPL') -depends=('ncurses') -conflicts=('ccs-tools') -install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('99999779698ea5f44c74d49e8c640ec1') - -build() { - cd "${srcdir}/${pkgname}" - make -j1 -} - -package() { - cd "${srcdir}/${pkgname}" - make INSTALLDIR="${pkgdir}" install -} diff --git a/community-testing/tomoyo-tools/tomoyo-tools.install b/community-testing/tomoyo-tools/tomoyo-tools.install deleted file mode 100644 index 695a53f19..000000000 --- a/community-testing/tomoyo-tools/tomoyo-tools.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install () { - echo - echo " * To enable TOMOYO Linux, append 'security=tomoyo' to the kernel" - echo " boot options and initialize policy with this command:" - echo " /usr/lib/tomoyo/init_policy" - echo -} - -post_upgrade () { - post_install $1 -} diff --git a/community-testing/xemacs/PKGBUILD b/community-testing/xemacs/PKGBUILD deleted file mode 100644 index 2787048b1..000000000 --- a/community-testing/xemacs/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 61886 2012-01-09 18:50:38Z stephane $ -# Maintainer: juergen <juergen@archlinux.org> -# Contributor : Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=xemacs -pkgver=21.5.31 -pkgrel=4 -pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" -arch=('i686' 'x86_64') -url="http://www.xemacs.org/" -license=('GPL') -depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') -optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' - 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') -makedepends=('xbitmaps') -install=xemacs.install -source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz - xemacs.desktop - xemacs-21.5.29-optimization-bug.patch) -md5sums=('0185fe905d0b8d8d094d9b60cf262d4a' - 'a4d3d5c0aa2c7ce7bec491f809ca3694' - 'eb061b10ea3bbe1026df5326ae1618e3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - -# Fix problem caused by improper optimization with GCC>=4.1.2 on i686 -# (and possibly other arches). See -# http://tracker.xemacs.org/XEmacs/its/issue354 -# for the upstream bug report. - patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch - - ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ - --without-postgresql --with-athena=xaw \ - --enable-database=berkdb --without-ldap \ - --enable-menubars=lucid --enable-scrollbars=lucid \ - --enable-widgets=athena --enable-dialogs=athena \ - --enable-external-widget \ - --with-jpeg --with-png --with-tiff \ - --with-ncurses --with-pop --with-xfs --disable-sound \ - --infodir=/usr/share/info \ - --with-mule \ - --mandir=/usr/share/man/man1 - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el - - rm "${pkgdir}"/usr/bin/{b2m,ctags,etags} - rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1} - - # fix FS#7927 - install -d -m755 "${pkgdir}/usr/share/pixmaps" - install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm" - - # correct permissions - chown -R root:root "${pkgdir}" - - rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} -} -# vim: ts=2 sw=2 et ft=sh diff --git a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch deleted file mode 100644 index 32a1a02c2..000000000 --- a/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch +++ /dev/null @@ -1,14 +0,0 @@ -Work around a GCC optimization bug as described in -http://tracker.xemacs.org/XEmacs/its/issue354 - ---- src/dumper.c.~1~ 2008-01-26 09:54:11.000000000 +0100 -+++ src/dumper.c 2008-05-03 10:17:03.000000000 +0200 -@@ -2584,7 +2584,7 @@ - #endif /* !WIN32_NATIVE */ - - --static int -+int - pdump_file_try (Wexttext *exe_path) - { - Wexttext *w = exe_path + wext_strlen (exe_path); diff --git a/community-testing/xemacs/xemacs.desktop b/community-testing/xemacs/xemacs.desktop deleted file mode 100644 index 257c56947..000000000 --- a/community-testing/xemacs/xemacs.desktop +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Name=XEmacs Text Editor -Name[bg]=редактор XEmacs -Name[ca]=Editor XEmacs -Name[cs]=Editor XEmacs -Name[da]=XEmacs tekstredigerer -Name[de]=XEmacs Texteditor -Name[eo]=La redaktilo XEmakso -Name[es]=Emacs para X -Name[et]=Emacs X'i kasutajaliidesega -Name[fi]=XEmacs editori -Name[fr]=Éditeur XEmacs -Name[hu]=XEmacs szövegszerkesztő -Name[is]=XEmacs-ritill -Name[it]=Emacs per X -Name[ja]=XEmacs テキスト・エディター -Name[mk]=Софистицираниот XEmacs уредувач -Name[no]=XEmacs-tekstredigerer -Name[pt]=Editor XEmacs -Name[ro]=Editorul XEmacs -Name[ru]=Редактор XEmacs -Name[sk]=Editor XEmacs -Name[sl]=Urejevalnik XEmacs -Name[uk]=Редактор XEmacs -GenericName=Text Editor -Comment=Edit text -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; -Exec=xemacs %f -Icon=/usr/share/pixmaps/xemacs-icon.xpm -Type=Application -Terminal=false -Categories=Development;TextEditor; -Encoding=UTF-8 -StartupWMClass=Emacs diff --git a/community-testing/xemacs/xemacs.install b/community-testing/xemacs/xemacs.install deleted file mode 100644 index a04ee187f..000000000 --- a/community-testing/xemacs/xemacs.install +++ /dev/null @@ -1,35 +0,0 @@ -infodir=usr/share/info -filelist=(beta.info.gz custom.info.gz - emodules.info.gz external-widget.info.gz - internals.info-1.gz internals.info-2.gz - internals.info-3.gz internals.info-4.gz - internals.info-5.gz internals.info.gz - lispref.info-1.gz lispref.info-10.gz - lispref.info-2.gz lispref.info-3.gz - lispref.info-4.gz lispref.info-5.gz - lispref.info-6.gz lispref.info-7.gz - lispref.info-8.gz lispref.info-9.gz - lispref.info.gz new-users-guide.info.gz - term.info.gz termcap.info.gz - xemacs-faq.info-1.gz xemacs-faq.info-2.gz - xemacs-faq.info.gz xemacs.info-1.gz - xemacs.info-2.gz xemacs.info-3.gz - xemacs.info-4.gz xemacs.info.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done - update-desktop-database -q -} diff --git a/community-testing/xfmedia/PKGBUILD b/community-testing/xfmedia/PKGBUILD deleted file mode 100644 index f2b4b3b97..000000000 --- a/community-testing/xfmedia/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 61733 2012-01-07 05:11:32Z ebelanger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Tom Killian <tomk@runbox.com> -# Contributor: Spider.007 <archPackage@spider007.net> - -pkgname=xfmedia -pkgver=0.9.2 -pkgrel=10 -pkgdesc="xfce media player" -arch=('i686' 'x86_64') -license=('GPL') -url="http://spuriousinterrupt.org/projects/xfmedia/" -depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib') -makedepends=('intltool' 'libxt') -install=xfmedia.install -source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 - xfmedia-dbus-0.6-support.patch - xfmedia-empty-prev-next-fix.patch - xfmedia-exo-0.6.patch - xfmedia-xine-1.2.0.patch) -md5sums=('6eb8bd1f67201f829e0f45e733c02bd5' - '8f2aa12eea584de65d8ed28179e56b51' - '650f8cb9e2ddd9a8a2a03748b8757110' - 'f5e17fcdf2056dcc8ca8aae8600c0132' - '934603c7d3a1a0a66edb847bcb930df1') - -build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ../xfmedia-dbus-0.6-support.patch - patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch - patch -Np1 -i ../xfmedia-exo-0.6.patch - patch -Np1 -i ../xfmedia-xine-1.2.0.patch - LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch b/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch deleted file mode 100644 index 9b1eb3678..000000000 --- a/community-testing/xfmedia/xfmedia-dbus-0.6-support.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c ---- xfmedia-0.9.1.orig/src/remote.c 2005-09-05 00:56:37.000000000 -0400 -+++ xfmedia-0.9.1/src/remote.c 2006-04-08 00:27:18.000000000 -0400 -@@ -55,6 +55,10 @@ - #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER - #endif - -+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT -+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE -+#endif -+ - #endif /* HAVE_DBUS */ - - #include <libxfce4util/libxfce4util.h> diff --git a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch deleted file mode 100644 index e2d0d8166..000000000 --- a/community-testing/xfmedia/xfmedia-empty-prev-next-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c ---- xfmedia-0.9.2/src/mainwin.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/mainwin.c 2010-11-01 13:01:17.000000000 +0000 -@@ -1865,6 +1865,10 @@ - gboolean use_playlist_q = xfmedia_playlist_queue_n_entries(mwin->playlist_q); - gboolean ret = FALSE; - -+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) -+// if(xfmedia_playlist_queue_is_empty(mwin->plist)) -+ return; -+ - if(mwin->cur_playing - && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle") - && !use_playlist_q ) -@@ -1899,6 +1903,10 @@ - { - gint tot_items, idx = -1; - -+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) -+// if(xfmedia_playlist_queue_is_empty(mwin->plist)) -+ return; -+ - if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) { - XfmediaPlaylistEntryRef *ref = NULL; - gboolean playing = FALSE; diff --git a/community-testing/xfmedia/xfmedia-exo-0.6.patch b/community-testing/xfmedia/xfmedia-exo-0.6.patch deleted file mode 100644 index 1de611c82..000000000 --- a/community-testing/xfmedia/xfmedia-exo-0.6.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure ---- xfmedia-0.9.2/configure 2006-11-27 20:20:59.000000000 +0000 -+++ xfmedia-0.9.2.my/configure 2011-01-31 17:15:58.000000000 +0000 -@@ -27417,7 +27417,7 @@ - - - if test x"$xdt_cv_EXO_check" = x"yes"; then -- if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then -+ if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then - - - # minimum supported version of pkg-config -@@ -27501,22 +27501,22 @@ - fi - - -- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5 --echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; } -- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then -- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"` -+ { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5 -+echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; } -+ if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then -+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5 - echo "${ECHO_T}$EXO_VERSION" >&6; } - - { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5 - echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; } -- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"` -+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5 - echo "${ECHO_T}$EXO_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking EXO_LIBS" >&5 - echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; } -- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"` -+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5 - echo "${ECHO_T}$EXO_LIBS" >&6; } - -@@ -27535,15 +27535,15 @@ - - EXO_FOUND="yes" - -- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then -- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"` -+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then -+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 - echo "${ECHO_T}found, but $xdt_cv_version" >&6; } - - -- echo "*** The required package exo-0.3 was found on your system," -+ echo "*** The required package exo-1 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust" -+ echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." -@@ -27554,8 +27554,8 @@ - echo "${ECHO_T}not found" >&6; } - - -- echo "*** The required package exo-0.3 was not found on your system." -- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust" -+ echo "*** The required package exo-1 was not found on your system." -+ echo "*** Please install exo-1 (atleast version 0.3.0) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." -@@ -27564,14 +27564,14 @@ - fi - - else -- { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5 --echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5 -+echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: not found" >&5 - echo "${ECHO_T}not found" >&6; } - fi - else -- { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5 --echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for optional package exo-1" >&5 -+echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: disabled" >&5 - echo "${ECHO_T}disabled" >&6; } - fi -diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c ---- xfmedia-0.9.2/src/main.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/main.c 2011-02-01 11:08:02.000000000 +0000 -@@ -388,6 +388,23 @@ - return optind; - } - -+/** -+ * exo_str_get_md5_str: -+ * @contents : The string to create a digest of. -+ * -+ * Creates a character array MD5 digestof the string -+ * @contents. -+ * -+ * Return value: A newly-allocated character array which -+ * should be free with g_free() when no -+ * longer needed. -+ **/ -+gchar* -+exo_str_get_md5_str (const gchar *contents) -+{ -+ return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1); -+} -+ - int - main(int argc, char **argv) - { -diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c ---- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/mediamarks.c 2011-02-01 11:04:42.000000000 +0000 -@@ -684,9 +684,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - gtk_tree_view_column_pack_start(col, render, TRUE); -@@ -1693,9 +1693,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - gtk_tree_view_column_pack_start(col, render, TRUE); -@@ -1705,9 +1705,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - col = gtk_tree_view_column_new_with_attributes(_("Location"), render, -diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c ---- xfmedia-0.9.2/src/playlist.c 2006-11-27 07:21:22.000000000 +0000 -+++ xfmedia-0.9.2.my/src/playlist.c 2011-02-01 11:04:47.000000000 +0000 -@@ -1409,9 +1409,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text", -diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c ---- xfmedia-0.9.2/src/settings-dialog.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/settings-dialog.c 2011-02-01 11:04:53.000000000 +0000 -@@ -552,7 +552,7 @@ - render = exo_cell_renderer_ellipsized_text_new(); - col = gtk_tree_view_column_new_with_attributes("name", render, - "text", PLUGINS_NAME, NULL); -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col); - -diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c ---- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 07:21:22.000000000 +0000 -+++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c 2011-02-01 11:04:57.000000000 +0000 -@@ -171,7 +171,7 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - g_object_set(G_OBJECT(render), -- "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, - NULL); - col = gtk_tree_view_column_new_with_attributes("display-name", render, diff --git a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch b/community-testing/xfmedia/xfmedia-xine-1.2.0.patch deleted file mode 100644 index 2e04ac80a..000000000 --- a/community-testing/xfmedia/xfmedia-xine-1.2.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c ---- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 -+++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 -@@ -1450,17 +1450,6 @@ - } - - gboolean --xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) --{ -- -- g_return_val_if_fail(xfx != NULL, 0); -- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); -- g_return_val_if_fail(xfx->priv->stream != NULL, 0); -- -- return xine_trick_mode(xfx->priv->stream, mode, value); --} -- --gboolean - xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, - gint *pos_time, gint *length_time) - { -diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h ---- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 -+++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 -@@ -87,9 +87,6 @@ - gboolean xfmedia_xine_play (XfmediaXine *xfx, - gint pos, - gint start_time); --gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, -- gint mode, -- gint value); - gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, - gint info); - G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, diff --git a/community-testing/xfmedia/xfmedia.install b/community-testing/xfmedia/xfmedia.install deleted file mode 100644 index b95cc069d..000000000 --- a/community-testing/xfmedia/xfmedia.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} |