Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yate-bts for openSUSE:Factory
checked in at 2021-03-15 10:56:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yate-bts (Old)
and /work/SRC/openSUSE:Factory/.yate-bts.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yate-bts"
Mon Mar 15 10:56:00 2021 rev:3 rq:878982 version:6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yate-bts/yate-bts.changes 2018-10-11
11:55:18.274034782 +0200
+++ /work/SRC/openSUSE:Factory/.yate-bts.new.2401/yate-bts.changes
2021-03-15 10:56:00.753320191 +0100
@@ -1,0 +2,9 @@
+Mon Mar 1 22:03:26 UTC 2021 - Martin Hauke <mar...@gmx.de>
+
+- Drop patch:
+ * yatebts-5.0.0-gcc6.patch
+- Add patches:
+ * 0001-Fixed-build-on-newer-versions-of-C.patch
+ * 0002-Fixed-compile-time-error-use-newer-Channel-getStatus.patch
+
+-------------------------------------------------------------------
Old:
----
yatebts-5.0.0-gcc6.patch
New:
----
0001-Fixed-build-on-newer-versions-of-C.patch
0002-Fixed-compile-time-error-use-newer-Channel-getStatus.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yate-bts.spec ++++++
--- /var/tmp/diff_new_pack.Z7luFQ/_old 2021-03-15 10:56:01.281321001 +0100
+++ /var/tmp/diff_new_pack.Z7luFQ/_new 2021-03-15 10:56:01.285321007 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yate-bts
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2017, Martin Hauke <mar...@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@@ -29,7 +29,8 @@
Source99: yate-bts.rpmlintrc
Patch0: yate-dont-mess-with-cflags.patch
Patch1: yatebts-sgsnggsn-inetutils-hostname-fix.diff
-Patch2: yatebts-5.0.0-gcc6.patch
+Patch2: 0001-Fixed-build-on-newer-versions-of-C.patch
+Patch3: 0002-Fixed-compile-time-error-use-newer-Channel-getStatus.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -50,6 +51,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
TIME="\"$(date -d "${modified}" "+%%R")\""
++++++ 0001-Fixed-build-on-newer-versions-of-C.patch ++++++
>From 05451e3ea5ccd350683cbe69f50f891e458bcf83 Mon Sep 17 00:00:00 2001
From: paulc <paulc@26ef948f-17ed-0410-91a8-c94bd273f071>
Date: Tue, 11 Feb 2020 15:21:59 +0000
Subject: [PATCH 1/2] Fixed build on newer versions of C++.
git-svn-id: http://voip.null.ro/svn/yatebts/trunk@677
26ef948f-17ed-0410-91a8-c94bd273f071
---
mbts/GPRS/MAC.cpp | 2 +-
mbts/GPRS/MSInfo.cpp | 2 +-
mbts/SGSNGGSN/Sgsn.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mbts/GPRS/MAC.cpp b/mbts/GPRS/MAC.cpp
index 5c631ee..8879389 100644
--- a/mbts/GPRS/MAC.cpp
+++ b/mbts/GPRS/MAC.cpp
@@ -835,7 +835,7 @@ PDCHL1FEC *L2MAC::macPickChannel()
devassert(npacch);
PDCHL1FEC *ch, *bestch = NULL;
int bestload = 0; // unneeded init to make gcc
happy.
- for (RListIterator<typeof(ch)> itr(macPacchs); itr.next(ch); ) {
+ for (RListIterator<PDCHL1FEC*> itr(macPacchs); itr.next(ch); ) {
int load = 0;
MSInfo *ms;
RN_MAC_FOR_ALL_MS(ms) {
diff --git a/mbts/GPRS/MSInfo.cpp b/mbts/GPRS/MSInfo.cpp
index bce7ce8..05a45df 100644
--- a/mbts/GPRS/MSInfo.cpp
+++ b/mbts/GPRS/MSInfo.cpp
@@ -638,7 +638,7 @@ bool MSInfo::msAssignChannels()
if (msPCHDowns.size() > 1) {
std::ostringstream os;
msDumpChannels(os);
- GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for
"<<this<<os;
+ GPRSLOG(INFO,GPRS_MSG|GPRS_CHECK_OK) << "Multislot assignment for
"<<this<<os.str();
}
} else {
diff --git a/mbts/SGSNGGSN/Sgsn.cpp b/mbts/SGSNGGSN/Sgsn.cpp
index 57371d6..b756c1a 100644
--- a/mbts/SGSNGGSN/Sgsn.cpp
+++ b/mbts/SGSNGGSN/Sgsn.cpp
@@ -149,7 +149,7 @@ void SgsnInfo::sirm()
clearConn(GprsConnNone,SigConnLost);
std::ostringstream ss;
sgsnInfoDump(this,ss);
- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<ss);
+ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing SgsnInfo:"<<ss.str());
sSgsnInfoList.remove(this);
GmmInfo *gmm = getGmm();
if (gmm && (gmm->getSI() == this)) {
@@ -253,7 +253,7 @@ static void GmmRemove(GmmInfo *gmm)
{
std::ostringstream ss;
gmmInfoDump(gmm,ss,0);
- SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<ss);
+ SGSNLOGF(INFO,GPRS_OK|GPRS_MSG,"SGSN","Removing gmm:"<<ss.str());
SgsnInfo *si;
RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) {
// The second test here should be redundant.
--
2.30.1
++++++ 0002-Fixed-compile-time-error-use-newer-Channel-getStatus.patch ++++++
>From 55b3aca010a5617dab176f7dc45040d2e36c1bb5 Mon Sep 17 00:00:00 2001
From: marian <marian@26ef948f-17ed-0410-91a8-c94bd273f071>
Date: Fri, 12 Jun 2020 07:38:10 +0000
Subject: [PATCH 2/2] Fixed compile time error: use newer Channel::getStatus()
instead of removed status().
git-svn-id: http://voip.null.ro/svn/yatebts/trunk@678
26ef948f-17ed-0410-91a8-c94bd273f071
---
ybts.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ybts.cpp b/ybts.cpp
index 8288e32..b246e3a 100644
--- a/ybts.cpp
+++ b/ybts.cpp
@@ -7057,7 +7057,9 @@ bool YBTSChan::serialize(String& str)
{
if (!(conn() && conn()->serialize(str)))
return false;
- str << " " << status() << ":" << (int)m_cref;
+ str << " ";
+ getStatus(str);
+ str << ":" << (int)m_cref;
YBTSCallDesc* act = m_activeCall;
if (act)
--
2.30.1
