Bump version: 1.6.1.1-559f → 1.6.2

Change-Id: Ia04060e57019a2d1394f1f2bcd400d9a4ab5667f
systemd: depend on networking-online.target
2025-11-03 21:53:30 +00:00 · 2023-05-26 14:54:12 +02:00 · 2023-05-26 14:53:42 +02:00 · 2023-02-23 10:23:04 +01:00 · 2023-02-23 10:22:30 +01:00 · 2023-02-23 10:22:25 +01:00
6 changed files with 23 additions and 6 deletions
--- a/contrib/systemd/osmo-hlr.service
+++ b/contrib/systemd/osmo-hlr.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=Osmocom Home Location Register (OsmoHLR)
 Documentation=https://osmocom.org/projects/osmo-hlr/wiki/OsmoHLR
+After=network-online.target
+Wants=network-online.target

 [Service]
 Type=simple
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+osmo-hlr (1.6.2) unstable; urgency=medium
+
+  * systemd: depend on networking-online.target
+
+ -- Oliver Smith <osmith@sysmocom.de>  Fri, 26 May 2023 14:54:12 +0200
+
+osmo-hlr (1.6.1) unstable; urgency=medium
+
+  * Run struct_endianness.py
+  * tests: adjust to XOR-3G rename in libosmocore
+
+ -- Oliver Smith <osmith@sysmocom.de>  Thu, 23 Feb 2023 10:23:04 +0100
+
 osmo-hlr (1.6.0) unstable; urgency=medium

  [ Vadim Yanitskiy ]
--- a/include/osmocom/mslookup/mdns_rfc.h
+++ b/include/osmocom/mslookup/mdns_rfc.h
@@ -71,7 +71,7 @@ struct osmo_mdns_rfc_header {
 	uint16_t nscount; /* Number of authority records */
 	uint16_t arcount; /* Number of additional records */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint16_t id;
 	uint8_t qr:1, opcode:4, aa:1, tc:1, rd:1;
 	uint8_t ra:1, z:3, rcode:4;
--- a/tests/test_subscriber.ctrl
+++ b/tests/test_subscriber.ctrl
@@ -677,9 +677,6 @@ GET_REPLY 112 subscriber.by-imsi-901991234567891.aud2g none
 SET 113 subscriber.by-imsi-901991234567891.aud2g xor,c01ffedc1cadaeac1d1f1edacac1ab0a
 SET_REPLY 113 subscriber.by-imsi-901991234567891.aud2g OK

-GET 114 subscriber.by-imsi-901991234567891.aud2g
-GET_REPLY 114 subscriber.by-imsi-901991234567891.aud2g XOR,c01ffedc1cadaeac1d1f1edacac1ab0a
-
 SET 115 subscriber.by-imsi-901991234567891.aud2g none
 SET_REPLY 115 subscriber.by-imsi-901991234567891.aud2g OK

--- a/tests/test_subscriber.vty
+++ b/tests/test_subscriber.vty
@@ -160,7 +160,7 @@ OsmoHLR# subscriber imsi 123456789023000 show
    ID: 101
    IMSI: 123456789023000
    MSISDN: 423
-    2G auth: XOR
+...
             KI=deaf0ff1ced0d0dabbedd1ced1cef00d

 OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -27,7 +27,12 @@ AT_KEYWORDS([db])
 cat $abs_srcdir/db/db_test.ok > expout
 cat $abs_srcdir/db/db_test.err > experr
 sqlite3 db_test.db < $abs_top_srcdir/sql/hlr.sql
-AT_CHECK([$abs_top_builddir/tests/db/db_test], [], [expout], [experr])
+
+# Compatibility with libosmocore I446e54d0ddf4a18c46ee022b1249af73552e3ce1
+$abs_top_builddir/tests/db/db_test >out 2>err
+sed -i "s/XOR-3G,/XOR,/g" err
+
+AT_CHECK([cat out; cat err >&2], [], [expout], [experr])
 AT_CLEANUP

 # AT_SKIP_IF: disable for old sqlite versions, because the way we dump tables in the test doesn't work with it.
Author	SHA1	Message	Date
Oliver Smith	a6e983b985	Bump version: 1.6.1.1-559f → 1.6.2 Change-Id: Ia04060e57019a2d1394f1f2bcd400d9a4ab5667f	2023-05-26 14:54:12 +02:00
Oliver Smith	559f4e8024	systemd: depend on networking-online.target Related: SYS#6400 Change-Id: I29e547242b2ed1cfc4750c7d7e5f8636c2e8f3dc	2023-05-26 14:53:42 +02:00
Oliver Smith	c9b80363f4	Bump version: 1.6.0.2-42f8 → 1.6.1 Change-Id: I6a74dccada51f13c6c3a9f3fe08c1df2e9c2811b	2023-02-23 10:23:04 +01:00
Oliver Smith	42f82975f2	tests: adjust to XOR-3G rename in libosmocore Fix forward compatibility to current master of libosmocore / future versions where the value_string for OSMO_AUTH_ALG_XOR has been changed. Adjust the tests so they pass with both the old and the new version. Related: libosmocore I446e54d0ddf4a18c46ee022b1249af73552e3ce1 Change-Id: I391b1a9b52e1969172aba9d4a1cc5792fc077fe1	2023-02-23 10:22:30 +01:00
Oliver Smith	4af47bb3d8	Run struct_endianness.py Ensure there is no diff to prepare to run this in CI. Related: OS#5884 Change-Id: I4294a18871214b70cef267fcaaaaada42cb61bf9 (cherry picked from commit `62e5c1b2c7`)	2023-02-23 10:22:25 +01:00