commit 9f6c4ad45563d52cb2f068aa7e988ed1ec9a895d
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Mon Jun 11 09:43:30 2018 +0200
- up to 2.2.36; allow alternative config path in sysconfig/dovecot
dovecot-local_name.patch | 11 -----------
dovecot.init | 11 ++++++++++-
dovecot.spec | 10 +++++-----
3 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/dovecot.spec b/dovecot.spec
index 50235ff..05233d5 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -11,20 +11,20 @@
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.2.35
-Release: 2
+Version: 2.2.36
+Release: 1
Epoch: 1
License: MIT (libraries), LGPL v2.1 (the rest)
Group: Networking/Daemons
Source0: http://dovecot.org/releases/2.2/%{name}-%{version}.tar.gz
-# Source0-md5: 6998a3b16c42a8b3c7086b03fa781fba
+# Source0-md5: a8d6492584025b2413e82ea48de3cd5f
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}.sysconfig
Source4: %{name}.tmpfiles
Patch0: %{name}-config.patch
Patch1: %{name}-rpath.patch
-Patch2: %{name}-local_name.patch
+
Patch3: %{name}-disableSSLv3.patch
URL: http://dovecot.org/
BuildRequires: autoconf
@@ -162,7 +162,7 @@ Pakiet programistyczny do tworzenia wtyczek dla Dovecota.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+
%patch3 -p1
%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g'
doc/example-config/*.conf doc/example-config/conf.d/*.conf
diff --git a/dovecot-local_name.patch b/dovecot-local_name.patch
deleted file mode 100644
index d6e34ee..0000000
--- a/dovecot-local_name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dovecot-2.2.35/src/lib-master/master-service-settings-cache.c
2018-03-21 10:15:09.097480691 +0100
-+++ dovecot-2.2.35/src/lib-master/master-service-settings-cache.c~
2018-03-19 10:30:01.000000000 +0100
-@@ -131,7 +131,7 @@ match_local_name(const char *local_name,
- return TRUE;
- local_name = ptr+1;
- }
-- return dns_match_wildcard(filter_local_name, local_name) == 0;
-+ return dns_match_wildcard(local_name, filter_local_name) == 0;
- }
-
- /* Remove any elements which there is no filter for */
diff --git a/dovecot.init b/dovecot.init
index 6a76990..4b1c3be 100644
--- a/dovecot.init
+++ b/dovecot.init
@@ -23,11 +23,20 @@ else
exit 0
fi
+if [ -n "${DOVECOT_CONF}" ]; then
+ if [ -f "${DOVECOT_CONF}" ]; then
+ DOVECOT_CFG="-c ${DOVECOT_CONF}"
+ else
+ echo "error: DOVECOT_CONF='$DOVECOT_CONF': not a file"
+ exit 1
+ fi
+fi
+
start() {
# Check if the service is already running?
if [ ! -f /var/lock/subsys/dovecot ]; then
msg_starting "Dovecot"
- daemon /usr/sbin/dovecot
+ daemon /usr/sbin/dovecot $DOVECOT_CFG
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/dovecot
else
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dovecot.git/commitdiff/9f6c4ad45563d52cb2f068aa7e988ed1ec9a895d
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
