diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile index bc81dc3215..7d749299a0 100644 --- a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile @@ -10,3 +10,7 @@ Addon Match\ Header : mail_daemon inbound_filters : LinkSharedOSLibs Match\ Header : be mail ; + +Package haiku-maildaemon-cvs : + Match\ Header : + boot home config add-ons mail_daemon inbound_filters ; diff --git a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile index 92579d3fd4..a8a148544b 100644 --- a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile +++ b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile @@ -8,3 +8,7 @@ Addon R5\ Daemon\ Filter : mail_daemon inbound_filters : LinkSharedOSLibs R5\ Daemon\ Filter : be mail ; + +Package haiku-maildaemon-cvs : + R5\ Daemon\ Filter : + boot home config add-ons mail_daemon inbound_filters ; diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile index d37ffa9df2..1a188d43fd 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile @@ -1,10 +1,15 @@ SubDir OBOS_TOP src add-ons mail_daemon inbound_protocols imap ; UsePrivateHeaders mail ; + SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirC++Flags -DBONE ; +#OpenSSL testing should be automated somehow +#SubDirC++Flags -DBONE -DUSESSL ; +#SubDirHdrs [ FDirName / boot home config include ] ; + Addon IMAP : mail_daemon inbound_protocols : imap_client.cpp imap_config.cpp @@ -12,3 +17,10 @@ Addon IMAP : mail_daemon inbound_protocols : LinkSharedOSLibs IMAP : be mail socket bind ; + +#LinkSharedOSLibs IMAP : +# be mail socket bind ssl crypto ; + +Package haiku-maildaemon-cvs : + IMAP : + boot home config add-ons mail_daemon inbound_protocols ; diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp index b9a30d962d..733279fc0d 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp +++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp @@ -28,7 +28,7 @@ #include #endif -#ifdef IMAPSSL +#ifdef USESSL #include #include #endif @@ -89,7 +89,7 @@ class IMAP4Client : public BMailRemoteStorageProtocol { BList box_info; status_t err; - #ifdef IMAPSSL + #ifdef USESSL SSL_CTX *ctx; SSL *ssl; BIO *sbio; @@ -122,14 +122,14 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BMailRemot err = B_OK; mb_root = settings->FindString("root"); - #ifdef IMAPSSL + #ifdef USESSL use_ssl = (settings->FindInt32("flavor") == 1); #endif int port = settings->FindInt32("port"); if (port <= 0) - #ifdef IMAPSSL + #ifdef USESSL port = use_ssl ? 993 : 143; #else port = 143; @@ -192,7 +192,7 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BMailRemot return; } -#ifdef IMAPSSL +#ifdef USESSL if (use_ssl) { SSL_library_init(); SSL_load_error_strings(); @@ -279,7 +279,7 @@ IMAP4Client::~IMAP4Client() { delete noop; -#ifdef IMAPSSL +#ifdef USESSL if (use_ssl) { SSL_shutdown(ssl); SSL_CTX_free(ctx); @@ -421,7 +421,7 @@ status_t IMAP4Client::AddMessage(const char *mailbox, BPositionIO *data, BString char *buffer = new char[size]; data->ReadAt(0,buffer,size); -#ifdef IMAPSSL +#ifdef USESSL if (use_ssl) { SSL_write(ssl,buffer,size); SSL_write(ssl,"\r\n",2); @@ -884,7 +884,7 @@ IMAP4Client::SendCommand(const char* command) static char cmd[255]; ::sprintf(cmd,"a%.7ld %s"CRLF,++commandCount,command); -#ifdef IMAPSSL +#ifdef USESSL if (use_ssl) SSL_write(ssl,cmd,strlen(cmd)); else @@ -918,7 +918,7 @@ IMAP4Client::ReceiveLine(BString &out) /* Set the socket in the mask. */ FD_SET(net, &fds); int result; -#ifdef IMAPSSL +#ifdef USESSL if ((use_ssl) && (SSL_pending(ssl))) result = 1; else @@ -932,7 +932,7 @@ IMAP4Client::ReceiveLine(BString &out) { while(c != '\n' && c != xEOF) { - #ifdef IMAPSSL + #ifdef USESSL if (use_ssl) r = SSL_read(ssl,&c,1); else @@ -983,7 +983,7 @@ int IMAP4Client::GetResponse(BString &tag, NestedString *parsed_response, bool r /* Set the socket in the mask. */ FD_SET(net, &fds); -#ifdef IMAPSSL +#ifdef USESSL if ((use_ssl) && (SSL_pending(ssl))) result = 1; else @@ -1001,7 +1001,7 @@ int IMAP4Client::GetResponse(BString &tag, NestedString *parsed_response, bool r { while(c != '\n' && c != xEOF) { -#ifdef IMAPSSL +#ifdef USESSL if (use_ssl) r = SSL_read(ssl,&c,1); else @@ -1061,7 +1061,7 @@ int IMAP4Client::GetResponse(BString &tag, NestedString *parsed_response, bool r int read_octets = 0; int nibble_size; while (read_octets < octets_to_read) { - #ifdef IMAPSSL + #ifdef USESSL if (use_ssl) nibble_size = SSL_read(ssl,buffer + read_octets,octets_to_read - read_octets); else diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile index 2a83002b45..db6b9bfa91 100644 --- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile +++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile @@ -5,6 +5,10 @@ SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirC++Flags -DBONE ; +#OpenSSL testing should be automated somehow +#SubDirC++Flags -DBONE -DUSESSL ; +#SubDirHdrs [ FDirName / boot home config include ] ; + Addon POP3 : mail_daemon inbound_protocols : MessageIO.cpp pop3.cpp @@ -13,3 +17,10 @@ Addon POP3 : mail_daemon inbound_protocols : LinkSharedOSLibs POP3 : be mail socket bind ; + +#LinkSharedOSLibs POP3 : +# be mail socket bind ssl crypto ; + +Package haiku-maildaemon-cvs : + POP3 : + boot home config add-ons mail_daemon inbound_protocols ; diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile index 6995ad0acd..b3055bc517 100644 --- a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile +++ b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile @@ -9,3 +9,7 @@ Addon Fortune : mail_daemon outbound_fitlers : LinkSharedOSLibs Fortune : be mail ; + +Package haiku-maildaemon-cvs : + Fortune : + boot home config add-ons mail_daemon outbound_filters ; diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile index f5837cd811..95710a0087 100644 --- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile +++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile @@ -11,3 +11,7 @@ Addon SMTP : mail_daemon outbound_protocols : LinkSharedOSLibs SMTP : be mail socket bind ; + +Package haiku-maildaemon-cvs : + SMTP : + boot home config add-ons mail_daemon outbound_protocols ; diff --git a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile index ad518cb002..ee33b51c1d 100644 --- a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile @@ -8,3 +8,7 @@ Addon Inbox : mail_daemon inbound_filters : LinkSharedOSLibs Inbox : be mail ; + +Package haiku-maildaemon-cvs : + Inbox : + boot home config add-ons mail_daemon system_filters ; diff --git a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile index 166fe21c98..af88999ab7 100644 --- a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile @@ -8,3 +8,7 @@ Addon New\ Mail\ Notification : mail_daemon inbound_filters : LinkSharedOSLibs New\ Mail\ Notification : be mail ; + +Package haiku-maildaemon-cvs : + New\ Mail\ Notification : + boot home config add-ons mail_daemon system_filters ; diff --git a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile index 782148572f..2d6a5e94b8 100644 --- a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile @@ -8,3 +8,7 @@ Addon Outbox : mail_daemon inbound_filters : LinkSharedOSLibs Outbox : be mail ; + +Package haiku-maildaemon-cvs : + Outbox : + boot home config add-ons mail_daemon system_filters ; diff --git a/src/add-ons/mail_daemon/system_filters/parser/Jamfile b/src/add-ons/mail_daemon/system_filters/parser/Jamfile index 1837ebc5cd..4b547cb980 100644 --- a/src/add-ons/mail_daemon/system_filters/parser/Jamfile +++ b/src/add-ons/mail_daemon/system_filters/parser/Jamfile @@ -8,3 +8,7 @@ Addon Message\ Parser : mail_daemon inbound_filters : LinkSharedOSLibs Message\ Parser : be mail ; + +Package haiku-maildaemon-cvs : + Message\ Parser : + boot home config add-ons mail_daemon system_filters ; diff --git a/src/apps/bemail/Jamfile b/src/apps/bemail/Jamfile index ef4359c6bd..3b531e325a 100644 --- a/src/apps/bemail/Jamfile +++ b/src/apps/bemail/Jamfile @@ -22,3 +22,7 @@ App BeMail : KUndoBuffer.cpp ; LinkSharedOSLibs BeMail : be mail tracker stdc++.r4 ; + +Package haiku-maildaemon-cvs : + BeMail : + boot beos apps ; diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile index 92c4664f06..0287a0d695 100644 --- a/src/kits/mail/Jamfile +++ b/src/kits/mail/Jamfile @@ -47,3 +47,7 @@ LinkSharedOSLibs libmail.so : MakeLocate libmail.so : $(OBOS_STLIB_DIR) ; RelSymLink libmail.so : libmail.so ; + +Package haiku-maildaemon-cvs : + libmail.so : + boot beos system lib ; diff --git a/src/prefs/mail/Jamfile b/src/prefs/mail/Jamfile index 90a3c36624..87587822b2 100644 --- a/src/prefs/mail/Jamfile +++ b/src/prefs/mail/Jamfile @@ -13,3 +13,7 @@ Preference E-mail : main.cpp ; LinkSharedOSLibs E-mail : be mail ; + +Package haiku-maildaemon-cvs : + E-mail : + boot beos preferences ; diff --git a/src/servers/mail/Jamfile b/src/servers/mail/Jamfile index 59c3494ac2..0f6f62f84c 100644 --- a/src/servers/mail/Jamfile +++ b/src/servers/mail/Jamfile @@ -18,3 +18,7 @@ LinkSharedOSLibs mail_daemon : tracker stdc++.r4 ; + +Package haiku-maildaemon-cvs : + mail_daemon : + boot beos system servers ;