~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/plugins/fts-solr/fts-solr-plugin.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
Tags: 1:2.2.9-1ubuntu1
* Merge from Debian unstable, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst: Convert init script to upstart.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/* Copyright (c) 2006-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2006-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "array.h"
 
5
#include "http-client.h"
5
6
#include "mail-user.h"
6
7
#include "mail-storage-hooks.h"
 
8
#include "solr-connection.h"
7
9
#include "fts-solr-plugin.h"
8
10
 
9
11
#include <stdlib.h>
10
12
 
11
 
const char *fts_solr_plugin_version = DOVECOT_VERSION;
 
13
const char *fts_solr_plugin_version = DOVECOT_ABI_VERSION;
 
14
struct http_client *solr_http_client = NULL;
12
15
 
13
16
struct fts_solr_user_module fts_solr_user_module =
14
17
        MODULE_CONTEXT_INIT(&mail_user_module_register);
82
85
        fts_backend_unregister(fts_backend_solr.name);
83
86
        fts_backend_unregister(fts_backend_solr_old.name);
84
87
        mail_storage_hooks_remove(&fts_solr_mail_storage_hooks);
 
88
        if (solr_http_client != NULL)
 
89
                http_client_deinit(&solr_http_client);
 
90
 
85
91
}
86
92
 
87
93
const char *fts_solr_plugin_dependencies[] = { "fts", NULL };