From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libu2f-host is archived
Date: Fri, 16 Oct 2020 03:20:44 +0200 [thread overview]
Message-ID: <20201016012044.LvcBJyXgDt7ycXHA-xZHO2oaeu2zQnUaXT9dfYAMLSs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25646@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages libu2f-host-is-archived
https://github.com/void-linux/void-packages/pull/25646
libu2f-host is archived
- libu2f-host is archived, and udev rules from libfido2 is more updated
- pam-u2f switched to libfido2 (tested by me on x86_64-musl)
A patch file from https://github.com/void-linux/void-packages/pull/25646.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libu2f-host-is-archived-25646.patch --]
[-- Type: text/x-diff, Size: 6759 bytes --]
From 0a1815cf43c09c997dbc336086aea8b036b98f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 16 Oct 2020 06:34:30 +0700
Subject: [PATCH 1/4] libfido2: ship udev rules
- libu2f-host is archived by Yubico
- udev rules from libfido2 is more updated
---
srcpkgs/libfido2/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 14ab9ade381..2190a973b09 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,8 +1,9 @@
# Template file for 'libfido2'
pkgname=libfido2
version=1.5.0
-revision=2
+revision=3
build_style=cmake
+configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
hostmakedepends="pkg-config"
makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
short_desc="Library for FIDO 2.0, including communication with a device over USB"
@@ -11,6 +12,9 @@ license="BSD-2-Clause"
homepage="https://github.com/Yubico/libfido2"
distfiles="https://github.com/Yubico/libfido2/archive/${version}.tar.gz"
checksum=5990f923c9390fe1e6a00ba5d1d1f74030e7344b855e971d9fb7223e70ff3122
+# udev rules used to be shipped by libu2f-host
+conf_files="/usr/lib/udev/rules.d/70-u2f.rules"
+conflicts="libu2f-host<=1.1.10_3"
CFLAGS="-Wno-type-limits"
if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -25,6 +29,8 @@ pre_configure() {
post_install() {
vlicense LICENSE
+ vsed -e 's/GROUP="plugdev"/GROUP="users"/' \
+ -i ${DESTDIR}/usr/lib/udev/rules.d/70-u2f.rules
}
libfido2-devel_package() {
From c031bdd5663e21e78a988fd8642fd4b22770a376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 16 Oct 2020 06:35:19 +0700
Subject: [PATCH 2/4] libu2f-host: stop shipping udev rules
---
srcpkgs/libu2f-host/template | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index 9252389fa30..c16dae4a2d1 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,13 @@
# Template file for 'libu2f-host'
pkgname=libu2f-host
version=1.1.10
-revision=3
+revision=4
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
-configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d"
+configure_args="--with-openssl=yes"
hostmakedepends="automake gengetopt libtool pkg-config"
makedepends="hidapi-devel json-c-devel libressl-devel"
+depends="libfido2"
short_desc="C library and tool that implements the host-side of the U2F protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, GPL-3.0-or-later"
@@ -14,17 +15,11 @@ homepage="https://developers.yubico.com/libu2f-host/"
#changelog="https://raw.githubusercontent.com/Yubico/libu2f-host/master/NEWS"
distfiles="https://github.com/Yubico/libu2f-host/archive/libu2f-host-${version}.tar.gz"
checksum=45937c6c04349f865d9f047d3a68cc50ea24e9085d18ac2c7d31fa38eb749303
-conf_files="/usr/lib/udev/rules.d/70-u2f.rules"
pre_configure() {
autoreconf -fi
}
-post_install() {
- vsed -e 's:GROUP="plugdev":GROUP="users":' \
- -i ${DESTDIR}/usr/lib/udev/rules.d/70-u2f.rules
-}
-
libu2f-host-devel_package() {
short_desc+=" - development files"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From c70067916407365b6d5dd535b9d77bab2caf084d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 16 Oct 2020 06:35:42 +0700
Subject: [PATCH 3/4] yubikey-manager: depend on udev rules from libfido2
---
srcpkgs/yubikey-manager/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yubikey-manager/template b/srcpkgs/yubikey-manager/template
index 20368e5b2ad..1946f6cab49 100644
--- a/srcpkgs/yubikey-manager/template
+++ b/srcpkgs/yubikey-manager/template
@@ -1,10 +1,10 @@
# Template file for 'yubikey-manager'
pkgname=yubikey-manager
version=3.1.1
-revision=4
+revision=5
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="libu2f-host python3-fido2 python3-openssl python3-usb python3-pyscard
+depends="libfido2 python3-fido2 python3-openssl python3-usb python3-pyscard
python3-click python3-cryptography python3-six pcsc-ccid python3-setuptools
libykpers"
checkdepends="$depends python3-pytest"
From 2367fae8ab72e6385ca6e80ca0f45a4b3a344510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 16 Oct 2020 06:39:05 +0700
Subject: [PATCH 4/4] pam-u2f: update to 1.1.0.
---
srcpkgs/pam-u2f/patches/musl.patch | 24 ++++++++++++++++++++++++
srcpkgs/pam-u2f/template | 9 ++++-----
2 files changed, 28 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/pam-u2f/patches/musl.patch
diff --git a/srcpkgs/pam-u2f/patches/musl.patch b/srcpkgs/pam-u2f/patches/musl.patch
new file mode 100644
index 00000000000..804612a4cd5
--- /dev/null
+++ b/srcpkgs/pam-u2f/patches/musl.patch
@@ -0,0 +1,24 @@
+diff --git b64.c b64.c
+index 0649c1e..7788089 100644
+--- b64.c
++++ b64.c
+@@ -4,6 +4,7 @@
+
+ #include <openssl/bio.h>
+ #include <openssl/evp.h>
++#include <limits.h>
+ #include <stdint.h>
+ #include <string.h>
+
+diff --git util.c util.c
+index 3ec4e71..5989c6c 100644
+--- util.c
++++ util.c
+@@ -9,6 +9,7 @@
+ #include <openssl/ec.h>
+ #include <openssl/obj_mac.h>
+
++#include <limits.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 990a5a7c41a..285e1ae4229 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,21 +1,20 @@
# Template file for 'pam-u2f'
pkgname=pam-u2f
-version=1.0.8
+version=1.1.0
revision=1
wrksrc="${pkgname/-/_}-${version}"
build_style=gnu-configure
configure_args="--with-pam-dir=/usr/lib/security"
-hostmakedepends="automake libtool pkg-config"
-makedepends="libu2f-host-devel libu2f-server-devel pam-devel"
+hostmakedepends="automake libtool pkg-config asciidoc"
+makedepends="libfido2-devel libressl-devel pam-devel"
short_desc="Pluggable Authentication Module (PAM) for U2F"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://developers.yubico.com/pam-u2f/"
#changelog="https://raw.githubusercontent.com/Yubico/pam-u2f/master/NEWS"
distfiles="https://developers.yubico.com/pam-u2f/Releases/pam_u2f-${version}.tar.gz"
-checksum=52a203a6fab6160e06c1369ff104afed62007ca3ffbb40c297352232fa975c99
+checksum=0dc3bf96ebb69c6e398b5f8991493b37a8ce1af792948af71e694f695d5edc05
post_install() {
vlicense COPYING
}
-
next prev parent reply other threads:[~2020-10-16 1:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 0:12 [PR PATCH] " sgn
2020-10-16 0:14 ` [PR PATCH] [Updated] " sgn
2020-10-16 0:15 ` sgn
2020-10-16 1:20 ` sgn [this message]
2020-10-17 10:11 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201016012044.LvcBJyXgDt7ycXHA-xZHO2oaeu2zQnUaXT9dfYAMLSs@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).