rpms/sems/devel sems--openssl10.diff, NONE, 1.1 sems--spandsp_0_0_6_fix.diff, NONE, 1.1 import.log, 1.3, 1.4 sems.spec, 1.9, 1.10
Peter Lemenkov
peter at fedoraproject.org
Fri Aug 28 19:56:06 UTC 2009
Author: peter
Update of /cvs/pkgs/rpms/sems/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13636/devel
Modified Files:
import.log sems.spec
Added Files:
sems--openssl10.diff sems--spandsp_0_0_6_fix.diff
Log Message:
fixed building with openssl 1.0 and spandsp 0.6
sems--openssl10.diff:
XmlRpcSource.h | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE sems--openssl10.diff ---
--- apps/xmlrpc2di/xmlrpc++/src/XmlRpcSource.h~ 2008-12-19 21:24:02.000000000 +0300
+++ apps/xmlrpc2di/xmlrpc++/src/XmlRpcSource.h 2009-08-28 23:36:28.702111338 +0400
@@ -48,7 +48,11 @@
bool _ssl;
SSL_CTX* _ssl_ctx;
SSL* _ssl_ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const SSL_METHOD* _ssl_meth;
+#else
SSL_METHOD* _ssl_meth;
+#endif
private:
// Socket. This should really be a SOCKET (an alias for unsigned int*) on windows...
sems--spandsp_0_0_6_fix.diff:
g722.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE sems--spandsp_0_0_6_fix.diff ---
--- core/plug-in/g722/g722.c.spandsp_new 2008-07-15 22:48:07.000000000 +0400
+++ core/plug-in/g722/g722.c 2009-08-28 20:51:44.911218471 +0400
@@ -28,7 +28,7 @@
typedef unsigned char uint8_t;
typedef signed short int16_t;
-#include "spandsp/g722.h"
+#include <spandsp.h>
#include "../../log.h"
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log 11 Jul 2009 14:38:50 -0000 1.3
+++ import.log 28 Aug 2009 19:56:05 -0000 1.4
@@ -1,3 +1,4 @@
sems-1_1_0-5_fc10:HEAD:sems-1.1.0-5.fc10.src.rpm:1239420130
sems-1_1_0-6_fc10:HEAD:sems-1.1.0-6.fc10.src.rpm:1240162624
sems-1_1_1-1_fc10:HEAD:sems-1.1.1-1.fc10.src.rpm:1247323064
+sems-1_1_1-6_fc11:HEAD:sems-1.1.1-6.fc11.src.rpm:1251489238
Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/devel/sems.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sems.spec 21 Aug 2009 15:47:49 -0000 1.9
+++ sems.spec 28 Aug 2009 19:56:05 -0000 1.10
@@ -1,7 +1,7 @@
Summary: SIP Express Media Server, an extensible SIP media server
Name: sems
Version: 1.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://www.iptel.org/sems
# wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
# tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
@@ -22,6 +22,10 @@ Patch5: sems--xmlrpc++-use_fedora_cxxfl
Patch6: sems--makefile_defs_removal.diff
# GCC 4.4 fixes
Patch7: sems--gcc44.diff
+# spandsp 0.0.6pre fixes
+Patch8: sems--spandsp_0_0_6_fix.diff
+# openssl 1.0 patch
+Patch9: sems--openssl10.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
#BuildRequires: python >= 2.3
@@ -69,7 +73,6 @@ It is used from other modules with the D
can execute DI functions to add a server connection, or send a
DIAMETER request.
-%if 0%{?with_g722}
%package g722
Summary: G.722 support for SEMS
Group: Applications/Communications
@@ -77,7 +80,6 @@ Requires: %{name} = %{version}-%{release
%description g722
This is a wrapper around the g722 codec from the spandsp library.
-%endif
%package gateway
Summary: ISDN gateway for SEMS
@@ -163,16 +165,18 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
%patch5 -p0 -b .cxxflags
%patch6 -p0 -b .makefile_defs_removal
%patch7 -p0 -b .gcc44
+%patch8 -p0 -b .spandsp_new
+%patch9 -p0 -b .openssl10
iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
mv ./apps/dsm/fsmc/readme.txt ./apps/dsm/fsmc/Readme.fsmc.txt
%build
-export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"' -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
+export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"' -DSPANDSP_EXPOSE_INTERNAL_STRUCTURES -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3} %{!?with_g722:g722}" all \
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
%install
rm -rf $RPM_BUILD_ROOT
@@ -456,12 +460,10 @@ fi
%doc doc/Readme.diameter_client
%{_libdir}/%{name}/plug-in/diameter_client.so
-%if 0%{?with_g722}
%files g722
%defattr(-,root,root)
%doc core/plug-in/g722/Readme.g722codec
%{_libdir}/%{name}/plug-in/g722.so
-%endif
%files gateway
%defattr(-,root,root)
@@ -549,6 +551,9 @@ fi
%{_libdir}/%{name}/plug-in/xmlrpc2di.so
%changelog
+* Fri Aug 28 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.1-6
+- g722 enabled back
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.1-5
- rebuilt with new openssl
More information about the scm-commits
mailing list