From b99cd4dce6103d3718307ed00cb0fb74ce4d457a Mon Sep 17 00:00:00 2001 From: John Khvatov Date: Nov 06 2011 22:47:23 +0000 Subject: Merge branch 'master' into f15 --- diff --git a/.gitignore b/.gitignore index 2425c1a..b6d74e7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ opensips-1.6.2-tls_src.tar.gz opensips-1.6.3-tls_src.tar.gz /opensips-1.6.4-tls_src.tar.gz /opensips-1.6.4-2-tls_src.tar.gz +/opensips-1.7.0_src.tar.gz diff --git a/opensips-0001-Check-for-stale-nonce-in-pre_auth.patch b/opensips-0001-Check-for-stale-nonce-in-pre_auth.patch index f2f185b..9f66368 100644 --- a/opensips-0001-Check-for-stale-nonce-in-pre_auth.patch +++ b/opensips-0001-Check-for-stale-nonce-in-pre_auth.patch @@ -1,7 +1,7 @@ From 5ce7165bfb2869300258193fdabbdf442435362b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 6 Dec 2010 15:56:54 +0300 -Subject: [PATCH 1/2] Check for stale nonce in pre_auth +Subject: [PATCH 1/3] Check for stale nonce in pre_auth Signed-off-by: Peter Lemenkov --- diff --git a/opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch b/opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch deleted file mode 100644 index 3ac6a08..0000000 --- a/opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From faaaacc7d9ad641e3d18b670703e2ca8108c9cda Mon Sep 17 00:00:00 2001 -From: bogdan_iancu -Date: Fri, 28 Jan 2011 10:17:40 +0000 -Subject: [PATCH 2/2] - fixed pvar overlapping - both auth realm and auth - response were defined as $ar. auth response moved as - $auth.resp Credits for report go to medve on IRC - channel - -git-svn-id: https://opensips.svn.sourceforge.net/svnroot/opensips/trunk@7686 689a6050-402a-0410-94f2-e92a70836424 ---- - pvar.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/pvar.c b/pvar.c -index a3cda2a..3b6c46e 100644 ---- a/pvar.c -+++ b/pvar.c -@@ -2958,7 +2958,7 @@ static pv_export_t _pv_names_table[] = { - {{"an", (sizeof("an")-1)}, /* */ - PVT_AUTH_NONCE, pv_get_authattr, 0, - 0, 0, pv_init_iname, 6}, -- {{"ar", (sizeof("ar")-1)}, /* */ -+ {{"auth.resp", (sizeof("auth.resp")-1)}, /* */ - PVT_AUTH_RESPONSE, pv_get_authattr, 0, - 0, 0, pv_init_iname, 7}, - {{"aU", (sizeof("aU")-1)}, /* */ --- -1.7.6 - diff --git a/opensips.spec b/opensips.spec index 3c9872f..b684c4b 100644 --- a/opensips.spec +++ b/opensips.spec @@ -9,14 +9,13 @@ Summary: Open Source SIP Server Name: opensips -Version: 1.6.4 -Release: 8%{?dist} +Version: 1.7.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons -Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}-2-tls_src.tar.gz +Source0: http://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}_src.tar.gz Source1: %{name}.sysconfig Patch1: opensips-0001-Check-for-stale-nonce-in-pre_auth.patch -Patch2: opensips-0002-fixed-pvar-overlapping-both-auth-realm-and-auth-resp.patch URL: http://opensips.org BuildRequires: expat-devel @@ -44,6 +43,7 @@ BuildRequires: openldap-devel BuildRequires: curl-devel BuildRequires: GeoIP-devel BuildRequires: pcre-devel +BuildRequires: python-devel Requires(post): chkconfig @@ -515,10 +515,26 @@ This modules is a gateway between Openser and a jabber server. It enables the exchange of instant messages between SIP clients and XMPP(jabber) clients. +%package python +Summary: Python scripting support +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description python +Helps implement your own OpenSIPS extensions in Python + +%package event_datagram +Summary: Event datagram module +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description event_datagram +This is a module which provides a UNIX/UDP SOCKET transport layer +implementation for the Event Interface. + %prep -%setup -q -n %{name}-%{version}-2-tls +%setup -q -n %{name}-%{version}-tls %patch1 -p1 -b .nonce -%patch2 -p1 -b .rename %build LOCALBASE=/usr CFLAGS="%{optflags}" %{__make} all %{?_smp_mflags} TLS=1 \ @@ -668,7 +684,6 @@ fi %{_libdir}/opensips/modules/group.so %{_libdir}/opensips/modules/identity.so %{_libdir}/opensips/modules/imc.so -%{_libdir}/opensips/modules/lcr.so %{_libdir}/opensips/modules/load_balancer.so %{_libdir}/opensips/modules/localcache.so %{_libdir}/opensips/modules/mangler.so @@ -679,6 +694,7 @@ fi %{_libdir}/opensips/modules/msilo.so %{_libdir}/opensips/modules/nathelper.so %{_libdir}/opensips/modules/nat_traversal.so +%{_libdir}/opensips/modules/rtpproxy.so %{_libdir}/opensips/modules/options.so %{_libdir}/opensips/modules/path.so %{_libdir}/opensips/modules/pdt.so @@ -702,6 +718,9 @@ fi %{_libdir}/opensips/modules/userblacklist.so %{_libdir}/opensips/modules/uri.so %{_libdir}/opensips/modules/usrloc.so +%{_libdir}/opensips/modules/uac_auth.so +%{_libdir}/opensips/modules/uac_registrant.so + %doc docdir/README.acc %doc docdir/README.alias_db @@ -724,7 +743,6 @@ fi %doc docdir/README.gflags %doc docdir/README.group %doc docdir/README.imc -%doc docdir/README.lcr %doc docdir/README.mangler %doc docdir/README.maxfwd %doc docdir/README.mediaproxy @@ -744,12 +762,15 @@ fi %doc docdir/README.speeddial %doc docdir/README.sst %doc docdir/README.statistics -#%doc docdir/README.textops +%doc docdir/README.textops %doc docdir/README.tm %doc docdir/README.uac %doc docdir/README.uac_redirect %doc docdir/README.uri %doc docdir/README.usrloc +%doc docdir/README.rtpproxy +%doc docdir/README.uac_auth +%doc docdir/README.uac_registrant %files aaa_radius %defattr(-,root,root,-) @@ -1009,7 +1030,37 @@ fi %{_libdir}/opensips/modules/xmpp.so %doc docdir/README.xmpp +%files python +%defattr(-,root,root,-) +%{_libdir}/opensips/modules/python.so + +%files event_datagram +%defattr(-,root,root,-) +%{_libdir}/opensips/modules/event_datagram.so +%doc docdir/README.event_datagram + %changelog +* Mon Nov 07 2011 John Khvatov - 1.7.0-1 +- update to 1.7.0 +- dropped upstreamed patches +- added new modules: event_datagram and python +- removed lcr module + +* Sat Sep 17 2011 Remi Collet - 1.6.4-13 +- rebuild against libmemcached.so.8 + +* Mon Aug 22 2011 John Khvatov - 1.6.4-12 +- rebuild against new libnetsnmp + +* Thu Jul 21 2011 Petr Sabata - 1.6.4-11 +- Perl mass rebuild + +* Wed Jul 20 2011 Petr Sabata - 1.6.4-10 +- Perl mass rebuild + +* Mon Jul 11 2011 Peter Lemenkov - 1.6.4-9 +- Updated init-script + * Mon Jul 11 2011 Peter Lemenkov - 1.6.4-8 - Upstream re-released traball with several new patches (API compatible) diff --git a/sources b/sources index 41e404a..342a52f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9869d9a726d70f83de4a1e77cd24d40 opensips-1.6.4-2-tls_src.tar.gz +9fc5054d2422495aa714947a55011897 opensips-1.7.0_src.tar.gz