[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcmciautils/files/, sys-apps/pcmciautils/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcmciautils/files/, sys-apps/pcmciautils/

[Lars Wendler]

commit:     7c17097c2266d20cce2fd8f3b05cd9c9ffbccd22
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Sat Jan  7 17:15:28 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 18:47:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c17097c

sys-apps/pcmciautils: flex-2.6.3 compatibility fix

Fixes yywrap errors caused by behavior changes in flex-2.6.3.

Gentoo-bug: 604606

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3363

 .../files/pcmciautils-018_p8-flex-2.6.3-fix.patch  | 27 ++++++++++++++++++++++
 sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild  | 17 ++++++++------
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch b/sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch
new file mode 100644
index 00000000..e30abb0
--- /dev/null
+++ b/sys-apps/pcmciautils/files/pcmciautils-018_p8-flex-2.6.3-fix.patch
@@ -0,0 +1,27 @@
+--- pcmciautils-018/src/lex_config.l
++++ pcmciautils-018/src/lex_config.l
+@@ -1,8 +1,8 @@
+ /* Special state for handling include files */
+ %x src
+-%option noinput nounput
++%option noinput nounput noyywrap
+ 
+ %{
+ /*
+  * Startup tool for non statically mapped PCMCIA sockets
+  *
+@@ -75,14 +75,10 @@ module		/* skip */ ;
+ 
+ .		return yytext[0];
+ 
+ %%
+ 
+-#ifndef yywrap
+-int yywrap() { return 1; }
+-#endif
+-
+ /*======================================================================
+ 
+     Stuff to parse basic data types
+ 
+ ======================================================================*/

diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
index 409b157..c4b8e06 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils flag-o-matic linux-info toolchain-funcs udev
+EAPI=6
+inherit flag-o-matic linux-info toolchain-funcs udev
 
 DEB_REV=${PV#*_p}
 MY_PV=${PV%_p*}
@@ -51,11 +51,14 @@ pkg_setup() {
 	use debug && append-cppflags -DDEBUG
 }
 
-src_prepare() {
-	epatch \
-		"${WORKDIR}"/debian/patches/no-modprobe-rules.patch \
-		"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
+PATCHES=(
+	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
+	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
+	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
+)
 
+src_prepare() {
+	default
 	sed -i \
 		-e '/CFLAGS/s:-fomit-frame-pointer::' \
 		-e '/dir/s:sbin:bin:g' \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/pcmciautils/files/, sys-apps/pcmciautils/

[Sam James]

commit:     aa59b7b0761874e3478702334b14a7df8c08b912
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 06:17:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 29 06:27:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa59b7b0

sys-apps/pcmciautils: fix musl build

Closes: https://bugs.gentoo.org/716120
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../pcmciautils-018_p8-musl-unsigned-type.patch    | 24 ++++++++++++++++++++++
 sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild  | 13 ++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch
new file mode 100644
index 000000000000..6039b8147096
--- /dev/null
+++ b/sys-apps/pcmciautils/files/pcmciautils-018_p8-musl-unsigned-type.patch
@@ -0,0 +1,24 @@
+https://git.alpinelinux.org/aports/plain/main/pcmciautils/unsigned.patch
+https://bugs.gentoo.org/716120
+--- a/src/read-cis.c
++++ b/src/read-cis.c
+@@ -51,7 +51,7 @@
+ 		/* Get indirect link from the MFC tuple */
+ 		read_cis(tuple->Flags.link_space,
+ 			       tuple->LinkOffset, 5, link);
+-		ofs = *(u_int *)(link+1);
++		ofs = *(unsigned int *)(link+1);
+ 		tuple->Flags.space = (link[0] == CISTPL_MFC_ATTR);
+ 		/* Move to the next indirect link */
+ 		tuple->LinkOffset += 5;
+--- a/src/yacc_config.y
++++ b/src/yacc_config.y
+@@ -40,7 +40,7 @@
+ 
+ %union {
+     char *str;
+-    u_long num;
++    unsigned long num;
+     struct adjust_list_t *adjust;
+ }
+ 

diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index d27c8288425f..e42d81c1d8d8 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -24,6 +24,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
+PATCHES=(
+	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
+	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
+	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
+	"${FILESDIR}"/${PN}-018_p8-musl-unsigned-type.patch
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~PCMCIA"
 	linux-info_pkg_setup
@@ -49,12 +56,6 @@ pkg_setup() {
 	use debug && append-cppflags -DDEBUG
 }
 
-PATCHES=(
-	"${WORKDIR}"/debian/patches/no-modprobe-rules.patch
-	"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch
-	"${FILESDIR}"/${P}-flex-2.6.3-fix.patch
-)
-
 src_prepare() {
 	default
 	sed -i \