Hello community, here is the log from the commit of package jack for openSUSE:Factory checked in at 2018-09-26 16:02:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jack (Old) and /work/SRC/openSUSE:Factory/.jack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jack" Wed Sep 26 16:02:12 2018 rev:62 rq:637005 version:1.9.12 Changes: -------- --- /work/SRC/openSUSE:Factory/jack/jack.changes 2018-01-20 11:25:26.915918506 +0100 +++ /work/SRC/openSUSE:Factory/.jack.new/jack.changes 2018-09-26 16:02:19.660399563 +0200 @@ -1,0 +2,20 @@ +Thu Sep 20 13:11:42 UTC 2018 - [email protected] + +- Remove unnecessary requires for libjack0 and remove obsolete + comments. +- Use %license on "COPYING" + +------------------------------------------------------------------- +Tue Sep 18 16:23:25 UTC 2018 - Tom Mbrt <[email protected]> + +- Add upstream patch to fix return value check of mmap() (boo#1108981): + fix-mmap-return-value-check.patch + +------------------------------------------------------------------- +Thu Sep 13 11:49:18 UTC 2018 - Tomáš Chvátal <[email protected]> + +- Update the waf code to the 2.0 series in order to work under + python3.7 taken from upstream git: + * jack-waf2.patch + +------------------------------------------------------------------- New: ---- fix-mmap-return-value-check.patch jack-waf2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jack.spec ++++++ --- /var/tmp/diff_new_pack.Fty2J7/_old 2018-09-26 16:02:20.328398406 +0200 +++ /var/tmp/diff_new_pack.Fty2J7/_new 2018-09-26 16:02:20.332398399 +0200 @@ -16,7 +16,6 @@ # -#FIXME: Waf error when using doc build atm %define buildoc 1 %define debug_package_requires %{name} = %{version}-%{release} # Switch the --dbus on and off, on = 1 @@ -28,11 +27,13 @@ Release: 0 #to_be_filled_by_service Summary: Jack-Audio Connection Kit -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Sound Daemons Url: http://jackaudio.org/ Source0: https://github.com/jackaudio/jack2/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf +Patch0: jack-waf2.patch +Patch1: fix-mmap-return-value-check.patch BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: fdupes @@ -55,7 +56,6 @@ BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sndfile) -Requires: libjack0 = %{version} Provides: jack-audio-connection-kit Provides: jack2 = %{version} Obsoletes: jack2 < %{version} @@ -87,9 +87,10 @@ %package -n libjacknet%{sonum} Summary: Jack Audio Connection Kit Library +# libjacknet was packaged with libjack prior to 1.9.12 +# libjacknet is not a compatible replacerment for libjack0 Group: System/Libraries -Requires: libjack%{sonum} = %{version} -Obsoletes: libjack%{sonum} < %{version} +Obsoletes: libjack%{sonum} < 1.9.12 %description -n libjacknet%{sonum} This package contains the library to access JACK @@ -97,9 +98,10 @@ %package -n libjackserver%{sonum} Summary: Jack Audio Connection Kit Library +# libjackserver was packaged with libjack prior to 1.9.12 +# libjacknet is not a compatible replacerment for libjack0 Group: System/Libraries -Requires: libjack%{sonum} = %{version} -Obsoletes: libjack%{sonum} < %{version} +Obsoletes: libjack%{sonum} < 1.9.12 %description -n libjackserver%{sonum} This package contains the library to access JACK @@ -123,17 +125,13 @@ %prep %setup -q -n %{name}2-%{version} +%patch0 -p1 +%patch1 -p1 #Change python script headers to python3 for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done %build -%if 1 == 0 -%define gcc_version 7 -export CC=gcc-7 -export CPP=cpp-7 -export CXX=g++-7 -%endif export CFLAGS="%{optflags} -ggdb -fPIC" export CXXFLAGS="$CFLAGS" @@ -199,6 +197,7 @@ %doc %{_docdir}/%{name}/ChangeLog %doc %{_docdir}/%{name}/README* %doc %{_docdir}/%{name}/TODO +%license windows/Setup/src/COPYING %{_mandir}/man1/* %{_bindir}/* %dir %{_libdir}/%{name} ++++++ fix-mmap-return-value-check.patch ++++++ >From cc8576a7ab62caab10c7ddd7309367cf797c5e69 Mon Sep 17 00:00:00 2001 From: falkTX <[email protected]> Date: Thu, 5 Apr 2018 10:04:18 +0200 Subject: [PATCH] Check mmap() against MAP_FAILED Fixes #338 --- linux/JackLinuxFutex.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/linux/JackLinuxFutex.cpp b/linux/JackLinuxFutex.cpp index b724f191..415a8b95 100644 --- a/linux/JackLinuxFutex.cpp +++ b/linux/JackLinuxFutex.cpp @@ -147,7 +147,9 @@ bool JackLinuxFutex::Allocate(const char* name, const char* server_name, int val return false; } - if ((fFutex = (FutexData*)mmap(NULL, sizeof(FutexData), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fSharedMem, 0)) == NULL) { + FutexData* futex = (FutexData*)mmap(NULL, sizeof(FutexData), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fSharedMem, 0); + + if (futex == NULL || futex == MAP_FAILED) { jack_error("Allocate: can't check in named futex name = %s err = %s", fName, strerror(errno)); close(fSharedMem); fSharedMem = -1; @@ -157,11 +159,12 @@ bool JackLinuxFutex::Allocate(const char* name, const char* server_name, int val fPrivate = internal; - fFutex->futex = value; - fFutex->internal = internal; - fFutex->wasInternal = internal; - fFutex->needsChange = false; - fFutex->externalCount = 0; + futex->futex = value; + futex->internal = internal; + futex->wasInternal = internal; + futex->needsChange = false; + futex->externalCount = 0; + fFutex = futex; return true; } @@ -182,24 +185,27 @@ bool JackLinuxFutex::Connect(const char* name, const char* server_name) return false; } - if ((fFutex = (FutexData*)mmap(NULL, sizeof(FutexData), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fSharedMem, 0)) == NULL) { + FutexData* futex = (FutexData*)mmap(NULL, sizeof(FutexData), PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, fSharedMem, 0); + + if (futex == NULL || futex == MAP_FAILED) { jack_error("Connect: can't connect named futex name = %s err = %s", fName, strerror(errno)); close(fSharedMem); fSharedMem = -1; return false; } - if (! fPrivate && fFutex->wasInternal) + if (! fPrivate && futex->wasInternal) { const char* externalSync = getenv("JACK_INTERNAL_CLIENT_SYNC"); - if (externalSync != NULL && strstr(fName, externalSync) != NULL && ++fFutex->externalCount == 1) + if (externalSync != NULL && strstr(fName, externalSync) != NULL && ++futex->externalCount == 1) { jack_error("Note: client %s running as external client temporarily", fName); - fFutex->needsChange = true; + futex->needsChange = true; } } + fFutex = futex; return true; } ++++++ jack-waf2.patch ++++++ ++++ 40605 lines (skipped)
