packages: inetutils/inetutils-info.patch, inetutils/inetutils-nolibs.patch, ...

qboosh qboosh at pld-linux.org
Sat Nov 13 14:32:10 CET 2010 

Author: qboosh                       Date: Sat Nov 13 13:32:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.8
- updated info,nolibs,tinfo patches
- added man patch

---- Files affected:
packages/inetutils:
   inetutils-info.patch (1.3 -> 1.4) , inetutils-nolibs.patch (1.2 -> 1.3) , inetutils-tinfo.patch (1.1 -> 1.2) , inetutils.spec (1.21 -> 1.22) , inetutils-man.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/inetutils/inetutils-info.patch
diff -u packages/inetutils/inetutils-info.patch:1.3 packages/inetutils/inetutils-info.patch:1.4
--- packages/inetutils/inetutils-info.patch:1.3	Mon Jan  5 21:08:08 2009
+++ packages/inetutils/inetutils-info.patch	Sat Nov 13 14:32:04 2010
@@ -1,49 +1,64 @@
---- inetutils-1.6/doc/inetutils.texi.orig	2008-12-27 14:27:42.000000000 +0100
-+++ inetutils-1.6/doc/inetutils.texi	2008-12-28 13:25:02.056393668 +0100
-@@ -27,27 +27,27 @@
+--- 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 @@
  
- @dircategory Individual utilities
+ @set Francois Fran@,{c}ois
+ 
+- at dircategory Basics
++ at dircategory Net utilities:
  @direntry
--* traceroute: (inetutils)traceroute invocation.    Trace the route to a host.
--* ftp: (inetutils)ftp invocation.               File Transfer Protocol.
--* ftpd: (inetutils)ftpd invocation.             FTP Daemon.
--* inetd: (inetutils)inetd invocation.           Internet super-server.
--* ping: (inetutils)ping invocation.             Packets to network hosts.
--* rcp: (inetutils)rcp invocation.               Strip non-directory suffix.
--* rexecd: (inetutils)rexecd invocation.         Remote execution server.
--* rlogin: (inetutils)rlogin invocation.         Remote login.
--* rlogind: (inetutils)rlogind invocation.       Remote login server.
--* rsh: (inetutils)rsh invocation.               Remote shell.
--* rshd: (inetutils)rshd invocation.             Remote shell server.
--* logger: (inetutils)logger invocation.            Make entries in the system log.
--* syslogd: (inetutils)syslogd invocation.       Syslog server.
--* talk: (inetutils)talk invocation.             Talk client.
--* talkd: (inetutils)talkd invocation.           Talk server.
--* telnet: (inetutils)telnet invocation.         User interface to TELNET.
--* telnetd: (inetutils)telnetd invocation.       Telnet server.
--* tftp: (inetutils)tftp invocation.             Trivial FTP.
--* tftpd: (inetutils)tftpd invocation.           TFTP server.
--* uucpd: (inetutils)uucpd invocation.           Unix to Unix Copy.
--* whois: (inetutils)whois invocation.           Whois user interface.
-+* traceroute: (inetutils)traceroute.	Trace the route to a host
-+* ftp: (inetutils)ftp.			File Transfer Protocol
+-* Inetutils: (inetutils).       GNU networking utilities.
+-* Common options: (inetutils)Common options.      Common options.
+- at end direntry
+-
+- at dircategory Individual utilities
+- at direntry
+-* 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.
+-* logger: (inetutils)logger invocation.           Send messages to the system log.
+-* ping: (inetutils)ping invocation.               Packets to network hosts.
+-* rcp: (inetutils)rcp invocation.                 Remote copy
+-* rexec: (inetutils)rexec invocation.             Remote execution client.
+-* rexecd: (inetutils)rexecd invocation.           Remote execution server.
+-* rlogin: (inetutils)rlogin invocation.           Remote login.
+-* rlogind: (inetutils)rlogind invocation.         Remote login server.
+-* rsh: (inetutils)rsh invocation.                 Remote shell.
+-* rshd: (inetutils)rshd invocation.               Remote shell server.
+-* syslogd: (inetutils)syslogd invocation.         Syslog server.
+-* talk: (inetutils)talk invocation.               Talk client.
+-* talkd: (inetutils)talkd invocation.             Talk server.
+-* telnet: (inetutils)telnet invocation.           User interface to TELNET.
+-* telnetd: (inetutils)telnetd invocation.         Telnet server.
+-* tftp: (inetutils)tftp invocation.               TFTP client.
+-* tftpd: (inetutils)tftpd invocation.             TFTP server.
+-* traceroute: (inetutils)traceroute invocation.   Trace the route to a host.
+-* 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
-+* inetd: (inetutils)inetd.		Internet super-server
++* hostname: (inetutils)hostname.	Show or set system host name
++* inetd: (inetutils)inetd.		Interner super-server
++* logger: (inetutils)logger.		Send messages to the system log
 +* ping: (inetutils)ping.		Packets to network hosts
-+* rcp: (inetutils)rcp.			Strip non-directory suffix
++* rcp: (inetutils)rcp.			Remote copy
++* rexec: (inetutils)rexec.		Remote execution client
 +* rexecd: (inetutils)rexecd.		Remote execution server
 +* rlogin: (inetutils)rlogin.		Remote login
 +* rlogind: (inetutils)rlogind.		Remote login server
 +* rsh: (inetutils)rsh.			Remote shell
 +* rshd: (inetutils)rshd.		Remote shell server
-+* logger: (inetutils)logger.		Make entries in the system log
 +* syslogd: (inetutils)syslogd.		Syslog server
 +* talk: (inetutils)talk.		Talk client
 +* talkd: (inetutils)talkd.		Talk server
 +* telnet: (inetutils)telnet.		User interface to TELNET
 +* telnetd: (inetutils)telnetd.		Telnet server
-+* tftp: (inetutils)tftp.		Trivial FTP
++* tftp: (inetutils)tftp.		TFTP client
 +* tftpd: (inetutils)tftpd.		TFTP server
++* traceroute: (inetutils)traceroute.	Trace the route to a host
 +* uucpd: (inetutils)uucpd.		Unix to Unix Copy
 +* whois: (inetutils)whois.		Whois user interface
  @end direntry

================================================================
Index: packages/inetutils/inetutils-nolibs.patch
diff -u packages/inetutils/inetutils-nolibs.patch:1.2 packages/inetutils/inetutils-nolibs.patch:1.3
--- packages/inetutils/inetutils-nolibs.patch:1.2	Sun Nov 19 22:11:31 2006
+++ packages/inetutils/inetutils-nolibs.patch	Sat Nov 13 14:32:04 2010
@@ -1,15 +1,13 @@
 --- inetutils-1.5/configure.ac.orig	2006-10-21 13:57:04.000000000 +0200
 +++ inetutils-1.5/configure.ac	2006-11-19 20:59:22.575311750 +0100
-@@ -131,11 +131,11 @@
+@@ -131,10 +131,10 @@
  gl_INIT
  
  ### Checks for libraries.
--AC_CHECK_LIB(bsd, revoke)
 -AC_CHECK_LIB(nsl, inet_ntoa)
 -AC_CHECK_LIB(resolv, gethostname)
 -AC_CHECK_LIB(socket, getpeername)
 -AC_CHECK_LIB(opie, opiegenerator)
-+AC_SEARCH_LIBS(revoke, bsd)
 +AC_SEARCH_LIBS(inet_ntoa, nsl)
 +AC_SEARCH_LIBS(gethostname, resolv)
 +AC_SEARCH_LIBS(getpeername, socket)

================================================================
Index: packages/inetutils/inetutils-tinfo.patch
diff -u packages/inetutils/inetutils-tinfo.patch:1.1 packages/inetutils/inetutils-tinfo.patch:1.2
--- packages/inetutils/inetutils-tinfo.patch:1.1	Sun Nov 19 22:13:23 2006
+++ packages/inetutils/inetutils-tinfo.patch	Sat Nov 13 14:32:04 2010
@@ -1,14 +1,14 @@
---- inetutils-1.5/acinclude.m4.orig	2006-10-11 23:46:22.000000000 +0200
-+++ inetutils-1.5/acinclude.m4	2006-11-19 21:38:12.412917500 +0100
-@@ -197,6 +197,7 @@
- dnl 
+--- inetutils-1.8/am/libcurses.m4.orig	2010-05-15 13:25:47.000000000 +0200
++++ inetutils-1.8/am/libcurses.m4	2010-11-13 08:52:51.651102452 +0100
+@@ -84,6 +84,7 @@
+ dnl
  AC_DEFUN([IU_LIB_TERMCAP], [
    AC_REQUIRE([IU_LIB_NCURSES])
 +  AC_CHECK_LIB(tinfo, tgetent, [LIBTERMCAP=-ltinfo], [
    if test "$LIBNCURSES"; then
      LIBTERMCAP="$LIBNCURSES"
    else
-@@ -208,6 +209,7 @@
+@@ -95,6 +96,7 @@
        AC_CHECK_LIB(termlib, tgetent, LIBTERMCAP=-ltermlib)
      fi
    fi

================================================================
Index: packages/inetutils/inetutils.spec
diff -u packages/inetutils/inetutils.spec:1.21 packages/inetutils/inetutils.spec:1.22
--- packages/inetutils/inetutils.spec:1.21	Mon Feb 16 12:43:01 2009
+++ packages/inetutils/inetutils.spec	Sat Nov 13 14:32:04 2010
@@ -14,12 +14,12 @@
 Summary:	Common networking utilities and servers
 Summary(pl.UTF-8):	Popularne narzędzia i serwery sieciowe
 Name:		inetutils
-Version:	1.6
+Version:	1.8
 Release:	0.1
 License:	GPL
 Group:		Networking/Utilities
 Source0:	http://ftp.gnu.org/gnu/inetutils/%{name}-%{version}.tar.gz
-# Source0-md5:	23cc24bc77751bf77d50a07a7395f9b3
+# Source0-md5:	ad8fdcdf1797b9ca258264a6b04e48fd
 # syslogd:
 Source1:	%{name}-syslog.conf
 Source2:	%{name}-syslog.init
@@ -36,9 +36,10 @@
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-nolibs.patch
 Patch2:		%{name}-tinfo.patch
+Patch3:		%{name}-man.patch
 URL:		http://www.gnu.org/software/inetutils/
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake >= 1:1.9
+BuildRequires:	automake >= 1:1.11
 # for config.rpath
 BuildRequires:	gettext-devel
 BuildRequires:	libwrap-devel
@@ -109,6 +110,19 @@
 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
+Summary(pl.UTF-8):	Program do konfiguracji interfejsów sieciowych z pakietu GNU inetutils
+Group:		Applications/Networking
+Requires:	%{name} = %{version}-%{release}
+
+%description ifconfig
+Network interfaces configuration program from GNU inetutils.
+
+%description ifconfig -l pl.UTF-8
+Program do konfiguracji interfejsów sieciowych, pochodzący z pakietu
+GNU inetutils.
+
 %package inetd
 Summary:	inetd server from GNU inetutils package
 Summary(pl.UTF-8):	Serwer inetd z pakietu GNU inetutils
@@ -156,6 +170,21 @@
 %description ping -l pl.UTF-8
 Narzędzie ping z pakietu GNU inetutils.
 
+%package rexec
+Summary:	rexec client from GNU inetutils package
+Summary(pl.UTF-8):	Klient rexec z pakietu GNU inetutils
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	rc-inetd
+Provides:	rexec
+Obsoletes:	rexec
+
+%description rexec
+rexec client from GNU inetutils package.
+
+%description rexec -l pl.UTF-8
+Klient rexec z pakietu GNU inetutils.
+
 %package rexecd
 Summary:	rexec server from GNU inetutils package
 Summary(pl.UTF-8):	Serwer rexec z pakietu GNU inetutils
@@ -397,15 +426,17 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-
-cp -f /usr/share/gettext/config.rpath build-aux
+%patch3 -p1
 
 %build
-%{__aclocal} -I m4
+cp -f /usr/share/gettext/config.rpath build-aux
+%{__aclocal} -I m4 -I am
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
 %configure \
+	--disable-silent-rules \
 	--with-pam \
 	--with-wrap
 
@@ -512,6 +543,12 @@
 %files hostname
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/hostname
+%{_mandir}/man1/hostname.1*
+
+%files ifconfig
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ifconfig
+%{_mandir}/man1/ifconfig.1*
 
 %files inetd
 %defattr(644,root,root,755)
@@ -525,10 +562,15 @@
 
 %files ping
 %defattr(644,root,root,755)
-%doc ping/TODO
 %attr(4754,root,adm) /bin/ping
 %attr(4754,root,adm) /bin/ping6
-%{_mandir}/man8/ping.8*
+%{_mandir}/man1/ping.1*
+%{_mandir}/man1/ping6.1*
+
+%files rexec
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rexec
+%{_mandir}/man1/rexec.1*
 
 %files rexecd
 %defattr(644,root,root,755)
@@ -565,7 +607,6 @@
 %attr(754,root,root) /etc/rc.d/init.d/syslog
 %attr(640,root,root) %ghost /var/log/*
 %attr(755,root,root) %{_sbindir}/syslogd
-%{_mandir}/man5/syslog.conf.5*
 %{_mandir}/man8/syslogd.8*
 
 %files talk
@@ -594,6 +635,7 @@
 %files traceroute
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/traceroute
+%{_mandir}/man1/traceroute.1*
 
 %files tftp
 %defattr(644,root,root,755)
@@ -608,11 +650,12 @@
 %files uucpd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/uucpd
+%{_mandir}/man8/uucpd.8*
 
 %files whois
 %defattr(644,root,root,755)
-%doc gwhois/{README,TODO}
 %attr(755,root,root) %{_bindir}/whois
+%{_mandir}/man1/whois.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -620,6 +663,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2010/11/13 13:32:04  qboosh
+- up to 1.8
+- updated info,nolibs,tinfo patches
+- added man patch
+
 Revision 1.21  2009/02/16 11:43:01  ankry
 - cosmetics
 

================================================================
Index: packages/inetutils/inetutils-man.patch
diff -u /dev/null packages/inetutils/inetutils-man.patch:1.1
--- /dev/null	Sat Nov 13 14:32:10 2010
+++ packages/inetutils/inetutils-man.patch	Sat Nov 13 14:32:04 2010
@@ -0,0 +1,96 @@
+--- inetutils-1.8/man/Makefile.am.orig	2010-05-15 13:25:47.000000000 +0200
++++ inetutils-1.8/man/Makefile.am	2010-11-13 10:18:06.303140164 +0100
+@@ -22,6 +22,7 @@
+       traceroute.1 uucpd.8 whois.1
+ 
+ dist_man1_MANS =
++dist_man8_MANS =
+ 
+ if ENABLE_hostname
+ dist_man1_MANS += hostname.1
+@@ -32,7 +33,7 @@
+ endif
+ 
+ if ENABLE_inetd
+-dist_man1_MANS += inetd.8
++dist_man8_MANS += inetd.8
+ endif
+ 
+ if ENABLE_ftp
+@@ -40,7 +41,7 @@
+ endif
+ 
+ if ENABLE_ftpd
+-dist_man1_MANS += ftpd.8
++dist_man8_MANS += ftpd.8
+ endif
+ 
+ if ENABLE_logger
+@@ -64,7 +65,7 @@
+ endif
+ 
+ if ENABLE_rexecd
+-dist_man1_MANS += rexecd.8
++dist_man8_MANS += rexecd.8
+ endif
+ 
+ if ENABLE_rlogin
+@@ -72,7 +73,7 @@
+ endif
+ 
+ if ENABLE_rlogind
+-dist_man1_MANS += rlogind.8
++dist_man8_MANS += rlogind.8
+ endif
+ 
+ if ENABLE_rsh
+@@ -80,11 +81,11 @@
+ endif
+ 
+ if ENABLE_rshd
+-dist_man1_MANS += rshd.8
++dist_man8_MANS += rshd.8
+ endif
+ 
+ if ENABLE_syslogd
+-dist_man1_MANS += syslogd.8
++dist_man8_MANS += syslogd.8
+ endif
+ 
+ if ENABLE_talk
+@@ -92,7 +93,7 @@
+ endif
+ 
+ if ENABLE_talkd
+-dist_man1_MANS += talkd.8
++dist_man8_MANS += talkd.8
+ endif
+ 
+ if ENABLE_telnet
+@@ -100,7 +101,7 @@
+ endif
+ 
+ if ENABLE_telnetd
+-dist_man1_MANS += telnetd.8
++dist_man8_MANS += telnetd.8
+ endif
+ 
+ if ENABLE_tftp
+@@ -108,7 +109,7 @@
+ endif
+ 
+ if ENABLE_tftpd
+-dist_man1_MANS += tftpd.8
++dist_man8_MANS += tftpd.8
+ endif
+ 
+ if ENABLE_traceroute
+@@ -116,7 +117,7 @@
+ endif
+ 
+ if ENABLE_uucpd
+-dist_man1_MANS += uucpd.8
++dist_man8_MANS += uucpd.8
+ endif
+ 
+ if ENABLE_whois
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/inetutils/inetutils-info.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/inetutils/inetutils-nolibs.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/inetutils/inetutils-tinfo.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/inetutils/inetutils.spec?r1=1.21&r2=1.22&f=u

More information about the pld-cvs-commit mailing list