mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 00:46:58 +02:00
app-crypt/ccid: Sync with Gentoo
It's from Gentoo commit 889687b967d2c0ea45d7e435ca72c277cef036a2.
This commit is contained in:
Flatcar Buildbot
Krzesimir Nowak
parent
54134b7185
commit
9c33dbb36b
@ -1,3 +1 @@
|
||||
DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
|
||||
DIST ccid-1.5.4.tar.bz2 706834 BLAKE2B 8b7f08145808ac94d085eef62c204f8146892cb11f2ce811e46e674272cab016d602afb945c6e808ce3957a80e847c0de2815fedaf15fc8c935cafaccf102762 SHA512 4b30f4768aebf49486a1b1e959615fa077bd393bfdd9e52c15bdc8d6ed63ce27fa7cf82a067d1f80d8b3534c66194036925d3fea5af64b6a775779d38267c757
|
||||
DIST ccid-1.5.5.tar.bz2 708374 BLAKE2B a82986ead2dbb3241ef419ad16eb0fac835c5ab4fa988e5ee53cd1608a30a9381210a6fd013b6a059ca2835d55b4a41afa4064575e91b8eb356bff6d01d19add SHA512 9d2aebe645a5880bfad7d420ddab96811d1fd989c79afa28f5471ae53f36b6d45ee5e13b32ac4afcf59fc762ae835db7e6312ad6642b263158c2d9a30c7651bd
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit udev
|
||||
|
||||
DESCRIPTION="CCID free software driver"
|
||||
HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
|
||||
SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
|
||||
IUSE="twinserial +usb"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-apps/pcsc-lite-1.8.3
|
||||
twinserial? ( dev-lang/perl )
|
||||
usb? ( virtual/libusb:1 )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
LEX=: \
|
||||
$(use_enable twinserial) \
|
||||
$(use_enable usb libusb)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
|
||||
einfo "for more info about how to configure and use ccid"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
@ -1,55 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools udev
|
||||
|
||||
DESCRIPTION="CCID free software driver"
|
||||
HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
|
||||
SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
|
||||
IUSE="twinserial +usb"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-apps/pcsc-lite-1.8.3
|
||||
twinserial? ( dev-lang/perl )
|
||||
usb? ( virtual/libusb:1 )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-remove-flex-configure-dependency.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
LEX=: \
|
||||
$(use_enable twinserial) \
|
||||
$(use_enable usb libusb)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
|
||||
einfo "for more info about how to configure and use ccid"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
udev_reload
|
||||
}
|
||||
@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
|
||||
IUSE="twinserial +usb"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
From 5bd94d9670ad10df9f14349dfa098d0a2e40ab08 Mon Sep 17 00:00:00 2001
|
||||
From: Eli Schwartz <eschwartz93@gmail.com>
|
||||
Date: Mon, 10 Jun 2024 22:02:37 -0400
|
||||
Subject: [PATCH] make building work again when flex is not installed
|
||||
|
||||
This explicitly reverts commit eec7cdf03dda2bd26e320ead73b91da5a9d86443
|
||||
because it was a bad idea.
|
||||
|
||||
The motivating bug report was https://github.com/LudovicRousseau/PCSC/issues/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
|
||||
|
||||
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
|
||||
---
|
||||
configure.ac | 9 ++++-----
|
||||
1 file changed, 4 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d291f2b..a5af2eb 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -33,10 +33,10 @@ AC_PROG_INSTALL
|
||||
AC_PROG_MAKE_SET
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_LEX([noyywrap])
|
||||
-if test $LEX = ":"
|
||||
-then
|
||||
- AC_MSG_ERROR([no lex or flex found])
|
||||
-fi
|
||||
+AS_IF([test $LEX = ":"], [
|
||||
+ AM_MISSING_PROG(MISSINGLEX, [flex])
|
||||
+ LEX=$MISSINGLEX]
|
||||
+)
|
||||
AM_PROG_AR
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
@@ -354,4 +354,3 @@ AC_CONFIG_FILES(Makefile
|
||||
examples/Makefile)
|
||||
|
||||
AC_OUTPUT
|
||||
-
|
||||
--
|
||||
2.44.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user