[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-241-g03bfa
|
From: |
Mats Erik Andersson |
|
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-241-g03bfa11 |
|
Date: |
Thu, 24 Jan 2013 15:49:41 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via 03bfa11f0e61d5babc11df6ea2dfa92a0644ec47 (commit)
via b1d8390d0a62254943dee1944ba549abba3e376e (commit)
via 9f586013083f6741fe4b164ea82fc7b658d1cf66 (commit)
from 63f4ad499f4a3b90f16995b47e53439adb6f9cd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=03bfa11f0e61d5babc11df6ea2dfa92a0644ec47
commit 03bfa11f0e61d5babc11df6ea2dfa92a0644ec47
Author: Mats Erik Andersson <address@hidden>
Date: Tue Jan 22 23:45:16 2013 +0100
traceroute: Source routing.
diff --git a/ChangeLog b/ChangeLog
index 4a85108..2dca504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2013-01-22 Mats Erik Andersson <address@hidden>
+
+ traceroute: Loose source routing.
+
+ * src/traceroute.c [HAVE_NETINET_IP_VAR_H]:
+ Include <netinet/ip_var.h>.
+ (len_ip_opts, ip_opts, opt_gateways) [IP_OPTIONS]:
+ New variables.
+ (argp_options) [IP_OPTIONS]: New option `-g/--gateways'.
+ (parse_opt) [IP_OPTIONS] <'g'>: New case.
+ (main): Call trace_ip_opts().
+ (trace_init) [IP_OPTIONS]: If `len_ip_opts' is positive,
+ call setsockopt(IP_OPTIONS).
+ (trace_ip_opts): New function.
+
+ traceroute: Settable maximal hop count.
+
+ * src/traceroute.c (argp_options): New option `-m/--max-hop'.
+ (parse_opt) <'m'>: New case.
+ (main): Exit with EXIT_FAILURE if HOP exceeds `opt_max_hops'.
+
2013-01-21 Guillem Jover <address@hidden>
Cleanup automake variables.
diff --git a/NEWS b/NEWS
index 02fccce..06a7780 100644
--- a/NEWS
+++ b/NEWS
@@ -46,8 +46,8 @@ New switch `-k/--realm'.
* traceroute
Default mode is now UDP, for better conformity with Unices.
-New switches `-f/--first-hop', `-I/--icmp', `-t/--tos', and
-`-w/--wait'.
+New switches `-f/--first-hop', `-g/--gateways', `-I/--icmp',
+`-m/--max-hop', `-t/--tos', and `-w/--wait'.
* ftpd
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 954c2b9..aceb33f 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -889,12 +889,32 @@ properties closer to the target host, skipping routers
close
to the local host. Quicker analysis of problems known to lie
at some routing distance is the outcome.
address@hidden -g @var{gates}
address@hidden address@hidden
address@hidden -g
address@hidden --gateways
+Set intermediary hosts used in loose source routing.
+The argument @var{gates} is a list of gateways,
+using spaces, commata, or semicola as separators.
+These hosts must be traversed in the given order
+before the intended host receives any datagram.
+At most eight host names or addresses may be specified.
+
@item -I
@itemx --icmp
@opindex -I
@opindex --icmp
Use ICMP ECHO datagrams for probing the remote host.
address@hidden -m @var{num}
address@hidden address@hidden
address@hidden -m
address@hidden --max-hop
+Set the maximum time-to-live allowed for probing.
+In other words, stop probing when the hop distance
+is in excess of @var{num}.
+The default limit is 64.
+
@item -M @var{method}
@itemx address@hidden
@opindex -M
diff --git a/src/traceroute.c b/src/traceroute.c
index d6f75f0..63c6474 100644
--- a/src/traceroute.c
+++ b/src/traceroute.c
@@ -31,6 +31,9 @@
#include <netinet/ip.h>
/* #include <netinet/ip_icmp.h> -- Deliberately not including this
since the definitions in use are being pulled in by libicmp. */
+#ifdef HAVE_NETINET_IP_VAR_H
+# include <netinet/ip_var.h>
+#endif
#include <arpa/inet.h>
#include <netdb.h>
@@ -79,6 +82,7 @@ typedef struct trace
void trace_init (trace_t * t, const struct sockaddr_in to,
const enum trace_type type);
+void trace_ip_opts (struct sockaddr_in *to);
void trace_inc_ttl (trace_t * t);
void trace_inc_port (trace_t * t);
void trace_port (trace_t * t, const unsigned short port);
@@ -101,6 +105,11 @@ static char *hostname = NULL;
char addrstr[INET6_ADDRSTRLEN];
struct sockaddr_in dest;
+#ifdef IP_OPTIONS
+size_t len_ip_opts = 0;
+char ip_opts[MAX_IPOPTLEN];
+#endif /* IP_OPTIONS */
+
/* Cause for destination unreachable reply,
* encoded as a single character.
*/
@@ -114,6 +123,9 @@ int opt_resolve_hostnames = 0;
int opt_tos = -1; /* Triggers with non-negative values. */
int opt_ttl = TRACE_TTL;
int opt_wait = TIME_INTERVAL;
+#ifdef IP_OPTIONS
+char *opt_gateways = NULL;
+#endif
const char args_doc[] = "HOST";
const char doc[] = "Print the route packets trace to network host.";
@@ -131,7 +143,12 @@ static struct argp_option argp_options[] = {
#define GRP 0
{"first-hop", 'f', "NUM", 0, "set initial hop distance, i.e., time-to-live",
GRP+1},
+#ifdef IP_OPTIONS
+ {"gateways", 'g', "GATES", 0, "list of gateways for loose source routing",
+ GRP+1},
+#endif
{"icmp", 'I', NULL, 0, "use ICMP ECHO as probe", GRP+1},
+ {"max-hop", 'm', "NUM", 0, "set maximal hop count (default: 64)", GRP+1},
{"port", 'p', "PORT", 0, "use destination PORT port (default: 33434)",
GRP+1},
{"resolve-hostnames", OPT_RESOLVE, NULL, 0, "resolve hostnames", GRP+1},
@@ -160,10 +177,22 @@ parse_opt (int key, char *arg, struct argp_state *state)
error (EXIT_FAILURE, 0, "impossible distance `%s'", arg);
break;
+#ifdef IP_OPTIONS
+ case 'g':
+ opt_gateways = xstrdup (arg);
+ break;
+#endif /* IP_OPTIONS */
+
case 'I':
opt_type = TRACE_ICMP;
break;
+ case 'm':
+ opt_max_hops = strtol (arg, &p, 0);
+ if (*p || opt_max_hops <= 0 || opt_max_hops > 255)
+ error (EXIT_FAILURE, 0, "invalid hops value `%s'", arg);
+ break;
+
case 'p':
opt_port = strtol (arg, &p, 0);
if (*p || opt_port <= 0 || opt_port > 65536)
@@ -284,6 +313,8 @@ main (int argc, char **argv)
freeaddrinfo (res);
+ trace_ip_opts (&dest);
+
trace_init (&trace, dest, opt_type);
hop = 1;
@@ -292,7 +323,7 @@ main (int argc, char **argv)
while (!stop)
{
if (hop > opt_max_hops)
- exit (EXIT_SUCCESS);
+ exit (EXIT_FAILURE);
do_try (&trace, hop, opt_max_hops, opt_max_tries);
trace_inc_ttl (&trace);
trace_inc_port (&trace);
@@ -474,6 +505,13 @@ trace_init (trace_t * t, const struct sockaddr_in to,
if (setsockopt (fd, IPPROTO_IP, IP_TOS,
&opt_tos, sizeof (opt_tos)) < 0)
error (0, errno, "setsockopt(IP_TOS)");
+
+#ifdef IP_OPTIONS
+ if (len_ip_opts)
+ if (setsockopt (fd, IPPROTO_IP, IP_OPTIONS,
+ &ip_opts, len_ip_opts) < 0)
+ error (0, errno, "setsockopt(IPOPT_LSRR)");
+#endif /* IP_OPTIONS */
}
void
@@ -698,3 +736,80 @@ trace_inc_port (trace_t * t)
if (t->type == TRACE_UDP)
t->to.sin_port = htons (ntohs (t->to.sin_port) + 1);
}
+
+void
+trace_ip_opts (struct sockaddr_in *to)
+{
+#ifdef IP_OPTIONS
+ if (opt_gateways && *opt_gateways)
+ {
+ char *gateway, *optbase;
+ struct addrinfo hints, *res;
+
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_family = AF_INET;
+ hints.ai_socktype = SOCK_DGRAM;
+
+ memset (&ip_opts, 0, sizeof (ip_opts));
+ optbase = ip_opts;
+
+ /* Set up any desired options. Keep
+ * `optbase' updated, pointing to the
+ * part presently under construction.
+ */
+
+ /* 1. Loose source routing. */
+ gateway = opt_gateways;
+ optbase[IPOPT_OPTVAL] = IPOPT_LSRR;
+ optbase[IPOPT_OLEN] = IPOPT_MINOFF - 1; /* No payload yet. */
+ optbase[IPOPT_OFFSET] = IPOPT_MINOFF; /* Empty payload. */
+
+ /* Traverse the gateway list, inserting
+ * addresses in the stated order. Take
+ * care not to overflow available space.
+ */
+ while (gateway && *gateway
+ && optbase[IPOPT_OFFSET]
+ < (int) (MAX_IPOPTLEN - sizeof (struct in_addr)))
+ {
+ int rc;
+ char *p;
+
+ p = strpbrk (gateway, " ,;:");
+ if (p)
+ *p++ = '\0';
+
+ rc = getaddrinfo (gateway, NULL, &hints, &res);
+ if (rc)
+ error (EXIT_FAILURE, errno, "gateway `%s' %s",
+ gateway, gai_strerror(rc));
+
+ /* Put target into next unused slot. */
+ memcpy (optbase + optbase[IPOPT_OLEN],
+ &((struct sockaddr_in *) res->ai_addr)->sin_addr,
+ sizeof (struct in_addr));
+
+ freeaddrinfo (res);
+
+ /* Option gained in length. */
+ optbase[IPOPT_OLEN] += sizeof (struct in_addr);
+
+ gateway = p;
+ }
+
+ if (gateway && *gateway)
+ error (EXIT_FAILURE, 0, "too many gateways specified");
+
+ /* Append the final destination. */
+ memcpy (optbase + optbase[IPOPT_OLEN],
+ &to->sin_addr, sizeof (to->sin_addr));
+ optbase[IPOPT_OLEN] += sizeof (to->sin_addr);
+
+ /* 2. There is an implicit IPOPT_EOL after
+ * IPOPT_LSRR, ensured by the call to memset().
+ * Use it!
+ */
+ len_ip_opts = optbase[IPOPT_OLEN] + 1;
+ }
+#endif /* IP_OPTIONS */
+}
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=b1d8390d0a62254943dee1944ba549abba3e376e
commit b1d8390d0a62254943dee1944ba549abba3e376e
Author: Guillem Jover <address@hidden>
Date: Mon Jan 21 16:03:05 2013 +0100
Cleanup automake variables.
diff --git a/ChangeLog b/ChangeLog
index b0a8bac..4a85108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-01-21 Guillem Jover <address@hidden>
+
+ Cleanup automake variables.
+
+ * ftp/Makefile.am (AM_CPPFLAGS): Consume depreciated
+ macro INCLUDES.
+ * ftpd/Makefile.am, ifconfig/Makefile.am,
+ libinetutils/Makefile.am: Likewise.
+ * libls/Makefile.am (AM_CPPFLAGS): Rename INCLUDES.
+ * libtelnet/Makefile.am: Likewise.
+ * ping/Makefile.am (AM_CPPFLAGS): Likewise.
+ (LDADD): New macro.
+ (ping_LDADD): Simplify using LDADD.
+ (ping6_LDADD): Remove.
+ * src/Makefile.am (AM_CPPFLAGS): Consume INCLUDES.
+ * talkd/Makefile.am, telnet/Makefile.am,
+ telnetd/Makefile.am: Likewise.
+ * talk/Makefile.am (AM_CPPFLAGS): Rename INCLUDES.
+ * whois/Makefile.am: Likewise.
+
2013-01-21 Mats Erik Andersson <address@hidden>
* configure.ac (AM_C_PROTOTYPES): Remove obsolete macro.
diff --git a/ftp/Makefile.am b/ftp/Makefile.am
index 0d5ec3f..3d134c7 100644
--- a/ftp/Makefile.am
+++ b/ftp/Makefile.am
@@ -18,6 +18,16 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
address@hidden@
+
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ $(PATHDEF_TMP) $(PATHDEF_BSHELL)
+
+LDADD = \
+ $(iu_LIBRARIES) \
+ $(LIBGLOB) $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
+
bin_PROGRAMS = $(ftp_BUILD)
EXTRA_PROGRAMS = ftp
@@ -25,10 +35,3 @@ EXTRA_PROGRAMS = ftp
ftp_SOURCES = cmds.c cmdtab.c domacro.c ftp.c main.c ruserpass.c
noinst_HEADERS = extern.h ftp_var.h
-
address@hidden@
-
-INCLUDES = $(iu_INCLUDES)
-AM_CPPFLAGS = $(PATHDEF_TMP) $(PATHDEF_BSHELL)
-
-LDADD = $(iu_LIBRARIES) $(LIBGLOB) $(LIBREADLINE) $(LIBTERMCAP) $(LIBHISTORY)
diff --git a/ftpd/Makefile.am b/ftpd/Makefile.am
index dd54ba7..a6dc2a3 100644
--- a/ftpd/Makefile.am
+++ b/ftpd/Makefile.am
@@ -18,6 +18,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
address@hidden@
+
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
+ $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
+ $(PATHDEF_DEVNULL) $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL)
+
+LDADD = \
+ $(LIBLS) \
+ $(iu_LIBRARIES) \
+ $(LIBCRYPT) $(LIBWRAP) $(FTPD_LIBPAM) $(LIBDL)
+
inetdaemondir = @inetdaemondir@
inetdaemon_PROGRAMS = $(ftpd_BUILD)
@@ -29,13 +42,4 @@ ftpd_SOURCES = ftpcmd.y ftpd.c popen.c pam.c auth.c \
noinst_HEADERS = extern.h
address@hidden@
-
-INCLUDES = $(iu_INCLUDES)
-AM_CPPFLAGS = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
- $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
- $(PATHDEF_DEVNULL) $(PATHDEF_NOLOGIN) $(PATHDEF_BSHELL)
-
-LDADD = $(LIBLS) $(LIBCRYPT) $(LIBWRAP) $(FTPD_LIBPAM) $(LIBDL) $(iu_LIBRARIES)
-
EXTRA_DIST = ftpcmd.c
diff --git a/ifconfig/Makefile.am b/ifconfig/Makefile.am
index 7cd0e16..89dec27 100644
--- a/ifconfig/Makefile.am
+++ b/ifconfig/Makefile.am
@@ -19,6 +19,15 @@
SUBDIRS = system
address@hidden@
+
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ $(PATHDEF_PROCNET_DEV)
+
+LDADD = \
+ $(iu_LIBRARIES)
+
bin_PROGRAMS = $(ifconfig_BUILD)
EXTRA_PROGRAMS = ifconfig
@@ -26,8 +35,3 @@ EXTRA_PROGRAMS = ifconfig
ifconfig_SOURCES = ifconfig.c flags.c changeif.c options.c printif.c system.c
noinst_HEADERS = ifconfig.h flags.h options.h printif.h system.h
-
address@hidden@
-AM_CPPFLAGS = $(PATHDEF_PROCNET_DEV)
-INCLUDES = $(iu_INCLUDES)
-LDADD = $(iu_LIBRARIES)
diff --git a/libinetutils/Makefile.am b/libinetutils/Makefile.am
index 7c599bc..db98f38 100644
--- a/libinetutils/Makefile.am
+++ b/libinetutils/Makefile.am
@@ -18,6 +18,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
address@hidden@
+
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) $(INCAUTH) \
+ $(PATHDEF_WTMPX) $(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL) \
+ $(PATHDEF_HEQUIV)
+
noinst_LIBRARIES = libinetutils.a
noinst_HEADERS = argcv.h libinetutils.h tftpsubs.h shishi_def.h
@@ -41,9 +48,3 @@ libinetutils_a_SOURCES = \
ttymsg.c\
utmp_init.c\
utmp_logout.c
-
address@hidden@
-
-AM_CPPFLAGS = $(PATHDEF_WTMPX) $(PATHDEF_TTY_PFX) $(PATHDEF_DEVNULL)
$(PATHDEF_HEQUIV)
-
-INCLUDES = $(iu_INCLUDES) $(INCAUTH)
diff --git a/libls/Makefile.am b/libls/Makefile.am
index 6dedddb..202596d 100644
--- a/libls/Makefile.am
+++ b/libls/Makefile.am
@@ -17,6 +17,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
+AM_CPPFLAGS = \
+ $(iu_INCLUDES)
+
noinst_LIBRARIES = $(libls_BUILD)
EXTRA_LIBRARIES = libls.a
@@ -24,5 +27,3 @@ EXTRA_LIBRARIES = libls.a
libls_a_SOURCES = cmp.c stat_flags.c ls.c print.c util.c fts.c
noinst_HEADERS = extern.h ls.h fts.h
-
-INCLUDES = $(iu_INCLUDES)
diff --git a/libtelnet/Makefile.am b/libtelnet/Makefile.am
index 87cb583..ba8b28e 100644
--- a/libtelnet/Makefile.am
+++ b/libtelnet/Makefile.am
@@ -18,10 +18,16 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
-INCLUDES = $(iu_INCLUDES) $(INCAUTH)
+AM_CPPFLAGS = \
+ $(INCAUTH) \
+ $(iu_INCLUDES)
noinst_LIBRARIES = libtelnet.a
-libtelnet_a_SOURCES = auth.c enc_des.c encrypt.c forward.c genget.c kerberos.c
kerberos5.c misc.c read_passwd.c shishi.c
+libtelnet_a_SOURCES = \
+ auth.c enc_des.c encrypt.c forward.c genget.c \
+ kerberos.c kerberos5.c misc.c read_passwd.c shishi.c
-noinst_HEADERS = auth-proto.h auth.h enc-proto.h encrypt.h genget.h
key-proto.h misc-proto.h misc.h
+noinst_HEADERS = \
+ auth-proto.h auth.h enc-proto.h encrypt.h genget.h key-proto.h \
+ misc-proto.h misc.h
diff --git a/ping/Makefile.am b/ping/Makefile.am
index 0b51189..d8d5fc5 100644
--- a/ping/Makefile.am
+++ b/ping/Makefile.am
@@ -18,13 +18,20 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ -I$(top_srcdir)/libicmp \
+ $(INCIDN)
+
+LDADD = \
+ $(iu_LIBRARIES) \
+ $(LIBIDN)
+
bin_PROGRAMS = $(ping_BUILD) $(ping6_BUILD)
EXTRA_PROGRAMS = ping ping6
-ping_LDADD = $(iu_LIBRARIES) $(top_builddir)/libicmp/libicmp.a $(LIBIDN)
-ping6_LDADD = $(iu_LIBRARIES) $(LIBIDN)
-INCLUDES = $(iu_INCLUDES) -I$(top_srcdir)/libicmp $(INCIDN)
+ping_LDADD = $(top_builddir)/libicmp/libicmp.a $(LDADD)
ping_SOURCES = ping.c ping_common.c ping_echo.c ping_address.c \
ping_router.c ping_timestamp.c ping_common.h ping_impl.h ping.h libping.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7242eb4..661612c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,16 +18,30 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
-inetdaemondir = @inetdaemondir@
address@hidden@
# Initialise variables.
-LDADD = $(iu_LIBRARIES) $(LIBUTIL)
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) $(INCAUTH) $(INCIDN) \
+ -I$(top_srcdir)/libicmp \
+ $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP) \
+ $(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) \
+ $(PATHDEF_INETDDIR) $(PATHDEF_INETDPID) $(PATHDEF_KLOG) \
+ $(PATHDEF_LOG) $(PATHDEF_LOGCONF) \
+ $(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) \
+ $(PATHDEF_RLOGIN) $(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) \
+ $(PATHDEF_UTMP) $(PATHDEF_UTMPX) $(PATHDEF_UUCICO)
+
+LDADD = \
+ $(iu_LIBRARIES) \
+ $(LIBUTIL)
+
+inetdaemondir = @inetdaemondir@
inetdaemon_PROGRAMS =
bin_PROGRAMS =
EXTRA_PROGRAMS =
-
bin_PROGRAMS += $(hostname_BUILD)
hostname_SOURCES = hostname.c
EXTRA_PROGRAMS += hostname
@@ -100,10 +114,6 @@ uucpd_SOURCES = uucpd.c
uucpd_LDADD = $(LDADD) $(LIBCRYPT)
EXTRA_PROGRAMS += uucpd
-INCLUDES = $(iu_INCLUDES) $(INCAUTH) -I$(top_srcdir)/libicmp $(INCIDN)
-
-AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_CONSOLE) $(PATHDEF_CP)
$(PATHDEF_DEFPATH) $(PATHDEF_DEV) $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR)
$(PATHDEF_INETDPID) $(PATHDEF_KLOG) $(PATHDEF_LOG) $(PATHDEF_LOGCONF)
$(PATHDEF_LOGIN) $(PATHDEF_LOGPID) $(PATHDEF_NOLOGIN) $(PATHDEF_RLOGIN)
$(PATHDEF_RSH) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) $(PATHDEF_UTMP)
$(PATHDEF_UTMPX) $(PATHDEF_UUCICO)
-
SUIDMODE = -o root -m 4775
install-exec-hook: $(traceroute_INSTALL_HOOK) $(rsh_INSTALL_HOOK)
$(rlogin_INSTALL_HOOK) $(rcp_INSTALL_HOOK)
@@ -135,5 +145,3 @@ install-rcp-hook:
echo "WARNING: insufficient access; not installing rcp"; \
echo "NOTE: To install rcp run 'make install' as root"; \
fi
-
address@hidden@
diff --git a/talk/Makefile.am b/talk/Makefile.am
index 77e25e6..ce0f99b 100644
--- a/talk/Makefile.am
+++ b/talk/Makefile.am
@@ -18,6 +18,14 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ $(NCURSES_INCLUDE)
+
+LDADD = \
+ $(iu_LIBRARIES) \
+ $(LIBCURSES)
+
bin_PROGRAMS = $(talk_BUILD)
EXTRA_PROGRAMS = talk
@@ -25,7 +33,3 @@ EXTRA_PROGRAMS = talk
talk_SOURCES = ctl.c ctl_transact.c display.c get_addrs.c get_names.c
init_disp.c invite.c io.c look_up.c msgs.c talk.c
noinst_HEADERS = talk.h talk_ctl.h
-
-INCLUDES = $(iu_INCLUDES) $(NCURSES_INCLUDE)
-
-LDADD = $(iu_LIBRARIES) $(LIBCURSES)
diff --git a/talkd/Makefile.am b/talkd/Makefile.am
index f654a05..e31fbb0 100644
--- a/talkd/Makefile.am
+++ b/talkd/Makefile.am
@@ -18,6 +18,15 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
address@hidden@
+
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ $(PATHDEF_DEV) \
+ $(PATHDEF_TTY_PFX) $(PATHDEF_UTMP) $(PATHDEF_UTMPX)
+
+LDADD = $(iu_LIBRARIES)
+
inetdaemondir = @inetdaemondir@
inetdaemon_PROGRAMS = $(talkd_BUILD)
@@ -32,9 +41,3 @@ talkd_SOURCES = \
table.c\
talkd.c\
intalkd.h
-
address@hidden@
-
-AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY_PFX) $(PATHDEF_UTMP)
$(PATHDEF_UTMPX)
-INCLUDES = $(iu_INCLUDES)
-LDADD = $(iu_LIBRARIES)
diff --git a/telnet/Makefile.am b/telnet/Makefile.am
index a18f9a0..29b3bcb 100644
--- a/telnet/Makefile.am
+++ b/telnet/Makefile.am
@@ -18,6 +18,17 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
+AM_CPPFLAGS = \
+ -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK \
+ $(iu_INCLUDES) \
+ -I$(top_srcdir) \
+ $(NCURSES_INCLUDE)
+
+LDADD = \
+ $(top_builddir)/libtelnet/libtelnet.a \
+ $(iu_LIBRARIES) \
+ $(LIBTERMCAP) $(LIBCRYPT) $(LIBAUTH)
+
bin_PROGRAMS = $(telnet_BUILD)
EXTRA_PROGRAMS = telnet
@@ -26,8 +37,3 @@ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c
sys_bsd.c \
telnet.c terminal.c tn3270.c utilities.c
noinst_HEADERS = defines.h externs.h general.h ring.h types.h
-
-INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(NCURSES_INCLUDE)
-AM_CPPFLAGS = -DTERMCAP -DLINEMODE -DKLUDGELINEMODE -DENV_HACK
-
-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP)
$(LIBCRYPT) $(LIBAUTH)
diff --git a/telnetd/Makefile.am b/telnetd/Makefile.am
index e18943a..4c4ec90 100644
--- a/telnetd/Makefile.am
+++ b/telnetd/Makefile.am
@@ -18,6 +18,19 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
address@hidden@
+
+AM_CPPFLAGS = \
+ $(iu_INCLUDES) \
+ -I$(top_srcdir) \
+ $(INCAUTH) $(NCURSES_INCLUDE) \
+ $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) $(PATHDEF_LOGIN)
+
+LDADD = \
+ $(top_builddir)/libtelnet/libtelnet.a \
+ $(iu_LIBRARIES) \
+ $(LIBTERMCAP) $(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
+
inetdaemondir = @inetdaemondir@
inetdaemon_PROGRAMS = $(telnetd_BUILD)
@@ -25,11 +38,5 @@ inetdaemon_PROGRAMS = $(telnetd_BUILD)
EXTRA_PROGRAMS = telnetd
telnetd_SOURCES = telnetd.c pty.c term.c utility.c state.c termstat.c slc.c
-noinst_HEADERS = telnetd.h
address@hidden@
-
-AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_TTY_PFX) $(PATHDEF_LOGIN)
-INCLUDES = $(iu_INCLUDES) -I$(top_srcdir) $(INCAUTH) $(NCURSES_INCLUDE)
-
-LDADD = $(iu_LIBRARIES) $(top_builddir)/libtelnet/libtelnet.a $(LIBTERMCAP)
$(LIBUTIL) $(LIBCRYPT) $(LIBAUTH)
+noinst_HEADERS = telnetd.h
diff --git a/whois/Makefile.am b/whois/Makefile.am
index 5d59cf7..f554a21 100644
--- a/whois/Makefile.am
+++ b/whois/Makefile.am
@@ -17,6 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see `http://www.gnu.org/licenses/'.
+AM_CPPFLAGS = $(iu_INCLUDES)
+
+LDADD = $(iu_LIBRARIES)
+
bin_PROGRAMS = $(whois_BUILD)
EXTRA_PROGRAMS = whois
@@ -28,10 +32,8 @@ EXTRA_DIST = as_del_list ip_del_list tld_serv_list \
as_del.h ip_del.h tld_serv.h
noinst_HEADERS = data.h as_del.h ip_del.h tld_serv.h whois.h
-BUILT_SOURCES = as_del.h ip_del.h tld_serv.h
-INCLUDES = $(iu_INCLUDES)
-LDADD = $(iu_LIBRARIES)
+BUILT_SOURCES = as_del.h ip_del.h tld_serv.h
as_del.h: $(srcdir)/as_del_list $(srcdir)/make_as_del.pl
LANG=C perl $(srcdir)/make_as_del.pl < $(srcdir)/as_del_list > as_del.h
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=9f586013083f6741fe4b164ea82fc7b658d1cf66
commit 9f586013083f6741fe4b164ea82fc7b658d1cf66
Author: Mats Erik Andersson <address@hidden>
Date: Mon Jan 21 14:37:52 2013 +0100
Support recent automake.
diff --git a/ChangeLog b/ChangeLog
index da35d5c..b0a8bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-21 Mats Erik Andersson <address@hidden>
+
+ * configure.ac (AM_C_PROTOTYPES): Remove obsolete macro.
+ Not supported by automake-1.13.
+
2013-01-17 Mats Erik Andersson <address@hidden>
ping6: Setting of tclass and flowinfo.
diff --git a/configure.ac b/configure.ac
index e793c00..28b733b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -718,8 +718,6 @@ IU_CHECK_MEMBERS([struct tftphdr.th_u], , ,
#include <arpa/tftp.h>])
### Checks for compiler characteristics.
-AM_C_PROTOTYPES # FIXME: Does inetutils even compile on pre-ANSI
- # compilers?
AC_C_CONST
# See if `weak refs' are possible; these make it possible (with shared
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 46 ++++++++++++++++++
NEWS | 4 +-
configure.ac | 2 -
doc/inetutils.texi | 20 ++++++++
ftp/Makefile.am | 17 ++++---
ftpd/Makefile.am | 22 +++++----
ifconfig/Makefile.am | 14 ++++--
libinetutils/Makefile.am | 13 +++--
libls/Makefile.am | 5 +-
libtelnet/Makefile.am | 12 ++++-
ping/Makefile.am | 13 ++++-
src/Makefile.am | 26 +++++++----
src/traceroute.c | 117 +++++++++++++++++++++++++++++++++++++++++++++-
talk/Makefile.am | 12 +++--
talkd/Makefile.am | 15 ++++--
telnet/Makefile.am | 16 ++++--
telnetd/Makefile.am | 21 ++++++---
whois/Makefile.am | 8 ++-
18 files changed, 309 insertions(+), 74 deletions(-)
hooks/post-receive
--
GNU Inetutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-241-g03bfa11,
Mats Erik Andersson <=