Archives
Archives
| From: | "Caleb Tennis (caleb)" <caleb@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: 2.0.0-missing-declaration.patch ejabberd-2.0.0.initd |
| Date: | Tue, 05 Feb 2008 13:27:49 |
| Message-Id: | E1JMNpx-0005n3-O9@stork.gentoo.org |
| 1 | caleb 08/02/05 13:27:45 |
| 2 | |
| 3 | Added: 2.0.0-missing-declaration.patch |
| 4 | ejabberd-2.0.0.initd |
| 5 | Log: |
| 6 | Version bump, from bug #207586 |
| 7 | (Portage version: 2.1.4.1) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 net-im/ejabberd/files/2.0.0-missing-declaration.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/2.0.0-missing-declaration.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/2.0.0-missing-declaration.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: 2.0.0-missing-declaration.patch |
| 16 | =================================================================== |
| 17 | diff -uNr ejabberd-1.1.4.ORIG/src/expat_erl.c ejabberd-1.1.4/src/expat_erl.c |
| 18 | --- ejabberd-1.1.4.ORIG/src/expat_erl.c 2007-09-14 12:07:56.000000000 +0100 |
| 19 | +++ ejabberd-1.1.4/src/expat_erl.c 2007-09-14 12:08:56.000000000 +0100 |
| 20 | @@ -14,6 +14,8 @@ |
| 21 | * Workaround for EI encode_string bug |
| 22 | */ |
| 23 | |
| 24 | +int x_fix_buff(ei_x_buff* x, int szneeded); |
| 25 | + |
| 26 | #define put8(s,n) do { \ |
| 27 | (s)[0] = (char)((n) & 0xff); \ |
| 28 | (s) += 1; \ |
| 29 | |
| 30 | |
| 31 | |
| 32 | 1.1 net-im/ejabberd/files/ejabberd-2.0.0.initd |
| 33 | |
| 34 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd?rev=1.1&view=markup |
| 35 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd?rev=1.1&content-type=text/plain |
| 36 | |
| 37 | Index: ejabberd-2.0.0.initd |
| 38 | =================================================================== |
| 39 | #!/sbin/runscript |
| 40 | # Copyright 1999-2007 Gentoo Foundation |
| 41 | # Distributed under the terms of the GNU General Public License v2 |
| 42 | # $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd,v 1.1 2008/02/05 13:27:45 caleb Exp $ |
| 43 | |
| 44 | opts="${opts} reload" |
| 45 | |
| 46 | depend() { |
| 47 | use dns |
| 48 | need net |
| 49 | provide jabber-server |
| 50 | } |
| 51 | |
| 52 | checkconfig() { |
| 53 | if [ ! -e /etc/jabber/ejabberd.cfg ] ; then |
| 54 | eerror "You need an /etc/jabber/ejabberd.cfg file to run ejabberd" |
| 55 | return 1 |
| 56 | fi |
| 57 | } |
| 58 | |
| 59 | start() { |
| 60 | checkconfig || return 1 |
| 61 | ebegin "Starting eJabberd" |
| 62 | start-stop-daemon --start --quiet --chuid jabber:jabber \ |
| 63 | --exec /usr/bin/env HOME=/var/run/jabber /usr/bin/ejabberd -- -noshell -detached |
| 64 | eend $? |
| 65 | # For bug #190266 |
| 66 | chown jabber:jabber /var/run/jabber/.erlang.cookie |
| 67 | } |
| 68 | |
| 69 | stop() { |
| 70 | ebegin "Stopping eJabberd" |
| 71 | if [ -z "$EJABBERD_NODE" ]; |
| 72 | then |
| 73 | EJABBERD_NODE="ejabberd@`hostname -s`" |
| 74 | fi |
| 75 | /usr/bin/ejabberdctl $EJABBERD_NODE stop |
| 76 | eend $? |
| 77 | } |
| 78 | |
| 79 | # Work around a bug in /sbin/runscript.sh - it won't run our custom |
| 80 | # restart() unless it finds these two strings in the file. |
| 81 | # svc_start svc_stop |
| 82 | restart() { |
| 83 | ebegin "Restarting eJabberd" |
| 84 | if [ -z "$EJABBERD_NODE" ]; |
| 85 | then |
| 86 | EJABBERD_NODE="ejabberd@`hostname -s`" |
| 87 | fi |
| 88 | /usr/bin/ejabberdctl $EJABBERD_NODE restart |
| 89 | eend $? |
| 90 | } |
| 91 | |
| 92 | reload() { |
| 93 | ebegin "Reloading eJabberd" |
| 94 | if [ -z "$EJABBERD_NODE" ]; |
| 95 | then |
| 96 | EJABBERD_NODE="ejabberd@`hostname -s`" |
| 97 | fi |
| 98 | /usr/bin/ejabberdctl $EJABBERD_NODE reopen-log |
| 99 | eend $? |
| 100 | } |
| 101 | |
| 102 | |
| 103 | |
| 104 | -- |
| 105 | gentoo-commits@l.g.o mailing list |