From ed939154f8c0bd3cb6c9894719b27f26dc4b790c Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 7 Feb 2023 16:49:14 +0100 Subject: [PATCH] =?UTF-8?q?Bump=20version:=201.5.0.19-268a-dirty=20?= =?UTF-8?q?=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ide480a902bbfadefa396f3a0cb925f5dceab4f9c --- configure.ac | 10 ++--- contrib/osmo-hlr.spec.in | 24 ++++++------ debian/changelog | 39 +++++++++++++++++++ debian/control | 14 +++---- ...kup0.install => libosmo-mslookup1.install} | 0 src/mslookup/Makefile.am | 2 +- 6 files changed, 64 insertions(+), 25 deletions(-) rename debian/{libosmo-mslookup0.install => libosmo-mslookup1.install} (100%) diff --git a/configure.ac b/configure.ac index 78d0af96..1ee71bff 100644 --- a/configure.ac +++ b/configure.ac @@ -41,11 +41,11 @@ PKG_PROG_PKG_CONFIG([0.20]) PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.7.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.3.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.4.0) PKG_CHECK_MODULES(SQLITE3, sqlite3) diff --git a/contrib/osmo-hlr.spec.in b/contrib/osmo-hlr.spec.in index 2c53587a..5c3dae71 100644 --- a/contrib/osmo-hlr.spec.in +++ b/contrib/osmo-hlr.spec.in @@ -29,11 +29,11 @@ BuildRequires: python3 %if 0%{?suse_version} BuildRequires: systemd-rpm-macros %endif -BuildRequires: pkgconfig(libosmoabis) >= 1.3.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(libosmoabis) >= 1.4.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(sqlite3) BuildRequires: pkgconfig(talloc) >= 2.0.1 # only needed for populate_hlr_db.pl @@ -75,19 +75,19 @@ and External USSD Entities (EUSEs) using this library to implement clients. This subpackage contains libraries and header files for developing applications that want to make use of libosmo-gsup-client. -%package -n libosmo-mslookup0 +%package -n libosmo-mslookup1 Summary: Osmocom MS lookup library License: GPL-2.0-or-later Group: System/Libraries -%description -n libosmo-mslookup0 +%description -n libosmo-mslookup1 This shared library contains routines for looking up mobile subscribers. %package -n libosmo-mslookup-devel Summary: Development files for the Osmocom MS lookup library License: GPL-2.0-or-later Group: Development/Libraries/C and C++ -Requires: libosmo-mslookup0 = %{version} +Requires: libosmo-mslookup1 = %{version} %description -n libosmo-mslookup-devel This shared library contains routines for looking up mobile subscribers. @@ -146,8 +146,8 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %post -n libosmo-gsup-client0 -p /sbin/ldconfig %postun -n libosmo-gsup-client0 -p /sbin/ldconfig -%post -n libosmo-mslookup0 -p /sbin/ldconfig -%postun -n libosmo-mslookup0 -p /sbin/ldconfig +%post -n libosmo-mslookup1 -p /sbin/ldconfig +%postun -n libosmo-mslookup1 -p /sbin/ldconfig %files %license COPYING @@ -179,8 +179,8 @@ make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) %{_libdir}/libosmo-gsup-client.so %{_libdir}/pkgconfig/libosmo-gsup-client.pc -%files -n libosmo-mslookup0 -%{_libdir}/libosmo-mslookup.so.0* +%files -n libosmo-mslookup1 +%{_libdir}/libosmo-mslookup.so.1* %files -n libosmo-mslookup-devel %dir %{_includedir}/osmocom diff --git a/debian/changelog b/debian/changelog index 10683c9b..89b5aed3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +osmo-hlr (1.6.0) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * db_auc: hexparse_stmt(): check value returned by osmo_hexparse() + + [ Max ] + * Set working directory in systemd service file + * Ignore .deb build byproducts + * Debian: bump copyright year to match current + * Debian: reformat package description + * systemd: enable basic hardening + * Debian: install osmo-hlr-dgsm.cfg as example config + * hlr_vty.c: fix typo + * ctrl: take both address and port from vty config + + [ Harald Welte ] + * Support building with -Werror=strict-prototypes / -Werror=old-style-definition + * Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition + + [ arehbein ] + * osmo-hlr: Transition to use of 'telnet_init_default' + + [ Oliver Smith ] + * osmo_mdns_rfc_record_decode: check ret of talloc + * osmo_mdns_rfc_record_decode: proper free on err + * mslookup: use apn functions from libosmocore + * osmo_mdns_rfc_record/question_encode: remove ctx + + [ Keith ] + * Vty: Fixup config shown/written from vty + + [ Neels Hofmeyr ] + * fix memleak of proxy_subscr_listentry + + [ Alexander Couzens ] + * Add vty `reject-cause` to set the reject cause + + -- Pau Espin Pedrol Tue, 07 Feb 2023 16:49:14 +0100 + osmo-hlr (1.5.0) unstable; urgency=medium [ Oliver Smith ] diff --git a/debian/control b/debian/control index 0ed4883b..4bb91484 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, python3-minimal, - libosmocore-dev (>= 1.7.0), - libosmo-abis-dev (>= 1.3.0), - libosmo-netif-dev (>= 1.2.0), + libosmocore-dev (>= 1.8.0), + libosmo-abis-dev (>= 1.4.0), + libosmo-netif-dev (>= 1.3.0), libsqlite3-dev, sqlite3, - osmo-gsm-manuals-dev (>= 1.3.0) + osmo-gsm-manuals-dev (>= 1.4.0) Standards-Version: 3.9.6 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-hlr Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-hlr @@ -59,7 +59,7 @@ Description: Development headers of Osmocom GSUP client library . This package contains the development headers. -Package: libosmo-mslookup0 +Package: libosmo-mslookup1 Section: libs Architecture: any Multi-Arch: same @@ -73,7 +73,7 @@ Package: libosmo-mslookup-dev Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libosmo-mslookup0 (= ${binary:Version}), + libosmo-mslookup1 (= ${binary:Version}), libosmocore-dev Pre-Depends: ${misc:Pre-Depends} Description: Development headers of Osmocom MS lookup library @@ -85,7 +85,7 @@ Package: osmo-mslookup-utils Architecture: any Section: utils Depends: ${shlibs:Depends}, - libosmo-mslookup0 (= ${binary:Version}), + libosmo-mslookup1 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Utilities for Osmocom MS lookup diff --git a/debian/libosmo-mslookup0.install b/debian/libosmo-mslookup1.install similarity index 100% rename from debian/libosmo-mslookup0.install rename to debian/libosmo-mslookup1.install diff --git a/src/mslookup/Makefile.am b/src/mslookup/Makefile.am index a720c402..24d11080 100644 --- a/src/mslookup/Makefile.am +++ b/src/mslookup/Makefile.am @@ -1,7 +1,7 @@ # 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 -LIBVERSION=0:0:0 +LIBVERSION=1:0:0 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS) $(LIBOSMOCORE_CFLAGS)