Accepting request 760944 from home:mnhauke:osmocom:CNI-2020-01

- Update to new upstream release 1.5.0
  * sgsnemu: Fix null-pointer format string argument
  * ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs
  * ggsn: Implement echo req/resp and recovery
  * libgtp: Introduce cb_recovery3
  * ggsn_vty.c: Improve output of VTY show pdp-context
  * gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas
- Update patch:
  * build-fixes.diff

OBS-URL: https://build.opensuse.org/request/show/760944
OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=18
This commit is contained in:
Jan Engelhardt 2020-01-07 14:03:56 +00:00 committed by Git OBS Bridge
parent f76bda9eed
commit 4aa1569deb
6 changed files with 28 additions and 13 deletions

View File

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

View File

@ -65,14 +65,14 @@ Index: osmo-ggsn-1.2.2/lib/Makefile.am
-noinst_LIBRARIES = libmisc.a -noinst_LIBRARIES = libmisc.a
+noinst_LTLIBRARIES = libmisc.la +noinst_LTLIBRARIES = libmisc.la
noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h util.h
-AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) -AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
+AM_CFLAGS = -fno-builtin -Wall +AM_CFLAGS = -fno-builtin -Wall
-libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c -libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c util.c
+libmisc_la_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c +libmisc_la_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c util.c
+libmisc_la_LIBADD = ${LIBOSMOCORE_LIBS} +libmisc_la_LIBADD = ${LIBOSMOCORE_LIBS}
if ENABLE_GTP_KERNEL if ENABLE_GTP_KERNEL

View File

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

3
osmo-ggsn-1.5.0.tar.xz Normal file
View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Jan 5 11:01:31 UTC 2020 - Martin Hauke <mardnh@gmx.de>
- Update to new upstream release 1.5.0
* sgsnemu: Fix null-pointer format string argument
* ggsn, sgsnemu: Drop use of no-op deprecated gtp_retrans* APIs
* ggsn: Implement echo req/resp and recovery
* libgtp: Introduce cb_recovery3
* ggsn_vty.c: Improve output of VTY show pdp-context
* gtp-kernel.c: Fix wrong use of in46a_from_eua, print IPv6 euas
- Update patch:
* build-fixes.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 14 17:16:25 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Wed Aug 14 17:16:25 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
# #
# spec file for package osmo-ggsn # spec file for package osmo-ggsn
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,8 +19,8 @@
%define _lto_cflags %nil %define _lto_cflags %nil
Name: osmo-ggsn Name: osmo-ggsn
%define lname libgtp5 %define lname libgtp6
Version: 1.4.0 Version: 1.5.0
Release: 0 Release: 0
Summary: GPRS Support Node Summary: GPRS Support Node
License: GPL-2.0-only AND LGPL-2.1-or-later License: GPL-2.0-only AND LGPL-2.1-or-later
@ -66,7 +66,9 @@ This subpackage contains libraries and header files for developing
applications that want to make use of libgtp. applications that want to make use of libgtp.
%prep %prep
%autosetup -p1 %setup -q
%patch1 -p1 -F2
sed -i 's|/usr/bin/osmo-ggsn|/usr/sbin/osmo-ggsn|g' contrib/systemd/osmo-ggsn.service
%build %build
echo "%version" >.tarball-version echo "%version" >.tarball-version
@ -116,7 +118,7 @@ install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf"
%config(noreplace) %_sysconfdir/osmocom/sgsnemu.conf %config(noreplace) %_sysconfdir/osmocom/sgsnemu.conf
%files -n %lname %files -n %lname
%_libdir/libgtp.so.5* %_libdir/libgtp.so.6*
%files -n libgtp-devel %files -n libgtp-devel
%_includedir/%name/ %_includedir/%name/