Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libosmo-abis for openSUSE:Factory
checked in at 2024-02-12 18:52:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libosmo-abis (Old)
and /work/SRC/openSUSE:Factory/.libosmo-abis.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmo-abis"
Mon Feb 12 18:52:49 2024 rev:19 rq:1146063 version:1.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libosmo-abis/libosmo-abis.changes
2023-11-02 20:22:02.993116121 +0100
+++ /work/SRC/openSUSE:Factory/.libosmo-abis.new.1815/libosmo-abis.changes
2024-02-12 18:55:18.165200072 +0100
@@ -1,0 +2,8 @@
+Mon Feb 12 02:38:05 UTC 2024 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 1.5.1
+ * dahdi: Log context (e1inpt_ts name) when opening timeslot
+ devices
+ * DAHDI: Log hexdump of TX at level DEBUG, not ERROR
+
+-------------------------------------------------------------------
Old:
----
1.5.0.tar.gz
New:
----
1.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libosmo-abis.spec ++++++
--- /var/tmp/diff_new_pack.sADyhc/_old 2024-02-12 18:55:18.605215962 +0100
+++ /var/tmp/diff_new_pack.sADyhc/_new 2024-02-12 18:55:18.609216106 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libosmo-abis
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libosmo-abis
-Version: 1.5.0
+Version: 1.5.1
Release: 0
Summary: Osmocom library for A-bis interface between BTS and BSC
License: AGPL-3.0-or-later AND GPL-2.0-or-later
++++++ 1.5.0.tar.gz -> 1.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libosmo-abis-1.5.0/Makefile.am
new/libosmo-abis-1.5.1/Makefile.am
--- old/libosmo-abis-1.5.0/Makefile.am 2023-09-12 13:39:09.000000000 +0200
+++ new/libosmo-abis-1.5.1/Makefile.am 2024-01-28 12:04:12.000000000 +0100
@@ -17,6 +17,7 @@
README.md \
contrib/libosmo-abis.spec.in \
debian \
+ git-version-gen \
$(NULL)
@RELMAKE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libosmo-abis-1.5.0/configure.ac
new/libosmo-abis-1.5.1/configure.ac
--- old/libosmo-abis-1.5.0/configure.ac 2023-09-12 13:39:09.000000000 +0200
+++ new/libosmo-abis-1.5.1/configure.ac 2024-01-28 12:04:12.000000000 +0100
@@ -161,6 +161,19 @@
[rtp_session_signal_connect requires ulong parameter])])
CFLAGS=$_cflags_save
+_cflags_save=$CFLAGS
+CFLAGS="$CFLAGS $ORTP_CFLAGS"
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <ortp/ortp.h>]],
+ [[OrtpMemoryFunctions memfn = { };]]
+ )],
+ [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [1],
+ [OrtpMemoryFunctions is available, will use talloc])],
+ [AC_DEFINE([HAVE_ORTP_MEM_FUNC], [0],
+ [OrtpMemoryFunctions is not available])])
+CFLAGS=$_cflags_save
+
AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libosmo-abis-1.5.0/debian/changelog
new/libosmo-abis-1.5.1/debian/changelog
--- old/libosmo-abis-1.5.0/debian/changelog 2023-09-12 13:39:09.000000000
+0200
+++ new/libosmo-abis-1.5.1/debian/changelog 2024-01-28 12:04:12.000000000
+0100
@@ -1,3 +1,18 @@
+libosmo-abis (1.5.1) unstable; urgency=medium
+
+ [ Harald Welte ]
+ * dahdi: Log context (e1inpt_ts name) when opening timeslot devices
+ * dahdi: Fix compilation with ancient DAHDI
+
+ [ Keith ]
+ * DAHDI: Log hexdump of TX at level DEBUG, not ERROR
+
+ [ Vadim Yanitskiy ]
+ * trau/osmo_ortp: support building without OrtpMemoryFunctions API
+ * build: include git-version-gen into the release tarball
+
+ -- Vadim Yanitskiy <vyanits...@sysmocom.de> Sun, 28 Jan 2024 18:04:12 +0700
+
libosmo-abis (1.5.0) unstable; urgency=medium
[ Philipp Maier ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libosmo-abis-1.5.0/src/Makefile.am
new/libosmo-abis-1.5.1/src/Makefile.am
--- old/libosmo-abis-1.5.0/src/Makefile.am 2023-09-12 13:39:09.000000000
+0200
+++ new/libosmo-abis-1.5.1/src/Makefile.am 2024-01-28 12:04:12.000000000
+0100
@@ -1,8 +1,8 @@
# This is _NOT_ the library release version, it's an API version.
# Please read chapter "Library interface versions" of the libtool documentation
# before making any modifications:
https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-ABIS_LIBVERSION=13:0:0
-TRAU_LIBVERSION=9:0:7
+ABIS_LIBVERSION=13:1:0
+TRAU_LIBVERSION=9:1:7
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
$(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS)
$(COVERAGE_CFLAGS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libosmo-abis-1.5.0/src/input/dahdi.c
new/libosmo-abis-1.5.1/src/input/dahdi.c
--- old/libosmo-abis-1.5.0/src/input/dahdi.c 2023-09-12 13:39:09.000000000
+0200
+++ new/libosmo-abis-1.5.1/src/input/dahdi.c 2024-01-28 12:04:12.000000000
+0100
@@ -259,7 +259,7 @@
return 0;
}
- LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "TX: %s\n", osmo_hexdump(msg->data,
msg->len));
+ LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX: %s\n", osmo_hexdump(msg->data,
msg->len));
lapd_transmit(e1i_ts->lapd, sign_link->tei,
sign_link->sapi, msg);
@@ -594,18 +594,21 @@
return 0;
}
-static int dahdi_open_slot(int dahdi_chan_nr)
+static int dahdi_open_slot(const struct e1inp_ts *e1i_ts, int dahdi_chan_nr)
{
int rc, fd;
+ char name[32];
#ifndef DAHDI_SPECIFY
char openstr[128];
- snprintf(openstr, sizeof(openstr), "/dev/dahdi/%d", dev_nr);
+ snprintf(openstr, sizeof(openstr), "/dev/dahdi/%d", dahdi_chan_nr);
#else
const char *openstr = "/dev/dahdi/channel";
#endif
+ e1inp_ts_name(name, sizeof(name), e1i_ts);
+
rc = open(openstr, O_RDWR | O_NONBLOCK);
if (rc < 0) {
- LOGP(DLINP, LOGL_ERROR, "DAHDI: could not open %s %s\n",
openstr, strerror(errno));
+ LOGP(DLINP, LOGL_ERROR, "%s: DAHDI: could not open %s %s\n",
name, openstr, strerror(errno));
return -EIO;
}
fd = rc;
@@ -613,11 +616,12 @@
rc = ioctl(fd, DAHDI_SPECIFY, &dahdi_chan_nr);
if (rc < 0) {
close(fd);
- LOGP(DLINP, LOGL_ERROR, "DAHDI: could not DAHDI_SPECIFY %d:
%s\n",
+ LOGP(DLINP, LOGL_ERROR, "%s: DAHDI: could not DAHDI_SPECIFY %d:
%s\n", name,
dahdi_chan_nr, strerror(errno));
return -EIO;
}
#endif
+ LOGP(DLINP, LOGL_DEBUG, "%s: DAHDI: opened dahdi_chan_nr=%d\n", name,
dahdi_chan_nr);
return fd;
}
@@ -668,7 +672,7 @@
break;
case E1INP_TS_TYPE_SIGN:
if (!bfd->fd)
- bfd->fd = dahdi_open_slot(dev_nr);
+ bfd->fd = dahdi_open_slot(e1i_ts, dev_nr);
if (bfd->fd < 0)
return -EIO;
bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;
@@ -686,7 +690,7 @@
break;
case E1INP_TS_TYPE_HDLC:
if (!bfd->fd)
- bfd->fd = dahdi_open_slot(dev_nr);
+ bfd->fd = dahdi_open_slot(e1i_ts, dev_nr);
if (bfd->fd < 0)
return -EIO;
bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;
@@ -703,7 +707,7 @@
e1i_ts->lapd = NULL;
}
if (!bfd->fd)
- bfd->fd = dahdi_open_slot(dev_nr);
+ bfd->fd = dahdi_open_slot(e1i_ts, dev_nr);
if (bfd->fd < 0)
return -EIO;
ret = dahdi_set_bufinfo(bfd->fd, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libosmo-abis-1.5.0/src/trau/osmo_ortp.c
new/libosmo-abis-1.5.1/src/trau/osmo_ortp.c
--- old/libosmo-abis-1.5.0/src/trau/osmo_ortp.c 2023-09-12 13:39:09.000000000
+0200
+++ new/libosmo-abis-1.5.1/src/trau/osmo_ortp.c 2024-01-28 12:04:12.000000000
+0100
@@ -47,7 +47,7 @@
static void *tall_rtp_ctx;
/* malloc integration */
-
+#if HAVE_ORTP_MEM_FUNC
static void *osmo_ortp_malloc(size_t sz)
{
return talloc_size(tall_rtp_ctx, sz);
@@ -68,6 +68,7 @@
.realloc_fun = osmo_ortp_realloc,
.free_fun = osmo_ortp_free
};
+#endif /* HAVE_ORTP_MEM_FUNC */
/* logging */
@@ -121,13 +122,14 @@
needs_endl = fmt[fmt_len - 1] != '\n' ? 1 : 0;
- str = osmo_ortp_malloc(domain_len + 2 /*": "*/ + fmt_len + needs_endl +
1);
- sprintf(str, "%s%s%s%s", domain_str, domain_len ? ": " : "", fmt,
needs_endl ? "\n" : "");
+ str = talloc_asprintf(tall_rtp_ctx, "%s%s%s%s",
+ domain_str, domain_len ? ": " : "",
+ fmt, needs_endl ? "\n" : "");
osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0,
0, str, args);
- osmo_ortp_free(str);
+ talloc_free(str);
}
@@ -315,7 +317,9 @@
void osmo_rtp_init(void *ctx)
{
tall_rtp_ctx = ctx;
+#if HAVE_ORTP_MEM_FUNC
ortp_set_memory_functions(&osmo_ortp_memfn);
+#endif
ortp_init();
ortp_set_log_level_mask(
#if HAVE_ORTP_LOG_DOMAIN
