commit srt for openSUSE:Factory
Hello community, here is the log from the commit of package srt for openSUSE:Factory checked in at 2019-12-16 17:26:17 Comparing /work/SRC/openSUSE:Factory/srt (Old) and /work/SRC/openSUSE:Factory/.srt.new.4691 (New) Package is "srt" Mon Dec 16 17:26:17 2019 rev:9 rq:756849 version:1.3.4 Changes: --- /work/SRC/openSUSE:Factory/srt/srt.changes 2019-09-04 09:03:21.751038063 +0200 +++ /work/SRC/openSUSE:Factory/.srt.new.4691/srt.changes2019-12-16 17:26:19.415961240 +0100 @@ -1,0 +2,8 @@ +Fri Dec 13 15:23:23 UTC 2019 - Dominique Leuenberger + +- Drop pkgconfig(zlib) BuildRequires: this is only needed on + win32/mingw (and even there it rather seems like working around a + bug in some other package, as there is no explicit call to zlib + functions). + +--- Other differences: -- ++ srt.spec ++ --- /var/tmp/diff_new_pack.T5QkSk/_old 2019-12-16 17:26:20.047960987 +0100 +++ /var/tmp/diff_new_pack.T5QkSk/_new 2019-12-16 17:26:20.051960985 +0100 @@ -1,7 +1,7 @@ # # spec file for package srt # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,6 @@ BuildRequires: pkgconfig BuildRequires: tcl BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(zlib) %description SRT is a video transport protocol and technology stack
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2019-09-04 09:03:19
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new.7948 (New)
Package is "srt"
Wed Sep 4 09:03:19 2019 rev:8 rq:727274 version:1.3.4
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2019-08-24 18:39:04.861799592
+0200
+++ /work/SRC/openSUSE:Factory/.srt.new.7948/srt.changes2019-09-04
09:03:21.751038063 +0200
@@ -1,0 +2,13 @@
+Fri Aug 30 12:47:57 UTC 2019 - Alexandros Toptsoglou
+
+- Backported commit 47e5890 and 64875fa to fix CVE-2019-15784
+ (boo#1148844) and avoid a potential array overflow.
+ * Added CVE-2019-15784.patch
+
+---
+Thu Aug 29 16:02:56 UTC 2019 - Alexandros Toptsoglou
+
+- Update to version 1.3.4:
+ + Various bugfixes and feature enhancments.
+
+---
Old:
srt-1.3.3.tar.gz
New:
CVE-2019-15784.patch
srt-1.3.4.tar.gz
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.frSq3P/_old 2019-09-04 09:03:22.731037927 +0200
+++ /var/tmp/diff_new_pack.frSq3P/_new 2019-09-04 09:03:22.735037926 +0200
@@ -19,7 +19,7 @@
%define sover 1
Name: srt
-Version:1.3.3
+Version:1.3.4
Release:0
Summary:Secure Reliable Transport (SRT)
License:MPL-2.0
@@ -27,6 +27,7 @@
URL:https://www.srtalliance.org
Source0:
https://github.com/Haivision/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source99: baselibs.conf
+Patch0: CVE-2019-15784.patch
BuildRequires: cmake
BuildRequires: fdupes
++ CVE-2019-15784.patch ++
Index: srt-1.3.4/srtcore/queue.cpp
===
--- srt-1.3.4.orig/srtcore/queue.cpp
+++ srt-1.3.4/srtcore/queue.cpp
@@ -256,7 +256,7 @@ void CUnitQueue::makeUnitGood(CUnit * un
CSndUList::CSndUList():
m_pHeap(NULL),
-m_iArrayLength(4096),
+m_iArrayLength(512),
m_iLastEntry(-1),
m_ListLock(),
m_pWindowLock(NULL),
@@ -273,32 +273,6 @@ CSndUList::~CSndUList()
pthread_mutex_destroy(_ListLock);
}
-void CSndUList::insert(int64_t ts, const CUDT* u)
-{
- CGuard listguard(m_ListLock);
-
- // increase the heap array size if necessary
- if (m_iLastEntry == m_iArrayLength - 1)
- {
- CSNode** temp = NULL;
-
- try
- {
- temp = new CSNode*[m_iArrayLength * 2];
- }
- catch(...)
- {
- return;
- }
-
- memcpy(temp, m_pHeap, sizeof(CSNode*) * m_iArrayLength);
- m_iArrayLength *= 2;
- delete [] m_pHeap;
- m_pHeap = temp;
- }
-
- insert_(ts, u);
-}
void CSndUList::update(const CUDT* u, EReschedule reschedule)
{
@@ -319,6 +293,8 @@ void CSndUList::update(const CUDT* u, ER
}
remove_(u);
+ insert_norealloc_(1, u);
+ return;
}
insert_(1, u);
@@ -366,7 +342,7 @@ int CSndUList::pop(sockaddr*& addr, CPac
// insert a new entry, ts is the next processing time
if (ts > 0)
- insert_(ts, u);
+ insert_norealloc_(ts, u);
return 1;
}
@@ -388,14 +364,47 @@ uint64_t CSndUList::getNextProcTime()
return m_pHeap[0]->m_llTimeStamp_tk;
}
+
+void CSndUList::realloc_()
+{
+ CSNode** temp = NULL;
+
+ try
+ {
+ temp = new CSNode *[2 * m_iArrayLength];
+ }
+ catch (...)
+ {
+ throw CUDTException(MJ_SYSTEMRES, MN_MEMORY, 0);
+ }
+
+ memcpy(temp, m_pHeap, sizeof(CSNode*) * m_iArrayLength);
+ m_iArrayLength *= 2;
+ delete[] m_pHeap;
+ m_pHeap = temp;
+}
+
+
void CSndUList::insert_(int64_t ts, const CUDT* u)
{
+// increase the heap array size if necessary
+if (m_iLastEntry == m_iArrayLength - 1)
+realloc_();
+
+insert_norealloc_(ts, u);
+}
+
+
+void CSndUList::insert_norealloc_(int64_t ts, const CUDT* u)
+{
CSNode* n = u->m_pSNode;
// do not insert repeated node
if (n->m_iHeapLoc >= 0)
return;
+ SRT_ASSERT(m_iLastEntry < m_iArrayLength);
+
m_iLastEntry ++;
m_pHeap[m_iLastEntry] = n;
n->m_llTimeStamp_tk = ts;
@@ -405,16 +414,12 @@ void CSndUList::insert_(int64_t ts, cons
while (p != 0)
{
p = (q - 1) >> 1;
- if (m_pHeap[p]->m_llTimeStamp_tk > m_pHeap[q]->m_llTimeStamp_tk)
- {
- CSNode* t = m_pHeap[p];
- m_pHeap[p] = m_pHeap[q];
- m_pHeap[q] = t;
- t->m_iHeapLoc = q;
- q = p;
- }
- else
- break;
+ if (m_pHeap[p]->m_llTimeStamp_tk <= m_pHeap[q]->m_llTimeStamp_tk)
+ break;
+
+ swap(m_pHeap[p], m_pHeap[q]);
+
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2019-08-24 18:39:01
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new.7948 (New)
Package is "srt"
Sat Aug 24 18:39:01 2019 rev:7 rq:724739 version:1.3.3
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2018-11-26 10:15:58.994036417
+0100
+++ /work/SRC/openSUSE:Factory/.srt.new.7948/srt.changes2019-08-24
18:39:04.861799592 +0200
@@ -1,0 +2,10 @@
+Mon Aug 19 19:06:58 UTC 2019 - Bjørn Lie
+
+- Update to version 1.3.3:
+ + Various bugfixes and feature enhancments.
+- Update to version 1.3.2:
+ + Various bugfixes, feature enhancments, build fixes and
+documentation updates.
+- Drop srt-no-rpath.patch: Fixed upstream.
+
+---
Old:
srt-1.3.1.tar.gz
srt-no-rpath.patch
New:
srt-1.3.3.tar.gz
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.TSW1BH/_old 2019-08-24 18:39:06.197799464 +0200
+++ /var/tmp/diff_new_pack.TSW1BH/_new 2019-08-24 18:39:06.197799464 +0200
@@ -1,7 +1,7 @@
#
# spec file for package srt
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,9 @@
%define sover 1
+
Name: srt
-Version:1.3.1
+Version:1.3.3
Release:0
Summary:Secure Reliable Transport (SRT)
License:MPL-2.0
@@ -26,8 +27,7 @@
URL:https://www.srtalliance.org
Source0:
https://github.com/Haivision/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source99: baselibs.conf
-# PATCH-FIX-UPSTREAM srt-no-rpath.patch -- Fix build, patch from archlinux
-Patch0: srt-no-rpath.patch
+
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -73,7 +73,7 @@
-DENABLE_SHARED=ON \
-DENABLE_STATIC=OFF \
%{nil}
-make %{?_smp_mflags}
+%cmake_build
%install
%cmake_install
@@ -87,7 +87,7 @@
%{_bindir}/%{name}-ffplay
%{_bindir}/%{name}-file-transmit
%{_bindir}/%{name}-live-transmit
-%{_bindir}/%{name}-multiplex
+%{_bindir}/%{name}-tunnel
%files -n libsrt%{sover}
%license LICENSE
++ srt-1.3.1.tar.gz -> srt-1.3.3.tar.gz ++
27370 lines of diff (skipped)
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2018-11-26 10:15:57
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new.19453 (New)
Package is "srt"
Mon Nov 26 10:15:57 2018 rev:6 rq:648934 version:1.3.1
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2018-11-08 09:41:17.613604350
+0100
+++ /work/SRC/openSUSE:Factory/.srt.new.19453/srt.changes 2018-11-26
10:15:58.994036417 +0100
@@ -1,0 +2,6 @@
+Tue Nov 13 12:54:11 UTC 2018 - Antonio Larrosa
+
+- Fix install prefix in cmake so the pkgconfig file has correct
+ information on where to find srt's libraries and include files.
+
+---
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.P7Y9Wj/_old 2018-11-26 10:15:59.654035645 +0100
+++ /var/tmp/diff_new_pack.P7Y9Wj/_new 2018-11-26 10:15:59.658035640 +0100
@@ -65,7 +65,7 @@
%build
%cmake \
- -DCMAKE_INSTALL_PREFIX=%{_datadir} \
+ -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_BINDIR=%{_bindir} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2018-11-08 09:41:13
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new (New)
Package is "srt"
Thu Nov 8 09:41:13 2018 rev:5 rq:645196 version:1.3.1
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2018-08-10 09:45:08.313822388
+0200
+++ /work/SRC/openSUSE:Factory/.srt.new/srt.changes 2018-11-08
09:41:17.613604350 +0100
@@ -1,0 +2,9 @@
+Mon Oct 29 09:10:45 UTC 2018 - Dominique Leuenberger
+
+- Add pkgconfig(zlib) BuildRequires: until openssl 1.1.1, zlib was
+ pulled in into our buildroot, avoiding srt having to care for it
+ explicitly. Since this is changed now, we have to worry for our
+ dependency on our own. The dep comes from:
+ CMakeLists.txt:set (SSL_REQUIRED_MODULES "openssl libcrypto zlib")
+
+---
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.uldpP0/_old 2018-11-08 09:41:18.905602853 +0100
+++ /var/tmp/diff_new_pack.uldpP0/_new 2018-11-08 09:41:18.909602849 +0100
@@ -12,12 +12,11 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define sover 1
-
Name: srt
Version:1.3.1
Release:0
@@ -29,13 +28,13 @@
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM srt-no-rpath.patch -- Fix build, patch from archlinux
Patch0: srt-no-rpath.patch
-
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: tcl
BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(zlib)
%description
SRT is a video transport protocol and technology stack
@@ -53,8 +52,8 @@
%package devel
Summary:Development files for the Secure Reliable Transport (SRT)
library
Group: Development/Libraries/C and C++
-Requires: %{name} == %{version}
-Requires: libsrt%{sover} == %{version}
+Requires: %{name} = %{version}
+Requires: libsrt%{sover} = %{version}
%description devel
This package contains all necessary include files and libraries
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2018-08-10 09:45:07
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new (New)
Package is "srt"
Fri Aug 10 09:45:07 2018 rev:4 rq:628218 version:1.3.1
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2018-07-17 09:39:13.365979858
+0200
+++ /work/SRC/openSUSE:Factory/.srt.new/srt.changes 2018-08-10
09:45:08.313822388 +0200
@@ -1,0 +2,5 @@
+Wed Aug 8 16:56:55 UTC 2018 - jeng...@inai.de
+
+- Trim marketing from description.
+
+---
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.zOeDZY/_old 2018-08-10 09:45:09.805824781 +0200
+++ /var/tmp/diff_new_pack.zOeDZY/_new 2018-08-10 09:45:09.805824781 +0200
@@ -38,10 +38,9 @@
BuildRequires: pkgconfig(openssl)
%description
-SRT is an open source video transport protocol and technology stack
+SRT is a video transport protocol and technology stack
that optimizes streaming performance across unpredictable networks
-with secure streams and easy firewall traversal, bringing the best
-quality live video over the worst networks.
+with secure streams and firewall traversal.
%package -n libsrt%{sover}
Summary:Secure Reliable Transport (SRT) library
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2018-07-17 09:39:09
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new (New)
Package is "srt"
Tue Jul 17 09:39:09 2018 rev:3 rq:622441 version:1.3.1
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2018-07-02 23:30:26.741472866
+0200
+++ /work/SRC/openSUSE:Factory/.srt.new/srt.changes 2018-07-17
09:39:13.365979858 +0200
@@ -1,0 +2,11 @@
+Fri Jul 13 08:25:47 UTC 2018 - bjorn@gmail.com
+
+- Update to version 1.3.1:
+ + Various bugfixes.
+
+---
+Thu Jul 12 20:31:52 UTC 2018 - jeng...@inai.de
+
+- Update summaries.
+
+---
Old:
srt-1.3.0.tar.gz
New:
srt-1.3.1.tar.gz
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.c7GeRY/_old 2018-07-17 09:39:13.797978355 +0200
+++ /var/tmp/diff_new_pack.c7GeRY/_new 2018-07-17 09:39:13.797978355 +0200
@@ -19,7 +19,7 @@
%define sover 1
Name: srt
-Version:1.3.0
+Version:1.3.1
Release:0
Summary:Secure Reliable Transport (SRT)
License:MPL-2.0
@@ -52,7 +52,7 @@
Transport (SRT).
%package devel
-Summary:Development files for srt
+Summary:Development files for the Secure Reliable Transport (SRT)
library
Group: Development/Libraries/C and C++
Requires: %{name} == %{version}
Requires: libsrt%{sover} == %{version}
++ srt-1.3.0.tar.gz -> srt-1.3.1.tar.gz ++
5616 lines of diff (skipped)
commit srt for openSUSE:Factory
Hello community,
here is the log from the commit of package srt for openSUSE:Factory checked in
at 2018-07-02 23:30:23
Comparing /work/SRC/openSUSE:Factory/srt (Old)
and /work/SRC/openSUSE:Factory/.srt.new (New)
Package is "srt"
Mon Jul 2 23:30:23 2018 rev:2 rq:619821 version:1.3.0
Changes:
--- /work/SRC/openSUSE:Factory/srt/srt.changes 2018-05-29 10:38:38.722388309
+0200
+++ /work/SRC/openSUSE:Factory/.srt.new/srt.changes 2018-07-02
23:30:26.741472866 +0200
@@ -1,0 +2,10 @@
+Fri Jun 29 16:06:41 UTC 2018 - bjorn@gmail.com
+
+- Add baselibs.conf: build 32bit support libs.
+
+---
+Thu May 31 09:17:36 UTC 2018 - bjorn@gmail.com
+
+- Update Summary and Descriptions fields.
+
+---
New:
baselibs.conf
Other differences:
--
++ srt.spec ++
--- /var/tmp/diff_new_pack.FxlNrF/_old 2018-07-02 23:30:27.285472190 +0200
+++ /var/tmp/diff_new_pack.FxlNrF/_new 2018-07-02 23:30:27.289472186 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define sover 1
Name: srt
@@ -25,6 +26,7 @@
Group: Development/Libraries/C and C++
URL:https://www.srtalliance.org
Source0:
https://github.com/Haivision/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source99: baselibs.conf
# PATCH-FIX-UPSTREAM srt-no-rpath.patch -- Fix build, patch from archlinux
Patch0: srt-no-rpath.patch
@@ -42,11 +44,12 @@
quality live video over the worst networks.
%package -n libsrt%{sover}
-Summary:SRT shared library
+Summary:Secure Reliable Transport (SRT) library
Group: System/Libraries
%description -n libsrt%{sover}
-This package contains a shared system library for srt.
+This package contains a shared system library for Secure Reliable
+Transport (SRT).
%package devel
Summary:Development files for srt
@@ -56,7 +59,8 @@
%description devel
This package contains all necessary include files and libraries
-needed to develop applications that require these.
+needed to develop applications with Secure Reliable Transport
+(SRT) support.
%prep
%autosetup -p1
++ baselibs.conf ++
libsrt1
