Drop inetutils package.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 May 2014 17:42:50 +0000 (19:42 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 May 2014 17:42:50 +0000 (19:42 +0200)
This package just provides a very very outdated version
of ping which does not support many features as required
by cacti.

ping is now solely built in the iputils package and
a symlink for compatibility is created.

config/rootfiles/common/inetutils [deleted file]
config/rootfiles/common/iputils
lfs/inetutils [deleted file]
lfs/iputils
make.sh
src/patches/inetutils-1.4.2-daemon_fixes-1.patch [deleted file]
src/patches/inetutils-1.4.2-gcc4_fixes-3.patch [deleted file]

diff --git a/config/rootfiles/common/inetutils b/config/rootfiles/common/inetutils
deleted file mode 100644 (file)
index fb33fb0..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-bin/ping
-#usr/bin/ftp
-#usr/bin/rcp
-#usr/bin/rlogin
-#usr/bin/rsh
-#usr/bin/talk
-#usr/bin/tftp
-#usr/sbin/ftpd
-#usr/sbin/inetd
-#usr/sbin/rexecd
-#usr/sbin/rlogind
-#usr/sbin/rshd
-#usr/sbin/talkd
-#usr/sbin/tftpd
-#usr/sbin/uucpd
-#usr/share/info/inetutils.info
-#usr/share/info/inetutils.info-1
-#usr/share/info/inetutils.info-2
-#usr/share/info/inetutils.info-3
-#usr/share/man/man1/ftp.1
-#usr/share/man/man1/logger.1
-#usr/share/man/man1/rcp.1
-#usr/share/man/man1/rlogin.1
-#usr/share/man/man1/rsh.1
-#usr/share/man/man1/talk.1
-#usr/share/man/man1/telnet.1
-#usr/share/man/man1/tftp.1
-#usr/share/man/man5/syslog.conf.5
-#usr/share/man/man8/ftpd.8
-#usr/share/man/man8/inetd.8
-#usr/share/man/man8/ping.8
-#usr/share/man/man8/rexecd.8
-#usr/share/man/man8/rlogind.8
-#usr/share/man/man8/rshd.8
-#usr/share/man/man8/syslogd.8
-#usr/share/man/man8/talkd.8
-#usr/share/man/man8/telnetd.8
-#usr/share/man/man8/tftpd.8
diff --git a/lfs/inetutils b/lfs/inetutils
deleted file mode 100644 (file)
index ba87c9c..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.4.2
-
-THISAPP    = inetutils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = df0909a586ddac2b7a0d62795eea4206
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-3.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-daemon_fixes-1.patch
-       cd $(DIR_APP) && sed -i '/#include/a #include <stdlib.h>' libicmp/icmp_timestamp.c
-       cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
-                               --sysconfdir=/etc --localstatedir=/var \
-                               --mandir=/usr/share/man --infodir=/usr/share/info \
-                               --disable-logger --disable-syslogd --disable-telnet --disable-telnetd
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       mv -v /usr/bin/ping /bin
-
-       # Don't use whois command from here.
-       rm -vf /usr/bin/whois
-
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
index deb9235..9310c1f 100644 (file)
@@ -74,6 +74,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-20020927-rh.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iputils-glibckernheaders.patch
        cd $(DIR_APP) && make ping
-       cd $(DIR_APP) && install -m 0755 ping /usr/bin
+       cd $(DIR_APP) && install -m 4755 ping /usr/bin
+
+       # Some scripts expect ping in /bin/ping.
+       ln -svf ../usr/bin/ping /bin/ping
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 37339ed..a9bcdc4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -351,7 +351,6 @@ buildbase() {
     lfsmake2 groff
     lfsmake2 gperf
     lfsmake2 gzip
-    lfsmake2 inetutils
     lfsmake2 iproute2
     lfsmake2 jwhois
     lfsmake2 kbd
diff --git a/src/patches/inetutils-1.4.2-daemon_fixes-1.patch b/src/patches/inetutils-1.4.2-daemon_fixes-1.patch
deleted file mode 100644 (file)
index c57f9ae..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2005-03-23
-Initial Package Version: 1.4.2
-Upstream Status:         Not sure
-Origin:                  Internet (URL's are now lost)
-Description:             Fix the rexecd daemon so that it understands shadow
-                         passwords. Fix the rshd daemon so that it properly
-                         resolves hostnames.
-
-diff -Naur inetutils-1.4.2-orig/rexecd/rexecd.c inetutils-1.4.2/rexecd/rexecd.c
---- inetutils-1.4.2-orig/rexecd/rexecd.c       2002-12-11 12:38:00.000000000 +0000
-+++ inetutils-1.4.2/rexecd/rexecd.c    2005-02-22 19:53:44.146962264 +0000
-@@ -79,6 +79,10 @@
- #include <varargs.h>
- #endif
-+#ifdef HAVE_SHADOW_H
-+#include <shadow.h>
-+#endif
-+
- void error __P ((const char *fmt, ...));
- /*
-  * remote execute server:
-@@ -127,6 +131,10 @@
-       char *cmdbuf, *cp, *namep;
-       char *user, *pass;
-       struct passwd *pwd;
-+#ifdef HAVE_SHADOW_H
-+      struct spwd *spwd;
-+      char *pw_field;
-+#endif
-       int s;
-       u_short port;
-       int pv[2], pid, cc;
-@@ -186,6 +194,24 @@
-               exit(1);
-       }
-       endpwent();
-+
-+#ifdef HAVE_SHADOW_H
-+      // Get encrypted password from /etc/shadow if possible,
-+      // else from /etc/passwd.
-+      spwd = getspnam(user);
-+      if (spwd) {
-+              pw_field = spwd->sp_pwdp;
-+      } else {
-+              pw_field = pwd->pw_passwd;
-+      }
-+      if (*pw_field != '\0') {
-+              namep = CRYPT (pass, pw_field);
-+              if (strcmp(namep, pw_field)) {
-+                      error("Password incorrect.\n");
-+                      exit(1);
-+              }
-+      }
-+#else
-       if (*pwd->pw_passwd != '\0') {
-               namep = CRYPT (pass, pwd->pw_passwd);
-               if (strcmp(namep, pwd->pw_passwd)) {
-@@ -193,6 +219,7 @@
-                       exit(1);
-               }
-       }
-+#endif
-       write(STDERR_FILENO, "\0", 1);
-       if (port) {
-               pipe(pv);
-diff -Naur inetutils-1.4.2-orig/rshd/rshd.c inetutils-1.4.2/rshd/rshd.c
---- inetutils-1.4.2-orig/rshd/rshd.c   2002-12-11 12:38:00.000000000 +0000
-+++ inetutils-1.4.2/rshd/rshd.c        2005-02-22 19:54:33.162510768 +0000
-@@ -443,7 +443,7 @@
-       dup2 (sockfd, STDERR_FILENO);
-     }
--  /* Get the "name" of the clent form its Internet address.
-+  /* Get the "name" of the client form its Internet address.
-    * This is used for the autentication below
-    */
-   errorstr = NULL;
-@@ -457,52 +457,49 @@
-        * in a remote net; look up the name and check that this
-        * address corresponds to the name.
-        */
--      hostname = strdup (hp->h_name);
-+      const char *remotehost = strdup(hp->h_name);
- #ifdef        KERBEROS
-       if (!use_kerberos)
- #endif
--      if (check_all || local_domain (hp->h_name))
-+       if (! remotehost)
-+           errorstr = "Out of memory\n";
-+       else if (check_all || local_domain (remotehost))
-         {
--          char *remotehost = (char *) alloca (strlen (hp->h_name) + 1);
--          if (! remotehost)
--            errorstr = "Out of memory\n";
--          else
-+           errorhost = remotehost;
-+           hp = gethostbyname (remotehost);
-+           if (hp == NULL)
-             {
--              strcpy (remotehost, hp->h_name);
--              errorhost = remotehost;
--              hp = gethostbyname (remotehost);
--              if (hp == NULL)
-+               syslog (LOG_INFO,
-+                       "Couldn't look up address for %s", remotehost);
-+                       errorstr = "Couldn't look up address for your host (%s)\n";
-+                       hostname = strdup(inet_ntoa(fromp->sin_addr));
-+             }
-+           else
-+              {
-+               for (; ; hp->h_addr_list++)
-                 {
--                  syslog (LOG_INFO,
--                          "Couldn't look up address for %s", remotehost);
--                  errorstr = "Couldn't look up address for your host (%s)\n";
--                  hostname = inet_ntoa (fromp->sin_addr);
-+                   if (hp->h_addr_list[0] == NULL)
-+                     {
-+                       syslog (LOG_NOTICE,
-+                               "Host addr %s not listed for host %s",
-+                               inet_ntoa (fromp->sin_addr), hp->h_name);
-+                       errorstr = "Host address mismatch for %s\n";
-+                       hostname = strdup(inet_ntoa(fromp->sin_addr));
-+                       break;
-+                     }
-+                   if (!memcmp (hp->h_addr_list[0],
-+                               (caddr_t)&fromp->sin_addr,
-+                               sizeof fromp->sin_addr))
-+                     {
-+                       hostname = strdup(hp->h_name);
-+                       break; /* equal, OK */
-+                     }
-                 }
--              else
--                for (; ; hp->h_addr_list++)
--                  {
--                    if (hp->h_addr_list[0] == NULL)
--                      {
--                        syslog (LOG_NOTICE,
--                                "Host addr %s not listed for host %s",
--                                inet_ntoa (fromp->sin_addr), hp->h_name);
--                        errorstr = "Host address mismatch for %s\n";
--                        hostname = inet_ntoa (fromp->sin_addr);
--                        break;
--                      }
--                    if (!memcmp (hp->h_addr_list[0],
--                                 (caddr_t)&fromp->sin_addr,
--                                 sizeof fromp->sin_addr))
--                      {
--                        hostname = hp->h_name;
--                        break; /* equal, OK */
--                      }
--                  }
--            }
-+              }
-         }
-     }
-   else
--    errorhost = hostname = inet_ntoa (fromp->sin_addr);
-+    errorhost = hostname = strdup(inet_ntoa(fromp->sin_addr));
- #ifdef        KERBEROS
-   if (use_kerberos)
-
diff --git a/src/patches/inetutils-1.4.2-gcc4_fixes-3.patch b/src/patches/inetutils-1.4.2-gcc4_fixes-3.patch
deleted file mode 100644 (file)
index fd7d847..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-Submitted By: Matthew Burgess <matthew@linuxfromscratch.org>
-Date: 2005-08-30
-Initial Package Version: 1.4.2
-Upstream Status: From upstream
-Origin: Greg Schafer <gschafer@zip.com.au> (http://www.diy-linux.org/downloads/patches/GCC4/inetutils-1.4.2-gcc4-fixes-1.patch)
-Description: Fix compilation issues with gcc4
-
-diff -Naur inetutils-1.4.2.orig/ftp/ftp_var.h inetutils-1.4.2/ftp/ftp_var.h
---- inetutils-1.4.2.orig/ftp/ftp_var.h 2000-07-08 01:00:53.000000000 +0000
-+++ inetutils-1.4.2/ftp/ftp_var.h      2005-08-30 20:25:27.205932304 +0000
-@@ -36,8 +36,6 @@
- #include <sys/param.h>
- #include <setjmp.h>
--#include "extern.h"
--
- #ifndef FTP_EXTERN
- #define FTP_EXTERN extern
- #endif
-@@ -129,3 +127,5 @@
- FTP_EXTERN int macnum;                        /* number of defined macros */
- FTP_EXTERN struct macel macros[16];
- FTP_EXTERN char macbuf[4096];
-+
-+#include "extern.h"
-diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c
---- inetutils-1.4.2.orig/libinetutils/ttymsg.c 2001-11-01 15:52:19.000000000 +0000
-+++ inetutils-1.4.2/libinetutils/ttymsg.c      2005-08-30 20:24:27.168059448 +0000
-@@ -132,7 +132,7 @@
-           }
-         if (wret)
-           {
--            (char *)iov->iov_base += wret;
-+            iov->iov_base = (char *)iov->iov_base + wret;
-             iov->iov_len -= wret;
-           }
-         continue;