summaryrefslogtreecommitdiff
path: root/app-crypt/ccid
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-06-15 00:09:17 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-06-15 00:09:17 +0100
commit6a7029e0f7370d4d5dfe9e31cc2719a870482392 (patch)
tree28c6c747114eaedfd2db81f86ac2ff3d7d13111e /app-crypt/ccid
parent5e41a38157bb40e8513e8e34426e85faba672fe7 (diff)
gentoo auto-resync : 15:06:2024 - 00:09:17
Diffstat (limited to 'app-crypt/ccid')
-rw-r--r--app-crypt/ccid/Manifest8
-rw-r--r--app-crypt/ccid/ccid-1.5.4.ebuild2
-rw-r--r--app-crypt/ccid/ccid-1.5.5.ebuild2
-rw-r--r--app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch65
-rw-r--r--app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch63
5 files changed, 125 insertions, 15 deletions
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 5ccb83369043..cf12fea835fc 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,9 +1,9 @@
-AUX ccid-1.5.4-remove-flex-configure-dependency.patch 318 BLAKE2B 3bdd4d48a01c919392dea0b64077069c03165f15c6965bb98d92154f2af6812c22d37a8146cc5ae7f98ee74c546854410f6ce6d6de05963dd2c25d6e199b9885 SHA512 12d4d547acd8bf05ac6fc261e1dcda0c0186db4dd808d892c63a904236fc66c4c839505bb9b5e42642e83d5f35e5d505514f879608be0f64dd5884de5d8c43c0
-AUX ccid-1.5.5-remove-flex-configure-dependency.patch 293 BLAKE2B 3751cb537db0574557f370f93888ca7225e8bbd7451df907a5fc0e64c097a52c99c01f389631f5a105f915d6a8bbf46383baf130173b8dc04aecc7fe4ecb5e31 SHA512 6dc40cd954f58b588fe0ba7203449753d09b21dd559b2cef8f9b6abc7ee7bff180766900094c07895249fdd856f3b0463b25ba0ecebd732ea06a1036ca420a00
+AUX ccid-1.5.4-remove-flex-configure-dependency.patch 2363 BLAKE2B 168934efb2350a4c9a385dbb9823ac32f2538227b4f81677462735e7d3e8909243742321677996d42980d3f0038e6c759b882a34a849fcc1613776154dbd3b48 SHA512 fa2b06a2dc425c0c937fdf674724c29afe1056e524b3a1a7708cfbc49f94ad01cf553750164828d1bfbce4a9009703aee49240c44a0ecec3de38ae125cda9993
+AUX ccid-1.5.5-remove-flex-configure-dependency.patch 2353 BLAKE2B 18496a0dbcfc6987f05615b6c4bf44f07975ae818016470082de68b85eacb8d308147a2e9b1d6aaf69f6a0237d38811bfd2a5597cb5f7f78e5c1ca02043ca82f SHA512 49039d0b4170a226c305bf21cd9069535eedc6436d1ee0fce1b643f5d45d1a35ece16c6f7274ca02f10ee0057bb8d6a88098f2cadbcec6ca2e4035c4cc59af9d
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
EBUILD ccid-1.5.1.ebuild 940 BLAKE2B da6ac353e97b916126ef0990a80be03a92105c38e1ed4dc1893fad853df419188b10d381bc23d810a083427a0b35dea9066b705baf868ccb2d4bab1dfa39fec0 SHA512 e0264beda6138afc794d401cb2f0763820bce74047532063a113ebc072121e3e20221da74a633805a738a760272c38fc0e793456d115c97230d99e8e592791f7
-EBUILD ccid-1.5.4.ebuild 1062 BLAKE2B 8d448067c0c60c9484d59632dd5f590c094ddc21c05db31e7c6671150d7f7167682531d726533592ff2cf9fc76efcf61b546a0fc4495ff2584a70ac3aba65cb1 SHA512 656ac991b6b5a28f5540b9a95ccb8b87ea0c53873ee592f886100629d9085aa3b3b6a994c402034aad34b8b72ae798739168e17c47321260a40e592fa2d9d3d5
-EBUILD ccid-1.5.5.ebuild 1067 BLAKE2B f3c4deb3ed00e0272b48c2f109e0be507c1c652179cf6f24486840266642240d0b3071bc086c94966d045d23a572f5c8b12ca6f691778a413d919dff5eea0223 SHA512 fc9fed5771af1c895c40d6c5caa62c099db15baecb00d6014e4d8bd8f8d031ac6e0a1a7515d4c3fd1fa3a1b78a6a3f51913acbc2bd6ae43787aa6f70f255328a
+EBUILD ccid-1.5.4.ebuild 1064 BLAKE2B 768a44a7ba697613e93c799088bf3fd9d2c72acf8a2f16b0d4b323b6a5fc1bdaf082ae3b120db10b4834fb369de778977c227b7a31fd094b9bd71a604e006059 SHA512 30d34aae572fe9802fbd915f932f58598869340218fd04b6fa9455648c0055e7e51dd4d66db550d650144c8c76b5ef728413905a0be40aa4ca2d9b513b55c84e
+EBUILD ccid-1.5.5.ebuild 1069 BLAKE2B 2557e4f83b7af8bd6b188bb526ef63a84e804f4a42b203ebca5b093151ea53e6706e30e39fdea217f1e2292d5452414ab0f3e4169fb4afc6d04eed778695ae65 SHA512 30f2f57abb51d33e444779e051174c2630474a2eea442647506fef2f7d05767c1a1a384a17828d071cc785c5a67ce80759864c0a908f28762b26db44e138a5a1
MISC metadata.xml 551 BLAKE2B 6290f9b5be875fb339b7414b02595a034946c7f612fc4f6b5f7edba4f88697181af0ed26231cd27ade41f5536aa62df26ee2bea002fc69cd716a648f45268cf5 SHA512 e7a7f47db4aba8712a7ea5c7efd63c76e0f5712588bca7dd9b8e7755f51cad0298a087ee7bedfcdc51b84866671f1436e2228359f1f2fbfe647f2e6a9f1e2ae5
diff --git a/app-crypt/ccid/ccid-1.5.4.ebuild b/app-crypt/ccid/ccid-1.5.4.ebuild
index 6652a82c38c2..005b7c99b1e9 100644
--- a/app-crypt/ccid/ccid-1.5.4.ebuild
+++ b/app-crypt/ccid/ccid-1.5.4.ebuild
@@ -29,7 +29,7 @@ PATCHES=(
src_prepare() {
default
- eautoconf
+ eautoreconf
}
src_configure() {
diff --git a/app-crypt/ccid/ccid-1.5.5.ebuild b/app-crypt/ccid/ccid-1.5.5.ebuild
index d701d5ebd5cf..a7a1290a0795 100644
--- a/app-crypt/ccid/ccid-1.5.5.ebuild
+++ b/app-crypt/ccid/ccid-1.5.5.ebuild
@@ -29,7 +29,7 @@ PATCHES=(
src_prepare() {
default
- eautoconf
+ eautoreconf
}
src_configure() {
diff --git a/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch b/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
index 564532c9ab42..b0c8122b6ec6 100644
--- a/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
+++ b/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
@@ -1,16 +1,71 @@
-Bug: https://bugs.gentoo.org/221361
-Reverts upstream commit eec7cdf0
+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
-@@ -32,11 +32,6 @@ AC_PROG_CPP
- AC_PROG_INSTALL
+@@ -33,10 +33,10 @@ AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
--AC_PROG_LEX([noyywrap])
+ 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
+
diff --git a/app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch b/app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch
index a124c50d1161..1ffb74fc61aa 100644
--- a/app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch
+++ b/app-crypt/ccid/files/ccid-1.5.5-remove-flex-configure-dependency.patch
@@ -1,13 +1,68 @@
-Bug: https://bugs.gentoo.org/221361
-Reverts upstream commit eec7cdf0 & 41270c2
+From 7e2207a07979b6c1b206024e83e22ca2bbd4e17c 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 | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index eb2370f..c012f2a 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -33,7 +33,5 @@
+@@ -33,7 +33,10 @@ AC_PROG_INSTALL
AC_PROG_MAKE_SET
AC_PROG_LN_S
--AC_PROG_LEX([noyywrap])
+ AC_PROG_LEX([noyywrap])
-AS_IF([test $LEX = ":"], [AC_MSG_ERROR([no lex or flex found])])
++AS_IF([test $LEX = ":"], [
++ AM_MISSING_PROG(MISSINGLEX, [flex])
++ LEX=$MISSINGLEX]
++)
AM_PROG_AR
PKG_PROG_PKG_CONFIG
+
+@@ -331,4 +334,3 @@ AC_CONFIG_FILES(Makefile
+ examples/Makefile)
+
+ AC_OUTPUT
+-
+--
+2.44.2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 16:31:05 +0000