commit 6905dbb198af63879393743d796e5992e1f6f075
Author: Jacek Konieczny <[email protected]>
Date: Fri Jul 10 09:06:56 2015 +0200
Version: 3.8.5
displayname_use_after_free.patch | 46 ----------------------------------------
linphone-sh.patch | 29 +++++++++++++++----------
linphone.spec | 21 ++++++++++++------
3 files changed, 32 insertions(+), 64 deletions(-)
---
diff --git a/linphone.spec b/linphone.spec
index d401fd1..d0ba305 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -16,15 +16,14 @@
Summary: Linphone Internet Phone
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
-Version: 3.7.0
-Release: 2
+Version: 3.8.5
+Release: 1
License: GPL v2+
Group: Applications/Communications
-Source0:
http://download-mirror.savannah.gnu.org/releases/linphone/3.7.x/sources/%{name}-%{version}.tar.gz
-# Source0-md5: 6978492712bdacd452e375254d6033ae
+Source0:
http://download-mirror.savannah.gnu.org/releases/linphone/3.8.x/sources/%{name}-%{version}.tar.gz
+# Source0-md5: fbc551c36350eb0414acef49926baf39
Patch0: %{name}-imgdir.patch
Patch1: %{name}-sh.patch
-Patch2: displayname_use_after_free.patch
URL: http://www.linphone.org/
BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: autoconf >= 2.50
@@ -190,7 +189,6 @@ find '(' -name '*.c' -o -name '*.h' ')' -print0 | xargs -0
%{__sed} -i -e 's,\r$
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
@@ -307,12 +305,16 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS BUGS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/linphone
+%attr(755,root,root) %{_bindir}/lp-autoanswer
+%{_desktopdir}/audio-assistant.desktop
%{_desktopdir}/linphone.desktop
%{_pixmapsdir}/linphone.png
%{_pixmapsdir}/linphone
+%{_iconsdir}/*/*/apps/linphone.png
%{_datadir}/linphone
%{_mandir}/man1/linphone.1*
%lang(cs) %{_mandir}/cs/man1/linphone.1*
+%{_datadir}/appdata/linphone.appdata.xml
%files -n linphonec
%defattr(644,root,root,755)
@@ -326,7 +328,9 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblinphone.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblinphone.so.6
+%attr(755,root,root) %ghost %{_libdir}/liblinphone.so.7
+%attr(755,root,root) %{_libdir}/liblinphonetester.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblinphonetester.so.0
%if %{without system_mediastreamer} || %{without system_ortp}
%dir %{_libdir}/%{name}
%endif
@@ -345,10 +349,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc coreapi/help/doc/html
%attr(755,root,root) %{_libdir}/liblinphone.so
+%attr(755,root,root) %{_libdir}/liblinphonetester.so
%attr(755,root,root) %{_bindir}/lp-gen-wrappers
%{_includedir}/linphone
%{_pkgconfigdir}/linphone.pc
%{_libdir}/liblinphone.la
+%{_libdir}/liblinphonetester.la
%if %{without system_mediastreamer} || %{without system_ortp}
%dir %{_libdir}/%{name}/include
%dir %{_libdir}/%{name}/pkgconfig
@@ -370,6 +376,7 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/liblinphone.a
+%{_libdir}/liblinphonetester.a
%if %{without system_mediastreamer}
%{_libdir}/%{name}/libmediastreamer.a
%endif
diff --git a/displayname_use_after_free.patch b/displayname_use_after_free.patch
deleted file mode 100644
index d2f2f17..0000000
--- a/displayname_use_after_free.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit a32c864292e147b769bc6f2b19735593cf84f41e
-Author: Jehan Monnier <[email protected]>
-Date: Mon Apr 14 16:28:57 2014 +0200
-
- fix invalid read in gtk app call log management
-
-diff --git a/gtk/calllogs.c b/gtk/calllogs.c
-index 2f7e8f7..7a4840a 100644
---- a/gtk/calllogs.c
-+++ b/gtk/calllogs.c
-@@ -293,7 +293,10 @@ void linphone_gtk_call_log_update(GtkWidget *w){
- #endif
-
lf=linphone_core_get_friend_by_address(linphone_gtk_get_core(),addr);
- if(lf != NULL){
--
display=linphone_address_get_display_name(linphone_friend_get_address(lf));
-+ if
((display=linphone_address_get_display_name(linphone_friend_get_address(lf)))) {
-+ /*update display name from friend*/
-+ linphone_address_set_display_name(la,display);
-+ }
- } else {
- display=linphone_address_get_display_name(la);
- }
-@@ -302,9 +305,8 @@ void linphone_gtk_call_log_update(GtkWidget *w){
- if (display==NULL){
- display=linphone_address_get_domain (la);
- }
-- } else {
-- linphone_address_set_display_name(la,display);
- }
-+
- if (linphone_call_log_get_quality(cl)!=-1){
-
snprintf(quality,sizeof(quality),"%.1f",linphone_call_log_get_quality(cl));
- }else snprintf(quality,sizeof(quality)-1,"%s",_("n/a"));
-diff --git a/tester/call_tester.c b/tester/call_tester.c
-index 2a18b30..c655e4b 100644
---- a/tester/call_tester.c
-+++ b/tester/call_tester.c
-@@ -355,7 +355,7 @@ static void call_with_dns_time_out(void) {
- linphone_core_set_sip_transports(marie->lc,&transport);
- linphone_core_iterate(marie->lc);
- sal_set_dns_timeout(marie->lc->sal,0);
-- linphone_core_invite(marie->lc,"sip:[email protected]");
-+ linphone_core_invite(marie->lc,"\"t\x8et\x8e\" sip:[email protected]");
/*just to use non ascii values*/
- for(i=0;i<10;i++){
- ms_usleep(200000);
- linphone_core_iterate(marie->lc);
diff --git a/linphone-sh.patch b/linphone-sh.patch
index 4c67e46..6ce4635 100644
--- a/linphone-sh.patch
+++ b/linphone-sh.patch
@@ -1,16 +1,23 @@
-diff -dur linphone-3.7.0.orig/configure.ac linphone-3.7.0/configure.ac
---- linphone-3.7.0.orig/configure.ac 2014-02-20 11:16:31.000000000 +0100
-+++ linphone-3.7.0/configure.ac 2014-06-06 14:47:59.000000000 +0200
-@@ -736,7 +736,7 @@
- AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
- if test x$enable_msg_storage != xfalse; then
- PKG_CHECK_MODULES(SQLITE3,[ sqlite3 >= 3.6.0],[
+diff -dur -x '*~' -x '*.orig' linphone-3.8.5.orig/configure.ac
linphone-3.8.5/configure.ac
+--- linphone-3.8.5.orig/configure.ac 2015-06-30 17:05:45.000000000 +0200
++++ linphone-3.8.5/configure.ac 2015-07-10 08:30:31.000000000 +0200
+@@ -867,12 +867,12 @@
+ PKG_CHECK_MODULES(SQLITE3,[sqlite3 >=
3.6.0],[found_sqlite=yes],[found_sqlite=no])
+ if test "$found_sqlite" = "no"; then
+ dnl Check the lib presence in case the PKG-CONFIG version is
not found
+- AC_CHECK_LIB(sqlite3, sqlite3_open, [SQLITE3_LIBS+=" -lsqlite3
"; found_sqlite=yes], [foo=bar])
++ AC_CHECK_LIB(sqlite3, sqlite3_open,
[SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes], [foo=bar])
+ fi
+ if test "$found_sqlite" = "yes"; then
- SQLITE3_CFLAGS+="-DMSG_STORAGE_ENABLED"
+ SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DMSG_STORAGE_ENABLED"
- AC_SUBST(SQLITE3_CFLAGS)
- AC_SUBST(SQLITE3_LIBS)
+ if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
+- SQLITE3_LIBS+=" -liconv"
++ SQLITE3_LIBS="$SQLITE3_LIBS -liconv"
+ fi
enable_msg_storage=true
-@@ -838,7 +838,7 @@
+ else
+@@ -945,7 +945,7 @@
[
AC_CHECK_LIB(cunit,CU_add_suite,[
found_cunit=yes
@@ -19,7 +26,7 @@ diff -dur linphone-3.7.0.orig/configure.ac
linphone-3.7.0/configure.ac
])
])
-@@ -847,7 +847,7 @@
+@@ -954,7 +954,7 @@
case "$target_os" in
*darwin*)
#hack for macport
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linphone.git/commitdiff/6905dbb198af63879393743d796e5992e1f6f075
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
