From 9b651ea0daa4ba2f2c9409041aa7289b6279b032bff364a3abf2f13c5d3360f8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Oct 2024 14:08:29 +0000 Subject: [PATCH 1/3] [info=92e190f86689f4e93a65ba91ea6b6c0071f15f50eacc880ef9c7349abccc2ba1] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=43 --- .gitattributes | 23 ++++++++ .gitignore | 1 + 1.4.0.tar.gz | 3 + _scmsync.obsinfo | 4 ++ build.specials.obscpio | 3 + libosmo-netif.changes | 129 +++++++++++++++++++++++++++++++++++++++++ libosmo-netif.spec | 97 +++++++++++++++++++++++++++++++ osmo-talloc.diff | 114 ++++++++++++++++++++++++++++++++++++ 8 files changed, 374 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 1.4.0.tar.gz create mode 100644 _scmsync.obsinfo create mode 100644 build.specials.obscpio create mode 100644 libosmo-netif.changes create mode 100644 libosmo-netif.spec create mode 100644 osmo-talloc.diff diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/1.4.0.tar.gz b/1.4.0.tar.gz new file mode 100644 index 0000000..cab7c85 --- /dev/null +++ b/1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cfd27fca1e0d50291eef3aa113cecd123e5485e3d2ec10d7cd3e3d50ac2fda2 +size 274737 diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo new file mode 100644 index 0000000..3951a40 --- /dev/null +++ b/_scmsync.obsinfo @@ -0,0 +1,4 @@ +mtime: 1698952911 +commit: 92e190f86689f4e93a65ba91ea6b6c0071f15f50eacc880ef9c7349abccc2ba1 +url: https://src.opensuse.org/jengelh/libosmo-netif +revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio new file mode 100644 index 0000000..16918c0 --- /dev/null +++ b/build.specials.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb0ea03fee39b37028ff5a8aad55ed3d0fe4bca8f9e90fe87e5ee7de5b0525be +size 256 diff --git a/libosmo-netif.changes b/libosmo-netif.changes new file mode 100644 index 0000000..5d49439 --- /dev/null +++ b/libosmo-netif.changes @@ -0,0 +1,129 @@ +------------------------------------------------------------------- +Wed Nov 1 19:06:32 UTC 2023 - Jan Engelhardt + +- Update to release 1.4.0 + * Add osmo_io support to osmo_stream_cli and osmo_stream_srv + * ipa: Add segmentation callback + +------------------------------------------------------------------- +Thu May 18 11:28:42 UTC 2023 - Jan Engelhardt + +- Update to release 1.3.0 + * osmux: Introduce API osmux_xfrm_input_set_name + +------------------------------------------------------------------- +Wed Aug 3 15:52:24 UTC 2022 - Jan Engelhardt + +- Update to release 1.2.0 + * stream: Add support for AF_UNIX sockets + * Introduce osmo_prim_srv APIs + * prim: Add internal CTL SAPI to negotiate SAP versions + +------------------------------------------------------------------- +Sun Mar 14 20:55:09 UTC 2021 - Jan Engelhardt + +- Update to release 1.1.0 + * No changelog was provided + +------------------------------------------------------------------- +Sun Sep 6 12:19:43 UTC 2020 - Jan Engelhardt + +- Update to release 1.0.0 + * stream: Add new WAIT_RECONNECT cli state + +------------------------------------------------------------------- +Sun Jan 5 10:49:20 UTC 2020 - Martin Hauke + +- Update to new upstream release 0.7.0 + * libosmo-netif.pc.in: Append -lsctp to Libs.private + * stream: osmo_stream_cli: Support setting multiple addr + * stream: osmo_stream_srv_link: Support setting multiple addr + * stream: Fix scheduling of queued messages during connecting state + * stream: Introduce API osmo_stream_cli_is_connected +- Update patch + * osmo-talloc.diff + +------------------------------------------------------------------- +Thu Aug 15 04:32:14 UTC 2019 - Jan Engelhardt + +- Update to new upstream release 0.6.0 + * osmux: Extend osmux_out_handle and add new API to set + rtp payload_type + +------------------------------------------------------------------- +Wed Feb 20 20:55:35 UTC 2019 - Martin Hauke + +- Update to new upstream release 0.4.0 + * Bugfix release only. + The full changelog is available via + http://git.osmocom.org/libosmo-netif/plain/debian/changelog?h=0.4.0 +- Rebase patch + * osmo-talloc.diff + +------------------------------------------------------------------- +Tue Dec 11 00:52:52 UTC 2018 - Jan Engelhardt + +- Update to new upstream release 0.3.0 + * stream: Avoid re-creating and leaking socket when unneeded + * osmo_stream_{cli,srv}_destroy: fix a mem leak on an empty msgb queue + * Add support for flushing and destroying a server-side stream + * jibuf: Add initial implementation of Jitter Buffer + * Remove "channel" layer + +------------------------------------------------------------------- +Wed Dec 27 20:38:21 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 0.1.1 + * cosmetic: relax UDP length check + * cosmetic: print textual error from recv() + * osmux_snprintf: Support different types of Osmux frames + +------------------------------------------------------------------- +Mon Oct 2 23:04:14 UTC 2017 - jengelh@inai.de + +- Update to new upstream snapshot 0.0.6.85 + * rtp: return offset in osmo_rtp_snprintf() + * somo_stream_srv_fd_cb(): close socket if NODELAY fails + +------------------------------------------------------------------- +Fri Apr 28 21:24:50 UTC 2017 - jengelh@inai.de + +- Update to new upstream snapshot 0.0.6.67 + * Fix potential NULL dereference + * stream: don't crash in _close() when fd is not initialized + * stream: When destroying, make sure to kill reconnect timer + * osmux: Fix delay between RTP packets + +------------------------------------------------------------------- +Sun Jul 31 17:59:57 UTC 2016 - jengelh@inai.de + +- Update to new upstream snapshot 0.0.6.19 +* misc: Drop oRTP dependency as there is nothing using it +* osmux: Pass circuit to _batch_del_circuit() and use it from _xfrm_input_fini() +* osmux: Add function to delete all msgs pending for a circuit +* osmux-test: remove real-time constraint by default + +------------------------------------------------------------------- +Tue Jan 26 12:06:24 UTC 2016 - jengelh@inai.de + +- Dump testsuite results on failure + +------------------------------------------------------------------- +Fri Jan 22 18:17:18 UTC 2016 - jengelh@inai.de + +- Update to new upstream snapshot 0.0.6.8 +* don't link everything to libsctp +* ensure to zero-initialize sctp_sndrcvinfo + +------------------------------------------------------------------- +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 new file mode 100644 index 0000000..cab78f4 --- /dev/null +++ b/libosmo-netif.spec @@ -0,0 +1,97 @@ +# +# spec file for package libosmo-netif +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +Name: libosmo-netif +Version: 1.4.0 +Release: 0 +Summary: Osmocom library for muxed audio +License: GPL-2.0-or-later +Group: Productivity/Telephony/Utilities +URL: https://osmocom.org/projects/libosmo-netif +Source: https://github.com/osmocom/libosmo-netif/archive/%version.tar.gz +Patch1: osmo-talloc.diff +BuildRequires: automake +BuildRequires: libtool >= 2 +BuildRequires: lksctp-tools-devel +BuildRequires: pkg-config >= 0.20 +BuildRequires: pkgconfig(libosmocodec) >= 1.9.0 +BuildRequires: pkgconfig(libosmocore) >= 1.9.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.9.0 +BuildRequires: pkgconfig(talloc) + +%description +Network interface demuxer library for OsmoCom projects. + +%package -n libosmonetif11 +Summary: Osmocom library for muxed audio +License: AGPL-3.0-or-later +Group: System/Libraries + +%description -n libosmonetif11 +Network interface demuxer library for OsmoCom projects. + +%package -n libosmonetif-devel +Summary: Development files for the Osmocom muxed audio library +License: AGPL-3.0-or-later +Group: Development/Libraries/C and C++ +Requires: libosmonetif11 = %version + +%description -n libosmonetif-devel +Network interface demuxer library for OsmoCom projects. + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmo-netif. + +%prep +%autosetup -p1 + +%build +echo "%version" >.tarball-version +autoreconf -fiv +# bugzilla.opensuse.org/795968 for rationale +%configure --includedir="%_includedir/%name" \ + --enable-shared --disable-static +%make_build + +%install +%make_install +find "%buildroot/%_libdir" -type f -name "*.la" -delete + +%check +if ! %make_build check; then + rv=$? + cat tests/testsuite.log + echo "Suppressing exit $rv" + # timing issue +fi + +%post -n libosmonetif11 -p /sbin/ldconfig +%postun -n libosmonetif11 -p /sbin/ldconfig + +%files -n libosmonetif11 +%_libdir/libosmonetif.so.* + +%files -n libosmonetif-devel +%license COPYING +%dir %_includedir/%name/ +%dir %_includedir/%name/osmocom/ +%_includedir/%name/osmocom/netif/ +%_libdir/libosmonetif.so +%_libdir/pkgconfig/libosmo-netif.pc + +%changelog diff --git a/osmo-talloc.diff b/osmo-talloc.diff new file mode 100644 index 0000000..1838df0 --- /dev/null +++ b/osmo-talloc.diff @@ -0,0 +1,114 @@ +--- + configure.ac | 1 + + examples/Makefile.am | 30 +++++++++++++++--------------- + src/Makefile.am | 2 +- + 3 files changed, 17 insertions(+), 16 deletions(-) + +Index: libosmo-netif-1.4.0/configure.ac +=================================================================== +--- libosmo-netif-1.4.0.orig/configure.ac ++++ libosmo-netif-1.4.0/configure.ac +@@ -125,6 +125,7 @@ AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"] + LIBS=$old_LIBS + ]) + ++PKG_CHECK_MODULES([TALLOC], [talloc]) + found_pcap=yes + AC_CHECK_HEADERS(pcap.h,,found_pcap=no) + AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) +Index: libosmo-netif-1.4.0/examples/Makefile.am +=================================================================== +--- libosmo-netif-1.4.0.orig/examples/Makefile.am ++++ libosmo-netif-1.4.0/examples/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/include +-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) ++AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + noinst_PROGRAMS = ipa-stream-client \ +@@ -19,57 +19,57 @@ noinst_HEADERS = udp-test.h + + ipa_stream_client_SOURCES = ipa-stream-client.c + ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + ipa_stream_server_SOURCES = ipa-stream-server.c + ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + if ENABLE_LAPD + noinst_PROGRAMS += lapd-over-datagram-user lapd-over-datagram-network + lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c + lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ +- $(LIBOSMOABIS_LIBS) ++ $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS) + + lapd_over_datagram_network_SOURCES = lapd-over-datagram-network.c + lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ +- $(LIBOSMOABIS_LIBS) ++ $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS) + endif + + stream_client_SOURCES = stream-client.c + stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + stream_server_SOURCES = stream-server.c + stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + rs232_read_SOURCES = rs232-read.c +-rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + rs232_write_SOURCES = rs232-write.c +-rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + rtp_udp_test_client_SOURCES = rtp-udp-test-client.c + rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + rtp_udp_test_server_SOURCES = rtp-udp-test-server.c + rtp_udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + udp_test_client_SOURCES = udp-test-client.c +-udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + udp_test_server_SOURCES = udp-test-server.c +-udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + osmux_test_input_SOURCES = osmux-test-input.c + osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + osmux_test_output_SOURCES = osmux-test-output.c + osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) +Index: libosmo-netif-1.4.0/src/Makefile.am +=================================================================== +--- libosmo-netif-1.4.0.orig/src/Makefile.am ++++ libosmo-netif-1.4.0/src/Makefile.am +@@ -3,7 +3,7 @@ + LIBVERSION=12:0:1 + + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) +-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) + + lib_LTLIBRARIES = libosmonetif.la From 19b821e37e687da11f41d41a06b3ec4357a6b773aa6c6837e6d51aa83e86d600 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 26 Oct 2024 14:11:08 +0000 Subject: [PATCH 2/3] [info=5fb369a588e583c622199334e0dd95e82715b97a7e71e14dd7f603c656780a3e] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=44 --- 1.4.0.tar.gz | 3 --- 1.5.1.tar.gz | 3 +++ _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- libosmo-netif.changes | 8 ++++++++ libosmo-netif.spec | 10 +++++----- osmo-talloc.diff | 20 ++++++++++---------- 7 files changed, 29 insertions(+), 21 deletions(-) delete mode 100644 1.4.0.tar.gz create mode 100644 1.5.1.tar.gz diff --git a/1.4.0.tar.gz b/1.4.0.tar.gz deleted file mode 100644 index cab7c85..0000000 --- a/1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cfd27fca1e0d50291eef3aa113cecd123e5485e3d2ec10d7cd3e3d50ac2fda2 -size 274737 diff --git a/1.5.1.tar.gz b/1.5.1.tar.gz new file mode 100644 index 0000000..d63eaca --- /dev/null +++ b/1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a3d65b26e4e983257ce1013f3a3ede8a904ffa4b75041fd8e589a4b5a061cb9 +size 284614 diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 3951a40..af15851 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1698952911 -commit: 92e190f86689f4e93a65ba91ea6b6c0071f15f50eacc880ef9c7349abccc2ba1 +mtime: 1729951854 +commit: 5fb369a588e583c622199334e0dd95e82715b97a7e71e14dd7f603c656780a3e url: https://src.opensuse.org/jengelh/libosmo-netif revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 16918c0..d1deb9a 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb0ea03fee39b37028ff5a8aad55ed3d0fe4bca8f9e90fe87e5ee7de5b0525be +oid sha256:36979dce313096ad294cbf25ad1b48790ff4234e814b28118aecb77e132cc3b5 size 256 diff --git a/libosmo-netif.changes b/libosmo-netif.changes index 5d49439..982fb8e 100644 --- a/libosmo-netif.changes +++ b/libosmo-netif.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 26 14:09:15 UTC 2024 - Jan Engelhardt + +- Update to release 1.5.1 + * stream: Add client-side (segmentation) support for IPA + * Introduce generic osmo_stream_{cli,srv}_get_fd() API + * stream_{cli,srv}: Add support for SCTP in OSMO_IO mode + ------------------------------------------------------------------- Wed Nov 1 19:06:32 UTC 2023 - Jan Engelhardt diff --git a/libosmo-netif.spec b/libosmo-netif.spec index cab78f4..b363d9b 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libosmo-netif -Version: 1.4.0 +Version: 1.5.1 Release: 0 Summary: Osmocom library for muxed audio License: GPL-2.0-or-later @@ -29,9 +29,9 @@ BuildRequires: automake BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config >= 0.20 -BuildRequires: pkgconfig(libosmocodec) >= 1.9.0 -BuildRequires: pkgconfig(libosmocore) >= 1.9.0 -BuildRequires: pkgconfig(libosmogsm) >= 1.9.0 +BuildRequires: pkgconfig(libosmocodec) >= 1.10.0 +BuildRequires: pkgconfig(libosmocore) >= 1.10.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.10.0 BuildRequires: pkgconfig(talloc) %description diff --git a/osmo-talloc.diff b/osmo-talloc.diff index 1838df0..d752b40 100644 --- a/osmo-talloc.diff +++ b/osmo-talloc.diff @@ -4,10 +4,10 @@ src/Makefile.am | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) -Index: libosmo-netif-1.4.0/configure.ac +Index: libosmo-netif-1.5.1/configure.ac =================================================================== ---- libosmo-netif-1.4.0.orig/configure.ac -+++ libosmo-netif-1.4.0/configure.ac +--- libosmo-netif-1.5.1.orig/configure.ac ++++ libosmo-netif-1.5.1/configure.ac @@ -125,6 +125,7 @@ AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"] LIBS=$old_LIBS ]) @@ -16,10 +16,10 @@ Index: libosmo-netif-1.4.0/configure.ac found_pcap=yes AC_CHECK_HEADERS(pcap.h,,found_pcap=no) AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) -Index: libosmo-netif-1.4.0/examples/Makefile.am +Index: libosmo-netif-1.5.1/examples/Makefile.am =================================================================== ---- libosmo-netif-1.4.0.orig/examples/Makefile.am -+++ libosmo-netif-1.4.0/examples/Makefile.am +--- libosmo-netif-1.5.1.orig/examples/Makefile.am ++++ libosmo-netif-1.5.1/examples/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) @@ -99,12 +99,12 @@ Index: libosmo-netif-1.4.0/examples/Makefile.am osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ - $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) -Index: libosmo-netif-1.4.0/src/Makefile.am +Index: libosmo-netif-1.5.1/src/Makefile.am =================================================================== ---- libosmo-netif-1.4.0.orig/src/Makefile.am -+++ libosmo-netif-1.4.0/src/Makefile.am +--- libosmo-netif-1.5.1.orig/src/Makefile.am ++++ libosmo-netif-1.5.1/src/Makefile.am @@ -3,7 +3,7 @@ - LIBVERSION=12:0:1 + LIBVERSION=13:1:2 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) From 330ff5043bc6986cedea7667d83630911acbeda5b8c8e9e068eed4afd63b2617 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 26 Oct 2024 14:14:39 +0000 Subject: [PATCH 3/3] [info=e1594f8254d92fdb907f39f12523b837c589b5319492479bec47bd0ad9423513] OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=45 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- libosmo-netif.spec | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index af15851..65c132a 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1729951854 -commit: 5fb369a588e583c622199334e0dd95e82715b97a7e71e14dd7f603c656780a3e +mtime: 1729951984 +commit: e1594f8254d92fdb907f39f12523b837c589b5319492479bec47bd0ad9423513 url: https://src.opensuse.org/jengelh/libosmo-netif revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index d1deb9a..855c1da 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36979dce313096ad294cbf25ad1b48790ff4234e814b28118aecb77e132cc3b5 +oid sha256:14c41d1856b90af39b505ab2d352f4211eb793e20353abb8be22e493e1712805 size 256 diff --git a/libosmo-netif.spec b/libosmo-netif.spec index b363d9b..5651a34 100644 --- a/libosmo-netif.spec +++ b/libosmo-netif.spec @@ -80,8 +80,7 @@ if ! %make_build check; then # timing issue fi -%post -n libosmonetif11 -p /sbin/ldconfig -%postun -n libosmonetif11 -p /sbin/ldconfig +%ldconfig_scriptlets -n libosmonetif11 %files -n libosmonetif11 %_libdir/libosmonetif.so.*