Hello community,
here is the log from the commit of package bayonne2 for openSUSE:Factory checked in at 2012-06-07 15:37:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bayonne2 (Old)
and /work/SRC/openSUSE:Factory/.bayonne2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bayonne2", Maintainer is "kkeil@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bayonne2/bayonne2.changes 2011-12-12 16:56:17.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bayonne2.new/bayonne2.changes 2012-06-07 15:37:25.000000000 +0200
@@ -1,0 +2,22 @@
+Mon Jun 4 08:51:06 UTC 2012 - idonmez@suse.com
+
+- Fix requires
+
+-------------------------------------------------------------------
+Thu May 31 12:11:24 UTC 2012 - jengelh@inai.de
+
+- Adhere to shlib packaging policy
+
+-------------------------------------------------------------------
+Wed Feb 22 18:10:32 UTC 2012 - kkeil@linux-pingi.de
+
+- update to version 2.3.2. Added the following:
+* service keyword to bind scripts to xmlrpc services
+* pending completion handlers in xmlrpc to allow services to
+ start and run and return response on completion
+* xmlrpc server services to locate service binding and return keymap
+* reorg of exit reason string to use %script.error if no reason set
+* restructure of session xmlrpc service/session creation around
+ service binding keyword and completion handling
+
+-------------------------------------------------------------------
Old:
----
bayonne2-1.5.19-const_char.dif
bayonne2-1.5.19.dif
bayonne2-1.5.19.tar.bz2
New:
----
bayonne2-2.3.2.tar.bz2
bayonne2-const_char.patch
bayonne2-opensuse.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bayonne2.spec ++++++
--- /var/tmp/diff_new_pack.5KB1tA/_old 2012-06-07 15:37:28.000000000 +0200
+++ /var/tmp/diff_new_pack.5KB1tA/_new 2012-06-07 15:37:28.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bayonne2
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: bayonne2
+%define lname libbayonne-2_3-0
+# plugins to libbayonne or so:
+%define ldname libbayonne-2_3
+Version: 2.3.2
+Release: 0
+Summary: The telephony server of the GNU project
+License: GPL-2.0+
+Group: Productivity/Telephony/Servers
+Url: http://gnu.org/software/bayonne
+Source0: %{name}-%{version}.tar.bz2
+Patch0: %{name}-opensuse.patch
+Patch1: bayonne2-const_char.patch
BuildRequires: SDL-devel
BuildRequires: ccaudio2-devel
BuildRequires: ccrtp-devel
@@ -36,46 +49,52 @@
BuildRequires: capi4linux
BuildRequires: capi4linux-devel
%endif
-Version: 1.5.19
-Release: 0
-Summary: the telephony server of the GNU project
-License: GPL-2.0+
-Group: Productivity/Telephony/Servers
-Url: http://www.gnu.org/software/bayonne
-Source0: %{name}-%{version}.tar.bz2
-Patch0: %{name}-%{version}.dif
-Patch1: bayonne2-1.5.19-const_char.dif
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq
PreReq: %insserv_prereq
Recommends: cron
Recommends: logrotate
-Provides: bayonne
-Obsoletes: bayonne
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Bayonne offers a script programmable modular server for deploying
multi-line telephony voice response and computer telephony
applications.
+%package -n %lname
+Summary: The telephony server of the GNU project
+Group: System/Libraries
+Requires: %ldname = %version
+
+%description -n %lname
+Bayonne offers a script programmable modular server for deploying
+multi-line telephony voice response and computer telephony
+applications.
+
+%package -n %ldname
+Summary: The telephony server of the GNU project
+Group: System/Libraries
+
+%description -n %ldname
+Bayonne offers a script programmable modular server for deploying
+multi-line telephony voice response and computer telephony
+applications.
+
%package devel
-Summary: the telephony server of the GNU project
+Summary: The telephony server of the GNU project
Group: Development/Libraries/Other
-Requires: %{name} = %{version}
+Requires: %lname = %version
Requires: ccaudio2-devel
Requires: ccscript3-devel
-Provides: bayonne-devel
-Obsoletes: bayonne-devel
%description devel
-the telephony server of the GNU project
+This package provides header and support files for building
+additional applications for bayonne.
+The telephony server of the GNU project
%package UsEng
-Summary: voice library for US English Male speaker
+Summary: Voice library for US English Male speaker
Group: Productivity/Telephony/Servers
Requires: %{name} = %{version}
-Provides: bayonne-UsEng
-Obsoletes: bayonne-UsEng
%description UsEng
The US English speaker library offers default voice prompts for the
@@ -83,12 +102,11 @@
%prep
%setup -q
-%patch0
-%patch1
+%patch0 -p1
+%patch1 -p1
%build
autoreconf --force --install
-CXXFLAGS="%{optflags}" \
%configure --with-pic \
--disable-static \
--libexecdir=%{_datadir}/bayonne/exec \
@@ -107,17 +125,19 @@
%stop_on_removal bayonne
%post
-/sbin/ldconfig
%{fillup_and_insserv bayonne}
%postun
-/sbin/ldconfig
%restart_on_update bayonne
%{insserv_cleanup}
+%post -n %lname -p /sbin/ldconfig
+
+%postun -n %lname -p /sbin/ldconfig
+
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING README
+%doc AUTHORS README
%dir %{_sysconfdir}/bayonne
%config(noreplace) %{_sysconfdir}/bayonne/*.conf
%config %{_sysconfdir}/logrotate.d/bayonne
@@ -133,12 +153,20 @@
%{_bindir}/btsmusic
%{_bindir}/ttstool
%{_datadir}/bayonne/
-%{_libdir}/libbayonne*.so.*
-%{_libdir}/bayonne-1.5/
%{_mandir}/man1/*.1*
+%files -n %lname
+%defattr(-,root,root)
+%doc COPYING
+%{_libdir}/libbayonne-2.3.so.0*
+
+%files -n %ldname
+%defattr(-,root,root)
+%{_libdir}/bayonne-2.3
+
%files devel
%defattr(-,root,root)
+%dir %{_includedir}/cc++/
%{_includedir}/cc++/*.h
%{_libdir}/libbayonne.so
%{_libdir}/pkgconfig/libbayonne.pc
@@ -146,6 +174,9 @@
%files UsEng
%defattr(-,root,root)
-%{_datadir}/phrasebook/
+%dir %{_datadir}/phrasebook
+%dir %{_datadir}/phrasebook/none
+%dir %{_datadir}/phrasebook/none/prompts
+%{_datadir}/phrasebook/none/prompts/*
%changelog
++++++ bayonne2-1.5.19.tar.bz2 -> bayonne2-2.3.2.tar.bz2 ++++++
++++ 28312 lines of diff (skipped)
++++++ bayonne2-const_char.patch ++++++
#! /bin/sh /usr/share/dpatch/dpatch-run
## gcc-4.4.dpatch by >
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
Index: bayonne2-2.3.2/binders/bayonnexml/image.cpp
===================================================================
--- bayonne2-2.3.2.orig/binders/bayonnexml/image.cpp
+++ bayonne2-2.3.2/binders/bayonnexml/image.cpp
@@ -88,11 +88,11 @@ unsigned ParseImage::getList(const char
return count;
}
-const char *ParseImage::dupString(const char *text)
+char *ParseImage::dupString(const char *text)
{
char *str = (char *)alloc(strlen(text) + 1);
strcpy(str, text);
- return (const char *)str;
+ return str;
}
void ParseImage::postCompile(Compile *cc, unsigned long mask)
Index: bayonne2-2.3.2/binders/bayonnexml/module.h
===================================================================
--- bayonne2-2.3.2.orig/binders/bayonnexml/module.h
+++ bayonne2-2.3.2/binders/bayonnexml/module.h
@@ -57,7 +57,7 @@ class ParseImage : public ScriptImage, p
public:
ParseImage();
- const char *dupString(const char *str);
+ char *dupString(const char *str);
unsigned getList(const char **args, const char *text, unsigned len, unsigned max);
void getCompile(Compile *cc, const char *name = "1");
void postCompile(Compile *cc, unsigned long mask = 0);
Index: bayonne2-2.3.2/binders/bayonnexml/parse.cpp
===================================================================
--- bayonne2-2.3.2.orig/binders/bayonnexml/parse.cpp
+++ bayonne2-2.3.2/binders/bayonnexml/parse.cpp
@@ -151,7 +151,7 @@ void ParseThread::characters(const unsig
void ParseThread::startDocument(const char **attrib)
{
const char *vargs[3];
- const char *voicelib = NULL;
+ char *voicelib = NULL;
char *p;
memset(vargs, 0, sizeof(vargs));
@@ -628,8 +628,8 @@ void ParseThread::playAudio(const char *
void ParseThread::doGoto(const char **attrib)
{
const char *submit = NULL;
- const char *value = NULL;
- const char *label = NULL;
+ char *value = NULL;
+ char *label = NULL;
const char *args[10];
unsigned argc = 0;
char *p, *q;
@@ -787,7 +787,7 @@ void ParseThread::startBlock(const char
void ParseThread::endBlock(void)
{
char *p, *q;
- const char *label;
+ char *label;
const char *args[10];
current->trap = 0;
@@ -807,7 +807,7 @@ void ParseThread::endBlock(void)
else
{
label = NULL;
- p = strchr(bnext, '#');
+ p = const_cast(strchr(bnext, '#'));
if(p)
{
*p = 0;
Index: bayonne2-2.3.2/binders/ivrscript/binder.cpp
===================================================================
--- bayonne2-2.3.2.orig/binders/ivrscript/binder.cpp
+++ bayonne2-2.3.2/binders/ivrscript/binder.cpp
@@ -427,7 +427,7 @@ bool Binder::testRegistered(ScriptInterp
char *p;
setString(vbuf, sizeof(vbuf), v);
- p = strchr(v, ':');
+ p = const_cast(strchr(v, ':'));
if(p)
{
*p = 0;
@@ -449,7 +449,7 @@ bool Binder::testExternal(ScriptInterp *
char *p;
setString(vbuf, sizeof(vbuf), v);
- p = strchr(v, ':');
+ p = const_cast(strchr(v, ':'));
if(p)
{
*p = 0;
@@ -471,7 +471,7 @@ bool Binder::testAvailable(ScriptInterp
char *p;
setString(vbuf, sizeof(vbuf), v);
- p = strchr(v, ':');
+ p = const_cast(strchr(v, ':'));
if(p)
{
*p = 0;
@@ -505,7 +505,7 @@ bool Binder::testReachable(ScriptInterp
char *p;
setString(vbuf, sizeof(vbuf), v);
- p = strchr(v, ':');
+ p = const_cast(strchr(v, ':'));
if(p)
{
*p = 0;
Index: bayonne2-2.3.2/engine/sysexec.cpp
===================================================================
--- bayonne2-2.3.2.orig/engine/sysexec.cpp
+++ bayonne2-2.3.2/engine/sysexec.cpp
@@ -322,8 +322,9 @@ exit:
void BayonneTSession::sysTone(const char *tsid, char *tok)
{
Event event;
- const char *loc, *tone, *cp;
+ const char *loc, *cp;
char *p;
+ char *tone;
timeout_t timeout = TIMEOUT_INF;
Audio::Level level = 26000;
TelTone::tonekey_t *key;
Index: bayonne2-2.3.2/modules/sip/driver.cpp
===================================================================
--- bayonne2-2.3.2.orig/modules/sip/driver.cpp
+++ bayonne2-2.3.2/modules/sip/driver.cpp
@@ -2016,7 +2016,7 @@ add:
}
while(gateways)
{
- p = strrchr(gateways, ':');
+ p = const_cast(strrchr(gateways, ':'));
if(p && !stricmp(p, ":5060"))
*p = 0;
Index: bayonne2-2.3.2/modules/webservice/session.cpp
===================================================================
--- bayonne2-2.3.2.orig/modules/webservice/session.cpp
+++ bayonne2-2.3.2/modules/webservice/session.cpp
@@ -297,7 +297,7 @@ timeout:
req_query = NULL;
req_auth = NULL;
if(req_path)
- tok = strchr(req_path, '?');
+ tok = const_cast(strchr(req_path, '?'));
else
tok = NULL;
if(tok)
@@ -335,9 +335,9 @@ timeout:
cp = buffer + 11;
while(isspace(*cp))
++cp;
- tok = strrchr(cp, '\r');
+ tok = const_cast(strrchr(cp, '\r'));
if(!tok)
- tok = strrchr(cp, '\n');
+ tok = const_cast(strrchr(cp, '\n'));
if(tok)
*tok = 0;
setString(agent, sizeof(agent), cp);
++++++ bayonne2-opensuse.patch ++++++
Index: bayonne2-2.3.2/config/bayonne.init.in
===================================================================
--- bayonne2-2.3.2.orig/config/bayonne.init.in
+++ bayonne2-2.3.2/config/bayonne.init.in
@@ -15,6 +15,17 @@
# chkconfig: 2345 98 10
# description: Bayonne is the telephony server of the GNU \
# project and offers interactive voice response.
+#
+# For LSB compatibility:
+#
+### BEGIN INIT INFO
+# Provides: bayonne
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
+# Default-Start: 3 5
+# Default-Stop: 0 1 2 6
+# Description: Bayonne is the telephony server of the GNU project and offers interactive voice response.
+### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON="@config_sbindir@/bayonne"
@@ -33,6 +44,7 @@ test -x $DAEMON || exit 0
DAEMON_OPTS="-p"
set -e
+. /etc/rc.status
if test -f /etc/sysconfig/bayonne ; then
source /etc/sysconfig/bayonne
@@ -70,7 +82,9 @@ case "$1" in
DAEMON_PRELOAD=""
if test -f /usr/dialogic/lib/libgc.so ; then
- DAEMON_PRELOAD=/usr/lib/libLiS.so:/usr/dialogic/lib/libgc.so:/usr/dialogic/lib/libdevmap.so
+ DAEMON_PRELOAD=/usr/lib64/libLiS.so:/usr/lib/libLiS.so:/usr/dialogic/lib/libgc.so:/usr/dialogic/lib/libdevmap.so
+ elif test -f /usr/lib64/libLiS.so ; then
+ DAEMON_PRELOAD=/usr/lib64/libLiS.so
elif test -f /usr/lib/libLiS.so ; then
DAEMON_PRELOAD=/usr/lib/libLiS.so
fi
@@ -87,49 +101,101 @@ case "$1" in
export LD_PRELOAD
fi
- if test -p $FIFO ; then
- echo "already started"
- exit -1
- fi
-
-
if test ! -z "$OPTIONS" ; then
DAEMON_OPTS="$OPTIONS" ; fi
- $DAEMON $DAEMON_OPTS
- echo "$NAME."
+ startproc $DAEMON $DAEMON_OPTS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/bayonne
+ echo
+
+ # Remember status and be verbose
+ rc_status -v
;;
stop)
- if test ! -p $FIFO ; then
- exit 0 ; fi
+ echo -n "Shutting down service bayonne: "
+ ## Stop daemon with killproc(8) and if this fails
+ ## set echo the echo return value.
+
+ killproc -TERM $bayonne_BIN
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/bayonne
- echo -n "Stopping $DESC: "
- echo "down" >$FIFO
- echo "$NAME."
+ # Remember status and be verbose
+ rc_status -v
+ ;;
+ restart)
+ ## Stop the service and regardless of whether it was
+ ## running or not, start it again.
+ $0 stop
+ $0 start
+
+ # Remember status and be quiet
+ rc_status
+ ;;
+ force-reload)
+ ## Signal the daemon to reload its config. Most daemons
+ ## do this on signal 1 (SIGHUP).
+ ## If it does not support it, restart.
+
+ echo -n "Reload service bayonne"
+ ## if it supports it:
+ killproc -HUP $bayonne_BIN
+ #touch /var/run/bayonne.pid
+ rc_status -v
+
+ ## Otherwise:
+ #$0 stop && $0 start
+ #rc_status
;;
reload)
- if test ! -p $FIFO ; then
- exit 0 ; fi
- echo -n "Reloading $DESC: "
- echo "reload" >$FIFO
- echo "$NAME."
- ;;
- restart|force-reload)
- #
- # If the "reload" option is implemented, move the "force-reload"
- # option to the "reload" entry above. If not, "force-reload" is
- # just the same as "restart".
- #
- echo -n "Restarting $DESC: "
- start-stop-daemon --stop --quiet --exec $DAEMON
- sleep 3
- start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMON_OPTS
- echo "$NAME."
+ ## Like force-reload, but if daemon does not support
+ ## signalling, do nothing (!)
+
+ # If it supports signalling:
+ echo -n "Reload service bayonne"
+ killproc -HUP $bayonne_BIN
+ #touch /var/run/bayonne.pid
+ rc_status -v
+
+ ## Otherwise if it does not support reload:
+ #rc_failed 3
+ #rc_status -v
+ ;;
+ try-restart)
+ ## Stop the service and if this succeeds (i.e. the
+ ## service was running before), start it again.
+ ## Note: try-restart is not (yet) part of LSB (as of 0.7.5)
+ $0 status >/dev/null && $0 restart
+
+ # Remember status and be quiet
+ rc_status
+ ;;
+ status)
+ echo -n "Checking for bayonne: "
+ ## Check status with checkproc(8), if process is running
+ ## checkproc will return with exit status 0.
+
+ # Status has a slightly different for the status command:
+ # 0 - service running
+ # 1 - service dead, but /var/run/ pid file exists
+ # 2 - service dead, but /var/lock/ lock file exists
+ # 3 - service not running
+
+ # NOTE: checkproc returns LSB compliant status values.
+ checkproc $bayonne_BIN
+ rc_status -v
+ ;;
+ probe)
+ ## Optional: Probe for the necessity of a reload,
+ ## give out the argument which is required for a reload.
+
+ test /etc/bayonne.conf -nt /var/run/bayonne.pid && echo reload
;;
*)
N=/etc/init.d/$NAME
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
;;
esac
Index: bayonne2-2.3.2/server/Makefile.am
===================================================================
--- bayonne2-2.3.2.orig/server/Makefile.am
+++ bayonne2-2.3.2/server/Makefile.am
@@ -14,7 +14,6 @@ EXTRA_DIST=bayonne.1 *.bat
INCLUDES = -I$(top_srcdir)/engine
noinst_HEADERS = server.h
-man1_MANS = bayonne.1
man_MANS = bayonne.1
bayonnedir=@module_libdir@
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org