Kolab Groupware OBS

Changes of Revision 22

guam.spec Changed

@@ -5,9 +5,7 @@
 %global debug_package %{nil}
 
 %global realname kolab_guam
-
-%global guam_user guam
-%global guam_group guam
+%global binname guam
 
 %if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
 %global with_systemd 0
@@ -15,11 +13,13 @@
 %global with_systemd 1
 %endif
 
-%define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%{VERSION}" %{1})
+%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
+
+%define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})
 
 Name:               guam
-Version:            0.9.2
-Release:            4%{?dist}
+Version:            0.9.4
+Release:            7%{?dist}
 Summary:            A Smart Reverse IMAP Proxy
 
 Group:              System Environment/Daemons
@@ -29,12 +29,9 @@
 Source0:            https://mirror.kolabenterprise.com/pub/releases/guam-%{version}.tar.gz
 Source100:          plesk.sys.config
 
-Patch0001:          0001-Avoid-empty-lines-in-the-responses-to-IMAP-clients.patch
-Patch0002:          guam-0.9.2-T25795.patch
-Patch0003:          guam-0.9.2-allow-empty-lines-in-commands.patch
-
-Patch9991:          rebar-remove-deps.patch
-Patch9992:          guam-0.9.2-set-version-number.patch
+Patch9991:          make-it-very-easy-on-rebar3.patch
+Patch9992:          guam-priv-no-delete.patch
+Patch9993:          guam-0.9.2-stalling-client-buffer-and-split-command-handling.patch
 
 BuildRequires:      erlang >= 17.4
 BuildRequires:      erlang-asn1
@@ -42,7 +39,7 @@
 BuildRequires:      erlang-compiler
 BuildRequires:      erlang-crypto
 BuildRequires:      erlang-debugger
-BuildRequires:      erlang-eimap >= 0.2.4
+BuildRequires:      erlang-eimap >= 0.3.0
 BuildRequires:      erlang-erts
 BuildRequires:      erlang-et
 BuildRequires:      erlang-goldrush >= 0.1.8
@@ -52,7 +49,8 @@
 BuildRequires:      erlang-mnesia
 BuildRequires:      erlang-observer
 BuildRequires:      erlang-public_key
-BuildRequires:      erlang-rebar >= 2.5.1
+BuildRequires:      erlang-rebar3 >= 3.3.2
+BuildRequires:      erlang-rpm-macros
 BuildRequires:      erlang-runtime_tools
 BuildRequires:      erlang-sasl
 BuildRequires:      erlang-snmp
@@ -61,17 +59,10 @@
 BuildRequires:      erlang-stdlib
 BuildRequires:      erlang-syntax_tools
 BuildRequires:      erlang-syslog >= 1.0.3
-%if 0%{?rhel}
-BuildRequires:      erlang-test_server
-BuildRequires:      erlang-webtool
-%endif
 BuildRequires:      erlang-tools
 BuildRequires:      erlang-wx
 BuildRequires:      erlang-xmerl
 
-Requires(pre):      shadow-utils
-Requires(postun):   shadow-utils
-
 Requires:           %lock_version erlang
 Requires:           %lock_version erlang-eimap
 Requires:           %lock_version erlang-goldrush
@@ -98,101 +89,103 @@
 %endif
 
 %description
-Guam is a smart, unjustly outcasted Reverse IMAP Proxy that lives at
+Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at
 the perimeter of your IMAP environment.
 
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
 %patch9991 -p1
 %patch9992 -p1
+%patch9993 -p1
+
+sed -i 's/"0\.9\.0"/"%{version}"/' rebar.config
 
 %build
-rebar compile
-mkdir -p deps
 
-pushd rel
-ENABLE_STATIC=no rebar generate
-popd
+DEBUG=1
+export DEBUG
+
+HEX_OFFLINE=true
+export HEX_OFFLINE
+
+rebar3 release \
+    --dev-mode false \
+    --relname %{name} \
+    --relvsn %{version} \
+    --verbose
 
 %install
+
+find -type f | sort
+
 mkdir -p \
-    %{buildroot}/opt \
+    %{buildroot}%{_sysconfdir}/%{name}/ \
     %{buildroot}%{_sbindir} \
-    %{buildroot}%{_sysconfdir}/guam/ \
+    %{buildroot}%{_erldir}/bin/ \
+    %{buildroot}%{_erllibdir}/%{realname}-%{version}/ \
 %if 0%{?with_systemd}
     %{buildroot}%{_unitdir}/ \
 %else
     %{buildroot}%{_initddir}/ \
 %endif
-    %{buildroot}%{_var}/log/
+    %{buildroot}%{_var}/log/%{name}/
+
+# Configuration
+cp _build/default/rel/%{name}/etc/sys.config \
+    %{buildroot}%{_sysconfdir}/%{name}/sys.config
+cp _build/default/rel/%{name}/vm.args \
+    %{buildroot}%{_sysconfdir}/%{name}/vm.args
 
+# Service scripts
 %if 0%{?with_systemd}
-install -p -m 644 contrib/guam.service \
-    %{buildroot}%{_unitdir}/guam.service
+install -p -m 644 contrib/%{name}.service \
+    %{buildroot}%{_unitdir}/%{name}.service
 %else
-install -p -m 755 contrib/guam.sysvinit \
-    %{buildroot}%{_initddir}/guam
+install -p -m 755 contrib/%{name}.sysvinit \
+    %{buildroot}%{_initddir}/%{name}
 %endif
 
-cp -a rel/%{realname} %{buildroot}/opt/.
-
-cat > %{buildroot}%{_sbindir}/guam << EOF
-#!/bin/bash
-exec /opt/kolab_guam/bin/kolab_guam \$*
-EOF
+pushd %{buildroot}%{_erldir}/bin/
+ln -s ../lib/%{realname}-%{version}/bin/%{binname} %{realname}
+popd
 
-mv %{buildroot}/opt/%{realname}/releases/*/sys.config \
-    %{buildroot}%{_sysconfdir}/guam/sys.config
+cp -a _build/default/rel/%{name}/bin %{buildroot}%{_erllibdir}/%{realname}-%{version}/
+cp -a _build/default/rel/%{name}/lib/%{realname}-%{version}/ebin/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
+cp -a _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{realname}-%{version}/
 
 %if 0%{?plesk}
 install -m 644 -p %{SOURCE100} %{buildroot}%{_sysconfdir}/guam/sys.config
 %endif
 
-ln -s ../../../..%{_sysconfdir}/%{name}/sys.config \
-    $(ls -1d %{buildroot}/opt/%{realname}/releases/*/)/sys.config
-
-mv %{buildroot}/opt/%{realname}/log %{buildroot}%{_var}/log/guam
-ln -s ../..%{_var}/log/guam %{buildroot}/opt/%{realname}/log
-
-pushd %{buildroot}/opt/%{realname}/lib
-for dir in $(ls -d */ | grep -v kolab_guam); do
-    dir=$(basename ${dir})
-    if  ! -d %{_libdir}/erlang/lib/${dir} ; then
-        echo "Skipping deletion of ${dir}, no equivalent in %{_libdir}/erlang/lib/"
-    else
-        rm -rvf ${dir}
-        ln -sv ../../..%{_libdir}/erlang/lib/${dir} ${dir}
-    fi
-done
+pushd %{buildroot}%{_erllibdir}/%{realname}-%{version}/releases/%{version}/
+rm sys.config vm.args
+ln -sv ../../../../../../..%{_sysconfdir}/%{name}/sys.config sys.config
+ln -sv ../../../../../../..%{_sysconfdir}/%{name}/vm.args vm.args
 popd
 
-%check
-rebar skip_deps=true eunit -v
+pushd %{buildroot}%{_erllibdir}/%{realname}-%{version}/
+ln -s ../../lib lib
+ln -s ../../../../..%{_var}/log/%{name} log
+popd
 
-%pre
-if  $1 == 1 ; then
-    /usr/sbin/groupadd --system %{guam_group} 2> /dev/null || :
-    /usr/sbin/useradd -c "Guam Service" -d /opt/kolab_guam -g %{guam_group} \
-        -s /sbin/nologin --system %{guam_user} 2> /dev/null || :
-fi
+cat > %{buildroot}%{_sbindir}/%{name} << EOF
+#!/bin/bash
+exec %{_erllibdir}/%{realname}-%{version}/bin/%{binname} \$*
+EOF
+
+%check
+# Hopeless on -0.9
+rebar3 eunit -v || :
 
 %postun
 %if 0%{?with_systemd}
 %systemd_postun
 %endif
-if  $1 == 0 ; then
-    /usr/sbin/userdel %{guam_user} 2>/dev/null || :
-    /usr/sbin/groupdel %{guam_group} 2>/dev/null || :
-fi
 
 %if 0%{?with_systemd}
 %post
-%systemd_post guam.service
+%systemd_post %{name}.service
 
 if  ! -f "/etc/guam/dh_2048.pem" ; then
     openssl gendh -out /etc/guam/dh_2048.pem -2 2048 >/dev/null 2>&1 || \
@@ -200,15 +193,15 @@
 fi
 
 %preun
-%systemd_preun guam.service
+%systemd_preun %{name}.service
 
 %posttrans
 test -f /etc/sysconfig/guam-disable-posttrans || \
-    systemctl try-restart guam.service 2>&1 || :
+    systemctl try-restart %{name}.service 2>&1 || :
 
 %else
 %post
-chkconfig --add guam >/dev/null 2>&1 || :
+chkconfig --add %{name} >/dev/null 2>&1 || :
 
 if  ! -f "/etc/guam/dh_2048.pem" ; then
     openssl gendh -out /etc/guam/dh_2048.pem -2 2048 >/dev/null 2>&1 || \
@@ -217,13 +210,16 @@
 
 %posttrans
 test -f /etc/sysconfig/guam-disable-posttrans || \
-    %{_sbindir}/service restart guam 2>&1 || :
+    %{_sbindir}/service restart %{name} 2>&1 || :
 %endif
 
 %files
-%attr(0750,root,root) %{_sbindir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/sys.config
-%attr(0640,%{guam_user},%{guam_group}) %{_var}/log/%{name}/
+%config(noreplace) %{_sysconfdir}/%{name}/vm.args
+%attr(0750,root,root) %{_sbindir}/%{name}
+%{_libdir}/erlang/bin/%{realname}
+%{_libdir}/erlang/lib/%{realname}-%{version}
+%attr(0640,root,root) %{_var}/log/%{name}/
 
 %if 0%{?with_systemd}
 %{_unitdir}/%{name}.service
@@ -231,11 +227,27 @@
 %{_initddir}/%{name}
 %endif
 
-/opt/%{realname}/
-
 %changelog
-* Sat May 19 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.9.2-4
-- Fix generating dh parameters on more recent openssl versions
+* Sat May 19 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.9.4-7
+- Fix generating dh params file on more recent openssl versions
+
+* Tue May 08 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-6
+- Apply patch that fixes stalling client buffers and handling of split commands
+
+* Fri May 04 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-5
+- Make logs go to /var/log/guam
+
+* Sat Apr 21 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-4
+- Fix packaging, dependencies and more stuff
+
+* Thu Apr 19 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-3
+- Use script rather than symlink
+
+* Thu Apr 19 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-2
+- Ship correct variants of sys.config and vm.args
+
+* Sun Apr 15 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-1
+- Release version 0.9.4
 
 * Tue Feb 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.9.2-3
 - Allow empty lines in commands

0001-Avoid-empty-lines-in-the-responses-to-IMAP-clients.patch Deleted

@@ -1,55 +0,0 @@
-From a3c6ca5afcfd73e8921be60afec0ed102da02c71 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Wed, 26 Apr 2017 16:24:35 +0200
-Subject: PATCH Avoid empty lines in the responses to IMAP clients.
-
----
- .../src/rules/kolab_guam_rule_filter_groupware.erl | 24 +++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl b/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
-index 9d89e92..1beec7c 100644
---- a/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
-+++ b/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
-@@ -78,15 +78,37 @@ apply_if_id_matches(Command, Data, State) ->
- apply_if_found_kolab(0) -> true;
- apply_if_found_kolab(_) -> false.
- 
-+% Filter out a would-be empty list of folders, should the list of folders
-+% consist of only groupware folders.
-+filter_folders(<<>>, State, _, LastChunk) ->
-+    { <<>>, State#state{ active = true, last_chunk = LastChunk } };
-+
-+% Send the response to the client. Note that the last list item is not
-+% imploded \r\n in to, so that needs to be added.
-+filter_folders(Response, State, More, LastChunk) ->
-+    {
-+        <<Response/binary, "\r\n">>,
-+        State#state { active = More, last_chunk = LastChunk }
-+    }.
-+
-+% The buffer is empty
- filter_folders(<<>>, State) ->
-     { <<>>, State#state{ active = true } };
-+
-+% Parse folders from the buffer, potentially leaving some cruft behind -- the
-+% start of the next, incomplete server response line.
- filter_folders(Buffer, #state{ last_chunk = LeftOvers } = State) ->
-+    % Add the left overs from the previous buffer to the current buffer
-     FullBuffer = <<LeftOvers/binary, Buffer/binary>>,
-+    % From that buffer, only take the complete lines and save off the
-+    % remainder.
-     { FullLinesBuffer, LastChunk } = eimap_utils:only_full_lines(FullBuffer),
-+    % Create a list so we can filter the individual folders
-     ListResponses = binary:split(FullLinesBuffer, <<"\r\n">>,  global ),
-     { Response, More } = filter_folders(State, ListResponses, { <<>>, true }),
-     %io:format("Filtered ... ~p~n", Response),
--    { <<Response/binary, "\r\n">>, State#state { active = More, last_chunk = LastChunk } }.
-+    % To send or not to send?
-+    filter_folders(Response, State, More, LastChunk).
- 
- filter_folders(_State, , Return) -> Return;
- filter_folders(_State, _Folders, { Acc, false }) -> { Acc, false };
--- 
-2.9.3
-

guam-0.9.2-T25795.patch Deleted

@@ -1,25 +0,0 @@
-commit 20808866e5a213e31cbd92d3c95da4547adadd0b
-Author: Christian Mollekopf <chrigi_1@fastmail.fm>
-Date:   Fri Mar 31 16:25:07 2017 +0200
-
-    Pass through untagged client responses
-    
-    The IDLE command allows for an untagged DONE respose by the client to
-    stop imap idle. This used to crash because we always expected a tagged
-    response. This patch simply passes through the buffer in case of an
-    untagged response.
-
-diff --git a/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl b/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
-index 4400f31..9d89e92 100644
---- a/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
-+++ b/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl
-@@ -29,6 +29,9 @@ applies(_ConnectionDetails, _Buffer, { _Tag, Command, Data }, State) ->
-     %lager:debug("********** Checking ...~n    Command: ~s ~s, Result ~p", Command, Data, Applies),
-     { Applies, State }.
- 
-+apply_to_client_message(_ImapSession, Buffer, undefined, State) ->
-+    { Buffer, State };
-+
- apply_to_client_message(ImapSession, Buffer, { Tag, Command, Data }, State) ->
-     { Active, StateTag } =
-     case is_triggering_command(Command, Data, State) of

guam-0.9.2-allow-empty-lines-in-commands.patch Deleted

@@ -1,38 +0,0 @@
-commit 7db53d9c3fc00baa1fe4fb8ca7c9ae63c61e853b
-Author: Christian Mollekopf <chrigi_1@fastmail.fm>
-Date:   Mon Feb 19 16:52:33 2018 +0100
-
-    Allow empty lines in commands.
-    
-    During DIGEST-MD5 authentication the client response with a an empty
-    line (Just \r\n). eimap_utils:split_command_into_components Either
-    returns a full command or an empty one, and thus cannot differentiate
-    between an empty and an incomplete command, and then erroneously tries
-    to buffer until the rest arrives (which is not existinent).
-    Ideally we would fix split_command_into_components into returning
-    something entirely different if the command is empty but complete,
-    but this fixes the problem at hand by matching for that special case.
-
-diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
-index 4d95797..ca4e633 100644
---- a/apps/kolab_guam/src/kolab_guam_session.erl
-+++ b/apps/kolab_guam/src/kolab_guam_session.erl
-@@ -266,9 +266,15 @@ apply_ruleset_clientside(ImapSession, Socket, ClientData, CurrentCommandSplit, U
-     { PostAction, SplitCommand, SplitResetTrigger } =
-         case CurrentCommandSplit of
-             undefined ->
--                case eimap_utils:split_command_into_components(ClientData) of
--                    { _Tag, <<>>, <<>> } -> { buffer_data, undefined, reset_for_next_client_command };
--                    { _Tag, Command, _Data } = Split -> { perform_passthrough, Split, when_to_reset_split(Command) }
-+                %We first have to check whether the command is an empty line. In such a case split_command_into_components would return an empty command,
-+                %even though the command is complete.
-+                case ClientData of
-+                    <<"\r\n">> -> { perform_passthrough, CurrentCommandSplit, reset_for_next_client_command };
-+                    _ ->
-+                        case eimap_utils:split_command_into_components(ClientData) of
-+                            { _Tag, <<>>, <<>> } -> { buffer_data, undefined, reset_for_next_client_command };
-+                            { _Tag, Command, _Data } = Split -> { perform_passthrough, Split, when_to_reset_split(Command) }
-+                        end
-                 end;
-             _ ->  { perform_passthrough, CurrentCommandSplit, reset_for_next_client_command }
-         end,

guam-0.9.2-set-version-number.patch Deleted

guam-0.9.2-stalling-client-buffer-and-split-command-handling.patch Added

@@ -0,0 +1,54 @@
+diff --git a/apps/kolab_guam/src/kolab_guam_session.erl b/apps/kolab_guam/src/kolab_guam_session.erl
+index ca4e633..e547c55 100644
+--- a/apps/kolab_guam/src/kolab_guam_session.erl
++++ b/apps/kolab_guam/src/kolab_guam_session.erl
+@@ -201,19 +201,37 @@ process_client_data(Socket, Data, #state{ rules_deciding = UndecidedRules, tls_c
+             BufferThisData =
+             case PostAction of
+                 perform_passthrough ->
++                    %lager:info("sending (no buffer): ~s", ModifiedData),
+                     eimap:passthrough_data(ImapSession, ModifiedData),
+                     <<>>;
+                 buffer_data ->
+-                    Data
++                    % Originally Aaron uses Data here, but later on this buffer is assumed to be
++                    % already decoded, so we do have to use PreprocessData here, I think.
++                    case binary:matches(PreprocessData, <<"\r\n">>) of
++                         ->
++                            %lager:info("buffering: ~s", PreprocessData),
++                            PreprocessData;
++                        List ->
++                            {FoundPos, _} = lists:last(List),
++                            % I would like to have some binary:match for the last instead of the
++                            % first occurrence; but I'm really inexperienced in erlang so I don't
++                            % know how to solve this efficiently, so I'm using binary:matches with
++                            % using the last element only
++                            SplitPos = FoundPos + 2,
++                            eimap:passthrough_data(ImapSession, binary:part(PreprocessData, 0, SplitPos)),
++                            %lager:info("sending first part: ~s", binary:part(PreprocessData, 0, SplitPos) ),
++                            %lager:info("buffering second part: ~s", binary:part(PreprocessData, SplitPos, size(PreprocessData)-SplitPos)),
++                            binary:part(PreprocessData, SplitPos, size(PreprocessData)-SplitPos)
++                    end
+             end,
+             { TLS, Socket, Inflator, Deflator, NewUndecidedRules, NewActiveRules, BufferThisData, NewSplitCommand, NewSplitResetTrigger }
+     end,
+     set_socket_active(TLSActive, CurrentSocket),
+-    PrevBuffered = State#state.buffered_client_data,
++    %buffered_client_data is already in DataToBuffer via preprocess_client_data
+     { noreply, State#state{ rules_deciding = CurrentUndecidedRules, rules_active = CurrentActiveRules,
+                             socket = CurrentSocket, client_tls_active = TLSActive,
+                             inflator = CurrentInflator, deflator = CurrentDeflator,
+-                            buffered_client_data = <<PrevBuffered/binary, DataToBuffer/binary>>,
++                            buffered_client_data = <<DataToBuffer/binary>>,
+                             current_command_split = SplitCommand,
+                             command_split_reset_trigger = SplitResetTrigger } }.
+ 
+@@ -261,7 +279,7 @@ apply_next_rule_serverside(ImapSession, ServerData, ActiveRulesAcc, { Module, R
+     apply_next_rule_serverside(ImapSession, ModifiedData, { Module, ModifiedRuleState } | ActiveRulesAcc, ActiveRules).
+ 
+ apply_ruleset_clientside(_ImapSession, _Socket, ClientData, _CurrentCommandSplit, , ) ->
+-    { ClientData, , , , , perform_passthrough };
++    { ClientData, undefined, , , , perform_passthrough };
+ apply_ruleset_clientside(ImapSession, Socket, ClientData, CurrentCommandSplit, UndecidedRules, CurrentlyActiveRules) ->
+     { PostAction, SplitCommand, SplitResetTrigger } =
+         case CurrentCommandSplit of

guam-priv-no-delete.patch Added

make-it-very-easy-on-rebar3.patch Added

@@ -0,0 +1,31 @@
+diff -ur guam-0.9.0.orig/apps/kolab_guam/src/kolab_guam.app.src guam-0.9.0/apps/kolab_guam/src/kolab_guam.app.src
+--- guam-0.9.0.orig/apps/kolab_guam/src/kolab_guam.app.src	2016-07-29 12:30:44.000000000 +0200
++++ guam-0.9.0/apps/kolab_guam/src/kolab_guam.app.src	2016-11-21 13:53:11.857715091 +0100
+@@ -9,8 +9,9 @@
+                   stdlib,
+                   compiler,
+                   syntax_tools,
+-                  goldrush,
++                  eimap,
+                   lager,
++                  lager_syslog,
+                   crypto,
+                   ssl
+                  },
+diff -ur guam-0.9.0.orig/rebar.config guam-0.9.0/rebar.config
+--- guam-0.9.0.orig/rebar.config	2016-07-29 12:30:44.000000000 +0200
++++ guam-0.9.0/rebar.config	2016-11-21 13:52:49.191460388 +0100
+@@ -8,13 +8,6 @@
+             fail_on_warning
+             
+ }.
+-{ deps, 
+-    lager,
+-    { lager_syslog, "3.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "3.0.1" } } },
+-    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.3.0" } } }
+-    %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
+-   
+-}.
+ 
+ { sub_dirs, 
+     "apps/kolab_guam"

rebar-remove-deps.patch Deleted

@@ -1,26 +0,0 @@
-diff -ur guam-0.9.2.orig/rebar.config guam-0.9.2/rebar.config
---- guam-0.9.2.orig/rebar.config	2017-03-21 11:20:48.000000000 +0100
-+++ guam-0.9.2/rebar.config	2017-09-13 14:54:56.504335783 +0200
-@@ -1,14 +1,14 @@
- %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
- %% ex: ft=erlang ts=4 sw=4 et
- 
--{ deps_dir, "deps" }.
--{ deps, 
--    { lager, "(2.0|2.1|2.2).*", { git, "git://github.com/basho/lager.git", { tag, "2.2.3" } } },
--    { lager_syslog, "2.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "2.1.3" } } },
--    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.5" } } }
--    %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
--   
--}.
-+%{ deps_dir, "deps" }.
-+%{ deps, 
-+%    { lager, "(2.0|2.1|2.2).*", { git, "git://github.com/basho/lager.git", { tag, "2.2.3" } } },
-+%    { lager_syslog, "2.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "2.1.3" } } },
-+%    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.5" } } }
-+%    %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
-+%   
-+%}.
- 
- { erl_opts,  %%no_debug_info,
-             {parse_transform, lager_transform},

debian.changelog Changed

@@ -1,8 +1,46 @@
-guam (0.9.2-5) unstable; urgency=medium
+guam (0.9.4-7) unstable; urgency=medium
 
-  * Fix generating dh parameters on more recent openssl versions
+  * Fix generating DH parameters on openssl >= 1.1.0f with gendh->dhparam
 
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Sat, 19 May 2018 06:06:06 +0600
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Sat, 19 May 2018 09:31:31 +0200
+
+guam (0.9.4-6) unstable; urgency=medium
+
+  * Apply patch that fixes stalling client buffers and handling of split commands
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Tue, 08 May 2018 09:31:31 +0200
+
+guam (0.9.4-5) unstable; urgency=medium
+
+  * Add erlang-eimap to guam-bundled-libs
+  * Make logs go to /var/log/guam
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Fri, 04 May 2018 09:59:56 +0200
+
+guam (0.9.4-4) unstable; urgency=medium
+
+  * Fix packaging, dependencies and more stuff
+  * Make package compatible with Erlang from backports
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Sat, 21 Apr 2017 10:39:28 +0200
+
+guam (0.9.4-3) unstable; urgency=medium
+
+  * Use script rather than symlink
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Thu, 19 Apr 2017 21:33:45 +0200
+
+guam (0.9.4-2) unstable; urgency=medium
+
+  * Ship correct variants of sys.config and vm.args
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Thu, 19 Apr 2017 19:36:20 +0200
+
+guam (0.9.4-1) unstable; urgency=medium
+
+  * Release of version 0.9.4
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Sun, 15 Apr 2017 23:14:48 +0200
 
 guam (0.9.2-4) unstable; urgency=medium

debian.control Changed

@@ -3,18 +3,20 @@
 Priority: extra
 Maintainer: Christoph Erhardt <kolab@sicherha.de>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-eimap (>= 0.2.5), erlang-goldrush, erlang-lager, erlang-lager-syslog, erlang-reltool, psa | bash, rebar (>= 2.5.1)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), erlang (>= 17.4), erlang-eimap (>= 0.3.0), erlang-lager, erlang-lager-syslog, psa | bash, erlang-rebar3 (>= 3.3.2)
 Homepage: https://kolab.org/about/guam
 
 Package: guam
 Architecture: any
 Section: mail
-Depends: ${misc:Depends},
-	erlang-base (>= 17.4) | erlang-base-hipe (>= 17.4),
-	erlang-eimap (>= 0.2.5),
-	erlang-goldrush,
-	erlang-lager,
-	erlang-lager-syslog
+Depends: ${misc:Depends}, ${dist:GuamDepends}
 Description: Smart Reverse IMAP Proxy
  Guam is a smart, unjustly outcast Reverse IMAP Proxy that lives at
  the perimeter of your IMAP environment.
+
+Package: guam-bundled-libs
+Architecture: any
+Section: mail
+Depends: ${misc:Depends}, ${dist:GuamBundleDepends}
+Description: Bundled runtime environment for Guam
+ This is a support package for backports users.

debian.rules Changed

@@ -3,36 +3,114 @@
 include /usr/share/dpkg/pkg-info.mk
 
 DESTDIR = $(CURDIR)/debian/guam
+BUNDLEDIR = $(CURDIR)/debian/guam-bundled-libs
+
+# The versions of all dependencies are hardcoded by relx (which honestly sucks).
+# The following magic tries to ensure that the Debian package's dependencies are
+# pinned to the versions present on the build machine. If the dependencies
+# cannot be satisfied on the end user's machine - for instance because a
+# different Erlang version was installed from backports - we make the package
+# manager pull in an extra package "guam-bundled-libs" that contains all the
+# dependencies in the exact versions expected by relx.
+# For maintainers, this means: please revision-bump this package every time one
+# of its dependencies gets version-bumped.
+GBL := guam-bundled-libs (= $(DEB_VERSION))
+currver = $(shell dpkg-query -f '$${Version}' -W $(1) | sed 's/+-.*$$//')
+nextver = $(shell echo $(call currver,$(1)) | perl -pe 's/((\d+\.)*)(\d+)$$/$$1.($$3+1)/e')
+pinvermin = $(1) (>= $(call currver,$(1)))
+pinvermax = $(1) (<< $(call nextver,$(1)))
+pinver    = $(call pinvermin,$(1)), $(call pinvermax,$(1))
+pinvererlmin = $(1) (>= $(call currver,erlang))
+pinvererlmax = $(1) (<< $(call nextver,erlang))
+altbundle = $(call pinvermin,$(1)) | $(GBL), $(call pinvermax,$(1)) | $(GBL)
+
+SUBSTVARS += -Vdist:GuamDepends="$(call pinvererlmin,erlang-base) | $(call pinvererlmin,erlang-base-hipe) | $(GBL), $(call pinvererlmax,erlang-base) | $(call pinvererlmax,erlang-base-hipe) | $(GBL), $(call pinver,erlang-eimap), $(call pinver,erlang-lager-syslog), $(call altbundle,erlang-asn1), $(call altbundle,erlang-inets), $(call altbundle,erlang-lager), $(call altbundle,erlang-public-key)"
+SUBSTVARS += -Vdist:GuamBundleDepends="$(call pinver,erlang-eimap), $(call pinver,erlang-lager-syslog)"
+
+EIMAP_DIR        := eimap-$(call currver,erlang-eimap)
+LAGER_SYSLOG_DIR := lager_syslog-$(call currver,erlang-lager-syslog)
 
 %:
 	dh $@ --with=systemd
 
 override_dh_auto_build:
-	rebar compile
-	mkdir -p deps
-	cd rel && ENABLE_STATIC=no rebar generate
+	sed -i -e 's/"0\.9\.0"/"$(DEB_VERSION_UPSTREAM)"/' \
+	       -e 's/include_erts,\s*false/include_erts, true/' rebar.config
+	export DEBUG=1
+	export HEX_OFFLINE=1
+	rebar3 release \
+		--dev-mode false \
+		--relname guam \
+		--relvsn $(DEB_VERSION_UPSTREAM) \
+		--verbose
 
 override_dh_auto_test:
-	rebar skip_deps=true eunit -v
+	rebar3 eunit -v || :
 
 override_dh_auto_install:
-	mkdir -p $(DESTDIR)/opt $(DESTDIR)/usr/sbin $(DESTDIR)/etc/guam \
-	      $(DESTDIR)/lib/systemd/system $(DESTDIR)/var/log
+	mkdir -p $(DESTDIR)/usr/sbin $(DESTDIR)/etc/guam \
+		$(DESTDIR)/lib/systemd/system $(DESTDIR)/var/log/ \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ \
+		$(DESTDIR)/usr/lib/erlang/bin $(DESTDIR)/var/log/guam
+	chmod o= $(DESTDIR)/var/log/guam
+
 	install -p -m 644 contrib/guam.service \
 	        $(DESTDIR)/lib/systemd/system/guam.service
-	cp -a rel/kolab_guam $(DESTDIR)/opt/
-	chmod +x $(DESTDIR)/opt/kolab_guam/bin/install_upgrade.escript
-	echo '#!/bin/bash' > $(DESTDIR)/usr/sbin/guam
-	echo 'exec /opt/kolab_guam/bin/kolab_guam $$*' \
-	     >> $(DESTDIR)/usr/sbin/guam
+
+	cp -a _build/default/rel/guam/bin \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
+	cp -a _build/default/rel/guam/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ebin \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
+	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config
+	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/vm.args
+
+	cp -a _build/default/rel/guam/releases \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
 	if  -f "/etc/plesk-release" ; then \
 		cp ../SOURCES/plesk.sys.config \
 			$(DESTDIR)/etc/guam/sys.config ; \
 	else \
-		mv $(DESTDIR)/opt/kolab_guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config \
+		sed -i -e 's/pki\/tls\/private\/localhost\.pem/ssl\/certs\/ssl-cert-snakeoil.pem/' \
+			-e 's/pki\/tls\/private\/localhost\.ca\.pem/ssl\/certs\/ssl-cert-snakeoil.pem/' \
+			-e 's/pki\/tls\/private\/localhost\.key/ssl\/private\/ssl-cert-snakeoil.key/' \
+			_build/default/rel/guam/etc/sys.config ; \
+		cp _build/default/rel/guam/etc/sys.config \
 			$(DESTDIR)/etc/guam/sys.config ; \
 	fi
-	ln -sf ../../../../etc/guam/sys.config \
-	   $(DESTDIR)/opt/kolab_guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config
-	mv $(DESTDIR)/opt/kolab_guam/log $(DESTDIR)/var/log/guam
-	ln -s ../../var/log/guam $(DESTDIR)/opt/kolab_guam/log
+
+	ln -s ../../../../../../../etc/guam/sys.config \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config
+
+	cp _build/default/rel/guam/vm.args $(DESTDIR)/etc/guam/vm.args
+
+	ln -s ../../../../../../../etc/guam/vm.args \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/vm.args
+
+	ln -s ../../../../../var/log/guam $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log
+
+	echo '#!/bin/bash' > $(DESTDIR)/usr/sbin/guam
+	echo 'exec /usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam $$*' \
+	     >> $(DESTDIR)/usr/sbin/guam
+	chmod +x $(DESTDIR)/usr/sbin/guam
+
+	ln -s ../lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/bin/guam \
+		$(DESTDIR)/usr/lib/erlang/bin/kolab_guam
+
+	# Bundled runtime system and libraries
+	mkdir -p $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
+	cp -a _build/default/rel/guam/erts-* \
+		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+	cp -a _build/default/rel/guam/lib \
+		$(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+	rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
+	ln -s .. $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)
+	for dir in $(EIMAP_DIR) $(LAGER_SYSLOG_DIR); do \
+		rm -r $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
+		ln -s ../../$$dir $(BUNDLEDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/lib/$$dir; \
+	done
+
+override_dh_gencontrol:
+	dh_gencontrol -- $(SUBSTVARS)

debian.series Changed

guam-0.9.2.tar.gz/.gitignore Deleted

guam-0.9.2.tar.gz/rebar Deleted

guam-0.9.2.tar.gz/rel Deleted

guam-0.9.2.tar.gz/rel/files Deleted

guam-0.9.2.tar.gz/rel/files/erl Deleted

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# /bin/sh on Solaris is not a POSIX compatible shell, but /usr/bin/ksh is.
-if  `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ; then
-    POSIX_SHELL="true"
-    export POSIX_SHELL
-    exec /usr/bin/ksh $0 "$@"
-fi
-
-# clear it so if we invoke other scripts, they run as ksh as well
-unset POSIX_SHELL
-
-## This script replaces the default "erl" in erts-VSN/bin. This is
-## necessary as escript depends on erl and in turn, erl depends on
-## having access to a bootscript (start.boot). Note that this script
-## is ONLY invoked as a side-effect of running escript -- the embedded
-## node bypasses erl and uses erlexec directly (as it should).
-##
-## Note that this script makes the assumption that there is a
-## start_clean.boot file available in $ROOTDIR/release/VSN.
-
-# Determine the abspath of where this script is executing from.
-ERTS_BIN_DIR=$(cd ${0%/*} && pwd -P)
-
-# Now determine the root directory -- this script runs from erts-VSN/bin,
-# so we simply need to strip off two dirs from the end of the ERTS_BIN_DIR
-# path.
-ROOTDIR=${ERTS_BIN_DIR%/*/*}
-
-# Parse out release and erts info
-START_ERL=`cat $ROOTDIR/releases/start_erl.data`
-ERTS_VSN=${START_ERL% *}
-APP_VSN=${START_ERL#* }
-
-BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
-EMU=beam
-PROGNAME=`echo $0 | sed 's/.*\\///'`
-CMD="$BINDIR/erlexec"
-export EMU
-export ROOTDIR
-export BINDIR
-export PROGNAME
-
-exec $CMD -boot $ROOTDIR/releases/$APP_VSN/start_clean ${1+"$@"}

guam-0.9.2.tar.gz/rel/files/install_upgrade.escript Deleted

@@ -1,55 +0,0 @@
-#!/usr/bin/env escript
-%%! -noshell -noinput
-%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ft=erlang ts=4 sw=4 et
-%% This file is left for backward-compatibility.
-%% You, probably, shouldn't include it to new projects.
-
-
-main(NodeName, Cookie, ReleasePackage) ->
-    io:format("WARNING: 'install_upgrade.escript' is deprecated! "
-              "Use 'nodetool upgrade' instead.~n"),
-    NodeRoot = filename:dirname(filename:dirname(escript:script_name())),
-    NodeTool = which_nodetool(NodeRoot),
-    process_flag(trap_exit, true),
-    Port = erlang:open_port(
-             {spawn_executable, NodeTool},
-             {args, "-sname", NodeName,
-                      "-setcookie", Cookie,
-                      "upgrade", ReleasePackage},
-              binary, exit_status, use_stdio, stderr_to_stdout, hide),
-    port_loop(Port);
-main(_) ->
-    halt(1).
-
-
-which_nodetool(NodeRoot) ->
-    %% ${RELEASE_ROOT}/
-    %%   bin/install_upgrade.escript
-    %%   bin/nodetool ?
-    %%   erts-<erts_ver>/bin/nodetool ?
-    %%   releases/<app_ver>/nodetool ?
-    %%   releases/start_erl.data
-    {ok, Content} = file:read_file(filename:join(NodeRoot, "releases", "start_erl.data")),
-    ErtsVsn, AppVsn = binary:split(Content, <<" ">>),
-    Probes = 
-              filename:join(NodeRoot, "bin", "nodetool"),
-              filename:join(NodeRoot, <<"erts-", ErtsVsn/binary>>, "bin", "nodetool"),
-              filename:join(NodeRoot, "releases", AppVsn, "bin", "nodetool")
-             ,
-    case lists:dropwhile(fun(Path) -> not filelib:is_regular(Path) end, Probes) of
-         ->
-            io:format("ERROR: can't find 'nodetool' in ~p.~n", Probes),
-            halt(2);
-        Path | _ ->
-            Path
-    end.
-
-port_loop(Port) ->
-    receive
-        {Port, {data, Data}} ->
-            io:put_chars(Data),
-            port_loop(Port);
-        {Port, {exit_status, Status}} ->
-            halt(Status)
-    end.

guam-0.9.2.tar.gz/rel/files/kolab_guam Deleted

@@ -1,433 +0,0 @@
-#!/bin/sh
-# -*- tab-width:4;indent-tabs-mode:nil -*-
-# ex: ts=4 sw=4 et
-
-# /bin/sh on Solaris is not a POSIX compatible shell, but /usr/bin/ksh is.
-if  `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ; then
-    POSIX_SHELL="true"
-    export POSIX_SHELL
-    # To support 'whoami' on old Solaris systems, add /usr/ucb to path
-    # (New Solaris systems do not have 'whoami')
-    PATH=/usr/ucb:$PATH
-    export PATH
-    exec /usr/bin/ksh $0 "$@"
-fi
-
-# clear it so if we invoke other scripts, they run as ksh
-unset POSIX_SHELL
-
-RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd -P)
-RUNNER_SCRIPT=${0##*/}
-
-CALLER_DIR=$PWD
-
-RUNNER_BASE_DIR=${RUNNER_SCRIPT_DIR%/*}
-RUNNER_ETC_DIR=$RUNNER_BASE_DIR/etc
-# Note the trailing slash on $PIPE_DIR/
-PIPE_DIR=/tmp/$RUNNER_BASE_DIR/
-RUNNER_USER=
-
-# Make sure this script is running as the appropriate user
-if  "$RUNNER_USER" ; then
-    WHOAMI=$(id -un 2>/dev/null || whoami 2>/dev/null)
-    if  $? -ne 0 ; then
-        echo "Could not determine user name."
-        exit 1
-    fi
-    if  "x$WHOAMI" != "x$RUNNER_USER" ; then
-        # The 'su' command is more portable, but can't be configured as 'sudo'
-        # can to allow non-interactive calls from non-root users.
-        type sudo > /dev/null 2>&1
-        if  $? -eq 0 ; then
-            echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2
-            exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
-        else
-            if  "x$WHOAMI" != "xroot" ; then
-                echo "Only root can run $RUNNER_SCRIPT as $RUNNER_USER without requiring a password."
-                exit 1
-            else
-                echo "Attempting to restart script through su $RUNNER_USER" >&2
-                exec su $RUNNER_USER -c $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
-            fi
-        fi
-    fi
-fi
-
-# Identify the script name
-SCRIPT=`basename $0`
-
-# Parse out release and erts info
-START_ERL=`cat $RUNNER_BASE_DIR/releases/start_erl.data`
-ERTS_VSN=${START_ERL% *}
-APP_VSN=${START_ERL#* }
-
-# Use $CWD/vm.args if exists, otherwise releases/APP_VSN/vm.args, or
-# else etc/vm.args
-if  -e "$CALLER_DIR/vm.args" ; then
-    VMARGS_PATH=$CALLER_DIR/vm.args
-    USE_DIR=$CALLER_DIR
-else
-    USE_DIR=$RUNNER_BASE_DIR
-    if  -e "$RUNNER_BASE_DIR/releases/$APP_VSN/vm.args" ; then
-        VMARGS_PATH="$RUNNER_BASE_DIR/releases/$APP_VSN/vm.args"
-    else
-        VMARGS_PATH="$RUNNER_ETC_DIR/vm.args"
-    fi
-fi
-
-RUNNER_LOG_DIR=$USE_DIR/log
-# Make sure log directory exists
-mkdir -p $RUNNER_LOG_DIR
-
-# Use releases/VSN/sys.config if it exists otherwise use etc/app.config
-if  -e "$USE_DIR/sys.config" ; then
-    CONFIG_PATH="$USE_DIR/sys.config"
-else
-    if  -e "$RUNNER_BASE_DIR/releases/$APP_VSN/sys.config" ; then
-        CONFIG_PATH="$RUNNER_BASE_DIR/releases/$APP_VSN/sys.config"
-    else
-        CONFIG_PATH="$RUNNER_ETC_DIR/app.config"
-    fi
-fi
-
-# Extract the target node name from node.args
-NAME_ARG=`egrep '^\-s?name' $VMARGS_PATH`
-if  -z "$NAME_ARG" ; then
-    echo "vm.args needs to have either -name or -sname parameter."
-    exit 1
-fi
-
-# Extract the name type and name from the NAME_ARG for REMSH
-REMSH_TYPE=`echo $NAME_ARG | awk '{print $1}'`
-REMSH_NAME=`echo $NAME_ARG | awk '{print $2}'`
-
-# Test if REMSH_NAME contains a @ and set REMSH_HOSTNAME_PART 
-# and REMSH_NAME_PART according REMSH_TYPE
-MAYBE_FQDN_HOSTNAME=`hostname`
-HOSTNAME=`echo $MAYBE_FQDN_HOSTNAME | awk -F. '{print $1}'`
-
-REMSH_HOSTNAME_PART="$MAYBE_FQDN_HOSTNAME"
-case "$REMSH_NAME" in
-    *@*)
-        REMSH_HOSTNAME_PART=`echo $REMSH_NAME | awk -F@ '{print $2}'`
-        REMSH_NAME_PART=`echo $REMSH_NAME | awk -F@ '{print $1}'`
-        ;;
-    *)
-        REMSH_NAME_PART="$REMSH_NAME"
-        if  "$REMSH_TYPE" = "-sname" ; then
-            REMSH_HOSTNAME_PART="$HOSTNAME"
-        else
-            # -name type, check if `hostname` is fqdn
-            if  "$MAYBE_FQDN_HOSTNAME" = "$HOSTNAME" ; then
-                echo "Hostname must be a fqdn domain name when node is configured with long names"
-                echo "and the full node name isn't configured in vm.args"
-                exit 1
-            fi
-        fi
-        ;;
-esac
-
-# Note the `date +%s`, used to allow multiple remsh to the same node
-# transparently
-REMSH_NAME_ARG="$REMSH_TYPE remsh`date +%s`@$REMSH_HOSTNAME_PART"
-REMSH_REMSH_ARG="-remsh $REMSH_NAME_PART@$REMSH_HOSTNAME_PART"
-
-# Extract the target cookie
-COOKIE_ARG=`grep '^\-setcookie' $VMARGS_PATH`
-if  -z "$COOKIE_ARG" ; then
-    echo "vm.args needs to have a -setcookie parameter."
-    exit 1
-fi
-
-# Make sure CWD is set to the right dir
-cd $USE_DIR
-
-# Make sure log directory exists
-mkdir -p $USE_DIR/log
-
-RUNNER_SCRIPT_DATA=
-if  -e "$RUNNER_BASE_DIR/releases/$APP_VSN/runner_script.data" ; then
-    RUNNER_SCRIPT_DATA=`cat $RUNNER_BASE_DIR/releases/$APP_VSN/runner_script.data`
-fi
-
-if  -z "$RUNNER_SCRIPT_DATA" ; then
-    ROOTDIR=$RUNNER_BASE_DIR
-    ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
-    if  -e "$RUNNER_BASE_DIR/releases/$APP_VSN/nodetool" ; then
-        NODETOOL="$ERTS_PATH/escript $RUNNER_BASE_DIR/releases/$APP_VSN/nodetool $NAME_ARG $COOKIE_ARG"
-    else
-        NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
-    fi
-    SLIM_ARGS=
-elif  "$RUNNER_SCRIPT_DATA" = "slim" ; then
-    # Setup system paths
-    SYSTEM_ERL_PATH=`which erl`
-    if  ! -x "$SYSTEM_ERL_PATH" ; then
-        echo "Failed to find erl. Is Erlang/OTP available in PATH?"
-        exit 1
-    fi
-    SYSTEM_HOME_BIN=${SYSTEM_ERL_PATH%/*}
-    ROOTDIR=$SYSTEM_HOME_BIN/../lib/erlang
-    ERTS_PATH=$ROOTDIR/erts-$ERTS_VSN/bin
-    unset SYSTEM_ERL_PATH
-    unset SYSTEM_HOME_BIN
-
-    LOCAL_ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
-    NODETOOL="$ERTS_PATH/escript $RUNNER_BASE_DIR/releases/$APP_VSN/nodetool $NAME_ARG $COOKIE_ARG"
-    unset LOCAL_ERL_PATH
-
-    # Setup additional arguments for slim release
-    SLIM_ARGS="-boot_var RELTOOL_EXT_LIB $RUNNER_BASE_DIR/lib -sasl releases_dir \"$RUNNER_BASE_DIR/releases\""
-else
-    echo "Unknown runner_script.data"
-    exit 1
-fi
-
-# Setup remote shell command to control node
-REMSH="$ERTS_PATH/erl -hidden $REMSH_NAME_ARG $REMSH_REMSH_ARG $COOKIE_ARG"
-
-# Common functions
-
-# Ping node without allowing nodetool to take stdin
-ping_node() {
-    $NODETOOL ping < /dev/null
-}
-
-# Set the PID global variable, return 1 on error
-get_pid() {
-    PID=`$NODETOOL getpid < /dev/null`
-    ES=$?
-    if  "$ES" -ne 0 ; then
-        echo "Node is not running!"
-        return 1
-    fi
-
-    # don't allow empty or init pid's
-    if  -z $PID  ||  "$PID" -le 1 ; then
-        return 1
-    fi
-
-    return 0
-}
-
-# Check the first argument for instructions
-case "$1" in
-    start|start_boot)
-        # Make sure there is not already a node running
-        RES=`ping_node`
-        if  "$RES" = "pong" ; then
-            echo "Node is already running!"
-            exit 1
-        fi
-        case "$1" in
-            start)
-                shift
-                START_OPTION="console"
-                HEART_OPTION="start"
-                ;;
-            start_boot)
-                shift
-                START_OPTION="console_boot"
-                HEART_OPTION="start_boot"
-                ;;
-        esac
-        RUN_PARAM=$(printf "\'%s\' " "$@")
-        HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT $HEART_OPTION $RUN_PARAM"
-        export HEART_COMMAND
-        mkdir -p $PIPE_DIR
-        $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT $START_OPTION $RUN_PARAM" 2>&1
-        ;;
-
-    stop)
-        # Wait for the node to completely stop...
-        case `uname -s` in
-            Darwin)
-                # Make sure we explicitly set this because iTerm.app doesn't for
-                # some reason.
-                COMMAND_MODE=unix2003
-        esac
-
-        # Get the PID from nodetool
-        get_pid
-        GPR=$?
-        if  "$GPR" -ne 0  ||  -z $PID ; then
-            exit $GPR
-        fi
-
-        # Tell nodetool to initiate a stop
-        $NODETOOL stop
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            exit $ES
-        fi
-
-        # Wait for the node to completely stop...
-        while `kill -s 0 $PID 2>/dev/null`
-        do
-            sleep 1
-        done
-        ;;
-
-    restart)
-        ## Restart the VM without exiting the process
-        $NODETOOL restart
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            exit $ES
-        fi
-        ;;
-
-    reboot)
-        ## Restart the VM completely (uses heart to restart it)
-        $NODETOOL reboot
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            exit $ES
-        fi
-        ;;
-
-    ping)
-        ## See if the VM is alive
-        ping_node
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            exit $ES
-        fi
-        ;;
-
-    attach)
-        # Make sure a node is running
-        ping_node
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            echo "Node is not running!"
-            exit $ES
-        fi
-
-        shift
-        exec $ERTS_PATH/to_erl $PIPE_DIR
-        ;;
-
-    eval)
-        # Make sure a node IS running
-        ping_node > /dev/null 2>&1
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            echo "Node is not running!"
-            exit $ES
-        fi
-
-        shift
-        $NODETOOL eval "$1"
-        ES_EVAL=$?
-        if  "$ES_EVAL" -ne 0 ; then
-            exit $ES_EVAL
-        fi
-        ;;
-
-    remote_console)
-        # Make sure a node is running
-        ping_node
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            echo "Node is not running!"
-            exit $ES
-        fi
-
-        shift
-        exec $REMSH
-        ;;
-
-    upgrade)
-        if  -z "$2" ; then
-            echo "Missing upgrade package argument"
-            echo "Usage: $SCRIPT upgrade {package base name}"
-            echo "NOTE {package base name} MUST NOT include the .tar.gz suffix"
-            exit 1
-        fi
-
-        # Make sure a node IS running
-        ping_node
-        ES=$?
-        if  "$ES" -ne 0 ; then
-            echo "Node is not running!"
-            exit $ES
-        fi
-
-        $NODETOOL upgrade $2
-        ;;
-
-    console|console_clean|console_boot)
-        # .boot file typically just $SCRIPT (ie, the app name)
-        # however, for debugging, sometimes start_clean.boot is useful.
-        # For e.g. 'setup', one may even want to name another boot script.
-        case "$1" in
-            console)        BOOTFILE=$SCRIPT ;;
-            console_clean)  BOOTFILE=start_clean ;;
-            console_boot)
-                shift
-                BOOTFILE="$1"
-                shift
-                ;;
-        esac
-        # Setup beam-required vars
-        BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
-        EMU=beam
-        PROGNAME=`echo $0 | sed 's/.*\\///'`
-        CMD="$BINDIR/erlexec $SLIM_ARGS -boot $RUNNER_BASE_DIR/releases/$APP_VSN/$BOOTFILE -mode embedded -config $CONFIG_PATH -args_file $VMARGS_PATH"
-        export EMU
-        export ROOTDIR
-        export BINDIR
-        export PROGNAME
-
-        # Dump environment info for logging purposes
-        echo "Exec: $CMD" -- ${1+"$@"}
-        echo "Root: $ROOTDIR"
-
-        # Log the startup
-        logger -t "$SCRIPT$$" "Starting up"
-
-        # Start the VM
-        exec $CMD -- ${1+"$@"}
-        ;;
-
-    foreground)
-        # start up the release in the foreground for use by runit
-        # or other supervision services
-
-        BOOTFILE=$SCRIPT
-        FOREGROUNDOPTIONS="-noinput +Bd"
-
-        # Setup beam-required vars
-        BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
-        EMU=beam
-        PROGNAME=`echo $0 | sed 's/.*\///'`
-        CMD="$BINDIR/erlexec $SLIM_ARGS $FOREGROUNDOPTIONS -boot $RUNNER_BASE_DIR/releases/$APP_VSN/$BOOTFILE -config $CONFIG_PATH -args_file $VMARGS_PATH"
-        export EMU
-        export ROOTDIR
-        export BINDIR
-        export PROGNAME
-
-        # Dump environment info for logging purposes
-        echo "Exec: $CMD" -- ${1+"$@"}
-        echo "Root: $ROOTDIR"
-
-        # Start the VM
-        exec $CMD -- ${1+"$@"}
-        ;;
-    getpid)
-        # Get the PID from nodetool
-        get_pid
-        ES=$?
-        if  "$ES" -ne 0  ||  -z $PID ; then
-            exit $ES
-        fi
-        echo $PID
-        ;;
-    *)
-        echo "Usage: $SCRIPT {start|start_boot <file>|foreground|stop|restart|reboot|ping|console|getpid|console_clean|console_boot <file>|attach|eval|remote_console|upgrade}"
-        exit 1
-        ;;
-esac
-
-exit 0

guam-0.9.2.tar.gz/rel/files/kolab_guam.cmd Deleted

@@ -1,116 +0,0 @@
-@setlocal
-
-@set node_name=kolab_guam
-
-@rem Get the absolute path to the parent directory,
-@rem which is assumed to be the node root.
-@for /F "delims=" %%I in ("%~dp0..") do @set node_root=%%~fI
-
-@rem CWD to the node root directory
-@cd %node_root%
-
-@set releases_dir=%node_root%\releases
-
-@rem Parse ERTS version and release version from start_erl.data
-@for /F "usebackq tokens=1,2" %%I in ("%releases_dir%\start_erl.data") do @(
-    @call :set_trim erts_version %%I
-    @call :set_trim release_version %%J
-)
-
-@if exist "%releases_dir%\%release_version%\vm.args" (
-    @set vm_args="%releases_dir%\%release_version%\vm.args"
-) else (
-    @set vm_args="%node_root%\etc\vm.args"
-)
-
-@if exist "%releases_dir%\%release_version%\sys.config" (
-    @set sys_config="%releases_dir%\%release_version%\sys.config"
-) else (
-    @set sys_config="%node_root%\etc\app.config"
-)
-
-@set node_boot_script=%releases_dir%\%release_version%\%node_name%
-@set clean_boot_script=%releases_dir%\%release_version%\start_clean
-
-@rem extract erlang cookie from vm.args
-@for /f "usebackq tokens=1-2" %%I in (`findstr /b \-setcookie "%vm_args%"`) do @set erlang_cookie=%%J
-
-@set erts_bin=%node_root%\erts-%erts_version%\bin
-
-@set service_name=%node_name%_%release_version%
-
-@set erlsrv="%erts_bin%\erlsrv.exe"
-@set epmd="%erts_bin%\epmd.exe"
-@set escript="%erts_bin%\escript.exe"
-@set werl="%erts_bin%\werl.exe"
-@set nodetool="%erts_bin%\nodetool"
-
-@if "%1"=="usage" @goto usage
-@if "%1"=="install" @goto install
-@if "%1"=="uninstall" @goto uninstall
-@if "%1"=="start" @goto start
-@if "%1"=="stop" @goto stop
-@if "%1"=="restart" @call :stop && @goto start
-@if "%1"=="console" @goto console
-@if "%1"=="ping" @goto ping
-@if "%1"=="query" @goto query
-@if "%1"=="attach" @goto attach
-@if "%1"=="upgrade" @goto upgrade
-@echo Unknown command: "%1"
-
-:usage
-@echo Usage: %~n0 install^|uninstall^|start^|stop^|restart^|console^|ping^|query^|attach^|upgrade
-@goto :EOF
-
-:install
-@set description=Erlang node %node_name% in %node_root%
-@set start_erl=%node_root%\bin\start_erl.cmd
-@set args= ++ %node_name% ++ %node_root%
-@%erlsrv% add %service_name% -c "%description%" -sname %node_name% -w "%node_root%" -m "%start_erl%" -args "%args%" -stopaction "init:stop()."
-@goto :EOF
-
-:uninstall
-@%erlsrv% remove %service_name%
-@%epmd% -kill
-@goto :EOF
-
-:start
-@%erlsrv% start %service_name%
-@goto :EOF
-
-:stop
-@%erlsrv% stop %service_name%
-@goto :EOF
-
-:console
-@start "%node_name% console" %werl% -boot "%node_boot_script%" -config "%sys_config%" -args_file "%vm_args%" -sname %node_name%
-@goto :EOF
-
-:ping
-@%escript% %nodetool% ping -sname "%node_name%" -setcookie "%erlang_cookie%"
-@exit %ERRORLEVEL%
-@goto :EOF
-
-:query
-@%erlsrv% list %service_name%
-@exit %ERRORLEVEL%
-@goto :EOF
-
-:attach
-@for /f "usebackq" %%I in (`hostname`) do @set hostname=%%I
-start "%node_name% attach" %werl% -boot "%clean_boot_script%" -remsh %node_name%@%hostname% -sname console -setcookie %erlang_cookie%
-@goto :EOF
-
-:upgrade
-@if "%2"=="" (
-    @echo Missing upgrade package argument
-    @echo Usage: %~n0 upgrade {package base name}
-    @echo NOTE {package base name} MUST NOT include the .tar.gz suffix
-    @goto :EOF
-)
-@%escript% %nodetool% -sname "%node_name%" -setcookie "%erlang_cookie%" upgrade %2
-@goto :EOF
-
-:set_trim
-@set %1=%2
-@goto :EOF

guam-0.9.2.tar.gz/rel/files/nodetool Deleted

@@ -1,219 +0,0 @@
-#!/usr/bin/env escript
-%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*-
-%% ex: ft=erlang ts=4 sw=4 et
-%% -------------------------------------------------------------------
-%%
-%% nodetool: Helper Script for interacting with live nodes
-%%
-%% -------------------------------------------------------------------
-main(Args) ->
-    ok = start_epmd(),
-    %% Extract the args
-    {RestArgs, TargetNode} = process_args(Args, , undefined),
-
-    %% any commands that don't need a running node
-    case RestArgs of
-        "chkconfig", File ->
-            case file:consult(File) of
-                {ok, _} ->
-                    io:format("ok\n"),
-                    halt(0);
-                {error, {Line, Mod, Term}} ->
-                    io:format(standard_error, "Error on line ",
-                              file:format_error({Line, Mod, Term}), "\n", ),
-                    halt(1);
-                {error, R} ->
-                    io:format(standard_error, "Error reading config file: ",
-                              file:format_error(R), "\n", ),
-                    halt(1)
-            end;
-        _ ->
-            ok
-    end,
-
-    %% See if the node is currently running  -- if it's not, we'll bail
-    case {net_kernel:hidden_connect_node(TargetNode),
-          net_adm:ping(TargetNode)} of
-        {true, pong} ->
-            ok;
-        {false,pong} ->
-            io:format("Failed to connect to node ~p .\n", TargetNode),
-            halt(1);
-        {_, pang} ->
-            io:format("Node ~p not responding to pings.\n", TargetNode),
-            halt(1)
-    end,
-
-    case RestArgs of
-        "getpid" ->
-            io:format("~p\n",
-                      list_to_integer(rpc:call(TargetNode, os, getpid, )));
-        "ping" ->
-            %% If we got this far, the node already responsed to a
-            %% ping, so just dump a "pong"
-            io:format("pong\n");
-        "stop" ->
-            io:format("~p\n", rpc:call(TargetNode, init, stop, , 60000));
-        "restart" ->
-            io:format("~p\n", rpc:call(TargetNode, init, restart, , 60000));
-        "reboot" ->
-            io:format("~p\n", rpc:call(TargetNode, init, reboot, , 60000));
-        "rpc", Module, Function | RpcArgs ->
-            case rpc:call(TargetNode,
-                          list_to_atom(Module),
-                          list_to_atom(Function),
-                          RpcArgs, 60000) of
-                ok ->
-                    ok;
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", TargetNode, Reason),
-                    halt(1);
-                _ ->
-                    halt(1)
-            end;
-        "rpc_infinity", Module, Function | RpcArgs ->
-            case rpc:call(TargetNode,
-                          list_to_atom(Module),
-                          list_to_atom(Function),
-                          RpcArgs, infinity) of
-                ok ->
-                    ok;
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", TargetNode, Reason),
-                    halt(1);
-                _ ->
-                    halt(1)
-            end;
-        "rpcterms", Module, Function, ArgsAsString ->
-            case rpc:call(TargetNode,
-                          list_to_atom(Module),
-                          list_to_atom(Function),
-                          consult(ArgsAsString), 60000) of
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", TargetNode, Reason),
-                    halt(1);
-                Other ->
-                    io:format("~p\n", Other)
-            end;
-        "eval", Str0 ->
-            Str = string:strip(Str0, right, $.) ++ ".",
-            Bindings = erl_eval:new_bindings(),
-            case rpc:call(TargetNode,
-                          erl_eval,
-                          exprs,
-                          parse(Str), Bindings,
-                          60000) of
-                {badrpc, Reason} ->
-                    io:format("RPC to ~p failed: ~p\n", TargetNode, Reason),
-                    halt(1);
-                {value, Value, _Bindings} ->
-                    io:format("~p\n", Value)
-            end;
-        "upgrade", ReleasePackage ->
-            %% TODO: This script currently does NOT support slim releases.
-            %% Necessary steps to upgrade a slim release are as follows:
-            %% 1. unpack relup archive manually
-            %% 2. copy releases directory and necessary libraries
-            %% 3. using release_hander:set_unpacked/2 .
-            %% For more details, see https://github.com/rebar/rebar/pull/52
-            %% and https://github.com/rebar/rebar/issues/202
-            {ok, Vsn} = rpc:call(TargetNode, release_handler, unpack_release,
-                                 ReleasePackage, 60000),
-            io:format("Unpacked Release ~p\n", Vsn),
-            {ok, OtherVsn, Desc} = rpc:call(TargetNode, release_handler,
-                                            check_install_release, Vsn, 60000),
-            {ok, OtherVsn, Desc} = rpc:call(TargetNode, release_handler,
-                                            install_release, Vsn, 60000),
-            io:format("Installed Release ~p\n", Vsn),
-            ok = rpc:call(TargetNode, release_handler, make_permanent, Vsn, 60000),
-            io:format("Made Release ~p Permanent\n", Vsn);
-        Other ->
-            io:format("Other: ~p\n", Other),
-            io:format("Usage: nodetool {chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms|eval|upgrade}\n")
-    end,
-    net_kernel:stop().
-
-process_args(, Acc, TargetNode) ->
-    {lists:reverse(Acc), TargetNode};
-process_args("-setcookie", Cookie | Rest, Acc, TargetNode) ->
-    erlang:set_cookie(node(), list_to_atom(Cookie)),
-    process_args(Rest, Acc, TargetNode);
-process_args("-name", TargetName | Rest, Acc, _) ->
-    ThisNode = append_node_suffix(TargetName, "_maint_"),
-    {ok, _} = net_kernel:start(ThisNode, longnames),
-    process_args(Rest, Acc, nodename(TargetName));
-process_args("-sname", TargetName | Rest, Acc, _) ->
-    ThisNode = append_node_suffix(TargetName, "_maint_"),
-    {ok, _} = net_kernel:start(ThisNode, shortnames),
-    process_args(Rest, Acc, nodename(TargetName));
-process_args(Arg | Rest, Acc, Opts) ->
-    process_args(Rest, Arg | Acc, Opts).
-
-
-start_epmd() ->
-     = os:cmd(epmd_path() ++ " -daemon"),
-    ok.
-
-epmd_path() ->
-    ErtsBinDir = filename:dirname(escript:script_name()),
-    Name = "epmd",
-    case os:find_executable(Name, ErtsBinDir) of
-        false ->
-            case os:find_executable(Name) of
-                false ->
-                    io:format("Could not find epmd.~n"),
-                    halt(1);
-                GlobalEpmd ->
-                    GlobalEpmd
-            end;
-        Epmd ->
-            Epmd
-    end.
-
-
-nodename(Name) ->
-    case string:tokens(Name, "@") of
-        _Node, _Host ->
-            list_to_atom(Name);
-        Node ->
-            _, Host = string:tokens(atom_to_list(node()), "@"),
-            list_to_atom(lists:concat(Node, "@", Host))
-    end.
-
-append_node_suffix(Name, Suffix) ->
-    case string:tokens(Name, "@") of
-        Node, Host ->
-            list_to_atom(lists:concat(Node, Suffix, os:getpid(), "@", Host));
-        Node ->
-            list_to_atom(lists:concat(Node, Suffix, os:getpid()))
-    end.
-
-
-%%
-%% Given a string or binary, parse it into a list of terms, ala file:consult/0
-%%
-consult(Str) when is_list(Str) ->
-    consult(, Str, );
-consult(Bin) when is_binary(Bin)->
-    consult(, binary_to_list(Bin), ).
-
-consult(Cont, Str, Acc) ->
-    case erl_scan:tokens(Cont, Str, 0) of
-        {done, Result, Remaining} ->
-            case Result of
-                {ok, Tokens, _} ->
-                    {ok, Term} = erl_parse:parse_term(Tokens),
-                    consult(, Remaining, Term | Acc);
-                {eof, _Other} ->
-                    lists:reverse(Acc);
-                {error, Info, _} ->
-                    {error, Info}
-            end;
-        {more, Cont1} ->
-            consult(Cont1, eof, Acc)
-    end.
-
-parse(Str) ->
-    {ok, Tokens, _} = erl_scan:string(Str),
-    {ok, Exprs} = erl_parse:parse_exprs(Tokens),
-    Exprs.

guam-0.9.2.tar.gz/rel/files/start_erl.cmd Deleted

@@ -1,40 +0,0 @@
-@setlocal
-
-@rem Parse arguments. erlsrv.exe prepends erl arguments prior to first ++.
-@rem Other args are position dependent.
-@set args="%*"
-@for /F "delims=++ tokens=1,2,3" %%I in (%args%) do @(
-    @set erl_args=%%I
-    @call :set_trim node_name %%J
-    @rem Trim spaces from the left of %%K (node_root), which may have spaces inside
-    @for /f "tokens=* delims= " %%a in ("%%K") do @set node_root=%%a
-)
-
-@set releases_dir=%node_root%\releases
-
-@rem parse ERTS version and release version from start_erl.dat
-@for /F "usebackq tokens=1,2" %%I in ("%releases_dir%\start_erl.data") do @(
-    @call :set_trim erts_version %%I
-    @call :set_trim release_version %%J
-)
-
-@set erl_exe="%node_root%\erts-%erts_version%\bin\erl.exe"
-@set boot_file="%releases_dir%\%release_version%\%node_name%"
-
-@if exist "%releases_dir%\%release_version%\sys.config" (
-    @set app_config="%releases_dir%\%release_version%\sys.config"
-) else (
-    @set app_config="%node_root%\etc\app.config"
-)
-
-@if exist "%releases_dir%\%release_version%\vm.args" (
-    @set vm_args="%releases_dir%\%release_version%\vm.args"
-) else (
-    @set vm_args="%node_root%\etc\vm.args"
-)
-
-@%erl_exe% %erl_args% -boot %boot_file% -config %app_config% -args_file %vm_args%
-
-:set_trim
-@set %1=%2
-@goto :EOF

guam-0.9.2.tar.gz/rel/files/sys.config Deleted

@@ -1,85 +0,0 @@
-%% Example configuration for Guam.
-
-    {
-        kolab_guam, 
-            {
-                imap_servers, 
-                    {
-                        imap, 
-                            { host, "127.0.0.1" },
-                            { port, 143 },
-                            { tls, starttls }
-                        
-                    },
-                    {
-                        imaps, 
-                            { host, "127.0.0.1" },
-                            { port, 993 },
-                            { tls, true }
-                        
-                    }
-                
-            },
-            {
-                listeners, 
-                    {
-                        imap, 
-                            { port, 9143 },
-                            { imap_server, imap },
-                            {
-                                rules, 
-                                    { filter_groupware,  }
-                                
-                            },
-                            {
-                                tls_config, 
-                                    { certfile, "/etc/pki/tls/private/localhost.pem" }
-                                
-                            }
-                        
-                    },
-                    {
-                        imaps, 
-                            { port, 9993 },
-                            { implicit_tls, true },
-                            { imap_server, imaps },
-                            {
-                                rules, 
-                                    { filter_groupware,  }
-                                
-                            },
-                            {
-                                tls_config, 
-                                    { certfile, "/etc/pki/tls/private/localhost.pem" }
-                                
-                            }
-                        
-                    }
-                
-            }
-        
-    },
-
-    {
-        lager, 
-            {
-                handlers, 
-                    { lager_console_backend, debug },
-                    { lager_file_backend,  { file, "log/error.log"}, { level, error }  },
-                    { lager_file_backend,  { file, "log/console.log"}, { level, info }  }
-                
-            }
-        
-    },
-
-    %% SASL config
-    {
-        sasl, 
-            { sasl_error_logger, { file, "log/sasl-error.log" } },
-            { errlog_type, error },
-            { error_logger_mf_dir, "log/sasl" },      % Log directory
-            { error_logger_mf_maxbytes, 10485760 },   % 10 MB max file size
-            { error_logger_mf_maxfiles, 5 }           % 5 files max
-        
-    }
-.

guam-0.9.2.tar.gz/rel/files/vm.args Deleted

guam-0.9.2.tar.gz/rel/reltool.config Deleted

@@ -1,51 +0,0 @@
-%% -*- mode: erlang -*-
-%% ex: ft=erlang
-{sys, 
-       {lib_dirs, "../deps"},
-       {erts, {mod_cond, derived}, {app_file, strip}},
-       {app_file, strip},
-       {rel, "kolab_guam", "0.9",
-        
-         kernel,
-         stdlib,
-         sasl,
-         compiler,
-         syntax_tools,
-         goldrush,
-         lager,
-         lager_syslog,
-         crypto,
-         kolab_guam
-        },
-       {rel, "start_clean", "",
-        
-         kernel,
-         stdlib
-        },
-       {boot_rel, "kolab_guam"},
-       {profile, embedded},
-       {incl_cond, derived},
-       {excl_archive_filters, ".*"}, %% Do not archive built libs
-       {excl_sys_filters, "^bin/(?!start_clean.boot)",
-                           "^erts.*/bin/(dialyzer|typer)",
-                           "^erts.*/(doc|info|include|lib|man|src)"},
-       {excl_app_filters, "\.gitignore"},
-       {app, kolab_guam, {mod_cond, app}, {incl_cond, include}, {lib_dir, "../apps/kolab_guam"}}
-      }.
-
-{target_dir, "kolab_guam"}.
-
-{overlay, 
-           {mkdir, "log/sasl"},
-           {copy, "files/erl", "\{\{erts_vsn\}\}/bin/erl"},
-           {copy, "files/nodetool", "releases/\{\{rel_vsn\}\}/nodetool"},
-           {copy, "kolab_guam/bin/start_clean.boot",
-                  "\{\{erts_vsn\}\}/bin/start_clean.boot"},
-           {copy, "files/kolab_guam", "bin/kolab_guam"},
-           {copy, "files/kolab_guam.cmd", "bin/kolab_guam.cmd"},
-           {copy, "files/start_erl.cmd", "bin/start_erl.cmd"},
-           %% Following line may be safely removed in new projects
-           {copy, "files/install_upgrade.escript", "bin/install_upgrade.escript"},
-           {copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"},
-           {copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"}
-          }.

guam-0.9.2.tar.gz/CHANGELOG.md -> guam-0.9.4.tar.gz/CHANGELOG.md Changed

guam-0.9.2.tar.gz/Makefile -> guam-0.9.4.tar.gz/Makefile Changed

guam-0.9.2.tar.gz/apps/kolab_guam/src/kolab_guam.app.src -> guam-0.9.4.tar.gz/apps/kolab_guam/src/kolab_guam.app.src Changed

guam-0.9.2.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl -> guam-0.9.4.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl Changed

@@ -266,9 +266,15 @@
     { PostAction, SplitCommand, SplitResetTrigger } =
         case CurrentCommandSplit of
             undefined ->
-                case eimap_utils:split_command_into_components(ClientData) of
-                    { _Tag, <<>>, <<>> } -> { buffer_data, undefined, reset_for_next_client_command };
-                    { _Tag, Command, _Data } = Split -> { perform_passthrough, Split, when_to_reset_split(Command) }
+                %We first have to check whether the command is an empty line. In such a case split_command_into_components would return an empty command,
+                %even though the command is complete.
+                case ClientData of
+                    <<"\r\n">> -> { perform_passthrough, CurrentCommandSplit, reset_for_next_client_command };
+                    _ ->
+                        case eimap_utils:split_command_into_components(ClientData) of
+                            { _Tag, <<>>, <<>> } -> { buffer_data, undefined, reset_for_next_client_command };
+                            { _Tag, Command, _Data } = Split -> { perform_passthrough, Split, when_to_reset_split(Command) }
+                        end
                 end;
             _ ->  { perform_passthrough, CurrentCommandSplit, reset_for_next_client_command }
         end,

guam-0.9.2.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl -> guam-0.9.4.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.erl Changed

@@ -19,8 +19,7 @@
 -export(new/1, applies/4, imap_data/3, apply_to_client_message/4, apply_to_server_message/3).
 -behavior(kolab_guam_rule).
 
--record(state, { blacklist = , tag = <<>>, active = false, last_chunk = <<>>,
-                 trigger_commands = <<"LIST">>, <<"list">>, <<"XLIST">>, <<"xlist">>, <<"LSUB">>, <<"lsub">>}).
+-include("kolab_guam_rule_filter_groupware.hrl").
 
 new(_Config) -> #state { blacklist = undefined }.
 
@@ -29,6 +28,9 @@
     %lager:debug("********** Checking ...~n    Command: ~s ~s, Result ~p", Command, Data, Applies),
     { Applies, State }.
 
+apply_to_client_message(_ImapSession, Buffer, undefined, State) ->
+    { Buffer, State };
+
 apply_to_client_message(ImapSession, Buffer, { Tag, Command, Data }, State) ->
     { Active, StateTag } =
     case is_triggering_command(Command, Data, State) of
@@ -75,15 +77,22 @@
 apply_if_found_kolab(0) -> true;
 apply_if_found_kolab(_) -> false.
 
+possibly_append_newline(<<>>) -> <<>> ;
+possibly_append_newline(Response) -> <<Response/binary, "\r\n">> .
+
 filter_folders(<<>>, State) ->
     { <<>>, State#state{ active = true } };
 filter_folders(Buffer, #state{ last_chunk = LeftOvers } = State) ->
+    % Add the left overs from the previous buffer to the current buffer
     FullBuffer = <<LeftOvers/binary, Buffer/binary>>,
+    % From that buffer, only take the complete lines and save off the remainder.
     { FullLinesBuffer, LastChunk } = eimap_utils:only_full_lines(FullBuffer),
+    % Create a list so we can filter the individual folders
     ListResponses = binary:split(FullLinesBuffer, <<"\r\n">>,  global ),
     { Response, More } = filter_folders(State, ListResponses, { <<>>, true }),
     %io:format("Filtered ... ~p~n", Response),
-    { <<Response/binary, "\r\n">>, State#state { active = More, last_chunk = LastChunk } }.
+    %Note that the last list item does not contain \r\n, so that needs to be added unless we filtered the complete content.
+    { possibly_append_newline(Response), State#state { active = More, last_chunk = LastChunk } }.
 
 filter_folders(_State, , Return) -> Return;
 filter_folders(_State, _Folders, { Acc, false }) -> { Acc, false };

guam-0.9.4.tar.gz/apps/kolab_guam/src/rules/kolab_guam_rule_filter_groupware.hrl Added

guam-0.9.2.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl -> guam-0.9.4.tar.gz/apps/kolab_guam/test/kolab_guam_rules_SUITE.erl Changed

@@ -21,7 +21,8 @@
 -compile(export_all).
 
 % required for common_test to work
--include("ct.hrl").
+-include_lib("common_test/include/ct.hrl").
+-include("../src/rules/kolab_guam_rule_filter_groupware.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% common test callbacks %%
@@ -54,36 +55,96 @@
 % c("apps/kolab_guam/test/kolab_guam_sup_tests.erl"). eunit:test(kolab_guam_sup_tests).
 
 kolab_guam_rule_filter_groupware_responsefiltering_test(_TestConfig) ->
+    %% Data to be fed into the test, one tuple per iteration
+    %% Tuple format: {  = folder_blacklist, input_data, correct_output }
     Data = 
         {
+            
+             {<<"Calendar">>, <<"Calendar/">>},
+             {<<"Calendar/Personal Calendar">>, <<"Calendar/Personal Calendar/">>},
+             {<<"Configuration">>, <<"Configuration/">>},
+             {<<"Contacts">>, <<"Contacts/">>},
+             {<<"Contacts/Personal Contacts">>, <<"Contacts/Personal Contacts/">>},
+             {<<"Files">>, <<"Files/">>},
+             {<<"Journal">>, <<"Journal/">>},
+             {<<"Notes">>, <<"Notes/">>},
+             {<<"Tasks">>, <<"Tasks/">>}
+            ,
             <<"* LIST (\\Noinferiors \\Subscribed) \"/\" INBOX\r\n* LIST (\\Subscribed) \"/\" Archive\r\n* LIST (\\Subscribed \\HasChildren) \"/\" Calendar\r\n* LIST (\\Subscribed) \"/\" \"Calendar/Personal Calendar\"\r\n* LIST (\\Subscribed) \"/\" Configuration\r\n* LIST (\\Subscribed \\HasChildren) \"/\" Contacts\r\n* LIST (\\Subscribed) \"/\" \"Contacts/Personal Contacts\"\r\n* LIST (\\Subscribed) \"/\" Drafts\r\n* LIST (\\Subscribed) \"/\" Files\r\n* LIST (\\Subscribed) \"/\" Journal\r\n* LIST (\\Subscribed) \"/\" Notes\r\n* LIST (\\Subscribed) \"/\" Sent\r\n* LIST (\\Subscribed) \"/\" Spam\r\n* LIST (\\Subscribed) \"/\" Tasks\r\n* LIST (\\Subscribed) \"/\" Trash\r\n7 OK Completed (0.000 secs 15 calls)\r\n">>,
             <<"* LIST (\\Noinferiors \\Subscribed) \"/\" INBOX\r\n* LIST (\\Subscribed) \"/\" Archive\r\n* LIST (\\Subscribed) \"/\" Drafts\r\n* LIST (\\Subscribed) \"/\" Sent\r\n* LIST (\\Subscribed) \"/\" Spam\r\n* LIST (\\Subscribed) \"/\" Trash\r\n7 OK Completed (0.000 secs 15 calls)\r\n">>
         }
     ,
+
+    %% setup boilerplate
     Config = {}, %%TODO?
     State = kolab_guam_rule_filter_groupware:new(Config),
     ServerConfig = kolab_guam_sup:default_imap_server_config(),
     { ok, ImapSession } = eimap:start_link(ServerConfig),
-    { _, ReadyState } = kolab_guam_rule_filter_groupware:apply_to_client_message(ImapSession, <<"7 list (subscribed) \"\" \"*\" return (special-use)">>, State),
-    lists:foreach(fun({ Input, Filtered }) -> { Filtered, NewState } = kolab_guam_rule_filter_groupware:apply_to_server_message(ImapSession, Input, ReadyState) end, Data).
+
+    %% create the rule, ready for testing
+    ClientData = <<"7 list (subscribed) \"\" \"*\" return (special-use)">>,
+    Split = eimap_utils:split_command_into_components(ClientData),
+    { _, ReadyState } = kolab_guam_rule_filter_groupware:apply_to_client_message(ImapSession, ClientData, Split, State),
+
+    %% run the dataset through the rule
+    lists:foreach(fun({ Blacklist, Input, Filtered }) ->
+                        BlacklistState = ReadyState#state{ blacklist = Blacklist },
+                        { Filtered, _NewState } = kolab_guam_rule_filter_groupware:apply_to_server_message(ImapSession, Input, BlacklistState) end,
+                  Data).
 
 kolab_guam_rule_filter_groupware_responsefiltering_multipacket_test(_TestConfig) ->
+    %% Data to be fed into the test, one tuple per iteration
+    %% Tuple format: {  input_packets  = complete_message, correct_output }
     Data = 
         {
             
+             {<<"Calendar">>, <<"Calendar/">>},
+             {<<"Calendar/Personal Calendar">>, <<"Calendar/Personal Calendar/">>},
+             {<<"Configuration">>, <<"Configuration/">>},
+             {<<"Contacts">>, <<"Contacts/">>},
+             {<<"Contacts/Personal Contacts">>, <<"Contacts/Personal Contacts/">>},
+             {<<"Files">>, <<"Files/">>},
+             {<<"Journal">>, <<"Journal/">>},
+             {<<"Notes">>, <<"Notes/">>},
+             {<<"Tasks">>, <<"Tasks/">>}
+            ,
+            
                 <<"* LIST (\\Noinferiors \\Subscribed) \"/\" INBOX\r\n* LIST (\\Subscribed) \"/\" Archive\r\n* LIST (\\Subscribed \\HasChildren) \"/\" Calendar\r\n* LIST (\\Subscribed) \"/\" \"Calendar/Personal Calendar\"\r\n* LIST (\\Subscribed) \"/\" Configuration\r\n* LIST (\\Subscribed \\HasChildren) \"/\" Contacts\r\n* LIST (\\Subscribed) \"/\" \"Contacts/Personal Contacts\"\r\n* LIST (\\Subscribed) \"/\" Drafts\r\n* LIST (\\Subscribed) \"/\" Files\r\n* LIST (\\Subscribed) \"/\" Journal\r\n* LIST (\\Subscribed)">>,
                 <<"\"/\" Notes\r\n* LIST (\\Subscribed) \"/\" Sent\r\n* LIST (\\Subscribed) \"/\" Spam\r\n* LIST (\\Subscribed) \"/\" Tasks\r\n* LIST (\\Subscribed) \"/\" Trash\r\n7 OK Completed (0.000 secs 15 calls)\r\n">>
             ,
             <<"* LIST (\\Noinferiors \\Subscribed) \"/\" INBOX\r\n* LIST (\\Subscribed) \"/\" Archive\r\n* LIST (\\Subscribed) \"/\" Drafts\r\n* LIST (\\Subscribed) \"/\" Sent\r\n* LIST (\\Subscribed) \"/\" Spam\r\n* LIST (\\Subscribed) \"/\" Trash\r\n7 OK Completed (0.000 secs 15 calls)\r\n">>
+        },
+        %Filter complete packet
+        {
+            
+             {<<"Calendar">>, <<"Calendar/">>}
+            ,
+            
+                <<"* LIST (\\Subscribed \\HasChildren) \"/\" Calendar\r\n">>,
+                <<"7 OK Completed (0.000 secs 15 calls)\r\n">>
+            ,
+            <<"7 OK Completed (0.000 secs 15 calls)\r\n">>
         }
     ,
+    %% setup boilerplate
     Config = {}, %%TODO?
     State = kolab_guam_rule_filter_groupware:new(Config),
-    { _, ReadyState } = kolab_guam_rule_filter_groupware:apply_to_client_message(<<"7 list (subscribed) \"\" \"*\" return (special-use)">>, State),
-    lists:foreach(fun({ Input, Filtered }) -> Filtered = filter_groupware_packets(ReadyState, Input, <<>>) end, Data).
+    ServerConfig = kolab_guam_sup:default_imap_server_config(),
+    { ok, ImapSession } = eimap:start_link(ServerConfig),
+
+    %% create the rule, ready for testing
+    ClientData = <<"7 list (subscribed) \"\" \"*\" return (special-use)">>,
+    Split = eimap_utils:split_command_into_components(ClientData),
+    { _, ReadyState } = kolab_guam_rule_filter_groupware:apply_to_client_message(ImapSession, ClientData, Split, State),
+
+    %% run the dataset through the rule
+    lists:foreach(fun({ Blacklist, Input, Filtered }) ->
+                          BlacklistState = ReadyState#state{ blacklist = Blacklist },
+                          Filtered = filter_groupware_packets(ImapSession, BlacklistState, Input, <<>>) end,
+                  Data).
 
-filter_groupware_packets(_ReadyState, , Buffer) -> Buffer;
-filter_groupware_packets(ReadyState, Input|More, Buffer) ->
-    { Processed, State } = kolab_guam_rule_filter_groupware:apply_to_server_message(Input, ReadyState),
-    filter_groupware_packets(State, More, <<Buffer/binary, Processed/binary>>).
+filter_groupware_packets(_ImapSession, _ReadyState, , Buffer) -> Buffer;
+filter_groupware_packets(ImapSession, ReadyState, Input|More, Buffer) ->
+    { Processed, State } = kolab_guam_rule_filter_groupware:apply_to_server_message(ImapSession, Input, ReadyState),
+    filter_groupware_packets(ImapSession, State, More, <<Buffer/binary, Processed/binary>>).

guam-0.9.2.tar.gz/apps/kolab_guam/test/kolab_guam_sup_SUITE.erl -> guam-0.9.4.tar.gz/apps/kolab_guam/test/kolab_guam_sup_SUITE.erl Changed

@@ -21,17 +21,32 @@
 -compile(export_all).
 
 % required for common_test to work
--include("ct.hrl").
+-include_lib("common_test/include/ct.hrl").
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% common test callbacks %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Specify a list of all unit test functions
-all() -> imap_server_config_test, imap_server_settings_to_config_test.
+all() -> default_imap_server_config_test, imap_server_config_test.
 
 % required, but can just return Config. this is a suite level setup function.
 init_per_suite(Config) ->
+        application:set_env(kolab_guam, imap_servers, 
+                { default, 
+                                { host, "192.168.56.102" },
+                                { port, 994 },
+                                { tls, true }
+                           
+                },
+                { test_default, 
+                                { host, "192.168.56.101" },
+                                { port, 993 },
+                                { tls, false }
+                           
+                }
+            
+        ),
         Config.
 
 % required, but can just return Config. this is a suite level tear down function.
@@ -48,8 +63,6 @@
 end_per_testcase(_TestCase, Config) ->
         Config.
 
-% c("apps/kolab_guam/test/kolab_guam_sup_tests.erl"). eunit:test(kolab_guam_sup_tests).
-
 default_imap_server_config_test(_TestConfig) ->
     Expected =  { host, "192.168.56.102" }, { port, 994 }, { tls, true } ,
     Expected = kolab_guam_sup:default_imap_server_config().

guam-0.9.2.tar.gz/rebar.config -> guam-0.9.4.tar.gz/rebar.config Changed

@@ -1,29 +1,40 @@
 %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ft=erlang ts=4 sw=4 et
 
-{ deps_dir, "deps" }.
+{ erl_opts, 
+            { parse_transform, lager_transform },
+            { platform_define, "(linux|solaris|freebsd|darwin)", 'HAVE_SENDFILE' },
+            debug_info,
+            fail_on_warning
+            
+}.
 { deps, 
-    { lager, "(2.0|2.1|2.2).*", { git, "git://github.com/basho/lager.git", { tag, "2.2.3" } } },
-    { lager_syslog, "2.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "2.1.3" } } },
-    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.2.5" } } }
+    lager,
+    { lager_syslog, "3.*", { git, "git://github.com/basho/lager_syslog.git", { tag, "3.0.1" } } },
+    { eimap, ".*", { git, "https://git.kolab.org/diffusion/EI/eimap.git", { tag, "0.3.0" } } }
     %% pull in the proper version of meck before jobs 0.3 gets around to pulling in the wrong version
    
 }.
 
-{ erl_opts,  %%no_debug_info,
-            {parse_transform, lager_transform},
-            {platform_define, "(linux|solaris|freebsd|darwin)", 'HAVE_SENDFILE'}
-            
-}.
 { sub_dirs, 
-    "apps/kolab_guam",
-    "rel"
+    "apps/kolab_guam"
  }.
 { erl_first_files, "apps/kolab_guam/src/kolab_guam_rule.erl" }.
-{ erl_opts, debug_info, fail_on_warning }.
 { eunit_opts, verbose, {skip_deps, true } }.
 { eunit_exclude_deps, true }.
 { cover_enabled, true }.
+{ relx,  { release, { guam, "0.9.0" }, kolab_guam},
+                { dev_mode, false },
+                { include_erts, false },
+                { extended_start_script, true },
+                { overlay, 
+                         { mkdir, "log/sasl" },
+                         { template, "priv/sys.config", "etc/sys.config" },
+                         { copy, "priv/vm.args", "vm.args" }
+                     
+                }
+         
+}.
 
 %%{require_otp_vsn, "17"}.
 { pre_hooks,  { clean, "rm -fr ebin priv erl_crash.dump" }  }.

guam-0.9.4.tar.gz/rebar3 Added

guam.dsc Changed