New version with non-root support.

(Portage version: 2.0.51.22-r2)

7 files changed, 144 insertions, 8 deletions

diff --git a/net-im/openmcu/ChangeLog b/net-im/openmcu/ChangeLog
index b2257c620980..237826f89c2e 100644
--- a/net-im/openmcu/ChangeLog
+++ b/net-im/openmcu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/openmcu
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/ChangeLog,v 1.6 2004/09/06 18:59:44 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/ChangeLog,v 1.7 2005/08/28 00:26:04 stkn Exp $
+
+*openmcu-2.1.0 (28 Aug 2005)
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/openmcu-2.1.0-gentoo.diff, files/openmcu.confd, +files/openmcu.ini,
+  files/openmcu.rc6, +openmcu-2.1.0.ebuild:
+  New version, changed openmcu init script to use a non-root user.
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> openmcu-1.1.7.ebuild:
   Switch to use epause and ebeep, bug #62950
diff --git a/net-im/openmcu/files/digest-openmcu-2.1.0 b/net-im/openmcu/files/digest-openmcu-2.1.0
new file mode 100644
index 000000000000..c6f255d29133
--- /dev/null
+++ b/net-im/openmcu/files/digest-openmcu-2.1.0
@@ -0,0 +1 @@
+MD5 6ff8580ba1b0635632392ad06f04fa60 openmcu-v2_1_0-src-tar.gz 78411
diff --git a/net-im/openmcu/files/openmcu-2.1.0-gentoo.diff b/net-im/openmcu/files/openmcu-2.1.0-gentoo.diff
new file mode 100644
index 000000000000..f8f8a150371e
--- /dev/null
+++ b/net-im/openmcu/files/openmcu-2.1.0-gentoo.diff
@@ -0,0 +1,39 @@
+--- openmcu_v2_1_0/main.cxx.orig	2005-08-25 22:21:01.000000000 +0000
++++ openmcu_v2_1_0/main.cxx	2005-08-25 22:22:45.000000000 +0000
+@@ -114,12 +114,12 @@
+ static const char HTTPCertificateFileKey[]  = "HTTP Certificate";
+ #endif
+ 
+-static const char DefaultCallLogFilename[] = "mcu_log.txt"; 
++static const char DefaultCallLogFilename[] = "/var/log/openmcu/mcu_log.txt"; 
+ static const char DefaultRoom[]            = "room101";
+ 
+-static const char DefaultConnectingWAVFile[] = "connecting.wav";
+-static const char DefaultEnteringWAVFile[]   = "entering.wav";
+-static const char DefaultLeavingWAVFile[]    = "leaving.wav";
++static const char DefaultConnectingWAVFile[] = "/usr/share/openmcu/sounds/connecting.wav";
++static const char DefaultEnteringWAVFile[]   = "/usr/share/openmcu/sounds/entering.wav";
++static const char DefaultLeavingWAVFile[]    = "/usr/share/openmcu/sounds/leaving.wav";
+ 
+ static const char * GKModeLabels[] = { 
+    "No gatekeeper", 
+@@ -182,8 +182,8 @@
+ #endif
+   exeDir.Change();
+ 
+-  httpNameSpace.AddResource(new PHTTPDirectory("data", "data"));
+-  httpNameSpace.AddResource(new PServiceHTTPDirectory("html", "html"));
++  httpNameSpace.AddResource(new PHTTPDirectory("data", "/usr/share/openmcu/data"));
++  httpNameSpace.AddResource(new PServiceHTTPDirectory("html", "/usr/share/openmcu/html"));
+ 
+   endpoint = new MyH323EndPoint();
+ 
+@@ -253,7 +253,7 @@
+ 
+ #if P_SSL
+   // SSL certificate file.
+-  PString certificateFile = cfg.GetString(HTTPCertificateFileKey, "server.pem");
++  PString certificateFile = cfg.GetString(HTTPCertificateFileKey, "/etc/openmcu/server.pem");
+   rsrc->Add(new PHTTPStringField(HTTPCertificateFileKey, 25, certificateFile));
+   if (!SetServerCertificate(certificateFile, TRUE)) {
+     PSYSTEMLOG(Fatal, "BMAC\tCould not load certificate \"" << certificateFile << '"');
diff --git a/net-im/openmcu/files/openmcu.confd b/net-im/openmcu/files/openmcu.confd
index cc28fff9e2f8..5330242d4b38 100644
--- a/net-im/openmcu/files/openmcu.confd
+++ b/net-im/openmcu/files/openmcu.confd
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/files/openmcu.confd,v 1.3 2004/07/14 23:45:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/files/openmcu.confd,v 1.4 2005/08/28 00:26:04 stkn Exp $
 
-OPTIONS="--disable-menu"
+OPTIONS="-u openmcu -g openmcu"
diff --git a/net-im/openmcu/files/openmcu.ini b/net-im/openmcu/files/openmcu.ini
new file mode 100644
index 000000000000..7dbdac551989
--- /dev/null
+++ b/net-im/openmcu/files/openmcu.ini
@@ -0,0 +1,13 @@
+[Parameters]
+Password=i9Vp7LN+X5Y=
+Log Level=2
+HTTP Certificate=/etc/openmcu/server.pem
+HTTP Port=1420
+Gatekeeper Mode=No gatekeeper
+Interface Array Size=0
+Default room=room101
+Connecting WAV File=/usr/share/openmcu/sounds/connecting.wav
+Entering WAV File=/usr/share/openmcu/sounds/entering.wav
+Leaving WAV File=/usr/share/openmcu/sounds/leaving.wav
+Call log filename=/var/log/openmcu/mcu_log.txt
+
diff --git a/net-im/openmcu/files/openmcu.rc6 b/net-im/openmcu/files/openmcu.rc6
index 12da491fb32b..c9912edd40bc 100644
--- a/net-im/openmcu/files/openmcu.rc6
+++ b/net-im/openmcu/files/openmcu.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/files/openmcu.rc6,v 1.3 2004/07/14 23:45:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/files/openmcu.rc6,v 1.4 2005/08/28 00:26:04 stkn Exp $
 
 depend() {
 	need net
@@ -9,13 +9,13 @@ depend() {
 
 start() {
 	ebegin "Starting H.323 Conferencing service"
-	start-stop-daemon --start --quiet --pidfile /var/run/openmcu.pid \
-		-b -m --exec /usr/sbin/openmcu -- ${OPTIONS}
+	start-stop-daemon --start --quiet --pidfile /var/run/openmcu/openmcu.pid \
+		--exec /usr/sbin/openmcu -- ${OPTIONS} -d -p /var/run/openmcu/openmcu.pid -i /etc/openmcu/openmcu.ini
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping H.323 Conferencing service"
-	start-stop-daemon --stop --quiet --pidfile /var/run/openmcu.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/openmcu/openmcu.pid
 	eend $?
 }
diff --git a/net-im/openmcu/openmcu-2.1.0.ebuild b/net-im/openmcu/openmcu-2.1.0.ebuild
new file mode 100644
index 000000000000..f7c2baf1f624
--- /dev/null
+++ b/net-im/openmcu/openmcu-2.1.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/openmcu-2.1.0.ebuild,v 1.1 2005/08/28 00:26:04 stkn Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="H.323 conferencing server"
+HOMEPAGE="http://openh323.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openh323/${PN}-v${PV//./_}-src-tar.gz"
+
+S=${WORKDIR}/${PN}_v${PV//./_}
+
+SLOT="0"
+KEYWORDS="~x86"
+LICENSE="MPL-1.0"
+
+DEPEND=">=net-libs/openh323-1.15.2"
+
+src_unpack() {
+	tar -xzf ${DISTDIR}/${A} -C ${WORKDIR} || die "Unpacking failed"
+
+	# change locations of various files
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+src_compile() {
+
+	CFLAGS="${CFLAGS}" \
+	PWLIBDIR=/usr/share/pwlib \
+	OPENH323DIR=/usr/share/openh323 \
+	emake opt || die
+}
+
+src_install() {
+	dosbin obj_*_*_r/openmcu
+	keepdir /var/log/openmcu
+	keepdir /var/run/openmcu
+
+	for x in data html; do
+		keepdir /usr/share/openmcu/$x
+	done
+
+	insinto /usr/share/openmcu/sounds
+	doins *.wav
+
+	insinto /etc/openmcu
+	doins server.pem
+	doins ${FILESDIR}/openmcu.ini
+
+	doman openmcu.1
+	dodoc ChangeLog ReadMe.txt mpl-1.0.htm
+
+	newinitd ${FILESDIR}/openmcu.rc6 openmcu
+	newconfd ${FILESDIR}/openmcu.confd openmcu
+}
+
+pkg_preinst() {
+	enewgroup openmcu
+	enewuser openmcu -1 -1 /dev/null openmcu
+}
+
+pkg_postinst() {
+	einfo "Setting permissions..."
+	chown -R openmcu:openmcu ${ROOT}etc/openmcu
+	chmod -R u=rwX,g=rX,o=	 ${ROOT}etc/openmcu
+
+	chown -R openmcu:openmcu ${ROOT}var/{log,run}/openmcu
+	chmod -R u=rwX,g=rX,o=	 ${ROOT}var/{log,run}/openmcu
+
+	echo
+	einfo "This patched version of openmcu stores it's configuration"
+	einfo "in \"/etc/openmcu/openmcu.ini\""
+}