Compare commits
10 Commits
2c51745d38
...
f7f5f321ca
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7f5f321ca | ||
|
|
e013657649 | ||
|
|
007b6641d4 | ||
|
|
4d9ba18491 | ||
|
|
b6724c3783 | ||
|
|
0e0677d4b7 | ||
|
|
0877e5980a | ||
|
|
7c760a022b | ||
|
|
dd7d69f67d | ||
|
|
b02457c43c |
29
0001-support-clang-build.patch
Normal file
29
0001-support-clang-build.patch
Normal 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
BIN
traceroute-2.1.5.tar.gz
Normal file
Binary file not shown.
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user