[packages/inetutils] - up to 1.9.4 (fixes CVE-2014-3684, adds dnsdomainname) - updated info patch - removed obsolete noli
qboosh
qboosh at pld-linux.org
Sat Mar 6 20:36:50 CET 2021
commit 51ec22d6062dca31cd665877e1fd8b9d6fe6d96b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 6 20:37:42 2021 +0100
- up to 1.9.4 (fixes CVE-2014-3684, adds dnsdomainname)
- updated info patch
- removed obsolete nolibs patch
inetutils-info.patch | 24 ++++++++++++++----------
inetutils-nolibs.patch | 15 ---------------
inetutils.spec | 20 +++++++++++++-------
3 files changed, 27 insertions(+), 32 deletions(-)
---
diff --git a/inetutils.spec b/inetutils.spec
index 3b9a907..cbda7a4 100644
--- a/inetutils.spec
+++ b/inetutils.spec
@@ -12,12 +12,12 @@
Summary: Common networking utilities and servers
Summary(pl.UTF-8): Popularne narzędzia i serwery sieciowe
Name: inetutils
-Version: 1.9.1
+Version: 1.9.4
Release: 0.1
License: GPL v3+
Group: Networking/Utilities
-Source0: http://ftp.gnu.org/gnu/inetutils/%{name}-%{version}.tar.gz
-# Source0-md5: 944f7196a2b3dba2d400e9088576000c
+Source0: https://ftp.gnu.org/gnu/inetutils/%{name}-%{version}.tar.xz
+# Source0-md5: 87fef1fa3f603aef11c41dcc097af75e
# syslogd:
Source1: %{name}-syslog.conf
Source2: %{name}-syslog.init
@@ -32,18 +32,20 @@ Source15: %{name}-ftp.desktop
Source16: %{name}-ftp.png
# patches:
Patch0: %{name}-info.patch
-Patch1: %{name}-nolibs.patch
Patch2: %{name}-tinfo.patch
URL: http://www.gnu.org/software/inetutils/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.11.1
# for config.rpath
BuildRequires: gettext-tools
+BuildRequires: libidn-devel
BuildRequires: libwrap-devel
BuildRequires: pam-devel
BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: tar >= 1:1.22
BuildRequires: texinfo
+BuildRequires: xz
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_sbindir}
@@ -94,6 +96,8 @@ Summary: Showing or setting the system's host name
Summary(pl.UTF-8): Pokazanie lub ustawienie nazwy hosta
Group: Applications/Networking
Requires: %{name} = %{version}-%{release}
+Provides: hostname
+Obsoletes: hostname
%description hostname
Hostname is the program that is used to either set or display the
@@ -104,8 +108,8 @@ name is also used by NIS/YP.
%description hostname -l pl.UTF-8
Hostname jest programem służącym do nadawania nowych lub podawania
aktualnych nazw hosta, domeny lub węzła systemu. Nazwy te są używane
-przez wiele programów sieciowych do identyfikacji maszyny. Nazwa domeny
-wykorzystywana jest też przez NIS/YP.
+przez wiele programów sieciowych do identyfikacji maszyny. Nazwa
+domeny wykorzystywana jest też przez NIS/YP.
%package ifconfig
Summary: Network interfaces configuration program from GNU inetutils
@@ -421,7 +425,6 @@ Klient whois z pakietu GNU inetutils.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%build
@@ -433,6 +436,7 @@ cp -f /usr/share/gettext/config.rpath build-aux
CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
%configure \
--disable-silent-rules \
+ --with-idn \
--with-path-procnet-dev=/proc/net/dev \
--with-pam \
--with-wrap
@@ -539,7 +543,9 @@ fi
%files hostname
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/dnsdomainname
%attr(755,root,root) %{_bindir}/hostname
+%{_mandir}/man1/dnsdomainname.1*
%{_mandir}/man1/hostname.1*
%files ifconfig
diff --git a/inetutils-info.patch b/inetutils-info.patch
index 35c4ec1..72b65ce 100644
--- a/inetutils-info.patch
+++ b/inetutils-info.patch
@@ -1,8 +1,8 @@
---- inetutils-1.8/doc/inetutils.texi.orig 2010-05-15 13:25:47.000000000 +0200
-+++ inetutils-1.8/doc/inetutils.texi 2010-11-13 08:26:42.819104128 +0100
-@@ -21,37 +21,33 @@
-
- @set Francois Fran@,{c}ois
+--- inetutils-1.9.4/doc/inetutils.texi.orig 2021-03-06 19:37:06.983684144 +0100
++++ inetutils-1.9.4/doc/inetutils.texi 2021-03-06 19:43:38.068232124 +0100
+@@ -19,39 +19,35 @@
+ @syncodeindex pg cp
+ @syncodeindex vr cp
- at dircategory Basics
+ at dircategory Net utilities:
@@ -13,11 +13,13 @@
-
- at dircategory Individual utilities
- at direntry
+-* dnsdomainname: (inetutils)dnsdomainname invocation. Show DNS domain name.
-* ftp: (inetutils)ftp invocation. FTP client.
-* ftpd: (inetutils)ftpd invocation. FTP Daemon.
-* hostname: (inetutils)hostname invocation. Show or set system host name.
--* inetd: (inetutils)inetd invocation. Interner super-server.
+-* inetd: (inetutils)inetd invocation. Internet super-server.
-* logger: (inetutils)logger invocation. Send messages to the system log.
+-* ping6: (inetutils)ping6 invocation. Packets to IPv6 network hosts.
-* ping: (inetutils)ping invocation. Packets to network hosts.
-* rcp: (inetutils)rcp invocation. Remote copy
-* rexec: (inetutils)rexec invocation. Remote execution client.
@@ -37,12 +39,14 @@
-* uucpd: (inetutils)uucpd invocation. Unix to Unix Copy.
-* whois: (inetutils)whois invocation. Whois user interface.
+* Inetutils: (inetutils). GNU networking utilities
-+* Inetutils common options: (inetutils)Common options. Inetutils common options
-+* ftp: (inetutils)ftp. FTP client
-+* ftpd: (inetutils)ftpd. FTP Daemon
++* Common options: (inetutils)Common options. Inetutils common options
++* dnsdomainname: (inetutils)dnsdomainname. Show DNS domain name
++* ftp: (inetutils)ftp. FTP client.
++* ftpd: (inetutils)ftpd. FTP Daemon.
+* hostname: (inetutils)hostname. Show or set system host name
-+* inetd: (inetutils)inetd. Interner super-server
++* inetd: (inetutils)inetd. Internet super-server
+* logger: (inetutils)logger. Send messages to the system log
++* ping6: (inetutils)ping6. Packets to IPv6 network hosts
+* ping: (inetutils)ping. Packets to network hosts
+* rcp: (inetutils)rcp. Remote copy
+* rexec: (inetutils)rexec. Remote execution client
diff --git a/inetutils-nolibs.patch b/inetutils-nolibs.patch
deleted file mode 100644
index bdbc67d..0000000
--- a/inetutils-nolibs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- inetutils-1.9/configure.ac.orig 2011-12-31 16:02:32.000000000 +0100
-+++ inetutils-1.9/configure.ac 2012-01-06 11:41:10.360431078 +0100
-@@ -141,9 +141,9 @@
- gl_INIT
-
- ### Checks for libraries.
--AC_CHECK_LIB(nsl, inet_ntoa)
--AC_CHECK_LIB(resolv, gethostname)
--AC_CHECK_LIB(socket, getpeername)
-+AC_SEARCH_LIBS(inet_ntoa, nsl)
-+AC_SEARCH_LIBS(gethostname, resolv)
-+AC_SEARCH_LIBS(getpeername, socket)
-
- # See if a termcap library is available (under one of several names)
- IU_LIB_TERMCAP
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/inetutils.git/commitdiff/51ec22d6062dca31cd665877e1fd8b9d6fe6d96b
More information about the pld-cvs-commit
mailing list