packages: opensips/opensips.spec, opensips/opensips-curses.patch (NEW), ope...

jajcus jajcus at pld-linux.org
Mon May 21 10:43:16 CEST 2012


Author: jajcus                       Date: Mon May 21 08:43:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 1.8.0

---- Files affected:
packages/opensips:
   opensips.spec (1.38 -> 1.39) , opensips-curses.patch (NONE -> 1.1)  (NEW), opensips-libs.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/opensips/opensips.spec
diff -u packages/opensips/opensips.spec:1.38 packages/opensips/opensips.spec:1.39
--- packages/opensips/opensips.spec:1.38	Tue May  8 10:11:01 2012
+++ packages/opensips/opensips.spec	Mon May 21 10:43:10 2012
@@ -11,19 +11,21 @@
 %bcond_without	geoip		# GeoIP
 %bcond_without	json		# json support
 %bcond_without	memcached	# memcached support
+%bcond_without	microhttpd	# httpd support
+%bcond_without	redis		# Redis 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.7.2
+Version:	1.8.0
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://opensips.org/pub/opensips/%{version}/src/%{name}-%{version}_src.tar.gz
-# Source0-md5:	2ff1a5ba832491267fc5f3e1ae21b666
+# Source0-md5:	46b2b9903ce567b1f31e4a7a7518736f
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Patch0:		%{name}-libs.patch
+Patch0:		%{name}-curses.patch
 URL:		http://www.opensips.org/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 %{?with_osp:BuildRequires:	OSPToolkit}
@@ -31,6 +33,7 @@
 BuildRequires:	curl-devel
 BuildRequires:	expat-devel
 BuildRequires:	flex
+%{?with_redis:BuildRequires:	hiredis-devel}
 %{?with_json:BuildRequires:	json-c-devel}
 %{?with_carrierroute:BuildRequires:	libconfuse-devel}
 %{?with_memcached:BuildRequires:	libmemcached-devel}
@@ -38,6 +41,7 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-progs
 #BuildRequires:	lynx
+%{?with_microhttpd:BuildRequires:	libmicrohttpd-devel}
 %{?with_mysql:BuildRequires:	mysql-devel}
 BuildRequires:	net-snmp-devel
 %{?with_ldap:BuildRequires:	openldap-devel}
@@ -59,7 +63,10 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # mi_xmlrpc requires xmlrpc-c-devel in version 1.9 only
-%define	exclude_modules	mi_xmlrpc db_oracle
+# event_rabbitmq requires 'amqp.h'
+# cachedb_cassandra requires 'protocol/TBinaryProtocol.h'
+# lua: lua.h
+%define	exclude_modules	mi_xmlrpc db_oracle event_rabbitmq cachedb_cassandra lua
 
 %description
 OpenSIPS (Open SIP Server) is a mature Open Source implementation of a
@@ -241,14 +248,39 @@
 %description -n mibs-%{name} -l pl.UTF-8
 MIB-y dla openSIPS.
 
+%package redis
+Summary:	Redis interface for openSIPS
+Summary(pl.UTF-8):	Moduł Redis do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description redis
+Redis interface for openSIPS.
+
+%description redis -l pl.UTF-8
+Moduł Redis do openSIPS.
+
+%package httpd
+Summary:	HTTP interface to openSIPS
+Summary(pl.UTF-8):	Interfejs HTTP do openSIPS
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description httpd
+HTTP interface to openSIPS.
+
+%description httpd -l pl.UTF-8
+Interfejs HTTP do openSIPS.
+
 %prep
 %setup -q -n %{name}-%{version}-tls
 %patch0 -p1
 
-find -type d -name CVS | xargs rm -rf
-
 %build
 exclude_modules="%{exclude_modules}"
+%if %{without redis}
+exclude_modules="$exclude_modules cachedb_redis"
+%endif
 %if %{without ldap}
 exclude_modules="$exclude_modules h350 ldap"
 %endif
@@ -258,6 +290,9 @@
 %if %{without osp}
 exclude_modules="$exclude_modules osp"
 %endif
+%if %{without microhttpd}
+exclude_modules="$exclude_modules httpd"
+%endif
 %if %{without mysql}
 exclude_modules="$exclude_modules db_mysql"
 %endif
@@ -364,6 +399,7 @@
 %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/cachedb_local.so
 %attr(755,root,root) %{_libdir}/opensips/modules/call_control.so
 %attr(755,root,root) %{_libdir}/opensips/modules/cfgutils.so
 %attr(755,root,root) %{_libdir}/opensips/modules/closeddial.so
@@ -377,6 +413,7 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/dialplan.so
 %attr(755,root,root) %{_libdir}/opensips/modules/dispatcher.so
 %attr(755,root,root) %{_libdir}/opensips/modules/diversion.so
+%attr(755,root,root) %{_libdir}/opensips/modules/dns_cache.so
 %attr(755,root,root) %{_libdir}/opensips/modules/domain.so
 %attr(755,root,root) %{_libdir}/opensips/modules/domainpolicy.so
 %attr(755,root,root) %{_libdir}/opensips/modules/drouting.so
@@ -388,7 +425,6 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/identity.so
 %attr(755,root,root) %{_libdir}/opensips/modules/imc.so
 %attr(755,root,root) %{_libdir}/opensips/modules/load_balancer.so
-%attr(755,root,root) %{_libdir}/opensips/modules/localcache.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mangler.so
 %attr(755,root,root) %{_libdir}/opensips/modules/maxfwd.so
 %attr(755,root,root) %{_libdir}/opensips/modules/mediaproxy.so
@@ -424,6 +460,8 @@
 %attr(755,root,root) %{_libdir}/opensips/modules/rtpproxy.so
 %attr(755,root,root) %{_libdir}/opensips/modules/seas.so
 %attr(755,root,root) %{_libdir}/opensips/modules/signaling.so
+%attr(755,root,root) %{_libdir}/opensips/modules/sipcapture.so
+%attr(755,root,root) %{_libdir}/opensips/modules/sipmsgops.so
 %attr(755,root,root) %{_libdir}/opensips/modules/siptrace.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sl.so
 %attr(755,root,root) %{_libdir}/opensips/modules/sms.so
@@ -445,6 +483,7 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/db_berkeley
 %{_datadir}/%{name}/dbtext
+%{_datadir}/%{name}/menuconfig_templates
 %{_mandir}/man*/*
 
 %files xmpp
@@ -476,7 +515,7 @@
 %if %{with memcached}
 %files memcached
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/opensips/modules/memcached.so
+%attr(755,root,root) %{_libdir}/opensips/modules/cachedb_memcached.so
 %endif
 
 %if %{with radius}
@@ -530,12 +569,28 @@
 %defattr(644,root,root,755)
 %{_datadir}/mibs/*
 
+%if %{with redis}
+%files redis
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/cachedb_redis.so
+%endif
+
+%if %{with microhttpd}
+%files httpd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/opensips/modules/httpd.so
+%attr(755,root,root) %{_libdir}/opensips/modules/mi_http.so
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2012/05/21 08:43:10  jajcus
+- Version: 1.8.0
+
 Revision 1.38  2012/05/08 08:11:01  jajcus
 - Version: 1.7.2
 

================================================================
Index: packages/opensips/opensips-curses.patch
diff -u /dev/null packages/opensips/opensips-curses.patch:1.1
--- /dev/null	Mon May 21 10:43:16 2012
+++ packages/opensips/opensips-curses.patch	Mon May 21 10:43:10 2012
@@ -0,0 +1,12 @@
+--- opensips-1.8.0-tls/menuconfig/Makefile~	2012-03-26 12:11:03.000000000 +0200
++++ opensips-1.8.0-tls/menuconfig/Makefile	2012-05-21 10:14:09.000000000 +0200
+@@ -4,7 +4,8 @@
+ MENUCONFIG_HAVE_SOURCES?=1
+ CFLAGS=-g -Wall -DMENUCONFIG_CFG_PATH=\"$(MENUCONFIG_CFG_PATH)\" \
+ 			-DMENUCONFIG_GEN_PATH=\"$(MENUCONFIG_GEN_PATH)\" \
+-			-DMENUCONFIG_HAVE_SOURCES=$(MENUCONFIG_HAVE_SOURCES)
++			-DMENUCONFIG_HAVE_SOURCES=$(MENUCONFIG_HAVE_SOURCES) \
++			-I/usr/include/ncurses
+ MY_LDFLAGS=-lcurses
+ EXEC_NAME=configure
+ all: $(MENUCONFIG_FILES)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/opensips/opensips.spec?r1=1.38&r2=1.39



More information about the pld-cvs-commit mailing list