Compare commits
14 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
38cc735945 | ||
|
1b342b096b | ||
|
|
f8fadcc12b | ||
|
e1d98cbd7f | ||
|
|
f11c144e4f | ||
|
|
535650332b | ||
|
d43265a3b2 |
|||
|
|
d7e59a9790 | ||
|
|
2324865b8b | ||
|
|
661ed307ea | ||
|
|
3c2a9b09d1 | ||
|
|
74061b8879 | ||
|
8a142c3614 |
|||
| eeeb05add1 |
17 changed files with 1 additions and 1023 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
/sflphone-1.4.1.tar.gz
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Dead upstream and FTBFS due to pjproject API changes
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
diff -up sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp
|
||||
--- sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp.pjsip-api-change 2017-09-06 16:49:23.087165453 +0200
|
||||
+++ sflphone-1.4.1/daemon/src/sip/pres_sub_server.cpp 2017-09-06 16:52:28.338162891 +0200
|
||||
@@ -122,12 +122,13 @@ PresSubServer::pres_on_rx_subscribe_requ
|
||||
|
||||
/* Create UAS dialog: */
|
||||
const pj_str_t contact(acc->getContactHeader());
|
||||
- status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, &contact, &dlg);
|
||||
+ status = pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, &contact, &dlg);
|
||||
|
||||
if (status != PJ_SUCCESS) {
|
||||
char errmsg[PJ_ERR_MSG_SIZE];
|
||||
pj_strerror(status, errmsg, sizeof(errmsg));
|
||||
WARN("Unable to create UAS dialog for subscription: %s [status=%d]", errmsg, status);
|
||||
+ pjsip_dlg_dec_lock(dlg);
|
||||
pres->unlock();
|
||||
pjsip_endpt_respond_stateless(endpt, rdata, 400, NULL, NULL, NULL);
|
||||
return PJ_TRUE;
|
||||
@@ -156,6 +157,7 @@ PresSubServer::pres_on_rx_subscribe_requ
|
||||
pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), tdata);
|
||||
}
|
||||
|
||||
+ pjsip_dlg_dec_lock(dlg);
|
||||
pres->unlock();
|
||||
return PJ_FALSE;
|
||||
}
|
||||
@@ -200,6 +202,7 @@ PresSubServer::pres_on_rx_subscribe_requ
|
||||
if (status != PJ_SUCCESS) {
|
||||
WARN("Unable to accept presence subscription %d", status);
|
||||
pjsip_pres_terminate(sub, PJ_FALSE);
|
||||
+ pjsip_dlg_dec_lock(dlg);
|
||||
pres->unlock();
|
||||
return PJ_FALSE;
|
||||
}
|
||||
@@ -209,6 +212,7 @@ PresSubServer::pres_on_rx_subscribe_requ
|
||||
|
||||
if (presSubServer->getExpires() == 0) {
|
||||
// PJSIP_EVSUB_STATE_TERMINATED
|
||||
+ pjsip_dlg_dec_lock(dlg);
|
||||
pres->unlock();
|
||||
return PJ_TRUE;
|
||||
}
|
||||
@@ -245,10 +249,12 @@ PresSubServer::pres_on_rx_subscribe_requ
|
||||
if (status != PJ_SUCCESS) {
|
||||
WARN("Unable to create/send NOTIFY %d", status);
|
||||
pjsip_pres_terminate(sub, PJ_FALSE);
|
||||
+ pjsip_dlg_dec_lock(dlg);
|
||||
pres->unlock();
|
||||
return status;
|
||||
}
|
||||
|
||||
+ pjsip_dlg_dec_lock(dlg);
|
||||
pres->unlock();
|
||||
return PJ_TRUE;
|
||||
}
|
||||
diff -up sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp
|
||||
--- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp.pjsip-api-change 2017-09-06 16:49:38.812165235 +0200
|
||||
+++ sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2017-09-06 16:54:46.362160982 +0200
|
||||
@@ -405,9 +405,10 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
|
||||
pjsip_dialog *dialog = 0;
|
||||
|
||||
- if (pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, nullptr, &dialog) != PJ_SUCCESS) {
|
||||
+ if (pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata, nullptr, &dialog) != PJ_SUCCESS) {
|
||||
call.reset();
|
||||
try_respond_stateless(endpt_, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, nullptr, nullptr, nullptr);
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
@@ -415,11 +416,13 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
|
||||
if (!dialog or pjsip_dlg_set_transport(dialog, &tp_sel) != PJ_SUCCESS) {
|
||||
ERROR("Could not set transport for dialog");
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
if (!call->inv) {
|
||||
ERROR("Call invite is not initialized");
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
@@ -443,6 +446,7 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
try_respond_stateless(endpt_, rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
@@ -464,11 +468,13 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
} else { // Proceed with normal call flow
|
||||
if (pjsip_inv_initial_answer(call->inv, rdata, PJSIP_SC_TRYING, NULL, NULL, &tdata) != PJ_SUCCESS) {
|
||||
ERROR("Could not answer invite");
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
if (pjsip_inv_send_msg(call->inv, tdata) != PJ_SUCCESS) {
|
||||
ERROR("Could not send msg for invite");
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
@@ -476,6 +482,7 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
|
||||
if (pjsip_inv_answer(call->inv, PJSIP_SC_RINGING, NULL, NULL, &tdata) != PJ_SUCCESS) {
|
||||
ERROR("Could not answer invite");
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
@@ -485,6 +492,7 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
|
||||
if (pjsip_inv_send_msg(call->inv, tdata) != PJ_SUCCESS) {
|
||||
ERROR("Could not send msg for invite");
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
@@ -494,6 +502,8 @@ transaction_request_cb(pjsip_rx_data *rd
|
||||
Manager::instance().incomingCall(*call, account_id);
|
||||
}
|
||||
|
||||
+ pjsip_dlg_dec_lock(dialog);
|
||||
+
|
||||
return PJ_FALSE;
|
||||
}
|
||||
|
||||
393
sflphone.spec
393
sflphone.spec
|
|
@ -1,393 +0,0 @@
|
|||
Name: sflphone
|
||||
Version: 1.4.1
|
||||
Release: 27%{?dist}
|
||||
Summary: SIP/IAX2 compatible enterprise-class software phone
|
||||
|
||||
License: GPLv3+
|
||||
URL: https://gitlab.savoirfairelinux.com/sfl-ports/sflphone
|
||||
# Note: the number in the URL is different for every release
|
||||
Source0: https://projects.savoirfairelinux.com/attachments/download/14805/%{name}-%{version}.tar.gz
|
||||
# Install icon to hicolor/scalable/apps
|
||||
Patch0: sflphone_icondir.patch
|
||||
# Unbundle pjproject
|
||||
Patch1: sflphone_unbundle.patch
|
||||
# ZRTP API changes
|
||||
Patch2: sflphone_zrtp.patch
|
||||
# Workaround for bad #includes in zrtp headers, see https://github.com/wernerd/ZRTPCPP/pull/19
|
||||
Patch3: sflphone_zrtp-includes.patch
|
||||
# Disable video support in kde interface (video is not available without ffmpeg)
|
||||
Patch4: sflphone_novideo.patch
|
||||
# Fix gcc5 FTBFS issues
|
||||
Patch5: sflphone_gcc5.patch
|
||||
# Install sflphoned in libexecdir
|
||||
Patch6: sflphone_sflphoned-dir.patch
|
||||
# Fix incorrect conditional in SipTransport::createTlsListener
|
||||
Patch7: sflphone_tls.patch
|
||||
# Fix memory corruption due to keeping pointer to local variable after scope ended
|
||||
Patch8: sflphone_memory-corruption.patch
|
||||
# Fix GCC6 FTBFS due to "error: the compiler can assume that the address of 'other' will always evaluate to 'true'"
|
||||
Patch9: sflphone_gcc6.patch
|
||||
# Fix GCC7 FTBFS due to
|
||||
# - ISO C++ forbids flexible array member 'm_Data' [-Werror=pedantic]
|
||||
# - error: this statement may fall through [-Werror=implicit-fallthrough=]
|
||||
Patch10: sflphone_gcc7.patch
|
||||
# Fix FTBFS due to ERROR: The token "BOOL" is deprecated; use "BOOLEAN" instead
|
||||
Patch11: sflphone_dbus.patch
|
||||
# Adapt to pjsip API change
|
||||
Patch12: sflphone-pjspi-api-change.patch
|
||||
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: ccrtp-devel
|
||||
BuildRequires: check-devel
|
||||
BuildRequires: clutter-gtk-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: dbus-glib-devel
|
||||
BuildRequires: dbus-c++-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: evolution-data-server-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gnome-doc-utils
|
||||
BuildRequires: gnutls-devel
|
||||
BuildRequires: gsm-devel
|
||||
BuildRequires: iaxclient-libiax-devel
|
||||
BuildRequires: ilbc-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: kdepimlibs-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libsamplerate-devel
|
||||
BuildRequires: libsexy-devel
|
||||
BuildRequires: libsndfile-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libyaml-devel
|
||||
BuildRequires: libzrtpcpp-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: perl-podlators
|
||||
BuildRequires: pjproject-devel
|
||||
BuildRequires: pulseaudio-libs-devel
|
||||
BuildRequires: rarian-compat
|
||||
BuildRequires: speex-devel
|
||||
BuildRequires: speexdsp-devel
|
||||
BuildRequires: systemd-devel
|
||||
BuildRequires: yelp-tools
|
||||
|
||||
|
||||
%description
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
|
||||
%package common
|
||||
Summary: Common files for SFLPhone
|
||||
Requires: %{name}-daemon = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description common
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
This package includes common files for SFLPhone.
|
||||
|
||||
|
||||
%package daemon
|
||||
Summary: SFLPhone daemon
|
||||
Requires: %{name}-common = %{version}-%{release}
|
||||
Requires: dbus%{?_isa}
|
||||
Obsoletes: %{name}-libs < 1.4.1-9
|
||||
|
||||
%description daemon
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
This package includes the SFLPhone daemon.
|
||||
|
||||
|
||||
%package gnome
|
||||
Summary: SIP/IAX2 compatible enterprise-class software phone
|
||||
Requires: %{name}-daemon%{?_isa} = %{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
|
||||
%description gnome
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
This package includes the Gnome client.
|
||||
|
||||
|
||||
%package gnome-plugins
|
||||
Summary: Plugins (address book) for SFLphone
|
||||
Requires: %{name}-gnome%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description gnome-plugins
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
This package includes the address book plugin.
|
||||
|
||||
|
||||
%package kde
|
||||
Summary: KDE interface for SFLphone
|
||||
Requires: %{name}-daemon%{?_isa} = %{version}-%{release}
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: kde-filesystem
|
||||
|
||||
%description kde
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
This package includes the KDE client.
|
||||
|
||||
|
||||
%package kde-devel
|
||||
Summary: Development files for the KDE interface for SFLphone
|
||||
Requires: %{name}-kde%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description kde-devel
|
||||
SFLphone is a robust standards-compliant enterprise software phone,
|
||||
for desktop and embedded systems. It is designed to handle
|
||||
several hundreds of calls a day. It supports both SIP and IAX2
|
||||
protocols.
|
||||
|
||||
This package includes the development files for the KDE client.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}
|
||||
|
||||
# Unbundle bundled libraries
|
||||
rm -rf daemon/libs
|
||||
|
||||
# Fix FSF addresses
|
||||
find . -type f -print0 | xargs -0 sed -i 's|675 Mass Ave, Cambridge, MA 02139|51 Franklin Street, Fifth Floor, Boston, MA 02110-1301|'
|
||||
|
||||
|
||||
%build
|
||||
### Compile the daemon ###
|
||||
pushd daemon
|
||||
./autogen.sh
|
||||
LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video
|
||||
%make_build V=1
|
||||
make doc
|
||||
popd
|
||||
|
||||
### Compile gnome client ###
|
||||
pushd gnome
|
||||
./autogen.sh
|
||||
LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure --disable-video
|
||||
%make_build V=1
|
||||
popd
|
||||
|
||||
### Compile plugins ###
|
||||
pushd plugins
|
||||
./autogen.sh
|
||||
LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %configure
|
||||
%make_build V=1
|
||||
popd
|
||||
|
||||
### Compile kde client ###
|
||||
mkdir kde/build
|
||||
pushd kde/build
|
||||
LDFLAGS="%{__global_ldflags} -Wl,--as-needed" %cmake ..
|
||||
%make_build VERBOSE=1
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
%make_install -C daemon
|
||||
%make_install -C gnome
|
||||
%make_install -C plugins
|
||||
%make_install -C kde/build
|
||||
|
||||
%find_lang sflphone --with-gnome
|
||||
%find_lang sflphone-client-kde --with-kde -f sflphone-client-kde
|
||||
%find_lang sflphone-kde --with-kde -f sflphone-kde
|
||||
|
||||
# Fix error: file contains group "Protocol", but groups extending the format should start with "X-"
|
||||
sed -i 's|\[Protocol\]|\[X-Protocol\]|' %{buildroot}%{_datadir}/applications/kde4/sflphone-client-kde.desktop
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
# Fix gzipped-svg-icon
|
||||
(
|
||||
cd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
|
||||
zcat sflphone-client-kde.svgz > sflphone-client-kde.svg && rm -f sflphone-client-kde.svgz
|
||||
)
|
||||
|
||||
|
||||
%post gnome
|
||||
/usr/bin/update-desktop-database &> /dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%postun gnome
|
||||
/usr/bin/update-desktop-database &> /dev/null || :
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans gnome
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
||||
|
||||
|
||||
%post kde
|
||||
/usr/sbin/ldconfig
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%postun kde
|
||||
/usr/sbin/ldconfig
|
||||
if [ $1 -eq 0 ] ; then
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans kde
|
||||
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
|
||||
%files common
|
||||
%license COPYING
|
||||
%doc daemon/AUTHORS NEWS README
|
||||
%{_datadir}/%{name}/
|
||||
|
||||
%files daemon
|
||||
%{_libdir}/%{name}/
|
||||
%{_datadir}/dbus-1/services/org.%{name}.SFLphone.service
|
||||
%exclude %{_libdir}/%{name}/plugins/
|
||||
%{_mandir}/man1/sflphoned.1.gz*
|
||||
%{_libexecdir}/sflphoned
|
||||
|
||||
%files gnome -f sflphone.lang
|
||||
%{_bindir}/sflphone
|
||||
%{_bindir}/sflphone-client-gnome
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.sflphone.SFLphone.gschema.xml
|
||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||
%{_mandir}/man1/sflphone.1.gz
|
||||
%{_mandir}/man1/sflphone-client-gnome.1.gz
|
||||
|
||||
%files gnome-plugins
|
||||
%{_libdir}/%{name}/plugins/
|
||||
|
||||
%files kde -f sflphone-client-kde -f sflphone-kde
|
||||
%{_bindir}/sflphone-client-kde
|
||||
%{_datadir}/applications/kde4/sflphone-client-kde.desktop
|
||||
%{_datadir}/config.kcfg/sflphone-client-kde.kcfg
|
||||
%{_datadir}/icons/hicolor/*/apps/sflphone-client-kde*
|
||||
%{_datadir}/kde4/apps/sflphone-client-kde
|
||||
%{_libdir}/libksflphone.so.*
|
||||
%{_libdir}/libqtsflphone.so.*
|
||||
%{_mandir}/man1/*kde*
|
||||
|
||||
%files kde-devel
|
||||
%{_includedir}/ksflphone/
|
||||
%{_includedir}/qtsflphone/
|
||||
%{_libdir}/libksflphone.so
|
||||
%{_libdir}/libqtsflphone.so
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Sep 06 2017 Sandro Mani <manisandro@gmail.com> - 1.4.1-27
|
||||
- Add patch to fix deprecated dbus marshalling types
|
||||
|
||||
* Wed Sep 06 2017 Milan Crha <mcrha@redhat.com> - 1.4.1-26
|
||||
- Add patch to adapt to pjspi API change
|
||||
|
||||
* Mon Aug 28 2017 Milan Crha <mcrha@redhat.com> - 1.4.1-25
|
||||
- Add patch to not use --g-fatal-warnings for glib-genmarshal
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Thu Feb 16 2017 Sandro Mani <manisandro@gmail.com> - 1.4.1-22
|
||||
- Drop F22 conditionals
|
||||
- Add patch to fix GCC7 FTBFS
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Oct 31 2016 Sandro Mani <manisandro@gmail.com> - 1.4.1-20
|
||||
- Rebuild (evolution-data-server)
|
||||
- BR: dbus-glib-devel
|
||||
|
||||
* Sat Jul 23 2016 Sandro Mani <manisandro@gmail.com> - 1.4.1-19
|
||||
- Rebuild (evolution-data-server)
|
||||
|
||||
* Fri Feb 05 2016 Sandro Mani <manisandro@gmail.com> - 1.4.1-18
|
||||
- Add patch to fix FTBFS
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sat Dec 26 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-16
|
||||
- Rebuild (ucommon)
|
||||
|
||||
* Thu Aug 06 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-15
|
||||
- Rebuild (ucommon)
|
||||
|
||||
* Wed Jul 22 2015 Milan Crha <mcrha@redhat.com> - 1.4.1-14
|
||||
- Rebuild for newer evolution-data-server
|
||||
|
||||
* Thu Jun 25 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-13
|
||||
- Add patch to fix memory corruption issues (#1222301)
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri May 15 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-10
|
||||
- Add patch to fix incorrect conditional in SipTransport::createTlsListener
|
||||
|
||||
* Wed May 06 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-9
|
||||
- Install sflphoned in /usr/libexec
|
||||
- Rename sflphone-libs -> sflphone-daemon
|
||||
|
||||
* Tue Apr 28 2015 Milan Crha <mcrha@redhat.com> - 1.4.1-8
|
||||
- Rebuild for newer evolution-data-server
|
||||
|
||||
* Sat Apr 18 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-7
|
||||
- Pass --disable-video to Gnome client configure
|
||||
|
||||
* Tue Feb 17 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-6
|
||||
- Rebuild (evolution-data-server)
|
||||
|
||||
* Tue Jan 27 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-5
|
||||
- Put org.sflphone.SFLphone.service in -libs package (it contains an arch specific path)
|
||||
|
||||
* Tue Jan 27 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-4
|
||||
- Remove -Wl,--as-needed, makes the application crash with -Wl,-z,relro
|
||||
|
||||
* Mon Jan 26 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-3
|
||||
- Set %%{__global_ldflags} in LDFLAGS override
|
||||
|
||||
* Thu Jan 22 2015 Sandro Mani <manisandro@gmail.com> - 1.4.1-2
|
||||
- Use %%license
|
||||
- Add Requires: dbus to sflphone-common
|
||||
- Fixed ownership of %%{_datadir}/icons/hicolor, added Requires: hicolor-icon-theme
|
||||
- Fixed ownership of %%{_datadir}/applications/kde4/
|
||||
- Require sflphone-libs in sflphone-kde, sflphone-gnome, not sflphone-common
|
||||
- Fix desktop file
|
||||
- Add LDFLAGS="-Wl,--as-needed"
|
||||
- Fix FSF addresses
|
||||
|
||||
* Sun Dec 14 2014 Sandro Mani <manisandro@gmail.com> - 1.4.1-1
|
||||
- 1.4.1
|
||||
|
||||
* Sun Aug 10 2014 Sandro Mani <manisandro@gmail.com> - 1.4.0-1
|
||||
- Initial package
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/gnome/src/dbus/dbus.c sflphone-1.4.1-new/gnome/src/dbus/dbus.c
|
||||
--- sflphone-1.4.1/gnome/src/dbus/dbus.c 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/gnome/src/dbus/dbus.c 2017-08-09 16:43:51.217374161 +0200
|
||||
@@ -829,7 +829,7 @@ gboolean dbus_connect(GError **error, SF
|
||||
|
||||
/* Register STRING STRING BOOL Marshaller */
|
||||
dbus_g_object_register_marshaller(
|
||||
- g_cclosure_user_marshal_VOID__STRING_STRING_BOOL, G_TYPE_NONE,
|
||||
+ g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN, G_TYPE_NONE,
|
||||
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
|
||||
|
||||
/* Register STRING STRING INT Marshaller */
|
||||
diff -rupN sflphone-1.4.1/gnome/src/dbus/marshaller.list sflphone-1.4.1-new/gnome/src/dbus/marshaller.list
|
||||
--- sflphone-1.4.1/gnome/src/dbus/marshaller.list 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/gnome/src/dbus/marshaller.list 2017-08-09 16:43:34.577383669 +0200
|
||||
@@ -5,9 +5,9 @@ VOID:STRING,INT
|
||||
VOID:STRING,DOUBLE
|
||||
VOID:STRING,STRING
|
||||
VOID:STRING,INT,INT
|
||||
-VOID:STRING,STRING,BOOL
|
||||
+VOID:STRING,STRING,BOOLEAN
|
||||
VOID:STRING,STRING,INT
|
||||
VOID:STRING,STRING,STRING
|
||||
-VOID:STRING,STRING,INT,INT,BOOL
|
||||
-VOID:STRING,STRING,BOOL,STRING
|
||||
+VOID:STRING,STRING,INT,INT,BOOLEAN
|
||||
+VOID:STRING,STRING,BOOLEAN,STRING
|
||||
VOID:STRING,BOXED
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h
|
||||
--- sflphone-1.4.1/daemon/src/ip_utils.h 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/ip_utils.h 2015-02-21 23:27:06.631839605 +0100
|
||||
@@ -33,6 +33,7 @@
|
||||
#define IP_UTILS_H_
|
||||
|
||||
#include <pjlib.h>
|
||||
+#undef isblank // macro collides with symbol...
|
||||
#include <ccrtp/channel.h> // For ost::IPV*Address
|
||||
|
||||
#include <netinet/ip.h>
|
||||
diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp
|
||||
--- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2015-02-21 23:42:40.570974842 +0100
|
||||
@@ -107,7 +107,7 @@ SIPAccount::SIPAccount(const std::string
|
||||
, tlsPassword_()
|
||||
, tlsMethod_("TLSv1")
|
||||
, tlsCiphers_()
|
||||
- , tlsServerName_(0, 0)
|
||||
+ , tlsServerName_()
|
||||
, tlsVerifyServer_(false)
|
||||
, tlsVerifyClient_(true)
|
||||
, tlsRequireClientCertificate_(true)
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/kde/src/lib/contact.cpp sflphone-1.4.1-new/kde/src/lib/contact.cpp
|
||||
--- sflphone-1.4.1/kde/src/lib/contact.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/contact.cpp 2016-02-05 19:02:48.755201247 +0100
|
||||
@@ -453,13 +453,3 @@ bool Contact::operator==(const Contact*
|
||||
{
|
||||
return other && this->d == other->d;
|
||||
}
|
||||
-
|
||||
-bool Contact::operator==(Contact& other)
|
||||
-{
|
||||
- return &other && this->d == other.d;
|
||||
-}
|
||||
-
|
||||
-bool Contact::operator==(const Contact& other) const
|
||||
-{
|
||||
- return &other && this->d == other.d;
|
||||
-}
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/contact.h sflphone-1.4.1-new/kde/src/lib/contact.h
|
||||
--- sflphone-1.4.1/kde/src/lib/contact.h 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/contact.h 2016-02-05 19:02:42.812041560 +0100
|
||||
@@ -132,8 +132,6 @@ public:
|
||||
//Operator
|
||||
bool operator==(Contact* other);
|
||||
bool operator==(const Contact* other) const;
|
||||
- bool operator==(Contact& other);
|
||||
- bool operator==(const Contact& other) const;
|
||||
|
||||
private Q_SLOTS:
|
||||
void slotPresenceChanged();
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.cpp sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp
|
||||
--- sflphone-1.4.1/kde/src/lib/phonenumber.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.cpp 2016-02-05 19:29:37.775461245 +0100
|
||||
@@ -547,16 +547,6 @@ bool PhoneNumber::operator==(const Phone
|
||||
return other && this->d == other->d;
|
||||
}
|
||||
|
||||
-bool PhoneNumber::operator==(PhoneNumber& other)
|
||||
-{
|
||||
- return &other && this->d == other.d;
|
||||
-}
|
||||
-
|
||||
-bool PhoneNumber::operator==(const PhoneNumber& other) const
|
||||
-{
|
||||
- return &other && this->d == other.d;
|
||||
-}
|
||||
-
|
||||
/************************************************************************************
|
||||
* *
|
||||
* Temporary phone number *
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/phonenumber.h sflphone-1.4.1-new/kde/src/lib/phonenumber.h
|
||||
--- sflphone-1.4.1/kde/src/lib/phonenumber.h 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/phonenumber.h 2016-02-05 19:29:27.722111681 +0100
|
||||
@@ -125,8 +125,6 @@ public:
|
||||
//Operator
|
||||
bool operator==(PhoneNumber* other);
|
||||
bool operator==(const PhoneNumber* other) const;
|
||||
- bool operator==(PhoneNumber& other);
|
||||
- bool operator==(const PhoneNumber& other) const;
|
||||
|
||||
protected:
|
||||
//Constructor
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp
|
||||
--- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2016-02-05 19:18:04.561964557 +0100
|
||||
@@ -49,10 +49,7 @@ struct SHMHeader{
|
||||
/* The header will be aligned on 16-byte boundaries */
|
||||
char padding[8];
|
||||
|
||||
-#pragma GCC diagnostic push
|
||||
-#pragma GCC diagnostic ignored "-pedantic"
|
||||
char m_Data[];
|
||||
-#pragma GCC diagnostic pop
|
||||
};
|
||||
|
||||
///Constructor
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/kde/src/eventmanager.cpp sflphone-1.4.1-new/kde/src/eventmanager.cpp
|
||||
--- sflphone-1.4.1/kde/src/eventmanager.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/eventmanager.cpp 2017-02-16 16:34:26.071363596 +0100
|
||||
@@ -63,6 +63,7 @@ protected:
|
||||
break;
|
||||
case Qt::WindowActive:
|
||||
qDebug() << "The window is now active";
|
||||
+ break;
|
||||
case Qt::WindowNoState:
|
||||
default:
|
||||
if (e->oldState() == Qt::WindowMinimized)
|
||||
@@ -464,6 +465,7 @@ void EventManager::enter()
|
||||
case Call::State::DIALING:
|
||||
//Change account if it changed
|
||||
call->setAccount(AccountListModel::instance()->currentAccount());
|
||||
+ break;
|
||||
case Call::State::INCOMING:
|
||||
case Call::State::TRANSFERRED:
|
||||
case Call::State::TRANSF_HOLD:
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/account.cpp sflphone-1.4.1-new/kde/src/lib/account.cpp
|
||||
--- sflphone-1.4.1/kde/src/lib/account.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/account.cpp 2017-02-16 15:01:18.122412899 +0100
|
||||
@@ -374,8 +374,10 @@ QString Account::password() const
|
||||
case Account::Protocol::SIP:
|
||||
if (credentialsModel()->rowCount())
|
||||
return credentialsModel()->data(credentialsModel()->index(0,0),CredentialModel::Role::PASSWORD).toString();
|
||||
+ break;
|
||||
case Account::Protocol::IAX:
|
||||
return accountDetail(Account::MapField::PASSWORD);
|
||||
+ break;
|
||||
};
|
||||
return "";
|
||||
}
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/call.cpp sflphone-1.4.1-new/kde/src/lib/call.cpp
|
||||
--- sflphone-1.4.1/kde/src/lib/call.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/call.cpp 2017-02-16 14:51:22.512603859 +0100
|
||||
@@ -191,16 +191,22 @@ QDebug LIB_EXPORT operator<<(QDebug dbg,
|
||||
switch (c) {
|
||||
case Call::Action::ACCEPT:
|
||||
dbg.nospace() << "ACCEPT";
|
||||
+ /* FALLTHRU */
|
||||
case Call::Action::REFUSE:
|
||||
dbg.nospace() << "REFUSE";
|
||||
+ /* FALLTHRU */
|
||||
case Call::Action::TRANSFER:
|
||||
dbg.nospace() << "TRANSFER";
|
||||
+ /* FALLTHRU */
|
||||
case Call::Action::HOLD:
|
||||
dbg.nospace() << "HOLD";
|
||||
+ /* FALLTHRU */
|
||||
case Call::Action::RECORD:
|
||||
dbg.nospace() << "RECORD";
|
||||
+ /* FALLTHRU */
|
||||
case Call::Action::__COUNT:
|
||||
dbg.nospace() << "COUNT";
|
||||
+ /* FALLTHRU */
|
||||
};
|
||||
dbg.space();
|
||||
dbg.nospace() << '(' << static_cast<int>(c) << ')';
|
||||
diff -rupN sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp
|
||||
--- sflphone-1.4.1/kde/src/lib/video/videorenderer.cpp 2017-02-16 14:35:42.351238109 +0100
|
||||
+++ sflphone-1.4.1-new/kde/src/lib/video/videorenderer.cpp 2017-02-16 14:37:30.942915551 +0100
|
||||
@@ -49,7 +49,7 @@ struct SHMHeader{
|
||||
/* The header will be aligned on 16-byte boundaries */
|
||||
char padding[8];
|
||||
|
||||
- char m_Data[];
|
||||
+ char* m_Data;
|
||||
};
|
||||
|
||||
///Constructor
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
diff -rupN sflphone-1.4.0/gnome/pixmaps/Makefile.am sflphone-1.4.0-new/gnome/pixmaps/Makefile.am
|
||||
--- sflphone-1.4.0/gnome/pixmaps/Makefile.am 2014-07-18 22:45:09.000000000 +0200
|
||||
+++ sflphone-1.4.0-new/gnome/pixmaps/Makefile.am 2014-08-10 15:07:48.842721079 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-icondir = $(datadir)/pixmaps
|
||||
+icondir = $(datadir)/icons/hicolor/scalable/apps
|
||||
|
||||
icon_DATA = sflphone.svg
|
||||
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp
|
||||
--- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp 2015-06-07 00:15:17.460394766 +0200
|
||||
@@ -1076,10 +1076,20 @@ void SIPAccount::initTlsConfiguration()
|
||||
// TLS listener is unique and should be only modified through IP2IP_PROFILE
|
||||
pjsip_tls_setting_default(&tlsSetting_);
|
||||
|
||||
- pj_cstr(&tlsSetting_.ca_list_file, tlsCaListFile_.c_str());
|
||||
- pj_cstr(&tlsSetting_.cert_file, tlsCertificateFile_.c_str());
|
||||
- pj_cstr(&tlsSetting_.privkey_file, tlsPrivateKeyFile_.c_str());
|
||||
- pj_cstr(&tlsSetting_.password, tlsPassword_.c_str());
|
||||
+ pj_pool_t *pool = link_.getMemoryPool();
|
||||
+
|
||||
+ pj_str_t tlsCaListFile_str = pj_str((char*) tlsCaListFile_.c_str());
|
||||
+ pj_strdup(pool, &tlsSetting_.ca_list_file, &tlsCaListFile_str);
|
||||
+
|
||||
+ pj_str_t tlsCertificateFile_str = pj_str((char*) tlsCertificateFile_.c_str());
|
||||
+ pj_strdup(pool, &tlsSetting_.cert_file, &tlsCertificateFile_str);
|
||||
+
|
||||
+ pj_str_t tlsPrivateKeyFile_str = pj_str((char*) tlsPrivateKeyFile_.c_str());
|
||||
+ pj_strdup(pool, &tlsSetting_.privkey_file, &tlsPrivateKeyFile_str);
|
||||
+
|
||||
+ pj_str_t tlsPassword_str = pj_str((char*) tlsPassword_.c_str());
|
||||
+ pj_strdup(pool, &tlsSetting_.password, &tlsPassword_str);
|
||||
+
|
||||
tlsSetting_.method = sslMethodStringToPjEnum(tlsMethod_);
|
||||
tlsSetting_.ciphers_num = ciphers_.size();
|
||||
tlsSetting_.ciphers = &ciphers_.front();
|
||||
@@ -1451,6 +1461,8 @@ void SIPAccount::setCredentials(const st
|
||||
|
||||
size_t i = 0;
|
||||
|
||||
+ pj_pool_t *pool = link_.getMemoryPool();
|
||||
+
|
||||
for (const auto &item : credentials_) {
|
||||
map<string, string>::const_iterator val = item.find(CONFIG_ACCOUNT_PASSWORD);
|
||||
const std::string password = val != item.end() ? val->second : "";
|
||||
@@ -1461,17 +1473,25 @@ void SIPAccount::setCredentials(const st
|
||||
val = item.find(CONFIG_ACCOUNT_USERNAME);
|
||||
|
||||
if (val != item.end())
|
||||
- cred_[i].username = pj_str((char*) val->second.c_str());
|
||||
+ {
|
||||
+ pj_str_t username_str = pj_str((char*) val->second.c_str());
|
||||
+ pj_strdup(pool, &cred_[i].username, &username_str);
|
||||
+ }
|
||||
|
||||
- cred_[i].data = pj_str((char*) password.c_str());
|
||||
+ pj_str_t password_str = pj_str((char*) password.c_str());
|
||||
+ pj_strdup(pool, &cred_[i].data, &password_str);
|
||||
|
||||
val = item.find(CONFIG_ACCOUNT_REALM);
|
||||
|
||||
if (val != item.end())
|
||||
- cred_[i].realm = pj_str((char*) val->second.c_str());
|
||||
+ {
|
||||
+ pj_str_t realm_str = pj_str((char*) val->second.c_str());
|
||||
+ pj_strdup(pool, &cred_[i].realm, &realm_str);
|
||||
+ }
|
||||
|
||||
cred_[i].data_type = dataType;
|
||||
- cred_[i].scheme = pj_str((char*) "digest");
|
||||
+ pj_str_t scheme_str = pj_str((char*) "digest");
|
||||
+ pj_strdup(pool, &cred_[i].scheme, &scheme_str);
|
||||
++i;
|
||||
}
|
||||
}
|
||||
diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp
|
||||
--- sflphone-1.4.1/daemon/src/sip/sipvoiplink.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.cpp 2015-06-03 00:27:56.528068793 +0200
|
||||
@@ -508,6 +508,11 @@ pjsip_module * SIPVoIPLink::getMod()
|
||||
return &mod_ua_;
|
||||
}
|
||||
|
||||
+pj_pool_t * SIPVoIPLink::getMemoryPool() const
|
||||
+{
|
||||
+ return pool_;
|
||||
+}
|
||||
+
|
||||
SIPVoIPLink::SIPVoIPLink() : sipTransport(), sipAccountMap_(),
|
||||
sipCallMapMutex_(), sipCallMap_()
|
||||
#ifdef SFL_VIDEO
|
||||
diff -rupN sflphone-1.4.1/daemon/src/sip/sipvoiplink.h sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h
|
||||
--- sflphone-1.4.1/daemon/src/sip/sipvoiplink.h 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/sip/sipvoiplink.h 2015-06-03 00:27:35.439631448 +0200
|
||||
@@ -302,6 +302,8 @@ class SIPVoIPLink : public VoIPLink {
|
||||
int getModId();
|
||||
pjsip_endpoint * getEndpoint();
|
||||
pjsip_module * getMod();
|
||||
+ pj_pool_t * getMemoryPool() const;
|
||||
+
|
||||
private:
|
||||
|
||||
NON_COPYABLE(SIPVoIPLink);
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/kde/src/CMakeLists.txt sflphone-1.4.1-new/kde/src/CMakeLists.txt
|
||||
--- sflphone-1.4.1/kde/src/CMakeLists.txt 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/kde/src/CMakeLists.txt 2014-12-27 21:29:30.736654122 +0100
|
||||
@@ -7,6 +7,7 @@ if(POLICY CMP0022)
|
||||
endif(POLICY CMP0022)
|
||||
|
||||
# set(CMAKE_AUTOMOC ON)
|
||||
+set(ENABLE_VIDEO false)
|
||||
|
||||
FIND_PACKAGE ( KDE4 REQUIRED )
|
||||
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/src/client/dbus/Makefile.am sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am
|
||||
--- sflphone-1.4.1/daemon/src/client/dbus/Makefile.am 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/client/dbus/Makefile.am 2015-05-06 14:35:15.551521795 +0200
|
||||
@@ -70,7 +70,7 @@ service_DATA = $(service_in_files:.servi
|
||||
|
||||
# Rule to make the service file with bindir expanded
|
||||
$(service_DATA): $(service_in_files) Makefile
|
||||
- sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
|
||||
+ sed -e "s|libexec|$(libexecdir)|" $<> $@
|
||||
|
||||
EXTRA_DIST = README $(service_in_files) \
|
||||
callmanager-introspec.xml \
|
||||
diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am
|
||||
--- sflphone-1.4.1/daemon/src/Makefile.am 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2015-05-06 14:31:46.556525919 +0200
|
||||
@@ -1,6 +1,5 @@
|
||||
include ../globals.mak
|
||||
|
||||
-libexecdir=$(libdir)/sflphone
|
||||
libexec_PROGRAMS = sflphoned
|
||||
|
||||
if SFL_VIDEO
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/src/sip/siptransport.cpp sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp
|
||||
--- sflphone-1.4.1/daemon/src/sip/siptransport.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/sip/siptransport.cpp 2015-05-15 16:31:17.575239534 +0200
|
||||
@@ -254,7 +254,7 @@ SipTransport::createTlsListener(SIPAccou
|
||||
|
||||
listeningAddress.setPort(account.getTlsListenerPort());
|
||||
|
||||
- RETURN_IF_FAIL(not listeningAddress, nullptr, "Could not determine IP address for this transport");
|
||||
+ RETURN_IF_FAIL(listeningAddress, nullptr, "Could not determine IP address for this transport");
|
||||
|
||||
DEBUG("Creating Listener on %s...", listeningAddress.toString(true).c_str());
|
||||
DEBUG("CRT file : %s", account.getTlsSetting()->ca_list_file.ptr);
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/configure.ac sflphone-1.4.1-new/daemon/configure.ac
|
||||
--- sflphone-1.4.1/daemon/configure.ac 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/configure.ac 2014-12-13 23:38:33.295585251 +0100
|
||||
@@ -431,8 +431,6 @@ AS_IF([test "x$enable_debug" = "xyes"],
|
||||
dnl What Makefiles to generate
|
||||
|
||||
AC_CONFIG_FILES([Makefile \
|
||||
- libs/Makefile \
|
||||
- libs/iax2/Makefile \
|
||||
src/Makefile \
|
||||
src/sip/Makefile \
|
||||
src/im/Makefile \
|
||||
@@ -460,5 +458,4 @@ AC_CONFIG_FILES([Makefile \
|
||||
# Go!
|
||||
AC_OUTPUT
|
||||
|
||||
-AC_CONFIG_SUBDIRS([libs/pjproject-2.2.1])
|
||||
-AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-2.2.1) has already been compiled. Run `make' to build the software.]])
|
||||
+AC_MSG_NOTICE([[Configuration done! Run `make' to build the software.]])
|
||||
diff -rupN sflphone-1.4.1/daemon/globals.mak sflphone-1.4.1-new/daemon/globals.mak
|
||||
--- sflphone-1.4.1/daemon/globals.mak 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/globals.mak 2014-12-13 23:38:33.296585270 +0100
|
||||
@@ -7,18 +7,9 @@ sflplugindir=$(sfllibdir)/plugins
|
||||
|
||||
ASTYLERC="$(top_srcdir)/../astylerc"
|
||||
indent="/usr/bin/astyle"
|
||||
-PJPROJECT_DIR=pjproject-2.2.1
|
||||
|
||||
# for pjsip
|
||||
-include $(src)/libs/$(PJPROJECT_DIR)/build.mak
|
||||
-PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS)
|
||||
-
|
||||
-SIP_CFLAGS=-I$(src)/libs/$(PJPROJECT_DIR)/pjsip/include \
|
||||
- -I$(src)/libs/$(PJPROJECT_DIR)/pjlib/include \
|
||||
- -I$(src)/libs/$(PJPROJECT_DIR)/pjlib-util/include \
|
||||
- -I$(src)/libs/$(PJPROJECT_DIR)/pjmedia/include \
|
||||
- -I$(src)/libs/$(PJPROJECT_DIR)/pjnath/include \
|
||||
- -DPJ_AUTOCONF=1
|
||||
+PJSIP_LIBS=-lpj -lpjsip -lpjlib-util -lpjmedia -lpjsip-ua -lpjnath -lpjsip-simple
|
||||
|
||||
if BUILD_SPEEX
|
||||
SPEEXCODEC=-DHAVE_SPEEX_CODEC
|
||||
@@ -34,13 +25,9 @@ endif
|
||||
|
||||
# Preprocessor flags
|
||||
AM_CPPFLAGS = \
|
||||
- -I$(src)/libs \
|
||||
- -I$(src)/libs/iax2 \
|
||||
- -I$(src)/libs/$(PJPROJECT_DIR) \
|
||||
-I$(src)/src \
|
||||
-I$(src)/src/config \
|
||||
-I$(src)/test \
|
||||
- $(SIP_CFLAGS) \
|
||||
@DBUSCPP_CFLAGS@ \
|
||||
-DPREFIX=\"$(prefix)\" \
|
||||
-DPROGSHAREDIR=\"${datadir}/sflphone\" \
|
||||
diff -rupN sflphone-1.4.1/daemon/Makefile.am sflphone-1.4.1-new/daemon/Makefile.am
|
||||
--- sflphone-1.4.1/daemon/Makefile.am 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/Makefile.am 2014-12-13 23:38:33.296585270 +0100
|
||||
@@ -19,7 +19,7 @@ unittest:
|
||||
endif
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
-SUBDIRS = libs src ringtones man $(TESTS_DIR) doc
|
||||
+SUBDIRS = src ringtones man $(TESTS_DIR) doc
|
||||
|
||||
EXTRA_DIST = m4/libtool.m4 \
|
||||
m4/lt~obsolete.m4 \
|
||||
diff -rupN sflphone-1.4.1/daemon/src/iax/iaxcall.cpp sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp
|
||||
--- sflphone-1.4.1/daemon/src/iax/iaxcall.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/iax/iaxcall.cpp 2014-12-13 23:38:33.297585288 +0100
|
||||
@@ -31,8 +31,8 @@
|
||||
|
||||
#include <cstring>
|
||||
#include <sys/socket.h>
|
||||
-#include <iax-client.h>
|
||||
-#include <frame.h>
|
||||
+#include <iax/iax-client.h>
|
||||
+#include <iax/frame.h>
|
||||
|
||||
#include "iaxcall.h"
|
||||
#include "logger.h"
|
||||
diff -rupN sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h
|
||||
--- sflphone-1.4.1/daemon/src/iax/iaxvoiplink.h 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/iax/iaxvoiplink.h 2014-12-13 23:38:33.297585288 +0100
|
||||
@@ -45,7 +45,7 @@
|
||||
#include "noncopyable.h"
|
||||
#include "audio/resampler.h"
|
||||
|
||||
-#include <iax-client.h>
|
||||
+#include <iax/iax-client.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
diff -rupN sflphone-1.4.1/daemon/src/im/instant_messaging.h sflphone-1.4.1-new/daemon/src/im/instant_messaging.h
|
||||
--- sflphone-1.4.1/daemon/src/im/instant_messaging.h 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/im/instant_messaging.h 2014-12-13 23:38:33.298585307 +0100
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#if HAVE_IAX
|
||||
-#include <iax-client.h>
|
||||
+#include <iax/iax-client.h>
|
||||
#endif
|
||||
|
||||
#define EMPTY_MESSAGE pj_str((char*)"")
|
||||
diff -rupN sflphone-1.4.1/daemon/src/Makefile.am sflphone-1.4.1-new/daemon/src/Makefile.am
|
||||
--- sflphone-1.4.1/daemon/src/Makefile.am 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/Makefile.am 2014-12-13 23:38:33.298585307 +0100
|
||||
@@ -18,7 +18,7 @@ endif
|
||||
if USE_IAX
|
||||
IAX_SUBDIR=iax
|
||||
IAX_CXXFLAG=-DUSE_IAX
|
||||
-IAX_LIB=./iax/libiaxlink.la $(top_builddir)/libs/iax2/libiax2.la
|
||||
+IAX_LIB=./iax/libiaxlink.la -liax
|
||||
endif
|
||||
|
||||
if USE_NETWORKMANAGER
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am
|
||||
--- sflphone-1.4.1/daemon/src/audio/audiortp/Makefile.am 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/Makefile.am 2014-12-27 21:56:46.320140246 +0100
|
||||
@@ -6,6 +6,8 @@ if BUILD_ZRTP
|
||||
SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h
|
||||
endif
|
||||
|
||||
+libaudiortp_la_CXXFLAGS = -I/usr/include/libzrtpcpp
|
||||
+
|
||||
libaudiortp_la_SOURCES = \
|
||||
$(SFL_ZRTP_SRC) \
|
||||
audio_rtp_session.cpp \
|
||||
diff -rupN sflphone-1.4.1/daemon/src/client/Makefile.am sflphone-1.4.1-new/daemon/src/client/Makefile.am
|
||||
--- sflphone-1.4.1/daemon/src/client/Makefile.am 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/client/Makefile.am 2014-12-27 21:56:23.078730082 +0100
|
||||
@@ -37,5 +37,6 @@ libclient_la_SOURCES = callmanager.cpp
|
||||
$(STUB_SRC)
|
||||
|
||||
libclient_la_CXXFLAGS = -I./ \
|
||||
+ -I/usr/include/libzrtpcpp \
|
||||
-DPREFIX=\"$(prefix)\" \
|
||||
-DPROGSHAREDIR=\"${datadir}/sflphone\"
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -rupN sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp
|
||||
--- sflphone-1.4.1/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2014-09-19 18:09:33.000000000 +0200
|
||||
+++ sflphone-1.4.1-new/daemon/src/audio/audiortp/audio_rtp_factory.cpp 2014-12-14 16:05:08.640248867 +0100
|
||||
@@ -109,7 +109,7 @@ void AudioRtpFactory::initSession()
|
||||
// TODO: be careful with that. The hello hash is computed asynchronously. Maybe it's
|
||||
// not even available at that point.
|
||||
if (helloHashEnabled_)
|
||||
- call_->getLocalSDP()->setZrtpHash(static_cast<AudioZrtpSession *>(rtpSession_.get())->getHelloHash());
|
||||
+ call_->getLocalSDP()->setZrtpHash(static_cast<AudioZrtpSession *>(rtpSession_.get())->getHelloHash(0));
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
2092fb6ebcdfdf4f0f45da4738b1be8d sflphone-1.4.1.tar.gz
|
||||
Reference in a new issue