From 1494784ae35c6fa7b6a92a80dea93265fc54ccd0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Jun 2023 19:48:47 +0100 Subject: gentoo auto-resync : 18:06:2023 - 19:48:47 --- sys-block/Manifest.gz | Bin 11032 -> 11038 bytes sys-block/cec/Manifest | 3 + sys-block/cec/cec-14-r1.ebuild | 30 ++++++ .../cec-14-including-select.h-and-time.h.patch | 107 +++++++++++++++++++++ ...cec-14-using-unsigned-int-instead-of-uint.patch | 33 +++++++ 5 files changed, 173 insertions(+) create mode 100644 sys-block/cec/cec-14-r1.ebuild create mode 100644 sys-block/cec/files/cec-14-including-select.h-and-time.h.patch create mode 100644 sys-block/cec/files/cec-14-using-unsigned-int-instead-of-uint.patch (limited to 'sys-block') diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz index 3d4083a8a5d0..05ab068f14b1 100644 Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ diff --git a/sys-block/cec/Manifest b/sys-block/cec/Manifest index e869935c1fac..c016403592cf 100644 --- a/sys-block/cec/Manifest +++ b/sys-block/cec/Manifest @@ -1,4 +1,7 @@ AUX cec-14-fno-common.patch 879 BLAKE2B 81ce3c301c007fe8ae5526e275becc85f12e41fa6f0e33a50ca03786324ee9d8996ac122d097d7c3581a24addc3bafc45ec3bbc07dc8ec1682067a9025442741 SHA512 c36b242e21941b8b639e9ef18f4a3a1e116683ff61f1eb25ec99378a8b22c77b5dfaa9f01a95f88393651e4c1d80e070fe585b4e9b007c16b153aba1f40b4e14 +AUX cec-14-including-select.h-and-time.h.patch 4193 BLAKE2B b6f39929719e9ea95cc02f373fd5fa180a30c13a9f185f1269d28c2f8d42ae7abc67d8a3e61eebe78e8671eafac2b87b33495ecd89aaab621c36a8a1eaa9addc SHA512 babf1ccf4cacc21b01339d5fb982ac0f125cd0aa8dd8c03359d8dd599bd88a26a25d9d571d3347cc8089d38820279a5f5f29c70f576f8b72f92889288b4ea8e8 +AUX cec-14-using-unsigned-int-instead-of-uint.patch 902 BLAKE2B 06a1244b0babfa1f8cf549f2b6038aba9be1afea4ce273e972cf6f99e61fd3848b3360d3dcef4cc408406a5a516c01c53705cc158077017ac18d96fb461ebd89 SHA512 fc13fa2d1430923069aea451e3578d91b3bc2d5f52374929db5b08d82dcdd534c4ef3dfe75455105e4f3da9fefc739efc43e2e23b9ae63a9c0450863fa5b03fc DIST cec-14.tgz 22654 BLAKE2B 01bf2c301983a5183bcffb3975ffb148b7efd2b7ea945c71654f090b1063ec1502bb4b64885924ef1fcd5798378537182a3b54e64400187fb515a6fc864a539c SHA512 b024c26badc7992c1d2804378119e214923bd7cfbac80de374efd22084595f74752db0edf3b83ac0e258db1847a3b49734958effc3961c9e086e61d5b806782c +EBUILD cec-14-r1.ebuild 639 BLAKE2B 12a9998b612ae3fda3e6d56582e7586d089944b0236deb704da6d7ca7d9c20da006235704b10ebfdab3855097469ba5ada928c8dd1f433f3c64ccb5a2bd88667 SHA512 8163da28e967123685ba65fb9444fa7aaac22a6d937274e4a98bb7a01f95e5282754ed7bcbb4a410342e16e49986b5cd814e8e1cb79e2950529d59c2cfac6982 EBUILD cec-14.ebuild 513 BLAKE2B bd45dc6a07308d44228a41a314c8c7b838d713583ebdb024ef280686e5aa24a17f46a0d73d83423cc71594c51d0b55dbde942d1d20c68ea5718a8da717684043 SHA512 93868f0f138f398438a0fee92897e06d7469bd32fb8e8de7d789d62e3f6313f4b376200c7e1b477ae84bfbaf6de7ab85286b2cc0b66f101f198b7a23d69e6429 MISC metadata.xml 246 BLAKE2B c9667815f2242caf872d97df93da023965f7143dcafc1b1a271f634723cbf2d32f9d1ad563d777ffd940e9dcef5e3e75330afdd9559e40050cbdb2cf10f25844 SHA512 b44306e02e1545af72fbb04ffcce52b5777697ab30256ad6f9a726f1a785f4efffacec2c307303dc253df67020267fc4695e7fbb896da6095cb9c28deb11bf8e diff --git a/sys-block/cec/cec-14-r1.ebuild b/sys-block/cec/cec-14-r1.ebuild new file mode 100644 index 000000000000..fb689a6f52be --- /dev/null +++ b/sys-block/cec/cec-14-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Coraid Ethernet Console client" +HOMEPAGE="http://aoetools.sourceforge.net/" +SRC_URI="mirror://sourceforge/aoetools/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${PN}-14-including-select.h-and-time.h.patch + "${FILESDIR}"/${PN}-14-using-unsigned-int-instead-of-uint.patch +) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dosbin ${PN} + doman ${PN}.8 + dodoc ${PN}.txt NEWS README +} diff --git a/sys-block/cec/files/cec-14-including-select.h-and-time.h.patch b/sys-block/cec/files/cec-14-including-select.h-and-time.h.patch new file mode 100644 index 000000000000..818579610eff --- /dev/null +++ b/sys-block/cec/files/cec-14-including-select.h-and-time.h.patch @@ -0,0 +1,107 @@ +From b8e4f29db4b46614e7f21515ba439eab3c0698b1 Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Tue, 13 Jun 2023 10:43:46 +0000 +Subject: [PATCH 2/2] cec.c: Including select.h and time.h + +According to POSIX.1-2001 sys/select.h should be included for usage of +identifier fd_set + +For using structure timeval sys/time.h is needed. + +Without the aforementioned includes, I'm getting the following error: +cec.c:311:3: warning: switch condition has boolean value [-Wswitch-bool] + switch (sh == tab) { + ^ ~~~~~~~~~ +cec.c:515:2: error: use of undeclared identifier 'fd_set' + fd_set rfds; + ^ +cec.c:521:23: error: variable has incomplete type 'struct timeval' + struct timeval *tvp, timout; + ^ +cec.c:521:9: note: forward declaration of 'struct timeval' + struct timeval *tvp, timout; + ^ +cec.c:527:3: error: call to undeclared function 'FD_ZERO'; ISO C99 and later do not + support implicit function declarations [-Wimplicit-function-declaration] + FD_ZERO(&rfds); + ^ +cec.c:527:12: error: use of undeclared identifier 'rfds'; did you mean 'ffs'? + FD_ZERO(&rfds); + ^~~~ + ffs +/usr/include/strings.h:25:5: note: 'ffs' declared here +int ffs (int); + ^ +cec.c:528:3: error: call to undeclared function 'FD_SET'; ISO C99 and later do not + support implicit function declarations [-Wimplicit-function-declaration] + FD_SET(fd, &rfds); + ^ +cec.c:528:15: error: use of undeclared identifier 'rfds'; did you mean 'ffs'? + FD_SET(fd, &rfds); + ^~~~ + ffs +/usr/include/strings.h:25:5: note: 'ffs' declared here +int ffs (int); + ^ +cec.c:530:15: error: use of undeclared identifier 'rfds'; did you mean 'ffs'? + FD_SET(0, &rfds); + ^~~~ + ffs +/usr/include/strings.h:25:5: note: 'ffs' declared here +int ffs (int); + ^ +cec.c:533:7: error: incomplete definition of type 'struct timeval' + tvp->tv_sec = 1; + ~~~^ +cec.c:521:9: note: forward declaration of 'struct timeval' + struct timeval *tvp, timout; + ^ +cec.c:534:7: error: incomplete definition of type 'struct timeval' + tvp->tv_usec = 0; + ~~~^ +cec.c:521:9: note: forward declaration of 'struct timeval' + struct timeval *tvp, timout; + ^ +cec.c:537:7: error: call to undeclared function 'select'; ISO C99 and later do not + support implicit function declarations [-Wimplicit-function-declaration] + n = select(fd+1, &rfds, nil, nil, tvp); + ^ +cec.c:537:21: error: use of undeclared identifier 'rfds'; did you mean 'ffs'? + n = select(fd+1, &rfds, nil, nil, tvp); + ^~~~ + ffs +/usr/include/strings.h:25:5: note: 'ffs' declared here +int ffs (int); + ^ +cec.c:550:7: error: call to undeclared function 'FD_ISSET'; ISO C99 and later do not + support implicit function declarations [-Wimplicit-function-declaration] + if (FD_ISSET(0, &rfds)) { + ^ +cec.c:550:20: error: use of undeclared identifier 'rfds'; did you mean 'ffs'? + if (FD_ISSET(0, &rfds)) { + ^~~~ + ffs +/usr/include/strings.h:25:5: note: 'ffs' declared here +int ffs (int); + ^ +cec.c:576:28: error: use of undeclared identifier 'rfds'; did you mean 'ffs'? + } else if (FD_ISSET(fd, &rfds)) { + ^~~~ + ffs +/usr/include/strings.h:25:5: note: 'ffs' declared here + +Signed-off-by: Brahmajit Das +--- a/cec.c ++++ b/cec.c +@@ -9,6 +9,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include "cec.h" +-- +2.41.0 + diff --git a/sys-block/cec/files/cec-14-using-unsigned-int-instead-of-uint.patch b/sys-block/cec/files/cec-14-using-unsigned-int-instead-of-uint.patch new file mode 100644 index 000000000000..1bc417a2dcbe --- /dev/null +++ b/sys-block/cec/files/cec-14-using-unsigned-int-instead-of-uint.patch @@ -0,0 +1,33 @@ +From 53cba8765ece2fddaea58405649d00df8041823b Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Tue, 13 Jun 2023 10:39:04 +0000 +Subject: [PATCH 1/2] cec.h utils.c: using unsigned int instead of uint + +Since uint ins't a standard type, using unsigned int in its place. + +Signed-off-by: Brahmajit Das +--- a/cec.h ++++ b/cec.h +@@ -22,7 +22,7 @@ void exits(char *); + + enum { FQUOTE = (1<<0), FEMPTY = (1<<1) }; + int getfields(char *, char **, int, char *, int); +-char *htoa(char *, char *, uint); ++char *htoa(char *, char *, unsigned int); + int parseether(char *, char *); + + #define tokenize(A, B, C) getfields((A), (B), (C), " \t\r\n", FQUOTE) +--- a/utils.c ++++ b/utils.c +@@ -57,7 +57,7 @@ dump(char *ap, int len) + } + + char * +-htoa(char *to, char *frm, uint len) ++htoa(char *to, char *frm, unsigned int len) + { + char *cp = to; + uchar ch; +-- +2.41.0 + -- cgit v1.2.3