Attachment #41454 for bug #62461

View | Details | Raw Unified | Return to bug 62461
Collapse All | Expand All




MD5 fe89e429e85eeb6c28d3fd2e76fcd82f mu-conference-0.6.0-r2.ebuild 1324
MD5 fd5e5272dca1912c7caab94b217d27a8 mu-conference-0.6.0-r1.ebuild 1362
MD5 efea36a1a1c1e12ae46249b75711fe9b ChangeLog 2906
MD5 5d032797cb26e7105194d6156f0dae09 metadata.xml 327
MD5 fe7a249c39d9046180aee62459ed6c82 files/mu-conference-conf.d 435
MD5 63d5ac8cd8b654555a7be33f16a5be0f mu-conference-0.6.0-r2.ebuild 1449
MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
MD5 48afbfebeba7df894e0b4fed629e22eb files/muc-transport.init-r2 532
MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r1 70
MD5 eaf08596bf13d647d0bfe12ce36318c4 files/digest-mu-conference-0.6.0-r2 131
MD5 48afbfebeba7df894e0b4fed629e22eb files/muc-transport.init-r2 532
MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
MD5 34c298326722258d9f0ad798afb32cb1 files/mu-conference-makefile.patch 430
MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
MD5 34f38216da5355bb7d24145b50d39bfd files/muc-transport.init 529
MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
MD5 fe7a249c39d9046180aee62459ed6c82 files/mu-conference-conf.d 435
MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r2 70

Line 1 Link Here

(-)/usr/portage/net-im/mu-conference/files/digest-mu-conference-0.6.0-r2 (+1 lines)
1	MD5 e97433bf4a978329d639ce872bee3223 mu-conference-0.6.0.tar.gz 56272	1	MD5 e97433bf4a978329d639ce872bee3223 mu-conference-0.6.0.tar.gz 56272
		2	MD5 f88bcc4a8347fd1dd8ca50dff50341f3 jcr-0.2.4.tar.gz 128939

Lines 1-9 Link Here

(-)/usr/portage/net-im/mu-conference/files/mu-conference-conf.d (-9 lines)
1	# Copyright 1999-2004 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License, v2 or later
3	# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/files/mu-conference-conf.d,v 1.4 2004/07/08 17:35:01 humpback Exp $
4
5	CONFIG="/etc/jabber/muctrans.xml"
6
7	#Need to find a way to fix the "double" expansion
8	#PIDFILE= grep pid ${CONFIG} \| sed -e 's/<[^>]*>//g' \| sed s/' '//g
9	PIDFILE="/var/log/jabber/muctrans.pid"

Line 0 Link Here

(-)/usr/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber14 (+9 lines)
	1	# Copyright 1999-2004 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License, v2 or later
	3	# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/files/mu-conference-conf.d,v 1.4 2004/07/08 17:35:01 humpback Exp $
	4
	5	CONFIG="/etc/jabber/muctrans.xml"
	6
	7	#Need to find a way to fix the "double" expansion
	8	#PIDFILE= grep pid ${CONFIG} \| sed -e 's/<[^>]*>//g' \| sed s/' '//g
	9	PIDFILE="/var/log/jabber/muctrans.pid"

Line 0 Link Here

(-)/usr/portage/net-im/mu-conference/files/mu-conference-conf.d-jabber2 (+8 lines)
	1	# Copyright 1999-2004 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License, v2 or later
	3
	4	CONFIG="/etc/jabberd/muc-jcr.xml"
	5
	6	#Need to find a way to fix the "double" expansion
	7	#PIDFILE= grep pid ${CONFIG} \| sed -e 's/<[^>]*>//g' \| sed s/' '//g
	8	PIDFILE="/var/jabberd/pid/muctrans.pid"




<jcr>
  <!--
       This is a config file for a copy of MU-Conference, compiled against
       the Jabber Component Runtime (JCR). This is the same file that I use
       to connect to my development server, running jabberd2 beta2

       In order to connect to a jabberd v1.4 server, simply change the
       <name> value to muclinker, and make sure the muclinker section is in
       your main jabber.xml file, as per the MU-Conference README file.
  -->

  <name>conference.localhost</name>
  <host>conference.localhost</host>
  <ip>localhost</ip>
  <port>5347</port>
  <secret>s621!asd</secret>

  <spool>/var/jabberd/spool/conference</spool>
  <logdir>/var/jabberd/log/conference</logdir>
  <pidfile>/var/jabberd/pid/muctrans.pid</pidfile>
  <!--
     <logstderr/>
  -->
  <loglevel>124</loglevel>

    <conference xmlns="jabber:config:conference">
      <public/>
      <vCard>
        <FN>Public Chatrooms</FN>
        <DESC>This service is for public chatrooms.</DESC>
        <URL>http://conferece.localhost/</URL>
      </vCard>
      <history>40</history>
      <logdir>/var/jabberd/log/conference/</logdir>
      <notice>
        <join>has become available</join>
        <leave>has left</leave>
        <rename>is now known as</rename>
      </notice>
      <sadmin>
        <user>admin@jabber.localhost</user>
      </sadmin>
    </conference>
</jcr>




#!/sbin/runscript

depend() {
	need net
	use jabber-server
}

start() {
	ebegin "Starting MUC Jabber Transport"
	mu-conference -c /etc/jabberd/muc-jcr.xml &>/dev/null 2>&1 &

	eend $?
}

stop() {
	ebegin "Stoping MUC Jabber Transport"
	if [ -f /var/jabberd/pid/muctrans.pid ]; then
		kill `cat /var/jabberd/pid/muctrans.pid`
	fi
	sleep 2
	if [ -f /var/jabberd/pid/muctrans.pid ]; then
		kill -9 `cat /var/jabberd/pid/muctrans.pid`
		rm -f /var/jabberd/pid/muctrans.pid
	fi
	rm -f /var/jabberd/pid/muctrans.pid
	eend $?
}




#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
	need net
	use jabber-server
}

start() {
	ebegin "Starting MUC Jabber Transport"
	
	if [ "${JABBERD}" = "jabberd14" ]
		then
		if [ -f ${PIDFILE} ]; then
			if [ -z $(ps ax | grep `cat ${PIDFILE}` | grep -v grep ) ]
			then
				rm -f ${PIDFILE}
			fi
		fi
	
		jabberd -B -c ${CONFIG} -H /var/spool/jabber >/dev/null 2>&1
	else
		mu-conference -c ${CONFIG} &>/dev/null 2>&1 &
	fi
	
	eend $?
}

stop() {
	ebegin "Stoping MUC Jabber Transport"
	
	if [ "${JABBERD}" = "jabberd14" ]
	then
		if [ -f ${PIDFILE} ]; then
			kill `cat ${PIDFILE}`
		fi
		sleep 2
		if [ -f ${PIDFILE} ]; then
			kill -9 `cat ${PIDFILE}`
			rm -f ${PIDFILE}
		fi
		rm -f ${PIDFILE}
	else
		if [ -f ${PIDFILE} ]; then
			kill `cat ${PIDFILE}`
		fi
		sleep 2
		if [ -f ${PIDFILE} ]; then
			kill -9 `cat ${PIDFILE}`
			rm -f ${PIDFILE}
		fi
		rm -f ${PIDFILE}	
	fi
	
	eend $?
}

Lines 1-54 Link Here

(-)/usr/portage/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild (-29 / +78 lines)
1	# Copyright 1999-2004 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/net-im/mu-conference/mu-conference-0.6.0-r2.ebuild,v 1.5 2004/07/08 16:31:40 humpback Exp $
4		1
5	inherit eutils	2	inherit eutils
6		3
		4	JCR_VERSION="0.2.4"
		5
7	DESCRIPTION="Multi-User Chat for jabberd"	6	DESCRIPTION="Multi-User Chat for jabberd"
8	HOMEPAGE="http://mu-conference.jabberstudio.org/"	7	HOMEPAGE="http://mu-conference.jabberstudio.org/"
9	SRC_URI="http://www.jabberstudio.org/files/mu-conference/${P}.tar.gz"	8	SRC_URI="http://www.jabberstudio.org/files/mu-conference/${P}.tar.gz
		9	jabber2? http://jabber.terrapin.com/JCR/jcr-${JCR_VERSION}.tar.gz
		10	"
10		11
11	LICENSE="GPL-2"	12	LICENSE="GPL-2"
12	KEYWORDS="~x86 ~sparc ~ppc"	13	KEYWORDS="x86 ~sparc ~ppc"
13	SLOT="0"	14	SLOT="0"
14		15
15	DEPEND="=net-im/jabberd-1.4*	16	IUSE="jabber2"
		17
		18	DEPEND="jabber2? ( >=net-im/jabberd-2* )
		19	!jabber2? ( >=net-im/jabberd-1.4* )
16	>=dev-libs/glib-2.2.1"	20	>=dev-libs/glib-2.2.1"
17		21
18	IUSE=""	22	if use jabber2; then
		23	S=${WORKDIR}/jcr-${JCR_VERSION}
		24	else
		25	S=${WORKDIR}/${P}
		26	fi
19		27
20	src_unpack() {	28	src_unpack() {
21	unpack ${A}	29	if use jabber2; then
22	cd ${S}/src	30	unpack jcr-${JCR_VERSION}.tar.gz
23	epatch ${FILESDIR}/mu-conference-makefile.patch	31	cd jcr-${JCR_VERSION}
		32	unpack ${P}.tar.gz
		33	else
		34	unpack ${A}
		35	cd ${S}/src
		36	epatch ${FILESDIR}/mu-conference-makefile.patch
		37	fi
24	}	38	}
25		39
26	src_compile() {	40	src_compile() {
27	emake \|\| die	41	if use jabber2; then
		42	emake \|\| die
		43	cp src/main.c src/jcomp.mk ${P}/src \|\| die
		44	cd ${P}/src
		45	emake -f jcomp.mk \|\| die
		46	else
		47	emake \|\| die
		48	fi
		49
28	}	50	}
29		51
30	src_install() {	52	src_install() {
31	dodir /etc/jabber /usr/lib/jabberd /var/log/jabber/conference
32	keepdir /var/log/jabber/conference/
33
34	insinto /usr/lib/jabberd
35	doins src/mu-conference.so
36
37	insinto /etc/jabber
38	doins ${FILESDIR}/muctrans.xml
39		53
40	insinto /etc/conf.d ; newins ${FILESDIR}/mu-conference-conf.d muc-transport	54	if use jabber2; then
		55	dodir /etc/jabberd /usr/bin
		56
		57	exeinto /usr/bin
		58	doexe ${P}/src/mu-conference
		59
		60	dodir /var/jabberd/log/conference
		61	keepdir /var/jabberd/log/conference/
		62
		63	fowners jabber:jabber /var/jabberd/log/conference
		64	fperms g-x /var/jabberd/log/conference
		65	fperms g+rw /var/jabberd/log/conference
		66
		67	dodir /var/jabberd/spool/conference
		68	keepdir /var/jabberd/spool/conference/
		69
		70	insinto /etc/jabberd
		71	doins ${FILESDIR}/muc-jcr.xml \|\| die
		72
		73	dodoc README.jcr
		74
		75	insinto /etc/conf.d
		76	newins ${FILESDIR}/mu-conference-conf.d-jabber14 muc-transport \|\| die
		77	else
		78	dodir /etc/jabber /usr/lib/jabberd
		79
		80	insinto /usr/lib/jabberd
		81	doins src/mu-conference.so \|\| die
		82
		83	dodir /var/log/jabber/conference
		84	keepdir /var/log/jabber/conference/
		85
		86	fowners jabber:jabber /var/log/jabber/conference
		87	fperms g-x /var/log/jabber/conference
		88	fperms g+rw /var/log/jabber/conference
		89
		90	insinto /etc/jabber
		91	doins ${FILESDIR}/muctrans.xml \|\| die
		92
		93	insinto /etc/conf.d
		94	newins ${FILESDIR}/mu-conference-conf.d-jabber2 muc-transport \|\| die
		95	fi
41		96
42	exeinto /etc/init.d	97	exeinto /etc/init.d
43	newexe ${FILESDIR}/muc-transport.init-r2 muc-transport	98	newexe ${FILESDIR}/muc-transport.init-r3 muc-transport
44		99
45	dodoc README FAQ README.jcr ${FILESDIR}/README.Gentoo	100	dodoc README FAQ ${FILESDIR}/README.Gentoo
46
47	fowners jabber:jabber /var/log/jabber/conference
48
49	fperms g-x /var/log/jabber/conference
50
51	fperms g+rw /var/log/jabber/conference
52	}	101	}
53		102
54	pkg_postinst() {	103	pkg_postinst() {

Return to bug 62461

Lines 1-12 Link Here

(-)/usr/portage/net-im/mu-conference/Manifest (-7 / +7 lines)
		1	MD5 fe89e429e85eeb6c28d3fd2e76fcd82f mu-conference-0.6.0-r2.ebuild 1324
		2	MD5 fd5e5272dca1912c7caab94b217d27a8 mu-conference-0.6.0-r1.ebuild 1362
1	MD5 efea36a1a1c1e12ae46249b75711fe9b ChangeLog 2906	3	MD5 efea36a1a1c1e12ae46249b75711fe9b ChangeLog 2906
2	MD5 5d032797cb26e7105194d6156f0dae09 metadata.xml 327	4	MD5 5d032797cb26e7105194d6156f0dae09 metadata.xml 327
3	MD5 fd5e5272dca1912c7caab94b217d27a8 mu-conference-0.6.0-r1.ebuild 1362	5	MD5 fe7a249c39d9046180aee62459ed6c82 files/mu-conference-conf.d 435
4	MD5 63d5ac8cd8b654555a7be33f16a5be0f mu-conference-0.6.0-r2.ebuild 1449
5	MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
6	MD5 48afbfebeba7df894e0b4fed629e22eb files/muc-transport.init-r2 532
7	MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r1 70	6	MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r1 70
		7	MD5 eaf08596bf13d647d0bfe12ce36318c4 files/digest-mu-conference-0.6.0-r2 131
		8	MD5 48afbfebeba7df894e0b4fed629e22eb files/muc-transport.init-r2 532
		9	MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
8	MD5 34c298326722258d9f0ad798afb32cb1 files/mu-conference-makefile.patch 430	10	MD5 34c298326722258d9f0ad798afb32cb1 files/mu-conference-makefile.patch 430
		11	MD5 95d0e1126a3c7d35a21f43cd01095323 files/README.Gentoo 1483
9	MD5 34f38216da5355bb7d24145b50d39bfd files/muc-transport.init 529	12	MD5 34f38216da5355bb7d24145b50d39bfd files/muc-transport.init 529
10	MD5 5d92cc782339ac08100c8a4068f24b92 files/muctrans.xml 908
11	MD5 fe7a249c39d9046180aee62459ed6c82 files/mu-conference-conf.d 435
12	MD5 f88abce484cd1607dc473ea266ea57f9 files/digest-mu-conference-0.6.0-r2 70

Line 0 Link Here

(-)/usr/portage/net-im/mu-conference/files/muc-jcr.xml (+44 lines)
	1	<jcr>
	2	<!--
	3	This is a config file for a copy of MU-Conference, compiled against
	4	the Jabber Component Runtime (JCR). This is the same file that I use
	5	to connect to my development server, running jabberd2 beta2
	6
	7	In order to connect to a jabberd v1.4 server, simply change the
	8	<name> value to muclinker, and make sure the muclinker section is in
	9	your main jabber.xml file, as per the MU-Conference README file.
	10	-->
	11
	12	<name>conference.localhost</name>
	13	<host>conference.localhost</host>
	14	<ip>localhost</ip>
	15	<port>5347</port>
	16	<secret>s621!asd</secret>
	17
	18	<spool>/var/jabberd/spool/conference</spool>
	19	<logdir>/var/jabberd/log/conference</logdir>
	20	<pidfile>/var/jabberd/pid/muctrans.pid</pidfile>
	21	<!--
	22	<logstderr/>
	23	-->
	24	<loglevel>124</loglevel>
	25
	26	<conference xmlns="jabber:config:conference">
	27	<public/>
	28	<vCard>
	29	<FN>Public Chatrooms</FN>
	30	<DESC>This service is for public chatrooms.</DESC>
	31	<URL>http://conferece.localhost/</URL>
	32	</vCard>
	33	<history>40</history>
	34	<logdir>/var/jabberd/log/conference/</logdir>
	35	<notice>
	36	<join>has become available</join>
	37	<leave>has left</leave>
	38	<rename>is now known as</rename>
	39	</notice>
	40	<sadmin>
	41	<user>admin@jabber.localhost</user>
	42	</sadmin>
	43	</conference>
	44	</jcr>

Line 0 Link Here

(-)/usr/portage/net-im/mu-conference/files/muc-transport-jcr.init (+27 lines)
	1	#!/sbin/runscript
	2
	3	depend() {
	4	need net
	5	use jabber-server
	6	}
	7
	8	start() {
	9	ebegin "Starting MUC Jabber Transport"
	10	mu-conference -c /etc/jabberd/muc-jcr.xml &>/dev/null 2>&1 &
	11
	12	eend $?
	13	}
	14
	15	stop() {
	16	ebegin "Stoping MUC Jabber Transport"
	17	if [ -f /var/jabberd/pid/muctrans.pid ]; then
	18	kill `cat /var/jabberd/pid/muctrans.pid`
	19	fi
	20	sleep 2
	21	if [ -f /var/jabberd/pid/muctrans.pid ]; then
	22	kill -9 `cat /var/jabberd/pid/muctrans.pid`
	23	rm -f /var/jabberd/pid/muctrans.pid
	24	fi
	25	rm -f /var/jabberd/pid/muctrans.pid
	26	eend $?
	27	}