From c5df3bd1430b8b3f66036374ba144763e5903821 Mon Sep 17 00:00:00 2001 From: bart Date: Tue, 25 Oct 2022 16:56:06 +0200 Subject: Initial commit --- .SRCINFO | 12 ++++++++++++ .gitignore | 4 ++++ PKGBUILD | 12 ++++++++++++ pkcs11_install | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 .SRCINFO create mode 100644 .gitignore create mode 100644 PKGBUILD create mode 100644 pkcs11_install diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..6b68e03 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,12 @@ +pkgbase = mkinitcpio-pkcs11 + pkgdesc = Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket + pkgver = 0.1 + pkgrel = 1 + arch = any + depends = ccid + depends = opensc + depends = pcsclite + source = pkcs11_install + sha256sums = 12ab776de8c225ca7fff411ab1a5a5998936d624aa95777a191f8b38de104d43 + +pkgname = mkinitcpio-pkcs11 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7446231 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pkg.tar.xz +lighthouse/ +pkg/ +src/ diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..bb7f55e --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,12 @@ +pkgname=mkinitcpio-pkcs11 +pkgver=0.1 +pkgrel=1 +pkgdesc='Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket' +depends=('ccid' 'opensc' 'pcsclite') +arch=('any') +source=('pkcs11_install') +sha256sums=('12ab776de8c225ca7fff411ab1a5a5998936d624aa95777a191f8b38de104d43') + +package() { + install -D -m644 "pkcs11_install" "$pkgdir/usr/bin/initcpio/pkcs11" +} diff --git a/pkcs11_install b/pkcs11_install new file mode 100644 index 0000000..d69385a --- /dev/null +++ b/pkcs11_install @@ -0,0 +1,46 @@ +#!/bin/bash + +build() { + + # CCID + add_file /etc/libccid_Info.plist + add_file /etc/reader.conf.d/libccidtwin + add_file /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist + add_binary /usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so + add_binary /usr/lib/pcsc/drivers/serial/libccidtwin.so + + # OPENSC + add_file /etc/opensc.conf + add_binary /usr/lib/libopensc.so.8 + add_binary /usr/lib/libopensc.so.8.0.0 + add_binary /usr/lib/opensc-pkcs11.so + add_binary /usr/lib/pkcs11/opensc-pkcs11.so + + # PCSCLITE + add_binary /usr/lib/libpcsclite.so + add_binary /usr/lib/libpcsclite.so.1 + add_binary /usr/lib/libpcsclite.so.1.0.0 + + + # PCSCD at boot before cryptsetup + add_systemd_unit pcscd.service + add_systemd_unit pcscd.socket + add_symlink /usr/lib/systemd/system/cryptsetup.target.wants/pcscd.socket ../pcscd.socket + + # MISC + add_binary /usr/bin/p11tool + # cat /etc/pkcs11/modules/opensc.module + # module: opensc-pkcs11.so + add_file /etc/pkcs11/modules/opensc.module + +} + +help() { + cat < Date: Tue, 3 Jan 2023 17:03:02 +0100 Subject: version 0.2: remove lib versions --- .SRCINFO | 4 ++-- .gitignore | 2 +- PKGBUILD | 4 ++-- pkcs11_install | 5 ----- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6b68e03..2cbbbd2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,12 @@ pkgbase = mkinitcpio-pkcs11 pkgdesc = Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket - pkgver = 0.1 + pkgver = 0.2 pkgrel = 1 arch = any depends = ccid depends = opensc depends = pcsclite source = pkcs11_install - sha256sums = 12ab776de8c225ca7fff411ab1a5a5998936d624aa95777a191f8b38de104d43 + sha256sums = accd33d28e83f3db1344f25de85338eba0bbfda260761fa1c3733b6b70d48be9 pkgname = mkinitcpio-pkcs11 diff --git a/.gitignore b/.gitignore index 7446231..37d234f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.pkg.tar.xz -lighthouse/ +*.pkg.tar.zst pkg/ src/ diff --git a/PKGBUILD b/PKGBUILD index bb7f55e..33c8d8b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,11 +1,11 @@ pkgname=mkinitcpio-pkcs11 -pkgver=0.1 +pkgver=0.2 pkgrel=1 pkgdesc='Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket' depends=('ccid' 'opensc' 'pcsclite') arch=('any') source=('pkcs11_install') -sha256sums=('12ab776de8c225ca7fff411ab1a5a5998936d624aa95777a191f8b38de104d43') +sha256sums=('accd33d28e83f3db1344f25de85338eba0bbfda260761fa1c3733b6b70d48be9') package() { install -D -m644 "pkcs11_install" "$pkgdir/usr/bin/initcpio/pkcs11" diff --git a/pkcs11_install b/pkcs11_install index d69385a..22b3416 100644 --- a/pkcs11_install +++ b/pkcs11_install @@ -11,16 +11,11 @@ build() { # OPENSC add_file /etc/opensc.conf - add_binary /usr/lib/libopensc.so.8 - add_binary /usr/lib/libopensc.so.8.0.0 add_binary /usr/lib/opensc-pkcs11.so add_binary /usr/lib/pkcs11/opensc-pkcs11.so # PCSCLITE add_binary /usr/lib/libpcsclite.so - add_binary /usr/lib/libpcsclite.so.1 - add_binary /usr/lib/libpcsclite.so.1.0.0 - # PCSCD at boot before cryptsetup add_systemd_unit pcscd.service -- cgit v1.2.3-70-g09d2 From 84be5ba124dae2db0f64a3d5570fb6daba73eed2 Mon Sep 17 00:00:00 2001 From: bargst Date: Fri, 13 Jan 2023 09:30:46 +0100 Subject: Add missing opensc.module and fix checksums --- .SRCINFO | 8 ++++++-- PKGBUILD | 14 +++++++++----- opensc.module | 1 + pkcs11_install | 2 -- 4 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 opensc.module diff --git a/.SRCINFO b/.SRCINFO index 2cbbbd2..1810e67 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,16 @@ pkgbase = mkinitcpio-pkcs11 pkgdesc = Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket - pkgver = 0.2 + pkgver = 0.3 pkgrel = 1 arch = any depends = ccid depends = opensc depends = pcsclite + depends = p11-kit + depends = gnutls source = pkcs11_install - sha256sums = accd33d28e83f3db1344f25de85338eba0bbfda260761fa1c3733b6b70d48be9 + source = opensc.module + sha256sums = 0c62dd5eb978268ed13be851b9ac46dee9aaa52c655061da5ece4c69ab4ff8f7 + sha256sums = fea71e2e2c1853bba034106d4eb40646a787ed900fef883e09d38dcb29675db4 pkgname = mkinitcpio-pkcs11 diff --git a/PKGBUILD b/PKGBUILD index 33c8d8b..d75729a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,12 +1,16 @@ pkgname=mkinitcpio-pkcs11 -pkgver=0.2 +pkgver=0.3 pkgrel=1 pkgdesc='Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket' -depends=('ccid' 'opensc' 'pcsclite') +depends=('ccid' 'opensc' 'pcsclite' 'p11-kit' 'gnutls') arch=('any') -source=('pkcs11_install') -sha256sums=('accd33d28e83f3db1344f25de85338eba0bbfda260761fa1c3733b6b70d48be9') +source=('pkcs11_install' 'opensc.module') +sha256sums=( + '0c62dd5eb978268ed13be851b9ac46dee9aaa52c655061da5ece4c69ab4ff8f7' + 'fea71e2e2c1853bba034106d4eb40646a787ed900fef883e09d38dcb29675db4' +) package() { - install -D -m644 "pkcs11_install" "$pkgdir/usr/bin/initcpio/pkcs11" + install -D -m644 "pkcs11_install" "$pkgdir/usr/lib/initcpio/install/pkcs11" + install -D -m644 "opensc.module" "$pkgdir/etc/pkcs11/modules/opensc.module" } diff --git a/opensc.module b/opensc.module new file mode 100644 index 0000000..fd1c1d9 --- /dev/null +++ b/opensc.module @@ -0,0 +1 @@ +module: opensc-pkcs11.so diff --git a/pkcs11_install b/pkcs11_install index 22b3416..0643423 100644 --- a/pkcs11_install +++ b/pkcs11_install @@ -24,8 +24,6 @@ build() { # MISC add_binary /usr/bin/p11tool - # cat /etc/pkcs11/modules/opensc.module - # module: opensc-pkcs11.so add_file /etc/pkcs11/modules/opensc.module } -- cgit v1.2.3-70-g09d2