[PATCH] Matahari broker initialization
by Adam Stokes
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.conf 2010-09-20 12:30:08.917687071 -0400
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Configuration file for qpidd. Entries are of the form:
+# name=value
+#
+# (Note: no spaces on either side of '='). Using default settings:
+# "qpidd --help" or "man qpidd" for more details.
+cluster-mechanism=ANONYMOUS
+auth=no
+port=5672
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.init 2010-09-20 13:08:18.811812330 -0400
@@ -0,0 +1,104 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# matahari-broker Startup script for the Qpid messaging daemon.
+#
+
+### BEGIN INIT INFO
+# Provides: matahari-broker
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start or stop qpidd
+# Description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+### END INIT INFO
+
+# chkconfig: - 85 15
+# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+# processname: qpidd
+
+prog=qpidd
+lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/qpidd.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/matahari-broker ] ; then
+ . /etc/sysconfig/matahari-broker
+fi
+
+RETVAL=0
+
+start() {
+ echo -n $"Starting Qpid AMQP daemon: "
+ daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch $lockfile
+ if [ $RETVAL = 0 ]; then
+ touch $pidfile
+ chown qpidd.qpidd $pidfile
+ [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
+ runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile"
+ fi
+ return $RETVAL
+}
+
+stop() {
+ echo -n $"Stopping Qpid AMQP daemon: "
+ killproc -p ${pidfile} $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+ echo 1>&2 $"$0: reload not supported"
+ exit 3
+}
+
+restart() {
+ stop
+ start
+}
+
+# See how we were called.
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ status $prog
+ RETVAL=$?
+ ;;
+ force-reload)
+ restart
+ ;;
+ try-restart|condrestart)
+ [ -e $lockfile ] && restart || :
+ ;;
+ *)
+ echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.sysconf 2010-09-20 12:16:20.111687831 -0400
@@ -0,0 +1 @@
+QPIDD_OPTIONS="--config /etc/matahari-broker.conf"
13 years, 7 months
[PATCH] CMake project update to replace var stubs
by Adam Stokes
---
CMakeLists.txt | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26f36a5..e854837 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,4 +16,6 @@ set(localstatedir "/var")
set(sysconfdir "/etc")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/matahari.init.in
${CMAKE_CURRENT_BINARY_DIR}/matahari.init)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/matahari-broker.init.in
+ ${CMAKE_CURRENT_BINARY_DIR}/matahari-broker.init)
--
1.7.2.3
13 years, 7 months
[PATCH 1/2] Matahari broker scripts
by Adam Stokes
---
matahari-broker.conf | 26 ++++++++++++
matahari-broker.init.in | 104 +++++++++++++++++++++++++++++++++++++++++++++++
matahari-broker.sysconf | 1 +
3 files changed, 131 insertions(+), 0 deletions(-)
create mode 100644 matahari-broker.conf
create mode 100755 matahari-broker.init.in
create mode 100644 matahari-broker.sysconf
diff --git a/matahari-broker.conf b/matahari-broker.conf
new file mode 100644
index 0000000..31ce360
--- /dev/null
+++ b/matahari-broker.conf
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Configuration file for qpidd. Entries are of the form:
+# name=value
+#
+# (Note: no spaces on either side of '='). Using default settings:
+# "qpidd --help" or "man qpidd" for more details.
+cluster-mechanism=ANONYMOUS
+auth=no
+port=49000
diff --git a/matahari-broker.init.in b/matahari-broker.init.in
new file mode 100755
index 0000000..6d50a7b
--- /dev/null
+++ b/matahari-broker.init.in
@@ -0,0 +1,104 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# matahari-broker Startup script for the Qpid messaging daemon.
+#
+
+### BEGIN INIT INFO
+# Provides: matahari-broker
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start or stop matahari broker
+# Description: Matahari Broker is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+### END INIT INFO
+
+# chkconfig: - 85 15
+# description: Matahari Broker is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+# processname: qpidd
+
+prog=qpidd
+lockfile=@localstatedir@/lock/subsys/matahari-broker
+pidfile=@localstatedir(a)/run/matahari-broker.pid
+
+# Source function library.
+. @sysconfdir(a)/rc.d/init.d/functions
+
+if [ -f @sysconfdir@/sysconfig/matahari-broker ] ; then
+ . @sysconfdir@/sysconfig/matahari-broker
+fi
+
+RETVAL=0
+
+start() {
+ echo -n $"Starting Matahari broker daemon: "
+ daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir @localstatedir@/run/qpidd --data-dir @localstatedir@/lib/qpidd $QPIDD_OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch $lockfile
+ if [ $RETVAL = 0 ]; then
+ touch $pidfile
+ chown qpidd.qpidd $pidfile
+ [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
+ runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir @localstatedir@/run/qpidd > $pidfile"
+ fi
+ return $RETVAL
+}
+
+stop() {
+ echo -n $"Stopping Matahari broker daemon: "
+ killproc -p ${pidfile} $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+ echo 1>&2 $"$0: reload not supported"
+ exit 3
+}
+
+restart() {
+ stop
+ start
+}
+
+# See how we were called.
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ status $prog
+ RETVAL=$?
+ ;;
+ force-reload)
+ restart
+ ;;
+ try-restart|condrestart)
+ [ -e $lockfile ] && restart || :
+ ;;
+ *)
+ echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
diff --git a/matahari-broker.sysconf b/matahari-broker.sysconf
new file mode 100644
index 0000000..765991f
--- /dev/null
+++ b/matahari-broker.sysconf
@@ -0,0 +1 @@
+QPIDD_OPTIONS="--config /etc/matahari-broker.conf"
\ No newline at end of file
--
1.7.2.3
13 years, 7 months
[PATCH] Revised Matahari broker initialization
by Adam Stokes
---
Revised patch to include suggested changes.
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.conf 2010-09-21 08:56:18.065687592 -0400
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Configuration file for qpidd. Entries are of the form:
+# name=value
+#
+# (Note: no spaces on either side of '='). Using default settings:
+# "qpidd --help" or "man qpidd" for more details.
+cluster-mechanism=ANONYMOUS
+auth=no
+port=49000
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.init 2010-09-21 08:52:54.397691905 -0400
@@ -0,0 +1,104 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# matahari-broker Startup script for the Qpid messaging daemon.
+#
+
+### BEGIN INIT INFO
+# Provides: matahari-broker
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start or stop matahari broker
+# Description: Matahari Broker is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+### END INIT INFO
+
+# chkconfig: - 85 15
+# description: Matahari Broker is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+# processname: qpidd
+
+prog=qpidd
+lockfile=/var/lock/subsys/matahari-broker
+pidfile=/var/run/matahari-broker.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/matahari-broker ] ; then
+ . /etc/sysconfig/matahari-broker
+fi
+
+RETVAL=0
+
+start() {
+ echo -n $"Starting Matahari broker daemon: "
+ daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch $lockfile
+ if [ $RETVAL = 0 ]; then
+ touch $pidfile
+ chown qpidd.qpidd $pidfile
+ [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
+ runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile"
+ fi
+ return $RETVAL
+}
+
+stop() {
+ echo -n $"Stopping Matahari broker daemon: "
+ killproc -p ${pidfile} $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+ echo 1>&2 $"$0: reload not supported"
+ exit 3
+}
+
+restart() {
+ stop
+ start
+}
+
+# See how we were called.
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ status $prog
+ RETVAL=$?
+ ;;
+ force-reload)
+ restart
+ ;;
+ try-restart|condrestart)
+ [ -e $lockfile ] && restart || :
+ ;;
+ *)
+ echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.sysconf 2010-09-20 12:16:20.111687831 -0400
@@ -0,0 +1 @@
+QPIDD_OPTIONS="--config /etc/matahari-broker.conf"
\ No newline at end of file
13 years, 7 months
[PATCH] Revised Matahari broker initialization
by Adam Stokes
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.conf 2010-09-20 12:30:08.917687071 -0400
@@ -0,0 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# Configuration file for qpidd. Entries are of the form:
+# name=value
+#
+# (Note: no spaces on either side of '='). Using default settings:
+# "qpidd --help" or "man qpidd" for more details.
+cluster-mechanism=ANONYMOUS
+auth=no
+port=5672
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.init 2010-09-20 13:08:18.811812330 -0400
@@ -0,0 +1,104 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+# matahari-broker Startup script for the Qpid messaging daemon.
+#
+
+### BEGIN INIT INFO
+# Provides: matahari-broker
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start or stop qpidd
+# Description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+### END INIT INFO
+
+# chkconfig: - 85 15
+# description: Qpidd is an AMQP broker. It receives, stores, routes and forwards messages using the AMQP protcol.
+# processname: qpidd
+
+prog=qpidd
+lockfile=/var/lock/subsys/$prog
+pidfile=/var/run/qpidd.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+if [ -f /etc/sysconfig/matahari-broker ] ; then
+ . /etc/sysconfig/matahari-broker
+fi
+
+RETVAL=0
+
+start() {
+ echo -n $"Starting Qpid AMQP daemon: "
+ daemon --pidfile $pidfile --check $prog --user qpidd /usr/sbin/$prog --daemon --pid-dir /var/run/qpidd --data-dir /var/lib/qpidd $QPIDD_OPTIONS
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch $lockfile
+ if [ $RETVAL = 0 ]; then
+ touch $pidfile
+ chown qpidd.qpidd $pidfile
+ [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
+ runuser -s /bin/sh qpidd -c "/usr/sbin/$prog --check --pid-dir /var/run/qpidd > $pidfile"
+ fi
+ return $RETVAL
+}
+
+stop() {
+ echo -n $"Stopping Qpid AMQP daemon: "
+ killproc -p ${pidfile} $prog
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
+}
+
+reload() {
+ echo 1>&2 $"$0: reload not supported"
+ exit 3
+}
+
+restart() {
+ stop
+ start
+}
+
+# See how we were called.
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ status $prog
+ RETVAL=$?
+ ;;
+ force-reload)
+ restart
+ ;;
+ try-restart|condrestart)
+ [ -e $lockfile ] && restart || :
+ ;;
+ *)
+ echo 1>&2 $"Usage: $0 {start|stop|restart|condrestart|status}"
+ exit 1
+esac
+
+exit $RETVAL
--- /dev/null 2010-09-15 08:09:25.434942591 -0400
+++ matahari-broker.sysconf 2010-09-20 12:16:20.111687831 -0400
@@ -0,0 +1 @@
+QPIDD_OPTIONS="--config /etc/matahari-broker.conf"
\ No newline at end of file
13 years, 7 months
[spot@fedoraproject.org: [matahari/f14/master] fix compile with recent gcc]
by Darryl L. Pierce
----- Forwarded message from Tom Callaway <spot(a)fedoraproject.org> -----
Date: Sun, 19 Sep 2010 23:31:03 +0000 (UTC)
From: Tom Callaway <spot(a)fedoraproject.org>
To: matahari-owner(a)fedoraproject.org, scm-commits(a)lists.fedoraproject.org
Subject: [matahari/f14/master] fix compile with recent gcc
Content-Type: text/plain; charset="utf-8"
Message-Id: <20100919233103.E244627699(a)pkgs01.phx2.fedoraproject.org>
commit a8470fb66155a5000dcceb3fc7e9dbebe31f9e00
Author: Tom "spot" Callaway <tcallawa(a)redhat.com>
Date: Mon Sep 20 01:30:53 2010 +0200
fix compile with recent gcc
matahari-0.0.5-gcc-fix.patch | 50 ++++++++++++++++++++++++++++++++++++++++++
matahari.spec | 16 +++++++++----
2 files changed, 61 insertions(+), 5 deletions(-)
---
diff --git a/matahari-0.0.5-gcc-fix.patch b/matahari-0.0.5-gcc-fix.patch
new file mode 100644
index 0000000..f342140
--- /dev/null
+++ b/matahari-0.0.5-gcc-fix.patch
@@ -0,0 +1,50 @@
+diff -up matahari-0.0.5/src/host.cpp.gcc matahari-0.0.5/src/host.cpp
+--- matahari-0.0.5/src/host.cpp.gcc 2010-09-20 01:08:26.476255002 +0200
++++ matahari-0.0.5/src/host.cpp 2010-09-20 01:08:33.928255002 +0200
+@@ -24,6 +24,7 @@
+ #include <stdexcept>
+
+ #include <cstdlib>
++#include <limits.h>
+ #include <unistd.h>
+
+ #include <libvirt/libvirt.h>
+diff -up matahari-0.0.5/src/main.cpp.gcc matahari-0.0.5/src/main.cpp
+--- matahari-0.0.5/src/main.cpp.gcc 2010-09-20 01:08:56.444254998 +0200
++++ matahari-0.0.5/src/main.cpp 2010-09-20 01:12:23.486255002 +0200
+@@ -22,12 +22,13 @@
+
+ #include <iostream>
+ #include <fstream>
+-#include <string>
++#include <cstring>
+ #include <vector>
+ #include <exception>
+
+ #include <signal.h>
+ #include <cstdlib>
++#include <cerrno>
+
+ #include <getopt.h>
+
+@@ -81,7 +82,7 @@ int do_main(int argc, char **argv)
+ char *service = NULL;
+ int port = 5672;
+
+- ConnectionSettings settings;
++ qpid::management::ConnectionSettings settings;
+ ManagementAgent *agent;
+ HostWrapper *hostWrapper;
+
+diff -up matahari-0.0.5/src/nic.cpp.gcc matahari-0.0.5/src/nic.cpp
+--- matahari-0.0.5/src/nic.cpp.gcc 2010-09-20 01:12:38.887255001 +0200
++++ matahari-0.0.5/src/nic.cpp 2010-09-20 01:12:44.412255003 +0200
+@@ -18,7 +18,7 @@
+ */
+
+ #include <iostream>
+-#include <string>
++#include <cstring>
+ #include <sstream>
+ #include <vector>
+ #include <stdexcept>
diff --git a/matahari.spec b/matahari.spec
index dc16c25..94e0eb5 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,12 +1,13 @@
Summary: Qpid QMF Agent for Ovirt Nodes
Name: matahari
Version: 0.0.5
-Release: 1%{?dist}
+Release: 3%{?dist}
Source: http://mcpierce.fedorapeople.org/sources/matahari-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
License: GPLv2
Group: Applications/System
URL: http://matahari.fedorahosted.org/
+Patch0: matahari-0.0.5-gcc-fix.patch
Requires: dbus >= 1.2.12
Requires: hal >= 0.5.12
@@ -28,15 +29,16 @@ BuildRequires: pcre-devel >= 7.8
Matahari provides a QMF Agent that can be used to control and manage
various pieces of functionality for an ovirt node, using the AMQP protocol.
-The Advanced Message Queuing Protocol (AMQP) is an open standard application
+The Advanced Message Queuing Protocol (AMQP) is an open standard application
layer protocol providing reliable transport of messages.
-QMF provides a modeling framework layer on top of qpid (which implements
+QMF provides a modeling framework layer on top of qpid (which implements
AMQP). This interface allows you to manage a host and its various components
as a set of objects with properties and methods.
%prep
%setup -q
+%patch0 -p1 -b .gcc
%build
%configure
@@ -76,10 +78,15 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
%doc AUTHORS COPYING
%changelog
+* Mon Sep 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.0.5-3
+- fix header and compiler issues in code which were preventing build
+
+* Mon Aug 16 2010 Darryl L. Pierce <dpierce(a)redhat.com> - 0.0.5-2
+- Rebuild for updated Qpid/WMF.
* Wed Jul 7 2010 Darryl L. Pierce <dpierce(a)redhat.com> - 0.0.5-1
- Rebuild for updated Qpid/QMF.
-- Resolves: rhbz602975 - Matahari messages are not accepted by current version of qpid in F13
+- Resolves: rhbz602975 - Matahari messages are not accepted by current version of qpid in F13
* Thu Oct 08 2009 Arjun Roy <arroy(a)redhat.com> - 0.0.4-7
- Refactored for new version of qpidc.
@@ -119,4 +126,3 @@ test "x%{buildroot}" != "x" && rm -rf %{buildroot}
* Tue Jun 23 2009 Arjun Roy <arroy(a)redhat.com> - 0.0.1-1
- Initial rpmspec packaging
-
----- End forwarded message -----
--
Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc.
Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/
13 years, 7 months
[PATCH] Setup expanded variables for creationg of init file
by Adam Stokes
---
CMakeLists.txt | 7 +++++
matahari.init | 74 ------------------------------------------------------
matahari.init.in | 6 ++--
3 files changed, 10 insertions(+), 77 deletions(-)
delete mode 100644 matahari.init
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45d774c..623704f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,3 +14,10 @@ include (CheckIncludeFiles)
check_include_files (string.h HAVE_STRING_H)
check_include_files (sys/ioctl.h HAVE_SYS_IOCTL_H)
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
+
+# Set some prefixes
+set(localstatedir "/var")
+set(sysconfdir "/etc")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/matahari.init.in
+ ${CMAKE_CURRENT_BINARY_DIR}/matahari.init)
+
diff --git a/matahari.init b/matahari.init
deleted file mode 100644
index cc73572..0000000
--- a/matahari.init
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# the following is chkconfig init header
-# matahari: host qmf agent
-# chkconfig: - 99 01
-# description: This is a daemon acts as a host qmf agent
-# processname: matahari-host
-# pidfile: /var/run/matahari.pid
-#
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-SERVICE=`basename "$0"`
-PROCESS=`echo $SERVICE | tr '-' '_'`
-RETVAL=0
-
-[ -f /etc/sysconfig/$SERVICE ] && . /etc/sysconfig/$SERVICE
-
-start() {
- echo -n $"Starting $SERVICE daemon: "
- daemon $PROCESS $MATAHARI_ARGS
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
-}
-
-stop() {
- echo -n $"Stopping $SERVICE daemon: "
-
- killproc $PROCESS
- RETVAL=$?
- echo
- if [ $RETVAL -eq 0 ]; then
- rm -f /var/lock/subsys/$SERVICE
- rm -f /var/run/$SERVICE.pid
- fi
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- echo -n $"Reloading $SERVICE configuration: "
-
- killproc $PROCESS -HUP
- RETVAL=$?
- echo
- return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
- start|stop|restart|reload)
- $1
- ;;
- status)
- status $PROCESS
- RETVAL=$?
- ;;
- force-reload)
- reload
- ;;
- condrestart|try-restart)
- [ -f /var/lock/subsys/$SERVICE ] && restart || :
- ;;
- *)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
- exit 1
- ;;
-esac
-exit $RETVAL
diff --git a/matahari.init.in b/matahari.init.in
index 1f6be49..1223416 100644
--- a/matahari.init.in
+++ b/matahari.init.in
@@ -11,8 +11,8 @@
# Source function library.
. @sysconfdir(a)/rc.d/init.d/functions
-SERVICE=matahari
-PROCESS=matahari
+SERVICE=`basename "$0"`
+PROCESS=`echo $SERVICE | tr '-' '_'`
RETVAL=0
@@ -23,7 +23,7 @@ start() {
daemon $PROCESS $MATAHARI_ARGS --daemon
RETVAL=$?
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+ [ $RETVAL -eq 0 ] && touch @localstatedir@/lock/subsys/$SERVICE
}
stop() {
--
1.7.2.3
13 years, 7 months
[PATCH 1/2] An updated sysvinit script for matahari-host agent
by Adam Stokes
---
matahari.init | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
create mode 100644 matahari.init
diff --git a/matahari.init b/matahari.init
new file mode 100644
index 0000000..bee1145
--- /dev/null
+++ b/matahari.init
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# the following is chkconfig init header
+# matahari-host: host qmf agent
+# chkconfig: - 99 01
+# description: This is a daemon acts as a host qmf agent
+# processname: matahari-host
+# pidfile: /var/run/matahari.pid
+#
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+SERVICE=matahari-host
+PROCESS=matahari-host
+
+RETVAL=0
+
+[ -f /etc/sysconfig/$SERVICE ] && . /etc/sysconfig/$SERVICE
+
+start() {
+ echo -n $"Starting $SERVICE daemon: "
+ daemon $PROCESS $MATAHARI_ARGS
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+}
+
+stop() {
+ echo -n $"Stopping $SERVICE daemon: "
+
+ killproc $PROCESS
+ RETVAL=$?
+ echo
+ if [ $RETVAL -eq 0 ]; then
+ rm -f /var/lock/subsys/$SERVICE
+ rm -f /var/run/$SERVICE.pid
+ fi
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ echo -n $"Reloading $SERVICE configuration: "
+
+ killproc $PROCESS -HUP
+ RETVAL=$?
+ echo
+ return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ status $PROCESS
+ RETVAL=$?
+ ;;
+ force-reload)
+ reload
+ ;;
+ condrestart|try-restart)
+ [ -f /var/lock/subsys/$SERVICE ] && restart || :
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ exit 1
+ ;;
+esac
+exit $RETVAL
--
1.7.2.3
13 years, 7 months
[PATCH] An updated sysvinit script for matahari-host agent
by Adam Stokes
---
matahari.init | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
create mode 100644 matahari.init
diff --git a/matahari.init b/matahari.init
new file mode 100644
index 0000000..bee1145
--- /dev/null
+++ b/matahari.init
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# the following is chkconfig init header
+# matahari-host: host qmf agent
+# chkconfig: - 99 01
+# description: This is a daemon acts as a host qmf agent
+# processname: matahari-host
+# pidfile: /var/run/matahari.pid
+#
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+SERVICE=matahari-host
+PROCESS=matahari-host
+
+RETVAL=0
+
+[ -f /etc/sysconfig/$SERVICE ] && . /etc/sysconfig/$SERVICE
+
+start() {
+ echo -n $"Starting $SERVICE daemon: "
+ daemon $PROCESS $MATAHARI_ARGS
+ RETVAL=$?
+ echo
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+}
+
+stop() {
+ echo -n $"Stopping $SERVICE daemon: "
+
+ killproc $PROCESS
+ RETVAL=$?
+ echo
+ if [ $RETVAL -eq 0 ]; then
+ rm -f /var/lock/subsys/$SERVICE
+ rm -f /var/run/$SERVICE.pid
+ fi
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ echo -n $"Reloading $SERVICE configuration: "
+
+ killproc $PROCESS -HUP
+ RETVAL=$?
+ echo
+ return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ status $PROCESS
+ RETVAL=$?
+ ;;
+ force-reload)
+ reload
+ ;;
+ condrestart|try-restart)
+ [ -f /var/lock/subsys/$SERVICE ] && restart || :
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ exit 1
+ ;;
+esac
+exit $RETVAL
--
1.7.2.2
13 years, 7 months