Skip to content

Commit 2e7df6b

Browse files
dengertdengert
committed
test PR 3291 with X25519-improvements
 On branch X25519-improvements-2 Changes to be committed: modified: .github/setup-libressl.sh modified: .github/setup-linux.sh modified: .github/test-cac.sh modified: .github/workflows/linux.yml modified: packaging/opensc.spec
1 parent 25ad7ad commit 2e7df6b

File tree

5 files changed

+60
-28
lines changed

5 files changed

+60
-28
lines changed

‎.github/setup-libressl.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
set -ex -o xtrace
44

5-
V=libressl-3.8.1
5+
# WARNING: Change this also in .github/workflows/linux.yml
6+
V=libressl-4.0.0
67

78
sudo apt-get remove -y libssl-dev
89

‎.github/setup-linux.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ if [ "$1" == "libressl" -o "$2" == "libressl" ]; then
8383
fi
8484
elif [ "$1" == "debug" -o "$2" == "debug" ]; then
8585
# install debug symbols
86-
$SUDO apt-get install -y lsb-core ubuntu-dbgsym-keyring
86+
$SUDO apt-get install -y lsb-release ubuntu-dbgsym-keyring
8787
echo "deb http://ddebs.ubuntu.com $(lsb_release -cs) main restricted universe multiverse
88-
deb http://ddebs.ubuntu.com $(lsb_release -cs)-updates main restricted universe multiverse
89-
deb http://ddebs.ubuntu.com $(lsb_release -cs)-proposed main restricted universe multiverse" | \
88+
deb http://ddebs.ubuntu.com $(lsb_release -cs 2> /dev/null)-updates main restricted universe multiverse
89+
deb http://ddebs.ubuntu.com $(lsb_release -cs 2> /dev/null)-proposed main restricted universe multiverse" | \
9090
$SUDO tee -a /etc/apt/sources.list.d/ddebs.list
9191
$SUDO apt-get update -qq
9292
DEP="libssl1.1-dbgsym"
9393
if [ -f "/usr/lib/x86_64-linux-gnu/libssl.so.3" ]; then
94-
DEP="libssl3-dbgsym"
94+
DEP="libssl3t64-dbgsym"
9595
fi
96-
$SUDO apt-get install -y openssl-dbgsym "$DEP" softhsm2-dbgsym
96+
$SUDO apt-get install -y openssl-dbgsym "$DEP" softhsm2-dbgsym libsofthsm2-dbgsym
9797
fi
9898

9999
if [ "$1" == "mingw" -o "$1" == "mingw32" ]; then

‎.github/test-cac.sh

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ sudo make install
2323
popd
2424

2525
# prepare pcscd
26+
PCSCD_DEBUG="-d -a"
2627
. .github/restart-pcscd.sh
2728

2829
# virt_cacard

‎.github/workflows/linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
JAVA_DEPS: |
2929
ant openjdk-8-jdk maven cmake
3030
JCARDSIM: https://github.com/Jakuje/jcardsim.git
31-
LIBRESSL_VERSION: 3.8.1
31+
LIBRESSL_VERSION: 4.0.0
3232

3333
jobs:
3434
build:

‎packaging/opensc.spec

+51-21
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,21 @@ BuildRequires: openssl-devel
1515
BuildRequires: /usr/bin/xsltproc
1616
BuildRequires: docbook-style-xsl
1717
BuildRequires: autoconf automake libtool gcc
18+
%if 0%{?fedora} > 40 || 0%{?rhel} > 10
19+
BuildRequires: bash-completion-devel
20+
%else
1821
BuildRequires: bash-completion
22+
%endif
1923
BuildRequires: zlib-ng-devel
2024
# For tests
2125
BuildRequires: libcmocka-devel
2226
BuildRequires: vim-common
27+
%if ! 0%{?rhel}
2328
BuildRequires: softhsm
2429
BuildRequires: openssl
30+
BuildRequires: openpace-devel
31+
%endif
32+
Requires: %{name}-libs = %{version}-%{release}
2533
Requires: pcsc-lite-libs%{?_isa}
2634
Requires: pcsc-lite
2735
Obsoletes: mozilla-opensc-signer < 0.12.0
@@ -39,6 +47,13 @@ supporting this API (such as Mozilla Firefox and Thunderbird) can use it. On
3947
the card OpenSC implements the PKCS#15 standard and aims to be compatible with
4048
every software/card that does so, too.
4149

50+
%package libs
51+
Requires: pcsc-lite-libs%{?_isa}
52+
Summary: OpenSC libraries
53+
54+
%description libs
55+
OpenSC libraries.
56+
4257

4358
%prep
4459
%setup -q
@@ -57,7 +72,6 @@ sed -i -e "/XFAIL_TESTS/,$ {
5772
q
5873
}" tests/Makefile.am
5974

60-
6175
cp -p src/pkcs15init/README ./README.pkcs15init
6276
cp -p src/scconf/README.scconf .
6377
# No {_libdir} here to avoid multilib conflicts; it's just an example
@@ -116,9 +130,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libopensc.so
116130
rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
117131
rm -f $RPM_BUILD_ROOT%{_libdir}/libsmm-local.so
118132

119-
# the npa-tool builds to nothing since we do not have OpenPACE library
133+
%if 0%{?rhel}
120134
rm -rf %{buildroot}%{_bindir}/npa-tool
121135
rm -rf %{buildroot}%{_mandir}/man1/npa-tool.1*
136+
%endif
122137

123138
# the pkcs11-register is not applicable to Fedora/RHEL where we use p11-kit
124139
rm -rf %{buildroot}%{_bindir}/pkcs11-register
@@ -134,24 +149,16 @@ rm %{buildroot}%{_mandir}/man1/opensc-notify.1*
134149

135150
%{_datadir}/bash-completion/*
136151

137-
%ifarch %{ix86}
138-
%{_mandir}/man5/opensc-%{_arch}.conf.5*
139-
%else
140-
%config(noreplace) %{_sysconfdir}/opensc.conf
141-
%{_mandir}/man5/opensc.conf.5*
142-
%endif
143152

144-
%config(noreplace) %{_sysconfdir}/opensc-%{_arch}.conf
145-
# Co-owned with p11-kit so it is not hard dependency
146-
%dir %{_datadir}/p11-kit
147-
%dir %{_datadir}/p11-kit/modules
148-
%{_datadir}/p11-kit/modules/opensc.module
149153
%{_bindir}/cardos-tool
150154
%{_bindir}/cryptoflex-tool
151155
%{_bindir}/eidenv
152156
%{_bindir}/iasecc-tool
153157
%{_bindir}/gids-tool
154158
%{_bindir}/netkey-tool
159+
%if ! 0%{?rhel}
160+
%{_bindir}/npa-tool
161+
%endif
155162
%{_bindir}/openpgp-tool
156163
%{_bindir}/opensc-explorer
157164
%{_bindir}/opensc-tool
@@ -167,14 +174,6 @@ rm %{buildroot}%{_mandir}/man1/opensc-notify.1*
167174
%{_bindir}/egk-tool
168175
%{_bindir}/goid-tool
169176
%{_bindir}/dtrust-tool
170-
%{_libdir}/lib*.so.*
171-
%{_libdir}/opensc-pkcs11.so
172-
%{_libdir}/pkcs11-spy.so
173-
%{_libdir}/onepin-opensc-pkcs11.so
174-
%dir %{_libdir}/pkcs11
175-
%{_libdir}/pkcs11/opensc-pkcs11.so
176-
%{_libdir}/pkcs11/onepin-opensc-pkcs11.so
177-
%{_libdir}/pkcs11/pkcs11-spy.so
178177
%{_datadir}/opensc/
179178
%{_mandir}/man1/cardos-tool.1*
180179
%{_mandir}/man1/cryptoflex-tool.1*
@@ -183,6 +182,9 @@ rm %{buildroot}%{_mandir}/man1/opensc-notify.1*
183182
%{_mandir}/man1/goid-tool.1*
184183
%{_mandir}/man1/iasecc-tool.1*
185184
%{_mandir}/man1/netkey-tool.1*
185+
%if ! 0%{?rhel}
186+
%{_mandir}/man1/npa-tool.1*
187+
%endif
186188
%{_mandir}/man1/openpgp-tool.1*
187189
%{_mandir}/man1/opensc-explorer.*
188190
%{_mandir}/man1/opensc-tool.1*
@@ -198,3 +200,31 @@ rm %{buildroot}%{_mandir}/man1/opensc-notify.1*
198200
%{_mandir}/man1/egk-tool.1*
199201
%{_mandir}/man1/dtrust-tool.1*
200202
%{_mandir}/man5/pkcs15-profile.5*
203+
204+
%files libs
205+
%ifarch %{ix86}
206+
%{_mandir}/man5/opensc-%{_arch}.conf.5*
207+
%else
208+
%config(noreplace) %{_sysconfdir}/opensc.conf
209+
%{_mandir}/man5/opensc.conf.5*
210+
%endif
211+
212+
%config(noreplace) %{_sysconfdir}/opensc-%{_arch}.conf
213+
# Co-owned with p11-kit so it is not hard dependency
214+
%dir %{_datadir}/p11-kit
215+
%dir %{_datadir}/p11-kit/modules
216+
%{_datadir}/p11-kit/modules/opensc.module
217+
%{_libdir}/lib*.so.*
218+
%{_libdir}/opensc-pkcs11.so
219+
%{_libdir}/pkcs11-spy.so
220+
%{_libdir}/onepin-opensc-pkcs11.so
221+
%dir %{_libdir}/pkcs11
222+
%{_libdir}/pkcs11/opensc-pkcs11.so
223+
%{_libdir}/pkcs11/onepin-opensc-pkcs11.so
224+
%{_libdir}/pkcs11/pkcs11-spy.so
225+
226+
# For OpenPACE
227+
%if ! 0%{?rhel}
228+
%config(noreplace) %{_sysconfdir}/eac/cvc/DESCHSMCVCA00001
229+
%config(noreplace) %{_sysconfdir}/eac/cvc/DESRCACC100001
230+
%endif

0 commit comments

Comments
 (0)