packages: opensips/opensips.spec, opensips/opensips-openssl.patch (REMOVED)...

mmazur mmazur at pld-linux.org
Thu Mar 24 13:30:20 CET 2011 

Author: mmazur                       Date: Thu Mar 24 12:30:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.6.4-2; rel 1

---- Files affected:
packages/opensips:
   opensips.spec (1.24 -> 1.25) , opensips-openssl.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/opensips/opensips.spec
diff -u packages/opensips/opensips.spec:1.24 packages/opensips/opensips.spec:1.25
--- packages/opensips/opensips.spec:1.24	Tue Nov 23 06:49:18 2010
+++ packages/opensips/opensips.spec	Thu Mar 24 13:30:15 2011
@@ -9,19 +9,21 @@
 %bcond_without	ldap		# LDAP support
 %bcond_with	osp		# ETSI OSP VoIP Peering support
 %bcond_without	geoip		# GeoIP
+%bcond_without	json		# json support
+%bcond_without	memcached	# memcached support
 
 Summary:	SIP proxy, redirect and registrar server
 Summary(pl.UTF-8):	Serwer SIP rejestrujący, przekierowujący i robiący proxy
 Name:		opensips
-Version:	1.5.3
-Release:	8
+Version:	1.6.4
+%define		_upstreamrel	2
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://opensips.org/pub/opensips/%{version}/src/%{name}-%{version}-tls_src.tar.gz
-# Source0-md5:	8a03167420c31da15405bed7630ed3e2
+Source0:	http://opensips.org/pub/opensips/%{version}/src/%{name}-%{version}-%{_upstreamrel}-tls_src.tar.gz
+# Source0-md5:	e9869d9a726d70f83de4a1e77cd24d40
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Patch0:		%{name}-openssl.patch
 URL:		http://www.opensips.org/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_osp:BuildRequires:	OSPToolkit}
@@ -29,7 +31,9 @@
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	flex
+%{?with_json:BuildRequires:	json-c-devel}
 %{?with_carrierroute:BuildRequires:	libconfuse-devel}
+%{?with_memcached:BuildRequires:	libmemcached-devel}
 %{?with_pgsql:BuildRequires:	libpqxx-devel}
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-progs
@@ -90,6 +94,30 @@
 %description postgres -l pl.UTF-8
 Moduł PostgreSQL do openSIPS.
 
+%package json
+Summary:	openSIPS JSON module
+Summary(pl.UTF-8):	Moduł JSON do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description json
+JSON module for openSIPS.
+
+%description json -l pl.UTF-8
+Moduł JSON do openSIPS.
+
+%package memcached
+Summary:	openSIPS memcached module
+Summary(pl.UTF-8):	Moduł memcached do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description memcached
+Memcached module for openSIPS.
+
+%description memcached -l pl.UTF-8
+Moduł memcached do openSIPS.
+
 %package radius
 Summary:	openSIPS Radius module
 Summary(pl.UTF-8):	Moduł Radius do openSIPS
@@ -214,8 +242,7 @@
 MIB-y dla openSIPS.
 
 %prep
-%setup -q -n %{name}-%{version}-tls
-%patch0 -p1
+%setup -q -n %{name}-%{version}-%{_upstreamrel}-tls
 
 find -type d -name CVS | xargs rm -rf
 
@@ -243,7 +270,13 @@
 exclude_modules="$exclude_modules mmgeoip"
 %endif
 %if %{without radius}
-exclude_modules="$exclude_modules auth_radius avp_radius group_radius uri_radius peering"
+exclude_modules="$exclude_modules aaa_radius"
+%endif
+%if %{without json}
+exclude_modules="$exclude_modules json"
+%endif
+%if %{without memcached}
+exclude_modules="$exclude_modules memcached"
 %endif
 echo "$exclude_modules" > exclude_modules
 %{__make} all \
@@ -323,9 +356,12 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/acc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/alias_db.so
 %attr(755,root,root) %{_libdir}/opensips/modules/auth.so
+%attr(755,root,root) %{_libdir}/opensips/modules/auth_aaa.so
 %attr(755,root,root) %{_libdir}/opensips/modules/auth_db.so
 %attr(755,root,root) %{_libdir}/opensips/modules/auth_diameter.so
 %attr(755,root,root) %{_libdir}/opensips/modules/avpops.so
+%attr(755,root,root) %{_libdir}/opensips/modules/b2b_entities.so
+%attr(755,root,root) %{_libdir}/opensips/modules/b2b_logic.so
 %attr(755,root,root) %{_libdir}/opensips/modules/benchmark.so
 %attr(755,root,root) %{_libdir}/opensips/modules/call_control.so
 %attr(755,root,root) %{_libdir}/opensips/modules/cfgutils.so
@@ -333,7 +369,9 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/cpl-c.so
 %attr(755,root,root) %{_libdir}/opensips/modules/db_berkeley.so
 %attr(755,root,root) %{_libdir}/opensips/modules/db_flatstore.so
+%attr(755,root,root) %{_libdir}/opensips/modules/db_http.so
 %attr(755,root,root) %{_libdir}/opensips/modules/db_text.so
+%attr(755,root,root) %{_libdir}/opensips/modules/db_virtual.so
 %attr(755,root,root) %{_libdir}/opensips/modules/dialog.so
 %attr(755,root,root) %{_libdir}/opensips/modules/dialplan.so
 %attr(755,root,root) %{_libdir}/opensips/modules/dispatcher.so
@@ -361,9 +399,11 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/options.so
 %attr(755,root,root) %{_libdir}/opensips/modules/path.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pdt.so
+%attr(755,root,root) %{_libdir}/opensips/modules/peering.so
 %attr(755,root,root) %{_libdir}/opensips/modules/permissions.so
 %attr(755,root,root) %{_libdir}/opensips/modules/pike.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence.so
+%attr(755,root,root) %{_libdir}/opensips/modules/presence_callinfo.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_dialoginfo.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_mwi.so
 %attr(755,root,root) %{_libdir}/opensips/modules/presence_xcapdiff.so
@@ -387,17 +427,16 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/speeddial.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sst.so
 %attr(755,root,root) %{_libdir}/opensips/modules/statistics.so
+%attr(755,root,root) %{_libdir}/opensips/modules/stun.so
 %attr(755,root,root) %{_libdir}/opensips/modules/textops.so
 %attr(755,root,root) %{_libdir}/opensips/modules/tlsops.so
 %attr(755,root,root) %{_libdir}/opensips/modules/tm.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uac.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uac_redirect.so
 %attr(755,root,root) %{_libdir}/opensips/modules/uri.so
-%attr(755,root,root) %{_libdir}/opensips/modules/uri_db.so
 %attr(755,root,root) %{_libdir}/opensips/modules/userblacklist.so
 %attr(755,root,root) %{_libdir}/opensips/modules/usrloc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/xcap_client.so
-%attr(755,root,root) %{_libdir}/opensips/modules/xlog.so
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/db_berkeley
 %{_datadir}/%{name}/dbtext
@@ -423,15 +462,23 @@
 %{_datadir}/%{name}/postgres
 %endif
 
+%if %{with json}
+%files json
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/json.so
+%endif
+
+%if %{with memcached}
+%files memcached
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/memcached.so
+%endif
+
 %if %{with radius}
 %files radius
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/opensips/dictionary.opensips
-%attr(755,root,root) %{_libdir}/opensips/modules/auth_radius.so
-%attr(755,root,root) %{_libdir}/opensips/modules/avp_radius.so
-%attr(755,root,root) %{_libdir}/opensips/modules/group_radius.so
-%attr(755,root,root) %{_libdir}/opensips/modules/uri_radius.so
-%attr(755,root,root) %{_libdir}/opensips/modules/peering.so
+%attr(755,root,root) %{_libdir}/opensips/modules/aaa_radius.so
 %endif
 
 %if %{with odbc}
@@ -484,6 +531,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/03/24 12:30:15  mmazur
+- up to 1.6.4-2; rel 1
+
 Revision 1.24  2010/11/23 05:49:18  arekm
 - release 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opensips/opensips.spec?r1=1.24&r2=1.25&f=u

More information about the pld-cvs-commit mailing list