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

Accepting request 671979 from home:mnhauke:branches:network:telephony

Browse Source 
- Update to new upstream release 1.3.0
  * ggsn: ctrl iface: listen on IP configured by VTY
  * gtp: Allow recv DEL CTX REQ in sgsn and DEL CTX RSP in ggsn
  * gtp: Log ignore CTX DEL REQ due to no teardown and only 1
    ctxactive
  * gtp: Add new API to avoid freeing pdp contexts during
    DEL CTX REQ
  * fix support for multiple IPCP in PDP protocol configuration
    options
- Remove patch: (fixed upstream)
  * build-fixes.diff

OBS-URL: https://build.opensuse.org/request/show/671979
OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=11
This commit is contained in:
Jan Engelhardt 2019-02-05 21:42:33 +00:00 committed by Git OBS Bridge
parent 8c412c9f19
commit 50458c75a4
6 changed files with 34 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_service
View File

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

173
build-fixes.diff
View File

@ -1,173 +0,0 @@
* stuff is in the wrong directory, move to sbin
* CFLAGS is abused for preprocessor, move to CPPFLAGS
* add missing $(LIBGTPNL_CFLAGS)
* ggsn includes libmnl.h but fails to PKG_CHECK for it;
turns out it only uses the header and no defs, so kill that.
* _DEPENDENCIES on files not generated by $this Makefile are pointless
* must use .la files in _LDADD/_LIBADD whenever they exist
* remove AC_PROG_CXX, the C++ is never used
---
ggsn/Makefile.am | 10 +++++-----
gtp/Makefile.am | 3 ++-
lib/Makefile.am | 13 ++++++++-----
lib/gtp-kernel.c | 5 +----
sgsnemu/Makefile.am | 10 +++++-----
tests/gtp/Makefile.am | 2 +-
tests/lib/Makefile.am | 4 ++--
7 files changed, 24 insertions(+), 23 deletions(-)
Index: osmo-ggsn-1.2.2/ggsn/Makefile.am
===================================================================
--- osmo-ggsn-1.2.2.orig/ggsn/Makefile.am
+++ osmo-ggsn-1.2.2/ggsn/Makefile.am
@@ -1,15 +1,15 @@
-bin_PROGRAMS = osmo-ggsn
+sbin_PROGRAMS = osmo-ggsn
AM_LDFLAGS = @EXEC_LDFLAGS@
-AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+AM_CFLAGS = -fno-builtin -Wall
-osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
+osmo_ggsn_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
if ENABLE_GTP_KERNEL
-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
+AM_CPPFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
osmo_ggsn_LDADD += $(LIBGTPNL_LIBS)
endif
-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
Index: osmo-ggsn-1.2.2/gtp/Makefile.am
===================================================================
--- osmo-ggsn-1.2.2.orig/gtp/Makefile.am
+++ osmo-ggsn-1.2.2/gtp/Makefile.am
@@ -8,7 +8,8 @@ lib_LTLIBRARIES = libgtp.la
include_HEADERS = gtp.h pdp.h gtpie.h
-AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
+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_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
Index: osmo-ggsn-1.2.2/lib/Makefile.am
===================================================================
--- osmo-ggsn-1.2.2.orig/lib/Makefile.am
+++ osmo-ggsn-1.2.2/lib/Makefile.am
@@ -1,12 +1,15 @@
-noinst_LIBRARIES = libmisc.a
+noinst_LTLIBRARIES = libmisc.la
noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h
-AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
+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_la_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c
+libmisc_la_LIBADD = ${LIBOSMOCORE_LIBS}
if ENABLE_GTP_KERNEL
-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
-libmisc_a_SOURCES += gtp-kernel.c
+AM_CPPFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
+libmisc_la_SOURCES += gtp-kernel.c
+libmisc_la_LIBADD += ${LIBGTPNL_LIBS}
endif
Index: osmo-ggsn-1.2.2/lib/gtp-kernel.c
===================================================================
--- osmo-ggsn-1.2.2.orig/lib/gtp-kernel.c
+++ osmo-ggsn-1.2.2/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>
@@ -31,8 +29,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)
@@ -49,6 +45,7 @@ static void pdp_debug(const char *prefix
in46a_ntoa(&ia46), inet_ntoa(ia));
}
+struct mnl_socket;
static struct {
int genl_id;
struct mnl_socket *nl;
Index: osmo-ggsn-1.2.2/sgsnemu/Makefile.am
===================================================================
--- osmo-ggsn-1.2.2.orig/sgsnemu/Makefile.am
+++ osmo-ggsn-1.2.2/sgsnemu/Makefile.am
@@ -1,15 +1,15 @@
-bin_PROGRAMS = sgsnemu
+sbin_PROGRAMS = sgsnemu
AM_LDFLAGS = @EXEC_LDFLAGS@
-AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
+AM_CFLAGS = -fno-builtin -Wall
-sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
+sgsnemu_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS)
if ENABLE_GTP_KERNEL
-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
+AM_CPPFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
sgsnemu_LDADD += $(LIBGTPNL_LIBS)
endif
-sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h
Index: osmo-ggsn-1.2.2/tests/gtp/Makefile.am
===================================================================
--- osmo-ggsn-1.2.2.orig/tests/gtp/Makefile.am
+++ osmo-ggsn-1.2.2/tests/gtp/Makefile.am
@@ -13,7 +13,7 @@ gtpie_test_SOURCES = \
$(NULL)
gtpie_test_LDADD = \
- $(top_builddir)/lib/debug.o \
+ $(top_builddir)/lib/debug.lo \
$(top_builddir)/gtp/libgtp.la \
$(LIBOSMOCORE_LIBS) \
$(NULL)
Index: osmo-ggsn-1.2.2/tests/lib/Makefile.am
===================================================================
--- osmo-ggsn-1.2.2.orig/tests/lib/Makefile.am
+++ osmo-ggsn-1.2.2/tests/lib/Makefile.am
@@ -14,7 +14,7 @@ ippool_test_SOURCES = \
$(NULL)
ippool_test_LDADD = \
- $(top_builddir)/lib/libmisc.a \
+ $(top_builddir)/lib/libmisc.la \
$(LIBOSMOCORE_LIBS) \
$(NULL)
@@ -23,6 +23,6 @@ in46a_test_SOURCES = \
$(NULL)
in46a_test_LDADD = \
- $(top_builddir)/lib/libmisc.a \
+ $(top_builddir)/lib/libmisc.la \
$(LIBOSMOCORE_LIBS) \
$(NULL)

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

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

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

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

15
osmo-ggsn.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Feb 5 21:33:10 UTC 2019 - mardnh@gmx.de
- Update to new upstream release 1.3.0
* ggsn: ctrl iface: listen on IP configured by VTY
* gtp: Allow recv DEL CTX REQ in sgsn and DEL CTX RSP in ggsn
* gtp: Log ignore CTX DEL REQ due to no teardown and only 1
ctxactive
* gtp: Add new API to avoid freeing pdp contexts during
DEL CTX REQ
* fix support for multiple IPCP in PDP protocol configuration
options
- Remove patch: (fixed upstream)
* build-fixes.diff
-------------------------------------------------------------------
Tue Dec 11 13:08:04 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

26
osmo-ggsn.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package osmo-ggsn
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,20 +12,19 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: osmo-ggsn
%define lname libgtp3
Version: 1.2.2
%define lname libgtp4
Version: 1.3.0
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
Patch1: build-fixes.diff
BuildRequires: libtool >= 2
BuildRequires: pkgconfig >= 0.20
BuildRequires: systemd-rpm-macros
@ -70,15 +69,17 @@ applications that want to make use of libgtp.
%build
echo "%version" >.tarball-version
autoreconf -fi
%configure --disable-static --docdir="%_docdir/%name" \
--includedir="%_includedir/%name"
%configure \
--disable-static \
--docdir="%_docdir/%name" \
--with-systemdsystemunitdir=%_unitdir \
--includedir="%_includedir/%name"
make %{?_smp_mflags} V=1
%install
b="%buildroot"
%make_install
find $b -type f -name "*.la" -delete -print
install -D -m 0644 contrib/osmo-ggsn.service "$b/%_unitdir/%name.service"
install -d "$b/%_sbindir"
ln -s "%_sbindir/service" "$b/%_sbindir/rc%name"
install -d "$b/%_sysconfdir/osmocom"
@ -101,9 +102,10 @@ install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf"
%postun -n %lname -p /sbin/ldconfig
%files
%doc AUTHORS COPYING README.md
%_sbindir/osmo-ggsn
%_sbindir/sgsnemu
%license COPYING
%doc AUTHORS README.md
%_bindir/osmo-ggsn
%_bindir/sgsnemu
%_mandir/man8/osmo-ggsn.8%ext_man
%_mandir/man8/sgsnemu.8%ext_man
%_unitdir/%name.service
@ -115,7 +117,7 @@ install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf"
%config(noreplace) %_sysconfdir/osmocom/sgsnemu.conf
%files -n %lname
%_libdir/libgtp.so.3*
%_libdir/libgtp.so.4*
%files -n libgtp-devel
%_includedir/%name/