commit 917f10ac2d99f8afd019188ca2066a750d311610
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Jan 7 10:29:35 2021 +0100
- up to 2.10
net-tools-config.patch | 6 ++++--
net-tools-interface.patch | 23 ++++++++++++-----------
net-tools.spec | 30 ++++++++++--------------------
3 files changed, 26 insertions(+), 33 deletions(-)
---
diff --git a/net-tools.spec b/net-tools.spec
index a09505c..7e98cf2 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -1,6 +1,5 @@
# TODO
# - changing config.in is not sufficent, must patch config.h and config.make
manually
-%define snap 20151002
Summary: Basic Networking Tools
Summary(es.UTF-8): Herramientas básicas de Red
Summary(ja.UTF-8): ネットワークをセットアップするための基本的なツール
@@ -9,13 +8,12 @@ Summary(pt_BR.UTF-8): Ferramentas básicas de Rede
Summary(ru.UTF-8): Базовые сетевые программы
Summary(uk.UTF-8): Базові програми мережі
Name: net-tools
-Version: 1.61
-Release: 0.%{snap}.1
+Version: 2.10
+Release: 1
License: GPL v2+
Group: Networking/Admin
-# git clone git://git.code.sf.net/p/net-tools/code net-tools
-Source0: %{name}-%{snap}.tar.bz2
-# Source0-md5: 000b3d8aaa9ec85054513cd365a3ccca
+Source0:
https://sourceforge.net/projects/net-tools/files/%{name}-%{version}.tar.xz
+# Source0-md5: 78aae762c95e2d731faf88d482e4cde5
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 9cee6ac0a07a0bf34fbc71add1eb2ead
Patch0: %{name}-config.patch
@@ -116,7 +114,7 @@ zależą od hardware portu równoległego, kabla, szybkości CPU
każdej
maszyny połączonej poprzez PLIP.
%prep
-%setup -q -n %{name}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -125,8 +123,6 @@ maszyny połączonej poprzez PLIP.
%patch5 -p0
%patch6 -p1
-mv po/et_EE.po po/et.po
-
%build
%{__make} -j1 \
CC="%{__cc}" \
@@ -147,7 +143,6 @@ bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.net-tools-non-english-man-pages
# standardize localized man dirs
-mv -f $RPM_BUILD_ROOT%{_mandir}/{de_DE/man1/*,de/man1}
rmdir $RPM_BUILD_ROOT%{_mandir}/de_DE/man1
mv -f $RPM_BUILD_ROOT%{_mandir}/{de_DE/*,de}
mv -f $RPM_BUILD_ROOT%{_mandir}/{fr_FR,fr}
@@ -159,16 +154,11 @@ ln -s %{_bindir}/ifconfig
$RPM_BUILD_ROOT%{_sbindir}/ifconfig
ln -s %{_bindir}/route $RPM_BUILD_ROOT%{_sbindir}/route
# remove hostname (has its own package)
-%{__rm} $RPM_BUILD_ROOT/bin/dnsdomainname
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/dnsdomainname*
-%{__rm} $RPM_BUILD_ROOT/bin/domainname
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/domainname*
-%{__rm} $RPM_BUILD_ROOT/bin/hostname
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/hostname*
-%{__rm} $RPM_BUILD_ROOT/bin/nisdomainname
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/nisdomainname*
-%{__rm} $RPM_BUILD_ROOT/bin/ypdomainname
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man1/ypdomainname*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/dnsdomainname*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/domainname*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/hostname*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/nisdomainname*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/ypdomainname*
cat > $RPM_BUILD_ROOT%{_sysconfdir}/mactab <<EOF
# Each line here contains an interface name and a Ethernet MAC address. Like:
diff --git a/net-tools-config.patch b/net-tools-config.patch
index 5d38d84..73e4348 100644
--- a/net-tools-config.patch
+++ b/net-tools-config.patch
@@ -80,7 +80,7 @@ diff -Nru net-tools-1.56/config.h net-tools-1.56.new/config.h
diff -Nru net-tools-1.56/config.make net-tools-1.56.new/config.make
--- net-tools-1.56/config.make Thu Jan 1 01:00:00 1970
+++ net-tools-1.56.new/config.make Tue May 30 03:19:19 2000
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,38 @@
+I18N=1
+HAVE_AFUNIX=1
+HAVE_AFINET=1
@@ -94,12 +94,14 @@ diff -Nru net-tools-1.56/config.make
net-tools-1.56.new/config.make
+# HAVE_AFECONET=0
+# HAVE_AFDECnet=0
+# HAVE_AFASH=0
++HAVE_ARP_TOOLS=1
+HAVE_HWETHER=1
+HAVE_HWARC=1
+HAVE_HWSLIP=1
+HAVE_HWPPP=1
+HAVE_HWTUNNEL=1
-+
++HAVE_SERIAL_TOOLS=1
++HAVE_PLIP_TOOLS=1
+HAVE_HWTR=1
+HAVE_HWAX25=1
+# HAVE_HWROSE=0
diff --git a/net-tools-interface.patch b/net-tools-interface.patch
index 8a45443..4c0e5b7 100644
--- a/net-tools-interface.patch
+++ b/net-tools-interface.patch
@@ -56,18 +56,19 @@ diff -up net-tools-2.0/netstat.c.interface
net-tools-2.0/netstat.c
perror(_("missing interface information"));
exit(1);
}
-@@ -1825,9 +1826,10 @@ static void usage(void)
- {
- fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat
{-V|--version|-h|--help}\n"));
- fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n"));
-- fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s
[-6tuw] }\n\n"));
-+ fprintf(stderr, _(" netstat { [-vWeenNac] -I[<Iface>] | -i |
[-cnNe] -M | -s [-6tuw] }\n\n"));
+@@ -1825,10 +1825,11 @@ static void usage(int rc)
+ FILE *fp = rc ? stderr : stdout;
+ fprintf(fp, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat
{-V|--version|-h|--help}\n"));
+ fprintf(fp, _(" netstat [-vWnNcaeol] [<Socket> ...]\n"));
+- fprintf(fp, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw]
}\n\n"));
++ fprintf(fp, _(" netstat { [-vWeenNac] -I[<Iface>] | -i | [-cnNe] -M
| -s [-6tuw] }\n\n"));
- fprintf(stderr, _(" -r, --route display routing
table\n"));
-+ fprintf(stderr, _(" -I, --interfaces=<Iface> display interface
table for <Iface>\n"));
- fprintf(stderr, _(" -i, --interfaces display interface
table\n"));
- fprintf(stderr, _(" -g, --groups display multicast
group memberships\n"));
- fprintf(stderr, _(" -s, --statistics display networking
statistics (like SNMP)\n"));
+ fprintf(fp, _(" -r, --route display routing
table\n"));
+ fprintf(fp, _(" -i, --interfaces display interface
table\n"));
++ fprintf(fp, _(" -I, --interfaces=<Iface> display interface table
for <Iface>\n"));
+ fprintf(fp, _(" -g, --groups display multicast group
memberships\n"));
+ fprintf(fp, _(" -s, --statistics display networking
statistics (like SNMP)\n"));
+ #if HAVE_FW_MASQUERADE
@@ -1875,7 +1882,7 @@ int main
{
AFTRANS_OPTS,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/net-tools.git/commitdiff/917f10ac2d99f8afd019188ca2066a750d311610
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
