Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package multimon-ng for openSUSE:Factory
checked in at 2024-07-15 19:49:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/multimon-ng (Old)
and /work/SRC/openSUSE:Factory/.multimon-ng.new.17339 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multimon-ng"
Mon Jul 15 19:49:54 2024 rev:11 rq:1187525 version:1.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/multimon-ng/multimon-ng.changes 2024-01-29
22:34:42.705815014 +0100
+++ /work/SRC/openSUSE:Factory/.multimon-ng.new.17339/multimon-ng.changes
2024-07-15 19:50:33.858526180 +0200
@@ -1,0 +2,7 @@
+Sat Jun 29 13:10:38 UTC 2024 - Martin Hauke <mar...@gmx.de>
+
+- Update to version 1.3.1
+ * Fixed subsampling issues when piping chunked data.
+ * Fixed format string in FLEX decoder.
+
+-------------------------------------------------------------------
Old:
----
multimon-ng-1.3.0.tar.gz
New:
----
multimon-ng-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multimon-ng.spec ++++++
--- /var/tmp/diff_new_pack.JETEgH/_old 2024-07-15 19:50:34.294542247 +0200
+++ /var/tmp/diff_new_pack.JETEgH/_new 2024-07-15 19:50:34.294542247 +0200
@@ -2,7 +2,7 @@
# spec file for package multimon-ng
#
# Copyright (c) 2024 SUSE LLC
-# Copyright (c) 2017-2022, Martin Hauke <mar...@gmx.de>
+# Copyright (c) 2017-2024, 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
@@ -18,7 +18,7 @@
Name: multimon-ng
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Summary: A fork of multimon that decodes multiple digital transmission
modes
License: GPL-2.0-only
++++++ multimon-ng-1.3.0.tar.gz -> multimon-ng-1.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/CMakeLists.txt
new/multimon-ng-1.3.1/CMakeLists.txt
--- old/multimon-ng-1.3.0/CMakeLists.txt 2023-10-11 15:48:41.000000000
+0200
+++ new/multimon-ng-1.3.1/CMakeLists.txt 2024-06-28 22:03:52.000000000
+0200
@@ -11,10 +11,10 @@
endif( NOT WIN32 )
set( TARGET "${PROJECT_NAME}" )
-set( VERSION "1.3.0" )
+set( VERSION "1.3.1" )
set( MAJOR "1" )
set( MINOR "3" )
-set( PATCH "0" )
+set( PATCH "1" )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra" )
if( WIN32 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_afsk12.c
new/multimon-ng-1.3.1/demod_afsk12.c
--- old/multimon-ng-1.3.0/demod_afsk12.c 2023-10-11 15:48:41.000000000
+0200
+++ new/multimon-ng-1.3.1/demod_afsk12.c 2024-06-28 22:03:52.000000000
+0200
@@ -1,8 +1,10 @@
/*
* demod_afsk12.c -- 1200 baud AFSK demodulator
*
- * Copyright (C) 1996
+ * Copyright (C) 1996
* Thomas Sailer (sai...@ife.ee.ethz.ch, hb9...@hb9w.che.eu)
+ * Copyright (C) 2024
+ * Marat Fayzullin (luarvi...@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -79,16 +81,15 @@
unsigned char curbit;
if (s->l1.afsk12.subsamp) {
- int numfill = SUBSAMP - s->l1.afsk12.subsamp;
- if (length < numfill) {
- s->l1.afsk12.subsamp += length;
+ if (length <= (int)s->l1.afsk12.subsamp) {
+ s->l1.afsk12.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.afsk12.subsamp;
+ length -= s->l1.afsk12.subsamp;
s->l1.afsk12.subsamp = 0;
}
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP)
{
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
f = fsqr(mac(buffer.fbuffer, corr_mark_i, CORRLEN)) +
fsqr(mac(buffer.fbuffer, corr_mark_q, CORRLEN)) -
fsqr(mac(buffer.fbuffer, corr_space_i, CORRLEN)) -
@@ -116,7 +117,7 @@
hdlc_rxbit(s, curbit);
}
}
- s->l1.afsk12.subsamp = length;
+ s->l1.afsk12.subsamp = -length;
}
/* ---------------------------------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_clipfsk.c
new/multimon-ng-1.3.1/demod_clipfsk.c
--- old/multimon-ng-1.3.0/demod_clipfsk.c 2023-10-11 15:48:41.000000000
+0200
+++ new/multimon-ng-1.3.1/demod_clipfsk.c 2024-06-28 22:03:52.000000000
+0200
@@ -1,7 +1,7 @@
/*
* demod_clipfsk.c -- 1200 baud FSK demodulator
*
- * Copyright (C) 2007
+ * Copyright (C) 2007, 2024
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -78,16 +78,15 @@
unsigned char curbit;
if (s->l1.clipfsk.subsamp) {
- int numfill = SUBSAMP - s->l1.clipfsk.subsamp;
- if (length < numfill) {
- s->l1.clipfsk.subsamp += length;
+ if (length <= (int)s->l1.clipfsk.subsamp) {
+ s->l1.clipfsk.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.clipfsk.subsamp;
+ length -= s->l1.clipfsk.subsamp;
s->l1.clipfsk.subsamp = 0;
}
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP)
{
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
f = fsqr(mac(buffer.fbuffer, corr_mark_i, CORRLEN)) +
fsqr(mac(buffer.fbuffer, corr_mark_q, CORRLEN)) -
fsqr(mac(buffer.fbuffer, corr_space_i, CORRLEN)) -
@@ -112,7 +111,7 @@
clip_rxbit(s, curbit);
}
}
- s->l1.clipfsk.subsamp = length;
+ s->l1.clipfsk.subsamp = -length;
}
/* ---------------------------------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_eas.c
new/multimon-ng-1.3.1/demod_eas.c
--- old/multimon-ng-1.3.0/demod_eas.c 2023-10-11 15:48:41.000000000 +0200
+++ new/multimon-ng-1.3.1/demod_eas.c 2024-06-28 22:03:52.000000000 +0200
@@ -5,6 +5,8 @@
*
* Copyright (C) 2000
* A. Maitland Bottoms <bott...@debian.org>
+* Copyright (C) 2024
+* Marat Fayzullin <luarvi...@gmail.com>
*
* Licensed under same terms and based upon the
* demod_afsk12.c -- 1200 baud AFSK demodulator
@@ -253,20 +255,19 @@
float f;
unsigned char curbit;
float dll_gain;
-
+
if (s->l1.eas.subsamp) {
- int numfill = SUBSAMP - s->l1.eas.subsamp;
- if (length < numfill) {
- s->l1.eas.subsamp += length;
+ if (length <= (int)s->l1.eas.subsamp) {
+ s->l1.eas.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.eas.subsamp;
+ length -= s->l1.eas.subsamp;
s->l1.eas.subsamp = 0;
}
// We use a sliding window correlator which advances by SUBSAMP
// each time. One correlator sample is output for each SUBSAMP symbols
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
f = fsqr(mac(buffer.fbuffer, eascorr_mark_i, CORRLEN)) +
fsqr(mac(buffer.fbuffer, eascorr_mark_q, CORRLEN)) -
fsqr(mac(buffer.fbuffer, eascorr_space_i, CORRLEN)) -
@@ -286,14 +287,13 @@
{
s->l1.eas.dcd_integrator -= 1;
}
-
+
verbprintf(9, "%c", '0'+(s->l1.afsk12.dcd_shreg & 1));
-
-
+
/*
* check if transition occurred on time
*/
-
+
if (s->l2.eas.state != EAS_L2_IDLE)
dll_gain = DLL_GAIN_SYNC;
else
@@ -313,7 +313,6 @@
else
{
// after center; check for increment
-
if (s->l1.eas.sphase < (0x10000u - SPHASEINC/2))
{
s->l1.eas.sphase += MIN((int)((0x10000u -
s->l1.eas.sphase)*
@@ -325,20 +324,20 @@
}
s->l1.eas.sphase += SPHASEINC;
-
+
if (s->l1.eas.sphase >= 0x10000u) {
// end of bit period.
s->l1.eas.sphase = 1; //was &= 0xffffu;
s->l1.eas.lasts >>= 1;
-
+
// if at least half of the values in the integrator are 1,
// declare a 1 received
s->l1.afsk12.lasts |= ((s->l1.eas.dcd_integrator >= 0) << 7) &
0x80u;
-
+
curbit = (s->l1.eas.lasts >> 7) & 0x1u;
verbprintf(9, " ");
verbprintf(7, "%c", '0'+curbit);
-
+
// check for sync sequence
// do not resync when we're reading a message!
if (s->l1.eas.lasts == PREAMBLE
@@ -369,12 +368,11 @@
s->l1.eas.byte_counter = 0;
}
}
-
-
+
verbprintf(9, "\n");
}
}
- s->l1.eas.subsamp = length;
+ s->l1.eas.subsamp = -length;
}
/* ---------------------------------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_flex_next.c
new/multimon-ng-1.3.1/demod_flex_next.c
--- old/multimon-ng-1.3.0/demod_flex_next.c 2023-10-11 15:48:41.000000000
+0200
+++ new/multimon-ng-1.3.1/demod_flex_next.c 2024-06-28 22:03:52.000000000
+0200
@@ -631,7 +631,7 @@
flex->GroupHandler.GroupFrame[flex_groupbit] = -1;
flex->GroupHandler.GroupCycle[flex_groupbit] = -1;
}
- verbprintf(0, message);
+ verbprintf(0, "%s", message);
}
static void parse_numeric(struct Flex_Next * flex, unsigned int * phaseptr,
int j) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_fmsfsk.c
new/multimon-ng-1.3.1/demod_fmsfsk.c
--- old/multimon-ng-1.3.0/demod_fmsfsk.c 2023-10-11 15:48:41.000000000
+0200
+++ new/multimon-ng-1.3.1/demod_fmsfsk.c 2024-06-28 22:03:52.000000000
+0200
@@ -1,7 +1,7 @@
/*
* demod_fmsfsk.c -- 1200 baud FMS FSK demodulator
*
- * Copyright (C) 2014
+ * Copyright (C) 2014, 2024
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -78,16 +78,15 @@
unsigned char curbit;
if (s->l1.fmsfsk.subsamp) {
- int numfill = SUBSAMP - s->l1.fmsfsk.subsamp;
- if (length < numfill) {
- s->l1.fmsfsk.subsamp += length;
+ if (length <= (int)s->l1.fmsfsk.subsamp) {
+ s->l1.fmsfsk.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.fmsfsk.subsamp;
+ length -= s->l1.fmsfsk.subsamp;
s->l1.fmsfsk.subsamp = 0;
}
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
f = fsqr(mac(buffer.fbuffer, corr_1_i, CORRLEN)) +
fsqr(mac(buffer.fbuffer, corr_1_q, CORRLEN)) -
fsqr(mac(buffer.fbuffer, corr_0_i, CORRLEN)) -
@@ -112,7 +111,7 @@
fms_rxbit(s, curbit);
}
}
- s->l1.fmsfsk.subsamp = length;
+ s->l1.fmsfsk.subsamp = -length;
}
/* ---------------------------------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_poc12.c
new/multimon-ng-1.3.1/demod_poc12.c
--- old/multimon-ng-1.3.0/demod_poc12.c 2023-10-11 15:48:41.000000000 +0200
+++ new/multimon-ng-1.3.1/demod_poc12.c 2024-06-28 22:03:52.000000000 +0200
@@ -1,8 +1,10 @@
/*
* demod_poc12.c -- 1200 baud POCSAG demodulator
*
- * Copyright (C) 1996
+ * Copyright (C) 1996
* Thomas Sailer (sai...@ife.ee.ethz.ch, hb9...@hb9w.che.eu)
+ * Copyright (C) 2024
+ * Marat Fayzullin (luarvi...@gmail.com)
*
* POCSAG (Post Office Code Standard Advisory Group)
* Radio Paging Decoder
@@ -54,16 +56,15 @@
static void poc12_demod(struct demod_state *s, buffer_t buffer, int length)
{
if (s->l1.poc12.subsamp) {
- int numfill = SUBSAMP - s->l1.poc12.subsamp;
- if (length < numfill) {
- s->l1.poc12.subsamp += length;
+ if (length <= (int)s->l1.poc12.subsamp) {
+ s->l1.poc12.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.poc12.subsamp;
+ length -= s->l1.poc12.subsamp;
s->l1.poc12.subsamp = 0;
}
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP)
{
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
s->l1.poc12.dcd_shreg <<= 1;
s->l1.poc12.dcd_shreg |= ((*buffer.fbuffer) > 0);
verbprintf(10, "%c", '0'+(s->l1.poc12.dcd_shreg & 1));
@@ -82,7 +83,7 @@
pocsag_rxbit(s, s->l1.poc12.dcd_shreg & 1);
}
}
- s->l1.poc12.subsamp = length;
+ s->l1.poc12.subsamp = -length;
}
static void poc12_deinit(struct demod_state *s)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_poc5.c
new/multimon-ng-1.3.1/demod_poc5.c
--- old/multimon-ng-1.3.0/demod_poc5.c 2023-10-11 15:48:41.000000000 +0200
+++ new/multimon-ng-1.3.1/demod_poc5.c 2024-06-28 22:03:52.000000000 +0200
@@ -1,8 +1,10 @@
/*
* demod_poc5.c -- 512 baud POCSAG demodulator
*
- * Copyright (C) 1996
+ * Copyright (C) 1996
* Thomas Sailer (sai...@ife.ee.ethz.ch, hb9...@hb9w.che.eu)
+ * Copyright (C) 2024
+ * Marat Fayzullin (luarvi...@gmail.com)
*
* POCSAG (Post Office Code Standard Advisory Group)
* Radio Paging Decoder
@@ -52,16 +54,15 @@
static void poc5_demod(struct demod_state *s, buffer_t buffer, int length)
{
if (s->l1.poc5.subsamp) {
- int numfill = SUBSAMP - s->l1.poc5.subsamp;
- if (length < numfill) {
- s->l1.poc5.subsamp += length;
+ if (length <= (int)s->l1.poc5.subsamp) {
+ s->l1.poc5.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.poc5.subsamp;
+ length -= s->l1.poc5.subsamp;
s->l1.poc5.subsamp = 0;
}
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP)
{
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
s->l1.poc5.dcd_shreg <<= 1;
s->l1.poc5.dcd_shreg |= ((*buffer.fbuffer) > 0);
verbprintf(10, "%c", '0'+(s->l1.poc5.dcd_shreg & 1));
@@ -80,7 +81,7 @@
pocsag_rxbit(s, s->l1.poc5.dcd_shreg & 1);
}
}
- s->l1.poc5.subsamp = length;
+ s->l1.poc5.subsamp = -length;
}
static void poc5_deinit(struct demod_state *s)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/demod_ufsk12.c
new/multimon-ng-1.3.1/demod_ufsk12.c
--- old/multimon-ng-1.3.0/demod_ufsk12.c 2023-10-11 15:48:41.000000000
+0200
+++ new/multimon-ng-1.3.1/demod_ufsk12.c 2024-06-28 22:03:52.000000000
+0200
@@ -1,7 +1,7 @@
/*
* demod_ufsk12.c -- 1200 baud FSK demodulator
*
- * Copyright (C) 2007
+ * Copyright (C) 2007, 2024
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -78,16 +78,15 @@
unsigned char curbit;
if (s->l1.ufsk12.subsamp) {
- int numfill = SUBSAMP - s->l1.ufsk12.subsamp;
- if (length < numfill) {
- s->l1.ufsk12.subsamp += length;
+ if (length <= (int)s->l1.ufsk12.subsamp) {
+ s->l1.ufsk12.subsamp -= length;
return;
}
- buffer.fbuffer += numfill;
- length -= numfill;
+ buffer.fbuffer += s->l1.ufsk12.subsamp;
+ length -= s->l1.ufsk12.subsamp;
s->l1.ufsk12.subsamp = 0;
}
- for (; length >= SUBSAMP; length -= SUBSAMP, buffer.fbuffer += SUBSAMP)
{
+ for (; length > 0; length -= SUBSAMP, buffer.fbuffer += SUBSAMP) {
f = fsqr(mac(buffer.fbuffer, corr_mark_i, CORRLEN)) +
fsqr(mac(buffer.fbuffer, corr_mark_q, CORRLEN)) -
fsqr(mac(buffer.fbuffer, corr_space_i, CORRLEN)) -
@@ -112,7 +111,7 @@
uart_rxbit(s, curbit);
}
}
- s->l1.ufsk12.subsamp = length;
+ s->l1.ufsk12.subsamp = -length;
}
/* ---------------------------------------------------------------------- */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0/unixinput.c
new/multimon-ng-1.3.1/unixinput.c
--- old/multimon-ng-1.3.0/unixinput.c 2023-10-11 15:48:41.000000000 +0200
+++ new/multimon-ng-1.3.1/unixinput.c 2024-06-28 22:03:52.000000000 +0200
@@ -4,7 +4,7 @@
* Copyright (C) 1996
* Thomas Sailer (sai...@ife.ee.ethz.ch, hb9...@hb9w.che.eu)
*
- * Copyright (C) 2012-2023
+ * Copyright (C) 2012-2024
* Elias Oenal (multimon...@eliasoenal.com)
*
* This program is free software; you can redistribute it and/or modify
@@ -802,9 +802,9 @@
if ( !quietflg )
{ // pay heed to the quietflg
- fprintf(stderr, "multimon-ng 1.3.0\n"
+ fprintf(stderr, "multimon-ng 1.3.1\n"
" (C) 1996/1997 by Tom Sailer HB9JNX/AE4WA\n"
- " (C) 2012-2023 by Elias Oenal\n"
+ " (C) 2012-2024 by Elias Oenal\n"
"Available demodulators:");
for (i = 0; (unsigned int) i < NUMDEMOD; i++) {
fprintf(stderr, " %s", dem[i]->name);
