Hello community, here is the log from the commit of package libosmo-abis for openSUSE:Factory checked in at 2016-01-01 19:48:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmo-abis (Old) and /work/SRC/openSUSE:Factory/.libosmo-abis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmo-abis" Changes: -------- --- /work/SRC/openSUSE:Factory/libosmo-abis/libosmo-abis.changes 2015-04-07 09:29:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libosmo-abis.new/libosmo-abis.changes 2016-01-01 19:51:15.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 23 17:34:54 UTC 2015 - [email protected] + +- Update to new upstream release 0.3.2.3 +* ortp: Guard the jitter stats with a version check +* ortp: Export statistics for the bts or similar +* export lapd_tei_alloc for libosmo-netif + +------------------------------------------------------------------- Old: ---- libosmo-abis-0.3.1.tar.xz New: ---- libosmo-abis-0.3.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmo-abis.spec ++++++ --- /var/tmp/diff_new_pack.3QKQsa/_old 2016-01-01 19:51:16.000000000 +0100 +++ /var/tmp/diff_new_pack.3QKQsa/_new 2016-01-01 19:51:16.000000000 +0100 @@ -17,15 +17,15 @@ Name: libosmo-abis -Version: 0.3.1 +Version: 0.3.2.3 Release: 0 Summary: Osmocom library for A-bis interface between BTS and BSC License: AGPL-3.0+ and GPL-2.0+ -Group: Development/Libraries/C and C++ +Group: Productivity/Telephony/Utilities Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis #Git-Clone: git://git.osmocom.org/libosmo-abis -#Snapshot: 0.3.1 +#Snapshot: 0.3.2-1-g86fc3c8 Source: %name-%version.tar.xz Patch1: osmo-talloc.diff Patch2: 0001-build-resolve-compiler-warnings.patch @@ -46,12 +46,12 @@ BSC. This interface allows control of the radio equipment and radio frequency allocation in the BTS. -%package -n libosmoabis4 +%package -n libosmoabis5 Summary: Osmocom A-bis interface core library License: AGPL-3.0+ Group: System/Libraries -%description -n libosmoabis4 +%description -n libosmoabis5 In the GSM system architecture, A-bis is a Base Station System-internal interface linking the Base Transceiver Stations (BTS) and Base Station Controller (BSC). This interface allows control of @@ -61,7 +61,7 @@ Summary: Development files for the Osmocom A-bis core library License: AGPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libosmoabis4 = %version +Requires: libosmoabis5 = %version Requires: libosmocore-devel >= 0.3.0 Requires: libosmogsm-devel >= 0.3.10 @@ -73,12 +73,12 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoabis. -%package -n libosmotrau0 +%package -n libosmotrau1 Summary: Osmocom TRAU (E1/RTP) library License: GPL-2.0+ Group: System/Libraries -%description -n libosmotrau0 +%description -n libosmotrau1 The Transcoder Rate Adaptor Unit enables the use of lower rates (32, 16 or 8 kbps) over the A-bis interface instead of the 64 kbps ISDN rate for which the Mobile Switching Center (MSC) is designed. @@ -87,7 +87,7 @@ Summary: Development files for the Osmocom TRAU (E1/RTP) library License: GPL-2.0+ Group: Development/Libraries/C and C++ -Requires: libosmotrau0 = %version +Requires: libosmotrau1 = %version %description -n libosmotrau-devel The Transcoder Rate Adaptor Unit enables the use of lower bitrates @@ -115,14 +115,14 @@ %check make %{?_smp_mflags} check -%post -n libosmoabis4 -p /sbin/ldconfig -%postun -n libosmoabis4 -p /sbin/ldconfig -%post -n libosmotrau0 -p /sbin/ldconfig -%postun -n libosmotrau0 -p /sbin/ldconfig +%post -n libosmoabis5 -p /sbin/ldconfig +%postun -n libosmoabis5 -p /sbin/ldconfig +%post -n libosmotrau1 -p /sbin/ldconfig +%postun -n libosmotrau1 -p /sbin/ldconfig -%files -n libosmoabis4 +%files -n libosmoabis5 %defattr(-,root,root) -%_libdir/libosmoabis.so.4* +%_libdir/libosmoabis.so.5* %files -n libosmoabis-devel %defattr(-,root,root) @@ -132,9 +132,9 @@ %_libdir/libosmoabis.so %_libdir/pkgconfig/libosmoabis.pc -%files -n libosmotrau0 +%files -n libosmotrau1 %defattr(-,root,root) -%_libdir/libosmotrau.so.0* +%_libdir/libosmotrau.so.1* %files -n libosmotrau-devel %defattr(-,root,root) ++++++ 0001-build-resolve-compiler-warnings.patch ++++++ --- /var/tmp/diff_new_pack.3QKQsa/_old 2016-01-01 19:51:16.000000000 +0100 +++ /var/tmp/diff_new_pack.3QKQsa/_new 2016-01-01 19:51:16.000000000 +0100 @@ -1,4 +1,4 @@ -From 025e2dd7129483300efe8dd02f8e1198c92aaad5 Mon Sep 17 00:00:00 2001 +From 34ce619dc89fa82f55cc2ebba85e3435d04d2531 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Thu, 2 Apr 2015 14:25:43 +0200 Subject: [PATCH] build: resolve compiler warnings @@ -23,7 +23,7 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c -index fedc977..55fce87 100644 +index 65ec269..f605af9 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -326,16 +326,16 @@ struct osmo_rtp_socket *osmo_rtp_socket_create(void *talloc_ctx, unsigned int fl @@ -48,5 +48,5 @@ /* initialize according to the RFC */ rtp_session_set_seq_number(rs->sess, random()); -- -2.1.4 +2.4.3 ++++++ libosmo-abis-0.3.1.tar.xz -> libosmo-abis-0.3.2.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/configure.ac new/libosmo-abis/configure.ac --- old/libosmo-abis/configure.ac 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/configure.ac 2015-12-23 18:32:12.000000000 +0100 @@ -2,7 +2,7 @@ m4_esyscmd([./git-version-gen .tarball-version]), [[email protected]]) -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip 1.6 subdir-objects]) AC_CONFIG_TESTDIR(tests) dnl kernel style compile messages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/changelog new/libosmo-abis/debian/changelog --- old/libosmo-abis/debian/changelog 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/changelog 2015-12-23 18:32:12.000000000 +0100 @@ -1,4 +1,10 @@ -libosmo-abis (0.3.1) UNRELEASED; urgency=medium +libosmo-abis (0.3.2) UNRELEASED; urgency=medium + + * Bump so version to re-link libosmovty + + -- Holger Hans Peter Freyther <[email protected]> Tue, 03 Nov 2015 09:42:01 +0100 + +libosmo-abis (0.3.1) unstable; urgency=medium * New upstream release of libosmo-abis diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/compat new/libosmo-abis/debian/compat --- old/libosmo-abis/debian/compat 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/compat 2015-12-23 18:32:12.000000000 +0100 @@ -1 +1 @@ -7 +9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/control new/libosmo-abis/debian/control --- old/libosmo-abis/debian/control 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/control 2015-12-23 18:32:12.000000000 +0100 @@ -2,8 +2,8 @@ Section: libs Priority: optional Maintainer: Harald Welte <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev -Standards-Version: 3.9.0 +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev (>= 0.6.4), pkg-config, libortp-dev +Standards-Version: 3.9.6 Homepage: http://openbsc.osmocom.org/trac/wiki/libosmo-abis Vcs-Git: git://git.osmocom.org/libosmo-abis.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-abis.git;a=summary @@ -11,32 +11,37 @@ Package: libosmo-abis Section: oldlibs Architecture: any -Depends: libosmoabis4, libosmotrau0, ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: Legacy package for libosmo-abis libosmo-abis is an empty package helping in the transition to one package per DSO. -Package: libosmoabis4 +Package: libosmoabis5 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: GSM A-bis handling -Package: libosmotrau0 +Package: libosmotrau1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same Description: GSM trau handling Package: libosmo-abis-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, libosmotrau0, libosmoabis4 +Depends: ${misc:Depends}, libosmotrau1 (= ${binary:Version}), libosmoabis5 (= ${binary:Version}) +Multi-Arch: same Description: Development headers for A-bis interface. Package: libosmo-abis-dbg Section: debug Architecture: any Priority: extra -Depends: libosmoabis4 (= ${binary:Version}), libosmotrau0 (= ${binary:Version}), ${misc:Depends} +Depends: libosmoabis5 (= ${binary:Version}), libosmotrau1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: Debug symbols for A-bis interface. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmo-abis-dev.install new/libosmo-abis/debian/libosmo-abis-dev.install --- old/libosmo-abis/debian/libosmo-abis-dev.install 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/libosmo-abis-dev.install 2015-12-23 18:32:12.000000000 +0100 @@ -1,5 +1,5 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/lib*.la -usr/lib/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/lib*.la +usr/lib/*/pkgconfig/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmoabis4.install new/libosmo-abis/debian/libosmoabis4.install --- old/libosmo-abis/debian/libosmoabis4.install 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/libosmoabis4.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libosmoabis.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmoabis5.install new/libosmo-abis/debian/libosmoabis5.install --- old/libosmo-abis/debian/libosmoabis5.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-abis/debian/libosmoabis5.install 2015-12-23 18:32:12.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libosmoabis.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmotrau0.install new/libosmo-abis/debian/libosmotrau0.install --- old/libosmo-abis/debian/libosmotrau0.install 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/libosmotrau0.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/libosmotrau.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/libosmotrau1.install new/libosmo-abis/debian/libosmotrau1.install --- old/libosmo-abis/debian/libosmotrau1.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-abis/debian/libosmotrau1.install 2015-12-23 18:32:12.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libosmotrau.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/debian/rules new/libosmo-abis/debian/rules --- old/libosmo-abis/debian/rules 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/debian/rules 2015-12-23 18:32:12.000000000 +0100 @@ -4,11 +4,11 @@ DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') -export DH_VERBOSE=1 +#export DH_VERBOSE=1 export DEB_BUILD_HARDENING=1 %: - dh --with autoreconf $@ --fail-missing + dh $@ --with autoreconf --fail-missing override_dh_strip: dh_strip --dbg-package=libosmo-abis-dbg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/include/osmocom/abis/lapd.h new/libosmo-abis/include/osmocom/abis/lapd.h --- old/libosmo-abis/include/osmocom/abis/lapd.h 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/include/osmocom/abis/lapd.h 2015-12-23 18:41:55.000000000 +0100 @@ -50,6 +50,8 @@ __LAPD_ERR_MAX }; +struct lapd_tei *lapd_tei_alloc(struct lapd_instance *li, uint8_t tei); + int lapd_receive(struct lapd_instance *li, struct msgb *msg, int *error); void lapd_transmit(struct lapd_instance *li, uint8_t tei, uint8_t sapi, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/include/osmocom/trau/osmo_ortp.h new/libosmo-abis/include/osmocom/trau/osmo_ortp.h --- old/libosmo-abis/include/osmocom/trau/osmo_ortp.h 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/include/osmocom/trau/osmo_ortp.h 2015-12-23 18:32:12.000000000 +0100 @@ -79,4 +79,10 @@ int subsys, int level, const char *pfx); +void osmo_rtp_socket_stats(struct osmo_rtp_socket *rs, + uint32_t *sent_packets, uint32_t *sent_octets, + uint32_t *recv_packets, uint32_t *recv_octets, + uint32_t *recv_lost, uint32_t *last_jitter); + + #endif /* _OSMO_ORTP_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/src/Makefile.am new/libosmo-abis/src/Makefile.am --- old/libosmo-abis/src/Makefile.am 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/src/Makefile.am 2015-12-23 18:32:12.000000000 +0100 @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification -ABIS_LIBVERSION=4:0:0 -TRAU_LIBVERSION=0:0:0 +ABIS_LIBVERSION=5:0:0 +TRAU_LIBVERSION=1:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/src/subchan_demux.c new/libosmo-abis/src/subchan_demux.c --- old/libosmo-abis/src/subchan_demux.c 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/src/subchan_demux.c 2015-12-23 18:32:12.000000000 +0100 @@ -44,7 +44,6 @@ } #define SYNC_HDR_BITS 16 -static const uint8_t nullbytes[SYNC_HDR_BITS]; /* check if we have just completed the 16 bit zero + 1 bit one sync * header, in accordance with GSM TS 08.60 Chapter 4.8.1 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-abis/src/trau/osmo_ortp.c new/libosmo-abis/src/trau/osmo_ortp.c --- old/libosmo-abis/src/trau/osmo_ortp.c 2015-03-01 02:14:11.000000000 +0100 +++ new/libosmo-abis/src/trau/osmo_ortp.c 2015-12-23 18:32:32.000000000 +0100 @@ -546,3 +546,32 @@ stats->packet_recv, stats->hw_recv, stats->outoftime, stats->cum_packet_loss, stats->discarded); } + +void osmo_rtp_socket_stats(struct osmo_rtp_socket *rs, + uint32_t *sent_packets, uint32_t *sent_octets, + uint32_t *recv_packets, uint32_t *recv_octets, + uint32_t *recv_lost, uint32_t *last_jitter) +{ + const rtp_stats_t *stats; + + *sent_packets = *sent_octets = *recv_packets = *recv_octets = 0; + *recv_lost = *last_jitter = 0; + + stats = rtp_session_get_stats(rs->sess); + if (stats) { + /* truncate from 64bit to 32bit here */ + *sent_packets = stats->packet_sent; + *sent_octets = stats->sent; + *recv_packets = stats->packet_recv; + *recv_octets = stats->recv; + *recv_lost = stats->cum_packet_loss; + } + +#if HAVE_ORTP_021 + const jitter_stats_t *jitter; + + jitter = rtp_session_get_jitter_stats(rs->sess); + if (jitter) + *last_jitter = jitter->jitter; +#endif +}
