[gentoo-commits] repo/gentoo:master commit in: net-analyzer/echoping/, net-analyzer/echoping/files/
commit: fc6853db1f910a17d2293e6b9d23987bbc45d66e
Author: Eli Schwartz gmail com>
AuthorDate: Tue Mar 5 03:54:37 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 5 04:47:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6853db
net-analyzer/echoping: fix underlinking to libm
Caused compilation failures if LTO was used.
Closes: https://bugs.gentoo.org/861152
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
.../echoping/echoping-6.0.2_p434-r5.ebuild | 1 +
.../files/0001-correctly-link-to-libm.patch| 32 ++
2 files changed, 33 insertions(+)
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild
b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild
index 69a6db661c00..a1b34e731c1b 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
"${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
"${FILESDIR}"/${PN}-6.0.2_p434-fno-common.patch
+ "${FILESDIR}"/0001-correctly-link-to-libm.patch
)
src_prepare() {
diff --git a/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch
b/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch
new file mode 100644
index ..2bd38fea6c6e
--- /dev/null
+++ b/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch
@@ -0,0 +1,32 @@
+From a951dcd0ea6cc64afbba2a438aead17706562486 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz
+Date: Mon, 4 Mar 2024 22:43:43 -0500
+Subject: [PATCH] correctly link to libm
+
+The program depends on math.h symbols via util.c, but blindly assumes
+that it will be available without explicitly linking to it -- a POSIX
+violation.
+
+Also an LTO violation.
+
+Signed-off-by: Eli Schwartz
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a586281..3f96637 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -6,7 +6,7 @@ bin_PROGRAMS = echoping
+ man_MANS = echoping.1
+ echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c
HTParse.c echoping.h icp.h HTParse.h smtp.c
+ pkginclude_HEADERS = echoping.h compilation.h
+-echoping_LDADD =
++echoping_LDADD = -lm
+ echoping_LDFLAGS = -export-dynamic
+ DOCS=DETAILS PLUGINS
+ SUBDIRS=plugins
+--
+2.43.0
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/echoping/, net-analyzer/echoping/files/
commit: 7e8dabe4cb93aacab8f043d01a289f7476a89fd5
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri May 20 07:58:58 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri May 20 08:00:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8dabe4
net-analyzer/echoping: Fix building with >net-libs/gnutls-3.3 (bug #546864).
Package-Manager: portage-2.3.0_rc1
.../echoping/echoping-6.0.2_p434-r2.ebuild | 57 ++
...p434-gnutls_certificate_type_set_priority.patch | 11 +
.../files/echoping-6.0.2_p434-gnutls_session.patch | 22 +
3 files changed, 90 insertions(+)
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
new file mode 100644
index 000..dc4f5d5
--- /dev/null
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Small program to test performances of remote servers"
+HOMEPAGE="http://echoping.sourceforge.net/;
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz;
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
+RESTRICT="test"
+
+RDEPEND="idn? ( net-dns/libidn )
+ postgres? ( dev-db/postgresql:* )
+ ldap? ( net-nds/openldap )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.3:= )
+ !gnutls? ( >=dev-libs/openssl-0.9.7d:= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
+ epatch
"${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
+ epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable http) \
+ $(use_enable icp) \
+ $(use_enable priority) \
+ $(use_enable smtp) \
+ $(use_enable tos) \
+ $(use_with idn libidn) \
+ $(usex gnutls $(use_with gnutls) $(use_with ssl)) \
+ --config-cache \
+ --disable-static \
+ --disable-ttcp
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git
a/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
new file mode 100644
index 000..0cb219f
--- /dev/null
+++
b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
@@ -0,0 +1,11 @@
+--- a/echoping.c
b/echoping.c
+@@ -981,8 +981,6 @@
+ if (tls_result != 0)
+ err_sys("Cannot create a new TLS session");
+ gnutls_set_default_priority(session);
+-gnutls_certificate_type_set_priority(session,
+- cert_type_priority);
+ gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE,
xcred);
+ gnutls_transport_set_ptr(session, (gnutls_transport_ptr)
+ (long) sockfd);
diff --git
a/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
new file mode 100644
index 000..8b87c47
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
@@ -0,0 +1,22 @@
+--- a/echoping.c
b/echoping.c
+@@ -134,7 +134,7 @@
+ SSL*sslh = NULL;
+ #endif
+ #ifdef GNUTLS
+-gnutls_session session;
++gnutls_session_t session;
+ gnutls_certificate_credentials xcred;
+ int tls_result;
+ const int cert_type_priority[3] = { GNUTLS_CRT_X509,
+--- a/echoping.h
b/echoping.h
+@@ -103,7 +103,7 @@
+ SSL*ssl;
+ #endif
+ #ifdef GNUTLS
+-gnutls_session tls;
++gnutls_session_t tls;
+ #endif
+ } CHANNEL;
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/echoping/, net-analyzer/echoping/files/
commit: 990ec09784b7ccd0015f66b9e6d9051051f97f7b
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Oct 4 18:38:40 2015 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Oct 4 18:38:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=990ec097
net-analyzer/echoping: Do not copy ltmain.sh (bug #562230 by Toralf Förster).
Package-Manager: portage-2.2.22
net-analyzer/echoping/Manifest | 1 -
net-analyzer/echoping/echoping-6.0.2-r2.ebuild | 60 --
.../echoping/echoping-6.0.2_p434-r1.ebuild | 1 -
net-analyzer/echoping/echoping-6.0.2_p434.ebuild | 1 -
.../echoping-6.0.2-fix_implicit_declarations.patch | 20
.../echoping/files/echoping-6.0.2-gnutls.patch | 41 ---
6 files changed, 124 deletions(-)
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index a5a95da..25fef68 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -1,2 +1 @@
-DIST echoping-6.0.2.tar.gz 1660983 SHA256
1dfa4c45bf461b2379ff91773ed7136176e2abac9e85c26bc9654942b5155eac SHA512
ca9a38c3be9da283e73a7a1b13ab003dca6a2ee317e2961325f3e6803f132ae2f5e4206d946564915c573f21f9c3e9641d61f6b3ae5806bbaa92c2f30f1e5e22
WHIRLPOOL
9140d20d82ed1c38df91d8905fb678c1ca717af518b374c3379db285662d55e70c8da5bb227c4f47a4c34f649c686037636c024a38d1109cd939f6974b274e15
DIST echoping-6.0.2_p434.tar.gz 74568 SHA256
152a4a9d2a3962fa8cb95eeb29b5d22a7039d4408f5ba22286259856f095baf7 SHA512
1b4f5f1ea6ba000c558cab3b8e86758d6c539d8cd23762d837b468861a177ac733441c885eb8ec1c35b49baa33a82e34e3f8b14b05429a075b72233d5799
WHIRLPOOL
cae10459766311ded4f6459e519461fb91de7dd9429679927c3955a5a9b09b9b9a9706947b3a5c1495805367c91cf2035d3154a3ff180241782deec304eb8aaf
diff --git a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild
b/net-analyzer/echoping/echoping-6.0.2-r2.ebuild
deleted file mode 100644
index 58c1021..000
--- a/net-analyzer/echoping/echoping-6.0.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils autotools
-
-DESCRIPTION="Small program to test performances of remote servers"
-HOMEPAGE="http://echoping.sourceforge.net/;
-SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
-RESTRICT="test"
-
-RDEPEND="idn? ( net-dns/libidn )
- postgres? ( dev-db/postgresql )
- ldap? ( net-nds/openldap )
- ssl? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( >=dev-libs/openssl-0.9.7d )
- )"
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
-
-src_prepare() {
- # bug 279525:
- epatch "${FILESDIR}/${P}-gnutls.patch"
-
- epatch "${FILESDIR}/${P}-fix_implicit_declarations.patch"
-
- rm -f ltmain.sh
- cp /usr/share/libtool/config/ltmain.sh .
- local i
- for i in . plugins/ plugins/*/; do
- pushd "${i}" > /dev/null
- eautoreconf
- popd > /dev/null
- done
-}
-
-src_configure() {
- econf \
- --config-cache \
- --disable-ttcp \
- $(use_enable http) \
- $(use_enable icp) \
- $(use_with idn libidn) \
- $(use_enable smtp) \
- $(use_enable tos) \
- $(use_enable priority) \
- $(usex gnutls $(use_with gnutls) $(use_with ssl))
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
index f96eb28..f0c6bf4 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
@@ -32,7 +32,6 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
- cp /usr/share/libtool/config/ltmain.sh .
eautoreconf
}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
index 5a5cb1b..4245e74 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434.ebuild
@@ -32,7 +32,6 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
- cp /usr/share/libtool/config/ltmain.sh .
eautoreconf
}
diff --git
a/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch
b/net-analyzer/echoping/files/echoping-6.0.2-fix_implicit_declarations.patch
deleted file mode 100644
index 1b0bce8..000
---
