Accepting request 678107 from network:telephony

Forward the current version of osmo-iuh to Factory

OBS-URL: https://build.opensuse.org/request/show/678107
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osmo-iuh?expand=0&rev=5

0001-fix-return-values.patch

@@ -1,21 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2018-12-11 14:44:48.979665889 +0100
-Subject: [PATCH] fix return values
-
-Fix yet more return value problems.
----
- src/hnbgw_hnbap.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: osmo-iuh-0.3.0/src/hnbgw_hnbap.c
-===================================================================
---- osmo-iuh-0.3.0.orig/src/hnbgw_hnbap.c
-+++ osmo-iuh-0.3.0/src/hnbgw_hnbap.c
-@@ -86,6 +86,7 @@ static int hnbgw_tx_hnb_register_rej(str
- 		/* The message was not queued. Destroy the connection right away. */
- 		hnb_context_release(ctx, true);
- 	}
-+	return 0;
- }
- 
- static int hnbgw_tx_hnb_register_acc(struct hnb_context *ctx)

_service

@@ -2,8 +2,8 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="scm">git</param>
 		<param name="url">git://git.osmocom.org/osmo-iuh</param>
-		<param name="revision">0.3.0</param>
+		<param name="revision">0.4.0</param>
-	        <param name="versionformat">0.3.0</param>
+	        <param name="versionformat">0.4.0</param>
 	</service>
 	<service name="recompress" mode="disabled">
 		<param name="file">*.tar</param>

osmo-iuh-0.3.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3eb44fae92e9e17ad3c4545b88fe91adfa728b2480691d85a4f1fd88f255d5eb
-size 10054460

osmo-iuh-0.4.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e0808883e8a1b756fee0361d0bb7360bbedbf01c7658b4bdde3b2d37337d4ff
+size 10055364

osmo-iuh.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Feb 21 19:39:50 UTC 2019 - Martin Hauke <mardnh@gmx.de>
+
+- Update to new upstream release 0.4.0
+  * add a VTY command which shows a specific HNB
+  * hnbgw: vty: add SCCP related vty commands
+  * fix decoding of incoming X.213 NSAP addr
+  * Full changelog:
+    http://git.osmocom.org/osmo-iuh/plain/debian/changelog?h=0.4.0
+- Remove patches (fixed upstream):
+  * 0001-fix-return-values.patch
+  * reproducible.patch
+- Package service file
+
 -------------------------------------------------------------------
 Mon Jan  7 12:46:22 UTC 2019 - Bernhard Wiedemann <bwiedemann@suse.com>
 

osmo-iuh.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package osmo-iuh
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,16 +18,14 @@
 
 Name:           osmo-iuh
 %define lname	libosmo-ranap2
-Version:        0.3.0
+Version:        0.4.0
 Release:        0
 Summary:        Osmocom code for the Iuh interface (HNBAP, RUA, RANAP)
 License:        AGPL-3.0-or-later AND GPL-2.0-or-later
 Group:          Hardware/Mobile
 Url:            https://osmocom.org/projects/osmohnbgw/wiki
 Source:         %name-%version.tar.xz
-Patch1:         0001-fix-return-values.patch
 Patch3:         0001-iu_client-uses-gprs_msgb.h.patch
-Patch4:         reproducible.patch
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
 BuildRequires:  lksctp-tools-devel
@@ -69,13 +67,19 @@ applications that want to make use of libosmoranap.
 %autosetup -p1
 
 %build
+echo "%version" >.tarball-version
 autoreconf -fi
-%configure --disable-static --docdir="%_docdir/%name"
+%configure \
+    --disable-static \
+    --docdir="%_docdir/%name" \
+    --with-systemdsystemunitdir="%_unitdir"
 make %{?_smp_mflags}
 
 %install
 %make_install
 find "%buildroot" -type f -name "*.la" -delete -print
+install -d %buildroot/%_sbindir
+ln -s %_sbindir/service %buildroot/%_sbindir/rcosmo-hnbgw
 
 %check
 if ! make %{?_smp_mflags} check; then
@@ -87,12 +91,25 @@ fi
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
+%pre
+%service_add_pre    osmo-hnbgw.service
+%post
+%service_add_post   osmo-hnbgw.service
+%preun
+%service_del_preun  osmo-hnbgw.service
+%postun
+%service_del_postun osmo-hnbgw.service
 
 %files
-%doc COPYING README.md
+%license COPYING
+%doc README.md
+%dir %_sysconfdir/osmocom
+%config %_sysconfdir/osmocom/osmo-hnbgw.cfg
 %dir %_docdir/%name/examples
 %_docdir/%name/examples/osmo-hnbgw.cfg
 %_bindir/osmo-hnbgw
+%_unitdir/osmo-hnbgw.service
+%_sbindir/rcosmo-hnbgw
 
 %files -n %lname
 %_libdir/libosmo-ranap.so.2*

reproducible.patch

@@ -1,42 +0,0 @@
-https://gerrit.osmocom.org/#/c/osmo-iuh/+/9387
-commit 7a97fcafedead40b311eef65467480bd72fdd18b
-Author: Bernhard M. Wiedemann <bwiedemann@suse.de>
-Date:   Wed May 30 13:20:29 2018 +0200
-
-    asn1tostruct: allow to override build date
-    
-    in order to make builds reproducible.
-    See https://reproducible-builds.org/ for why this is good
-    and https://reproducible-builds.org/specs/source-date-epoch/
-    for the definition of this variable.
-    
-    Also do not record build user name to not have it vary.
-    
-    Change-Id: I5cfa465cc82f009f28dd7f12ced0e72a05fda842
-
-diff --git a/asn1/utils/asn1tostruct.py b/asn1/utils/asn1tostruct.py
-index 0bba9dd..3c33980 100755
---- a/asn1/utils/asn1tostruct.py
-+++ b/asn1/utils/asn1tostruct.py
-@@ -4,6 +4,7 @@ import re, os, sys, string
- import datetime
- import getopt
- import getpass
-+import time
- 
- version = "0.5osmo1"
- 
-@@ -33,11 +34,11 @@ def printDebug(string):
-         print string
- 
- def outputHeaderToFile(f, filename):
--    now = datetime.datetime.now()
-+    now = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.time())))
-     f.write("/*******************************************************************************\n")
-     f.write(" * This file had been created by asn1tostruct.py script v%s\n" % (version))
-     f.write(" * Please do not modify this file but regenerate it via script.\n")
--    f.write(" * Created on: %s by %s\n * from %s\n" % (str(now), getpass.getuser(), filenames))
-+    f.write(" * Created on: %s\n * from %s\n" % (str(now), filenames))
-     f.write(" ******************************************************************************/\n")
- 
- def lowerFirstCamelWord(word):