Skip to content

Commit 0622538

Browse files
committed
Merge branch 'master' into joerger/sync-teleport
2 parents eb815b5 + 6667870 commit 0622538

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3389
-1575
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: LudovicRousseau
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1.
16+
2.
17+
3.
18+
4.
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Versions:**
24+
- smart card reader driver name and version
25+
- pcsc-lite version
26+
- the output of the command `/usr/sbin/pcscd --version`
27+
28+
**Platform:**
29+
- Operating system or GNU/Linux distribution name and version
30+
- Smart card middleware name and version
31+
- Smart card reader manufacturer name and reader model name
32+
- Smart card name
33+
34+
**Log:**
35+
Then you shall generate a complete log (do not truncate it).
36+
37+
- If you need to enter the smart card PIN to reproduce the problem then
38+
consider changing your PIN before generating the logs as the PIN value
39+
will be included in the logs.
40+
- Kill any running pcscd process
41+
- (re)start pcscd exactly as described bellow:
42+
```
43+
sudo LIBCCID_ifdLogLevel=0x000F pcscd --foreground --debug --apdu --color | tee log.txt
44+
```
45+
- Stop pcscd (using Control-C) after the problem occurred and send me the
46+
generated `log.txt` file
47+
48+
See also https://pcsclite.apdu.fr/#support
49+
50+
**Additional context**
51+
Add any other context about the problem here.

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
# Checks-out your repository under $GITHUB_WORKSPACE, so your job
2828
# can access it
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030

3131
- name: setup prerequisites
3232
shell: bash
@@ -46,11 +46,11 @@ jobs:
4646
shell: bash
4747
run: |
4848
./bootstrap
49-
export CFLAGS="-Wall -Wextra -Wformat -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wswitch-enum -Wundef -Wuninitialized -Wunused -Wwrite-strings -Wmissing-noreturn -flto=auto -O2 -Wp,-D_FORTIFY_SOURCE=2"
50-
./configure ${{ matrix.configure_args }}
49+
export CFLAGS="-Wall -Wextra -Wformat -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wswitch-enum -Wundef -Wuninitialized -Wunused -Wwrite-strings -Wmissing-noreturn -flto=auto -O2"
50+
./configure --disable-polkit ${{ matrix.configure_args }}
5151
make V=1
5252
5353
- name: distcheck
5454
shell: bash
5555
run: |
56-
make distcheck
56+
AM_DISTCHECK_CONFIGURE_FLAGS=--disable-polkit make distcheck

.github/workflows/build_meson.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: build_meson
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on: [push, pull_request]
6+
7+
# A workflow run is made up of one or more jobs that can run
8+
# sequentially or in parallel
9+
jobs:
10+
# This workflow contains a single job called "build"
11+
build:
12+
runs-on: ubuntu-latest
13+
14+
# Steps represent a sequence of tasks that will be executed as part of the job
15+
steps:
16+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job
17+
# can access it
18+
- uses: actions/checkout@v4
19+
20+
- name: setup prerequisites
21+
shell: bash
22+
run: |
23+
sudo apt update
24+
sudo apt install \
25+
autoconf-archive \
26+
debhelper-compat \
27+
doxygen \
28+
dpkg-dev \
29+
flex \
30+
libpolkit-gobject-1-dev \
31+
libsystemd-dev \
32+
libudev-dev \
33+
libusb-1.0-0-dev \
34+
meson \
35+
pkg-config
36+
37+
- name: compile
38+
shell: bash
39+
run: |
40+
export CFLAGS="-Wall -Wextra -Wformat -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wswitch-enum -Wundef -Wuninitialized -Wunused -Wwrite-strings -Wmissing-noreturn -flto=auto -O2"
41+
meson setup builddir --werror
42+
cd builddir
43+
44+
DESTDIR=/tmp/pcsc meson install
45+
find /tmp/pcsc
46+
47+
meson dist
48+
49+
# doxygen
50+
meson compile doc
51+
52+
meson setup --reconfigure -Dlibsystemd=false -Dlibudev=false -Dpolkit=false
53+
meson compile
54+
55+
meson setup --reconfigure -Dserial=true
56+
meson compile
57+
58+
meson setup --reconfigure -Dembedded=true
59+
meson compile

0 commit comments

Comments
 (0)