Author: baggins Date: Wed May 9 10:07:14 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 6 - allow building with dovecot 2.1
---- Files affected: packages/dovecot-antispam: dovecot-antispam.spec (1.6 -> 1.7) , dovecot-2.1.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dovecot-antispam/dovecot-antispam.spec diff -u packages/dovecot-antispam/dovecot-antispam.spec:1.6 packages/dovecot-antispam/dovecot-antispam.spec:1.7 --- packages/dovecot-antispam/dovecot-antispam.spec:1.6 Mon Mar 26 23:47:55 2012 +++ packages/dovecot-antispam/dovecot-antispam.spec Wed May 9 12:07:09 2012 @@ -3,11 +3,12 @@ Summary(pl.UTF-8): Wtyczka antyspamowa dla dovecota Name: dovecot-antispam Version: 2.0 -Release: 5 +Release: 6 License: GPL v2 Group: Daemons Source0: http://johannes.sipsolutions.net/download/dovecot-antispam/%{name}-%{version}.tar.bz2 # Source0-md5: 14547898759fbd93f2b98304520decc6 +Patch0: dovecot-2.1.patch URL: http://johannes.sipsolutions.net/Projects/dovecot-antispam BuildRequires: dovecot-devel >= 1:2.0 %requires_eq_to dovecot dovecot-devel @@ -23,6 +24,8 @@ %prep %setup -q +%patch0 -p1 +cp -a antispam-storage-2.0.c antispam-storage-2.1.c %build %{__make} \ @@ -54,6 +57,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2012/05/09 10:07:09 baggins +- rel 6 +- allow building with dovecot 2.1 + Revision 1.6 2012/03/26 21:47:55 baggins - release 5 ================================================================ Index: packages/dovecot-antispam/dovecot-2.1.patch diff -u /dev/null packages/dovecot-antispam/dovecot-2.1.patch:1.1 --- /dev/null Wed May 9 12:07:14 2012 +++ packages/dovecot-antispam/dovecot-2.1.patch Wed May 9 12:07:09 2012 @@ -0,0 +1,34 @@ +--- dovecot-antispam-2.0/antispam-plugin.h~ 2011-11-07 10:49:47.000000000 +0100 ++++ dovecot-antispam-2.0/antispam-plugin.h 2012-05-09 11:50:32.432166565 +0200 +@@ -285,6 +285,31 @@ + { + return dict_init(uri, DICT_DATA_TYPE_STRING, username, NULL); + } ++#elif DOVECOT_IS_EQ(2, 1) ++#define mempool_unref pool_unref ++#define module_arg struct module * ++#define ME(err) MAIL_ERROR_ ##err, ++ ++static inline const char *const * ++get_mail_headers(struct mail *mail, const char *hdr) ++{ ++ const char *const *ret; ++ if (mail_get_headers(mail, hdr, &ret)) ++ return NULL; ++ return ret; ++} ++ ++static inline struct ostream * ++o_stream_create_from_fd(int fd, pool_t pool ATTR_UNUSED) ++{ ++ return o_stream_create_fd(fd, 0, TRUE); ++} ++ ++static inline struct dict * ++string_dict_init(const char *uri, const char *username) ++{ ++ return dict_init(uri, DICT_DATA_TYPE_STRING, username, NULL); ++} + #else + #error "Building against this dovecot version is not supported" + #endif ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/dovecot-antispam/dovecot-antispam.spec?r1=1.6&r2=1.7 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
