Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2021-11-01 22:21:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linphone" Mon Nov 1 22:21:01 2021 rev:2 rq:928579 version:5.0.36 Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2021-09-28 19:16:38.968193945 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new.1890/linphone.changes 2021-11-01 22:21:05.467226559 +0100 @@ -1,0 +2,46 @@ +Tue Oct 19 23:53:27 UTC 2021 - Giacomo Comes <gcomes.obs@gmail.com> - 5.0.36 + +- Update to 5.0.36: + * Use UTF8 instead of locale in chat message modifiers` + * Fix bad chat room when creating a call + * Crash on ec-calibration : Use tone sent callback only on MS_DTMF_GEN_EVENT + * Added missing conference APIs + * Play ring tone only if tone indications are enabled + * Fix tonemanager on infinite rings and wrong ring type + * fix crash of kickOffConnectivity + * Add option to deactivate potentially weak digest authentication schemes + * Fix issue when receiving an INVITE with ICE and rtcp-mux + * Fix call repair in case of multi account + * Fix regression with ICE not setting candidates correctly for completed check-lists + * Improve reliability of account creation by increasing account creation timeout to 30s + * Change contact address if call in IncomingReceived state is added to conference + * fix crash when session refresh after BYE received + * Repair streaming from file feature of AudioStream/VideoStream + * Fixed error logs showing CoreManager's core being const + * Logging facility optimization + * Fix bug with ChatRoomParams::isGroup() erroneously returning true for some basic chatrooms + * Count unread chat messages in all Chat Rooms with a weak address testing + * avoid to downgrade chat message participant state and add unitest + * Stop audio stream when setting new device + This fix allow changing device on Desktop while ringback + * Audio : Allow setting NULL device (case of no cards available) + * Fixed call to content.isFileEncrypted() on a FileTransferContent + * Fixed mic gain +- Update to 5.0.0: + * Support of Capability Negociation framework - RFC5939 + limited to media encryption choice (None, SRTP, DTLS-SRTP, ZRTP) + * New API to manage SIP accounts: LinphoneAccount and LinphoneAccountParams + replacing LinphoneProxyConfig which is now deprecated. + LinphoneProxyConfig remains fully usable for backward compatibility with previous version. + * New implementation of LinphoneAccountCreator relying on http REST API. + * Added LDAP contact provider API integrated with LinphoneMagicSearch + * Added asynchronous API to the LinphoneMagicSearch API (for contact searching). + * Fixed erroneous ICE ufrag and passwd parameters sent in reINVITE while ICE + was refused previously. + * Fixed swift and C# wrappers corner-case usage issues. +- Build and use Belledonne's version of libldap +- delete build-liblinphone4-with-mediastreamer5.patch +- add linphone-build-jsoncpp.patch +- add BuildRequires: jsoncpp-devel + +------------------------------------------------------------------- Old: ---- build-liblinphone4-with-mediastreamer5.patch liblinphone-4.5.25.tar.bz2 New: ---- liblinphone-5.0.36.tar.bz2 linphone-build-jsoncpp.patch openldap-bc.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.0cAzmB/_old 2021-11-01 22:21:06.395226888 +0100 +++ /var/tmp/diff_new_pack.0cAzmB/_new 2021-11-01 22:21:06.399226890 +0100 @@ -16,9 +16,11 @@ # +%define ldaplibdir %buildroot%_libexecdir/%name + %define sover 10 Name: linphone -Version: 4.5.25 +Version: 5.0.36 Release: 0 Summary: Web Phone License: GPL-3.0-or-later @@ -26,6 +28,7 @@ URL: https://linphone.org/technical-corner/liblinphone/ Source: https://gitlab.linphone.org/BC/public/liblinphone/-/archive/%{version}/liblinphone-%{version}.tar.bz2 Source1: %{name}-manual.tar.bz2 +Source3: https://gitlab.linphone.org/BC/public/external/openldap/-/archive/bc/openlda... # PATCH-FIX-OPENSUSE linphone-fix-pkgconfig.patch sor.alexei@meowr.ru -- Install linphone.pc. Patch0: linphone-fix-pkgconfig.patch # PATCH-FEATURE-OPENSUSE linphone-build-readline.patch sor.alexei@meowr.ru -- Add the ability to compile with readline to the build system. @@ -34,8 +37,8 @@ Patch2: reproducible.patch # PATCH-FIX-OPENSUSE linphone-link-soci-sqlite3.patch -- force linking to libsoci_sqlite3 so that RPM finds the requirement boo#1140595 -- code@bnavigator.de Patch3: linphone-link-soci-sqlite3.patch -# PATCH-FIX-OPENSUSE build-liblinphone4-with-mediastreamer5.patch -- allow build with mediastreamer 5.x -Patch4: build-liblinphone4-with-mediastreamer5.patch +# PATCH-FIX-OPENSUSE linphone-build-jsoncpp.patch -- use pkgconfig to find jsoncpp and link against jsoncpp, not jsoncpp_object +Patch4: linphone-build-jsoncpp.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -43,8 +46,9 @@ BuildRequires: graphviz BuildRequires: libeXosip2-devel BuildRequires: libgsm-devel -BuildRequires: lime-devel >= 4.5.0 -BuildRequires: openldap2-devel +BuildRequires: lime-devel >= 5.0.0 +#BuildRequires: openldap2-devel +BuildRequires: jsoncpp-devel BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: python3-pystache @@ -56,11 +60,11 @@ BuildRequires: soci-sqlite3-devel BuildRequires: xsd BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bctoolbox) >= 4.5.0 +BuildRequires: pkgconfig(bctoolbox) >= 5.0.0 BuildRequires: pkgconfig(belcard) >= 4.5.0 -BuildRequires: pkgconfig(belle-sip) >= 4.5.0 +BuildRequires: pkgconfig(belle-sip) >= 5.0.0 BuildRequires: pkgconfig(libavcodec) >= 51.0.0 -BuildRequires: pkgconfig(libbzrtp) >= 4.5.0 +BuildRequires: pkgconfig(libbzrtp) >= 5.0.0 BuildRequires: pkgconfig(libosip2) BuildRequires: pkgconfig(libsasl2) BuildRequires: pkgconfig(libswscale) >= 0.7.0 @@ -68,12 +72,16 @@ BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(libv4l2) >= 0.8.4 BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(mediastreamer) >= 4.5.0 +BuildRequires: pkgconfig(mediastreamer) >= 5.0.0 BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(ortp) >= 4.5.0 +BuildRequires: pkgconfig(ortp) >= 5.0.0 BuildRequires: pkgconfig(speex) >= 1.1.6 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(xerces-c) +#for openldap +BuildRequires: chrpath +BuildRequires: db-devel +BuildRequires: openslp-devel %description Linphone is a Web phone with a Qt interface. It lets you make @@ -85,6 +93,7 @@ %package cli Summary: Web Phone Command Line Interface +Group: Productivity/Telephony/SIP/Clients Requires: lib%{name}-data = %{version} %description cli @@ -99,6 +108,7 @@ %package -n lib%{name}%{sover} Summary: Web Phone library +Group: Productivity/Telephony/SIP/Clients Recommends: lib%{name}-lang Provides: lib%{name} = %{version} @@ -116,6 +126,7 @@ %package -n lib%{name}++%{sover} Summary: Web Phone C++ library +Group: Productivity/Telephony/SIP/Clients %description -n lib%{name}++%{sover} Linphone is a Web phone with a Qt interface. It lets you make @@ -129,6 +140,7 @@ %package -n lib%{name}-data Summary: Web Phone data files +Group: Productivity/Telephony/SIP/Clients BuildArch: noarch %description -n lib%{name}-data @@ -174,9 +186,41 @@ %setup -q -n liblinphone-%{version} -D -T -a 1 %build +#START build belledonne's libldap +mkdir aux +tar fx %{SOURCE3} -C aux +cd aux/openldap-bc +LDFLAGS="-Wl,-rpath,%ldaplibdir" ./configure \ + --enable-static=no \ + --enable-slapd=no \ + --enable-wrappers=no \ + --enable-spasswd \ + --with-tls=openssl \ + --with-cyrus-sasl \ + --enable-crypt \ + --enable-ipv6=yes \ + --enable-rewrite \ + --enable-slp \ + --enable-lmpasswd \ + --with-yielding-select \ + --prefix=$PWD/.. \ + --libdir=%ldaplibdir +make depend +make %{?_smp_mflags} +# do a preliminary install, because libldap is needed to build liblinphone +make install +cd ../.. +#END build belledonne's libldap +#find and use belledonne's libldap +sed -i "/OPENLDAP_INCLUDE_DIRS/,/LDAP_LIB/s@\${CMAKE_INSTALL_PREFIX}@$PWD/aux@;s@\${CMAKE_INSTALL_PREFIX}@%ldaplibdir@;s@include/openldap@include@" cmake/FindOpenLDAP.cmake %cmake \ -DPYTHON_EXECUTABLE="%{_bindir}/python3" \ -DENABLE_CXX_WRAPPER=ON \ + -DOPENLDAP_INCLUDE_DIRS=$PWD/../aux/include \ + -DLDAP_LIB=%ldaplibdir/libldap.so \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-rpath,%ldaplibdir" \ + -DENABLE_DOC=ON \ + -DCMAKE_BUILD_TYPE=Release \ -DENABLE_ROOTCA_DOWNLOAD=OFF \ -DENABLE_ZRTP=ON \ -DENABLE_LDAP=ON \ @@ -188,13 +232,27 @@ %cmake_build %install +#START reinstall belledonne's libldap +cd aux/openldap-bc +make install +cd ../.. +cp aux/openldap-bc/LICENSE LICENSE.openldap +#END reinstall belledonne's libldap %cmake_install +#remove unnecessary files +rm %ldaplibdir/*.{la,so} +#fix rpath in openldap libs and make them executable +find %ldaplibdir -type f -exec chrpath -r %_libexecdir/%name {} \; -exec chmod a+x {} \; +#fix rpath in liblinphone +find %buildroot%_libdir -type f -name "liblinphone*" -exec chrpath -r %_libexecdir/%name {} \; # Install the manual. mkdir -p %{buildroot}%{_datadir}/gnome/help/ cp -a %{name} %{buildroot}%{_datadir}/gnome/help/%{name}/ %find_lang %{name} %fdupes %{buildroot}%{_datadir}/ +#disable rpmlint complain about rpath +export NO_BRP_CHECK_RPATH=true %post -n lib%{name}%{sover} -p /sbin/ldconfig @@ -210,6 +268,8 @@ %files -n lib%{name}%{sover} %{_libdir}/lib%{name}.so.%{sover}* +%dir %_libexecdir/%name +%_libexecdir/%name/ %files -n lib%{name}-lang -f %{name}.lang %dir %{_datadir}/gnome/ @@ -219,7 +279,7 @@ %{_libdir}/lib%{name}++.so.%{sover}* %files -n lib%{name}-data -%license LICENSE.txt +%license LICENSE.txt LICENSE.openldap %doc CHANGELOG.md README.md %{_datadir}/%{name}/ %{_datadir}/sounds/%{name}/ @@ -235,6 +295,6 @@ %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/Linphone/ %{_datadir}/LinphoneCxx/ -%{_datadir}/doc/lib%{name}-4.5.0/ +%{_datadir}/doc/lib%{name}-5.0.0/ %changelog ++++++ liblinphone-4.5.25.tar.bz2 -> liblinphone-5.0.36.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/linphone/liblinphone-4.5.25.tar.bz2 /work/SRC/openSUSE:Factory/.linphone.new.1890/liblinphone-5.0.36.tar.bz2 differ: char 11, line 1 ++++++ linphone-build-jsoncpp.patch ++++++ diff -Nraub liblinphone-5.0.22.ori/CMakeLists.txt liblinphone-5.0.22/CMakeLists.txt --- liblinphone-5.0.22.ori/CMakeLists.txt 2021-09-09 23:33:57.000000000 -0400 +++ liblinphone-5.0.22/CMakeLists.txt 2021-09-11 22:31:10.816277962 -0400 @@ -207,7 +207,8 @@ endif() if (ENABLE_FLEXIAPI) - find_package(jsoncpp REQUIRED) + find_package(PkgConfig REQUIRED) + pkg_check_modules(JSONCPP REQUIRED jsoncpp) set(HAVE_FLEXIAPI TRUE) endif() diff -Nraub liblinphone-5.0.22.ori/src/CMakeLists.txt liblinphone-5.0.22/src/CMakeLists.txt --- liblinphone-5.0.22.ori/src/CMakeLists.txt 2021-09-09 23:33:57.000000000 -0400 +++ liblinphone-5.0.22/src/CMakeLists.txt 2021-09-11 22:29:46.614904584 -0400 @@ -32,7 +32,7 @@ if (XCODE) list(APPEND LINK_LIBS jsoncpp_static) else() - list(APPEND LINK_LIBS jsoncpp_object) + list(APPEND LINK_LIBS jsoncpp) endif() endif() @@ -589,7 +589,7 @@ if (XCODE) target_link_libraries(linphone PRIVATE jsoncpp_static) else() - target_link_libraries(linphone PRIVATE jsoncpp_object) + target_link_libraries(linphone PRIVATE jsoncpp) endif() endif() @@ -640,7 +640,7 @@ if (XCODE) target_link_libraries(linphone PRIVATE jsoncpp_static) else() - target_link_libraries(linphone PRIVATE jsoncpp_object) + target_link_libraries(linphone PRIVATE jsoncpp) endif() endif() diff -Nraub liblinphone-5.0.22.ori/tester/CMakeLists.txt liblinphone-5.0.22/tester/CMakeLists.txt --- liblinphone-5.0.22.ori/tester/CMakeLists.txt 2021-09-09 23:33:57.000000000 -0400 +++ liblinphone-5.0.22/tester/CMakeLists.txt 2021-09-11 22:29:46.618904459 -0400 @@ -34,7 +34,7 @@ if (XCODE) list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) else() - list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) + list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) endif() endif() ++++++ linphone-build-readline.patch ++++++ --- /var/tmp/diff_new_pack.0cAzmB/_old 2021-11-01 22:21:06.455226909 +0100 +++ /var/tmp/diff_new_pack.0cAzmB/_new 2021-11-01 22:21:06.455226909 +0100 @@ -62,13 +62,13 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,6 +69,7 @@ option(ENABLE_ASSETS "Package sound asse - option(ENABLE_PACKAGE_SOURCE "Create 'package_source' target for source archive making (CMake >= 3.11)" OFF) + cmake_dependent_option(ENABLE_NOTIFY "Enable libnotify support." YES "ENABLE_GTK_UI;NOT APPLE" NO) +cmake_dependent_option(ENABLE_READLINE "Enable readline support." YES "ENABLE_CONSOLE_UI" NO) cmake_dependent_option(ENABLE_ASSISTANT "Turn on assistant compiling." YES "ENABLE_GTK_UI" NO) - set(CMAKE_CXX_STANDARD 14) + # Hidden non-cache options: @@ -156,6 +157,15 @@ if(ENABLE_TUNNEL) set(ENABLE_TUNNEL OFF CACHE BOOL "Enable tunnel support." FORCE) endif() ++++++ linphone-link-soci-sqlite3.patch ++++++ --- /var/tmp/diff_new_pack.0cAzmB/_old 2021-11-01 22:21:06.463226912 +0100 +++ /var/tmp/diff_new_pack.0cAzmB/_new 2021-11-01 22:21:06.467226913 +0100 @@ -3,19 +3,20 @@ --- liblinphone-4.4.0.orig/CMakeLists.txt +++ liblinphone-4.4.0/CMakeLists.txt @@ -138,12 +138,7 @@ find_package(Sqlite3 REQUIRED) - find_package(XML2 REQUIRED) if (ENABLE_DB_STORAGE) -- #APPLE platform does not use dlopen for soci backend -- if (APPLE OR ANDROID) -- find_package(Soci REQUIRED COMPONENTS sqlite3) -- else() -- find_package(Soci REQUIRED) -- endif() -+ find_package(Soci REQUIRED COMPONENTS sqlite3) - set(HAVE_DB_STORAGE 1) - endif() - + if(NOT DISABLE_SOCI_PACKAGE_SEARCH) +- #APPLE platform does not use dlopen for soci backend +- if (APPLE OR ANDROID) +- find_package(Soci REQUIRED COMPONENTS sqlite3) +- else() +- find_package(Soci REQUIRED) +- endif() ++ find_package(Soci REQUIRED COMPONENTS sqlite3) + else() + set(SOCI_FOUND YES) + set(SOCI_LIBRARIES soci_core) + Index: liblinphone-4.4.0/src/CMakeLists.txt =================================================================== --- liblinphone-4.4.0.orig/src/CMakeLists.txt