From d770c6c0cb35e0ae96b969dca0b185edb2e7a18bdc2d8af77e3f6da4bb161377 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 14 Mar 2021 21:05:40 +0000 Subject: [PATCH] - Update to release 1.7.1 OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=22 --- 1.7.1.tar.gz | 3 ++ _service | 13 --------- build-fixes.diff | 66 +++++++++++++++--------------------------- osmo-ggsn-1.6.0.tar.xz | 3 -- osmo-ggsn.changes | 8 +++++ osmo-ggsn.spec | 12 ++++---- 6 files changed, 41 insertions(+), 64 deletions(-) create mode 100644 1.7.1.tar.gz delete mode 100644 _service delete mode 100644 osmo-ggsn-1.6.0.tar.xz diff --git a/1.7.1.tar.gz b/1.7.1.tar.gz new file mode 100644 index 0000000..c7593d9 --- /dev/null +++ b/1.7.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2dc58d66fcca83efbefdc2ca5d5c66e43dc38c909b9bd7ba32cf3218a4d48bd +size 376263 diff --git a/_service b/_service deleted file mode 100644 index b786241..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - https://git.osmocom.org/osmo-ggsn - 1.6.0 - 1.6.0 - - - *.tar - xz - - - diff --git a/build-fixes.diff b/build-fixes.diff index 20e02dc..3bef7d8 100644 --- a/build-fixes.diff +++ b/build-fixes.diff @@ -12,16 +12,16 @@ ggsn/Makefile.am | 10 +++++----- gtp/Makefile.am | 3 ++- lib/Makefile.am | 10 ++++++---- - lib/gtp-kernel.c | 5 +---- + lib/gtp-kernel.c | 1 + sgsnemu/Makefile.am | 10 +++++----- tests/gtp/Makefile.am | 2 +- tests/lib/Makefile.am | 4 ++-- - 7 files changed, 22 insertions(+), 22 deletions(-) + 7 files changed, 22 insertions(+), 18 deletions(-) -Index: osmo-ggsn-1.6.0/ggsn/Makefile.am +Index: osmo-ggsn-1.7.1/ggsn/Makefile.am =================================================================== ---- osmo-ggsn-1.6.0.orig/ggsn/Makefile.am -+++ osmo-ggsn-1.6.0/ggsn/Makefile.am +--- osmo-ggsn-1.7.1.orig/ggsn/Makefile.am ++++ osmo-ggsn-1.7.1/ggsn/Makefile.am @@ -1,15 +1,15 @@ -bin_PROGRAMS = osmo-ggsn +sbin_PROGRAMS = osmo-ggsn @@ -43,10 +43,10 @@ Index: osmo-ggsn-1.6.0/ggsn/Makefile.am -osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.h pco.c pco.h -Index: osmo-ggsn-1.6.0/gtp/Makefile.am +Index: osmo-ggsn-1.7.1/gtp/Makefile.am =================================================================== ---- osmo-ggsn-1.6.0.orig/gtp/Makefile.am -+++ osmo-ggsn-1.6.0/gtp/Makefile.am +--- osmo-ggsn-1.7.1.orig/gtp/Makefile.am ++++ osmo-ggsn-1.7.1/gtp/Makefile.am @@ -8,7 +8,8 @@ lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h pdp.h gtpie.h @@ -57,10 +57,10 @@ Index: osmo-ggsn-1.6.0/gtp/Makefile.am libgtp_la_SOURCES = gtp.c gtp.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -Index: osmo-ggsn-1.6.0/lib/Makefile.am +Index: osmo-ggsn-1.7.1/lib/Makefile.am =================================================================== ---- osmo-ggsn-1.6.0.orig/lib/Makefile.am -+++ osmo-ggsn-1.6.0/lib/Makefile.am +--- osmo-ggsn-1.7.1.orig/lib/Makefile.am ++++ osmo-ggsn-1.7.1/lib/Makefile.am @@ -1,12 +1,14 @@ -noinst_LIBRARIES = libmisc.a +noinst_LTLIBRARIES = libmisc.la @@ -80,29 +80,11 @@ Index: osmo-ggsn-1.6.0/lib/Makefile.am -libmisc_a_SOURCES += gtp-kernel.c +libmisc_la_SOURCES += gtp-kernel.c endif -Index: osmo-ggsn-1.6.0/lib/gtp-kernel.c +Index: osmo-ggsn-1.7.1/lib/gtp-kernel.c =================================================================== ---- osmo-ggsn-1.6.0.orig/lib/gtp-kernel.c -+++ osmo-ggsn-1.6.0/lib/gtp-kernel.c -@@ -18,8 +18,6 @@ - - #include - #include --#include -- - #include - - #include -@@ -33,8 +31,6 @@ - - #include - #include --#include -- - #include "gtp-kernel.h" - - static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp) -@@ -58,6 +54,7 @@ static void pdp_debug(const char *prefix +--- osmo-ggsn-1.7.1.orig/lib/gtp-kernel.c ++++ osmo-ggsn-1.7.1/lib/gtp-kernel.c +@@ -53,6 +53,7 @@ static void pdp_debug(const char *prefix buf4, buf6, inet_ntoa(ia)); } @@ -110,10 +92,10 @@ Index: osmo-ggsn-1.6.0/lib/gtp-kernel.c static struct { int genl_id; struct mnl_socket *nl; -Index: osmo-ggsn-1.6.0/sgsnemu/Makefile.am +Index: osmo-ggsn-1.7.1/sgsnemu/Makefile.am =================================================================== ---- osmo-ggsn-1.6.0.orig/sgsnemu/Makefile.am -+++ osmo-ggsn-1.6.0/sgsnemu/Makefile.am +--- osmo-ggsn-1.7.1.orig/sgsnemu/Makefile.am ++++ osmo-ggsn-1.7.1/sgsnemu/Makefile.am @@ -1,15 +1,15 @@ -bin_PROGRAMS = sgsnemu +sbin_PROGRAMS = sgsnemu @@ -135,10 +117,10 @@ Index: osmo-ggsn-1.6.0/sgsnemu/Makefile.am -sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h -Index: osmo-ggsn-1.6.0/tests/gtp/Makefile.am +Index: osmo-ggsn-1.7.1/tests/gtp/Makefile.am =================================================================== ---- osmo-ggsn-1.6.0.orig/tests/gtp/Makefile.am -+++ osmo-ggsn-1.6.0/tests/gtp/Makefile.am +--- osmo-ggsn-1.7.1.orig/tests/gtp/Makefile.am ++++ osmo-ggsn-1.7.1/tests/gtp/Makefile.am @@ -19,7 +19,7 @@ queue_test_SOURCES = \ $(NULL) @@ -148,10 +130,10 @@ Index: osmo-ggsn-1.6.0/tests/gtp/Makefile.am $(top_builddir)/gtp/libgtp.la \ $(LIBOSMOCORE_LIBS) \ $(NULL) -Index: osmo-ggsn-1.6.0/tests/lib/Makefile.am +Index: osmo-ggsn-1.7.1/tests/lib/Makefile.am =================================================================== ---- osmo-ggsn-1.6.0.orig/tests/lib/Makefile.am -+++ osmo-ggsn-1.6.0/tests/lib/Makefile.am +--- osmo-ggsn-1.7.1.orig/tests/lib/Makefile.am ++++ osmo-ggsn-1.7.1/tests/lib/Makefile.am @@ -14,7 +14,7 @@ ippool_test_SOURCES = \ $(NULL) diff --git a/osmo-ggsn-1.6.0.tar.xz b/osmo-ggsn-1.6.0.tar.xz deleted file mode 100644 index 8542c45..0000000 --- a/osmo-ggsn-1.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb88db3943f9a92c205d93a990de4c01535d49ebf106ea13dfc22652ea5a2629 -size 183500 diff --git a/osmo-ggsn.changes b/osmo-ggsn.changes index 2403746..dfc0cde 100644 --- a/osmo-ggsn.changes +++ b/osmo-ggsn.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Mar 14 20:59:58 UTC 2021 - Jan Engelhardt + +- Update to release 1.7.1 + * Support setting rt-prio and cpu-affinity mask through VTY + * Fix vty PDP lookups by IMSI + * Prevent Crash in show pdp-context from vty + ------------------------------------------------------------------- Sun Sep 6 13:38:03 UTC 2020 - Jan Engelhardt diff --git a/osmo-ggsn.spec b/osmo-ggsn.spec index c3689df..68c7b35 100644 --- a/osmo-ggsn.spec +++ b/osmo-ggsn.spec @@ -1,7 +1,7 @@ # # spec file for package osmo-ggsn # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,13 @@ Name: osmo-ggsn %define lname libgtp6 -Version: 1.6.0 +Version: 1.7.1 Release: 0 Summary: GPRS Support Node License: GPL-2.0-only AND LGPL-2.1-or-later Group: Productivity/Telephony/Servers URL: https://osmocom.org/projects/openggsn/wiki/OsmoGGSN -Source: %name-%version.tar.xz +Source: https://github.com/osmocom/osmo-ggsn/archive/%version.tar.gz Patch1: build-fixes.diff BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 @@ -34,10 +34,10 @@ BuildRequires: systemd-rpm-macros BuildRequires: xz BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 BuildRequires: pkgconfig(libmnl) >= 1.0.3 -BuildRequires: pkgconfig(libosmocore) >= 1.1.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 BuildRequires: pkgconfig(libosmogsm) -BuildRequires: pkgconfig(libosmovty) >= 1.1.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 Obsoletes: openggsn %description