Bump version: 0.2.2.4-5ac8-dirty → 0.2.3

Change-Id: I84d05f283cfd28298f3a4ef6df1c49265638969b
ctrl: take both address and port from vty config
2025-10-24 16:53:52 +00:00 · 2023-02-07 17:42:01 +01:00 · 2022-12-17 21:32:29 +03:00 · 2022-09-12 07:12:35 +00:00 · 2022-09-09 22:40:27 +07:00 · 2022-08-29 00:33:10 +07:00
16 changed files with 130 additions and 49 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.osmocom.org
+project=osmo-smlc
+
--- a/4
+++ b/4
@@ -1,4 +0,0 @@
-About OsmoSMLC
-==============
-
-FIXME
--- a/README.md
+++ b/README.md
@@ -0,0 +1,69 @@
+osmo-smlc - Osmocom Serving Mobile Location Centre
+==================================================
+
+This repository contains a C-language implementation of a minimalistic
+GSM Serving Mobile Location Centre (SMLC) for 2G (GSM).  It is part of the
+[Osmocom](https://osmocom.org/) Open Source Mobile Communications project.
+
+OsmoSMLC exposes
+ * 3GPP Lb interface towards the BSC
+ * The Osmocom typical telnet VTY and CTRL interfaces.
+ * The Osmocom typical statsd exporter.
+
+OsmoSMLC supports the following location methods:
+ * currently only the Timing Advance based method of determining a mobile station; operator must configure the
+   locations of the cells in the osmo-smlc configuration file
+
+Homepage
+--------
+
+You can find the OsmoSMLC issue tracker and wiki online at
+<https://osmocom.org/projects/osmo-smlc> and <https://osmocom.org/projects/osmo-smlc/wiki>
+
+
+GIT Repository
+--------------
+
+You can clone from the official osmo-smlc.git repository using
+
+        git clone https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
+
+There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc>
+
+
+Documentation
+-------------
+
+User Manuals and VTY reference manuals are [optionally] built in PDF form
+as part of the build process.
+
+Pre-rendered PDF version of the current "master" can be found at
+[User Manual](https://ftp.osmocom.org/docs/latest/osmosmlc-usermanual.pdf)
+as well as the [VTY Reference Manual](https://ftp.osmocom.org/docs/latest/osmosmlc-vty-reference.pdf)
+
+
+Mailing List
+------------
+
+Discussions related to osmo-smlc are happening on the
+openbsc@lists.osmocom.org mailing list, please see
+<https://lists.osmocom.org/mailman/listinfo/openbsc> for subscription
+options and the list archive.
+
+Please observe the [Osmocom Mailing List
+Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules)
+when posting.
+
+Contributing
+------------
+
+Our coding standards are described at
+<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards>
+
+We us a gerrit based patch submission/review process for managing
+contributions.  Please see
+<https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> for
+more details
+
+The current patch queue for osmo-smlc can be seen at
+<https://gerrit.osmocom.org/#/q/project:osmo-smlc+status:open>
--- a/configure.ac
+++ b/configure.ac
@@ -34,12 +34,12 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
 fi
 PKG_PROG_PKG_CONFIG([0.20])

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

 dnl checks for header files
 AC_HEADER_STDC
@@ -121,7 +121,7 @@ if test "x$enable_ext_tests" = "xyes" ; then
 	fi
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
-		AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
+		AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.])
 	fi
 fi
 AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
--- 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
@@ -25,20 +25,19 @@ Group:          Hardware/Mobile
 URL:            https://osmocom.org/projects/osmo-smlc
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  autoconf
-BuildRequires:  autoconf-archive
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig >= 0.20
 %if 0%{?suse_version}
 BuildRequires:  systemd-rpm-macros
 %endif
-BuildRequires:  pkgconfig(libosmo-netif) >= 1.1.0
-BuildRequires:  pkgconfig(libosmo-sccp) >= 1.5.0
-BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.5.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.6.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.6.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.6.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.6.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 1.3.0
+BuildRequires:  pkgconfig(libosmo-sccp) >= 1.7.0
+BuildRequires:  pkgconfig(libosmo-sigtran) >= 1.7.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.8.0
+BuildRequires:  pkgconfig(libosmoctrl) >= 1.8.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.8.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.8.0
 BuildRequires:  pkgconfig(talloc)
 %{?systemd_requires}

@@ -78,7 +77,7 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)

 %files
 %license COPYING
-%doc AUTHORS README
+%doc AUTHORS README.md
 %{_bindir}/osmo-smlc
 %dir %{_docdir}/%{name}/examples
 %dir %{_docdir}/%{name}/examples/osmo-smlc
--- a/contrib/systemd/osmo-smlc.service
+++ b/contrib/systemd/osmo-smlc.service
@@ -4,6 +4,8 @@ Description=Osmocom Serving Mobile Location Center (SMLC)
 [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,32 @@
+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 ]
+  * treewide: remove FSF address
+
+  [ Pau Espin Pedrol ]
+  * deb/rpm packaging: Drop dependency on autoconf-archive
+
+  [ Vadim Yanitskiy ]
+  * tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS'
+
+  [ Harald Welte ]
+  * update git URLs (git -> https; gitea)
+  * Fill README with content; convert to markdown
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 29 Jun 2022 12:21:06 +0200
+
 osmo-smlc (0.2.1) unstable; urgency=medium

  [ Pau Espin Pedrol ]
--- a/debian/control
+++ b/debian/control
@@ -6,19 +6,18 @@ Build-Depends: debhelper (>=9),
               dh-autoreconf,
               autotools-dev,
               autoconf,
-               autoconf-archive,
               automake,
               libtool,
               pkg-config,
               libsctp-dev,
               libtalloc-dev,
-               libosmocore-dev (>= 1.6.0),
-               libosmo-sccp-dev (>= 1.5.0),
-               libosmo-sigtran-dev (>= 1.5.0),
-               osmo-gsm-manuals-dev (>= 1.2.0)
+               libosmocore-dev (>= 1.8.0),
+               libosmo-sccp-dev (>= 1.7.0),
+               libosmo-sigtran-dev (>= 1.7.0),
+               osmo-gsm-manuals-dev (>= 1.4.0)
 Standards-Version: 3.9.8
-Vcs-Git: git://git.osmocom.org/osmo-smlc.git
-Vcs-Browser: https://git.osmocom.org/osmo-smlc/
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc
 Homepage: https://osmocom.org/projects/osmo-smlc

 Package: osmo-smlc
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: osmo-smlc
-Source: git://git.osmocom.org/osmo-smlc
+Source: https://gitea.osmocom.org/cellular-infrastructure/osmo-smlc

 Files:     *
 Copyright: 2020 Harald Welte <laforge@osmocom.org>
--- a/include/osmocom/smlc/cell_locations.h
+++ b/include/osmocom/smlc/cell_locations.h
@@ -17,10 +17,6 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
 */

 #pragma once
--- a/include/osmocom/smlc/smlc_loc_req.h
+++ b/include/osmocom/smlc/smlc_loc_req.h
@@ -17,10 +17,6 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
 */
 #pragma once

--- a/src/osmo-smlc/cell_locations.c
+++ b/src/osmo-smlc/cell_locations.c
@@ -17,10 +17,6 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
 */

 #include <limits.h>
--- a/src/osmo-smlc/smlc_loc_req.c
+++ b/src/osmo-smlc/smlc_loc_req.c
@@ -17,10 +17,6 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
 */

 #include <osmocom/smlc/smlc_data.h>
--- a/src/osmo-smlc/smlc_main.c
+++ b/src/osmo-smlc/smlc_main.c
@@ -268,8 +268,7 @@ int main(int argc, char **argv)

 	/* 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/smlc_subscr/Makefile.am
+++ b/tests/smlc_subscr/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST = \
 	smlc_subscr_test.err \
 	$(NULL)

-noinst_PROGRAMS = \
+check_PROGRAMS = \
 	smlc_subscr_test \
 	$(NULL)
Author	SHA1	Message	Date
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
Pau Espin Pedrol	f30a8a1133	Bump version: 0.2.1.5-cd82-dirty → 0.2.2 Change-Id: I17fe1460bb04da7d10ebaa1410cdb0dd670ece24	2022-06-29 12:21:07 +02:00
Harald Welte	cd82cb23be	Fill README with content; convert to markdown Change-Id: I54297aba4dbb4f521caaeb555de9e5404f9e6dcd	2022-06-18 14:01:07 +02:00
Harald Welte	bc54ff06f8	update git URLs (git -> https; gitea) Change-Id: I8788fa6b0495b8ee72b1bb5485f6cd3a4835eb0b	2022-06-18 14:01:07 +02:00
Vadim Yanitskiy	b9b65d953f	tests: use 'check_PROGRAMS' instead of 'noinst_PROGRAMS' When using 'check_PROGRAMS', autoconf/automake generates smarter Makefiles, so that the test programs are not being compiled during the normal 'make all', but only during 'make check'. Change-Id: I9b60429c8c3922dd97809c72ed7960ffdc059d8b	2022-04-14 02:18:50 +03:00
Pau Espin Pedrol	454047c586	deb/rpm packaging: Drop dependency on autoconf-archive it is not needed since `ec37263a37`. Change-Id: I729b7dc0f2971b959810a46baa8a344e8b71e4a4	2022-01-11 18:26:44 +01:00
Oliver Smith	5b7f1fd5c8	treewide: remove FSF address Remove the paragraph about writing to the Free Software Foundation's mailing address. The FSF has changed addresses in the past, and may do so again. In 2021 this is not useful, let's rather have a bit less boilerplate at the start of source files. Change-Id: Ieb4f9b4ad5073c9b5996cb960b248c450fd5f2dd	2021-12-14 12:22:00 +01:00