@@ -8,7 +8,7 @@

 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})

 Name:           erlang-%{realname}

-Version:        0.4.0

+Version:        0.4.2

 Release:        1%{?dist}

 Summary:        Erlang IMAP client

 Group:          Development/Libraries

@@ -19,16 +19,16 @@

 %endif

 Source0:        erlang-eimap-%{version}.tar.gz

-Patch1:         untagged-commands.patch

-Patch2:         eimap-0.4.0-otp-20.patch

-Patch3:         make-things-easy-for-rebar3.patch

+# Keep rebar3 from downloading dependencies, we want package provide ones.

+Patch1:         nodeps.patch

 BuildRequires: erlang-goldrush

-BuildRequires: erlang-lager

+BuildRequires: erlang-lager >= 3.1.0

 BuildRequires: erlang-rebar3 >= 3.3.2

 Requires:       %lock_version erlang-erts

 Requires:       %lock_version erlang-stdlib

+Requires:       %lock_version erlang-lager

 %description

 IMAP client library for Erlang

@@ -37,8 +37,6 @@

 %setup -q -n eimap-%{version}

 %patch1 -p1

-%patch2 -p1

-%patch3 -p1

 %build

 DEBUG=1

@@ -78,6 +76,13 @@

 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/*.beam

 %changelog

+

+* Wed Apr 15 2020 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.2-1

+- Upstream release 0.4.2

+

+* Sat Mar 28 2020 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.1-1

+- Upstream release 0.4.1

+

 * Sun Apr 08 2018 Christoph Erhardt <kolab@sicherha.de> - 0.4.0-1

 - Upstream release 0.4.0

​

@@ -1,13 +0,0 @@

-diff -ur eimap-0.4.0.orig/rebar.config eimap-0.4.0/rebar.config

---- eimap-0.4.0.orig/rebar.config  2016-11-11 15:49:11.000000000 +0100

-+++ eimap-0.4.0/rebar.config   2018-08-13 16:19:45.864891814 +0200

-@@ -1,8 +1,7 @@

- %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-

- %% ex: ft=erlang ts=4 sw=4 et

- 

--{erl_opts, [warnings_as_errors, {parse_transform, lager_transform}]}.

--{deps, [ lager ]}.

-+{erl_opts, [{parse_transform, lager_transform}]}.

- 

- { erl_first_files, ["src/eimap_command.erl"] }.

- {sub_dirs, [

​

@@ -1,26 +0,0 @@

-diff -ur eimap-0.4.0.orig/rebar.config eimap-0.4.0/rebar.config

---- eimap-0.4.0.orig/rebar.config  2016-11-11 15:49:11.000000000 +0100

-+++ eimap-0.4.0/rebar.config   2016-11-23 10:34:12.227835779 +0100

-@@ -15,3 +15,8 @@

- %%{require_otp_vsn, "17"}.

- {pre_hooks, [{clean, "rm -rf ebin priv erl_crash.dump"}]}.

- 

-+{ relx, [ { release, { eimap, "0.4.0" }, [eimap]},

-+                { dev_mode, false },

-+                { include_erts, false }

-+         ]

-+}.

-diff -ur eimap-0.4.0.orig/src/eimap.app.src eimap-0.4.0/src/eimap.app.src

---- eimap-0.4.0.orig/src/eimap.app.src 2016-11-11 15:49:11.000000000 +0100

-+++ eimap-0.4.0/src/eimap.app.src  2016-11-21 12:35:31.302170628 +0100

-@@ -10,9 +10,7 @@

-                    crypto,

-                    ssl,

-                    compiler,

--                   syntax_tools,

--                   goldrush,

--                   lager

-+                   syntax_tools

-                   ]

-   },

-   { env, [ ]},

​

@@ -0,0 +1,12 @@

+diff --git a/rebar.config b/rebar.config

+index 33e4158..0b5d970 100644

+--- a/rebar.config

++++ b/rebar.config

+@@ -2,7 +2,6 @@

+ %% ex: ft=erlang ts=4 sw=4 et

+ 

+ {erl_opts, [{parse_transform, lager_transform}]}.

+-{deps, [ lager ]}.

+ 

+ { erl_first_files, ["src/eimap_command.erl"] }.

+ {sub_dirs, [

​

@@ -1,43 +0,0 @@

-diff --git a/src/eimap_utils.erl b/src/eimap_utils.erl

-index 163229b..230ab60 100644

---- a/src/eimap_utils.erl

-+++ b/src/eimap_utils.erl

-@@ -156,14 +156,20 @@ remove_tag_from_response(Buffer, Tag, trust) ->

- %% Private

- split_command(<<>>) -> { <<>>, <<>>, <<>> };

- split_command(Buffer) ->

--    End = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),

-+    {Terminated, End} = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),

-     { Tag, CommandStart } = searched_in_buffer(Buffer, 0, End, binary:match(Buffer, <<" ">>, [ { scope, { 0, End } } ])),

--    { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),

--    Data = binary:part(Buffer, DataStart, End - (DataStart)),

--    { Tag, Command, Data }.

-+    case Terminated of

-+         true when End == CommandStart ->

-+            %% when we have a newline, and the tag takes the entire line, the "tag" is actually the command

-+            {<<>>, Tag, <<>>};

-+         _ ->

-+            { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),

-+            Data = binary:part(Buffer, DataStart, End - (DataStart)),

-+            { Tag, Command, Data }

-+    end.

- 

--eol_found(Buffer, nomatch) -> size(Buffer);

--eol_found(_Buffer, { MatchStart, _MatchLength }) -> MatchStart.

-+eol_found(Buffer, nomatch) -> {false, size(Buffer)};

-+eol_found(_Buffer, { MatchStart, _MatchLength }) -> {true, MatchStart}.

- 

- searched_in_buffer(Buffer, Start, End, nomatch) -> { binary:part(Buffer, Start, End - Start), End };

- searched_in_buffer(Buffer, Start, _End, { MatchStart, MatchLength } ) -> { binary:part(Buffer, Start, MatchStart - Start), MatchStart + MatchLength }.

-diff --git a/test/eimap_utils_tests.erl b/test/eimap_utils_tests.erl

-index 389be6f..81631c1 100644

---- a/test/eimap_utils_tests.erl

-+++ b/test/eimap_utils_tests.erl

-@@ -79,6 +79,7 @@ split_command_into_components_test_() ->

-     Data =

-     [

-         { { <<>>, <<>>, <<>> }, <<>> },

-+        { { <<>>, <<"DONE">>, <<>> }, <<"DONE\r\n">> },

-         { { <<".">>, <<"LIST">>, <<"\"\" \"*\"">> }, <<". LIST \"\" \"*\"">> },

-         { { <<"1">>, <<"STARTTLS">>, <<>> }, <<"1 STARTTLS">> },

-         { { <<"1">>, <<"STARTTLS">>, <<>> }, <<"1 STARTTLS\r\n">> },

​

@@ -1,3 +1,15 @@

+erlang-eimap (0.4.2-1.1) unstable; urgency=medium

+

+  * Package the 0.4.2 release

+

+ -- Christian Mollekopf <mollekopf@kolabsys.com>  Wed, 15 Apr 2020 00:44:10 +0200

+

+erlang-eimap (0.4.1-1.1) unstable; urgency=medium

+

+  * Package the 0.4.1 release

+

+ -- Christian Mollekopf <mollekopf@kolabsys.com>  Sat, 28 Mar 2020 00:44:10 +0200

+

 erlang-eimap (0.4.0-1.1) unstable; urgency=medium

   * Package the 0.4.0 release

​

@@ -1,2 +1,1 @@

-untagged-commands.patch -p1

-eimap-0.4.0-otp-20.patch -p1

+nodeps.patch -p1

​

@@ -0,0 +1,3 @@

+{

+    "phabricator.uri": "https://git.kolab.org"

+}

​

@@ -11,6 +11,12 @@

 ### Fixed

 ### Security

+

+## [0.4.1] - 2020-03-28

+### Added

+- Enabled tcp keepalive

+- Support for untagged commands

+

 ## [0.4.0] - 2016-11-11

 ### Added

 - optional timeout on eimap objects for server delay

​

@@ -1,17 +1,20 @@

 %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-

 %% ex: ft=erlang ts=4 sw=4 et

-{erl_opts, [warnings_as_errors, {parse_transform, lager_transform}]}.

+{erl_opts, [{parse_transform, lager_transform}]}.

 {deps, [ lager ]}.

 { erl_first_files, ["src/eimap_command.erl"] }.

 {sub_dirs, [

     "src",

-    "rel",

     "tests"

  ]}.

 {cover_enabled, true}.

 %%{require_otp_vsn, "17"}.

 {pre_hooks, [{clean, "rm -rf ebin priv erl_crash.dump"}]}.

-

+{ relx, [ { release, { eimap, "0.4.2" }, [eimap]},

+                { dev_mode, false },

+                { include_erts, false }

+         ]

+}.

​

@@ -2,7 +2,7 @@

 {application, eimap,

  [

   { description, "IMAP client implementation" },

-  { vsn, "0.4.0" },

+  { vsn, "0.4.2" },

   { registered, [] },

   { applications, [

                    kernel,

@@ -11,7 +11,6 @@

                    ssl,

                    compiler,

                    syntax_tools,

-                   goldrush,

                    lager

                   ]

   },

​

@@ -211,6 +211,21 @@

 wait_response({ data, Data }, #state{ current_command = #command{ response_type = ResponseType, parse_state = CommandState , tag = Tag } } = State) ->

     Response = eimap_command:parse_response(ResponseType, Data, Tag, CommandState),

     %%lager:info("Response from parser was ~p ~p, size of queue ~p", [More, Response, queue:len(State#state.command_queue)]),

+    % FIXME

+    % Because several commands can be in flight at the same time, it can happen that we have something like:

+    % * Client send: CMD1, CMD2 (triggering a request for metadata)

+    % * Because we immediately after processing CMD2 from the client request metadata and start waiting for the response,

+    % a response that actually still belongs to CMD1 will not be recognized as such (will end up in here).

+    %

+    % Below is a workaround for that case; If we fail to parse the repsonse we simply assume it's none of our business and pass it trough.

+    %

+    % For a proper fix more work would be required, here are some ideas:

+    % * Track pending tags and only start associating with this command once we have all outstanding tags completed. The problem is that we don't know about pending tags because normally we don't look for them while passing through.

+    % * Buffer data and watch out for any tag. If its not ours pass the data through (would result in performance penalty only while waiting for the command).

+    case Response of

+        {more,{<<>>,[],_}} -> passthrough({data, Data}, State);

+        _ -> {}

+    end,

     NewState = cancel_timeout(State),

     next_command_after_response(Response, NewState);

 wait_response(process_command_queue, State) ->

@@ -404,7 +419,7 @@

 create_socket(Host, Port, _, _Receiver, _ResponseToken, CommandQueue) ->

     { gen_tcp:connect(Host, Port, socket_options(), ?TCP_CONNECT_TIMEOUT), false, self(), CommandQueue }.

-socket_options() -> [binary, { active, once }, { send_timeout, 5000 }].

+socket_options() -> [binary, { active, once }, { send_timeout, 5000 }, { keepalive, true }].

 upgrade_socket(#state{ socket = Socket, tls_state = true, current_command = Command }) ->

     notify_of_response(starttls_complete, Command),

@@ -478,13 +493,10 @@

     State#state { command_queue = queue:in_r(Command, State#state.command_queue) }.

 inflated(Data, #state{ inflator = undefined }) -> Data;

-inflated(Data, #state{ inflator = Inflator }) ->  joined(zlib:inflate(Inflator, Data), <<>>).

+inflated(Data, #state{ inflator = Inflator }) ->  iolist_to_binary(zlib:inflate(Inflator, Data)).

 deflated(Data, #state{ deflator = undefined }) -> Data;

-deflated(Data, #state{ deflator = Deflator }) ->  joined(zlib:deflate(Deflator, Data, sync), <<>>).

-

-joined([], Binary) -> Binary;

-joined([H|Rest], Binary) -> joined(Rest, <<Binary/binary, H/binary>>).

+deflated(Data, #state{ deflator = Deflator }) ->  iolist_to_binary(zlib:deflate(Deflator, Data, sync)).

 reset_timeout(#state{ command_timeout = Timeout } = State) ->

     cancel_timeout(State),

​

@@ -156,14 +156,20 @@

 %% Private

 split_command(<<>>) -> { <<>>, <<>>, <<>> };

 split_command(Buffer) ->

-    End = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),

+    {Terminated, End} = eol_found(Buffer, binary:match(Buffer, <<"\r\n">>)),

     { Tag, CommandStart } = searched_in_buffer(Buffer, 0, End, binary:match(Buffer, <<" ">>, [ { scope, { 0, End } } ])),

-    { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),

-    Data = binary:part(Buffer, DataStart, End - (DataStart)),

-    { Tag, Command, Data }.

+    case Terminated of

+         true when End == CommandStart ->

+            %% when we have a newline, and the tag takes the entire line, the "tag" is actually the command

+            {<<>>, Tag, <<>>};

+         _ ->

+            { Command, DataStart } = searched_in_buffer(Buffer, CommandStart, End, binary:match(Buffer, <<" ">>, [ { scope, { CommandStart, End - CommandStart  } } ])),

+            Data = binary:part(Buffer, DataStart, End - (DataStart)),

+            { Tag, Command, Data }

+    end.

-eol_found(Buffer, nomatch) -> size(Buffer);

-eol_found(_Buffer, { MatchStart, _MatchLength }) -> MatchStart.

+eol_found(Buffer, nomatch) -> {false, size(Buffer)};

+eol_found(_Buffer, { MatchStart, _MatchLength }) -> {true, MatchStart}.

 searched_in_buffer(Buffer, Start, End, nomatch) -> { binary:part(Buffer, Start, End - Start), End };

 searched_in_buffer(Buffer, Start, _End, { MatchStart, MatchLength } ) -> { binary:part(Buffer, Start, MatchStart - Start), MatchStart + MatchLength }.

​

@@ -79,6 +79,7 @@

     Data =

     [

         { { <<>>, <<>>, <<>> }, <<>> },

+        { { <<>>, <<"DONE">>, <<>> }, <<"DONE\r\n">> },

         { { <<".">>, <<"LIST">>, <<"\"\" \"*\"">> }, <<". LIST \"\" \"*\"">> },

         { { <<"1">>, <<"STARTTLS">>, <<>> }, <<"1 STARTTLS">> },

         { { <<"1">>, <<"STARTTLS">>, <<>> }, <<"1 STARTTLS\r\n">> },

​

@@ -2,7 +2,7 @@

 Source: erlang-eimap

 Binary: erlang-eimap

 Architecture: any

-Version: 0.4.0-1.1

+Version: 0.4.2-1.1

 Maintainer: Christoph Erhardt <kolab@sicherha.de>

 Homepage: https://git.kolab.org/diffusion/EI/eimap.git

 Standards-Version: 3.9.6

@@ -10,5 +10,5 @@

 Package-List:

  erlang-eimap deb devel extra

 Files:

- 00000000000000000000000000000000 0 erlang-eimap-0.4.0.tar.gz

+ 00000000000000000000000000000000 0 erlang-eimap-0.4.2.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​