commit: 6c6ab1f71f11d2d692fa3bfb610a64a37f729895
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 14:00:11 2024 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 14:00:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6ab1f7
net-analyzer/yersinia: add 0.8.2_p20221119, drop 0.8.2-r2
current 0.8.2-r2 USE=gtk didn't appear to function correctly. I fixed
the deps to be a bit more explicit but that didn't fix it. Upgrading to
current git snapshot fixed the issue so I am removing the non-working
version and replacing it with a working version in one commit.
Additionally removing unneeded patches, thanks to Sam for upstreaming
them.
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-analyzer/yersinia/Manifest | 2 +-
.../yersinia/files/yersinia-0.7.3-tinfo.patch | 4 +-
.../yersinia-0.8.2-configure-clang16-deux.patch | 38 ----------------
.../files/yersinia-0.8.2-configure-clang16.patch | 53 ----------------------
...2-r2.ebuild => yersinia-0.8.2_p20221119.ebuild} | 16 ++++---
5 files changed, 12 insertions(+), 101 deletions(-)
diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest
index 36a60ac06592..a80add615abf 100644
--- a/net-analyzer/yersinia/Manifest
+++ b/net-analyzer/yersinia/Manifest
@@ -1 +1 @@
-DIST yersinia-0.8.2.tar.gz 387889 BLAKE2B
67fe92b9cd1253874c61fa38c8e89e023f7d0ec3b83fe3001b5bc203d4033e36cb94b453ed56426b34d942036a143bd135f247466425337478f292797a433652
SHA512
2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd
+DIST yersinia-0.8.2_p20221119.tar.gz 268158 BLAKE2B
2598d6809c7830c7824c9141ef58a617a8d472c0d7b3591b81e6209cecb915649a82d780108c45c488619775effca266eca4a9a0e60d1174211a5af05a05997d
SHA512
e54025d782374d836148a813c0a8eb8d822c82f87d6e92c10b254831b95eef073d36ddb1ef94a7e7db2cd962fd52589d41fc6d21ca63422ca57c5ada2045de72
diff --git a/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch
b/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch
index 8a58d01d33c6..b5bf566c107d 100644
--- a/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch
+++ b/net-analyzer/yersinia/files/yersinia-0.7.3-tinfo.patch
@@ -1,5 +1,5 @@
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
@@ -467,6 +467,7 @@
AC_DEFINE(HAVE_REMOTE_ADMIN)
fi
diff --git
a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch
b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch
deleted file mode 100644
index 427be023a021..000000000000
--- a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/tomac/yersinia/commit/867b309eced9e02b63412855440cd4f5f7727431
-
-From 5db403f8aa4101589f33246eaa23b5f31228fc3b Mon Sep 17 00:00:00 2001
-From: Sam James <[email protected]>
-Date: Sat, 19 Nov 2022 18:43:26 +0000
-Subject: [PATCH] configure: fix -Wimplicit-function-declaration,
- -Wimplicit-int
-
-Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by
default. Unfortunately,
-this can lead to misconfiguration or miscompilation of software as configure
-tests may then return the wrong result.
-
-For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki
[2],
-or the (new) c-std-porting mailing list [3].
-
-[0] https://lwn.net/Articles/913505/
-[1]
https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
-[2] https://wiki.gentoo.org/wiki/Modern_C_porting
-[3] hosted at lists.linux.dev.
-
-Followup to 6414681ae99d6a0f460f827648f114aa3cb2e419.
-
-Signed-off-by: Sam James <[email protected]>
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -79,8 +79,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
- # include <sys/types.h>
- # include <sys/wait.h>
- # include <stdio.h>
-+# include <stdlib.h>
-+# include <unistd.h>
- unsigned char a[[5]] = { 1, 2, 3, 4, 5 };
-- main() {
-+ int main(void) {
- unsigned int i;
- pid_t pid;
- int status;
-
diff --git a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch
b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch
deleted file mode 100644
index f2366c02dfb4..000000000000
--- a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://github.com/tomac/yersinia/pull/76
-
-From ec9d31932fca39e3160b0d0bfd0383db82ff5bcf Mon Sep 17 00:00:00 2001
-From: Sam James <[email protected]>
-Date: Wed, 16 Nov 2022 23:10:45 +0000
-Subject: [PATCH] configure: fix -Wimplicit-function-declaration,
- -Wstrict-prototypes
-
-Clang 16 makes -Wimplicit-function-declaration an error by default.
Unfortunately,
-this can lead to misconfiguration or miscompilation of software as configure
-tests may then return the wrong result.
-
-For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki
[2],
-or the (new) c-std-porting mailing list [3].
-
-[0] https://lwn.net/Articles/913505/
-[1]
https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
-[2] https://wiki.gentoo.org/wiki/Modern_C_porting
-[3] hosted at lists.linux.dev.
-
-Signed-off-by: Sam James <[email protected]>
---- a/configure.in
-+++ b/configure.in
-@@ -233,12 +233,13 @@ dnl fi
-
- AC_MSG_CHECKING(if libnet is at least version 1.1.2)
- AC_TRY_RUN([
--#include<stdio.h>
--#include<libnet.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <libnet.h>
- #define HOPE_MAJOR 1
- #define HOPE_MEDIUM 1
- #define HOPE_MINOR 2
--int main()
-+int main(void)
- {
- unsigned int major,medium,minor,current, desired;
- desired = HOPE_MAJOR*10000 + HOPE_MEDIUM*100 + HOPE_MINOR;
-@@ -419,9 +420,9 @@ AC_CHECK_FUNCS(strerror_r,
have_strerror_r=yes,have_strerror_r=no)
- if test $have_strerror_r = yes; then
- AC_MSG_CHECKING(if strerror_r is on glibc version >= 2.0)
- AC_TRY_RUN([
--#include <stdio.h>
-+#include <stdlib.h>
- #include <features.h>
--int main()
-+int main(void)
- {
- #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0
- exit(0);
-
diff --git a/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild
b/net-analyzer/yersinia/yersinia-0.8.2_p20221119.ebuild
similarity index 70%
rename from net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild
rename to net-analyzer/yersinia/yersinia-0.8.2_p20221119.ebuild
index be2de6bbc614..3e07f8adbe01 100644
--- a/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild
+++ b/net-analyzer/yersinia/yersinia-0.8.2_p20221119.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,10 @@ inherit autotools flag-o-matic
DESCRIPTION="A framework for layer 2 attacks"
HOMEPAGE="http://www.yersinia.net/";
-SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+#SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="867b309eced9e02b63412855440cd4f5f7727431"
+SRC_URI="https://github.com/tomac/yersinia/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-2"
SLOT="0"
@@ -15,13 +18,14 @@ KEYWORDS="amd64 x86"
IUSE="gtk ncurses"
RDEPEND="
- >=net-libs/libnet-1.1.2
+ >=net-libs/libnet-1.1.2:1.1
>=net-libs/libpcap-0.9.4
ncurses? ( >=sys-libs/ncurses-5.5:= )
gtk? (
dev-libs/glib:2
- x11-libs/gdk-pixbuf
- =x11-libs/gtk+-2*
+ x11-libs/gdk-pixbuf:2
+ =x11-libs/gtk+-2*:2
+ x11-libs/pango
)
"
DEPEND="${RDEPEND}"
@@ -32,8 +36,6 @@ DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO )
PATCHES=(
"${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch
"${FILESDIR}"/${PN}-0.7.3-tinfo.patch
- "${FILESDIR}"/${PN}-0.8.2-configure-clang16.patch
- "${FILESDIR}"/${PN}-0.8.2-configure-clang16-deux.patch
)
src_prepare() {
