jengelh/osmo-ggsn
SHA256
1
0
Fork 0
forked from pool/osmo-ggsn
Code Pull Requests Activity

- Update to release 1.6.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=20
This commit is contained in:
Jan Engelhardt 2020-09-06 13:40:28 +00:00 committed by Git OBS Bridge
parent 4aa1569deb
commit 0e1dba33ed
6 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_service
View File

@ -1,9 +1,9 @@
<services> <services>
<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">https://git.osmocom.org/osmo-ggsn</param>
<param name="revision">1.5.0</param> <param name="revision">1.6.0</param>
<param name="versionformat">1.5.0</param> <param name="versionformat">1.6.0</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">
<param name="file">*.tar</param> <param name="file">*.tar</param>

72
build-fixes.diff
View File

@ -11,17 +11,17 @@
--- ---
ggsn/Makefile.am | 10 +++++----- ggsn/Makefile.am | 10 +++++-----
gtp/Makefile.am | 3 ++- gtp/Makefile.am | 3 ++-
lib/Makefile.am | 13 ++++++++----- lib/Makefile.am | 10 ++++++----
lib/gtp-kernel.c | 5 +---- lib/gtp-kernel.c | 5 +----
sgsnemu/Makefile.am | 10 +++++----- sgsnemu/Makefile.am | 10 +++++-----
tests/gtp/Makefile.am | 2 +- tests/gtp/Makefile.am | 2 +-
tests/lib/Makefile.am | 4 ++-- tests/lib/Makefile.am | 4 ++--
7 files changed, 24 insertions(+), 23 deletions(-) 7 files changed, 22 insertions(+), 22 deletions(-)
Index: osmo-ggsn-1.2.2/ggsn/Makefile.am Index: osmo-ggsn-1.6.0/ggsn/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/ggsn/Makefile.am --- osmo-ggsn-1.6.0.orig/ggsn/Makefile.am
+++ osmo-ggsn-1.2.2/ggsn/Makefile.am +++ osmo-ggsn-1.6.0/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
@ -42,11 +42,11 @@ Index: osmo-ggsn-1.2.2/ggsn/Makefile.am
endif endif
-osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
osmo_ggsn_SOURCES = ggsn_vty.c ggsn.c ggsn.h icmpv6.c icmpv6.h checksum.c checksum.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.2.2/gtp/Makefile.am Index: osmo-ggsn-1.6.0/gtp/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/gtp/Makefile.am --- osmo-ggsn-1.6.0.orig/gtp/Makefile.am
+++ osmo-ggsn-1.2.2/gtp/Makefile.am +++ osmo-ggsn-1.6.0/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 pdp.h gtpie.h
@ -57,35 +57,33 @@ Index: osmo-ggsn-1.2.2/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_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 libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
Index: osmo-ggsn-1.2.2/lib/Makefile.am Index: osmo-ggsn-1.6.0/lib/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/lib/Makefile.am --- osmo-ggsn-1.6.0.orig/lib/Makefile.am
+++ osmo-ggsn-1.2.2/lib/Makefile.am +++ osmo-ggsn-1.6.0/lib/Makefile.am
@@ -1,12 +1,15 @@ @@ -1,12 +1,14 @@
-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 util.h noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h netns.h util.h icmpv6.h checksum.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)"' -ggdb $(LIBOSMOCORE_CFLAGS)
+AM_CFLAGS = -fno-builtin -Wall +AM_CFLAGS = -O2 -fno-builtin -Wall
-libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c util.c -libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c netns.c util.c icmpv6.c checksum.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}
+libmisc_la_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c netns.c util.c icmpv6.c checksum.c
if ENABLE_GTP_KERNEL if ENABLE_GTP_KERNEL
-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
-libmisc_a_SOURCES += gtp-kernel.c -libmisc_a_SOURCES += gtp-kernel.c
+AM_CPPFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
+libmisc_la_SOURCES += gtp-kernel.c +libmisc_la_SOURCES += gtp-kernel.c
+libmisc_la_LIBADD += ${LIBGTPNL_LIBS}
endif endif
Index: osmo-ggsn-1.2.2/lib/gtp-kernel.c Index: osmo-ggsn-1.6.0/lib/gtp-kernel.c
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/lib/gtp-kernel.c --- osmo-ggsn-1.6.0.orig/lib/gtp-kernel.c
+++ osmo-ggsn-1.2.2/lib/gtp-kernel.c +++ osmo-ggsn-1.6.0/lib/gtp-kernel.c
@@ -18,8 +18,6 @@ @@ -18,8 +18,6 @@
#include <libgtpnl/gtp.h> #include <libgtpnl/gtp.h>
@ -95,7 +93,7 @@ Index: osmo-ggsn-1.2.2/lib/gtp-kernel.c
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
@@ -31,8 +29,6 @@ @@ -33,8 +31,6 @@
#include <libgtpnl/gtp.h> #include <libgtpnl/gtp.h>
#include <libgtpnl/gtpnl.h> #include <libgtpnl/gtpnl.h>
@ -104,18 +102,18 @@ Index: osmo-ggsn-1.2.2/lib/gtp-kernel.c
#include "gtp-kernel.h" #include "gtp-kernel.h"
static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp) static void pdp_debug(const char *prefix, const char *devname, struct pdp_t *pdp)
@@ -49,6 +45,7 @@ static void pdp_debug(const char *prefix @@ -58,6 +54,7 @@ static void pdp_debug(const char *prefix
in46a_ntoa(&ia46), inet_ntoa(ia)); buf4, buf6, inet_ntoa(ia));
} }
+struct mnl_socket; +struct mnl_socket;
static struct { static struct {
int genl_id; int genl_id;
struct mnl_socket *nl; struct mnl_socket *nl;
Index: osmo-ggsn-1.2.2/sgsnemu/Makefile.am Index: osmo-ggsn-1.6.0/sgsnemu/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/sgsnemu/Makefile.am --- osmo-ggsn-1.6.0.orig/sgsnemu/Makefile.am
+++ osmo-ggsn-1.2.2/sgsnemu/Makefile.am +++ osmo-ggsn-1.6.0/sgsnemu/Makefile.am
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
-bin_PROGRAMS = sgsnemu -bin_PROGRAMS = sgsnemu
+sbin_PROGRAMS = sgsnemu +sbin_PROGRAMS = sgsnemu
@ -137,11 +135,11 @@ Index: osmo-ggsn-1.2.2/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.2.2/tests/gtp/Makefile.am Index: osmo-ggsn-1.6.0/tests/gtp/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/tests/gtp/Makefile.am --- osmo-ggsn-1.6.0.orig/tests/gtp/Makefile.am
+++ osmo-ggsn-1.2.2/tests/gtp/Makefile.am +++ osmo-ggsn-1.6.0/tests/gtp/Makefile.am
@@ -13,7 +13,7 @@ gtpie_test_SOURCES = \ @@ -19,7 +19,7 @@ queue_test_SOURCES = \
$(NULL) $(NULL)
gtpie_test_LDADD = \ gtpie_test_LDADD = \
@ -150,10 +148,10 @@ Index: osmo-ggsn-1.2.2/tests/gtp/Makefile.am
$(top_builddir)/gtp/libgtp.la \ $(top_builddir)/gtp/libgtp.la \
$(LIBOSMOCORE_LIBS) \ $(LIBOSMOCORE_LIBS) \
$(NULL) $(NULL)
Index: osmo-ggsn-1.2.2/tests/lib/Makefile.am Index: osmo-ggsn-1.6.0/tests/lib/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.2.2.orig/tests/lib/Makefile.am --- osmo-ggsn-1.6.0.orig/tests/lib/Makefile.am
+++ osmo-ggsn-1.2.2/tests/lib/Makefile.am +++ osmo-ggsn-1.6.0/tests/lib/Makefile.am
@@ -14,7 +14,7 @@ ippool_test_SOURCES = \ @@ -14,7 +14,7 @@ ippool_test_SOURCES = \
$(NULL) $(NULL)

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

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

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

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

7
osmo-ggsn.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Sep 6 13:38:03 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.6.0
* Add Linux network namespace support for TUN device
* sgsnemu: Implement ping on IPv6 APNs
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 5 11:01:31 UTC 2020 - Martin Hauke <mardnh@gmx.de> Sun Jan 5 11:01:31 UTC 2020 - Martin Hauke <mardnh@gmx.de>

15
osmo-ggsn.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package osmo-ggsn # spec file for package osmo-ggsn
# #
# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 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
@ -20,7 +20,7 @@
Name: osmo-ggsn Name: osmo-ggsn
%define lname libgtp6 %define lname libgtp6
Version: 1.5.0 Version: 1.6.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,16 +66,17 @@ 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
%setup -q %autosetup -p1
%patch1 -p1 -F2
sed -i 's|/usr/bin/osmo-ggsn|/usr/sbin/osmo-ggsn|g' contrib/systemd/osmo-ggsn.service 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
autoreconf -fi autoreconf -fi
%configure --disable-static --docdir="%_docdir/%name" \ # bugzilla.opensuse.org/795968 for rationale
--includedir="%_includedir/%name" --with-systemdsystemunitdir="%_unitdir" %configure --includedir="%_includedir/%name" \
make %{?_smp_mflags} V=1 --disable-static --docdir="%_docdir/%name" \
--with-systemdsystemunitdir="%_unitdir"
%make_build
%install %install
b="%buildroot" b="%buildroot"