/[smecontribs]/rpms/smeserver-ejabberd/contribs8/smeserver-ejabberd-2.0.1-64patch.patch
ViewVC logotype

Contents of /rpms/smeserver-ejabberd/contribs8/smeserver-ejabberd-2.0.1-64patch.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Sun Jul 14 20:42:28 2013 UTC (11 years, 4 months ago) by unnilennium
Branch: MAIN
CVS Tags: smeserver-ejabberd-2_0_1-21_el5_sme, smeserver-ejabberd-2_0_1-22_el5_sme, smeserver-ejabberd-2_0_1-20_el5_sme, HEAD
Error occurred while calculating annotation data.
* Sun Jul 14 2013 JP Pialasse <tests@pialasse.com> 2.0.1-20.sme
- apply locale 2013-07-14 patch
- fix 64 bit bug [SME: 7129]

1 diff -up smeserver-ejabberd-2.0.1/root/sbin/e-smith/ejabberdctl.64patch smeserver-ejabberd-2.0.1/root/sbin/e-smith/ejabberdctl
2 --- smeserver-ejabberd-2.0.1/root/sbin/e-smith/ejabberdctl.64patch 2008-06-27 16:28:20.000000000 -0400
3 +++ smeserver-ejabberd-2.0.1/root/sbin/e-smith/ejabberdctl 2013-07-14 16:38:20.000000000 -0400
4 @@ -17,7 +17,14 @@ NODE=ejabberd
5 HOST=`hostname | cut -d. -f1`
6 ERLANG_NODE=$NODE@$HOST
7
8 - LD_LIBRARY_PATH="/lib/:/usr/lib/"
9 +if [ -d "/usr/lib64/ejabberd" ]
10 +then
11 +usrpath='/usr/lib64';
12 +else
13 +usrpath='/usr/lib';
14 +fi
15 +
16 + LD_LIBRARY_PATH="/lib/:$usrpath/"
17 DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
18 export LD_LIBRARY_PATH
19 export DYLD_LIBRARY_PATH
20 @@ -28,7 +35,7 @@ export HOME
21 # common control function
22 ctl()
23 {
24 - erl -pa /usr/lib/ejabberd/ebin -sname ejabberdctl \
25 + erl -pa $usrpath/ejabberd/ebin -sname ejabberdctl \
26 -noinput \
27 -s ejabberd_ctl -extra $ERLANG_NODE $@
28 result=$?
29 diff -up smeserver-ejabberd-2.0.1/root/var/service/ejabberd/run.64patch smeserver-ejabberd-2.0.1/root/var/service/ejabberd/run
30 --- smeserver-ejabberd-2.0.1/root/var/service/ejabberd/run.64patch 2008-06-27 16:31:28.000000000 -0400
31 +++ smeserver-ejabberd-2.0.1/root/var/service/ejabberd/run 2013-07-14 16:34:05.000000000 -0400
32 @@ -19,8 +19,13 @@ HOST=`hostname | cut -d. -f1`
33
34 EMU=beam
35 export EMU
36 -
37 -LD_LIBRARY_PATH=/usr/lib/:/lib
38 +if [ -d "/usr/lib64/ejabberd" ]
39 +then
40 +usrpath='/usr/lib64';
41 +else
42 +usrpath='/usr/lib';
43 +fi
44 +LD_LIBRARY_PATH=$usrpath/:/lib
45 export LD_LIBRARY_PATH
46 DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
47 export DYLD_LIBRARY_PATH
48 @@ -34,11 +39,11 @@ SASL_LOG_PATH=/var/log/ejabberd/sasl.log
49 export SASL_LOG_PATH
50 EJABBERD_LOG_PATH=/var/log/ejabberd/ejabberd.log
51 export EJABBERD_LOG_PATH
52 -EJABBERD_SO_PATH=/usr/lib/ejabberd/priv/lib
53 +EJABBERD_SO_PATH=$usrpath/ejabberd/priv/lib
54 export EJABBERD_SO_PATH
55 EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.cfg
56 export EJABBERD_CONFIG_PATH
57 -EJABBERD_MSGS_PATH=/usr/lib/ejabberd/priv/msgs
58 +EJABBERD_MSGS_PATH=$usrpath/ejabberd/priv/msgs
59 export EJABBERD_MSGS_PATH
60 EJABBERD_DB=/var/lib/ejabberd/spool
61 export EJABBERD_DB
62 @@ -46,7 +51,7 @@ HOME=/var/lib/ejabberd
63 export HOME
64
65 exec /usr/local/bin/setuidgid ejabberd \
66 - erl -pa /usr/lib/ejabberd/ebin \
67 + erl -pa $usrpath/ejabberd/ebin \
68 -noinput \
69 -smp auto +K false +P 250000 \
70 -sname ejabberd \
71 @@ -56,4 +61,4 @@ exec /usr/local/bin/setuidgid ejabberd \
72 -ejabberd config \"$EJABBERD_CONFIG_PATH\" \
73 log_path \"$EJABBERD_LOG_PATH\" \
74 -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\}
75 -
76 \ Pas de fin de ligne à la fin du fichier.
77 +

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed