commit: fc25ff5b514075235fd04aaca6d4f0067fe7b120 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Tue Jan 24 16:35:51 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 26 04:58:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc25ff5b
sys-apps/ucspi-tcp[-ipv6]: fix build Closes: https://bugs.gentoo.org/888707 Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/29248 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch | 11 +++++++++++ sys-apps/ucspi-tcp/files/0.88-implicit-int.patch | 11 ----------- sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch b/sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch new file mode 100644 index 000000000000..aee400dc48c3 --- /dev/null +++ b/sys-apps/ucspi-tcp/files/0.88-implicit-int-ipv6.patch @@ -0,0 +1,11 @@ +--- a/tryip6.c ++++ b/tryip6.c +@@ -2,7 +2,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + +-main() { ++int main() { + struct sockaddr_in6 sa; + sa.sin6_family = PF_INET6; + } diff --git a/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch b/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch index 8c4bbf327800..b2e39abd838e 100644 --- a/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch +++ b/sys-apps/ucspi-tcp/files/0.88-implicit-int.patch @@ -182,17 +182,6 @@ { #ifdef NeXT printf("nextstep\n"); exit(0); ---- a/tryip6.c -+++ b/tryip6.c -@@ -2,7 +2,7 @@ - #include <sys/socket.h> - #include <netinet/in.h> - --main() { -+int main() { - struct sockaddr_in6 sa; - sa.sin6_family = PF_INET6; - } --- a/trylsock.c +++ b/trylsock.c @@ -1,4 +1,4 @@ diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild index af7bfc881cea..28b0addc8b65 100644 --- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild +++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild @@ -31,6 +31,7 @@ src_prepare() { eapply "${FILESDIR}"/${PV}-protos-ipv6.patch eapply "${FILESDIR}"/${PV}-tcprules.patch #135571 eapply "${FILESDIR}"/${PV}-bigendian.patch #18892 + eapply "${FILESDIR}"/${PV}-implicit-int-ipv6.patch else eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch fi
