← Back to branch summary

~james-page/ubuntu/raring/dovecot/autopkgtest

« back to all changes in this revision

Viewing changes to pigeonhole/src/lib-sieve/sieve-code.h

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-06-11 11:11:54 UTC
  • mfrom: (1.15.2) (4.1.27 sid)
  • Revision ID: package-import@ubuntu.com-20120611111154-678cwbdj6ktgsv1h
Tags: 1:2.1.7-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/{control,rules}: enable PIE hardening.
  + 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.
  + d/control: Added Pre-Depends: dpkg (>= 1.15.6) to dovecot-dbg to support
    xz compression in Ubuntu.
  + d/control: Demote dovecot-common Recommends: to Suggests: to prevent
    install of extra packages on upgrade.
  + d/patches/dovecot-drac.patch: Updated with version for dovecot >= 2.0.0.
  + d/control: Drop B-D on systemd.
* Dropped changes:
  + d/patches/fix-racey-restart.patch: part of 2.1.x, no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
pigeonhole/src/lib-sieve/sieve-code.h
213
213
                const char *field_name); 
214
214
bool sieve_opr_string_dump_ex
215
215
        (const struct sieve_dumptime_env *denv, sieve_size_t *address, 
216
 
                const char *field_name, bool *literal_r); 
 
216
                const char *field_name, const char *omitted_value); 
217
217
int sieve_opr_string_read_data
218
218
        (const struct sieve_runtime_env *renv, struct sieve_operand *operand,
219
219
                sieve_size_t *address, const char *field_name, string_t **str_r);
222
222
                const char *field_name, string_t **str_r);
223
223
int sieve_opr_string_read_ex
224
224
        (const struct sieve_runtime_env *renv, sieve_size_t *address, 
225
 
                const char *field_name, string_t **str_r, bool *literal_r);
 
225
                const char *field_name, bool optional, string_t **str_r, bool *literal_r);
226
226
 
227
227
static inline bool sieve_operand_is_string
228
228
(const struct sieve_operand *operand)
252
252
bool sieve_opr_stringlist_dump
253
253
        (const struct sieve_dumptime_env *denv, sieve_size_t *address,
254
254
                const char *field_name);
 
255
bool sieve_opr_stringlist_dump_ex
 
256
        (const struct sieve_dumptime_env *denv, sieve_size_t *address,
 
257
                const char *field_name, const char *omitted_value);
255
258
int sieve_opr_stringlist_read_data
256
259
        (const struct sieve_runtime_env *renv, struct sieve_operand *operand, 
257
260
                sieve_size_t *address, const char *field_name, 
259
262
int sieve_opr_stringlist_read
260
263
        (const struct sieve_runtime_env *renv, sieve_size_t *address,
261
264
                const char *field_name, struct sieve_stringlist **strlist_r);
 
265
int sieve_opr_stringlist_read_ex
 
266
        (const struct sieve_runtime_env *renv, sieve_size_t *address,
 
267
                const char *field_name, bool optional, struct sieve_stringlist **strlist_r);
262
268
 
263
269
static inline bool sieve_operand_is_stringlist
264
270
(const struct sieve_operand *operand)