pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-e1d/+/34371?usp=email )
Change subject: Bump version: 0.5.0.11-b7c9-dirty → 0.6.0
......................................................................
Bump version: 0.5.0.11-b7c9-dirty → 0.6.0
Change-Id: I8d5e3ffd928fa65bc3d3b43553fcd6774a7812dc
---
M configure.ac
M contrib/osmo-e1d.spec.in
M debian/changelog
M debian/control
R debian/libosmo-octoi2.install
M src/octoi/Makefile.am
6 files changed, 46 insertions(+), 16 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
osmith: Looks good to me, but someone else must approve
diff --git a/configure.ac b/configure.ac
index c4311a5..28ea2b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,9 @@
PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1])
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0)
-PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.8.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb >= 1.9.0)
PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21)
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/osmo-e1d.spec.in b/contrib/osmo-e1d.spec.in
index 878a05c..024fed8 100644
--- a/contrib/osmo-e1d.spec.in
+++ b/contrib/osmo-e1d.spec.in
@@ -27,9 +27,9 @@
%if 0%{?suse_version}
BuildRequires: systemd-rpm-macros
%endif
-BuildRequires: pkgconfig(libosmocore) >= 1.8.0
-BuildRequires: pkgconfig(libosmousb) >= 1.8.0
-BuildRequires: pkgconfig(libosmovty) >= 1.8.0
+BuildRequires: pkgconfig(libosmocore) >= 1.9.0
+BuildRequires: pkgconfig(libosmousb) >= 1.9.0
+BuildRequires: pkgconfig(libosmovty) >= 1.9.0
BuildRequires: pkgconfig(talloc) >= 2.0.1
%{?systemd_requires}
@@ -51,12 +51,12 @@
%description -n libosmo-e1d1
Osmocom E1 Daemon Protocol Library.
-%package -n libosmo-octoi1
+%package -n libosmo-octoi2
Summary: Library for the Osmocom Community TDMoIP network
License: LGPL-3.0-or-later
Group: System/Libraries
-%description -n libosmo-octoi1
+%description -n libosmo-octoi2
Library for the Osmocom Community TDMoIP network.
%package devel
@@ -64,7 +64,7 @@
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: libosmo-e1d1 = %version-%release
-Requires: libosmo-octoi1 = %version-%release
+Requires: libosmo-octoi2 = %version-%release
Provides: libosmo-e1d-devel = %version-%release
Obsoletes: libosmo-e1d-devel < %version-%release
@@ -93,8 +93,8 @@
%post -n libosmo-e1d1 -p /sbin/ldconfig
%postun -n libosmo-e1d1 -p /sbin/ldconfig
-%post -n libosmo-octoi1 -p /sbin/ldconfig
-%postun -n libosmo-octoi1 -p /sbin/ldconfig
+%post -n libosmo-octoi2 -p /sbin/ldconfig
+%postun -n libosmo-octoi2 -p /sbin/ldconfig
%if 0%{?suse_version}
%preun
@@ -125,7 +125,7 @@
%files -n libosmo-e1d1
%_libdir/libosmo-e1d.so.*
-%files -n libosmo-octoi1
+%files -n libosmo-octoi2
%_libdir/libosmo-octoi.so.*
%files devel
diff --git a/debian/changelog b/debian/changelog
index f841b6a..339ecc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+osmo-e1d (0.6.0) unstable; urgency=medium
+
+ [ Oliver Smith ]
+ * Run struct_endianness.py
+ * debian: set compat level to 10
+ * systemd: depend on networking-online.target
+
+ [ Philipp Maier ]
+ * proto_clnt: fix function prototype
+ * proto_clnt: close osmo-e1d control socket on connection loss
+ * proto_clnt: use osmo_fd_close to close the socket on connection loss
+
+ [ Harald Welte ]
+ * Check return code of fcntl() in several plaaces
+ * proto_srv: Fix file descriptor and memory leak in error paths
+ * octoi: Fix missing check of osmo_fsm_register() return value
+ * e1d-ts-pipe: Assert that osmo_fd_register() succeeds
+ * octoi: Add force-send-all-ts mode
+
+ -- Pau Espin Pedrol <[email protected]> Tue, 12 Sep 2023 13:30:06 +0200
+
osmo-e1d (0.5.0) unstable; urgency=medium
[ Oliver Smith ]
diff --git a/debian/control b/debian/control
index 29a6143..f0b726a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@
libtool,
pkg-config,
python3-minimal,
- libosmocore-dev (>= 1.8.0),
+ libosmocore-dev (>= 1.9.0),
libusb-1.0-0-dev,
osmo-gsm-manuals-dev (>= 1.4.0)
Standards-Version: 3.9.8
@@ -41,7 +41,7 @@
libosmocore-dev,
Description: Development headers for the osmo-e1d library.
-Package: libosmo-octoi1
+Package: libosmo-octoi2
Section: libs
Architecture: any
Multi-Arch: same
@@ -54,6 +54,6 @@
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends},
- libosmo-octoi1 (= ${binary:Version}),
+ libosmo-octoi2 (= ${binary:Version}),
libosmocore-dev,
Description: Development headers for the Osmocom Community TDMoIP library.
diff --git a/debian/libosmo-octoi1.install b/debian/libosmo-octoi2.install
similarity index 100%
rename from debian/libosmo-octoi1.install
rename to debian/libosmo-octoi2.install
diff --git a/src/octoi/Makefile.am b/src/octoi/Makefile.am
index 529dd8c..bc6d3fb 100644
--- a/src/octoi/Makefile.am
+++ b/src/octoi/Makefile.am
@@ -5,7 +5,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
-LIBVERSION=1:0:0
+LIBVERSION=2:0:0
lib_LTLIBRARIES = libosmo-octoi.la
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/34371?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I8d5e3ffd928fa65bc3d3b43553fcd6774a7812dc
Gerrit-Change-Number: 34371
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
