Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osmo-pcap for openSUSE:Factory checked in at 2021-11-21 23:52:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osmo-pcap (Old) and /work/SRC/openSUSE:Factory/.osmo-pcap.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "osmo-pcap" Sun Nov 21 23:52:01 2021 rev:3 rq:932639 version:0.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/osmo-pcap/osmo-pcap.changes 2021-10-15 23:03:53.350094279 +0200 +++ /work/SRC/openSUSE:Factory/.osmo-pcap.new.1895/osmo-pcap.changes 2021-11-21 23:52:27.850198372 +0100 @@ -1,0 +2,6 @@ +Fri Nov 19 10:34:07 UTC 2021 - Martin Hauke <mar...@gmx.de> + +- Update to new upstream release 0.1.3 + * https://git.osmocom.org/osmo-pcap/plain/debian/changelog?h=0.1.3 + +------------------------------------------------------------------- Old: ---- osmo-pcap-0.1.2.tar.xz New: ---- osmo-pcap-0.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osmo-pcap.spec ++++++ --- /var/tmp/diff_new_pack.5UncjS/_old 2021-11-21 23:52:28.426196516 +0100 +++ /var/tmp/diff_new_pack.5UncjS/_new 2021-11-21 23:52:28.430196503 +0100 @@ -1,7 +1,8 @@ # # spec file for package osmo-pcap # -# Copyright (c) 2015, Martin Hauke <mar...@gmx.de> +# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2015-2021, Martin Hauke <mar...@gmx.de> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +13,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: osmo-pcap -Version: 0.1.2 +Version: 0.1.3 Release: 0 Summary: Osmocom's PCAP client and server License: AGPL-3.0-or-later AND GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.5UncjS/_old 2021-11-21 23:52:28.454196426 +0100 +++ /var/tmp/diff_new_pack.5UncjS/_new 2021-11-21 23:52:28.454196426 +0100 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">git://git.osmocom.org/osmo-pcap</param> - <param name="revision">0.1.2</param> - <param name="versionformat">0.1.2</param> + <param name="revision">0.1.3</param> + <param name="versionformat">0.1.3</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ osmo-pcap-0.1.2.tar.xz -> osmo-pcap-0.1.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/.gitignore new/osmo-pcap-0.1.3/.gitignore --- old/osmo-pcap-0.1.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/osmo-pcap-0.1.3/.gitignore 2021-02-23 13:19:37.000000000 +0100 @@ -0,0 +1,39 @@ +*.o +*.a +.deps +Makefile +Makefile.in +*.*~ +*.sw? +*.pyc + +#configure +aclocal.m4 +autom4te.cache/ +config.log +config.status +configure +depcomp +install-sh +missing +stamp-h1 +compile + +osmopcapconfig.h* + +# git-version-gen magic +.tarball-version +.version + + +# apps +src/osmo-pcap-client +src/osmo-pcap-server + +# tests +tests/atconfig +tests/package.m4 +tests/testsuite +tests/testsuite.log + +contrib/osmo-pcap.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/Makefile.am new/osmo-pcap-0.1.3/Makefile.am --- old/osmo-pcap-0.1.2/Makefile.am 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/Makefile.am 2021-02-23 13:19:37.000000000 +0100 @@ -3,7 +3,12 @@ SUBDIRS = include src contrib doc tests BUILT_SOURCES = $(top_srcdir)/.version -EXTRA_DIST = git-version-gen .version +EXTRA_DIST = \ + .version \ + contrib/osmo-pcap.spec.in \ + debian \ + git-version-gen \ + $(NULL) AM_DISTCHECK_CONFIGURE_FLAGS = \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/configure.ac new/osmo-pcap-0.1.3/configure.ac --- old/osmo-pcap-0.1.2/configure.ac 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/configure.ac 2021-02-23 13:19:37.000000000 +0100 @@ -6,6 +6,8 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AC_CONFIG_TESTDIR(tests) +CFLAGS="$CFLAGS -std=gnu11" + dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -115,9 +117,9 @@ AC_SUBST([PCAP_CFLAGS]) dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.11.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.11.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(LIBZMQ, libzmq >= 3.2.2) PKG_CHECK_MODULES(LIBGNUTLS, gnutls) @@ -145,6 +147,7 @@ src/Makefile contrib/Makefile contrib/systemd/Makefile + contrib/osmo-pcap.spec doc/Makefile doc/examples/Makefile tests/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/contrib/osmo-pcap.spec.in new/osmo-pcap-0.1.3/contrib/osmo-pcap.spec.in --- old/osmo-pcap-0.1.2/contrib/osmo-pcap.spec.in 1970-01-01 01:00:00.000000000 +0100 +++ new/osmo-pcap-0.1.3/contrib/osmo-pcap.spec.in 2021-02-23 13:19:37.000000000 +0100 @@ -0,0 +1,88 @@ +# +# spec file for package osmo-pcap +# +# Copyright (c) 2015, Martin Hauke <mar...@gmx.de> +# +# 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. + +Name: osmo-pcap +Version: @VERSION@ +Release: 0 +Summary: Osmocom's PCAP client and server +License: AGPL-3.0-or-later AND GPL-2.0-or-later +Group: Productivity/Telephony/Servers +URL: https://osmocom.org/projects/osmo-pcap +Source: %{name}-%{version}.tar.xz +BuildRequires: autoconf +BuildRequires: automake >= 1.6 +BuildRequires: libpcap-devel +BuildRequires: libtool +%if 0%{?suse_version} +BuildRequires: systemd-rpm-macros +%endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(gnutls) +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(libzmq) >= 3.2.2 +%{?systemd_requires} + +%description +Osmocom tools to help with pcap tracing. +Run osmo_pcap_client locally and send traces to a different system. + +%prep +%setup -q + +%build +echo "%{version}" >.tarball-version +autoreconf -fi +%configure \ + --docdir=%{_docdir}/%{name} \ + --with-systemdsystemunitdir=%{_unitdir} +make %{?_smp_mflags} + +%install +%make_install + +%if 0%{?suse_version} +%preun +%service_del_preun osmo-pcap-client.service osmo-pcap-server.service + +%postun +%service_del_postun osmo-pcap-client.service osmo-pcap-server.service + +%pre +%service_add_pre osmo-pcap-client.service osmo-pcap-server.service + +%post +%service_add_post osmo-pcap-client.service osmo-pcap-server.service +%endif + +%check +make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) + +%files +%license COPYING +%doc AUTHORS +%doc %{_docdir}/%{name}/examples +%dir %{_sysconfdir}/osmocom +%config(noreplace) %{_sysconfdir}/osmocom/osmo-pcap-client.cfg +%config(noreplace) %{_sysconfdir}/osmocom/osmo-pcap-server.cfg +%{_bindir}/osmo-pcap-client +%{_bindir}/osmo-pcap-server +%{_unitdir}/osmo-pcap-client.service +%{_unitdir}/osmo-pcap-server.service +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/osmo_pcap_clean_old + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/debian/changelog new/osmo-pcap-0.1.3/debian/changelog --- old/osmo-pcap-0.1.2/debian/changelog 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/debian/changelog 2021-02-23 13:19:37.000000000 +0100 @@ -1,3 +1,22 @@ +osmo-pcap (0.1.3) unstable; urgency=medium + + [ Oliver Smith ] + * contrib: import RPM spec + * contrib: integrate RPM spec + * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in + * configure.ac: set -std=gnu11 + + [ Harald Welte ] + * Use OSMO_FD_* instead of deprecated BSC_FD_* + * Use osmo_fd_setup() whenever applicable + * Use osmo_fd_*_{disable,enable} + * reformat debian/control for osmo-release.sh compatibility + + [ Pau Espin Pedrol ] + * main: generate coredump and exit upon SIGABRT received + + -- Pau Espin Pedrol <pes...@espeweb.net> Tue, 23 Feb 2021 13:19:37 +0100 + osmo-pcap (0.1.2) unstable; urgency=medium [ Oliver Smith ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/debian/control new/osmo-pcap-0.1.3/debian/control --- old/osmo-pcap-0.1.2/debian/control 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/debian/control 2021-02-23 13:19:37.000000000 +0100 @@ -2,7 +2,14 @@ Section: unknown Priority: extra Maintainer: Holger Hans Peter Freyther <ze...@selfish.org> -Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, autotools-dev, libpcap0.8-dev, pkg-config, libosmocore-dev, libgnutls28-dev, libzmq3-dev +Build-Depends: debhelper (>= 7.0.50~), + dh-autoreconf, + autotools-dev, + libpcap0.8-dev, + pkg-config, + libosmocore-dev (>= 1.5.0), + libgnutls28-dev, + libzmq3-dev Standards-Version: 3.9.1 Homepage: https://osmocom.org/projects/osmo-pcap Vcs-Git: git://git.osmocom.org/osmo-pcap.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/src/osmo_client_core.c new/osmo-pcap-0.1.3/src/osmo_client_core.c --- old/osmo-pcap-0.1.2/src/osmo_client_core.c 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/src/osmo_client_core.c 2021-02-23 13:19:37.000000000 +0100 @@ -305,10 +305,7 @@ return 3; } - client->fd.fd = fd; - client->fd.when = BSC_FD_READ; - client->fd.cb = pcap_read_cb; - client->fd.data = client; + osmo_fd_setup(&client->fd, fd, OSMO_FD_READ, pcap_read_cb, client, 0); if (osmo_fd_register(&client->fd) != 0) { LOGP(DCLIENT, LOGL_ERROR, "Failed to register the fd.\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/src/osmo_client_main.c new/osmo-pcap-0.1.3/src/osmo_client_main.c --- old/osmo-pcap-0.1.2/src/osmo_client_main.c 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/src/osmo_client_main.c 2021-02-23 13:19:37.000000000 +0100 @@ -150,17 +150,26 @@ } } -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stdout, "signal %u received\n", signal); + fprintf(stdout, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: exit(0); break; case SIGABRT: - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_cli_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_cli_ctx, stderr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/src/osmo_client_network.c new/osmo-pcap-0.1.3/src/osmo_client_network.c --- old/osmo-pcap-0.1.2/src/osmo_client_network.c 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/src/osmo_client_network.c 2021-02-23 13:19:37.000000000 +0100 @@ -120,7 +120,7 @@ int conn_cb(struct osmo_fd *fd, unsigned int what) { /* finally the socket is connected... continue */ - if (what & BSC_FD_WRITE) { + if (what & OSMO_FD_WRITE) { struct osmo_pcap_client_conn *conn = fd->data; /* * The write queue needs to work differently for GNUtls. Before we can @@ -144,7 +144,7 @@ } } - if (what & BSC_FD_READ) + if (what & OSMO_FD_READ) read_cb(fd); return 0; } @@ -267,6 +267,7 @@ int rc; uint16_t srv_port; int sock_type, sock_proto; + unsigned int when; osmo_client_disconnect(conn); @@ -279,18 +280,20 @@ srv_port = conn->srv_port; sock_type = SOCK_STREAM; sock_proto = IPPROTO_TCP; + when = OSMO_FD_READ | OSMO_FD_WRITE; break; case PROTOCOL_IPIP: srv_port = 0; sock_type = SOCK_RAW; sock_proto = IPPROTO_IPIP; - conn->wqueue.bfd.when = BSC_FD_WRITE; + when = OSMO_FD_WRITE; break; default: OSMO_ASSERT(0); break; } + osmo_fd_setup(&conn->wqueue.bfd, -1, when, conn_cb, conn, 0); rc = osmo_sock_init2_ofd(&conn->wqueue.bfd, AF_INET, sock_type, sock_proto, conn->source_ip, 0, conn->srv_ip, srv_port, OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK); @@ -303,12 +306,6 @@ } rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_CONNECT]); - conn->wqueue.bfd.cb = conn_cb; - conn->wqueue.bfd.data = conn; - if (conn->protocol == PROTOCOL_IPIP) - conn->wqueue.bfd.when = BSC_FD_WRITE; - else - conn->wqueue.bfd.when = BSC_FD_READ | BSC_FD_WRITE; } void osmo_client_reconnect(struct osmo_pcap_client_conn *conn) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/src/osmo_server_main.c new/osmo-pcap-0.1.3/src/osmo_server_main.c --- old/osmo-pcap-0.1.2/src/osmo_server_main.c 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/src/osmo_server_main.c 2021-02-23 13:19:37.000000000 +0100 @@ -160,17 +160,26 @@ } } -static void signal_handler(int signal) +static void signal_handler(int signum) { - fprintf(stdout, "signal %u received\n", signal); + fprintf(stdout, "signal %u received\n", signum); - switch (signal) { + switch (signum) { case SIGINT: exit(0); break; case SIGABRT: - /* in case of abort, we want to obtain a talloc report - * and then return to the caller, who will abort the process */ + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_srv_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; case SIGUSR1: talloc_report(tall_vty_ctx, stderr); talloc_report_full(tall_srv_ctx, stderr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/src/osmo_server_network.c new/osmo-pcap-0.1.3/src/osmo_server_network.c --- old/osmo-pcap-0.1.2/src/osmo_server_network.c 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/src/osmo_server_network.c 2021-02-23 13:19:37.000000000 +0100 @@ -542,7 +542,7 @@ } else { client->rem_wq.bfd.cb = osmo_wqueue_bfd_cb; client->rem_wq.bfd.data = client; - client->rem_wq.bfd.when = BSC_FD_READ; + client->rem_wq.bfd.when = OSMO_FD_READ; client->rem_wq.read_cb = read_cb; client->direct_read = true; } @@ -602,7 +602,7 @@ } server->listen_fd.fd = fd; - server->listen_fd.when = BSC_FD_READ; + server->listen_fd.when = OSMO_FD_READ; server->listen_fd.cb = accept_cb; server->listen_fd.data = server; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osmo-pcap-0.1.2/src/osmo_tls.c new/osmo-pcap-0.1.3/src/osmo_tls.c --- old/osmo-pcap-0.1.2/src/osmo_tls.c 2020-01-02 20:19:28.000000000 +0100 +++ new/osmo-pcap-0.1.3/src/osmo_tls.c 2021-02-23 13:19:37.000000000 +0100 @@ -191,10 +191,9 @@ if (rc == 0) { /* handshake is done. start writing if we are allowed to */ LOGP(DTLS, LOGL_NOTICE, "TLS handshake done.\n"); + osmo_fd_read_enable(&tls_session->wqueue->bfd); if (!llist_empty(&tls_session->wqueue->msg_queue)) - tls_session->wqueue->bfd.when = BSC_FD_WRITE | BSC_FD_READ; - else - tls_session->wqueue->bfd.when = BSC_FD_READ; + osmo_fd_write_enable(&tls_session->wqueue->bfd); tls_session->need_handshake = false; release_keys(tls_session); if (tls_session->handshake_done) @@ -227,7 +226,7 @@ static int tls_write(struct osmo_tls_session *sess) { int rc; - sess->wqueue->bfd.when &= ~BSC_FD_WRITE; + osmo_fd_write_disable(&sess->wqueue->bfd); if (llist_empty(&sess->wqueue->msg_queue)) return 0; @@ -252,7 +251,7 @@ } if (sess->need_resend || !llist_empty(&sess->wqueue->msg_queue)) - sess->wqueue->bfd.when |= BSC_FD_WRITE; + osmo_fd_write_enable(&sess->wqueue->bfd); return rc; } @@ -263,14 +262,14 @@ if (sess->need_handshake) return need_handshake(sess); - if (what & BSC_FD_READ) { + if (what & OSMO_FD_READ) { int rc = tls_read(sess); if (rc <= 0) { sess->error(sess); return rc; } } - if (what & BSC_FD_WRITE) { + if (what & OSMO_FD_WRITE) { int rc = tls_write(sess); if (rc < 0) { sess->error(sess); @@ -435,9 +434,7 @@ gnutls_transport_set_int(sess->session, wq->bfd.fd); gnutls_handshake_set_timeout(sess->session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); - wq->bfd.cb = osmo_tls_client_bfd_cb; - wq->bfd.data = sess; - wq->bfd.when = BSC_FD_READ | BSC_FD_WRITE; + osmo_fd_setup(&wq->bfd, wq->bfd.fd, OSMO_FD_READ | OSMO_FD_WRITE, osmo_tls_client_bfd_cb, sess, 0); sess->need_handshake = true; sess->wqueue = wq; return true; @@ -531,9 +528,7 @@ gnutls_transport_set_int(sess->session, wq->bfd.fd); gnutls_handshake_set_timeout(sess->session, GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT); - wq->bfd.cb = osmo_tls_client_bfd_cb; - wq->bfd.data = sess; - wq->bfd.when = BSC_FD_READ | BSC_FD_WRITE; + osmo_fd_setup(&wq->bfd, wq->bfd.fd, OSMO_FD_READ | OSMO_FD_WRITE, osmo_tls_client_bfd_cb, sess, 0); sess->need_handshake = true; sess->wqueue = wq; return true;
