Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osmo-ggsn for openSUSE:Factory checked in at 2023-11-02 20:21:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osmo-ggsn (Old) and /work/SRC/openSUSE:Factory/.osmo-ggsn.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osmo-ggsn" Thu Nov 2 20:21:53 2023 rev:11 rq:1121722 version:1.10.2 Changes: -------- --- /work/SRC/openSUSE:Factory/osmo-ggsn/osmo-ggsn.changes 2023-05-19 11:56:08.331475078 +0200 +++ /work/SRC/openSUSE:Factory/.osmo-ggsn.new.17445/osmo-ggsn.changes 2023-11-02 20:22:07.625286566 +0100 @@ -1,0 +2,6 @@ +Wed Nov 1 20:26:42 UTC 2023 - Jan Engelhardt <[email protected]> + +- Update to release 1.10.2 + * doc: running: update kernel-gtp limitations + +------------------------------------------------------------------- Old: ---- 1.10.1.tar.gz New: ---- 1.10.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osmo-ggsn.spec ++++++ --- /var/tmp/diff_new_pack.8lAzUs/_old 2023-11-02 20:22:08.433316299 +0100 +++ /var/tmp/diff_new_pack.8lAzUs/_new 2023-11-02 20:22:08.433316299 +0100 @@ -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: 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 ++++++ 1.10.1.tar.gz -> 1.10.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/README.md new/osmo-ggsn-1.10.2/README.md --- old/osmo-ggsn-1.10.1/README.md 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/README.md 2023-09-12 14:36:11.000000000 +0200 @@ -27,9 +27,10 @@ Documentation ------------- -There currently is no other documentation other than the wiki on the -homepage. It would be great if somebody would work towards a user -manual that can become part of the osmo-gsm-manuals project. +The user manual and VTY reference are optionally built in PDF form +as part of the build process. Find pre-rendered versions here: + +https://ftp.osmocom.org/docs/osmo-ggsn/master/ Mailing List ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/configure.ac new/osmo-ggsn-1.10.2/configure.ac --- old/osmo-ggsn-1.10.1/configure.ac 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/configure.ac 2023-09-12 14:36:11.000000000 +0200 @@ -154,9 +154,9 @@ AM_INIT_AUTOMAKE([foreign]) -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.8.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.8.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.9.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.9.0) AC_ARG_ENABLE(sanitize, [AS_HELP_STRING( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/contrib/osmo-ggsn.spec.in new/osmo-ggsn-1.10.2/contrib/osmo-ggsn.spec.in --- old/osmo-ggsn-1.10.1/contrib/osmo-ggsn.spec.in 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/contrib/osmo-ggsn.spec.in 2023-09-12 14:36:11.000000000 +0200 @@ -30,9 +30,9 @@ BuildRequires: systemd-rpm-macros %endif BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 -BuildRequires: pkgconfig(libosmocore) >= 1.8.0 -BuildRequires: pkgconfig(libosmoctrl) >= 1.8.0 -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 %{?systemd_requires} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/contrib/systemd/osmo-ggsn.service new/osmo-ggsn-1.10.2/contrib/systemd/osmo-ggsn.service --- old/osmo-ggsn-1.10.1/contrib/systemd/osmo-ggsn.service 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/contrib/systemd/osmo-ggsn.service 2023-09-12 14:36:11.000000000 +0200 @@ -1,6 +1,7 @@ [Unit] Description=OsmoGGSN -After=networking.service +After=network-online.target +Wants=network-online.target [Service] Type=simple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/debian/changelog new/osmo-ggsn-1.10.2/debian/changelog --- old/osmo-ggsn-1.10.1/debian/changelog 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/debian/changelog 2023-09-12 14:36:11.000000000 +0200 @@ -1,3 +1,19 @@ +osmo-ggsn (1.10.2) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * Do not hard-code -g and -O2 in CFLAGS + * tests: use -no-install libtool flag to avoid ./lt-* scripts + + [ Oliver Smith ] + * doc/manuals/chapters/configuration: fix typo + * debian: set compat level to 10 + * systemd: depend on networking-online.target + * README: update documentation section + * doc: running: update kernel-gtp limitations + * lib/in46_addr: add in46a_from_gsna + + -- Pau Espin Pedrol <[email protected]> Tue, 12 Sep 2023 14:36:10 +0200 + osmo-ggsn (1.10.1) unstable; urgency=medium [ Oliver Smith ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/debian/compat new/osmo-ggsn-1.10.2/debian/compat --- old/osmo-ggsn-1.10.1/debian/compat 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/debian/compat 2023-09-12 14:36:11.000000000 +0200 @@ -1 +1 @@ -9 +10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/debian/control new/osmo-ggsn-1.10.2/debian/control --- old/osmo-ggsn-1.10.1/debian/control 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/debian/control 2023-09-12 14:36:11.000000000 +0200 @@ -2,12 +2,12 @@ Maintainer: Osmocom team <[email protected]> Section: net Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), autotools-dev, pkg-config, libdpkg-perl, git, dh-autoreconf, - libosmocore-dev (>= 1.8.0), + libosmocore-dev (>= 1.9.0), osmo-gsm-manuals-dev, libgtpnl-dev (>= 1.2.0) Standards-Version: 3.9.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/doc/manuals/chapters/configuration.adoc new/osmo-ggsn-1.10.2/doc/manuals/chapters/configuration.adoc --- old/osmo-ggsn-1.10.1/doc/manuals/chapters/configuration.adoc 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/doc/manuals/chapters/configuration.adoc 2023-09-12 14:36:11.000000000 +0200 @@ -302,7 +302,7 @@ Address=192.168.7.1/24 <2> IPMasquerade=yes <3> ---- -<1> The netowrk device name, which must match the one in the apn0.netdev unit file above +<1> The network device name, which must match the one in the apn0.netdev unit file above <2> The local IP address configured on the device <3> Requesting systemd to configure IP masquerading for this interface. Depending on your needs, You may not want this if you have proper end-to-end routing set up, and want to have transparent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/doc/manuals/chapters/running.adoc new/osmo-ggsn-1.10.2/doc/manuals/chapters/running.adoc --- old/osmo-ggsn-1.10.1/doc/manuals/chapters/running.adoc 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/doc/manuals/chapters/running.adoc 2023-09-12 14:36:11.000000000 +0200 @@ -83,7 +83,12 @@ === GTP-U kernel module -WARNING: As of writing, the kernel module does not support IPv6. +WARNING: As of writing, IPv6 support for the kernel module has not been + upstreamed yet (OS#1952). + +WARNING: As of writing, it is not possible to configure multiple APNs with + gtpu-mode kernel-gpt. This is a limitation in OsmoGGSN, not in the + kernel module (OS#6106). OsmoGGSN has support to use the Linux kernel GTP-U tunnel driver to accelerate the data/user plane while still implementing the control plane (GTP-C) in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/ggsn/Makefile.am new/osmo-ggsn-1.10.2/ggsn/Makefile.am --- old/osmo-ggsn-1.10.1/ggsn/Makefile.am 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/ggsn/Makefile.am 2023-09-12 14:36:11.000000000 +0200 @@ -2,7 +2,7 @@ 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) osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/ggsn/ggsn_vty.c new/osmo-ggsn-1.10.2/ggsn/ggsn_vty.c --- old/osmo-ggsn-1.10.1/ggsn/ggsn_vty.c 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/ggsn/ggsn_vty.c 2023-09-12 14:36:11.000000000 +0200 @@ -814,10 +814,7 @@ { struct in46_addr in46; - in46.len = in->l; - OSMO_ASSERT(in->l <= sizeof(in46.v6)); - memcpy(&in46.v6, in->v, in->l); - + in46a_from_gsna(in, &in46); return in46a_ntoa(&in46); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/gtp/Makefile.am new/osmo-ggsn-1.10.2/gtp/Makefile.am --- old/osmo-ggsn-1.10.1/gtp/Makefile.am 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/gtp/Makefile.am 2023-09-12 14:36:11.000000000 +0200 @@ -8,7 +8,7 @@ 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) 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/lib/Makefile.am new/osmo-ggsn-1.10.2/lib/Makefile.am --- old/osmo-ggsn-1.10.1/lib/Makefile.am 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/lib/Makefile.am 2023-09-12 14:36:11.000000000 +0200 @@ -2,7 +2,7 @@ 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 = -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/lib/in46_addr.c new/osmo-ggsn-1.10.2/lib/in46_addr.c --- old/osmo-ggsn-1.10.1/lib/in46_addr.c 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/lib/in46_addr.c 2023-09-12 14:36:11.000000000 +0200 @@ -375,3 +375,10 @@ dst->v4.s_addr = 0; return 1; } + +void in46a_from_gsna(const struct ul16_t *in, struct in46_addr *dst) +{ + dst->len = in->l; + OSMO_ASSERT(in->l <= sizeof(dst->v6)); + memcpy(&dst->v6, in->v, in->l); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/lib/in46_addr.h new/osmo-ggsn-1.10.2/lib/in46_addr.h --- old/osmo-ggsn-1.10.1/lib/in46_addr.h 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/lib/in46_addr.h 2023-09-12 14:36:11.000000000 +0200 @@ -39,3 +39,5 @@ static inline bool in46a_is_v4(const struct in46_addr *addr) { return addr->len == sizeof(struct in_addr); } + +void in46a_from_gsna(const struct ul16_t *in, struct in46_addr *dst); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/sgsnemu/Makefile.am new/osmo-ggsn-1.10.2/sgsnemu/Makefile.am --- old/osmo-ggsn-1.10.1/sgsnemu/Makefile.am 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/sgsnemu/Makefile.am 2023-09-12 14:36:11.000000000 +0200 @@ -2,7 +2,7 @@ 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) sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/tests/gtp/Makefile.am new/osmo-ggsn-1.10.2/tests/gtp/Makefile.am --- old/osmo-ggsn-1.10.1/tests/gtp/Makefile.am 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/tests/gtp/Makefile.am 2023-09-12 14:36:11.000000000 +0200 @@ -1,4 +1,5 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g +AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) +AM_LDFLAGS = -no-install EXTRA_DIST = \ gtpie_test.ok \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-ggsn-1.10.1/tests/lib/Makefile.am new/osmo-ggsn-1.10.2/tests/lib/Makefile.am --- old/osmo-ggsn-1.10.1/tests/lib/Makefile.am 2023-02-27 16:35:47.000000000 +0100 +++ new/osmo-ggsn-1.10.2/tests/lib/Makefile.am 2023-09-12 14:36:11.000000000 +0200 @@ -1,4 +1,5 @@ -AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -g +AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) +AM_LDFLAGS = -no-install EXTRA_DIST = ippool_test.ok \ ippool_test.err \ ++++++ build-fixes.diff ++++++ --- /var/tmp/diff_new_pack.8lAzUs/_old 2023-11-02 20:22:08.589322038 +0100 +++ /var/tmp/diff_new_pack.8lAzUs/_new 2023-11-02 20:22:08.589322038 +0100 @@ -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 @@ 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 @@ 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 @@ 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 @@ $(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 @@ $(LIBOSMOCORE_LIBS) \ $(NULL) -@@ -23,6 +23,6 @@ in46a_test_SOURCES = \ +@@ -24,6 +24,6 @@ in46a_test_SOURCES = \ $(NULL) in46a_test_LDADD = \
