diff --git a/_service b/_service
index b6c1e5a..891b3b2 100644
--- a/_service
+++ b/_service
@@ -1,13 +1,13 @@
-
+
git
git://git.osmocom.org/libosmo-abis
v0.3.2
0.3.2.@TAG_OFFSET@
-
+
*.tar
xz
-
+
diff --git a/libosmo-abis-0.3.2.24.tar.xz b/libosmo-abis-0.3.2.24.tar.xz
deleted file mode 100644
index 502863c..0000000
--- a/libosmo-abis-0.3.2.24.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:578321ce1402835e3c50c65c60cd20edc762cfbe14203fe86426f0d25766fcec
-size 62292
diff --git a/libosmo-abis-0.3.2.68.tar.xz b/libosmo-abis-0.3.2.68.tar.xz
new file mode 100644
index 0000000..c595938
--- /dev/null
+++ b/libosmo-abis-0.3.2.68.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c2272ee9203ff99c5eb4aaed2ffab6660132bd39847c76aaa3cdcab90569518
+size 67856
diff --git a/libosmo-abis.changes b/libosmo-abis.changes
index 716c0b5..e48b825 100644
--- a/libosmo-abis.changes
+++ b/libosmo-abis.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Apr 28 20:58:28 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream snapshot 0.3.2.68
+ * Really fix order of set_connected_mode and set_remote_addr
+ * Resync RTP session in case of timestamp jump
+ * e1_input: Add E1 timeslot number to input_signal_data
+ * Convert e1inp_{sign,ts}type_name() to use struct value_string
+ * Implement new 'raw' input type for E1 timeslots
+ * Add HDLC timeslot mode
+ * lapd: adding support for ericsson's lapd dialect
+ * Enable adaptive jitter compensation
+ * lapd: Reduce N200 (SABM retransmission count)
+- Drop ortp27.diff (no longer needed)
+
-------------------------------------------------------------------
Sat Oct 1 12:30:41 UTC 2016 - jengelh@inai.de
diff --git a/libosmo-abis.spec b/libosmo-abis.spec
index cae29c8..c275920 100644
--- a/libosmo-abis.spec
+++ b/libosmo-abis.spec
@@ -1,7 +1,7 @@
#
# spec file for package libosmo-abis
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,10 @@
#
-%define version_unconverted 0.3.2.24
+%define version_unconverted 0.3.2.68
Name: libosmo-abis
-Version: 0.3.2.24
+Version: 0.3.2.68
Release: 0
Summary: Osmocom library for A-bis interface between BTS and BSC
License: AGPL-3.0+ and GPL-2.0+
@@ -31,7 +31,6 @@ Url: http://openbsc.osmocom.org/trac/wiki/libosmo-abis
Source: %name-%version.tar.xz
Patch1: osmo-talloc.diff
Patch2: 0001-build-resolve-compiler-warnings.patch
-Patch3: ortp27.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@@ -50,7 +49,7 @@ BSC. This interface allows control of the radio equipment and radio
frequency allocation in the BTS.
%package -n libosmoabis5
-Summary: Osmocom A-bis interface core library
+Summary: Osmocom GSM A-bis interface library
License: AGPL-3.0+
Group: System/Libraries
@@ -60,8 +59,12 @@ System-internal interface linking the Base Transceiver Stations (BTS)
and Base Station Controller (BSC). This interface allows control of
the radio equipment and radio frequency allocation in the BTS.
+This library contains common/shared code regarding this A-bis
+interface. It also implements drivers for mISDN and DAHDI-based E1
+cards, as well as some A-bis/IP dialects.
+
%package -n libosmoabis-devel
-Summary: Development files for the Osmocom A-bis core library
+Summary: Development files for the Osmocom GSM A-bis library
License: AGPL-3.0+
Group: Development/Libraries/C and C++
Requires: libosmoabis5 = %version
@@ -69,22 +72,24 @@ Requires: libosmocore-devel >= 0.3.0
Requires: libosmogsm-devel >= 0.3.10
%description -n libosmoabis-devel
-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.
+This library contains common/shared code regarding the GSM A-bis
+interface. It also implements drivers for mISDN and DAHDI-based E1
+cards, as well as some A-bis/IP dialects.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmoabis.
%package -n libosmotrau1
-Summary: Osmocom TRAU (E1/RTP) library
+Summary: Osmocom GSM TRAU (E1/RTP) library
License: GPL-2.0+
Group: System/Libraries
%description -n libosmotrau1
-The Transcoder Rate Adaptor Unit enables the use of lower rates (32,
-16 or 8 kbps) over the A-bis interface instead of the 64 kbps ISDN
-rate for which the Mobile Switching Center (MSC) is designed.
+This library implements the Transcoder and Rate Adaptation Unit (TRAU) for
+GSM systems.
+The TRAU enables the use of lower rates (32, 16 or 8 kbps) over the
+A-bis interface instead of the 64 kbps ISDN rate for which the Mobile
+Switching Center (MSC) is designed.
%package -n libosmotrau-devel
Summary: Development files for the Osmocom TRAU (E1/RTP) library
@@ -93,16 +98,15 @@ Group: Development/Libraries/C and C++
Requires: libosmotrau1 = %version
%description -n libosmotrau-devel
-The Transcoder Rate Adaptor Unit enables the use of lower bitrates
-over the A-bis interface instead of the 64 kbps design rate of the
-MSC.
+This library implements the Transcoder and Rate Adaptation Unit
+(TRAU) for GSM systems.
This subpackage contains libraries and header files for developing
applications that want to make use of libosmotrau.
%prep
%setup -q
-%patch -P 1 -P 2 -P 3 -p1
+%patch -P 1 -P 2 -p1
%build
echo "%version" >.tarball-version
diff --git a/ortp27.diff b/ortp27.diff
deleted file mode 100644
index a924979..0000000
--- a/ortp27.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jan Engelhardt
-Date: 2016-10-01 14:30:22.066588957 +0200
-
-build: make libosmo-abis build with ortp-0.27
-
----
- src/trau/osmo_ortp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: libosmo-abis-0.3.2.24/src/trau/osmo_ortp.c
-===================================================================
---- libosmo-abis-0.3.2.24.orig/src/trau/osmo_ortp.c
-+++ libosmo-abis-0.3.2.24/src/trau/osmo_ortp.c
-@@ -94,7 +94,7 @@ static int ortp_to_osmo_lvl(OrtpLogLevel
- return LOGL_ERROR;
- }
-
--static void my_ortp_logfn(OrtpLogLevel lev, const char *fmt,
-+static void my_ortp_logfn(const char *domain, OrtpLogLevel lev, const char *fmt,
- va_list args)
- {
- osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0,
-@@ -271,7 +271,7 @@ void osmo_rtp_init(void *ctx)
- tall_rtp_ctx = ctx;
- ortp_set_memory_functions(&osmo_ortp_memfn);
- ortp_init();
-- ortp_set_log_level_mask(0xffff);
-+ ortp_set_log_level_mask(ORTP_LOG_DOMAIN, 0xffff);
- ortp_set_log_handler(my_ortp_logfn);
- create_payload_types();
- }