From 49234566c590c9ba87b788a7da033f1b65283b2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20=C5=9Awi=C4=85tek?= Date: Sun, 2 Jan 2022 18:51:06 +0100 Subject: [PATCH] - Add patch to not include libcoredumper in mysql check, rel 2 --- dovecot-mysql.patch | 22 ++++++++++++++++++++++ dovecot.spec | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dovecot-mysql.patch diff --git a/dovecot-mysql.patch b/dovecot-mysql.patch new file mode 100644 index 0000000..35f42ff --- /dev/null +++ b/dovecot-mysql.patch @@ -0,0 +1,22 @@ +--- m4/want_mysql.m4 2021-12-03 12:48:47.000000000 +0100 ++++ m4/want_mysql.m4.new 2022-01-02 18:47:50.748433585 +0100 +@@ -1,8 +1,6 @@ + AC_DEFUN([DOVECOT_WANT_MYSQL], [ + have_mysql=no + if test $want_mysql != no; then +- AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, mysql_config, NO) +- if test $MYSQL_CONFIG = NO; then + # based on code from PHP + MYSQL_LIBS="-lmysqlclient -lz -lm" + for i in /usr /usr/local /usr/local/mysql; do +@@ -17,10 +15,6 @@ + fi + done + done +- else +- MYSQL_INCLUDE="`$MYSQL_CONFIG --include`" +- MYSQL_LIBS="`$MYSQL_CONFIG --libs`" +- fi + + old_LIBS=$LIBS + if test "$MYSQL_LIBS" != ""; then diff --git a/dovecot.spec b/dovecot.spec index 02e8042..f1c14cf 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -12,7 +12,7 @@ Summary: IMAP and POP3 server written with security primarily in mind Summary(pl.UTF-8): Serwer IMAP i POP3 pisany głównie z myślą o bezpieczeństwie Name: dovecot Version: 2.3.17.1 -Release: 1 +Release: 2 Epoch: 1 License: MIT (libraries), LGPL v2.1 (the rest) Group: Networking/Daemons @@ -24,6 +24,7 @@ Source3: %{name}.sysconfig Patch0: %{name}-config.patch Patch1: %{name}-rpath.patch Patch2: %{name}-shebang.patch +Patch3: %{name}-mysql.patch URL: http://dovecot.org/ BuildRequires: autoconf BuildRequires: automake @@ -160,6 +161,7 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p0 %{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf -- 2.44.0