Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libacars2 for openSUSE:Factory checked in at 2023-05-31 21:54:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libacars2 (Old) and /work/SRC/openSUSE:Factory/.libacars2.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libacars2" Wed May 31 21:54:53 2023 rev:8 rq:1089974 version:2.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libacars2/libacars2.changes 2021-03-07 15:19:52.284566383 +0100 +++ /work/SRC/openSUSE:Factory/.libacars2.new.1533/libacars2.changes 2023-05-31 21:54:58.173172819 +0200 @@ -1,0 +2,6 @@ +Mon May 29 20:52:57 UTC 2023 - Andreas Stieger <[email protected]> + +- update to 2.1.4: + * portability fixes + +------------------------------------------------------------------- Old: ---- libacars-2.1.3.tar.gz New: ---- libacars-2.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libacars2.spec ++++++ --- /var/tmp/diff_new_pack.PSD8AM/_old 2023-05-31 21:54:58.657175679 +0200 +++ /var/tmp/diff_new_pack.PSD8AM/_new 2023-05-31 21:54:58.657175679 +0200 @@ -1,7 +1,7 @@ # # spec file for package libacars2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2019-2021, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %define sover 2 %define libname libacars-2-%{sover} Name: libacars2 -Version: 2.1.3 +Version: 2.1.4 Release: 0 Summary: A library for decoding various ACARS message payloads License: MIT @@ -28,11 +28,11 @@ URL: https://github.com/szpajder/libacars #Git-Clone: https://github.com/szpajder/libacars.git Source: https://github.com/szpajder/libacars/archive/v%{version}.tar.gz#/libacars-%{version}.tar.gz -BuildRequires: cmake -BuildRequires: gcc-c++ +BuildRequires: c++_compiler +BuildRequires: cmake >= 3.1 BuildRequires: pkgconfig BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(zlib) >= 1.2 %description libacars is a library for decoding various ACARS message payloads. @@ -84,8 +84,10 @@ %cmake_install rm -rf %{buildroot}/%{_datadir}/doc -%post -n %{libname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%check +%ctest + +%ldconfig_scriptlets -n %{libname} %files -n %{libname} %doc CHANGELOG.md README.md @@ -93,12 +95,14 @@ %{_libdir}/libacars-2.so.%{sover}* %files devel -%doc doc/API_REFERENCE.md doc/API_REFERENCE.md +%license LICENSE.md +%doc doc/API_REFERENCE.md %{_includedir}/libacars-2 %{_libdir}/libacars-2.so %{_libdir}/pkgconfig/libacars-2.pc %files -n acars2-examples +%license LICENSE.md %{_bindir}/adsc_get_position %{_bindir}/cpdlc_get_position %{_bindir}/decode_acars_apps ++++++ libacars-2.1.3.tar.gz -> libacars-2.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/.github/workflows/build.yml new/libacars-2.1.4/.github/workflows/build.yml --- old/libacars-2.1.3/.github/workflows/build.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libacars-2.1.4/.github/workflows/build.yml 2022-03-06 21:37:58.000000000 +0100 @@ -0,0 +1,46 @@ +name: CMake + +on: + [ push, pull_request ] + +env: + BUILD_TYPE: Release + +jobs: + build: + strategy: + matrix: + os: [ ubuntu-latest, ubuntu-18.04, macos-11, macos-10.15 ] + runs-on: ${{ matrix.os }} + env: + DECODE_ACARS_APPS: ${{github.workspace}}/build/examples/decode_acars_apps + SAMPLE_ADSC: "d B6 /BOMASAI.ADS.VT-ANB072501A070A988CA73248F0E5DC10200000F5EE1ABC000102B885E0A19F5" + SAMPLE_CPDLC: "d BA /AKLCDYA.AT1.B-2727A0D5470C3D803BA464FAE2A15530DA2448312641AB425383320C74009CE009090A2CCA506AA61941DCA5005763" + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Install packaged dependencies + run: | + if [[ "$RUNNER_OS" == "Linux" ]]; then sudo apt-get update; fi + if [[ "$RUNNER_OS" == "Linux" ]]; then sudo apt-get install libxml2-dev; fi + if [[ "$RUNNER_OS" == "macOS" ]]; then brew update; fi + if [[ "$RUNNER_OS" == "macOS" ]]; then brew install libxml2; fi + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Install + run: sudo cmake --install ${{github.workspace}}/build + + - name: ADS-C test + run: | + ${DECODE_ACARS_APPS} ${SAMPLE_ADSC} + ${DECODE_ACARS_APPS} ${SAMPLE_ADSC} | grep -q "Temperature: -62.75 C" + - name: CPDLC test + run: | + ${DECODE_ACARS_APPS} ${SAMPLE_CPDLC} + ${DECODE_ACARS_APPS} ${SAMPLE_CPDLC} | grep -q "Flight level: 360" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/.travis.yml new/libacars-2.1.4/.travis.yml --- old/libacars-2.1.3/.travis.yml 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -language: c - -env: - global: - - MAKEFLAGS="-j2" - - DECODE_ACARS_APPS=./examples/decode_acars_apps - - SAMPLE_ADSC="d B6 /BOMASAI.ADS.VT-ANB072501A070A988CA73248F0E5DC10200000F5EE1ABC000102B885E0A19F5" - - SAMPLE_CPDLC="d BA /AKLCDYA.AT1.B-2727A0D5470C3D803BA464FAE2A15530DA2448312641AB425383320C74009CE009090A2CCA506AA61941DCA5005763" - - SAMPLE_MEDIA_ADV="d SA 0E2123245HV/TEXT" - -matrix: - include: - - os: linux - compiler: gcc - - os: osx - compiler: clang - -addons: - apt: - update: true - packages: - - libxml2-dev - homebrew: - packages: - - libxml2 - -script: - - mkdir build - - cd build - - cmake ../ - - make VERBOSE=1 - - sudo make install - - ${DECODE_ACARS_APPS} ${SAMPLE_ADSC} - - '${DECODE_ACARS_APPS} ${SAMPLE_ADSC} | grep -q "Temperature: -62.75 C"' - - ${DECODE_ACARS_APPS} ${SAMPLE_CPDLC} - - '${DECODE_ACARS_APPS} ${SAMPLE_CPDLC} | grep -q "Flight level: 360"' - - ${DECODE_ACARS_APPS} ${SAMPLE_MEDIA_ADV} - - '${DECODE_ACARS_APPS} ${SAMPLE_MEDIA_ADV} | grep -q "Link VDL2 established at 12:32:45 UTC"' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/CHANGELOG.md new/libacars-2.1.4/CHANGELOG.md --- old/libacars-2.1.3/CHANGELOG.md 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/CHANGELOG.md 2022-03-06 21:37:58.000000000 +0100 @@ -1,5 +1,12 @@ # ChangeLog +## Version 2.1.4 (2022-03-06) + +* Fix compile error under MS Visual C++ caused by `struct timeval` + being defined in `winsock.h` rather than `sys/time.h` (thx Jon Beniston) +* Fix compile error under GCC >= 10 (multiple definitions of `asn_debug_indent`) +* Fix for cmake >=3.17 not finding zlib1.dll when building with MinGW. + ## Version 2.1.3 (2021-03-05) * Fixed incorrect calculation of reporting interval in ADS-C Periodic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/CMakeLists.txt new/libacars-2.1.4/CMakeLists.txt --- old/libacars-2.1.3/CMakeLists.txt 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/CMakeLists.txt 2022-03-06 21:37:58.000000000 +0100 @@ -3,7 +3,7 @@ set (LA_VERSION_MAJOR 2) set (LA_VERSION_MINOR 1) -set (LA_VERSION_PATCH 3) +set (LA_VERSION_PATCH 4) set (LA_VERSION "${LA_VERSION_MAJOR}.${LA_VERSION_MINOR}.${LA_VERSION_PATCH}") set (LA_SUBDIR "${PROJECT_NAME}-${LA_VERSION_MAJOR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/README.md new/libacars-2.1.4/README.md --- old/libacars-2.1.3/README.md 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/README.md 2022-03-06 21:37:58.000000000 +0100 @@ -2,7 +2,7 @@ libacars is a library for decoding ACARS message contents. -Current stable version: **2.1.3** (released March 5, 2021) +Current stable version: **2.1.4** (released March 6, 2022) ## Supported message types @@ -55,7 +55,7 @@ apt-get install libxml2-dev ``` -#### Compiling libacars +#### Compiling libacars (Linux) - **Option 1:** To run stable and tested code, download the latest stable release tarball from [Releases](https://github.com/szpajder/libacars/releases) @@ -104,10 +104,21 @@ sudo ldconfig ``` -On Linux the library will be installed to `/usr/local/lib` (or +The library will be installed to `/usr/local/lib` (or `/usr/local/lib64`). Header files will land in `/usr/local/include/libacars-2/libacars`. +#### Compiling libacars (Mac) + +Install dependencies and tools with `brew`: + +``` +brew install cmake zlib libxml2 +``` + +Then follow the above instructions for Linux. Just skip the final `sudo +ldconfig` step. + ### Advanced compilation options The following options may be used when invoking cmake: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/libacars/CMakeLists.txt new/libacars-2.1.4/libacars/CMakeLists.txt --- old/libacars-2.1.3/libacars/CMakeLists.txt 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/libacars/CMakeLists.txt 2022-03-06 21:37:58.000000000 +0100 @@ -4,6 +4,10 @@ include(CheckSymbolExists) include(CheckPrototypeDefinition) +# Use ZLIB_ROOT when searching for zlib with find_package +# This is used when making Win32 binary releases. +cmake_policy(SET CMP0074 NEW) + # Check if LD supports linker scripts. file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/conftest.ldscript" "VERS_1 { global: sym; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/libacars/asn1/asn_internal.h new/libacars-2.1.4/libacars/asn1/asn_internal.h --- old/libacars-2.1.3/libacars/asn1/asn_internal.h 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/libacars/asn1/asn_internal.h 2022-03-06 21:37:58.000000000 +0100 @@ -44,7 +44,7 @@ #else /* !ASN_THREAD_SAFE */ #undef ASN_DEBUG_INDENT_ADD #undef asn_debug_indent -int asn_debug_indent; +extern int asn_debug_indent; #define ASN_DEBUG_INDENT_ADD(i) do { asn_debug_indent += i; } while(0) #endif /* ASN_THREAD_SAFE */ #define ASN_DEBUG(fmt, args...) do { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/libacars/asn1/constr_TYPE.c new/libacars-2.1.4/libacars/asn1/constr_TYPE.c --- old/libacars-2.1.3/libacars/asn1/constr_TYPE.c 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/libacars/asn1/constr_TYPE.c 2022-03-06 21:37:58.000000000 +0100 @@ -98,3 +98,11 @@ fprintf(stderr, "\n"); va_end(ap); } + +#if EMIT_ASN_DEBUG == 1 +#ifdef __GNUC__ +#ifndef ASN_THREAD_SAFE +int asn_debug_indent; +#endif +#endif +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/libacars/find_zlibdll.cmake new/libacars-2.1.4/libacars/find_zlibdll.cmake --- old/libacars-2.1.3/libacars/find_zlibdll.cmake 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/libacars/find_zlibdll.cmake 2022-03-06 21:37:58.000000000 +0100 @@ -1,9 +1,14 @@ -# FindZLIB.cmake often finds the path to the static library (libz.dll.a) +# FindZLIB.cmake finds the path to the import library (libz.dll.a) # This macro searches for the actual DLL in the same set of places # (assuming it's named zlib1.dll) macro(find_zlibdll) set(_ZLIBDLL_SEARCHES) + # Since cmake 3.17 when using MinGW tools, the find_library() command + # no longer finds .dll files by default. + set(CMAKE_FIND_LIBRARY_SUFFIXES_ORIG ${CMAKE_FIND_LIBRARY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .dll) + # Search ZLIBDLL_ROOT first if it is set. if(ZLIB_ROOT) set(_ZLIBDLL_SEARCH_ROOT PATHS ${ZLIB_ROOT} NO_DEFAULT_PATH) @@ -26,4 +31,5 @@ message(STATUS "zlib1.dll path: ${ZLIBDLL_LIBRARY_RELEASE}") unset(ZLIBDLL_NAMES) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libacars-2.1.3/libacars/reassembly.h new/libacars-2.1.4/libacars/reassembly.h --- old/libacars-2.1.3/libacars/reassembly.h 2021-03-05 21:36:34.000000000 +0100 +++ new/libacars-2.1.4/libacars/reassembly.h 2022-03-06 21:37:58.000000000 +0100 @@ -10,7 +10,11 @@ extern "C" { #endif #include <stdbool.h> +#ifndef _MSC_VER #include <sys/time.h> +#else +#include <winsock.h> +#endif #include <libacars/hash.h> typedef struct la_reasm_ctx_s la_reasm_ctx;
