From 42ff81a7480d9bba317b42fcca03b46da2a622ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Oct 2022 07:10:13 +0100 Subject: gentoo auto-resync : 01:10:2022 - 07:10:12 --- net-analyzer/ike-scan/Manifest | 4 +- .../ike-scan/files/ike-scan-1.9.5-clang-16.patch | 92 ++++++++++++++++++++++ net-analyzer/ike-scan/ike-scan-1.9.5.ebuild | 42 ++++++++++ net-analyzer/ike-scan/ike-scan-99999.ebuild | 43 ---------- 4 files changed, 137 insertions(+), 44 deletions(-) create mode 100644 net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch create mode 100644 net-analyzer/ike-scan/ike-scan-1.9.5.ebuild delete mode 100644 net-analyzer/ike-scan/ike-scan-99999.ebuild (limited to 'net-analyzer/ike-scan') diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest index 8354a70e8bbe..2f9830a26384 100644 --- a/net-analyzer/ike-scan/Manifest +++ b/net-analyzer/ike-scan/Manifest @@ -1,4 +1,6 @@ +AUX ike-scan-1.9.5-clang-16.patch 3150 BLAKE2B 1ed607aee9003ddb07a49c96ad14e882d3e5135ca5f0af07212bb60dff25854b5104ce35b2bc9c7c286b34d1feb1fcd2a0b8ee6da18a35c04f800671431352ca SHA512 9e84734e60ba0bcd2ef714e5051d486ed7594b33e99447fe8ee9a6b59eda57ccd7311b01781d5e5096b98df45ed141644a94bc78d69747e5639b19cd89b0df79 DIST ike-scan-1.9.4.tar.gz 1360202 BLAKE2B abe206b22a23a6d4eaa2218204657d6c47f22ac8009df1f1e7918fbb55575033f237462ed57ba89aee8bed28e47a4dacf69e443dac5cd3b506842e26e71f97e9 SHA512 d7dde6d3d76a2e3ddeb9ed1f0dee3e2c3a13d4afa57ebb8ff19f6af094f7334b464509cee6ffc385d2703bcf9bc1c503bc604506279518f692f82c8f12f146be +DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590 EBUILD ike-scan-1.9.4.ebuild 738 BLAKE2B f73bc5fb1a446a3f9cf97ad85a1cd68db0be95bbf3200ac4530763d0c696569092ef7032c03633cf051fb2a7d01eb7cd106c0718a76b619cbaf341e1122683a0 SHA512 aed95ea1d8511de9b542394d5f5ae41df0408dde189e95a1a255d554524e0099b0d262b1b32daaab8fc15121120400d2767dd2a57763b1bc5ec22894c75089c9 -EBUILD ike-scan-99999.ebuild 700 BLAKE2B d808a7c999fbb3bd203134643b76ef627eebe81e9c23bd5c889a68199482441cc4b9f05e46a4411b00f3ca5fcbe815b09206def835c4d6af8553fdff146f5161 SHA512 72c46f8bc360ab68bb47391b65fc59086aaac5c2bc4cd4a27c795f8f494298ec1c36eac99a2b98bbcc31b9968f1e874ed53323829d131cefe95db826e9093403 +EBUILD ike-scan-1.9.5.ebuild 784 BLAKE2B 82997a6df4449ab79ceb62d06d6605e57c04a7374d70128780f2f7772066451b7b035f48662f7b7a3dead619707a01a61f682d3f89694b01443640e41cd168c0 SHA512 b8d8a1744aa6f3107384d78dfa77f4c00f15c0185085ea40040eb18d83e1f3b810e038bc690332ccb987bdbe9c93195125ea750762e2966810a7141176665635 MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch new file mode 100644 index 000000000000..c4aec2836ba0 --- /dev/null +++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch @@ -0,0 +1,92 @@ +https://github.com/royhills/ike-scan/pull/39 + +From 9949ce4bdf9f4bcb616b2a5d273708a7ea9ee93d Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 26 Sep 2022 05:22:18 +0100 +Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+ + compat) + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -144,7 +144,7 @@ int does_int64_work() + return 0; + return 1; + } +-main() { ++int main() { + return ! does_int64_work(); + }], + [Ac_cachevar=yes], +@@ -200,7 +200,7 @@ int does_int64_snprintf_work() + return 0; /* either multiply or snprintf is busted */ + return 1; + } +-main() { ++int main() { + return ! does_int64_snprintf_work(); + }], + [pgac_cv_snprintf_long_long_int_format=$pgac_format; break], + +From 6a931ca559a937cb9f7917b9131ec1aca4919683 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Mon, 26 Sep 2022 05:23:06 +0100 +Subject: [PATCH 2/3] acinclude.m4: fix typo in 'x' if check + +Case doesn't matter but case does need to match on left & right +hand side, so just choose uppercase everywhere to match what +the rest of the file does. +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -278,7 +278,7 @@ dnl in . We don't use __GNUC_PREREQ directly because + dnl is not present on all the operating systems that we support, e.g. OpenBSD. + dnl + AC_DEFUN([GCC_FORTIFY_SOURCE],[ +- if test "x$CC" != "X"; then ++ if test "X$CC" != "X"; then + AC_MSG_CHECKING([whether ${CC} accepts -D_FORTIFY_SOURCE]) + AC_TRY_COMPILE(,[ + #define GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +@@ -311,7 +311,7 @@ dnl If it is not supported, then the test program will compile without + dnl warnings. + dnl + AC_DEFUN([GCC_FORMAT_SECURITY],[ +- if test "x$CC" != "X"; then ++ if test "X$CC" != "X"; then + AC_MSG_CHECKING([whether ${CC} accepts -Wformat-security]) + wfs_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror -Wformat -Wformat-security" + +From fbc40c7b117b523eceb9aa58d6086bde701f1299 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 1 Oct 2022 01:24:04 +0100 +Subject: [PATCH 3/3] configure.ac: Fix recognising -Wformat-security with + Clang + +Before: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +checking whether clang accepts -Wformat-security... no +``` + +After: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -Wformat-security... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +``` + +Signed-off-by: Sam James +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ if test -n "$GCC"; then + CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings" + GCC_WEXTRA + GCC_STACK_PROTECT_CC +- GCC_FORTIFY_SOURCE + GCC_FORMAT_SECURITY ++ GCC_FORTIFY_SOURCE + dnl Uncomment the lines below for testing with stricter warnings. + dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline " + dnl Uncomment the line below to check malloc/free with electric fence + diff --git a/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild new file mode 100644 index 000000000000..acfffd464bb0 --- /dev/null +++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers" +HOMEPAGE="https://github.com/royhills/ike-scan" +SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="ssl" + +DEPEND="ssl? ( dev-libs/openssl:= )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9.5-clang-16.patch +) + +src_prepare() { + default + + # Fix buffer overflow, bug #277556 + sed \ + -e "/MAXLINE/s:255:511:g" \ + -i ike-scan.h || die + + eautoreconf +} + +src_configure() { + econf $(use_with ssl openssl) +} + +src_install() { + default + dodoc udp-backoff-fingerprinting-paper.txt +} diff --git a/net-analyzer/ike-scan/ike-scan-99999.ebuild b/net-analyzer/ike-scan/ike-scan-99999.ebuild deleted file mode 100644 index 4e89ede7807a..000000000000 --- a/net-analyzer/ike-scan/ike-scan-99999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers" -HOMEPAGE="https://github.com/royhills/ike-scan/" -EGIT_REPO_URI="https://github.com/royhills/ike-scan" - -LICENSE="GPL-2" -SLOT="0" -IUSE="ssl" -KEYWORDS="" - -DEPEND=" - ssl? ( - dev-libs/openssl:0= - ) -" -RDEPEND=" - ${DEPEND} -" - -src_prepare() { - # Fix buffer overflow, bug #277556 - sed \ - -e "/MAXLINE/s:255:511:g" \ - -i ike-scan.h || die - - default - - eautoreconf -} - -src_configure() { - econf $(use_with ssl openssl) -} - -src_install() { - default - dodoc udp-backoff-fingerprinting-paper.txt -} -- cgit v1.2.3