diff --git a/1.10.1.tar.gz b/1.10.1.tar.gz deleted file mode 100644 index b59715a..0000000 --- a/1.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75a994b17eb86f789342b137de816bdc8a1aca4dc0340cfed877b7bd1222861d -size 477870 diff --git a/1.10.2.tar.gz b/1.10.2.tar.gz new file mode 100644 index 0000000..7bfd8b1 --- /dev/null +++ b/1.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ec9794f0f2f222c4cd650d543ec92fa48a78dec91e30bdb6a2ff60eae49e1c3 +size 478157 diff --git a/build-fixes.diff b/build-fixes.diff index 6502027..c199eda 100644 --- a/build-fixes.diff +++ b/build-fixes.diff @@ -9,26 +9,26 @@ * remove AC_PROG_CXX, the C++ is never used --- - ggsn/Makefile.am | 10 +++++----- + ggsn/Makefile.am | 11 ++++++----- gtp/Makefile.am | 3 ++- - lib/Makefile.am | 10 ++++++---- + lib/Makefile.am | 8 ++++---- lib/gtp-kernel.c | 1 + - sgsnemu/Makefile.am | 10 +++++----- + sgsnemu/Makefile.am | 11 ++++++----- tests/gtp/Makefile.am | 2 +- tests/lib/Makefile.am | 4 ++-- 7 files changed, 22 insertions(+), 18 deletions(-) -Index: osmo-ggsn-1.10.1/ggsn/Makefile.am +Index: osmo-ggsn-1.10.2/ggsn/Makefile.am =================================================================== ---- osmo-ggsn-1.10.1.orig/ggsn/Makefile.am -+++ osmo-ggsn-1.10.1/ggsn/Makefile.am -@@ -1,15 +1,15 @@ +--- osmo-ggsn-1.10.2.orig/ggsn/Makefile.am ++++ osmo-ggsn-1.10.2/ggsn/Makefile.am +@@ -1,15 +1,16 @@ -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_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -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 @@ -42,48 +42,47 @@ Index: osmo-ggsn-1.10.1/ggsn/Makefile.am endif -osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a ++osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.la 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.10.1/gtp/Makefile.am +Index: osmo-ggsn-1.10.2/gtp/Makefile.am =================================================================== ---- osmo-ggsn-1.10.1.orig/gtp/Makefile.am -+++ osmo-ggsn-1.10.1/gtp/Makefile.am +--- osmo-ggsn-1.10.2.orig/gtp/Makefile.am ++++ osmo-ggsn-1.10.2/gtp/Makefile.am @@ -8,7 +8,8 @@ lib_LTLIBRARIES = libgtp.la include_HEADERS = gtp.h gsn.h pdp.h gtpie.h --AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) +-AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) ++AM_CFLAGS = -fno-builtin -Wall +AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) -+AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb 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 -Index: osmo-ggsn-1.10.1/lib/Makefile.am +Index: osmo-ggsn-1.10.2/lib/Makefile.am =================================================================== ---- osmo-ggsn-1.10.1.orig/lib/Makefile.am -+++ osmo-ggsn-1.10.1/lib/Makefile.am -@@ -1,12 +1,14 @@ +--- osmo-ggsn-1.10.2.orig/lib/Makefile.am ++++ osmo-ggsn-1.10.2/lib/Makefile.am +@@ -1,12 +1,12 @@ -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 netns.h util.h icmpv6.h checksum.h --AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) -+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) -+AM_CFLAGS = -O2 -fno-builtin -Wall + AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) -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_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 - AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) +-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) -libmisc_a_SOURCES += gtp-kernel.c ++AM_CPPFLAGS = -DGTP_KERNEL $(LIBGTPNL_CFLAGS) +libmisc_la_SOURCES += gtp-kernel.c endif -Index: osmo-ggsn-1.10.1/lib/gtp-kernel.c +Index: osmo-ggsn-1.10.2/lib/gtp-kernel.c =================================================================== ---- osmo-ggsn-1.10.1.orig/lib/gtp-kernel.c -+++ osmo-ggsn-1.10.1/lib/gtp-kernel.c +--- osmo-ggsn-1.10.2.orig/lib/gtp-kernel.c ++++ osmo-ggsn-1.10.2/lib/gtp-kernel.c @@ -53,6 +53,7 @@ static void pdp_debug(const char *prefix buf4, buf6, inet_ntoa(ia)); } @@ -92,17 +91,17 @@ Index: osmo-ggsn-1.10.1/lib/gtp-kernel.c static struct { int genl_id; struct mnl_socket *nl; -Index: osmo-ggsn-1.10.1/sgsnemu/Makefile.am +Index: osmo-ggsn-1.10.2/sgsnemu/Makefile.am =================================================================== ---- osmo-ggsn-1.10.1.orig/sgsnemu/Makefile.am -+++ osmo-ggsn-1.10.1/sgsnemu/Makefile.am -@@ -1,15 +1,15 @@ +--- osmo-ggsn-1.10.2.orig/sgsnemu/Makefile.am ++++ osmo-ggsn-1.10.2/sgsnemu/Makefile.am +@@ -1,15 +1,16 @@ -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_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CFLAGS = -fno-builtin -Wall @@ -116,12 +115,13 @@ Index: osmo-ggsn-1.10.1/sgsnemu/Makefile.am endif -sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a ++sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.la sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h -Index: osmo-ggsn-1.10.1/tests/gtp/Makefile.am +Index: osmo-ggsn-1.10.2/tests/gtp/Makefile.am =================================================================== ---- osmo-ggsn-1.10.1.orig/tests/gtp/Makefile.am -+++ osmo-ggsn-1.10.1/tests/gtp/Makefile.am -@@ -19,7 +19,7 @@ queue_test_SOURCES = \ +--- osmo-ggsn-1.10.2.orig/tests/gtp/Makefile.am ++++ osmo-ggsn-1.10.2/tests/gtp/Makefile.am +@@ -20,7 +20,7 @@ queue_test_SOURCES = \ $(NULL) gtpie_test_LDADD = \ @@ -130,11 +130,11 @@ Index: osmo-ggsn-1.10.1/tests/gtp/Makefile.am $(top_builddir)/gtp/libgtp.la \ $(LIBOSMOCORE_LIBS) \ $(NULL) -Index: osmo-ggsn-1.10.1/tests/lib/Makefile.am +Index: osmo-ggsn-1.10.2/tests/lib/Makefile.am =================================================================== ---- osmo-ggsn-1.10.1.orig/tests/lib/Makefile.am -+++ osmo-ggsn-1.10.1/tests/lib/Makefile.am -@@ -14,7 +14,7 @@ ippool_test_SOURCES = \ +--- osmo-ggsn-1.10.2.orig/tests/lib/Makefile.am ++++ osmo-ggsn-1.10.2/tests/lib/Makefile.am +@@ -15,7 +15,7 @@ ippool_test_SOURCES = \ $(NULL) ippool_test_LDADD = \ @@ -143,7 +143,7 @@ Index: osmo-ggsn-1.10.1/tests/lib/Makefile.am $(LIBOSMOCORE_LIBS) \ $(NULL) -@@ -23,6 +23,6 @@ in46a_test_SOURCES = \ +@@ -24,6 +24,6 @@ in46a_test_SOURCES = \ $(NULL) in46a_test_LDADD = \ diff --git a/osmo-ggsn.changes b/osmo-ggsn.changes index 7601116..a8b6760 100644 --- a/osmo-ggsn.changes +++ b/osmo-ggsn.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 1 20:26:42 UTC 2023 - Jan Engelhardt + +- Update to release 1.10.2 + * doc: running: update kernel-gtp limitations + ------------------------------------------------------------------- Thu May 18 11:45:02 UTC 2023 - Jan Engelhardt diff --git a/osmo-ggsn.spec b/osmo-ggsn.spec index 712b8a5..4e61b95 100644 --- a/osmo-ggsn.spec +++ b/osmo-ggsn.spec @@ -16,9 +16,10 @@ # +%define _lto_cflags %nil Name: osmo-ggsn %define lname libgtp6 -Version: 1.10.1 +Version: 1.10.2 Release: 0 Summary: GPRS Support Node License: GPL-2.0-only AND LGPL-2.1-or-later @@ -32,11 +33,9 @@ BuildRequires: pkgconfig >= 0.20 BuildRequires: systemd-rpm-macros BuildRequires: xz BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 -BuildRequires: pkgconfig(libmnl) >= 1.0.3 -BuildRequires: pkgconfig(libosmocore) >= 1.8.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.8.0 -BuildRequires: pkgconfig(libosmogsm) -BuildRequires: pkgconfig(libosmovty) >= 1.8.0 +BuildRequires: pkgconfig(libosmocore) >= 1.9.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0 +BuildRequires: pkgconfig(libosmovty) >= 1.9.0 Obsoletes: openggsn %description