Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LudovicRousseau/CCID
base: 1.6.0
Choose a base ref
...
head repository: LudovicRousseau/CCID
compare: master
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Jun 5, 2024

  1. GetSetNAD: fix Python warnings

    ./GetSetNAD.py:35: SyntaxWarning: "is" with a literal. Did you mean "=="?
      if status is 0:
    ./GetSetNAD.py:51: SyntaxWarning: "is" with a literal. Did you mean "=="?
      if status is 0:
    LudovicRousseau committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1b5f11e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Fix build issue on Ubuntu 22.04

    The error was:
    [30/32] Linking target parse
    FAILED: parse
    cc  -o parse parse.p/meson-generated_tokenparser.c.o parse.p/src_parse.c.o parse.p/src_debug.c.o parse.p/src_ccid_usb.c.o parse.p/src_sys_unix.c.o parse.p/src_simclist.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,--start-group /usr/lib/x86_64-linux-gnu/libusb-1.0.so /usr/lib/x86_64-linux-gnu/libz.so -Wl,--end-group
    /usr/bin/ld: parse.p/src_debug.c.o: in function `log_xxd':
    /home/user/workspace/CCID/builddir/../src/debug.c:221: undefined reference to `strlcpy'
    collect2: error: ld returned 1 exit status
    
    Thanks to Jahns Ralf for the bug report.
    LudovicRousseau committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    3a179d9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5667302 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. make building work again when flex is not installed

    This explicitly reverts commit eec7cdf
    because it was a bad idea.
    
    The motivating bug report was LudovicRousseau/PCSC#124
    and the issue there occurred when building from a git clone, running
    ./bootstrap && ./configure && make, and having:
    
    - configure succeed
    - make "succeeeds" at having $LEX run, do nothing and fail to generate
      required sources
    - compiling nonexistent files fail with highly confusing errors
    
    The autoconf manual has always documented the correct way to handle this
    is to check if lex is unavailable, and set it to the famous automake
    wrapper "missing", which checks if a program is missing at build time
    rather than at ./configure time, and fails the build if the rule cannot
    be run. This means:
    
    When building from a git clone, if flex is not available then
    - configure succeeds
    - make fails to run $LEX, and tells you to install flex
    
    The previous attempt to fix the highly confusing error instead resulted
    in configure erroring out, and saying flex is required, even when it is
    *not* required because a `make dist` tarball was used, which contains
    pregenerated tokenparser.c for the express purpose of making flex
    unnecessary.
    
    See autoconf documentation on $LEX:
    https://www.gnu.org/software/autoconf/manual/autoconf-2.72/html_node/Particular-Programs.html#index-AC_005fPROG_005fLEX-1
    
    And automake documentation on why to use "missing":
    https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html
    eli-schwartz authored and LudovicRousseau committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    583ca08 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. meson: parse depends on pthread

    Fix link issue on Ubuntu 20.04
    
    $ ninja
    [32/33] Linking target parse.
    FAILED: parse
    cc  -o parse 'parse@exe/meson-generated_tokenparser.c.o' 'parse@exe/src_parse.c.o' 'parse@exe/src_debug.c.o' 'parse@exe/src_ccid_usb.c.o' 'parse@exe/src_sys_unix.c.o' 'parse@exe/src_strlcpy.c.o' 'parse@exe/src_simclist.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,--start-group /usr/lib/x86_64-linux-gnu/libusb-1.0.so /usr/lib/x86_64-linux-gnu/libz.so -Wl,--end-group
    /usr/bin/ld: parse@exe/src_ccid_usb.c.o: undefined reference to symbol 'pthread_join@@GLIBC_2.2.5'
    /usr/bin/ld: /lib/x86_64-linux-gnu/libpthread.so.0: error adding symbols: DSO missing from command line
    collect2: error: ld returned 1 exit status
    [33/33] Generating Info.plist with a meson_exe.py custom command.
    ninja: build stopped: subcommand failed.
    
    Thanks to Peter Helcmanovsky for the bug report and patch.
    LudovicRousseau committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    7ae4a5c View commit details
    Browse the repository at this point in the history