[SM-Commit] GIT changes to master grimoire by Andraž Levstik (e9a3d2072e3f9faa8044ebc00936707570030161)

Andraž Levstik scm at sourcemage.org
Mon Jun 15 02:16:51 EDT 2009


GIT changes to master grimoire by Andraž Levstik <ruskie+2054d253 at codemages.net>:

 audio-soft/musepack-tools/HISTORY               |    3 
 audio-soft/musepack-tools/PRE_BUILD             |   12 
 chat-im/ejabberd/DETAILS                        |    2 
 chat-im/ejabberd/HISTORY                        |    5 
 chat-im/ejabberd/PRE_BUILD                      |    3 
 chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch |  361 ++++++++++++++++++++++++
 mail/dspam/DETAILS                              |   15 
 mail/dspam/HISTORY                              |    4 
 mail/dspam/PREPARE                              |   11 
 python-pypi/zopeinterface/DETAILS               |    4 
 python-pypi/zopeinterface/HISTORY               |    3 
 security/pam-imap/DETAILS                       |    4 
 security/pam-imap/HISTORY                       |    4 
 security/pam-imap/INSTALL                       |    1 
 utils/nut/DETAILS                               |    2 
 utils/nut/HISTORY                               |    3 
 video/mkvtoolnix/DEPENDS                        |   13 
 video/mkvtoolnix/HISTORY                        |    4 
 18 files changed, 436 insertions(+), 18 deletions(-)

New commits:
commit e9a3d2072e3f9faa8044ebc00936707570030161
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    musepack-tools: updated for x86_64

commit 8521b4a4849fcfbaa2cb3c6477be7f8f82c4bc6f
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    mkvtoolnix: minor fix

commit f1639eb5bd2b054f9b760ff7ea84965cc95bc128
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    pam-imap: updated to 0.3.8

commit a0b195de2253be99d5d9ae87718baceaa7aa2afe
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    zopeinterface: fixed SPELLX and hash

commit a886975ae7c124798996864ab81bd3056ff852bd
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    ejabberd: updated to 2.0.5, added patch to make it usable with erlang 13

commit 03e23628149630117e40b9b2ef9404bbaed4c2e5
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    dspam: updated SCM to git

commit deb8f9722e7e434f7d538939c1651b14482a12bb
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    nut: updated to 2.4.1

commit 70d29648bf201a19820c273bca37268a59c425ab
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    mkvtoolnix: added a workaround for searching of boost on x86_64

diff --git a/audio-soft/musepack-tools/HISTORY b/audio-soft/musepack-tools/HISTORY
index be990fc..118d6b1 100644
--- a/audio-soft/musepack-tools/HISTORY
+++ b/audio-soft/musepack-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-06-16 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* PRE_BUILD: updated for x86_64
+
 2008-12-04 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* BUILD, PRE_BUILD: changed for castability #14907
 	* Makefile.patch: added for castability
diff --git a/audio-soft/musepack-tools/PRE_BUILD b/audio-soft/musepack-tools/PRE_BUILD
index 9bd273e..d12d85f 100755
--- a/audio-soft/musepack-tools/PRE_BUILD
+++ b/audio-soft/musepack-tools/PRE_BUILD
@@ -10,4 +10,14 @@ LDADD\ \ \ +=\ -lesd' Makefile
 else
         sed -i 's/#define USE_ESD_AUDIO/#undef\ USE_ESD_AUDIO/' mpp.h
 fi &&
-patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/Makefile.patch
+patch -p0 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/Makefile.patch &&
+# added else fails to build
+# http://bugs.gentoo.org/show_bug.cgi?id=188160
+if [[ "${SMGL_COMPAT_ARCHS[1]}" != "ia32" ]] ; then
+sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
+fi
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] ; then
+sed -i 's/-f elf$/-f elf64/' Makefile
+fi
+
diff --git a/chat-im/ejabberd/DETAILS b/chat-im/ejabberd/DETAILS
index bf33931..b47eedc 100755
--- a/chat-im/ejabberd/DETAILS
+++ b/chat-im/ejabberd/DETAILS
@@ -1,5 +1,5 @@
            SPELL=ejabberd
-         VERSION=2.0.3
+         VERSION=2.0.5
           SOURCE="${SPELL}-${VERSION}.tar.gz"
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://www.process-one.net/downloads/${SPELL}/${VERSION}/${SOURCE}
diff --git a/chat-im/ejabberd/HISTORY b/chat-im/ejabberd/HISTORY
index a31fc73..b19642e 100644
--- a/chat-im/ejabberd/HISTORY
+++ b/chat-im/ejabberd/HISTORY
@@ -1,3 +1,8 @@
+2009-06-15 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* ejabberd-2.0.5-erlang-13.patch: make it usable with erlang r13
+	* DETAILS: updated spell to 2.0.5
+	* PRE_BUILD: added
+
 2009-01-15 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 2.0.3
 
diff --git a/chat-im/ejabberd/PRE_BUILD b/chat-im/ejabberd/PRE_BUILD
new file mode 100755
index 0000000..d812e4e
--- /dev/null
+++ b/chat-im/ejabberd/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src &&
+patch < $SPELL_DIRECTORY/ejabberd-2.0.5-erlang-13.patch
diff --git a/chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch b/chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch
new file mode 100644
index 0000000..d52777b
--- /dev/null
+++ b/chat-im/ejabberd/ejabberd-2.0.5-erlang-13.patch
@@ -0,0 +1,361 @@
+diff --git a/src/dynamic_compile.erl b/src/dynamic_compile.erl
+new file mode 100644
+index 0000000..1fe2dca
+--- /dev/null
++++ dynamic_compile.erl
+@@ -0,0 +1,268 @@
++%% Copyright (c) 2007
++%%          Mats Cronqvist <mats.cronqvist at ericsson.com>
++%%          Chris Newcombe <chris.newcombe at gmail.com> 
++%%          Jacob Vorreuter <jacob.vorreuter at gmail.com>
++%% 
++%% Permission is hereby granted, free of charge, to any person
++%% obtaining a copy of this software and associated documentation
++%% files (the "Software"), to deal in the Software without
++%% restriction, including without limitation the rights to use,
++%% copy, modify, merge, publish, distribute, sublicense, and/or sell
++%% copies of the Software, and to permit persons to whom the
++%% Software is furnished to do so, subject to the following
++%% conditions:
++%% 
++%% The above copyright notice and this permission notice shall be
++%% included in all copies or substantial portions of the Software.
++%% 
++%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++%% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++%% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++%% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++%% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++%% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++%% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++%% OTHER DEALINGS IN THE SOFTWARE.
++
++%%%-------------------------------------------------------------------
++%%% File : dynamic_compile.erl
++%%% Description :
++%%% Authors : Mats Cronqvist <mats.cronqvist at ericsson.com>
++%%%           Chris Newcombe <chris.newcombe at gmail.com> 
++%%%           Jacob Vorreuter <jacob.vorreuter at gmail.com>
++%%% TODO :
++%%% - add support for limit include-file depth (and prevent circular references)
++%%%   prevent circular macro expansion set FILE correctly when -module() is found
++%%% -include_lib support $ENVVAR in include filenames
++%%%  substitute-stringize (??MACRO)
++%%% -undef/-ifdef/-ifndef/-else/-endif
++%%% -file(File, Line)
++%%%-------------------------------------------------------------------
++-module(dynamic_compile).
++
++%% API
++-export([from_string/1, from_string/2]).
++
++-import(lists, [reverse/1, keyreplace/4]).
++
++%%====================================================================
++%% API
++%%====================================================================
++%%--------------------------------------------------------------------
++%% Function:
++%% Description:
++%%   Returns a binary that can be used with
++%%           code:load_binary(Module, ModuleFilenameForInternalRecords, Binary).
++%%--------------------------------------------------------------------
++from_string(CodeStr) ->
++    from_string(CodeStr, []).
++
++% takes Options as for compile:forms/2
++from_string(CodeStr, CompileFormsOptions) ->
++    %% Initialise the macro dictionary with the default predefined macros,
++    %% (adapted from epp.erl:predef_macros/1
++    Filename = "compiled_from_string",
++    %%Machine  = list_to_atom(erlang:system_info(machine)),
++    Ms0    = dict:new(),
++    % Ms1    = dict:store('FILE',          {[], "compiled_from_string"}, Ms0),
++    % Ms2    = dict:store('LINE',          {[], 1}, Ms1),  % actually we might add special code for this
++    % Ms3    = dict:store('MODULE',        {[], undefined},              Ms2),
++    % Ms4    = dict:store('MODULE_STRING', {[], undefined},              Ms3),
++    % Ms5    = dict:store('MACHINE',       {[], Machine},                Ms4),
++    % InitMD = dict:store(Machine,         {[], true},                   Ms5),
++    InitMD = Ms0,
++
++    %% From the docs for compile:forms:
++    %%    When encountering an -include or -include_dir directive, the compiler searches for header files in the following directories:
++    %%      1. ".", the current working directory of the file server;
++    %%      2. the base name of the compiled file;
++    %%      3. the directories specified using the i option. The directory specified last is searched first.
++    %% In this case, #2 is meaningless.
++    IncludeSearchPath = ["." | reverse([Dir || {i, Dir} <- CompileFormsOptions])],
++    {RevForms, _OutMacroDict} = scan_and_parse(CodeStr, Filename, 1, [], InitMD, IncludeSearchPath),
++    Forms = reverse(RevForms),
++
++    %% note: 'binary' is forced as an implicit option, whether it is provided or not.
++    case compile:forms(Forms, CompileFormsOptions) of
++        {ok, ModuleName, CompiledCodeBinary} when is_binary(CompiledCodeBinary) ->
++            {ModuleName, CompiledCodeBinary};
++        {ok, ModuleName, CompiledCodeBinary, []} when is_binary(CompiledCodeBinary) ->  % empty warnings list
++            {ModuleName, CompiledCodeBinary};
++        {ok, _ModuleName, _CompiledCodeBinary, Warnings} ->
++            throw({?MODULE, warnings, Warnings});
++        Other ->
++            throw({?MODULE, compile_forms, Other})
++    end.
++
++%%====================================================================
++%% Internal functions
++%%====================================================================
++%%% Code from Mats Cronqvist
++%%% See http://www.erlang.org/pipermail/erlang-questions/2007-March/025507.html
++%%%## 'scan_and_parse'
++%%%
++%%% basically we call the OTP scanner and parser (erl_scan and
++%%% erl_parse) line-by-line, but check each scanned line for (or
++%%% definitions of) macros before parsing.
++%% returns {ReverseForms, FinalMacroDict}
++scan_and_parse([], _CurrFilename, _CurrLine, RevForms, MacroDict, _IncludeSearchPath) ->
++    {RevForms, MacroDict};
++
++scan_and_parse(RemainingText, CurrFilename, CurrLine, RevForms, MacroDict, IncludeSearchPath) ->
++    case scanner(RemainingText, CurrLine, MacroDict) of
++	    {tokens, NLine, NRemainingText, Toks} ->
++	        {ok, Form} = erl_parse:parse_form(Toks),
++	        scan_and_parse(NRemainingText, CurrFilename, NLine, [Form | RevForms], MacroDict, IncludeSearchPath);
++	    {macro, NLine, NRemainingText, NMacroDict} ->
++	        scan_and_parse(NRemainingText, CurrFilename, NLine, RevForms,NMacroDict, IncludeSearchPath);
++        {include, NLine, NRemainingText, IncludeFilename} ->
++            IncludeFileRemainingTextents = read_include_file(IncludeFilename, IncludeSearchPath),
++            %%io:format("include file ~p contents: ~n~p~nRemainingText = ~p~n", [IncludeFilename,IncludeFileRemainingTextents, RemainingText]),
++            %% Modify the FILE macro to reflect the filename
++            %%IncludeMacroDict = dict:store('FILE', {[],IncludeFilename}, MacroDict),
++            IncludeMacroDict = MacroDict,
++
++            %% Process the header file (inc. any nested header files)
++            {RevIncludeForms, IncludedMacroDict} = scan_and_parse(IncludeFileRemainingTextents, IncludeFilename, 1, [], IncludeMacroDict, IncludeSearchPath),
++            %io:format("include file results = ~p~n", [R]),
++            %% Restore the FILE macro in the NEW MacroDict (so we keep any macros defined in the header file)
++            %%NMacroDict = dict:store('FILE', {[],CurrFilename}, IncludedMacroDict),
++            NMacroDict = IncludedMacroDict,
++
++            %% Continue with the original file
++	        scan_and_parse(NRemainingText, CurrFilename, NLine, RevIncludeForms ++ RevForms, NMacroDict, IncludeSearchPath);
++        done ->
++	        scan_and_parse([], CurrFilename, CurrLine, RevForms, MacroDict, IncludeSearchPath)
++    end.
++
++scanner(Text, Line, MacroDict) ->
++    case erl_scan:tokens([],Text,Line) of
++        {done, {ok,Toks,NLine}, LeftOverChars} ->
++            case pre_proc(Toks, MacroDict) of
++                {tokens,  NToks}      -> {tokens,  NLine, LeftOverChars, NToks};
++                {macro,   NMacroDict} -> {macro,   NLine, LeftOverChars, NMacroDict};
++                {include, Filename}   -> {include, NLine, LeftOverChars, Filename}
++            end;
++        {more, _Continuation} ->
++            %% This is supposed to mean "term is not yet complete" (i.e. a '.' has
++            %% not been reached yet).
++            %% However, for some bizarre reason we also get this if there is a comment after the final '.' in a file.
++            %% So we check to see if Text only consists of comments.
++            case is_only_comments(Text) of
++                true  ->
++                    done;
++                false ->
++                    throw({incomplete_term, Text, Line})
++            end
++    end.
++
++is_only_comments(Text) -> is_only_comments(Text, not_in_comment).
++
++is_only_comments([],       _)              -> true;
++is_only_comments([$   |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
++is_only_comments([$\t |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
++is_only_comments([$\n |T], not_in_comment) -> is_only_comments(T, not_in_comment); % skipping whitspace outside of comment
++is_only_comments([$%  |T], not_in_comment) -> is_only_comments(T, in_comment);     % found start of a comment
++is_only_comments(_,        not_in_comment) -> false;
++% found any significant char NOT in a comment
++is_only_comments([$\n |T], in_comment)     -> is_only_comments(T, not_in_comment); % found end of a comment
++is_only_comments([_   |T], in_comment)     -> is_only_comments(T, in_comment).     % skipping over in-comment chars
++
++%%%## 'pre-proc'
++%%%
++%%% have to implement a subset of the pre-processor, since epp insists
++%%% on running on a file.
++%%% only handles 2 cases;
++%% -define(MACRO, something).
++%% -define(MACRO(VAR1,VARN),{stuff,VAR1,more,stuff,VARN,extra,stuff}).
++pre_proc([{'-',_},{atom,_,define},{'(',_},{_,_,Name}|DefToks],MacroDict) ->
++    false = dict:is_key(Name, MacroDict),
++    case DefToks of
++    	[{',',_} | Macro] ->
++    	    {macro, dict:store(Name, {[], macro_body_def(Macro, [])},  MacroDict)};
++    	[{'(',_} | Macro] ->
++    	    {macro, dict:store(Name, macro_params_body_def(Macro, []), MacroDict)}
++    end;
++
++pre_proc([{'-',_}, {atom,_,include}, {'(',_}, {string,_,Filename}, {')',_}, {dot,_}], _MacroDict) ->
++    {include, Filename};
++
++pre_proc(Toks,MacroDict) ->
++    {tokens, subst_macros(Toks, MacroDict)}.
++
++macro_params_body_def([{')',_},{',',_} | Toks], RevParams) ->
++    {reverse(RevParams), macro_body_def(Toks, [])};
++macro_params_body_def([{var,_,Param} | Toks], RevParams) ->
++    macro_params_body_def(Toks, [Param | RevParams]);
++macro_params_body_def([{',',_}, {var,_,Param} | Toks], RevParams) ->
++    macro_params_body_def(Toks, [Param | RevParams]).
++
++macro_body_def([{')',_}, {dot,_}], RevMacroBodyToks) ->
++    reverse(RevMacroBodyToks);
++macro_body_def([Tok|Toks], RevMacroBodyToks) ->
++    macro_body_def(Toks, [Tok | RevMacroBodyToks]).
++
++subst_macros(Toks, MacroDict) ->
++    reverse(subst_macros_rev(Toks, MacroDict, [])).
++
++%% returns a reversed list of tokes
++subst_macros_rev([{'?',_}, {_,LineNum,'LINE'} | Toks], MacroDict, RevOutToks) ->
++    %% special-case for ?LINE, to avoid creating a new MacroDict for every line in the source file
++    subst_macros_rev(Toks, MacroDict, [{integer,LineNum,LineNum}] ++ RevOutToks);
++
++subst_macros_rev([{'?',_}, {_,_,Name}, {'(',_} = Paren | Toks], MacroDict, RevOutToks) ->
++    case dict:fetch(Name, MacroDict) of
++        {[], MacroValue} ->
++            %% This macro does not have any vars, so ignore the fact that the invocation is followed by "(...stuff"
++            %% Recursively expand any macro calls inside this macro's value
++            %% TODO: avoid infinite expansion due to circular references (even indirect ones)
++            RevExpandedOtherMacrosToks = subst_macros_rev(MacroValue, MacroDict, []),
++            subst_macros_rev([Paren|Toks], MacroDict, RevExpandedOtherMacrosToks ++ RevOutToks);
++        ParamsAndBody ->
++            %% This macro does have vars.
++            %% Collect all of the passe arguments, in an ordered list
++            {NToks, Arguments} = subst_macros_get_args(Toks, []),
++            %% Expand the varibles
++            ExpandedParamsToks = subst_macros_subst_args_for_vars(ParamsAndBody, Arguments),
++            %% Recursively expand any macro calls inside this macro's value
++            %% TODO: avoid infinite expansion due to circular references (even indirect ones)
++            RevExpandedOtherMacrosToks = subst_macros_rev(ExpandedParamsToks, MacroDict, []),
++            subst_macros_rev(NToks, MacroDict, RevExpandedOtherMacrosToks ++ RevOutToks)
++    end;
++
++subst_macros_rev([{'?',_}, {_,_,Name} | Toks], MacroDict, RevOutToks) ->
++    %% This macro invocation does not have arguments.
++    %% Therefore the definition should not have parameters
++    {[], MacroValue} = dict:fetch(Name, MacroDict),
++
++    %% Recursively expand any macro calls inside this macro's value
++    %% TODO: avoid infinite expansion due to circular references (even indirect ones)
++    RevExpandedOtherMacrosToks = subst_macros_rev(MacroValue, MacroDict, []),
++    subst_macros_rev(Toks, MacroDict, RevExpandedOtherMacrosToks ++ RevOutToks);
++
++subst_macros_rev([Tok|Toks], MacroDict,  RevOutToks) ->
++subst_macros_rev(Toks, MacroDict, [Tok|RevOutToks]);
++subst_macros_rev([], _MacroDict, RevOutToks) -> RevOutToks.
++
++subst_macros_get_args([{')',_} | Toks], RevArgs) ->
++    {Toks, reverse(RevArgs)};
++subst_macros_get_args([{',',_}, {var,_,ArgName} | Toks], RevArgs) ->
++    subst_macros_get_args(Toks, [ArgName| RevArgs]);
++subst_macros_get_args([{var,_,ArgName} | Toks], RevArgs) ->
++    subst_macros_get_args(Toks, [ArgName | RevArgs]).
++
++subst_macros_subst_args_for_vars({[], BodyToks}, []) ->
++    BodyToks;
++subst_macros_subst_args_for_vars({[Param | Params], BodyToks}, [Arg|Args]) ->
++    NBodyToks = keyreplace(Param, 3, BodyToks, {var,1,Arg}),
++    subst_macros_subst_args_for_vars({Params, NBodyToks}, Args).
++
++read_include_file(Filename, IncludeSearchPath) ->
++    case file:path_open(IncludeSearchPath, Filename, [read, raw, binary]) of
++        {ok, IoDevice, FullName} ->
++            {ok, Data} = file:read(IoDevice, filelib:file_size(FullName)),
++            file:close(IoDevice),
++            binary_to_list(Data);
++        {error, Reason} ->
++            throw({failed_to_read_include_file, Reason, Filename, IncludeSearchPath})
++    end.
+\ No newline at end of file
+diff --git a/src/ejabberd.app b/src/ejabberd.app
+index 1ff41ec..7f0948f 100644
+--- ejabberd.app
++++ ejabberd.app
+@@ -115,7 +115,6 @@
+ 	     nodetree_virtual,
+ 	     p1_fsm,
+ 	     p1_mnesia,
+-	     ram_file_io_server,
+ 	     randoms,
+ 	     sha,
+ 	     shaper,
+diff --git a/src/ejabberd_loglevel.erl b/src/ejabberd_loglevel.erl
+index 3134d4d..2a34060 100644
+--- ejabberd_loglevel.erl
++++ ejabberd_loglevel.erl
+@@ -38,51 +38,30 @@
+ -define(LOGMODULE, "error_logger").
+ 
+ %% Error levels:
+-%% 0 -> No log
+-%% 1 -> Critical
+-%% 2 -> Error
+-%% 3 -> Warning
+-%% 4 -> Info
+-%% 5 -> Debug
++-define(LOG_LEVELS,[ {0, no_log, "No log"}
++                    ,{1, critical, "Critical"}
++                    ,{2, error, "Error"}
++                    ,{3, warning, "Warning"}
++                    ,{4, info, "Info"}
++                    ,{5, debug, "Debug"}
++                    ]).
++
++set(LogLevel) when is_atom(LogLevel) ->
++    set(level_to_integer(LogLevel));
+ set(Loglevel) when is_integer(Loglevel) ->
+-   Forms = compile_string(?LOGMODULE, ejabberd_logger_src(Loglevel)),
+-   load_logger(Forms, ?LOGMODULE, Loglevel);
++    try
++        {Mod,Code} = dynamic_compile:from_string(ejabberd_logger_src(Loglevel)),
++        code:load_binary(Mod, ?LOGMODULE ++ ".erl", Code)
++    catch
++        Type:Error -> ?CRITICAL_MSG("Error compiling logger (~p): ~p~n", [Type, Error])
++    end;
+ set(_) ->
+     exit("Loglevel must be an integer").
+-                
+-%% --------------------------------------------------------------  
+-%% Compile a string into a module and returns the binary
+-compile_string(Mod, Str) ->
+-    Fname = Mod ++ ".erl",
+-    {ok, Fd} = open_ram_file(Fname),
+-    file:write(Fd, Str),
+-    file:position(Fd, 0),
+-    case epp_dodger:parse(Fd) of
+-	{ok, Tree} ->
+-	    Forms = revert_tree(Tree),
+-	    close_ram_file(Fd),
+-	    Forms;
+-	Error ->
+-	    close_ram_file(Fd),
+-	    Error
+-    end.
+-   
+-open_ram_file(Fname) ->
+-    ram_file_io_server:start(self(), Fname, [read,write]).
+-
+-close_ram_file(Fd) ->
+-    file:close(Fd).
+-
+-revert_tree(Tree) ->
+-    [erl_syntax:revert(T) || T <- Tree].
+ 
+-load_logger(Forms, Mod, Loglevel) ->
+-    Fname = Mod ++ ".erl",
+-    case compile:forms(Forms, [binary, {d,'LOGLEVEL',Loglevel}]) of
+-        {ok, M, Bin} ->
+-            code:load_binary(M, Fname, Bin);
+-        Error ->
+-            ?CRITICAL_MSG("Error ~p~n", [Error])
++level_to_integer(Level) ->
++    case lists:keyfind(Level, 2, ?LOG_LEVELS) of
++        {Int, Level, _Desc} -> Int;
++        _ -> erlang:error({no_such_loglevel, Level})
+     end.
diff --git a/mail/dspam/DETAILS b/mail/dspam/DETAILS
index e8d612d..5f22f4f 100755
--- a/mail/dspam/DETAILS
+++ b/mail/dspam/DETAILS
@@ -1,19 +1,22 @@
            SPELL=dspam
-if [ "$DSPAM_CVS" = 'n' ]; then
+if [[ $DSPAM_SCM == n ]]; then
          VERSION=3.8.0
           SOURCE="${SPELL}-${VERSION}.tar.gz"
      SOURCE_HASH=sha512:7a9e69ca1ce67dc14d98305a7d780ff9faf925e0380fbac755d53c8eb593445662350b6c62c8860151a8c8000e714d992a60cd9b8c83450e5557422366d1b60c
    SOURCE_URL[0]="http://dspam.nuclearelephant.com/sources/${SOURCE}"
 else
-         VERSION=cvs
-          SOURCE="${SPELL}-${VERSION}.tar.bz2"
-   SOURCE_URL[0]=cvs://:pserver:cvs@cvs.nuclearelephant.com:/usr/local/cvsroot:dspam
+if [[ $DSPAM_SCM_AUTO == y ]]; then
+         VERSION=$(date +%Y%m%d)
+else
+         VERSION=scm
+fi
+          SOURCE="${SPELL}-scm.tar.bz2"
+   SOURCE_URL[0]=git://dspam.git.sourceforge.net/gitroot/dspam:dspam-scm
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 fi
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-        WEB_SITE="http://$SPELL.nuclearelephant.com/"
-   FRESHMEAT_URL="http://freshmeat.net/projects/$SPELL/"
+        WEB_SITE="http://dspam.sourceforge.net/"
             DOCS="$DOCS RELEASE.NOTES UPGRADING"
       LICENSE[0]='GPL'
       PATCHLEVEL=3
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index b23104e..389bd00 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,7 @@
+2009-06-16 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* PREPARE: updated for git and added the extra autoupdate query
+	* DETAILS: updated the scm to git, changed website
+
 2007-09-07 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* INSTALL: install src/pref.h else nothing else can use
 	  the headers to build, minor cleanup of the rest of the
diff --git a/mail/dspam/PREPARE b/mail/dspam/PREPARE
index a643d54..d1f4b32 100755
--- a/mail/dspam/PREPARE
+++ b/mail/dspam/PREPARE
@@ -1,3 +1,8 @@
-config_query  DSPAM_CVS                                                    \
-              "Do you want to use the dspam development version from CVS?" \
-              n
+config_query  DSPAM_SCM                                           \
+              "Do you want to use the dspam development version?" \
+              ${DSPAM_CVS:-n} &&
+if [[ $DSPAM_SCM == y ]]; then
+config_query DSPAM_SCM_AUTO \
+             "Automaticaly update the spell on sorcery queue/system-update?" \
+						 n
+fi
diff --git a/python-pypi/zopeinterface/DETAILS b/python-pypi/zopeinterface/DETAILS
index cc9ed95..f92e1b8 100755
--- a/python-pypi/zopeinterface/DETAILS
+++ b/python-pypi/zopeinterface/DETAILS
@@ -1,7 +1,7 @@
            SPELL=zopeinterface
-          SPELLX=zope.interface54f54a9d61429706916a1e41a05c086c68ac6b2fd33485dbc5511e647ee4dc7e0f726247c590a8dd675eaeffbfdf073143beb28d96c4619a95ff6d00208cd05b
+          SPELLX=zope.interface
          VERSION=3.5.1
-     SOURCE_HASH=sha512:
+     SOURCE_HASH=sha512:54f54a9d61429706916a1e41a05c086c68ac6b2fd33485dbc5511e647ee4dc7e0f726247c590a8dd675eaeffbfdf073143beb28d96c4619a95ff6d00208cd05b
           SOURCE=$SPELLX-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
    SOURCE_URL[0]=http://pypi.python.org/packages/source/z/$SPELLX/$SOURCE
diff --git a/python-pypi/zopeinterface/HISTORY b/python-pypi/zopeinterface/HISTORY
index 77bce69..1afe1be 100644
--- a/python-pypi/zopeinterface/HISTORY
+++ b/python-pypi/zopeinterface/HISTORY
@@ -1,3 +1,6 @@
+2009-06-16 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: fixed SPELLX and hash
+
 2009-05-03 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 3.5.1
 
diff --git a/security/pam-imap/DETAILS b/security/pam-imap/DETAILS
index cdc35a1..160920f 100755
--- a/security/pam-imap/DETAILS
+++ b/security/pam-imap/DETAILS
@@ -1,8 +1,8 @@
            SPELL=pam-imap
-         VERSION=0.3.7
+         VERSION=0.3.8
           SOURCE="pam_imap-${VERSION}.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:347624d20d02aa2603ffb5a206290076c30d04614d2ac93d9b49845cb95e3d34f116a809dbb56582bcf06ab9dd0504f004ce64bc4b136d28acb03d8c51772335
+     SOURCE_HASH=sha512:90833202637b297e2941bdc053b11df87db1f195be3f9961b0d497e487c3d5b83eddde5dccc236a3d420f30b0bbc3b1463f6fcbe5e92645df436fc8f7c5df405
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/pam_imap-${VERSION}"
         WEB_SITE="http://pam-imap.sf.net "
       LICENSE[0]=GPL
diff --git a/security/pam-imap/HISTORY b/security/pam-imap/HISTORY
index b36229e..1ddd461 100644
--- a/security/pam-imap/HISTORY
+++ b/security/pam-imap/HISTORY
@@ -1,3 +1,7 @@
+2009-06-15 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 0.3.8
+	* INSTALL: mkdir added
+
 2009-01-02 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DEPENDS, DETAILS, BUILD, INSTALL: spell created
 	* check_user.pam: added my own example since I had issues
diff --git a/security/pam-imap/INSTALL b/security/pam-imap/INSTALL
index 253c07e..4b533a2 100755
--- a/security/pam-imap/INSTALL
+++ b/security/pam-imap/INSTALL
@@ -1,3 +1,4 @@
+mkdir -vp $INSTALL_ROOT/usr/share/doc/pam-imap/conf/  &&
 default_install  &&
 cp -v check_user $INSTALL_ROOT/usr/bin/  &&
 # since all the examples are a bit outdated I'm adding what I needed
diff --git a/utils/nut/DETAILS b/utils/nut/DETAILS
index 848dbcc..a358968 100755
--- a/utils/nut/DETAILS
+++ b/utils/nut/DETAILS
@@ -1,5 +1,5 @@
            SPELL=nut
-         VERSION=2.2.2
+         VERSION=2.4.1
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
    SOURCE_URL[0]=http://random.networkupstools.org/source/${VERSION::3}/$SOURCE
diff --git a/utils/nut/HISTORY b/utils/nut/HISTORY
index e5c1bcb..432fc73 100644
--- a/utils/nut/HISTORY
+++ b/utils/nut/HISTORY
@@ -1,3 +1,6 @@
+2009-06-15 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 2.4.1
+
 2008-10-29 George Sherwood <gsherwood at sourcemage.org>
 	* BUILD: Set sysconfig direcotry to /etc/nut. Clutters /etc.
 
diff --git a/video/mkvtoolnix/DEPENDS b/video/mkvtoolnix/DEPENDS
index b8f3433..5a54c08 100755
--- a/video/mkvtoolnix/DEPENDS
+++ b/video/mkvtoolnix/DEPENDS
@@ -1,7 +1,16 @@
 depends  expat             &&
 depends  libvorbis         &&
 depends  libmatroska       &&
-depends  -sub REGEX boost  &&
+# unless someone has a better suggestion this seems to be needed on 
+# x86_64 else it'll look for it in /usr/lib64 and fail but I'm giving
+# this check just to see if that dir exists in case someone goes
+# multilib or something similar
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] &&
+	 [[ ! -d ${INSTALL_ROOT}/usr/lib64 ]] ; then
+depends  -sub REGEX boost "--with-boost-libdir=${INSTALL_ROOT}/usr/lib"
+else
+depends  -sub REGEX boost
+fi &&
 depends  -sub CPP pcre     &&
 optional_depends  bzip2            \
                   '--enable-bz2'   \
@@ -11,7 +20,7 @@ optional_depends  lzo              \
                   '--enable-lzo'   \
                   '--disable-lzo'  \
                   'for LZO compression'  &&
-optional_depends  WXWIDGET         \
+optional_depends  wxgtk            \
                   '--enable-gui'   \
                   '--disable-gui'  \
                   "for mkvinfo and mmg gui"  &&
diff --git a/video/mkvtoolnix/HISTORY b/video/mkvtoolnix/HISTORY
index df0af6a..158a96f 100644
--- a/video/mkvtoolnix/HISTORY
+++ b/video/mkvtoolnix/HISTORY
@@ -1,3 +1,7 @@
+2009-06-16 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DEPENDS: added a workaround for /usr/lib64 search patch for boost,
+	  minor fix
+
 2009-06-09 Treeve Jelbert <treeve at sourcemage.org>
 	* DEPENDS: wxgtk -> WXWIDGET
 



More information about the SM-Commit mailing list