public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-im/mu-conference/, net-im/mu-conference/files/
@ 2016-05-02 22:24 Austin English
  0 siblings, 0 replies; 4+ messages in thread
From: Austin English @ 2016-05-02 22:24 UTC (permalink / raw
  To: gentoo-commits

commit:     0e5dbc45bad9c39c64887428201e9e4c78d0f29c
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 19:18:30 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon May  2 22:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5dbc45

net-im/mu-conference: #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 net-im/mu-conference/files/mu-conference-0.7.init  |  2 +-
 net-im/mu-conference/files/muc-transport.init      |  2 +-
 net-im/mu-conference/files/muc-transport.init-r2   |  2 +-
 net-im/mu-conference/mu-conference-0.7-r1.ebuild   | 83 ++++++++++++++++++++
 net-im/mu-conference/mu-conference-0.8-r2.ebuild   | 90 ++++++++++++++++++++++
 .../mu-conference/mu-conference-0.8.81-r1.ebuild   | 88 +++++++++++++++++++++
 6 files changed, 264 insertions(+), 3 deletions(-)

diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init
index 20400ac..a41c470 100644
--- a/net-im/mu-conference/files/mu-conference-0.7.init
+++ b/net-im/mu-conference/files/mu-conference-0.7.init
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend() {
 	need net

diff --git a/net-im/mu-conference/files/muc-transport.init b/net-im/mu-conference/files/muc-transport.init
index 39f6115..c10c0ae 100644
--- a/net-im/mu-conference/files/muc-transport.init
+++ b/net-im/mu-conference/files/muc-transport.init
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend() {
 	need net

diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2
index 03978bd..f1d5379 100644
--- a/net-im/mu-conference/files/muc-transport.init-r2
+++ b/net-im/mu-conference/files/muc-transport.init-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 depend() {
 	need net

diff --git a/net-im/mu-conference/mu-conference-0.7-r1.ebuild b/net-im/mu-conference/mu-conference-0.7-r1.ebuild
new file mode 100644
index 0000000..9b37494
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.7-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
+SLOT="0"
+
+DEPEND="
+	dev-libs/expat
+	>=dev-libs/glib-2
+	net-dns/libidn
+	net-im/jabberd2
+	mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+IUSE="mysql"
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_prepare() {
+	# Fix missing header in src/conference_user.c in order to
+	# make emerge happy and avoid QA notice.
+	sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+	if use mysql; then
+		sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile || die
+	else
+		# Makefile is broken. Should not always link against mysql
+		sed -i 's/`mysql_config --libs`//' src/Makefile || die
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	dobin src/mu-conference
+	fowners jabber:jabber /usr/bin/mu-conference
+	fperms 750 /usr/bin/mu-conference
+
+	newinitd "${FILESDIR}/${P}".init mu-conference
+
+	dodoc ChangeLog FAQ mu-conference.sql README
+	docinto scripts
+	dodoc scripts/*
+
+	for i in log spool; do
+		dodir /var/${i}/jabber/mu-conference
+		keepdir /var/${i}/jabber/mu-conference
+		fowners jabber:jabber /var/${i}/jabber/mu-conference
+		fperms 770 /var/${i}/jabber/mu-conference
+	done
+
+	insinto /etc/jabber
+	newins muc-default.xml mu-conference.xml
+	doins style.css
+
+	cd "${D}/etc/jabber/" || die
+	sed -i \
+		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+		-e 's,./syslogs,/var/log/jabber,g' \
+		-e 's,./logs,/var/log/jabber/mu-conference,g' \
+		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+		-e "s,../style.css,/etc/jabber/style.css,g" \
+		-e "s,7009,5347,g" \
+		mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "For jabberd-2 connection:"
+	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+	elog "   match the address of your jabberd router."
+	elog "2. Set a common secret in mu-conference.xml and router.xml"
+	echo
+}

diff --git a/net-im/mu-conference/mu-conference-0.8-r2.ebuild b/net-im/mu-conference/mu-conference-0.8-r2.ebuild
new file mode 100644
index 0000000..fa352c9
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="mysql"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/glib-2:2
+	net-dns/libidn
+	net-im/jabberd2
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_prepare() {
+	# Fix missing header in src/conference_user.c in order to
+	# make emerge happy and avoid QA notice.
+	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+	if use mysql; then
+		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
+			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
+	fi
+		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
+			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
+			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
+		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
+		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
+		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
+		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
+	tc-export CC AR RANLIB
+
+	eapply_user
+}
+
+src_install() {
+	dobin src/mu-conference
+	fowners jabber:jabber /usr/bin/mu-conference
+	fperms 750 /usr/bin/mu-conference
+
+	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
+
+	dodoc ChangeLog FAQ mu-conference.sql README README.sql
+	docinto scripts
+	dodoc scripts/*
+
+	local i
+	for i in log spool; do
+		dodir /var/${i}/jabber/mu-conference
+		keepdir /var/${i}/jabber/mu-conference
+		fowners jabber:jabber /var/${i}/jabber/mu-conference
+		fperms 770 /var/${i}/jabber/mu-conference
+	done
+
+	insinto /etc/jabber
+	newins muc-default.xml mu-conference.xml
+	doins style.css
+
+	sed -i \
+		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+		-e 's,./syslogs,/var/log/jabber,g' \
+		-e 's,./logs,/var/log/jabber/mu-conference,g' \
+		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+		-e "s,../style.css,/etc/jabber/style.css,g" \
+		-e "s,7009,5347,g" \
+		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "For jabberd-2 connection:"
+	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+	elog "   match the address of your jabberd router."
+	elog "2. Set a common secret in mu-conference.xml and router.xml"
+	echo
+}

diff --git a/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
new file mode 100644
index 0000000..8b00445
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="mysql"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/glib-2:2
+	net-dns/libidn
+	net-im/jabberd2
+	mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix missing header in src/conference_user.c in order to
+	# make emerge happy and avoid QA notice.
+	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+	if use mysql; then
+		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
+			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
+	fi
+		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
+			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
+			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
+		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
+		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
+		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
+		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
+	tc-export CC AR RANLIB
+
+	eapply_user
+}
+
+src_install() {
+	dobin src/mu-conference
+	fowners jabber:jabber /usr/bin/mu-conference
+	fperms 750 /usr/bin/mu-conference
+
+	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
+
+	dodoc ChangeLog FAQ mu-conference.sql README README.sql
+	docinto scripts
+	dodoc scripts/*
+
+	local i
+	for i in log spool; do
+		dodir /var/${i}/jabber/mu-conference
+		keepdir /var/${i}/jabber/mu-conference
+		fowners jabber:jabber /var/${i}/jabber/mu-conference
+		fperms 770 /var/${i}/jabber/mu-conference
+	done
+
+	insinto /etc/jabber
+	newins muc-default.xml mu-conference.xml
+	doins style.css
+
+	sed -i \
+		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+		-e 's,./syslogs,/var/log/jabber,g' \
+		-e 's,./logs,/var/log/jabber/mu-conference,g' \
+		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+		-e "s,../style.css,/etc/jabber/style.css,g" \
+		-e "s,7009,5347,g" \
+		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "For jabberd-2 connection:"
+	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+	elog "   match the address of your jabberd router."
+	elog "2. Set a common secret in mu-conference.xml and router.xml"
+	echo
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/mu-conference/, net-im/mu-conference/files/
@ 2016-08-25 16:34 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-08-25 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     8f1f2f099ca5238ae3e12a9571833c90bcf7ce92
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 16:34:26 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 16:34:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1f2f09

net-im/mu-conference: Drop old

Package-Manager: portage-2.3.0

 net-im/mu-conference/Manifest                      |  2 -
 net-im/mu-conference/files/README.Gentoo           | 40 ----------
 net-im/mu-conference/files/mu-conference-conf.d    |  9 ---
 .../files/mu-conference-makefile.patch             | 11 ---
 net-im/mu-conference/files/muc-transport.init      | 26 -------
 net-im/mu-conference/files/muc-transport.init-r2   | 33 --------
 net-im/mu-conference/files/muctrans.xml            | 37 ---------
 net-im/mu-conference/mu-conference-0.7-r1.ebuild   | 83 --------------------
 net-im/mu-conference/mu-conference-0.8-r2.ebuild   | 90 ----------------------
 .../mu-conference/mu-conference-0.8.81-r1.ebuild   | 88 ---------------------
 10 files changed, 419 deletions(-)

diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
index 2a113bf..09fde34 100644
--- a/net-im/mu-conference/Manifest
+++ b/net-im/mu-conference/Manifest
@@ -1,3 +1 @@
 DIST mu-conference-0.8.81.tar.gz 247649 SHA256 d3c8f2f0539b06e32b8bcd48dfae008c84961815ada0922ecf095be36b599862 SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1 WHIRLPOOL b6da089299d22b3b4e68d79f6451de981e5ccbd7144cf765c2a4073c6b7d58f276c687e4693ab34bbca57275b5b5e48886eded5adc3e5382c61add4d23b9467a
-DIST mu-conference_0.7.tar.gz 112381 SHA256 914d7e5cf45c50e3eaae77d03d895211d332f85469f4a70adaf7209917d27a35 SHA512 55efde6f7605b0d76038c9d67a3e0acb2f0041f896e9a70db0496dec4dbcb28a86539e9efc23df67c4b2eea64c221d1d7d99df2a02f212d46c5172da61d8d6a1 WHIRLPOOL cc9cfe32cff1b21ace94a55d8003038aa28df881b4aaf8759f9e53f53f76a5da4b4dbe7c27985ab2e638deafa4bb7a03cbaa3494c9387b56fb7204b073187f7e
-DIST mu-conference_0.8.tar.gz 110356 SHA256 d9f4399573a83f20c84af55cb56b405c706a943898cb14a5d220d35b89db429b SHA512 e5c410b77091d5fa4cba657a3362704fe1c148b9125984dc1cad832fd48ed343de78e044bafa10c8b8e38160406f4023444009281cb2236c300fbc17d4b85d7f WHIRLPOOL d49fe19bdd09081ba44b16126c9e71e1f9a07a285dea7efe64e487baeb0ac2d3eae04374c245b2451293805f60f935f9243d9e93f1df0f8de9cf98b54e42e53c

diff --git a/net-im/mu-conference/files/README.Gentoo b/net-im/mu-conference/files/README.Gentoo
deleted file mode 100644
index a478572..00000000
--- a/net-im/mu-conference/files/README.Gentoo
+++ /dev/null
@@ -1,40 +0,0 @@
-This is a small help to get you started with the MSN Jabberd transport in 
-Gentoo.
-
-Edit /etc/jabber/muctrans.xml . This is the config file for MU-Conference.
-There change all references to localhost with the FQDN (Fully Qualified Domain 
-Name) for your server.
-
-In the msnlinker section enter the IP of your main jabber server (normally 
-127.0.0.1) and choose a port and secret (secret is the password the MSN 
-transport will use to connect to the main jabber server).
-
-Now back to the multiple.xml to tell your main jabber server to listen to 
-connections from the MU transport.
-Search for "<vcard2jud/>" and after that, and before the </jsm> add:
-
-<browse>
-	<item category="conference" type="public" jid="conference.localhost" name="Public Conferencing" version="0.6.0">
-	<ns>http://jabber.org/protocol/muc</ns>
-	</item>
-</browse>
-
-Again here change localhost for your FQDN.
-
-Scrool down to the bottom of the file, and just before the </jabber> add:
-
-<service id="muclinker">
-<host>conference.localhost</host>
-	<accept>
-		<ip>127.0.0.1</ip>
-		<port>31518</port>
-		<secret>mymucsecret</secret>
-	</accept>
-</service>
-(By know you know you have to change localhost for you FQDN).
-One very importante thing: even if it is the same machine the name's for the 
-various services must be diferent, that means that there must be valid aliases 
-for conference.FQDN .
-
-If you need help with configuration you can try the Jabber Admin Mailling list:
-http://mailman.jabber.org/listinfo/jadmin

diff --git a/net-im/mu-conference/files/mu-conference-conf.d b/net-im/mu-conference/files/mu-conference-conf.d
deleted file mode 100644
index 95e38ab..00000000
--- a/net-im/mu-conference/files/mu-conference-conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
-
-CONFIG="/etc/jabber/muctrans.xml"
-
-#Need to find a way to fix the "double" expansion 
-#PIDFILE= grep pid ${CONFIG} | sed -e 's/<[^>]*>//g' | sed s/' '//g
-PIDFILE="/var/log/jabber/muctrans.pid"

diff --git a/net-im/mu-conference/files/mu-conference-makefile.patch b/net-im/mu-conference/files/mu-conference-makefile.patch
deleted file mode 100644
index 2a00940..00000000
--- a/net-im/mu-conference/files/mu-conference-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	2003-11-15 04:19:44.000000000 +0000
-+++ Makefile.new	2004-01-10 02:20:28.753368424 +0000
-@@ -1,6 +1,6 @@
--include ../../platform-settings
-+include /usr/lib/jabberd/platform-settings
- 
--CFLAGS:=$(CFLAGS) -I../../jabberd -I../include `pkg-config --cflags glib-2.0`
-+CFLAGS:=$(CFLAGS) -I/usr/include/jabberd -I../include `pkg-config --cflags glib-2.0`
- LIBS:=$(LIBS) `pkg-config --libs glib-2.0`
- 
- # Debug/Experimental

diff --git a/net-im/mu-conference/files/muc-transport.init b/net-im/mu-conference/files/muc-transport.init
deleted file mode 100644
index c10c0ae..00000000
--- a/net-im/mu-conference/files/muc-transport.init
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting MUC Jabber Transport"
-	jabberd -B -c /etc/jabber/muctrans.xml -H /var/spool/jabber >/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping MUC Jabber Transport"
-	if [ -f /var/log/jabber/muctrans.pid ]; then
-		kill `cat /var/log/jabber/muctrans.pid`
-	fi
-	sleep 2
-	if [ -f /var/log/jabber/muctrans.pid ]; then
-		kill -9 `cat /var/log/jabber/muctrans.pid`
-		rm -f /var/log/jabber/muctrans.pid
-	fi
-	rm -f /var/log/jabber/muctrans.pid
-	eend $?
-}

diff --git a/net-im/mu-conference/files/muc-transport.init-r2 b/net-im/mu-conference/files/muc-transport.init-r2
deleted file mode 100644
index f1d5379..00000000
--- a/net-im/mu-conference/files/muc-transport.init-r2
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting MUC Jabber Transport"
-	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
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping MUC Jabber Transport"
-	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}
-	eend $?
-}

diff --git a/net-im/mu-conference/files/muctrans.xml b/net-im/mu-conference/files/muctrans.xml
deleted file mode 100644
index 6fe5b21..00000000
--- a/net-im/mu-conference/files/muctrans.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<jabber>
-
-  <service id="muclinker">
-    <uplink/>
-    <connect>
-      <ip>127.0.0.1</ip>
-      <port>31518</port>
-      <secret>mymucsecret</secret>
-    </connect>
-  </service>
-
-  <service id="conference.localhost">
-    <load>
-       <conference>/usr/lib/jabberd/mu-conference.so</conference>
-    </load>
-    <conference xmlns="jabber:config:conference">
-      <public/>
-      <vCard>
-        <FN>Public Chatrooms</FN>
-        <DESC>This service is for public chatrooms.</DESC>
-        <URL>http://conference.localhost/logs/</URL>
-      </vCard>
-      <history>20</history>
-      <logdir>/var/log/jabber/conference/</logdir>
-      <sadmin>admin@localhost</sadmin>
-      <notice>
-        <join>has joined this session</join>
-        <leave>has left</leave>
-        <rename>is now known as</rename>
-      </notice>
-    </conference>
-  </service>
-
-  <pidfile>/var/log/jabber/muctrans.pid</pidfile>
-
-</jabber>
-

diff --git a/net-im/mu-conference/mu-conference-0.7-r1.ebuild b/net-im/mu-conference/mu-conference-0.7-r1.ebuild
deleted file mode 100644
index 9b37494..00000000
--- a/net-im/mu-conference/mu-conference-0.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Multi-User Chat for jabberd"
-HOMEPAGE="https://gna.org/projects/mu-conference/"
-SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-SLOT="0"
-
-DEPEND="
-	dev-libs/expat
-	>=dev-libs/glib-2
-	net-dns/libidn
-	net-im/jabberd2
-	mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-IUSE="mysql"
-
-S="${WORKDIR}/${PN}_${PV}"
-
-src_prepare() {
-	# Fix missing header in src/conference_user.c in order to
-	# make emerge happy and avoid QA notice.
-	sed -i "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
-
-	if use mysql; then
-		sed -i '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' src/Makefile || die
-	else
-		# Makefile is broken. Should not always link against mysql
-		sed -i 's/`mysql_config --libs`//' src/Makefile || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	dobin src/mu-conference
-	fowners jabber:jabber /usr/bin/mu-conference
-	fperms 750 /usr/bin/mu-conference
-
-	newinitd "${FILESDIR}/${P}".init mu-conference
-
-	dodoc ChangeLog FAQ mu-conference.sql README
-	docinto scripts
-	dodoc scripts/*
-
-	for i in log spool; do
-		dodir /var/${i}/jabber/mu-conference
-		keepdir /var/${i}/jabber/mu-conference
-		fowners jabber:jabber /var/${i}/jabber/mu-conference
-		fperms 770 /var/${i}/jabber/mu-conference
-	done
-
-	insinto /etc/jabber
-	newins muc-default.xml mu-conference.xml
-	doins style.css
-
-	cd "${D}/etc/jabber/" || die
-	sed -i \
-		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
-		-e 's,./syslogs,/var/log/jabber,g' \
-		-e 's,./logs,/var/log/jabber/mu-conference,g' \
-		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
-		-e "s,../style.css,/etc/jabber/style.css,g" \
-		-e "s,7009,5347,g" \
-		mu-conference.xml || die "sed failed"
-}
-
-pkg_postinst() {
-	echo
-	elog "For jabberd-2 connection:"
-	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
-	elog "   match the address of your jabberd router."
-	elog "2. Set a common secret in mu-conference.xml and router.xml"
-	echo
-}

diff --git a/net-im/mu-conference/mu-conference-0.8-r2.ebuild b/net-im/mu-conference/mu-conference-0.8-r2.ebuild
deleted file mode 100644
index fa352c9..00000000
--- a/net-im/mu-conference/mu-conference-0.8-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Multi-User Chat for jabberd"
-HOMEPAGE="https://gna.org/projects/mu-conference/"
-SRC_URI="http://download.gna.org/mu-conference/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="mysql"
-
-RDEPEND="
-	dev-libs/expat
-	>=dev-libs/glib-2:2
-	net-dns/libidn
-	net-im/jabberd2
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}_${PV}
-
-src_prepare() {
-	# Fix missing header in src/conference_user.c in order to
-	# make emerge happy and avoid QA notice.
-	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
-
-	if use mysql; then
-		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
-			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
-	fi
-		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
-			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
-			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
-		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
-		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
-		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
-		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
-	tc-export CC AR RANLIB
-
-	eapply_user
-}
-
-src_install() {
-	dobin src/mu-conference
-	fowners jabber:jabber /usr/bin/mu-conference
-	fperms 750 /usr/bin/mu-conference
-
-	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
-
-	dodoc ChangeLog FAQ mu-conference.sql README README.sql
-	docinto scripts
-	dodoc scripts/*
-
-	local i
-	for i in log spool; do
-		dodir /var/${i}/jabber/mu-conference
-		keepdir /var/${i}/jabber/mu-conference
-		fowners jabber:jabber /var/${i}/jabber/mu-conference
-		fperms 770 /var/${i}/jabber/mu-conference
-	done
-
-	insinto /etc/jabber
-	newins muc-default.xml mu-conference.xml
-	doins style.css
-
-	sed -i \
-		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
-		-e 's,./syslogs,/var/log/jabber,g' \
-		-e 's,./logs,/var/log/jabber/mu-conference,g' \
-		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
-		-e "s,../style.css,/etc/jabber/style.css,g" \
-		-e "s,7009,5347,g" \
-		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
-}
-
-pkg_postinst() {
-	echo
-	elog "For jabberd-2 connection:"
-	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
-	elog "   match the address of your jabberd router."
-	elog "2. Set a common secret in mu-conference.xml and router.xml"
-	echo
-}

diff --git a/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
deleted file mode 100644
index 8b00445..00000000
--- a/net-im/mu-conference/mu-conference-0.8.81-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Multi-User Chat for jabberd"
-HOMEPAGE="https://gna.org/projects/mu-conference/"
-SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="mysql"
-
-RDEPEND="
-	dev-libs/expat
-	>=dev-libs/glib-2:2
-	net-dns/libidn
-	net-im/jabberd2
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Fix missing header in src/conference_user.c in order to
-	# make emerge happy and avoid QA notice.
-	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
-
-	if use mysql; then
-		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
-			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
-	fi
-		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
-			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
-			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
-		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
-		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
-		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
-		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
-	tc-export CC AR RANLIB
-
-	eapply_user
-}
-
-src_install() {
-	dobin src/mu-conference
-	fowners jabber:jabber /usr/bin/mu-conference
-	fperms 750 /usr/bin/mu-conference
-
-	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
-
-	dodoc ChangeLog FAQ mu-conference.sql README README.sql
-	docinto scripts
-	dodoc scripts/*
-
-	local i
-	for i in log spool; do
-		dodir /var/${i}/jabber/mu-conference
-		keepdir /var/${i}/jabber/mu-conference
-		fowners jabber:jabber /var/${i}/jabber/mu-conference
-		fperms 770 /var/${i}/jabber/mu-conference
-	done
-
-	insinto /etc/jabber
-	newins muc-default.xml mu-conference.xml
-	doins style.css
-
-	sed -i \
-		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
-		-e 's,./syslogs,/var/log/jabber,g' \
-		-e 's,./logs,/var/log/jabber/mu-conference,g' \
-		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
-		-e "s,../style.css,/etc/jabber/style.css,g" \
-		-e "s,7009,5347,g" \
-		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
-}
-
-pkg_postinst() {
-	echo
-	elog "For jabberd-2 connection:"
-	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
-	elog "   match the address of your jabberd router."
-	elog "2. Set a common secret in mu-conference.xml and router.xml"
-	echo
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/mu-conference/, net-im/mu-conference/files/
@ 2016-08-25 16:34 Pacho Ramos
  0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2016-08-25 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b98a03cb4931341204f1e3a339ebb61364b47661
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 16:33:03 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 16:33:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98a03cb

net-im/mu-conference: Fix connection with long secrets (#505600 by Dmitry A. Bakshaev)

Package-Manager: portage-2.3.0

 .../files/mu-conference-0.8.81-sha1_64bit.patch    | 31 +++++++
 .../mu-conference/mu-conference-0.8.81-r2.ebuild   | 95 ++++++++++++++++++++++
 2 files changed, 126 insertions(+)

diff --git a/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch b/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch
new file mode 100644
index 00000000..2764daa
--- /dev/null
+++ b/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch
@@ -0,0 +1,31 @@
+--- mu-conference-0.8.81/include/lib.h
++++ mu-conference-0.8.81/include/lib.h
+@@ -114,13 +114,6 @@
+ /* SHA calculations                                          */
+ /*                                                           */
+ /* --------------------------------------------------------- */
+-#if (SIZEOF_INT == 4)
+-typedef unsigned int uint32;
+-#elif (SIZEOF_SHORT == 4)
+-typedef unsigned short uint32;
+-#else
+-typedef unsigned int uint32;
+-#endif /* HAVEUINT32 */
+ 
+ char *shahash(char *str);	/* NOT THREAD SAFE */
+ void shahash_r(const char* str, char hashbuf[40]); /* USE ME */
+@@ -301,10 +294,10 @@
+ 
+ 
+ typedef struct {
+-  uint32_t H[5];
+-  uint32_t W[80];
++  guint32 H[5];
++  guint32 W[80];
+   int lenW;
+-  uint32_t sizeHi,sizeLo;
++  guint32 sizeHi,sizeLo;
+ } j_SHA_CTX;
+ 
+ 
+ 

diff --git a/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild
new file mode 100644
index 00000000..133a888
--- /dev/null
+++ b/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multi-User Chat for jabberd"
+HOMEPAGE="https://gna.org/projects/mu-conference/"
+SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE="mysql"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/glib-2:2
+	net-dns/libidn
+	net-im/jabberd2
+	mysql? ( virtual/mysql )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# http://gna.org/bugs/?16238
+	"${FILESDIR}"/${P}-sha1_64bit.patch
+)
+
+src_prepare() {
+	# Fix missing header in src/conference_user.c in order to
+	# make emerge happy and avoid QA notice.
+	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
+
+	if use mysql; then
+		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
+			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
+	fi
+		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
+			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
+			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
+		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
+		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
+		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
+		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
+	tc-export CC AR RANLIB
+
+	default
+}
+
+src_install() {
+	dobin src/mu-conference
+	fowners jabber:jabber /usr/bin/mu-conference
+	fperms 750 /usr/bin/mu-conference
+
+	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
+
+	dodoc ChangeLog FAQ mu-conference.sql README README.sql
+	docinto scripts
+	dodoc scripts/*
+
+	local i
+	for i in log spool; do
+		dodir /var/${i}/jabber/mu-conference
+		keepdir /var/${i}/jabber/mu-conference
+		fowners jabber:jabber /var/${i}/jabber/mu-conference
+		fperms 770 /var/${i}/jabber/mu-conference
+	done
+
+	insinto /etc/jabber
+	newins muc-default.xml mu-conference.xml
+	doins style.css
+
+	sed -i \
+		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
+		-e 's,./syslogs,/var/log/jabber,g' \
+		-e 's,./logs,/var/log/jabber/mu-conference,g' \
+		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
+		-e "s,../style.css,/etc/jabber/style.css,g" \
+		-e "s,7009,5347,g" \
+		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
+}
+
+pkg_postinst() {
+	echo
+	elog "For jabberd-2 connection:"
+	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
+	elog "   match the address of your jabberd router."
+	elog "2. Set a common secret in mu-conference.xml and router.xml"
+	echo
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/mu-conference/, net-im/mu-conference/files/
@ 2018-03-03 17:16 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2018-03-03 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     078f330fe5a44d365eccd9da4d83b90378921da7
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  3 17:10:33 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar  3 17:10:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=078f330f

net-im/mu-conference: Removed from repository

Bug: https://bugs.gentoo.org/629416

 net-im/mu-conference/Manifest                      |  1 -
 net-im/mu-conference/files/mu-conference-0.7.init  | 25 ------
 .../files/mu-conference-0.8.81-sha1_64bit.patch    | 31 -------
 net-im/mu-conference/metadata.xml                  |  6 --
 .../mu-conference/mu-conference-0.8.81-r2.ebuild   | 94 ----------------------
 5 files changed, 157 deletions(-)

diff --git a/net-im/mu-conference/Manifest b/net-im/mu-conference/Manifest
deleted file mode 100644
index ec34dd56b0f..00000000000
--- a/net-im/mu-conference/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mu-conference-0.8.81.tar.gz 247649 BLAKE2B 765ca8d25e11b5b0cabd000476fc12667489f742e3e222004ffac7e13c5a88eb9d462a53c1bcf8b72a3637e89134e7ddb142b5116840724dbad57dfeee65448d SHA512 96bfafac726ebc8c1a7489f092e5a6d90df0aaff39a183aaa33847e12caf142fe64178d7041fff15115bb5d8116e69b7dce95cb4caf329a4187b5c35ceca28b1

diff --git a/net-im/mu-conference/files/mu-conference-0.7.init b/net-im/mu-conference/files/mu-conference-0.7.init
deleted file mode 100644
index a41c470cc81..00000000000
--- a/net-im/mu-conference/files/mu-conference-0.7.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-	use jabber-server
-}
-
-start() {
-	ebegin "Starting MUC Jabber Transport"
-	start-stop-daemon \
-		--background \
-		--start  \
-		--user jabber:jabber \
-		--exec /usr/bin/mu-conference \
-		-- -c /etc/jabber/mu-conference.xml
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping MUC Jabber Transport"
-	start-stop-daemon \
-		--stop \
-		--pidfile /var/run/jabber/mu-conference.pid
-	eend $?
-}

diff --git a/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch b/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch
deleted file mode 100644
index 2764daa1054..00000000000
--- a/net-im/mu-conference/files/mu-conference-0.8.81-sha1_64bit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mu-conference-0.8.81/include/lib.h
-+++ mu-conference-0.8.81/include/lib.h
-@@ -114,13 +114,6 @@
- /* SHA calculations                                          */
- /*                                                           */
- /* --------------------------------------------------------- */
--#if (SIZEOF_INT == 4)
--typedef unsigned int uint32;
--#elif (SIZEOF_SHORT == 4)
--typedef unsigned short uint32;
--#else
--typedef unsigned int uint32;
--#endif /* HAVEUINT32 */
- 
- char *shahash(char *str);	/* NOT THREAD SAFE */
- void shahash_r(const char* str, char hashbuf[40]); /* USE ME */
-@@ -301,10 +294,10 @@
- 
- 
- typedef struct {
--  uint32_t H[5];
--  uint32_t W[80];
-+  guint32 H[5];
-+  guint32 W[80];
-   int lenW;
--  uint32_t sizeHi,sizeLo;
-+  guint32 sizeHi,sizeLo;
- } j_SHA_CTX;
- 
- 
- 

diff --git a/net-im/mu-conference/metadata.xml b/net-im/mu-conference/metadata.xml
deleted file mode 100644
index e3c243e00aa..00000000000
--- a/net-im/mu-conference/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Multi User Conference for Jabber</longdescription>
-</pkgmetadata>

diff --git a/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild b/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild
deleted file mode 100644
index ed5e3ea48f7..00000000000
--- a/net-im/mu-conference/mu-conference-0.8.81-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Multi-User Chat for jabberd"
-HOMEPAGE="https://gna.org/projects/mu-conference/"
-SRC_URI="http://download.gna.org/mu-conference/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="mysql"
-
-RDEPEND="
-	dev-libs/expat
-	>=dev-libs/glib-2:2
-	net-dns/libidn
-	net-im/jabberd2
-	mysql? ( virtual/mysql )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# http://gna.org/bugs/?16238
-	"${FILESDIR}"/${P}-sha1_64bit.patch
-)
-
-src_prepare() {
-	# Fix missing header in src/conference_user.c in order to
-	# make emerge happy and avoid QA notice.
-	sed -i -e "/conference.h/ i #define _XOPEN_SOURCE" src/conference_user.c || die
-
-	if use mysql; then
-		sed -i -e '/^CFLAGS/ a CFLAGS:=$(CFLAGS) -DHAVE_MYSQL' \
-			-e '/^LIBS/ a LIBS:=$(LIBS) `mysql_config --libs`' src/Makefile || die
-	fi
-		sed -i -e 's/^CC:=/CC?=/' -e 's/$(MCFLAGS)/$(MCFLAGS) $(LDFLAGS)/'\
-			-e 's/LDFLAGS:=-L./LDFLAGS:=$(LDFLAGS) -L./'\
-			-e 's/$(LDFLAGS) $(LIBS)/$(LIBS)/' src/Makefile || die
-		sed -i -e 's/-O2//' src/{,jabberd,jcomp}/Makefile || die
-		sed -i -e 's/CC=/CC?=/' src/{jabberd,jcomp}/Makefile || die
-		sed -i -e 's/ar/$(AR)/' -e 's/ranlib/$(RANLIB)/' src/jabberd/Makefile || die
-		sed -i -e 's/gcc -g/$(CC) -g/' src/jcomp/Makefile || die
-	tc-export CC AR RANLIB
-
-	default
-}
-
-src_install() {
-	dobin src/mu-conference
-	fowners jabber:jabber /usr/bin/mu-conference
-	fperms 750 /usr/bin/mu-conference
-
-	newinitd "${FILESDIR}/${PN}"-0.7.init mu-conference
-
-	dodoc ChangeLog FAQ mu-conference.sql README README.sql
-	docinto scripts
-	dodoc scripts/*
-
-	local i
-	for i in log spool; do
-		dodir /var/${i}/jabber/mu-conference
-		keepdir /var/${i}/jabber/mu-conference
-		fowners jabber:jabber /var/${i}/jabber/mu-conference
-		fperms 770 /var/${i}/jabber/mu-conference
-	done
-
-	insinto /etc/jabber
-	newins muc-default.xml mu-conference.xml
-	doins style.css
-
-	sed -i \
-		-e 's,./spool/chat.localhost,/var/spool/jabber/mu-conference,g' \
-		-e 's,./syslogs,/var/log/jabber,g' \
-		-e 's,./logs,/var/log/jabber/mu-conference,g' \
-		-e 's,./mu-conference.pid,/var/run/jabber/mu-conference.pid,g' \
-		-e "s,../style.css,/etc/jabber/style.css,g" \
-		-e "s,7009,5347,g" \
-		"${D}"/etc/jabber/mu-conference.xml || die "sed failed"
-}
-
-pkg_postinst() {
-	echo
-	elog "For jabberd-2 connection:"
-	elog "1. Make sure that the ip and port in /etc/jabber/mu-conference.xml"
-	elog "   match the address of your jabberd router."
-	elog "2. Set a common secret in mu-conference.xml and router.xml"
-	echo
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-03-03 17:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-02 22:24 [gentoo-commits] repo/gentoo:master commit in: net-im/mu-conference/, net-im/mu-conference/files/ Austin English
  -- strict thread matches above, loose matches on Subject: below --
2016-08-25 16:34 Pacho Ramos
2016-08-25 16:34 Pacho Ramos
2018-03-03 17:16 Thomas Deutschmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox