Kolab Groupware OBS

guam.spec Changed

@@ -5,6 +5,7 @@
 %global debug_package %{nil}
 
 %global realname kolab_guam
+%global binname guam
 
 %global guam_user guam
 %global guam_group guam
@@ -20,17 +21,18 @@
 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%{VERSION}" %{1})
 
 Name:               guam
-Version:            0.8.3
-Release:            0.20160219.git%{?dist}
+Version:            0.9.0
+Release:            2%{?dist}
 Summary:            A Smart Reverse IMAP Proxy
 
 Group:              System Environment/Daemons
 License:            GPLv3+
 URL:                https://kolab.org/about/guam
 
-Source0:            guam-%{version}.tar.gz
+Source0:            %{name}-%{version}.tar.gz
+Source1:            sys.config
 
-Patch9991:          guam-0.8.2-relax-dependencies.patch
+Patch1:             make-it-very-easy-on-rebar3.patch
 
 BuildRequires:      erlang >= 17.4
 BuildRequires:      erlang-asn1
@@ -38,7 +40,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
@@ -48,7 +50,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
@@ -57,9 +60,7 @@
 BuildRequires:      erlang-stdlib
 BuildRequires:      erlang-syntax_tools
 BuildRequires:      erlang-syslog >= 1.0.3
-BuildRequires:      erlang-test_server
 BuildRequires:      erlang-tools
-BuildRequires:      erlang-webtool
 BuildRequires:      erlang-wx
 BuildRequires:      erlang-xmerl
 
@@ -98,106 +99,107 @@
 %prep
 %setup -q
 
-%patch9991 -p1
+%patch1 -p1
 
 %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}/%{name}-%{version}/ \
 %if 0%{?with_systemd}
     %{buildroot}%{_unitdir}/ \
 %else
     %{buildroot}%{_initddir}/ \
 %endif
-    %{buildroot}%{_var}/log/
+    %{buildroot}%{_var}/log/%{name}/
+
+# Configuration
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/sys.config
 
+# 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}/%{name}-%{version}/
+cp -a _build/default/rel/%{name}/lib/%{realname}-%{version}/ebin/ %{buildroot}%{_erllibdir}/%{name}-%{version}/
+cp -a _build/default/rel/%{name}/releases/ %{buildroot}%{_erllibdir}/%{name}-%{version}/
 
-ln -s ../../../..%{_sysconfdir}/%{name}/sys.config \
-    $(ls -1d %{buildroot}/opt/%{realname}/releases/*/)/sys.config
+pushd %{buildroot}%{_erllibdir}/%{name}-%{version}/releases/%{version}/
+ln -sfv ../../../../../../..%{_sysconfdir}/%{name}/sys.config sys.config
+mv vm.args ../../../../../../..%{_sysconfdir}/%{name}/vm.args
+ln -sv ../../../../../../..%{_sysconfdir}/%{name}/vm.args vm.args
+popd
 
-mv %{buildroot}/opt/%{realname}/log %{buildroot}%{_var}/log/guam
-ln -s ../..%{_var}/log/guam %{buildroot}/opt/%{realname}/log
+pushd %{buildroot}%{_erllibdir}/%{name}-%{version}/
+ln -s ../../lib lib
+popd
 
-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}%{_sbindir}
+ln -sfv ../..%{_erllibdir}/%{name}-%{version}/bin/%{binname} %{name}
 popd
 
 %check
-rebar skip_deps=true eunit -v
-
-%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
+# 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
 
 %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 || :

guam-0.8.2-relax-dependencies.patch Deleted

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

@@ -0,0 +1,29 @@
+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,6 @@
+                   stdlib,
+                   compiler,
+                   syntax_tools,
+-                  goldrush,
+-                  lager,
+                   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"

_link Changed

debian.changelog Changed

debian.control Changed

debian.rules Changed

@@ -8,26 +8,45 @@
 	dh $@ --with=systemd
 
 override_dh_auto_build:
-	rebar compile
-	mkdir -p deps
-	cd rel && ENABLE_STATIC=no rebar generate
+	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)/
+
 	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
-	mv $(DESTDIR)/opt/kolab_guam/releases/*/sys.config \
-	   $(DESTDIR)/etc/guam/sys.config
-	ln -s ../../../../etc/guam/sys.config \
-	   $$(ls -1d $(DESTDIR)/opt/kolab_guam/releases/*/)/sys.config
-	mv $(DESTDIR)/opt/kolab_guam/log $(DESTDIR)/var/log/guam
-	ln -s ../../var/log/guam $(DESTDIR)/opt/kolab_guam/log
+
+	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)/
+
+	cp -a _build/default/rel/guam/releases \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/
+
+	mv $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config \
+		 $(DESTDIR)/etc/guam/sys.config
+
+	ln -s ../../../../../../../etc/guam/sys.config \
+		$(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config
+
+	mv $(DESTDIR)/usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/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
+
+	mv $(DESTDIR)//usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log/ $(DESTDIR)/var/log/guam
+	ln -s ../../../../../var/log/guam /usr/lib/erlang/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/log

debian.series Changed

guam-0.8.3.tar.gz/.erlang Deleted

guam-0.8.3.tar.gz/rebar Deleted

guam-0.8.3.tar.gz/rel Deleted

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

guam-0.8.3.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.8.3.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.8.3.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=$?

guam-0.8.3.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.8.3.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), []).
-

guam-0.8.3.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.8.3.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.8.3",
-        [
-         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.8.3.tar.gz/.gitignore -> guam-0.9.0.tar.gz/.gitignore Changed

guam-0.8.3.tar.gz/CHANGELOG.md -> guam-0.9.0.tar.gz/CHANGELOG.md Changed

guam-0.8.3.tar.gz/Makefile -> guam-0.9.0.tar.gz/Makefile Changed

guam-0.8.3.tar.gz/app.config -> guam-0.9.0.tar.gz/app.config Changed

guam-0.8.3.tar.gz/apps/kolab_guam/src/kolab_guam.app.src -> guam-0.9.0.tar.gz/apps/kolab_guam/src/kolab_guam.app.src Changed

guam-0.8.3.tar.gz/apps/kolab_guam/src/kolab_guam.erl -> guam-0.9.0.tar.gz/apps/kolab_guam/src/kolab_guam.erl Changed

guam-0.8.3.tar.gz/apps/kolab_guam/src/kolab_guam_listener.erl -> guam-0.9.0.tar.gz/apps/kolab_guam/src/kolab_guam_listener.erl Changed

@@ -41,7 +41,7 @@
     ImplicitTLS = proplists:get_value(implicit_tls, Config, false),
     TLSConfig = proplists:get_value(tls_config, Config, []),
     Rules = proplists:get_value(rules, Config, []),
-    Options = listen_options(NetIface, Host, ImplicitTLS, TLSConfig),
+    Options = listen_options(NetIface, Host),
     lager:info("Starting listener \"~p\" on port ~B (~p) with ~B rules", [Name, Port, Options, length(Rules)]),
     { ok, ListenSocket } = listen(ImplicitTLS, Port, Options),
     spawn_link(?MODULE, cleanup, [ListenSocket]),
@@ -58,26 +58,23 @@
 imap_config(none) -> kolab_guam_sup:default_imap_server_config();
 imap_config(Backend) -> kolab_guam_sup:imap_server_config(Backend).
 
--spec listen_options(Iface :: string(), Hostname :: string(), ImplicitTLS :: boolean(), TLSConfig :: list()) -> list().
-listen_options(none, none, ImplicitTLS, TLSConfig) -> default_listen_options(ImplicitTLS, TLSConfig);
-listen_options(none, Hostname, ImplicitTLS, TLSConfig) ->
+-spec listen_options(Iface :: string(), Hostname :: string()) -> list().
+listen_options(none, none) -> default_listen_options();
+listen_options(none, Hostname) ->
     case inet:gethostbyname(Hostname) of
         { ok, { hostent, _HostName, _Unused, inet, _Ver, [IP] } } ->
-            [ { ip, IP } | default_listen_options(ImplicitTLS, TLSConfig) ];
+            [ { ip, IP } | default_listen_options() ];
         _ ->
-            listen_options(none, none, ImplicitTLS, TLSConfig)
+            listen_options(none, none)
     end;
-listen_options(Iface, Hostname, ImplicitTLS, TLSConfig) ->
+listen_options(Iface, Hostname) ->
     { ok, Ifaces } = inet:getifaddrs(),
     case proplists:get_value(Iface, Ifaces) of
-        undefined -> listen_options(none, Hostname, ImplicitTLS, TLSConfig);
+        undefined -> listen_options(none, Hostname);
         Info -> Addr = proplists:get_value(addr, Info, none),
-                %lager:info("YEAH! ~p", [Addr]),
-                listen_options(none, Addr, ImplicitTLS, TLSConfig)
+                listen_options(none, Addr)
     end.
 
-default_listen_options(true, TLSConfig) -> default_listen_options() ++ TLSConfig;
-default_listen_options(_ImplicitTLS, _Config) -> default_listen_options().
 default_listen_options() -> [ { reuseaddr, true }, {active, false}, inet6 ].
 
 create_initial_listeners(ListenerPoolSize, PID) when is_pid(PID) ->
@@ -92,7 +89,7 @@
     end,
     gen_tcp:close(Socket).
 
-listen(true, Port, Options) -> ssl:listen(Port, Options);
+listen(true, Port, Options) -> gen_tcp:listen(Port, Options);
 listen(_ImplicitTLS, Port, Options) -> gen_tcp:listen(Port, Options).
 
 %% private API

guam-0.8.3.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl -> guam-0.9.0.tar.gz/apps/kolab_guam/src/kolab_guam_session.erl Changed

@@ -76,7 +76,7 @@
 handle_info({ server_hello, ServerHello }, #state{ imap_session = ImapSession, tls_config = TLSConfig, socket = Socket, client_implicit_tls = ImplicitTLS, client_tls_active = TLSActive, deflator = Deflator } = State) ->
     CorrectedHello = correct_hello(TLSActive, ImplicitTLS, TLSConfig, ServerHello),
     ServerIdent = proplists:get_value(server_id, ServerHello, <<>>),
-    FullGreeting = <<"* OK [CAPABILITIES ", CorrectedHello/binary, "] ", ServerIdent/binary, "\r\n">>,
+    FullGreeting = <<"* OK [CAPABILITY ", CorrectedHello/binary, "] ", ServerIdent/binary, "\r\n">>,
     eimap:start_passthrough(ImapSession, self()),
     relay_response(Socket, postprocess_server_data(Deflator, FullGreeting), TLSActive),
     { noreply, State };
@@ -122,21 +122,20 @@
     { ok, State }.
 
 %% private API
-accept_client(#state{ client_implicit_tls = true, listen_socket = ListenSocket, super_pid = SupervisorPID }) ->
-    AcceptResult = ssl:transport_accept(ListenSocket),
-    AcceptSocket = post_accept_bookkeeping(implicit_tls, ListenSocket, SupervisorPID, AcceptResult),
+accept_client(#state{ client_implicit_tls = true, tls_config = TLSConfig, listen_socket = ListenSocket, super_pid = SupervisorPID }) ->
+    AcceptSocket = accept_socket(ListenSocket, SupervisorPID),
     %% prep for the next listen
-    ok = ssl:ssl_accept(AcceptSocket),
-    ok = ssl:setopts(AcceptSocket, [{ active, once }, { mode, binary }]),
+    { ok, SSLSocket } = ssl:ssl_accept(AcceptSocket, TLSConfig),
+    ok = ssl:setopts(SSLSocket, [{ active, once }, { mode, binary }]),
     % lager:info("~p All done!", [self()]),
-    { ok, AcceptSocket, true };
+    { ok, SSLSocket, true };
 accept_client(#state{ listen_socket = ListenSocket, super_pid = SupervisorPID }) ->
-    AcceptResult = gen_tcp:accept(ListenSocket),
-    AcceptSocket = post_accept_bookkeeping(no_implicit_tls, ListenSocket, SupervisorPID, AcceptResult),
+    AcceptSocket = accept_socket(ListenSocket, SupervisorPID),
     ok = inet:setopts(AcceptSocket, [{ active, once }, { mode, binary }]),
     { ok, AcceptSocket, false }.
 
-post_accept_bookkeeping(ImplicitTls, ListenSocket, SupervisorPID, AcceptResult) ->
+accept_socket(ListenSocket, SupervisorPID) ->
+    AcceptResult = gen_tcp:accept(ListenSocket),
     %% start a new accepting process to replace this one, which is now in use
     supervisor:start_child(SupervisorPID, []),
     %% assert that the accept worked

guam-0.8.3.tar.gz/apps/kolab_guam/test/kolab_guam_sup_SUITE.erl -> guam-0.9.0.tar.gz/apps/kolab_guam/test/kolab_guam_sup_SUITE.erl Changed

@@ -50,32 +50,15 @@
 
 % c("apps/kolab_guam/test/kolab_guam_sup_tests.erl"). eunit:test(kolab_guam_sup_tests).
 
-imap_server_settings_to_config_test(_TestConfig) ->
-    Configs = [
-        {
-            [],
-            #eimap_server_config{}
-        },
-        {
-            [ { tls, false } ],
-            #eimap_server_config{ tls = false }
-        },
-        {
-            [ { host, "192.168.56.101" }, { port, 993 }, { tls, true } ],
-            #eimap_server_config{ host = "192.168.56.101", port = 993, tls = true }
-        }
-    ],
-    lists:foreach(fun({ Config, Record }) -> Record = kolab_guam_sup:imap_server_settings_to_config(Config) end, Configs).
-
 default_imap_server_config_test(_TestConfig) ->
-    Expected = #eimap_server_config{ host = "192.168.56.102", port = 994, tls = true },
+    Expected = [ { host, "192.168.56.102" }, { port, 994 }, { tls, true } ],
     Expected = kolab_guam_sup:default_imap_server_config().
 
 imap_server_config_test(_TestConfig) ->
     Configs = [
         {
             test_default,
-            #eimap_server_config{ host = "192.168.56.101", port = 993, tls = false }
+            [ { host, "192.168.56.101" }, { port, 993 }, { tls, false } ]
         }
     ],
     lists:foreach(fun({ Config, Record }) -> Record = kolab_guam_sup:imap_server_config(Config) end, Configs).

guam-0.9.0.tar.gz/priv Added

guam-0.9.0.tar.gz/priv/sys.config Changed

guam-0.9.0.tar.gz/priv/vm.args Changed

guam-0.8.3.tar.gz/rebar.config -> guam-0.9.0.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.0" } } },
-    { 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.0.tar.gz/rebar3 Added

guam.dsc Changed

sys.config Added

@@ -0,0 +1,78 @@
+%% Example configuration for Guam.
+[
+    {
+        kolab_guam, [
+            {
+                imap_servers, [
+                    {
+                        imaps, [
+                            { host, "127.0.0.1" },
+                            { port, 9993 },
+                            { tls, true }
+                        ]
+                    }
+                ]
+            },
+            {
+                listeners, [
+                    {
+                        imap, [
+                            { port, 143 },
+                            { imap_server, imaps },
+                            {
+                                rules, [
+                                    { filter_groupware, [] }
+                                ]
+                            },
+                            {
+                                tls_config, [
+                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
+                                ]
+                            }
+                        ]
+                    },
+                    {
+                        imaps, [
+                            { port, 993 },
+                            { implicit_tls, true },
+                            { imap_server, imaps },
+                            {
+                                rules, [
+                                    { filter_groupware, [] }
+                                ]
+                            },
+                            {
+                                tls_config, [
+                                    { certfile, "/etc/pki/cyrus-imapd/cyrus-imapd.pem" }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+
+    {
+        lager, [
+            {
+                handlers, [
+                    { lager_console_backend, warning },
+                    { 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
+        ]
+    }
+].

Changes of Revision 13