From f5588424e3182e3006f725536eebd7dc7b5bbfd4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Dec 2023 14:53:46 +0000 Subject: gentoo auto-resync : 16:12:2023 - 14:53:46 --- net-analyzer/Manifest.gz | Bin 43412 -> 43414 bytes net-analyzer/httping/Manifest | 3 +- net-analyzer/httping/files/httping-2.9-c99.patch | 35 ++++++++++ net-analyzer/httping/httping-2.9-r1.ebuild | 79 +++++++++++++++++++++++ net-analyzer/httping/httping-2.9.ebuild | 78 ---------------------- 5 files changed, 116 insertions(+), 79 deletions(-) create mode 100644 net-analyzer/httping/files/httping-2.9-c99.patch create mode 100644 net-analyzer/httping/httping-2.9-r1.ebuild delete mode 100644 net-analyzer/httping/httping-2.9.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 0f1174b1c4ad..8152c9dcaf06 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest index 4e9e2106c540..27c711fae56e 100644 --- a/net-analyzer/httping/Manifest +++ b/net-analyzer/httping/Manifest @@ -1,6 +1,7 @@ AUX httping-2.2.1-flags.patch 161 BLAKE2B be0f5f8df2fd89f46f15b3ef6c0c06e9f04573a822a6ce6e559471e3db586d69de0e440e3b9c4f401f30ab741d9eb85077ead8d3f9d4c026e7398609602f7c2e SHA512 037f53e3f23247ddc5f33ef846bafe32e3f818242b92375d7145fa244c9a8aeeac2d3b1138cbffa792a9564a5e4e96274ff457a13be0c4b228033d47b21748d6 +AUX httping-2.9-c99.patch 1055 BLAKE2B 9422d3c656f91db7e8a67b2180d4df3dc21bdcda6467faab6ffb4e57d0dd380f8b1775479510dcd14f74911760ce4b131f9393c8f9a044295ee796a81a7458aa SHA512 9bec6497c463c63feb54bc669927942181a709b4959c7d08cddcee3b8e428e135256c47a60a30095050831a64aa91e79fcc5a68689e7fb5fa53f1c755bea0a43 DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355 DIST httping-2.9.tar.gz 83674 BLAKE2B aa1e2b74756ebf62896ad2a4b89e68eff61f73f98ff881bba2fe4e14d2ed2a63af84a2780122ad845d1057ece3f37d567b7bf5d5b62a4b8487c58f1442a90fdf SHA512 74d4a98590b6862a2f15fffdf3bc58e3226a94c7aebbe60135695397b20e6cb71fe8c2af75b8525724f2f9ce6530d1f8eecd3193bc50f31d254bbb9903615019 EBUILD httping-2.5.ebuild 1567 BLAKE2B 34e9626ad8c7c558d07d3607fcf9d94510a302087cb58a52bac83bfbf94e4af4b85cb0c0d97d651e658596aecd891fcf03363348eef6c4de59df3d7acee03b8f SHA512 9c52120be63efbf5e708ddf3e049175cc032811973376f64e555f4281d85bb89f57e31995e2851e35268024c34eb786087602c10a358503962bfd2e3b057b3a2 -EBUILD httping-2.9.ebuild 1733 BLAKE2B a937ef276445e68ba40f07f50f45e45ddf9a3e414dc999ceeb3f5ca9a7c1888c8a84e92a72ab9043c8642e7576839e556e0a79f95cac337ba4b4ca41909be2fe SHA512 0c6f1fc2080264b6f319f284f4482580ef817cead84b56a43bdf5151735037b9e5de2fcf301741b079d336e6fa4f42cd86998b06238c743eecfb1ecc3cb65a0c +EBUILD httping-2.9-r1.ebuild 1766 BLAKE2B 870d5068601f9a9041f4b6f79954b8c2d7f6adf2c0e1d225268e03c8b611fba630a075d7848e1daa309aeea3417169fb277694dade99bc68d414b4133ad37a9a SHA512 77e3aa2d926b9203c5f5374e3c3834793ad8bb5e8a95fdcd332ff141082ee3e6715f64f5eebd8a2113141a9153a4a2e30f3d8864e18beb7f1552498fe8469df5 MISC metadata.xml 445 BLAKE2B 0ebe975f648b094ebe02e8cb5f478972c6aa5ba6ca3125b14e07948ff7bc260e09711af5e8864eeb252ab81464d65ac53639745153014ad9eba0174f504a3503 SHA512 1673292f25011cc116a415286dfe92bfc07dc2a23d174d1081513c226b2f3fdcaf75b965fa10eb4c75f6fe1bf3fdaf0fa1b97e21ccebe60375e82fb55745fccd diff --git a/net-analyzer/httping/files/httping-2.9-c99.patch b/net-analyzer/httping/files/httping-2.9-c99.patch new file mode 100644 index 000000000000..48e07219d4e8 --- /dev/null +++ b/net-analyzer/httping/files/httping-2.9-c99.patch @@ -0,0 +1,35 @@ +https://github.com/folkertvanheusden/HTTPing/pull/12 + +From 684a6e255ea2f5b11a0548e5d99c2678be7563d9 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sat, 16 Dec 2023 10:48:17 +0000 +Subject: [PATCH] http.c: add for malloc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 14 makes implicit function declarations an error by default: +``` +http.c: In function ‘get_HTTP_headers’: +http.c:21:32: error: implicit declaration of function ‘malloc’ [-Wimplicit-function-declaration] + 21 | char *buffer = (char *)malloc(len + 1); + | ^~~~~~ +http.c:16:1: note: include ‘’ or provide a declaration of ‘malloc’ + 15 | #include "utils.h" + +++ |+#include + 16 | +[...] +``` + +Bug: https://bugs.gentoo.org/920107 +Signed-off-by: Sam James +--- a/http.c ++++ b/http.c +@@ -2,6 +2,7 @@ + + #include + #include ++#include + #include + #include + #ifndef NO_SSL diff --git a/net-analyzer/httping/httping-2.9-r1.ebuild b/net-analyzer/httping/httping-2.9-r1.ebuild new file mode 100644 index 000000000000..a9db3b0d13f7 --- /dev/null +++ b/net-analyzer/httping/httping-2.9-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="http protocol ping-like program" +HOMEPAGE="https://www.vanheusden.com/httping/" +SRC_URI="https://github.com/folkertvanheusden/HTTPing/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/HTTPing-${PV} + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86" +IUSE="debug fftw l10n_nl ncurses ssl +tfo" + +RDEPEND=" + fftw? ( sci-libs/fftw:3.0 ) + ncurses? ( sys-libs/ncurses:= ) + ssl? ( dev-libs/openssl:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="ncurses? ( virtual/pkgconfig )" + +# This would bring in test? ( dev-util/cppcheck ) but unlike +# upstream we should only care about compile/run time testing +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-flags.patch + "${FILESDIR}"/${PN}-2.9-c99.patch +) + +src_prepare() { + default + + # Don't clobber toolchain defaults + sed -i -e 's:-D_FORTIFY_SOURCE=2::' Makefile || die + + # doman does not get PN-LANG.CAT so we move things around and then point at + # it later + if use l10n_nl; then + mkdir nl || die + mv httping-nl.1 nl/httping.1 || die + fi + +} + +src_configure() { + # not an autotools script + echo > makefile.inc || die + + if use ncurses ; then + local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)" + + # Don't require ncurses with unicode support + # bug #731950 + sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die + append-libs "${ncurses_flags}" + fi +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + FW=$(usex fftw) \ + DEBUG=$(usex debug) \ + NC=$(usex ncurses) \ + SSL=$(usex ssl) \ + TFO=$(usex tfo) +} + +src_install() { + dobin httping + doman httping.1 + + use l10n_nl && doman -i18n=nl nl/httping.1 +} diff --git a/net-analyzer/httping/httping-2.9.ebuild b/net-analyzer/httping/httping-2.9.ebuild deleted file mode 100644 index 9bfb0a57e5f1..000000000000 --- a/net-analyzer/httping/httping-2.9.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="http protocol ping-like program" -HOMEPAGE="https://www.vanheusden.com/httping/" -SRC_URI="https://github.com/folkertvanheusden/HTTPing/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}"/HTTPing-${PV} - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86" -IUSE="debug fftw l10n_nl ncurses ssl +tfo" - -RDEPEND=" - fftw? ( sci-libs/fftw:3.0 ) - ncurses? ( sys-libs/ncurses:0= ) - ssl? ( dev-libs/openssl:0= ) -" -DEPEND="${RDEPEND}" -BDEPEND="ncurses? ( virtual/pkgconfig )" - -# This would bring in test? ( dev-util/cppcheck ) but unlike -# upstream we should only care about compile/run time testing -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2.1-flags.patch -) - -src_prepare() { - default - - # Don't clobber toolchain defaults - sed -i -e 's:-D_FORTIFY_SOURCE=2::' Makefile || die - - # doman does not get PN-LANG.CAT so we move things around and then point at - # it later - if use l10n_nl; then - mkdir nl || die - mv httping-nl.1 nl/httping.1 || die - fi - -} - -src_configure() { - # not an autotools script - echo > makefile.inc || die - - if use ncurses ; then - local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)" - - # Don't require ncurses with unicode support - # bug #731950 - sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die - append-libs "${ncurses_flags}" - fi -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - FW=$(usex fftw) \ - DEBUG=$(usex debug) \ - NC=$(usex ncurses) \ - SSL=$(usex ssl) \ - TFO=$(usex tfo) -} - -src_install() { - dobin httping - doman httping.1 - - use l10n_nl && doman -i18n=nl nl/httping.1 -} -- cgit v1.2.3