diff --git a/libosmo-netif-0.0.4.tar.xz b/libosmo-netif-0.0.4.tar.xz deleted file mode 100644 index 3c5d4ff..0000000 --- a/libosmo-netif-0.0.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd83be65e20d9afb3cb3f1ed01a5a62406358e51e331c946d84c7decd5207028 -size 105900 diff --git a/libosmo-netif-0.0.6.5.tar.xz b/libosmo-netif-0.0.6.5.tar.xz new file mode 100644 index 0000000..0e9bbed --- /dev/null +++ b/libosmo-netif-0.0.6.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aab4ed1614b4a2fcbc7fe34543516021216c3b3a6b201d2f9795750c7622e54 +size 108120 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index c29dfb6..4525fc5 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,5 +1,12 @@ +------------------------------------------------------------------- +Wed Dec 23 17:13:12 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 0.0.6.5 +* No changelog was provided +- Drop osmo-cppflags.diff, osmo-ldadd.diff, osmo-allincludes.diff + (merged upstream) + ------------------------------------------------------------------- Thu Oct 2 20:58:44 UTC 2014 - jengelh@inai.de - Initial package (version 0.0.4) for build.opensuse.org - diff --git a/libosmo-netif.spec b/libosmo-netif.spec index a35d605..092b8b8 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -18,25 +18,23 @@ Name: libosmo-netif Summary: Osmocom library for muxed audio -Version: 0.0.4 +Version: 0.0.6.5 Release: 0 License: AGPL-3.0+ and GPL-2.0+ -Group: Development/Libraries/C and C++ +Group: Hardware/Mobile Url: http://openbsc.osmocom.org/trac/ #Git-Clone: git://git.osmocom.org/libosmo-netif #Git-Web: http://git.osmocom.org/libosmo-netif/ -#Snapshot: 0.0.4 +#Snapshot: 0.0.6-5-gcc4ce39 Source: %name-%version.tar.xz -Patch1: osmo-cppflags.diff -Patch2: osmo-ldadd.diff -Patch3: osmo-allincludes.diff Patch4: osmo-talloc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake #BuildRequires: dahdi-linux-devel BuildRequires: libtool >= 2 +BuildRequires: lksctp-tools-devel BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(libosmoabis) >= 0.0.7 @@ -47,24 +45,24 @@ BuildRequires: pkgconfig(ortp) >= 0.15.0 %description -%package -n libosmonetif2 +%package -n libosmonetif3 Summary: Osmocom library for muxed audio License: AGPL-3.0+ Group: System/Libraries -%description -n libosmonetif2 +%description -n libosmonetif3 %package -n libosmonetif-devel Summary: Development files for the Osmocom muxed audio library License: AGPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libosmonetif2 = %version +Requires: libosmonetif3 = %version %description -n libosmonetif-devel %prep %setup -qn %name -%patch -P 1 -P 2 -P 3 -P 4 -p1 +%patch -P 4 -p1 %build echo "%version" >.tarball-version @@ -79,12 +77,12 @@ find "%buildroot/%_libdir" -type f -name "*.la" -delete %check make %{?_smp_mflags} check -%post -n libosmonetif2 -p /sbin/ldconfig -%postun -n libosmonetif2 -p /sbin/ldconfig +%post -n libosmonetif3 -p /sbin/ldconfig +%postun -n libosmonetif3 -p /sbin/ldconfig -%files -n libosmonetif2 +%files -n libosmonetif3 %defattr(-,root,root) -%_libdir/libosmonetif.so.2* +%_libdir/libosmonetif.so.3* %files -n libosmonetif-devel %defattr(-,root,root) diff --git a/osmo-allincludes.diff b/osmo-allincludes.diff deleted file mode 100644 index 87a3acf..0000000 --- a/osmo-allincludes.diff +++ /dev/null @@ -1,83 +0,0 @@ -From 226e99483234c100e5a18ea12838d98a3b091de6 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 2 Oct 2014 23:22:18 +0200 -Subject: [PATCH] build: remove all_includes - -This variable is never set and could therefore be removed. ---- - Makefile.am | 1 - - examples/Makefile.am | 2 +- - examples/channel/Makefile.am | 2 +- - src/Makefile.am | 2 +- - src/channel/abis/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - 6 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index c8a05a3..519d1ae 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,6 @@ - AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 - ACLOCAL_AMFLAGS = -I m4 - --AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include - SUBDIRS = include src examples tests - - pkgconfigdir = $(libdir)/pkgconfig -diff --git a/examples/Makefile.am b/examples/Makefile.am -index f8cfc8f..ddfaa48 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,4 +1,4 @@ --AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/include - AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - -diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am -index 4191c94..c417909 100644 ---- a/examples/channel/Makefile.am -+++ b/examples/channel/Makefile.am -@@ -1,4 +1,4 @@ --AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -+AM_CPPFLAGS = -I$(top_srcdir)/include - AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - -diff --git a/src/Makefile.am b/src/Makefile.am -index ca40152..7fbdaf2 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,7 +2,7 @@ - # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification - LIBVERSION=2:0:0 - --AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - -diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am -index 7b744f2..9ccce1d 100644 ---- a/src/channel/abis/Makefile.am -+++ b/src/channel/abis/Makefile.am -@@ -1,4 +1,4 @@ --AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 0c1fed3..a986940 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,4 +1,4 @@ --AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) -+AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) - AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) - - check_PROGRAMS = osmux/osmux_test --- -2.0.0 - diff --git a/osmo-cppflags.diff b/osmo-cppflags.diff deleted file mode 100644 index 921d1aa..0000000 --- a/osmo-cppflags.diff +++ /dev/null @@ -1,73 +0,0 @@ -From 603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff Mon Sep 17 00:00:00 2001 -From: Martin Hauke -Date: Thu, 11 Sep 2014 17:11:38 +0200 -Subject: [PATCH] build: rename INCLUDES to AM_CPPFLAGS in Makefile.am to avoid - warnings - ---- - Makefile.am | 2 +- - examples/Makefile.am | 2 +- - examples/channel/Makefile.am | 2 +- - src/Makefile.am | 2 +- - src/channel/abis/Makefile.am | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 91abed1..c8a05a3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,7 @@ - AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 - ACLOCAL_AMFLAGS = -I m4 - --INCLUDES = $(all_includes) -I$(top_srcdir)/include -+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include - SUBDIRS = include src examples tests - - pkgconfigdir = $(libdir)/pkgconfig -diff --git a/examples/Makefile.am b/examples/Makefile.am -index e7742cd..f8cfc8f 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,4 +1,4 @@ --INCLUDES = $(all_includes) -I$(top_srcdir)/include -+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include - AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - -diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am -index 6ab34b6..4191c94 100644 ---- a/examples/channel/Makefile.am -+++ b/examples/channel/Makefile.am -@@ -1,4 +1,4 @@ --INCLUDES = $(all_includes) -I$(top_srcdir)/include -+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include - AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(COVERAGE_LDFLAGS) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 4fd93d7..8b4b58e 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,7 +2,7 @@ - # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification - LIBVERSION=2:0:0 - --INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) - -diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am -index 3c6fef6..e4d93a3 100644 ---- a/src/channel/abis/Makefile.am -+++ b/src/channel/abis/Makefile.am -@@ -1,4 +1,4 @@ --INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) - AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) - --- -2.0.0 - diff --git a/osmo-ldadd.diff b/osmo-ldadd.diff deleted file mode 100644 index 76c612e..0000000 --- a/osmo-ldadd.diff +++ /dev/null @@ -1,63 +0,0 @@ -From de816861cb000453991c52896315ae5a65a0fdf7 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Thu, 2 Oct 2014 23:18:06 +0200 -Subject: [PATCH] build: put dependency libraries in the right place in - Makefiles - -Libs must be in _LDADD/_LIBADD and not in _LDFLAGS. ---- - src/Makefile.am | 4 ++-- - src/channel/abis/Makefile.am | 3 ++- - tests/osmo-pcap-test/Makefile.am | 2 +- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 8b4b58e..ca40152 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -4,13 +4,13 @@ LIBVERSION=2:0:0 - - AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) --AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(COVERAGE_LDFLAGS) - - SUBDIRS = channel - - lib_LTLIBRARIES = libosmonetif.la - --libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la -+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) - libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined - - libosmonetif_la_SOURCES = amr.c \ -diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am -index e4d93a3..7b744f2 100644 ---- a/src/channel/abis/Makefile.am -+++ b/src/channel/abis/Makefile.am -@@ -1,8 +1,9 @@ - AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) - AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) --AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) -+AM_LDFLAGS = $(COVERAGE_LDFLAGS) - - noinst_LTLIBRARIES = libosmonetif-abis.la - - libosmonetif_abis_la_SOURCES = ipa_stream_server.c \ - ipa_stream_client.c -+libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) -diff --git a/tests/osmo-pcap-test/Makefile.am b/tests/osmo-pcap-test/Makefile.am -index 0be6fc4..a256005 100644 ---- a/tests/osmo-pcap-test/Makefile.am -+++ b/tests/osmo-pcap-test/Makefile.am -@@ -9,6 +9,6 @@ osmo_pcap_test_SOURCES = proto.c \ - osmux_test.c \ - pcap.c - --osmo_pcap_test_LDFLAGS = -lpcap \ -+osmo_pcap_test_LDADD = -lpcap \ - -losmocore \ - -losmonetif --- -2.0.0 - diff --git a/osmo-talloc.diff b/osmo-talloc.diff index e9b0b56..93205a5 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -1,4 +1,4 @@ -From 1c54312597f7a4c5eae2c495ef321f424913dcb9 Mon Sep 17 00:00:00 2001 +From 84cb7836dfb9cee206e7d2bd552d4a71fbea4aef Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 2 Oct 2014 23:26:16 +0200 Subject: [PATCH] build: support external libtalloc @@ -12,13 +12,13 @@ Subject: [PATCH] build: support external libtalloc 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac -index 28dde0c..cef782e 100644 +index 42f3f42..185557e 100644 --- a/configure.ac +++ b/configure.ac -@@ -43,6 +43,7 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0) - dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here - PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7) - PKG_CHECK_MODULES(ORTP, ortp >= 0.15.0) +@@ -47,6 +47,7 @@ AC_CHECK_LIB([sctp], [sctp_send], [ + ], [ + AC_MSG_ERROR([libsctp not found]) + ]) +PKG_CHECK_MODULES([TALLOC], [talloc]) AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) @@ -118,23 +118,23 @@ index c417909..2f003ce 100644 - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) diff --git a/src/Makefile.am b/src/Makefile.am -index 7fbdaf2..e0f3754 100644 +index 4bc481e..3a0460d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,14 +3,14 @@ - LIBVERSION=2:0:0 + LIBVERSION=3:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) --AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) -+AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) +-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) ++AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS) AM_LDFLAGS = $(COVERAGE_LDFLAGS) SUBDIRS = channel lib_LTLIBRARIES = libosmonetif.la --libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) -+libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS) +-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) ++libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS) libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined libosmonetif_la_SOURCES = amr.c \ @@ -155,5 +155,5 @@ index 9ccce1d..bc066cb 100644 -libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) +libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS) -- -2.0.0 +2.4.3