From 8c412c9f19fb4485dd7334d6242b0111f6b783b171d1e8f7622b2923e8c6af82 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 11 Dec 2018 13:21:21 +0000 Subject: [PATCH] - Update to new upstream release 1.2.2 OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=9 --- ...warnings-return-0-in-main-in-3-tests.patch | 45 ----- _service | 4 +- build-fixes.diff | 162 ++++++++++-------- osmo-ggsn-1.1.0.tar.xz | 3 - osmo-ggsn-1.2.2.tar.xz | 3 + osmo-ggsn.changes | 10 ++ osmo-ggsn.spec | 39 ++--- 7 files changed, 121 insertions(+), 145 deletions(-) delete mode 100644 0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch delete mode 100644 osmo-ggsn-1.1.0.tar.xz create mode 100644 osmo-ggsn-1.2.2.tar.xz diff --git a/0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch b/0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch deleted file mode 100644 index f72c165..0000000 --- a/0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dabb8b4860199a44401fa436f5fcd56eb3d09512 Mon Sep 17 00:00:00 2001 -From: Neels Hofmeyr -Date: Sun, 29 Oct 2017 01:53:50 +0200 -Subject: [PATCH] fix compiler warnings: return 0 in main(), in 3 tests - -Change-Id: I9e49ceba6b0a8dffd331e5707667d9bb007f3ec7 ---- - tests/gtp/gtpie_test.c | 1 + - tests/lib/in46a_test.c | 1 + - tests/lib/ippool_test.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/tests/gtp/gtpie_test.c b/tests/gtp/gtpie_test.c -index fe2d502..8d87dcc 100644 ---- a/tests/gtp/gtpie_test.c -+++ b/tests/gtp/gtpie_test.c -@@ -124,4 +124,5 @@ int main(int argc, char **argv) - /* TODO: gtpie_encaps() */ - /* TODO: gtpie_encaps2() */ - /* TODO: gtpie_getie(), gtpie_exist(), gtpie_get*() */ -+ return 0; - } -diff --git a/tests/lib/in46a_test.c b/tests/lib/in46a_test.c -index 42a1768..ab7156f 100644 ---- a/tests/lib/in46a_test.c -+++ b/tests/lib/in46a_test.c -@@ -321,4 +321,5 @@ int main(int argc, char **argv) - test_in46a_to_eua(); - test_in46a_from_eua(); - test_in46a_netmasklen(); -+ return 0; - } -diff --git a/tests/lib/ippool_test.c b/tests/lib/ippool_test.c -index ea56edd..5b3227c 100644 ---- a/tests/lib/ippool_test.c -+++ b/tests/lib/ippool_test.c -@@ -130,4 +130,5 @@ int main(int argc, char **argv) - srand(time(NULL)); - - test_pool_sizes(); -+ return 0; - } --- -2.13.6 - diff --git a/_service b/_service index 97e5f14..9d00d83 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ git git://git.osmocom.org/osmo-ggsn - 1.1.0 - 1.1.0 + 1.2.2 + 1.2.2 *.tar diff --git a/build-fixes.diff b/build-fixes.diff index a2dacd5..e2185a4 100644 --- a/build-fixes.diff +++ b/build-fixes.diff @@ -9,78 +9,45 @@ * remove AC_PROG_CXX, the C++ is never used --- - ggsn/Makefile.am | 12 ++++++------ - ggsn/gtp-kernel.c | 5 +---- + ggsn/Makefile.am | 10 +++++----- gtp/Makefile.am | 3 ++- - lib/Makefile.am | 8 +++++--- - sgsnemu/Makefile.am | 9 ++++----- + 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, 21 insertions(+), 22 deletions(-) + 7 files changed, 24 insertions(+), 23 deletions(-) -Index: osmo-ggsn-1.1.0/ggsn/Makefile.am +Index: osmo-ggsn-1.2.2/ggsn/Makefile.am =================================================================== ---- osmo-ggsn-1.1.0.orig/ggsn/Makefile.am -+++ osmo-ggsn-1.1.0/ggsn/Makefile.am -@@ -1,17 +1,17 @@ +--- 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_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 --osmo_ggsn_LDADD += -lgtpnl -+AM_CPPFLAGS += -DGTP_KERNEL ${LIBGTPNL_CFLAGS} -+osmo_ggsn_LDADD += ${LIBGTPNL_LIBS} +-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 gtp-kernel.h icmpv6.c icmpv6.h checksum.c checksum.h - - if ENABLE_GTP_KERNEL -Index: osmo-ggsn-1.1.0/ggsn/gtp-kernel.c + 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.1.0.orig/ggsn/gtp-kernel.c -+++ osmo-ggsn-1.1.0/ggsn/gtp-kernel.c -@@ -17,8 +17,6 @@ - - #include - #include --#include -- - #include - - #include -@@ -30,8 +28,6 @@ - - #include - #include --#include -- - #include "gtp-kernel.h" - - static void pdp_debug(struct pdp_t *pdp) -@@ -69,6 +65,7 @@ static void pdp_debug(struct pdp_t *pdp) - printf("\n"); - } - -+struct mnl_socket; - static struct { - int genl_id; - struct mnl_socket *nl; -Index: osmo-ggsn-1.1.0/gtp/Makefile.am -=================================================================== ---- osmo-ggsn-1.1.0.orig/gtp/Makefile.am -+++ osmo-ggsn-1.1.0/gtp/Makefile.am -@@ -6,7 +6,8 @@ lib_LTLIBRARIES = libgtp.la +--- 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 @@ -90,45 +57,90 @@ Index: osmo-ggsn-1.1.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.1.0/lib/Makefile.am +Index: osmo-ggsn-1.2.2/lib/Makefile.am =================================================================== ---- osmo-ggsn-1.1.0.orig/lib/Makefile.am -+++ osmo-ggsn-1.1.0/lib/Makefile.am -@@ -1,7 +1,9 @@ +--- 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 + 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_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 -+libmisc_la_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c +-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} -Index: osmo-ggsn-1.1.0/sgsnemu/Makefile.am + + 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.1.0.orig/sgsnemu/Makefile.am -+++ osmo-ggsn-1.1.0/sgsnemu/Makefile.am -@@ -1,9 +1,8 @@ +--- osmo-ggsn-1.2.2.orig/lib/gtp-kernel.c ++++ osmo-ggsn-1.2.2/lib/gtp-kernel.c +@@ -18,8 +18,6 @@ + + #include + #include +-#include +- + #include + + #include +@@ -31,8 +29,6 @@ + + #include + #include +-#include +- + #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_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) -+AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb -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_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a +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.1.0/tests/gtp/Makefile.am +Index: osmo-ggsn-1.2.2/tests/gtp/Makefile.am =================================================================== ---- osmo-ggsn-1.1.0.orig/tests/gtp/Makefile.am -+++ osmo-ggsn-1.1.0/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) @@ -138,11 +150,11 @@ Index: osmo-ggsn-1.1.0/tests/gtp/Makefile.am $(top_builddir)/gtp/libgtp.la \ $(LIBOSMOCORE_LIBS) \ $(NULL) -Index: osmo-ggsn-1.1.0/tests/lib/Makefile.am +Index: osmo-ggsn-1.2.2/tests/lib/Makefile.am =================================================================== ---- osmo-ggsn-1.1.0.orig/tests/lib/Makefile.am -+++ osmo-ggsn-1.1.0/tests/lib/Makefile.am -@@ -10,7 +10,7 @@ ippool_test_SOURCES = \ +--- 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 = \ @@ -151,7 +163,7 @@ Index: osmo-ggsn-1.1.0/tests/lib/Makefile.am $(LIBOSMOCORE_LIBS) \ $(NULL) -@@ -19,6 +19,6 @@ in46a_test_SOURCES = \ +@@ -23,6 +23,6 @@ in46a_test_SOURCES = \ $(NULL) in46a_test_LDADD = \ diff --git a/osmo-ggsn-1.1.0.tar.xz b/osmo-ggsn-1.1.0.tar.xz deleted file mode 100644 index ceafec8..0000000 --- a/osmo-ggsn-1.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec31061f15858ce6beed74c14a5097886dc7b8ce5b0c9154684327d71bfafd45 -size 144472 diff --git a/osmo-ggsn-1.2.2.tar.xz b/osmo-ggsn-1.2.2.tar.xz new file mode 100644 index 0000000..5a585a7 --- /dev/null +++ b/osmo-ggsn-1.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:797633f72e6df164ee00b83cd7bea4eed1d90704bae1a12273788d81b9bba880 +size 153096 diff --git a/osmo-ggsn.changes b/osmo-ggsn.changes index 1f82c73..9e092df 100644 --- a/osmo-ggsn.changes +++ b/osmo-ggsn.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Dec 11 13:08:04 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 1.2.2 + * Add support for IPv4v6 End User Addresses + * ggsn: Add 'ipv6 link-local' vty cmd + * Add talloc context introspection via VTY +- Remove 0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch + (merged) + ------------------------------------------------------------------- Fri Dec 29 16:38:27 UTC 2017 - mardnh@gmx.de diff --git a/osmo-ggsn.spec b/osmo-ggsn.spec index 56c19bb..13c57dd 100644 --- a/osmo-ggsn.spec +++ b/osmo-ggsn.spec @@ -1,7 +1,7 @@ # # spec file for package osmo-ggsn # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,30 +12,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: osmo-ggsn -Version: 1.1.0 +%define lname libgtp3 +Version: 1.2.2 Release: 0 Summary: GPRS Support Node -License: GPL-2.0 AND LGPL-2.1+ +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 -Patch2: 0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch BuildRequires: libtool >= 2 BuildRequires: pkgconfig >= 0.20 BuildRequires: systemd-rpm-macros BuildRequires: xz -BuildRequires: pkgconfig(libgtpnl) >= 1.0.0 +BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 BuildRequires: pkgconfig(libmnl) >= 1.0.3 -BuildRequires: pkgconfig(libosmocore) >= 0.6.4 -BuildRequires: pkgconfig(libosmoctrl) +BuildRequires: pkgconfig(libosmocore) >= 0.11.0 +BuildRequires: pkgconfig(libosmoctrl) >= 0.11.0 BuildRequires: pkgconfig(libosmogsm) -BuildRequires: pkgconfig(libosmovty) >= 0.3.0 +BuildRequires: pkgconfig(libosmovty) >= 0.11.0 Obsoletes: openggsn %{?systemd_requires} @@ -44,19 +44,19 @@ Osmo-GGSN is a C-language implementation of a GGSN (Gateway GPRS Support Node), a core network element of ETSI/3GPP cellular networks such as GPRS, EDGE, UMTS or HSPA. -%package -n libgtp2 +%package -n %lname Summary: Library implementing GTP between SGSN and GGSN -License: GPL-2.0 +License: GPL-2.0-only Group: System/Libraries -%description -n libgtp2 +%description -n %lname libgtp implements the GPRS Tunneling Protocol between SGSN and GGSN. %package -n libgtp-devel Summary: Development files for the GTP library -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/C and C++ -Requires: libgtp2 = %version +Requires: %lname = %version %description -n libgtp-devel libgtp implements the GPRS Tunneling Protocol between SGSN and GGSN. @@ -65,8 +65,7 @@ This subpackage contains libraries and header files for developing applications that want to make use of libgtp. %prep -%setup -q -%patch -P 1 -P 2 -p1 +%autosetup -p1 %build echo "%version" >.tarball-version @@ -98,8 +97,8 @@ install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf" %postun %service_del_postun %name.service -%post -n libgtp2 -p /sbin/ldconfig -%postun -n libgtp2 -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %doc AUTHORS COPYING README.md @@ -115,8 +114,8 @@ install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf" %config(noreplace) %_sysconfdir/osmocom/osmo-ggsn.cfg %config(noreplace) %_sysconfdir/osmocom/sgsnemu.conf -%files -n libgtp2 -%_libdir/libgtp.so.2* +%files -n %lname +%_libdir/libgtp.so.3* %files -n libgtp-devel %_includedir/%name/