[packages/dovecot] - up to 2.2.14
arekm
arekm at pld-linux.org
Thu Oct 16 14:48:43 CEST 2014
commit 283503bf6ac90ef7b2671cef11de0c916be56cf9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Oct 16 14:48:40 2014 +0200
- up to 2.2.14
dovecot-auth-settings.patch | 69 ---------------------------------------------
dovecot.spec | 12 ++++----
2 files changed, 7 insertions(+), 74 deletions(-)
---
diff --git a/dovecot.spec b/dovecot.spec
index 256988a..87af737 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -10,20 +10,19 @@
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.13
-Release: 3
+Version: 2.2.14
+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: a3eb1c0b1822c4f2b0fe9247776baa71
+# Source0-md5: 03315255920ee1c4b11039945246a8af
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}.sysconfig
Source4: %{name}.tmpfiles
Patch0: %{name}-config.patch
Patch1: %{name}-rpath.patch
-Patch2: %{name}-auth-settings.patch
URL: http://dovecot.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -148,7 +147,6 @@ Współdzielone biblioteki Dovecota.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__sed} -i 's,/usr/lib/dovecot,%{_libdir}/dovecot,g' doc/example-config/*.conf doc/example-config/conf.d/*.conf
@@ -348,6 +346,7 @@ fi
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so
@@ -359,8 +358,10 @@ fi
%files libs
%defattr(644,root,root,755)
%dir %{_libdir}/%{name}
+
%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so.0.0.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so.0.0.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so.0.0.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0.0.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0.0.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0.0.0
@@ -369,6 +370,7 @@ fi
# directory. This is why the following files are not %ghost
%attr(755,root,root) %{_libdir}/%{name}/libdovecot.so.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-compression.so.0
+%attr(755,root,root) %{_libdir}/%{name}/libdovecot-dsync.so.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-lda.so.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-login.so.0
%attr(755,root,root) %{_libdir}/%{name}/libdovecot-sql.so.0
diff --git a/dovecot-auth-settings.patch b/dovecot-auth-settings.patch
deleted file mode 100644
index cdd8361..0000000
--- a/dovecot-auth-settings.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-
-# HG changeset patch
-# User Timo Sirainen <tss at iki.fi>
-# Date 1408538127 -7200
-# Node ID c3da5ffaa0f259711fcaf8334b1998a3af77dc62
-# Parent febedba15c7ebc87a90de5bc935783eb42438126
-auth: protocol-specific username settings weren't used for userdb lookups.
-The username was set before the service-specific settings were looked up, so
-global settings were always used. This affected auth_default_realm,
-auth_username_translation and auth_username_format settings.
-
-diff -r febedba15c7e -r c3da5ffaa0f2 src/auth/auth-master-connection.c
---- a/src/auth/auth-master-connection.c Wed Aug 20 14:22:28 2014 +0300
-+++ b/src/auth/auth-master-connection.c Wed Aug 20 14:35:27 2014 +0200
-@@ -167,7 +167,7 @@
- const char **error_r)
- {
- struct auth_request *auth_request;
-- const char *const *list, *name, *arg;
-+ const char *const *list, *name, *arg, *username;
- unsigned int id;
-
- /* <id> <userid> [<parameters>] */
-@@ -182,11 +182,7 @@
- auth_request->id = id;
- auth_request->master = conn;
- auth_master_connection_ref(conn);
--
-- if (!auth_request_set_username(auth_request, list[1], error_r)) {
-- *request_r = auth_request;
-- return 0;
-- }
-+ username = list[1];
-
- for (list += 2; *list != NULL; list++) {
- arg = strchr(*list, '=');
-@@ -209,6 +205,11 @@
- }
-
- auth_request_init(auth_request);
-+
-+ if (!auth_request_set_username(auth_request, username, error_r)) {
-+ *request_r = auth_request;
-+ return 0;
-+ }
- *request_r = auth_request;
- return 1;
- }
-diff -r febedba15c7e -r c3da5ffaa0f2 src/auth/auth-postfix-connection.c
---- a/src/auth/auth-postfix-connection.c Wed Aug 20 14:22:28 2014 +0300
-+++ b/src/auth/auth-postfix-connection.c Wed Aug 20 14:35:27 2014 +0200
-@@ -51,13 +51,13 @@
- auth_request->context = conn;
- auth_postfix_connection_ref(conn);
-
-+ (void)auth_request_import_info(auth_request, "service", "postfix");
-+ auth_request_init(auth_request);
-+
- if (!auth_request_set_username(auth_request, username, error_r)) {
- *request_r = auth_request;
- return FALSE;
- }
-- (void)auth_request_import_info(auth_request, "service", "postfix");
--
-- auth_request_init(auth_request);
- *request_r = auth_request;
- return TRUE;
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dovecot.git/commitdiff/283503bf6ac90ef7b2671cef11de0c916be56cf9
More information about the pld-cvs-commit
mailing list