Bump version: 0.2.3.12-7385-dirty → 0.2.4

Change-Id: Ib73d7f15f55a52479a7728f86e96e93bba699ec5
configure.ac: migrate from python2 to python3
2025-11-04 06:03:33 +00:00 · 2023-09-12 17:14:42 +02:00 · 2023-07-15 00:47:40 +07:00 · 2023-06-08 19:42:04 +02:00 · 2023-05-26 14:10:49 +02:00 · 2023-05-18 17:22:27 +07:00
16 changed files with 84 additions and 44 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.osmocom.org
+project=osmo-smlc
+
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,8 @@ AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_TESTDIR(tests)

+CFLAGS="$CFLAGS -std=gnu11"
+
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

@@ -34,12 +36,12 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
 fi
 PKG_PROG_PKG_CONFIG([0.20])

-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.7.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
-PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.6.0)
-PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.9.0)
+PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.8.0)
+PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 1.8.0)

 dnl checks for header files
 AC_HEADER_STDC
@@ -115,9 +117,9 @@ AC_ARG_ENABLE([external_tests],
 				[Include the VTY/CTRL tests in make check [default=no]]),
 		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
 if test "x$enable_ext_tests" = "xyes" ; then
-	AC_CHECK_PROG(PYTHON2_AVAIL,python2,yes)
-	 if test "x$PYTHON2_AVAIL" != "xyes" ; then
-		AC_MSG_ERROR([Please install python2 to run the VTY/CTRL tests.])
+	AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes)
+	 if test "x$PYTHON3_AVAIL" != "xyes" ; then
+		AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.])
 	fi
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -58,12 +58,12 @@ LD_LIBRARY_PATH="$inst/lib" $MAKE check \
  || cat-testlogs.sh
 LD_LIBRARY_PATH="$inst/lib" \
  DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \
-  $MAKE distcheck \
+  $MAKE $PARALLEL_MAKE distcheck \
  || cat-testlogs.sh

 if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi

-$MAKE maintainer-clean
+$MAKE $PARALLEL_MAKE maintainer-clean
 osmo-clean-workspace.sh
--- a/contrib/osmo-smlc.spec.in
+++ b/contrib/osmo-smlc.spec.in
@@ -31,13 +31,13 @@ BuildRequires:  pkgconfig >= 0.20
 %if 0%{?suse_version}
 BuildRequires:  systemd-rpm-macros
 %endif
-BuildRequires:  pkgconfig(libosmo-netif) >= 1.2.0
-BuildRequires:  pkgconfig(libosmo-sccp) >= 1.6.0
-BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.6.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.7.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.7.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.7.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.7.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 1.4.0
+BuildRequires:  pkgconfig(libosmo-sccp) >= 1.8.0
+BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.8.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.9.0
+BuildRequires:  pkgconfig(libosmoctrl) >= 1.9.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.9.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.9.0
 BuildRequires:  pkgconfig(talloc)
 %{?systemd_requires}

--- a/contrib/systemd/osmo-smlc.service
+++ b/contrib/systemd/osmo-smlc.service
@@ -1,9 +1,13 @@
 [Unit]
 Description=Osmocom Serving Mobile Location Center (SMLC)
+After=network-online.target
+Wants=network-online.target

 [Service]
 Type=simple
 Restart=always
+StateDirectory=osmocom
+WorkingDirectory=%S/osmocom
 ExecStart=/usr/bin/osmo-smlc -c /etc/osmocom/osmo-smlc.cfg
 RestartSec=2

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+osmo-smlc (0.2.4) unstable; urgency=medium
+
+  [ arehbein ]
+  * Transition to use of 'telnet_init_default'
+
+  [ Vadim Yanitskiy ]
+  * configure.ac: set -std=gnu11
+  * Makefile.am: remove $(COVERAGE_LDFLAGS) from osmo_smlc_LDADD
+  * Makefile.am: remove unneeded AM_LDFLAGS with LIBS
+  * tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc
+  * tests: execute osmotest{vty,config}.py against osmo-smlc
+  * copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH
+  * configure.ac: migrate from python2 to python3
+
+  [ Oliver Smith ]
+  * debian: set compat level to 10
+  * systemd: depend on networking-online.target
+
+  [ Neels Janosch Hofmeyr ]
+  * ctrl-test: drop bogus 'rm -f $(CTRL_TEST_DB)'
+
+  [ Pau Espin Pedrol ]
+  * Write explicit role & sctp-role fields in ASP configurations
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 12 Sep 2023 17:14:41 +0200
+
+osmo-smlc (0.2.3) unstable; urgency=medium
+
+  [ Vadim Yanitskiy ]
+  * contrib/jenkins.sh: execute distcheck/maintainer-clean with $PARALLEL_MAKE
+
+  [ Max ]
+  * Add git-review config
+  * Set working directory in systemd service file
+  * ctrl: take both address and port from vty config
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 07 Feb 2023 17:42:00 +0100
+
 osmo-smlc (0.2.2) unstable; urgency=medium

  [ Oliver Smith ]
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: osmo-smlc
 Section: net
 Priority: extra
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Build-Depends: debhelper (>=9),
+Build-Depends: debhelper (>= 10),
               dh-autoreconf,
               autotools-dev,
               autoconf,
@@ -11,10 +11,10 @@ Build-Depends: debhelper (>=9),
               pkg-config,
               libsctp-dev,
               libtalloc-dev,
-               libosmocore-dev (>= 1.7.0),
-               libosmo-sccp-dev (>= 1.6.0),
-               libosmo-sigtran-dev (>= 1.6.0),
-               osmo-gsm-manuals-dev (>= 1.3.0)
+               libosmocore-dev (>= 1.9.0),
+               libosmo-sccp-dev (>= 1.8.0),
+               libosmo-sigtran-dev (>= 1.8.0),
+               osmo-gsm-manuals-dev (>= 1.5.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
--- a/doc/manuals/chapters/running.adoc
+++ b/doc/manuals/chapters/running.adoc
@@ -74,6 +74,7 @@ cs7 instance 0
 point-code 1.23.6
 asp asp-clnt-msc-0 2905 0 m3ua
  remote-ip 127.0.0.1
+  role asp
  sctp-role client
 ----

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,12 +14,6 @@ AM_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)

-AM_LDFLAGS = \
-	$(LIBOSMOCORE_LIBS) \
-	$(LIBOSMOGSM_LIBS) \
-	$(COVERAGE_LDFLAGS) \
-	$(NULL)
-
 SUBDIRS = \
 	osmo-smlc \
 	$(NULL)
--- a/src/osmo-smlc/Makefile.am
+++ b/src/osmo-smlc/Makefile.am
@@ -39,6 +39,5 @@ osmo_smlc_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
 	$(LIBOSMOCTRL_LIBS) \
-	$(COVERAGE_LDFLAGS) \
 	$(LIBOSMOSIGTRAN_LIBS) \
 	$(NULL)
--- a/src/osmo-smlc/lb_conn.c
+++ b/src/osmo-smlc/lb_conn.c
@@ -1,7 +1,7 @@
 /* SMLC Lb connection implementation */

 /*
- * (C) 2020 by sysmocom s.m.f.c. <info@sysmocom.de>
+ * (C) 2020 by sysmocom s.f.m.c. <info@sysmocom.de>
 * All Rights Reserved
 *
 * Author: Neels Hofmeyr
--- a/src/osmo-smlc/lb_peer.c
+++ b/src/osmo-smlc/lb_peer.c
@@ -1,5 +1,5 @@
 /*
- * (C) 2019 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2019 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
 * All Rights Reserved
 *
 * SPDX-License-Identifier: AGPL-3.0+
--- a/src/osmo-smlc/sccp_lb_inst.c
+++ b/src/osmo-smlc/sccp_lb_inst.c
@@ -1,5 +1,5 @@
 /*
- * (C) 2020 by sysmocom - s.m.f.c. GmbH <info@sysmocom.de>
+ * (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
 * All Rights Reserved
 *
 * SPDX-License-Identifier: AGPL-3.0+
--- a/src/osmo-smlc/smlc_main.c
+++ b/src/osmo-smlc/smlc_main.c
@@ -262,14 +262,13 @@ int main(int argc, char **argv)
 	}

 	/* Start telnet interface after reading config for vty_get_bind_addr() */
-	rc = telnet_init_dynif(tall_smlc_ctx, g_smlc, vty_get_bind_addr(), OSMO_VTY_PORT_SMLC);
+	rc = telnet_init_default(tall_smlc_ctx, g_smlc, OSMO_VTY_PORT_SMLC);
 	if (rc < 0)
 		exit(1);

 	/* start control interface after reading config for
 	 * ctrl_vty_get_bind_addr() */
-	g_smlc->ctrl = ctrl_interface_setup_dynip2(g_smlc, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_SMLC,
-						   smlc_ctrl_node_lookup, _LAST_CTRL_NODE_SMLC);
+	g_smlc->ctrl = ctrl_interface_setup2(g_smlc, OSMO_CTRL_PORT_SMLC, smlc_ctrl_node_lookup, _LAST_CTRL_NODE_SMLC);
 	if (!g_smlc->ctrl) {
 		fprintf(stderr, "Failed to init the control interface. Exiting.\n");
 		exit(1);
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,11 +37,13 @@ DISTCLEANFILES = \
 	$(NULL)

 if ENABLE_EXT_TESTS
-python-tests: $(BUILT_SOURCES)
+python-tests: $(top_builddir)/src/osmo-smlc/osmo-smlc
 	$(MAKE) vty-test
 	$(MAKE) ctrl-test
+	osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
+	osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v
 else
-python-tests: $(BUILT_SOURCES)
+python-tests:
 	echo "Not running python-based tests (determined at configure-time)"
 endif

@@ -51,7 +53,7 @@ VTY_TEST ?= *.vty
 # To update the VTY script from current application behavior,
 # pass -u to vty_script_runner.py by doing:
 #   make vty-test U=-u
-vty-test:
+vty-test: $(top_builddir)/src/osmo-smlc/osmo-smlc
 	osmo_verify_transcript_vty.py -v \
 		-n OsmoSMLC -p 4271 \
 		-r "$(top_builddir)/src/osmo-smlc/osmo-smlc -c $(top_srcdir)/tests/osmo-smlc.cfg" \
@@ -60,14 +62,11 @@ vty-test:
 # To update the CTRL script from current application behavior,
 # pass -u to ctrl_script_runner.py by doing:
 #   make ctrl-test U=-u
-ctrl-test:
-	-rm -f $(CTRL_TEST_DB)
+ctrl-test: $(top_builddir)/src/osmo-smlc/osmo-smlc
 	osmo_verify_transcript_ctrl.py -v \
 		-p 4272 \
 		-r "$(top_builddir)/src/osmo-smlc/osmo-smlc -c $(top_srcdir)/tests/osmo-smlc.cfg" \
 		$(U) $(srcdir)/*.ctrl
-	-rm -f $(CTRL_TEST_DB)
-	-rm $(CTRL_TEST_DB)-*

 check-local: atconfig $(TESTSUITE)
 	$(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
Author	SHA1	Message	Date
Pau Espin Pedrol	e7535a4a9b	Bump version: 0.2.3.12-7385-dirty → 0.2.4 Change-Id: Ib73d7f15f55a52479a7728f86e96e93bba699ec5	2023-09-12 17:14:42 +02:00
Vadim Yanitskiy	7385427397	configure.ac: migrate from python2 to python3 Fortunatelly we don't have any python2 specific code, so just bump. Change-Id: Iaab94a1e896b78dc8699256e326edc165b0ed922 Related: OS#5950	2023-07-15 00:47:40 +07:00
Pau Espin Pedrol	81e12318ae	Write explicit role & sctp-role fields in ASP configurations Change-Id: Idf7b2288e93edb408b644da759f844ac0ce1210b	2023-06-08 19:42:04 +02:00
Oliver Smith	85f1cca096	systemd: depend on networking-online.target Related: SYS#6400 Change-Id: Idadcbbf55e976ae035cfac4b85ccd870e0f27b82	2023-05-26 14:10:49 +02:00
Vadim Yanitskiy	e8c4967639	copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH Change-Id: Ib155c44fb318cab38227c196919fc6cbba86c4bb	2023-05-18 17:22:27 +07:00
Neels Janosch Hofmeyr	d09e87c645	ctrl-test: drop bogus 'rm -f $(CTRL_TEST_DB)' That is a copy-paste artifact from osmo-hlr.git and looks pretty dangerous when CTRL_TEST_DB is not defined. Change-Id: Idcf9296a6e7e520c2f0b42f8aace01d616bcfc56	2023-05-05 02:14:01 +02:00
Oliver Smith	386d5acdbe	debian: set compat level to 10 Related: OS#5958 Change-Id: Ib45ad7c44cdefa4c5acab2da09f24796253a133d	2023-04-25 16:48:33 +02:00
Vadim Yanitskiy	8c11b24ca0	tests: execute osmotest{vty,config}.py against osmo-smlc Change-Id: I61d970563a1902cce704d5c1a6adea9d8be438e4	2023-03-30 02:40:18 +07:00
Vadim Yanitskiy	8bcac6f928	tests: $(BUILT_SOURCES) is not defined, depend on osmo-smlc Change-Id: I75a038b2730c7e0d4637db6dfb780839a49abc2e	2023-03-30 02:19:12 +07:00
Vadim Yanitskiy	74b4e61f36	Makefile.am: remove unneeded AM_LDFLAGS with LIBS Change-Id: Ic6886d2e47c053fe39647bc9ec3be704c935bee5	2023-03-09 18:10:18 +07:00
Vadim Yanitskiy	7118875839	Makefile.am: remove $(COVERAGE_LDFLAGS) from osmo_smlc_LDADD Change-Id: Ia7073d2baf4c758ebff167b6cf1b3ba9c1552821	2023-03-09 18:09:44 +07:00
Vadim Yanitskiy	cf29f44722	configure.ac: set -std=gnu11 Avoid using different dialects by accident (and resulting compiler errors if compiler assumes a different dialect), like in I72310886bef4db635078b75715c9d98ee45391cc. Related: https://lists.osmocom.org/pipermail/openbsc/2019-September/013030.html Related: https://lists.osmocom.org/pipermail/openbsc/2021-January/013360.html Related: osmo-pcu Ia57ba101627e3cc0babeca82631e207a3e2e0960 Change-Id: I76ed877d160f98e3627293b0539bec5fac1e8469	2023-03-09 15:39:18 +07:00
arehbein	0fda654d29	Transition to use of 'telnet_init_default' Related: OS#5809 Change-Id: Icc57c68337d55c6594c1c36e9bf41624d11dab0a	2023-02-25 17:48:58 +01:00
Pau Espin Pedrol	848316e9d4	Bump version: 0.2.2.4-5ac8-dirty → 0.2.3 Change-Id: I84d05f283cfd28298f3a4ef6df1c49265638969b	2023-02-07 17:42:01 +01:00
Max	5ac8ab7cd9	ctrl: take both address and port from vty config Change-Id: I5d73257c0233ce6772847809a6163b6ca4c88f83	2022-12-17 21:32:29 +03:00
Max	518550e404	Set working directory in systemd service file By default systemd will execute service with root directory (or home directory for user instance) which might result in attempts to create files in unexpected place. Let's set it to 'osmocom' subdir of state directory (/var/lib for system instance) instead. Related: OS#4821 Change-Id: Ie8b014e8eac23221a6a7087bb2b886014323680b	2022-09-12 07:12:35 +00:00
Max	f2a03654bb	Add git-review config Change-Id: Ia16bb7936e9382dcc51d9122bd7582d75eb7ae15	2022-09-09 22:40:27 +07:00
Vadim Yanitskiy	accb1d1b25	contrib/jenkins.sh: execute distcheck/maintainer-clean with $PARALLEL_MAKE Change-Id: I14b0e0343dc70b72cc9e14641bccaa6da2059e46	2022-08-29 00:33:10 +07:00