changeset 902:9686672df5a3

imap: use "imap" as default port The "imap" seems to be a better bet than using "imap2" Signed-off-by: Simon Horman <horms@verge.net.au>
author Simon Horman <horms@verge.net.au>
date Thu, 09 Aug 2012 09:03:33 +0900
parents 2cc80436b435
children e8b6f74bfc39
files perdition.spec.in perdition/imap4_write.h
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/perdition.spec.in	Tue Mar 20 21:03:08 2012 +0900
+++ b/perdition.spec.in	Thu Aug 09 09:03:33 2012 +0900
@@ -39,7 +39,7 @@
 %{!?_without_ssl:BuildRequires: openssl-devel}
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
 
-%if 0%{?suse_version} || 0%{?fedora_version}
+%if 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600 || 0%{?suse_version} || 0%{?fedora_version}
 BuildRequires: popt-devel
 %else
 %if 0%{?mandriva_version}
@@ -80,8 +80,6 @@
 %endif
 %endif
 
-Requires: libvanessa_socket2 >= 0.0.12
-
 %description
 Perdition is a fully featured POP3 and IMAP4 proxy server. It is able to
 handle both SSL and non-SSL connections and redirect users to a
--- a/perdition/imap4_write.h	Tue Mar 20 21:03:08 2012 +0900
+++ b/perdition/imap4_write.h	Thu Aug 09 09:03:33 2012 +0900
@@ -40,7 +40,7 @@
 #define IMAP4_UNTAGGED "*"
 #define IMAP4_UNTAGGED_LEN 1
 #define IMAP4_CONT_TAG "+"
-#define IMAP4_DEFAULT_PORT_NAME "imap2"
+#define IMAP4_DEFAULT_PORT_NAME "imap"
 #define IMAP4_DEFAULT_PORT_NUMBER "143"
 #define IMAP4_CAPABILITY_DELIMITER " "
 #define IMAP4S_DEFAULT_PORT_NAME "imaps"