Merge branch '1.0.0' into master

We tagged 1.0.0 off a non-master version in the commit history in order
to keep the new TRAU frame handling out of the 1.0.0 release, but to
have all of the other fixes in a tagged release.  This merge brings
master in sync with those changes.

Change-Id: If8fc996f385f4127204ad773b991c49d853dfc5b

7 files changed, 94 insertions, 26 deletions

diff --git a/TODO-RELEASE b/TODO-RELEASE
index bf3ef84..d0852fc 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,8 +7,3 @@
 # If any interfaces have been added since the last public release: c:r:a + 1.
 # If any interfaces have been removed or changed since the last public release: c:r:0.
 #library	what		description / commit summary line
-libosmo-abis	API change	major: add parameter to struct e1inp_line
-libosmo-trau	API change	add new function osmo_rtp_socket_set_dscp()
-libosmo-abis	API change	major: add parameter to struct lapd_instance
-libosmo-abis	Field added	struct e1inp_line "use_count". REMINDER: Upon LIBVERSION c bump, take the chance to drop struct e1inp_line "refcnt" field.
-libosmo-abis	libosmogsm dep Use of lapd_dl_init2() requires libosmocore > 1.3.0 (not yet released, 00b2faf8217338d4d7d1f4d27331af3151447350)
diff --git a/configure.ac b/configure.ac
index d24010e..a7dde2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,10 +64,10 @@ AC_SUBST(SYMBOL_VISIBILITY)
 dnl Generate the output
 AM_CONFIG_HEADER(config.h)
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.1.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.4.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.4.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.4.0)
+PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.4.0)
 PKG_CHECK_MODULES(ORTP, ortp >= 0.22.0)
 
 AC_ARG_ENABLE([dahdi],
diff --git a/contrib/libosmo-abis.spec.in b/contrib/libosmo-abis.spec.in
index abde676..889c20a 100644
--- a/contrib/libosmo-abis.spec.in
+++ b/contrib/libosmo-abis.spec.in
@@ -39,12 +39,12 @@ In GSM, A-bis is a BSS-internal interface link between the BTS and
 BSC. This interface allows control of the radio equipment and radio
 frequency allocation in the BTS.
 
-%package -n libosmoabis6
+%package -n libosmoabis9
 Summary:        Osmocom GSM A-bis interface library
 License:        AGPL-3.0-or-later
 Group:          System/Libraries
 
-%description -n libosmoabis6
+%description -n libosmoabis9
 In the GSM system architecture, A-bis is a Base Station
 System-internal interface linking the Base Transceiver Stations (BTS)
 and Base Station Controller (BSC). This interface allows control of
@@ -58,7 +58,7 @@ cards, as well as some A-bis/IP dialects.
 Summary:        Development files for the Osmocom GSM A-bis library
 License:        AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmoabis6 = %version
+Requires:       libosmoabis9 = %version
 Requires:       libosmocore-devel >= 0.3.0
 Requires:       libosmogsm-devel >= 0.3.10
 
@@ -120,12 +120,12 @@ find "$b/%_libdir" -type f -name "*.la" -delete
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
-%post   -n libosmoabis6 -p /sbin/ldconfig
-%postun -n libosmoabis6 -p /sbin/ldconfig
+%post   -n libosmoabis9 -p /sbin/ldconfig
+%postun -n libosmoabis9 -p /sbin/ldconfig
 %post   -n libosmotrau2 -p /sbin/ldconfig
 %postun -n libosmotrau2 -p /sbin/ldconfig
 
-%files -n libosmoabis6
+%files -n libosmoabis9
 %defattr(-,root,root)
 %_libdir/libosmoabis.so.6*
 
diff --git a/debian/changelog b/debian/changelog
index 68064ca..b839ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,80 @@
+libosmo-abis (1.0.0) unstable; urgency=medium
+
+  [ Neels Hofmeyr ]
+  * add/clean big-endian packed structs (struct_endianess.py)
+
+  [ Harald Welte ]
+  * dahdi: Don't use perror() directly, use osmocom logging instead
+  * introduce and use logging macros with context on E1 line / timeslot
+  * e1d: Use HAVE_E1D in C source, not ENABLE_E1D
+  * e1d: add missing forward-declaration of e1inp_e1d_init()
+  * e1d: Don't use perror() directly, use osmocom logging instead
+  * e1d: Remove EXCEPTFD handling
+  * e1d: Remove bogus vty_show function.
+  * e1d: Use line->port_nr to specify e1d interface/line
+  * e1d: Use LOGPIL/LOGPITS logging macros to give context
+  * e1d: Don't connect to e1d at program start time
+  * e1d: Implement varions non-LAPD timeslot modes
+  * Add rtp_test to show the double-bind bug of OS#4444
+  * ortp: disable SO_REUSEADDR + SO_REUSEPORT
+  * subchan_demux: Use 'ubit_t' for unpacked bit buffer; use const
+  * trau_frame: use 'ubit_t' for unpacked bits
+  * subchan_demux: Use ubit_t where appropriate
+  * trau_frame.h: Fix definition of TRAU_FT_OM_UP
+  * Fix subchan_demux_test compiler warning on some gcc versions
+  * trau_frame: Fix AMR frame decoding
+  * lapd: Always print context information when logging
+  * fix compilation with --enable-e1d
+  * lapd: Replace magic numbers with #defines
+  * input/lapd.c: Enlarge message buffers for DL-SAP primitives
+  * input/dahdi.c: Don't simply read beyond end of msgb
+  * subchan_demux: Fix out-of-bounds write
+  * e1d: Add new osmo_e1dp_client_ts_open() argument
+  * e1d: Fix compilation after I4a088f91f23aaad05c5ab84a4783c1915d85aca6
+  * contrib/jenkins.sh: Test builds with --enable-e1d
+  * dahdi: Use osmo_revbytebits_buf() instead of local flip table
+  * input/e1d: Fix support for TRAU slots
+  * input/e1d: Add missing "RAW" timeslot support
+  * e1_input_vty: Fix VTY help strings
+
+  [ Sylvain Munaut ]
+  * e1d: Initial osmo-e1d support
+  * e1_input: Allow to change the pcap fd and/or unset it
+  * e1_input: Add VTY command to enable PCAP debug output
+
+  [ Oliver Smith ]
+  * ipaccess.c: line_already_initialized: int -> bool
+  * osmo_ortp: add osmo_rtp_socket_set_dscp()
+  * contrib: import RPM spec
+  * contrib: integrate RPM spec
+  * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in
+  * src/input/ipaccess.c: set TCP_NODELAY
+
+  [ Eric Wild ]
+  * add ipa ping/pong keepalive for OML/RSL links between bts and bsc
+
+  [ Eric ]
+  * configure.ac: fix libtool issue  with clang and sanitizer
+
+  [ Pau Espin Pedrol ]
+  * e1_input: refcount inc line during e1_sign_link_create, not during line update
+  * ipaccess.c: Drop repeated ipaccess_keepalive_fsm_cleanup in write error path
+  * ipaccess: Fix log formatting of RESP_ID IPA attributes
+  * cosmetic: e1_input.h: Fix trailing whitespace
+  * e1_input: Use osmo_use_count in e1inp_line
+  * ipaccess: Drop e1inp_line reference in ipacess_drop()
+  * ipacces: Fix e1inp_line reference put in ipaccess_close
+  * ipaccess: Set bfd->data to NULL before releasing its reference
+  * ipaccess_recvmsg: Clean up release steps upon error condition
+  * ipaccess_recvmsg: Assert the new bfd from new line differs from the old one
+  * ipaccess_recvmsg: Untangle code updating line
+  * cosmetic: lapd: Fix trailing whitespace
+  * lapd: Use lapd_dl_init2 instead of deprecated lapd_dl_init
+  * tests: Use API e1inp_line_put2 instead of deprecated e1inp_line_put
+  * ipaccess: Fix use-after-free in ipaccess_drop()
+
+ -- Harald Welte <laforge@osmocom.org>  Thu, 13 Aug 2020 12:09:39 +0200
+
 libosmo-abis (0.8.0) unstable; urgency=medium
 
   [ Alexander Couzens ]
diff --git a/debian/control b/debian/control
index 7039bfe..12f4a4f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                libdpkg-perl,
                git,
-               libosmocore-dev (>= 1.1.0),
+               libosmocore-dev (>= 1.4.0),
                pkg-config,
                libortp-dev
 Standards-Version: 3.9.7
@@ -22,20 +22,16 @@ Homepage: https://projects.osmocom.org/projects/libosmo-abis
 Package: libosmo-abis
 Section: oldlibs
 Architecture: any
-Depends: libosmoabis6 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends}
+Depends: libosmoabis9 (= ${binary:Version}), libosmotrau2 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Legacy package for libosmo-abis
  libosmo-abis is an empty package helping in the transition to one
  package per DSO.
 
-Package: libosmoabis6
+Package: libosmoabis9
 Section: libs
 Architecture: any
 Multi-Arch: same
-# Due to previous release issues, libosmoabis5 actually installed same libosmoabis.so.6 file.
-# Once major is increased to 7, following two lines below can be dropped:
-Conflicts: libosmoabis5
-Replaces: libosmoabis5
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: GSM A-bis handling
@@ -64,7 +60,7 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libosmotrau2 (= ${binary:Version}),
-         libosmoabis6 (= ${binary:Version})
+         libosmoabis9 (= ${binary:Version})
 Description: Development headers for A-bis interface
  The libosmo-abis library contains common/shared code regarding the A-bis
  interface between GSM BTS and BSC. This package in particular contains the
@@ -76,7 +72,7 @@ Architecture: any
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: libosmoabis6 (= ${binary:Version}),
+Depends: libosmoabis9 (= ${binary:Version}),
          libosmotrau2 (= ${binary:Version}),
          ${misc:Depends}
 Description: Debug symbols for A-bis interface
diff --git a/debian/libosmoabis6.install b/debian/libosmoabis9.install
index 79c51a9..79c51a9 100644
--- a/debian/libosmoabis6.install
+++ b/debian/libosmoabis9.install
diff --git a/src/Makefile.am b/src/Makefile.am
index f5dd865..24a7c26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read chapter "Library interface versions" of the libtool documentation
 # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-ABIS_LIBVERSION=8:0:2
-TRAU_LIBVERSION=4:0:2
+ABIS_LIBVERSION=9:0:0
+TRAU_LIBVERSION=5:0:3
 
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS= -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOE1D_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(COVERAGE_CFLAGS)