rpms/dovecot/devel dovecot-1.0.rc27-split.patch, 1.1.2.1, 1.1.2.2 dovecot.spec, 1.70.2.2, 1.70.2.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 28 16:18:12 UTC 2007
Author: tjanouse
Update of /cvs/dist/rpms/dovecot/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10660
Modified Files:
Tag: private-145241-branch
dovecot-1.0.rc27-split.patch dovecot.spec
Log Message:
* Wed Mar 28 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-8.6.rc28
- support for not building all sql modules
dovecot-1.0.rc27-split.patch:
configure.in | 38 +++++++++++++++++++----------
src/auth/main.c | 7 ++++-
src/dict/Makefile.am | 3 --
src/dict/main.c | 5 +++
src/lib-sql/Makefile.am | 28 ++-------------------
src/lib-sql/driver-mysql.c | 2 -
src/lib-sql/driver-pgsql.c | 2 -
src/lib-sql/driver-sqlite.c | 2 -
src/lib-sql/sql-api.c | 7 +++++
src/lib-sql/sql-api.h | 4 +--
src/master/main.c | 10 -------
src/plugins/Makefile.am | 11 +++++++-
src/plugins/sql-mysql/Makefile.am | 16 ++++++++++++
src/plugins/sql-mysql/sql-mysql-plugin.c | 12 +++++++++
src/plugins/sql-pgsql/Makefile.am | 16 ++++++++++++
src/plugins/sql-pgsql/sql-pgsql-plugin.c | 12 +++++++++
src/plugins/sql-sqlite/Makefile.am | 16 ++++++++++++
src/plugins/sql-sqlite/sql-sqlite-plugin.c | 12 +++++++++
18 files changed, 142 insertions(+), 61 deletions(-)
Index: dovecot-1.0.rc27-split.patch
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/Attic/dovecot-1.0.rc27-split.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- dovecot-1.0.rc27-split.patch 27 Mar 2007 09:18:03 -0000 1.1.2.1
+++ dovecot-1.0.rc27-split.patch 28 Mar 2007 16:18:10 -0000 1.1.2.2
@@ -1,6 +1,6 @@
diff -Naur dovecot-1.0.rc27/configure.in dovecot-1.0.rc27.split/configure.in
--- dovecot-1.0.rc27/configure.in 2007-03-13 16:59:04.000000000 +0100
-+++ dovecot-1.0.rc27.split/configure.in 2007-03-26 17:46:10.000000000 +0200
++++ dovecot-1.0.rc27.split/configure.in 2007-03-28 18:06:08.000000000 +0200
@@ -1547,12 +1547,12 @@
fi
AC_CHECK_HEADER(libpq-fe.h, [
@@ -65,7 +65,34 @@
dnl **
dnl ** Index file compatibility flags
-@@ -1846,6 +1849,9 @@
+@@ -1774,17 +1777,23 @@
+ dnl ** SQL drivers
+ dnl **
+
++build_pgsql=no
++build_mysql=no
++build_sqlite=no
+ for driver in $sql_drivers; do
+ if test "$driver" = "pgsql"; then
+- AC_DEFINE(BUILD_PGSQL,, Built-in PostgreSQL support)
++ build_pgsql=yes
+ elif test "$driver" = "mysql"; then
+- AC_DEFINE(BUILD_MYSQL,, Built-in MySQL support)
++ build_mysql=yes
+ elif test "$driver" = "sqlite"; then
+- AC_DEFINE(BUILD_SQLITE,, Built-in SQLite support)
++ build_sqlite=yes
+ fi
+ done
+
+ AC_SUBST(sql_drivers)
++AM_CONDITIONAL(BUILD_PGSQL, test "$build_pgsql" = "yes")
++AM_CONDITIONAL(BUILD_MYSQL, test "$build_mysql" = "yes")
++AM_CONDITIONAL(BUILD_SQLITE, test "$build_sqlite" = "yes")
+
+ dnl **
+ dnl ** Plugins
+@@ -1846,6 +1855,9 @@
src/plugins/mail-log/Makefile
src/plugins/trash/Makefile
src/plugins/zlib/Makefile
@@ -77,7 +104,7 @@
diff -Naur dovecot-1.0.rc27/src/auth/main.c dovecot-1.0.rc27.split/src/auth/main.c
--- dovecot-1.0.rc27/src/auth/main.c 2007-02-15 14:05:07.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/auth/main.c 2007-03-26 16:58:39.000000000 +0200
++++ dovecot-1.0.rc27.split/src/auth/main.c 2007-03-28 18:01:34.000000000 +0200
@@ -10,6 +10,7 @@
#include "sql-api.h"
#include "randgen.h"
@@ -115,7 +142,7 @@
diff -Naur dovecot-1.0.rc27/src/dict/main.c dovecot-1.0.rc27.split/src/dict/main.c
--- dovecot-1.0.rc27/src/dict/main.c 2007-02-22 15:32:11.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/dict/main.c 2007-03-26 17:00:28.000000000 +0200
++++ dovecot-1.0.rc27.split/src/dict/main.c 2007-03-28 18:01:34.000000000 +0200
@@ -22,6 +22,7 @@
static struct io *log_io;
@@ -144,7 +171,7 @@
lib_signals_deinit();
diff -Naur dovecot-1.0.rc27/src/dict/Makefile.am dovecot-1.0.rc27.split/src/dict/Makefile.am
--- dovecot-1.0.rc27/src/dict/Makefile.am 2006-06-18 11:44:27.000000000 +0200
-+++ dovecot-1.0.rc27.split/src/dict/Makefile.am 2007-03-26 17:35:07.000000000 +0200
++++ dovecot-1.0.rc27.split/src/dict/Makefile.am 2007-03-28 18:01:34.000000000 +0200
@@ -18,8 +18,7 @@
dict_LDADD = \
$(libs) \
@@ -155,9 +182,57 @@
dict_DEPENDENCIES = $(libs)
+diff -Naur dovecot-1.0.rc27/src/lib-sql/driver-mysql.c dovecot-1.0.rc27.split/src/lib-sql/driver-mysql.c
+--- dovecot-1.0.rc27/src/lib-sql/driver-mysql.c 2006-08-28 19:04:37.000000000 +0200
++++ dovecot-1.0.rc27.split/src/lib-sql/driver-mysql.c 2007-03-28 18:05:23.000000000 +0200
+@@ -5,7 +5,6 @@
+ #include "str.h"
+ #include "sql-api-private.h"
+
+-#ifdef BUILD_MYSQL
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
+@@ -712,4 +711,3 @@
+ sql_driver_unregister(&driver_mysql_db);
+ }
+
+-#endif
+diff -Naur dovecot-1.0.rc27/src/lib-sql/driver-pgsql.c dovecot-1.0.rc27.split/src/lib-sql/driver-pgsql.c
+--- dovecot-1.0.rc27/src/lib-sql/driver-pgsql.c 2007-03-07 00:42:17.000000000 +0100
++++ dovecot-1.0.rc27.split/src/lib-sql/driver-pgsql.c 2007-03-28 18:05:29.000000000 +0200
+@@ -5,7 +5,6 @@
+ #include "ioloop-internal.h" /* kind of dirty, but it should be fine.. */
+ #include "sql-api-private.h"
+
+-#ifdef BUILD_PGSQL
+ #include <stdlib.h>
+ #include <time.h>
+ #include <libpq-fe.h>
+@@ -825,4 +824,3 @@
+ sql_driver_unregister(&driver_pgsql_db);
+ }
+
+-#endif
+diff -Naur dovecot-1.0.rc27/src/lib-sql/driver-sqlite.c dovecot-1.0.rc27.split/src/lib-sql/driver-sqlite.c
+--- dovecot-1.0.rc27/src/lib-sql/driver-sqlite.c 2006-07-01 19:23:52.000000000 +0200
++++ dovecot-1.0.rc27.split/src/lib-sql/driver-sqlite.c 2007-03-28 18:05:36.000000000 +0200
+@@ -4,7 +4,6 @@
+ #include "str.h"
+ #include "sql-api-private.h"
+
+-#ifdef BUILD_SQLITE
+ #include <sqlite3.h>
+
+ /* retry time if db is busy (in ms) */
+@@ -426,4 +425,3 @@
+ sql_driver_unregister(&driver_sqlite_db);
+ }
+
+-#endif
diff -Naur dovecot-1.0.rc27/src/lib-sql/Makefile.am dovecot-1.0.rc27.split/src/lib-sql/Makefile.am
--- dovecot-1.0.rc27/src/lib-sql/Makefile.am 2007-02-22 22:09:16.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/lib-sql/Makefile.am 2007-03-26 17:48:13.000000000 +0200
++++ dovecot-1.0.rc27.split/src/lib-sql/Makefile.am 2007-03-28 18:01:34.000000000 +0200
@@ -4,17 +4,13 @@
AM_CPPFLAGS = \
@@ -207,7 +282,7 @@
+ rm -f Makefile
diff -Naur dovecot-1.0.rc27/src/lib-sql/sql-api.c dovecot-1.0.rc27.split/src/lib-sql/sql-api.c
--- dovecot-1.0.rc27/src/lib-sql/sql-api.c 2006-07-01 19:23:52.000000000 +0200
-+++ dovecot-1.0.rc27.split/src/lib-sql/sql-api.c 2007-03-26 17:05:48.000000000 +0200
++++ dovecot-1.0.rc27.split/src/lib-sql/sql-api.c 2007-03-28 18:01:34.000000000 +0200
@@ -2,6 +2,7 @@
#include "lib.h"
@@ -231,7 +306,7 @@
array_append(&sql_drivers, &driver, 1);
diff -Naur dovecot-1.0.rc27/src/lib-sql/sql-api.h dovecot-1.0.rc27.split/src/lib-sql/sql-api.h
--- dovecot-1.0.rc27/src/lib-sql/sql-api.h 2006-07-01 19:23:52.000000000 +0200
-+++ dovecot-1.0.rc27.split/src/lib-sql/sql-api.h 2007-03-26 16:47:20.000000000 +0200
++++ dovecot-1.0.rc27.split/src/lib-sql/sql-api.h 2007-03-28 18:01:34.000000000 +0200
@@ -18,8 +18,8 @@
void sql_drivers_init(void);
void sql_drivers_deinit(void);
@@ -243,18 +318,48 @@
void sql_driver_register(const struct sql_db *driver);
void sql_driver_unregister(const struct sql_db *driver);
+diff -Naur dovecot-1.0.rc27/src/master/main.c dovecot-1.0.rc27.split/src/master/main.c
+--- dovecot-1.0.rc27/src/master/main.c 2007-01-27 02:42:05.000000000 +0100
++++ dovecot-1.0.rc27.split/src/master/main.c 2007-03-28 18:05:10.000000000 +0200
+@@ -685,16 +685,6 @@
+ #ifdef HAVE_OPENSSL
+ " openssl"
+ #endif
+- "\nSQL drivers:"
+-#ifdef BUILD_MYSQL
+- " mysql"
+-#endif
+-#ifdef BUILD_PGSQL
+- " postgresql"
+-#endif
+-#ifdef BUILD_SQLITE
+- " sqlite"
+-#endif
+ "\nPassdb:"
+ #ifdef PASSDB_BSDAUTH
+ " bsdauth"
diff -Naur dovecot-1.0.rc27/src/plugins/Makefile.am dovecot-1.0.rc27.split/src/plugins/Makefile.am
--- dovecot-1.0.rc27/src/plugins/Makefile.am 2007-03-06 17:34:47.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/Makefile.am 2007-03-23 14:10:03.000000000 +0100
-@@ -2,4 +2,4 @@
++++ dovecot-1.0.rc27.split/src/plugins/Makefile.am 2007-03-28 18:01:34.000000000 +0200
+@@ -1,5 +1,14 @@
+ if BUILD_ZLIB
ZLIB = zlib
endif
++if BUILD_MYSQL
++MYSQL = sql-mysql
++endif
++if BUILD_PGSQL
++PGSQL = sql-pgsql
++endif
++if BUILD_SQLITE
++SQLITE = sql-sqlite
++endif
-SUBDIRS = acl convert quota imap-quota lazy-expunge mail-log trash $(ZLIB)
-+SUBDIRS = acl convert quota imap-quota lazy-expunge mail-log trash sql-mysql sql-pgsql sql-sqlite $(ZLIB)
++SUBDIRS = acl convert quota imap-quota lazy-expunge mail-log trash $(ZLIB) $(MYSQL) $(PGSQL) $(SQLITE)
diff -Naur dovecot-1.0.rc27/src/plugins/sql-mysql/Makefile.am dovecot-1.0.rc27.split/src/plugins/sql-mysql/Makefile.am
--- dovecot-1.0.rc27/src/plugins/sql-mysql/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/sql-mysql/Makefile.am 2007-03-27 11:07:01.000000000 +0200
++++ dovecot-1.0.rc27.split/src/plugins/sql-mysql/Makefile.am 2007-03-28 18:01:34.000000000 +0200
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/lib \
@@ -274,7 +379,7 @@
+ driver-mysql.c
diff -Naur dovecot-1.0.rc27/src/plugins/sql-mysql/sql-mysql-plugin.c dovecot-1.0.rc27.split/src/plugins/sql-mysql/sql-mysql-plugin.c
--- dovecot-1.0.rc27/src/plugins/sql-mysql/sql-mysql-plugin.c 1970-01-01 01:00:00.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/sql-mysql/sql-mysql-plugin.c 2007-03-21 18:36:27.000000000 +0100
++++ dovecot-1.0.rc27.split/src/plugins/sql-mysql/sql-mysql-plugin.c 2007-03-28 18:01:34.000000000 +0200
@@ -0,0 +1,12 @@
+extern void driver_mysql_init(void);
+extern void driver_mysql_deinit(void);
@@ -290,7 +395,7 @@
+}
diff -Naur dovecot-1.0.rc27/src/plugins/sql-pgsql/Makefile.am dovecot-1.0.rc27.split/src/plugins/sql-pgsql/Makefile.am
--- dovecot-1.0.rc27/src/plugins/sql-pgsql/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/sql-pgsql/Makefile.am 2007-03-27 11:07:06.000000000 +0200
++++ dovecot-1.0.rc27.split/src/plugins/sql-pgsql/Makefile.am 2007-03-28 18:01:34.000000000 +0200
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/lib \
@@ -310,7 +415,7 @@
+ driver-pgsql.c
diff -Naur dovecot-1.0.rc27/src/plugins/sql-pgsql/sql-pgsql-plugin.c dovecot-1.0.rc27.split/src/plugins/sql-pgsql/sql-pgsql-plugin.c
--- dovecot-1.0.rc27/src/plugins/sql-pgsql/sql-pgsql-plugin.c 1970-01-01 01:00:00.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/sql-pgsql/sql-pgsql-plugin.c 2007-03-23 13:41:45.000000000 +0100
++++ dovecot-1.0.rc27.split/src/plugins/sql-pgsql/sql-pgsql-plugin.c 2007-03-28 18:01:34.000000000 +0200
@@ -0,0 +1,12 @@
+extern void driver_pgsql_init(void);
+extern void driver_pgsql_deinit(void);
@@ -326,7 +431,7 @@
+}
diff -Naur dovecot-1.0.rc27/src/plugins/sql-sqlite/Makefile.am dovecot-1.0.rc27.split/src/plugins/sql-sqlite/Makefile.am
--- dovecot-1.0.rc27/src/plugins/sql-sqlite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/sql-sqlite/Makefile.am 2007-03-27 11:07:11.000000000 +0200
++++ dovecot-1.0.rc27.split/src/plugins/sql-sqlite/Makefile.am 2007-03-28 18:01:34.000000000 +0200
@@ -0,0 +1,16 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/lib \
@@ -346,7 +451,7 @@
+ driver-sqlite.c
diff -Naur dovecot-1.0.rc27/src/plugins/sql-sqlite/sql-sqlite-plugin.c dovecot-1.0.rc27.split/src/plugins/sql-sqlite/sql-sqlite-plugin.c
--- dovecot-1.0.rc27/src/plugins/sql-sqlite/sql-sqlite-plugin.c 1970-01-01 01:00:00.000000000 +0100
-+++ dovecot-1.0.rc27.split/src/plugins/sql-sqlite/sql-sqlite-plugin.c 2007-03-23 14:10:28.000000000 +0100
++++ dovecot-1.0.rc27.split/src/plugins/sql-sqlite/sql-sqlite-plugin.c 2007-03-28 18:01:34.000000000 +0200
@@ -0,0 +1,12 @@
+extern void driver_sqlite_init(void);
+extern void driver_sqlite_deinit(void);
Index: dovecot.spec
===================================================================
RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v
retrieving revision 1.70.2.2
retrieving revision 1.70.2.3
diff -u -r1.70.2.2 -r1.70.2.3
--- dovecot.spec 27 Mar 2007 09:32:28 -0000 1.70.2.2
+++ dovecot.spec 28 Mar 2007 16:18:10 -0000 1.70.2.3
@@ -1,5 +1,5 @@
%define pkg_version 1.0
-%define my_release 8.5
+%define my_release 8.6
%define pkg_release %{my_release}.rc28%{?dist}
%define pkg_sieve_version 1.0.1
%define pkg_sieve_release %{my_release}%{?dist}
@@ -326,16 +326,25 @@
%defattr(-,root,root)
%{_libdir}/%{name}/lda/lib90_cmusieve_plugin.so
+%if %{build_mysql}
%files mysql
%{_libdir}/%{name}/sql/lib90_sql_mysql_plugin.so
+%endif
+%if %{build_postgres}
%files pgsql
%{_libdir}/%{name}/sql/lib90_sql_pgsql_plugin.so
+%endif
+%if %{build_sqlite}
%files sqlite
%{_libdir}/%{name}/sql/lib90_sql_sqlite_plugin.so
+%endif
%changelog
+* Wed Mar 28 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-8.6.rc28
+- support for not building all sql modules
+
* Tue Mar 27 2007 Tomas Janousek <tjanouse at redhat.com> - 1.0-8.5.rc28
- update to latest upstream
More information about the fedora-cvs-commits
mailing list