Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
f7f5f321ca
!22 [sync] PR-21: Support build with clang
From: @openeuler-sync-bot 
Reviewed-by: @sunsuwan 
Signed-off-by: @sunsuwan
2024-03-27 01:59:42 +00:00
luofeng14
e013657649 support clang build
Signed-off-by: luofeng14 <luofeng13@huawei.com>
(cherry picked from commit 83bb0dad4c450bacf519477fb501f00ea7bc843a)
2024-03-26 20:21:21 +08:00
openeuler-ci-bot
007b6641d4
!20 update to 2.1.5
From: @XWwalker 
Reviewed-by: @robertxw 
Signed-off-by: @robertxw
2024-01-02 02:15:35 +00:00
xingwei
4d9ba18491 update to 2.1.5 2023-12-29 11:19:35 +00:00
openeuler-ci-bot
b6724c3783
!13 fix CVE-2023-46316
From: @XWwalker 
Reviewed-by: @robertxw 
Signed-off-by: @robertxw
2023-10-30 12:02:33 +00:00
xingwei
0e0677d4b7 fix CVE-2023-46316 2023-10-30 09:09:18 +00:00
openeuler-ci-bot
0877e5980a
!5 Update version to 2.1.2
From: @XWwalker 
Reviewed-by: @robertxw 
Signed-off-by: @robertxw
2023-07-28 09:20:58 +00:00
seuzw
7c760a022b Update version to 2.1.2 2023-07-22 14:33:11 +08:00
openeuler-ci-bot
dd7d69f67d
!4 traceroute 2.1.0 -> traceroute 2.1.1
From: @caojingbo 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
2023-02-09 09:59:15 +00:00
Cao Jingbo
b02457c43c Update version to 2.1.1
Signed-off-by: Cao Jingbo <caojb@chinatelecom.cn>
2023-02-02 14:54:46 +08:00
4 changed files with 69 additions and 23 deletions

View File

@ -0,0 +1,29 @@
From 92a59ec22b6b4c097c6aee6898071d66b8ce381c Mon Sep 17 00:00:00 2001
From: luofeng <luofeng13@huawei.com>
Date: Mon, 11 Mar 2024 12:15:11 +0800
Subject: [PATCH] support clang build
---
Make.rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Make.rules b/Make.rules
index f1ddc25..fa7c662 100644
--- a/Make.rules
+++ b/Make.rules
@@ -36,10 +36,10 @@ endif
$(call set, CROSS, )
-$(call set, CC, $$(CROSS)gcc)
+$(call set, CC, $$(CROSS)$(CC))
$(call set, AS, $$(CROSS)as)
$(call set, LD, $$(CROSS)ld)
-$(call set, DEPEND, $$(CROSS)gcc -MM -MG)
+$(call set, DEPEND, $$(CROSS)$(CC) -MM -MG)
$(call set, AR, $$(CROSS)ar)
$(call set, RANLIB, $$(CROSS)ranlib)
$(call set, INSTALL, cp)
--
2.19.1

Binary file not shown.

BIN
traceroute-2.1.5.tar.gz Normal file

Binary file not shown.

View File

@ -1,17 +1,19 @@
Name: traceroute
Epoch: 3
Version: 2.1.0
Release: 11
Version: 2.1.5
Release: 2
Summary: A new modern implementation of traceroute(8) utility for Linux systems
License: GPLv2+
License: GPL-2.0-or-later
URL: http://traceroute.sourceforge.net/
Source0: https://udomain.dl.sourceforge.net/project/traceroute/traceroute/traceroute-2.1.0/traceroute-2.1.0.tar.gz
Source0: https://sourceforge.net/projects/traceroute/files/traceroute/%{name}-%{version}/%{name}-%{version}.tar.gz
Provides: tcptraceroute = 1.5-1
Obsoletes: tcptraceroute < 1.5-1
BuildRequires: gcc
Patch0001: 0001-support-clang-build.patch
%description
Traceroute tracks the route packets taken from an IP network on their way
to a given host. It utilizes the IP protocol's time to live (TTL) field
@ -24,31 +26,19 @@ along the path to the host.
%autosetup -n %{name}-%{version} -p1
%build
make CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%make_build CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SKIPDIRS="${RPM_SPECPARTS_DIR##*/}"
%install
mkdir -p $RPM_BUILD_ROOT/bin
install -m755 traceroute/traceroute $RPM_BUILD_ROOT/bin
pushd $RPM_BUILD_ROOT/bin
ln -s traceroute traceroute6
popd
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
install -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8
pushd $RPM_BUILD_ROOT%{_mandir}/man8
ln -s traceroute.8 traceroute6.8
ln -s traceroute.8 tcptraceroute.8
popd
install -D -p -m755 traceroute/traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute
ln -s traceroute $RPM_BUILD_ROOT%{_bindir}/traceroute6
install -D -p -m755 wrappers/tcptraceroute $RPM_BUILD_ROOT%{_bindir}/tcptraceroute
install -D -p -m644 traceroute/traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute.8
ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/traceroute6.8
ln -s traceroute.8 $RPM_BUILD_ROOT%{_mandir}/man8/tcptraceroute.8
%files
%defattr(-,root,root)
%license COPYING
/bin/*
%{_bindir}/*
%files help
@ -57,6 +47,33 @@ popd
%{_mandir}/*/*
%changelog
* Fri Mar 1 2024 luofeng <luofeng13@huawei.com> - 3:2.1.5-2
- support clang build
* Fri Dec 29 2023 Xingwei <xingwei14@h-partners.com> - 3:2.1.5-1
- Type:requirement
- Id:NA
- SUG:NA
- DESC:Update to version 2.1.5
* Mon Oct 30 2023 xingwei <xingwei14@h-partners.com> - 3:2.1.2-2
- Type:CVE
- CVE:CVE-2023-46316
- SUG:NA
- DESC:fix CVE-2023-46316
* Jul Sat 22 2023 Xingwei <xingwei14@h-partners.com> - 3:2.1.2-1
- Type:requirement
- Id:NA
- SUG:NA
- DESC:Update to version 2.1.2
* Thu Feb 2 2023 Cao Jingbo <caojb@chinatelecom.cn> - 3:2.1.1-1
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:Update to version 2.1.1
* Tue Sep 8 2020 lunankun <lunankun@huawei.com> - 2.1.0-11
- Type:bugfix
- Id:NA