Browse Source

Updated files to Rev. 6330.

git-svn-id: http://yate.null.ro/svn/yate/trunk@6334 acf43c95-373e-0410-b603-e72c3f656dc1
divo
sabina 4 years ago
parent
commit
a8b16c13f6
  1. 4
      Makefile.in
  2. 89
      modules/Makefile.in
  3. 73
      packing/rpm/yate.spec.in

4
Makefile.in

@ -29,10 +29,8 @@ SLIBS:= $(YLIB) libyate.so \
libyatesig.so.@PACKAGE_VERSION@ libyatesig.so \
libyateasn.so.@PACKAGE_VERSION@ libyateasn.so \
libyateradio.so.@PACKAGE_VERSION@ libyateradio.so \
libyatemapcamel.so.@PACKAGE_VERSION@ libyatemapcamel.so \
libyatemgcp.so.@PACKAGE_VERSION@ libyatemgcp.so \
libyatejabber.so.@PACKAGE_VERSION@ libyatejabber.so \
libyatecodecutils.so.@PACKAGE_VERSION@ libyatecodecutils.so
libyatejabber.so.@PACKAGE_VERSION@ libyatejabber.so
ILIBS:= yscript yasn yradio
INCS := yateclass.h yatemime.h yatengine.h yatephone.h yatecbase.h yatexml.h yatemath.h yatewiresniff.h
GENS := yateversn.h

89
modules/Makefile.in

@ -37,11 +37,6 @@ OPENSSL_LIB := @OPENSSL_LIB@
HAVE_ZLIB := @HAVE_ZLIB@
ZLIB_INC := @ZLIB_INC@
ZLIB_LIB := @ZLIB_LIB@
HAVE_CELLALGO := @HAVE_CELLALGO@
HAVE_128EIA1 := @HAVE_128EIA1@
CELLALGO_INC := @CELLALGO_INC@
CELLALGO_LIB := @CELLALGO_LIB@
CELLALGO_DEF := @CELLALGO_DEF@
HAVE_LIBUSB := @HAVE_LIBUSB@
LIBUSB_INC := @LIBUSB_INC@
LIBUSB_LIB := @LIBUSB_LIB@
@ -60,8 +55,7 @@ INCFILES := @top_srcdir@/yateclass.h @top_srcdir@/yatengine.h @top_srcdir@/yatep
JUSTSIG := server/ysigchan.yate server/analog.yate \
server/ciscosm.yate server/sigtransport.yate \
sig/isupmangler.yate sig/ss7_lnp_ansi.yate \
sig/camel_map.yate sig/camel_bcsm.yate sig/camel_bcsm_proxy.yate \
sig/ussd_map.yate sig/camelmap.yate
sig/camel_map.yate
SUBDIRS :=
MKDEPS := ../config.status
@ -96,14 +90,11 @@ PROGS := cdrbuild.yate cdrcombine.yate cdrfile.yate regexroute.yate \
server/cache.yate \
server/eventlogs.yate \
client/jabberclient.yate \
callgen.yate analyzer.yate rmanager.yate msgsniff.yate wiresniff.yate\
radio/dummyradio.yate radio/radiotest.yate \
server/ysmpp.yate server/ydiameter.yate \
mobile/gsmfeatures.yate \
server/xml_tcp.yate
callgen.yate analyzer.yate rmanager.yate msgsniff.yate wiresniff.yate \
radio/dummyradio.yate radio/radiotest.yate
LIBS :=
DIRS := client server jabber qt4 sip sig radio mobile
DIRS := client server jabber qt4 sip sig radio
ifneq ($(HAVE_PGSQL),no)
PROGS := $(PROGS) server/pgsqldb.yate
@ -121,13 +112,6 @@ ifneq (@HAVE_RESOLV@,no)
PROGS := $(PROGS) enumroute.yate
endif
ifneq (@HAVE_IPV6@,no)
PROGS := $(PROGS) mobile/ys1ap.yate
ifneq (@HAVE_TUN@,no)
PROGS := $(PROGS) mobile/gtp.yate
endif
endif
ifneq (@HAVE_SOUNDCARD@,no)
PROGS := $(PROGS) client/osschan.yate
endif
@ -199,10 +183,6 @@ PROGS := $(PROGS) amrnbcodec.yate
PROGS := $(PROGS) efrcodec.yate
endif
ifneq (@HAVE_AMRWB@,no)
PROGS := $(PROGS) amrwbcodec.yate
endif
ifneq ($(HAVE_OPENSSL),no)
PROGS := $(PROGS) openssl.yate
endif
@ -224,11 +204,6 @@ ifneq (@HAVE_LIBUSB@,no)
PROGS := $(PROGS) radio/ybladerf.yate
endif
ifeq (@HAVE_CELLALGO@,yes)
ifeq (@HAVE_128EIA1@,yes)
PROGS := $(PROGS) mobile/nassession.yate
endif
endif
LOCALFLAGS =
LOCALLIBS =
@ -336,9 +311,6 @@ sig/%.yate: @srcdir@/sig/%.cpp $(MKDEPS) $(INCFILES)
sip/%.yate: @srcdir@/sip/%.cpp $(MKDEPS) $(INCFILES)
mkdir -p sip && $(MODCOMP) -o $@ $(LOCALFLAGS) $(EXTERNFLAGS) $< $(LOCALLIBS) $(YATELIBS) $(EXTERNLIBS)
mobile/%.yate: @srcdir@/mobile/%.cpp $(MKDEPS) $(INCFILES)
mkdir -p mobile && $(MODCOMP) -o $@ $(LOCALFLAGS) $(EXTERNFLAGS) $< $(LOCALLIBS) $(YATELIBS) $(EXTERNLIBS)
%.yate: @srcdir@/%.cpp $(MKDEPS) $(INCFILES)
$(MODCOMP) -o $@ $(LOCALFLAGS) $(EXTERNFLAGS) $< $(LOCALLIBS) $(YATELIBS) $(EXTERNLIBS)
@ -357,14 +329,6 @@ sig/camel_map.yate: ../libs/yasn/libyasn.a
sig/camel_map.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig -I@top_srcdir@/libs/yasn
sig/camel_map.yate: LOCALLIBS = -lyatesig -lyateasn
sig/camelmap.yate: ../libyatemapcamel.so
sig/camelmap.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysig -I@top_srcdir@/libs/yasn -I@top_srcdir@/libs/ymapcamel
sig/camelmap.yate: LOCALLIBS = -lyatemapcamel -lyatesig -lyateasn
sig/camel_bcsm_proxy.yate sig/ussd_map.yate: ../libs/ytcapxml/libyatetcapxml.a
sig/camel_bcsm_proxy.yate sig/ussd_map.yate: LOCALFLAGS = -I../libs/ytcapxml
sig/camel_bcsm_proxy.yate sig/ussd_map.yate: LOCALLIBS = -L../libs/ytcapxml -lyatetcapxml
server/analogdetect.yate: ../libs/ymodem/libyatemodem.a
server/analogdetect.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymodem
server/analogdetect.yate: LOCALLIBS = -L../libs/ymodem -lyatemodem
@ -429,9 +393,6 @@ speexcodec.yate: EXTERNLIBS = @SPEEX_LIB@
amrnbcodec.yate efrcodec.yate: EXTERNFLAGS = @AMRNB_INC@
amrnbcodec.yate efrcodec.yate: EXTERNLIBS = @AMRNB_LIB@
amrwbcodec.yate: EXTERNFLAGS = @AMRWB_INC@
amrwbcodec.yate: EXTERNLIBS = @AMRWB_LIB@
faxchan.yate: EXTERNFLAGS = $(SPANDSP_INC)
faxchan.yate: EXTERNLIBS = $(SPANDSP_LIB)
@ -463,30 +424,6 @@ server/ysnmpagent.yate: ../libyateasn.so ../libs/ysnmp/libysnmp.a
server/ysnmpagent.yate: LOCALFLAGS = -I@top_srcdir@/libs/yasn -I@top_srcdir@/libs/ysnmp
server/ysnmpagent.yate: LOCALLIBS = -L../libs/ysnmp -lysnmp -lyateasn
server/ysmpp.yate: ../libs/ysmpp/libyatesmpp.a ../libs/ycodecutils/libyatecodecutils.a
server/ysmpp.yate: LOCALFLAGS = -I@top_srcdir@/libs/ysmpp -I@top_srcdir@/libs/ycodecutils
server/ysmpp.yate: LOCALLIBS = -L../libs/ysmpp -lyatesmpp -L../libs/ycodecutils -lyatecodecutils
server/ydiameter.yate: ../libs/ydiameter/libyatediameter.a
server/ydiameter.yate: LOCALFLAGS = -I@top_srcdir@/libs/ydiameter
server/ydiameter.yate: LOCALLIBS = -L../libs/ydiameter -lyatediameter
mobile/gtp.yate: ../libs/ygtp/libyategtp.a
mobile/gtp.yate: LOCALFLAGS = -I@top_srcdir@/libs/ygtp
mobile/gtp.yate: LOCALLIBS = -L../libs/ygtp -lyategtp
mobile/ys1ap.yate: ../libyateasn.so
mobile/ys1ap.yate: LOCALFLAGS = -I../libs/yasn
mobile/ys1ap.yate: LOCALLIBS = -lyateasn
mobile/gsmfeatures.yate: ../libyateradio.so ../libyatecodecutils.so
mobile/gsmfeatures.yate: LOCALFLAGS = -I@top_srcdir@/libs/yradio -I@top_srcdir@/libs/ycodecutils
mobile/gsmfeatures.yate: LOCALLIBS = -lyateradio -L../libs/ycodecutils -lyatecodecutils
mobile/nassession.yate: ../libyatescript.so ../libyateradio.so
mobile/nassession.yate: LOCALFLAGS = -I@top_srcdir@/libs/yscript -I@top_srcdir@/libs/yradio $(CELLALGO_DEF) $(CELLALGO_INC)
mobile/nassession.yate: LOCALLIBS = -lyatescript -lyateradio $(CELLALGO_LIB)
radio/ybladerf.yate radio/dummyradio.yate radio/radiotest.yate: ../libyateradio.so
radio/ybladerf.yate radio/dummyradio.yate radio/radiotest.yate: LOCALFLAGS = -I@top_srcdir@/libs/yradio
radio/ybladerf.yate radio/dummyradio.yate radio/radiotest.yate: LOCALLIBS = -lyateradio
@ -540,21 +477,3 @@ radio/ybladerf.yate: EXTERNLIBS = $(LIBUSB_LIB)
../libyateradio.so ../libs/yradio/libyateradio.a: @top_srcdir@/libs/yradio/yateradio.h
$(MAKE) -C ../libs/yradio
../libs/ytcapxml/libyatetcapxml.a: @top_srcdir@/libs/ytcapxml/yatetcapxml.h
$(MAKE) -C ../libs/ytcapxml
../libs/ysmpp/libyatesmpp.a: @top_srcdir@/libs/ysmpp/yatesmpp.h
$(MAKE) -C ../libs/ysmpp
../libs/ydiameter/libyatediameter.a: @top_srcdir@/libs/ydiameter/yatediameter.h
$(MAKE) -C ../libs/ydiameter
../libs/ygtp/libyategtp.a: @top_srcdir@/libs/ygtp/yategtp.h
$(MAKE) -C ../libs/ygtp
../libyatemapcamel.so ../libs/ysig/libyatemapcamel.a: @top_srcdir@/libs/ymapcamel/yatemapcamel.h
$(MAKE) -C ../libs/ymapcamel
../libs/ycodecutils/libyatecodecutils.a: @top_srcdir@/libs/ycodecutils/yatecodecutils.h
$(MAKE) -C ../libs/ycodecutils

73
packing/rpm/yate.spec.in

@ -12,8 +12,6 @@
# to disable the GUI clients run rpmbuild --define 'nogui 1'
# to disable only Zaptel support run rpmbuild --define 'nozap 1'
# to disable only TDMV support run rpmbuild --define 'notdm 1'
# to disable kernel GTP-U acceleration run rpmbuild --define 'nokgtpu 1'
# to disable cell algorithms run rpmbuild --define 'nocellalgo 1'
%{!?systemd:%define systemd %(test -x /usr/bin/systemd && echo 1 || echo 0)}
%{!?_unitdir:%define _unitdir /usr/lib/systemd/system}
@ -33,8 +31,6 @@
%{?nogui:%define no_gui 1}
%{?nozap:%define no_zaptel 1}
%{?notdm:%define no_tdmapi 1}
%{?nokgtpu:%define no_kgtpu 1}
%{?nocellalgo:%define no_cellalgo 1}
%{!?debuginfo:%define debuginfo %{nil}}
%if "%{debuginfo}"
@ -83,7 +79,6 @@ Source: http://yate.null.ro/tarballs/@PACKAGE_TARNAME@@PACKAGE_VERSION_MAJOR@/@
Group: Applications/Communication
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://yate.null.ro/
Provides: %{name}-commercial
%{?extra_prov:Provides: %{?extra_prov}}
%{?extra_reqs:Requires: %{?extra_reqs}}
BuildRequires: gcc-c++
@ -113,8 +108,6 @@ for small to large scale projects.
%{_libdir}/libyateasn.so.*
%{_libdir}/libyateradio.so.*
%{_libdir}/libyatemgcp.so.*
%{_libdir}/libyatemapcamel.so.*
%{_libdir}/libyatecodecutils.so.*
%{_bindir}/yate
%{_mandir}/*/yate.*
%if "%{systemd}" != "0"
@ -139,11 +132,11 @@ for small to large scale projects.
%{_libdir}/yate/wavefile.yate
%{_libdir}/yate/conference.yate
%{_libdir}/yate/moh.yate
%{_libdir}/yate/wiresniff.yate
%{_libdir}/yate/callgen.yate
%{_libdir}/yate/analyzer.yate
%{_libdir}/yate/rmanager.yate
%{_libdir}/yate/msgsniff.yate
%{_libdir}/yate/wiresniff.yate
%{_libdir}/yate/mux.yate
%{_libdir}/yate/pbx.yate
%{_libdir}/yate/dumbchan.yate
@ -189,11 +182,8 @@ for small to large scale projects.
%{_libdir}/yate/server/ccongestion.yate
%{_libdir}/yate/server/monitoring.yate
%{_libdir}/yate/server/ysnmpagent.yate
%{_libdir}/yate/server/ysmpp.yate
%{_libdir}/yate/server/cache.yate
%{_libdir}/yate/server/ydiameter.yate
%{_libdir}/yate/server/eventlogs.yate
%{_libdir}/yate/server/xml_tcp.yate
%{_libdir}/yate/client/osschan.yate
%{_libdir}/yate/client/jabberclient.yate
%{_libdir}/yate/jabber/jabberserver.yate
@ -201,14 +191,7 @@ for small to large scale projects.
%{_libdir}/yate/sig/isupmangler.yate
%{_libdir}/yate/sig/ss7_lnp_ansi.yate
%{_libdir}/yate/sig/camel_map.yate
%{_libdir}/yate/sig/camelmap.yate
%{_libdir}/yate/sig/camel_bcsm.yate
%{_libdir}/yate/sig/camel_bcsm_proxy.yate
%{_libdir}/yate/sig/ussd_map.yate
%{_libdir}/yate/sip/sip_cnam_lnp.yate
%{_libdir}/yate/mobile/gtp.yate
%{_libdir}/yate/mobile/ys1ap.yate
%{_libdir}/yate/mobile/gsmfeatures.yate
%{_libdir}/yate/radio/dummyradio.yate
%{_libdir}/yate/radio/radiotest.yate
%dir %{_sysconfdir}/yate
@ -225,6 +208,7 @@ for small to large scale projects.
%config(noreplace) %{_sysconfdir}/yate/fileinfo.conf
%config(noreplace) %{_sysconfdir}/yate/filetransfer.conf
%config(noreplace) %{_sysconfdir}/yate/moh.conf
%config(noreplace) %{_sysconfdir}/yate/wiresniff.conf
%config(noreplace) %{_sysconfdir}/yate/mux.conf
%config(noreplace) %{_sysconfdir}/yate/pbxassist.conf
%config(noreplace) %{_sysconfdir}/yate/queues.conf
@ -256,11 +240,8 @@ for small to large scale projects.
%config(noreplace) %{_sysconfdir}/yate/cpuload.conf
%config(noreplace) %{_sysconfdir}/yate/ccongestion.conf
%config(noreplace) %{_sysconfdir}/yate/monitoring.conf
%config(noreplace) %{_sysconfdir}/yate/wiresniff.conf
%config(noreplace) %{_sysconfdir}/yate/ysnmpagent.conf
%config(noreplace) %{_sysconfdir}/yate/ysmpp.conf
%config(noreplace) %{_sysconfdir}/yate/cache.conf
%config(noreplace) %{_sysconfdir}/yate/ydiameter.conf
%config(noreplace) %{_sysconfdir}/yate/eventlogs.conf
%config(noreplace) %{_sysconfdir}/yate/users.conf
%config(noreplace) %{_sysconfdir}/yate/presence.conf
@ -271,11 +252,7 @@ for small to large scale projects.
%config(noreplace) %{_sysconfdir}/yate/isupmangler.conf
%config(noreplace) %{_sysconfdir}/yate/ss7_lnp_ansi.conf
%config(noreplace) %{_sysconfdir}/yate/camel_map.conf
%config(noreplace) %{_sysconfdir}/yate/camel_bcsm.conf
%config(noreplace) %{_sysconfdir}/yate/camel_bcsm_proxy.conf
%config(noreplace) %{_sysconfdir}/yate/ussd_map.conf
%config(noreplace) %{_sysconfdir}/yate/sip_cnam_lnp.conf
%config(noreplace) %{_sysconfdir}/yate/xml_tcp.conf
%config(noreplace) %{_sysconfdir}/yate/dummyradio.conf
%config %{_sysconfdir}/logrotate.d/yate
@ -325,19 +302,16 @@ Requires: %{name} = %{version}-%{release}
%description amr
GSM-AMR and GSM-EFR audio codecs for Yate. AMR is a multi-rate codec that provides moderate
to high compression rate and good voice quality. EFR is just a different payload stucture
for 12.2 kbit/s AMR-NB. AMR-WB provides wideband (16 kHz) audio with bitrates between 7 and
24 kbit/s.
for 12.2 kbit/s AMR-NB.
%files amr
%{_libdir}/yate/amrnbcodec.yate
%{_libdir}/yate/amrwbcodec.yate
%{_libdir}/yate/efrcodec.yate
%config(noreplace) %{_sysconfdir}/yate/amrnbcodec.conf
%config(noreplace) %{_sysconfdir}/yate/amrwbcodec.conf
%define conf_amr %{nil}
%else
%define conf_amr --without-amrnb --without-amrwb
%define conf_amr --without-amrnb
%endif
@ -655,30 +629,6 @@ The devel package must still be installed separately.
%defattr(-,root,root)
%if "%{no_cellalgo}" != "1"
%package ltenas
Summary: Yate LTE NAS session support
Group: Applications/Communication
Requires: %{name} = %{version}-%{release}
%description ltenas
This package provides support for LTE NAS integrity check and ciphering.
%files ltenas
%{_libdir}/yate/mobile/nassession.yate
%define conf_cellalgo %{nil}
%else
%define conf_cellalgo --without-cellalgo
%endif
%if "%{no_kgtpu}" == "1"
%define conf_gtpu --disable-gtpuacc
%else
%define conf_gtpu %{nil}
%endif
# disable unpackaged files check if we know we are going to skip some
%if "%{no_pstn}" == "1"
%define _unpackaged_files_terminate_build 0
@ -741,7 +691,7 @@ chmod +x %{local_find_requires} %{local_find_provides}
--libdir=%{_libdir} --mandir=%{_mandir} --with-archlib=%{_lib} \
--without-spandsp --without-coredumper \
%{conf_sctp} %{conf_h323} %{conf_amr} %{conf_pstn} %{conf_usb} %{conf_gui} \
%{conf_gtpu} %{conf_cellalgo} %{?extra_conf}
%{?extra_conf}
make %{stripped} %{?extra_make}
%{?extra_step}
@ -769,15 +719,9 @@ rm -rf %{buildroot}
%changelog
* Thu Aug 10 2017 Paul Chitescu <paulc@voip.null.ro>
- Added AMR-WB codec to the yate-amr package
* Fri Nov 25 2016 Paul Chitescu <paulc@voip.null.ro>
- Added package for the AMR codec
* Mon Jan 25 2016 Marian Podgoreanu <marian@voip.null.ro>
- Added separate package for nassession
* Thu Nov 26 2015 Paul Chitescu <paulc@voip.null.ro>
- More tweaking to suppress unwanted dependencies in newer RPM
@ -787,13 +731,6 @@ rm -rf %{buildroot}
* Wed Apr 01 2015 Paul Chitescu <paulc@voip.null.ro>
- Package the new dynamic libyateasn.so
* Wed Apr 01 2015 Marian Podgoreanu <marian@voip.null.ro>
- Added codec utils dynamic library
* Tue Nov 11 2014 Ioana Stanciu <oana@voip.null.ro>
- Added MAP & CAMEL codec library and new camelmap module
- Added xml_tcp module
* Tue Apr 29 2014 Paul Chitescu <paulc@voip.null.ro>
- Added SQLite module and subpackage

Loading…
Cancel
Save