pool/osmo-ggsn
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1087825 from network:telephony

Browse Source 
- Update to release 1.10.1

OBS-URL: https://build.opensuse.org/request/show/1087825
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osmo-ggsn?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2023-05-19 09:55:38 +00:00 committed by Git OBS Bridge
commit 4b9c17ca5e
6 changed files with 58 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
1.10.1.tar.gz Normal file
View File

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

3
1.9.0.tar.gz
View File

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

46
build-fixes.diff
View File

@ -18,10 +18,10 @@
tests/lib/Makefile.am | 4 ++-- tests/lib/Makefile.am | 4 ++--
7 files changed, 22 insertions(+), 18 deletions(-) 7 files changed, 22 insertions(+), 18 deletions(-)
Index: osmo-ggsn-1.7.1/ggsn/Makefile.am Index: osmo-ggsn-1.10.1/ggsn/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/ggsn/Makefile.am --- osmo-ggsn-1.10.1.orig/ggsn/Makefile.am
+++ osmo-ggsn-1.7.1/ggsn/Makefile.am +++ osmo-ggsn-1.10.1/ggsn/Makefile.am
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
-bin_PROGRAMS = osmo-ggsn -bin_PROGRAMS = osmo-ggsn
+sbin_PROGRAMS = osmo-ggsn +sbin_PROGRAMS = osmo-ggsn
@ -43,24 +43,24 @@ Index: osmo-ggsn-1.7.1/ggsn/Makefile.am
-osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -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 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.7.1/gtp/Makefile.am Index: osmo-ggsn-1.10.1/gtp/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/gtp/Makefile.am --- osmo-ggsn-1.10.1.orig/gtp/Makefile.am
+++ osmo-ggsn-1.7.1/gtp/Makefile.am +++ osmo-ggsn-1.10.1/gtp/Makefile.am
@@ -8,7 +8,8 @@ lib_LTLIBRARIES = libgtp.la @@ -8,7 +8,8 @@ lib_LTLIBRARIES = libgtp.la
include_HEADERS = gtp.h pdp.h gtpie.h include_HEADERS = gtp.h gsn.h pdp.h gtpie.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 = -O2 -fno-builtin -Wall -ggdb +AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb
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_SOURCES = gtp.c gtp.h gsn.c gsn.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 libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
Index: osmo-ggsn-1.7.1/lib/Makefile.am Index: osmo-ggsn-1.10.1/lib/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/lib/Makefile.am --- osmo-ggsn-1.10.1.orig/lib/Makefile.am
+++ osmo-ggsn-1.7.1/lib/Makefile.am +++ osmo-ggsn-1.10.1/lib/Makefile.am
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
-noinst_LIBRARIES = libmisc.a -noinst_LIBRARIES = libmisc.a
+noinst_LTLIBRARIES = libmisc.la +noinst_LTLIBRARIES = libmisc.la
@ -80,10 +80,10 @@ Index: osmo-ggsn-1.7.1/lib/Makefile.am
-libmisc_a_SOURCES += gtp-kernel.c -libmisc_a_SOURCES += gtp-kernel.c
+libmisc_la_SOURCES += gtp-kernel.c +libmisc_la_SOURCES += gtp-kernel.c
endif endif
Index: osmo-ggsn-1.7.1/lib/gtp-kernel.c Index: osmo-ggsn-1.10.1/lib/gtp-kernel.c
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/lib/gtp-kernel.c --- osmo-ggsn-1.10.1.orig/lib/gtp-kernel.c
+++ osmo-ggsn-1.7.1/lib/gtp-kernel.c +++ osmo-ggsn-1.10.1/lib/gtp-kernel.c
@@ -53,6 +53,7 @@ static void pdp_debug(const char *prefix @@ -53,6 +53,7 @@ static void pdp_debug(const char *prefix
buf4, buf6, inet_ntoa(ia)); buf4, buf6, inet_ntoa(ia));
} }
@ -92,10 +92,10 @@ Index: osmo-ggsn-1.7.1/lib/gtp-kernel.c
static struct { static struct {
int genl_id; int genl_id;
struct mnl_socket *nl; struct mnl_socket *nl;
Index: osmo-ggsn-1.7.1/sgsnemu/Makefile.am Index: osmo-ggsn-1.10.1/sgsnemu/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/sgsnemu/Makefile.am --- osmo-ggsn-1.10.1.orig/sgsnemu/Makefile.am
+++ osmo-ggsn-1.7.1/sgsnemu/Makefile.am +++ osmo-ggsn-1.10.1/sgsnemu/Makefile.am
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
-bin_PROGRAMS = sgsnemu -bin_PROGRAMS = sgsnemu
+sbin_PROGRAMS = sgsnemu +sbin_PROGRAMS = sgsnemu
@ -117,10 +117,10 @@ Index: osmo-ggsn-1.7.1/sgsnemu/Makefile.am
-sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h
Index: osmo-ggsn-1.7.1/tests/gtp/Makefile.am Index: osmo-ggsn-1.10.1/tests/gtp/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/tests/gtp/Makefile.am --- osmo-ggsn-1.10.1.orig/tests/gtp/Makefile.am
+++ osmo-ggsn-1.7.1/tests/gtp/Makefile.am +++ osmo-ggsn-1.10.1/tests/gtp/Makefile.am
@@ -19,7 +19,7 @@ queue_test_SOURCES = \ @@ -19,7 +19,7 @@ queue_test_SOURCES = \
$(NULL) $(NULL)
@ -130,10 +130,10 @@ Index: osmo-ggsn-1.7.1/tests/gtp/Makefile.am
$(top_builddir)/gtp/libgtp.la \ $(top_builddir)/gtp/libgtp.la \
$(LIBOSMOCORE_LIBS) \ $(LIBOSMOCORE_LIBS) \
$(NULL) $(NULL)
Index: osmo-ggsn-1.7.1/tests/lib/Makefile.am Index: osmo-ggsn-1.10.1/tests/lib/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.7.1.orig/tests/lib/Makefile.am --- osmo-ggsn-1.10.1.orig/tests/lib/Makefile.am
+++ osmo-ggsn-1.7.1/tests/lib/Makefile.am +++ osmo-ggsn-1.10.1/tests/lib/Makefile.am
@@ -14,7 +14,7 @@ ippool_test_SOURCES = \ @@ -14,7 +14,7 @@ ippool_test_SOURCES = \
$(NULL) $(NULL)

9
osmo-ggsn.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu May 18 11:45:02 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.10.1
* Use rate_ctr for gsn_t available_counters
* ggsn: Introduce tdef and make it configurable over VTY
* gtp: Introduce VTY configurable GTP timer X3
- Add ppc64.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 3 18:29:09 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Wed Aug 3 18:29:09 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

11
osmo-ggsn.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package osmo-ggsn # spec file for package osmo-ggsn
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# 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
@ -18,7 +18,7 @@
Name: osmo-ggsn Name: osmo-ggsn
%define lname libgtp6 %define lname libgtp6
Version: 1.9.0 Version: 1.10.1
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
@ -26,16 +26,17 @@ Group: Productivity/Telephony/Servers
URL: https://osmocom.org/projects/openggsn/wiki/OsmoGGSN URL: https://osmocom.org/projects/openggsn/wiki/OsmoGGSN
Source: https://github.com/osmocom/osmo-ggsn/archive/%version.tar.gz Source: https://github.com/osmocom/osmo-ggsn/archive/%version.tar.gz
Patch1: build-fixes.diff Patch1: build-fixes.diff
Patch2: ppc64.diff
BuildRequires: libtool >= 2 BuildRequires: libtool >= 2
BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig >= 0.20
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 BuildRequires: pkgconfig(libgtpnl) >= 1.2.0
BuildRequires: pkgconfig(libmnl) >= 1.0.3 BuildRequires: pkgconfig(libmnl) >= 1.0.3
BuildRequires: pkgconfig(libosmocore) >= 1.7.0 BuildRequires: pkgconfig(libosmocore) >= 1.8.0
BuildRequires: pkgconfig(libosmoctrl) >= 1.7.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.8.0
BuildRequires: pkgconfig(libosmogsm) BuildRequires: pkgconfig(libosmogsm)
BuildRequires: pkgconfig(libosmovty) >= 1.7.0 BuildRequires: pkgconfig(libosmovty) >= 1.8.0
Obsoletes: openggsn Obsoletes: openggsn
%description %description

17
ppc64.diff Normal file
View File

@ -0,0 +1,17 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2023-05-18 16:11:05.927027347 +0200
Upstream: not submitted, too much work
diff --git a/utils/gtp_echo_responder.c b/utils/gtp_echo_responder.c
index 390fa25..3c383c2 100644
--- a/utils/gtp_echo_responder.c
+++ b/utils/gtp_echo_responder.c
@@ -80,7 +80,7 @@ struct gtp2_hdr {
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
uint32_t reserved2:8, seq:24;
#else
- uint8_t seq:24, reserved2:1;
+ uint32_t seq:24, reserved2:8;
#endif
} __attribute__((packed));