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

- Update to release 1.7.1

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=22
This commit is contained in:
Jan Engelhardt
2021-03-14 21:05:40 +00:00
committed by Git OBS Bridge
parent 0e1dba33ed
commit d770c6c0cb
6 changed files with 41 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
build-fixes.diff
View File

@@ -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 <libgtpnl/gtp.h>
#include <libgtpnl/gtpnl.h>
-#include <libmnl/libmnl.h>
-
#include <errno.h>
#include <time.h>
@@ -33,8 +31,6 @@
#include <libgtpnl/gtp.h>
#include <libgtpnl/gtpnl.h>
-#include <libmnl/libmnl.h>
-
#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)