diff options
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r-- | makefu/5pkgs/farpd/default.nix | 8 | ||||
-rw-r--r-- | makefu/5pkgs/farpd/farpd_0.2-11.diff | 1606 |
2 files changed, 6 insertions, 1608 deletions
diff --git a/makefu/5pkgs/farpd/default.nix b/makefu/5pkgs/farpd/default.nix index d58066ee5..d16400016 100644 --- a/makefu/5pkgs/farpd/default.nix +++ b/makefu/5pkgs/farpd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { libpcap libdnet pcre - libevent + libevent.out # requires .so and .h readline autoconf libtool @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { pythonPackages.sqlite3 ]; patches = [ - ./farpd_0.2-11.diff + ( fetchurl { + url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2-11.diff.gz; + sha256 = "2c246b37de8aab9c73f955fb77101adefd90637d03f582b9f8ffae2903af2f94"; + }) ]; # removes user install script from Makefile before automake #patches = [ ./autoconf.patch ]; @@ -35,6 +38,7 @@ stdenv.mkDerivation rec { autoreconf -fi substituteInPlace configure \ + --replace "dumbnet" "dnet" \ --replace "libpcap.a" "libpcap.so" \ --replace "libevent.a" "libevent.so" \ --replace "net/bpf.h" "pcap/bpf.h" diff --git a/makefu/5pkgs/farpd/farpd_0.2-11.diff b/makefu/5pkgs/farpd/farpd_0.2-11.diff deleted file mode 100644 index 21c202254..000000000 --- a/makefu/5pkgs/farpd/farpd_0.2-11.diff +++ /dev/null @@ -1,1606 +0,0 @@ ---- farpd-0.2.orig/config.h.in -+++ farpd-0.2-11-debian/config.h.in -@@ -1,39 +1,81 @@ --/* config.h.in. Generated automatically from configure.in by autoheader. */ -+/* config.h.in. Generated from configure.in by autoheader. */ - /* Define if the addr_cmp in libdnet is broken */ - #undef HAVE_BROKEN_DNET - - --/* Define if you have the `daemon' function. */ -+/* Define to 1 if you have the `daemon' function. */ - #undef HAVE_DAEMON - --/* Define if you have the `nsl' library (-lnsl). */ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define to 1 if you have the `nsl' library (-lnsl). */ - #undef HAVE_LIBNSL - --/* Define if you have the `socket' library (-lsocket). */ -+/* Define to 1 if you have the `socket' library (-lsocket). */ - #undef HAVE_LIBSOCKET - --/* Define if you have the <paths.h> header file. */ -+/* Define to 1 if you have the <memory.h> header file. */ -+#undef HAVE_MEMORY_H -+ -+/* Define to 1 if you have the <paths.h> header file. */ - #undef HAVE_PATHS_H - --/* Define if you have the <syslog.h> header file. */ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#undef HAVE_STRING_H -+ -+/* Define to 1 if you have the <syslog.h> header file. */ - #undef HAVE_SYSLOG_H - --/* Define if you have the <sys/ioctl.h> header file. */ -+/* Define to 1 if you have the <sys/ioctl.h> header file. */ - #undef HAVE_SYS_IOCTL_H - --/* Define if you have the <unistd.h> header file. */ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define to 1 if you have the <unistd.h> header file. */ - #undef HAVE_UNISTD_H - - /* Name of package */ - #undef PACKAGE - -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the home page for this package. */ -+#undef PACKAGE_URL -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ - /* Define as the return type of signal handlers (`int' or `void'). */ - #undef RETSIGTYPE - --/* Define if you have the ANSI C header files. */ -+/* Define to 1 if you have the ANSI C header files. */ - #undef STDC_HEADERS - --/* Define if you can safely include both <sys/time.h> and <time.h>. */ -+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ - #undef TIME_WITH_SYS_TIME - - /* Version number of package */ ---- farpd-0.2.orig/arpd.c -+++ farpd-0.2/arpd.c -@@ -27,13 +27,13 @@ - #undef timeout_initialized - - #include <event.h> --#include <dnet.h> -+#include <dnet.h> - #include "tree.h" - - #define ARPD_MAX_ACTIVE 600 - #define ARPD_MAX_INACTIVE 300 - --#define PIDFILE "/var/run/arpd.pid" -+#define PIDFILE "/var/run/farpd.pid" - - struct arp_req { - struct addr pa; -@@ -265,7 +265,7 @@ - spa->addr_ip, tha->addr_eth, tpa->addr_ip); - - if (op == ARP_OP_REQUEST) { -- syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s", -+ syslog(LOG_DEBUG, "%s: who-has %s tell %s", __func__, - addr_ntoa(tpa), addr_ntoa(spa)); - } else if (op == ARP_OP_REPLY) { - syslog(LOG_INFO, "arp reply %s is-at %s", -@@ -282,7 +282,7 @@ - int error; - - if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) { -- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", -+ syslog(LOG_DEBUG, "%s: %s at %s", __func__, - addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr)); - return (0); - } -@@ -291,10 +291,10 @@ - error = arp_get(arpd_arp, &arpent); - - if (error == -1) { -- syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s", -+ syslog(LOG_DEBUG, "%s: no entry for %s", __func__, - addr_ntoa(addr)); - } else { -- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", -+ syslog(LOG_DEBUG, "%s: %s at %s", __func__, - addr_ntoa(addr), addr_ntoa(&arpent.arp_ha)); - } - return (error); -@@ -315,7 +315,7 @@ - struct arp_req *req = arg; - - SPLAY_REMOVE(tree, &arpd_reqs, req); -- syslog(LOG_DEBUG, "%s: expiring %s",__FUNCTION__, addr_ntoa(&req->pa)); -+ syslog(LOG_DEBUG, "%s: expiring %s", __func__, addr_ntoa(&req->pa)); - arpd_free(req); - } - -@@ -400,7 +400,7 @@ - - if (req->negative) { - syslog(LOG_DEBUG, "%s: %s is allocated", -- __FUNCTION__, addr_ntoa(&req->pa)); -+ __func__, addr_ntoa(&req->pa)); - return; - } - -@@ -411,7 +411,7 @@ - } else { - syslog(LOG_DEBUG, - "%s: %s still discovering (%d)", -- __FUNCTION__, addr_ntoa(&req->pa), -+ __func__, addr_ntoa(&req->pa), - req->cnt); - } - } -@@ -423,7 +423,7 @@ - if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) { - addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS, - ethip->ar_sha, ETH_ADDR_LEN); -- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s", -+ syslog(LOG_DEBUG, "%s: %s at %s", __func__, - addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha)); - - /* This address is claimed */ -@@ -445,9 +445,6 @@ - void - terminate_handler(int sig) - { -- extern int event_gotsig; -- -- event_gotsig = 1; - arpd_sig = sig; - } - -@@ -464,7 +461,6 @@ - main(int argc, char *argv[]) - { - struct event recv_ev; -- extern int (*event_sigcb)(void); - char *dev; - int c, debug; - FILE *fp; -@@ -524,7 +520,6 @@ - perror("signal"); - return (-1); - } -- event_sigcb = arpd_signal; - - event_dispatch(); - ---- farpd-0.2.orig/Makefile.in -+++ farpd-0.2/Makefile.in -@@ -1,6 +1,9 @@ --# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -+# Makefile.in generated by automake 1.11.5 from Makefile.am. -+# @configure_input@ - --# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -+# Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -10,404 +13,733 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - -+@SET_MAKE@ - --SHELL = @SHELL@ -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ - VPATH = @srcdir@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ -- --bindir = @bindir@ --sbindir = @sbindir@ --libexecdir = @libexecdir@ --datadir = @datadir@ --sysconfdir = @sysconfdir@ --sharedstatedir = @sharedstatedir@ --localstatedir = @localstatedir@ --libdir = @libdir@ --infodir = @infodir@ --mandir = @mandir@ --includedir = @includedir@ --oldincludedir = /usr/include -- --DESTDIR = -- -+am__make_dryrun = \ -+ { \ -+ am__dry=no; \ -+ case $$MAKEFLAGS in \ -+ *\\[\ \ ]*) \ -+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ -+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ -+ *) \ -+ for am__flg in $$MAKEFLAGS; do \ -+ case $$am__flg in \ -+ *=*|--*) ;; \ -+ *n*) am__dry=yes; break;; \ -+ esac; \ -+ done;; \ -+ esac; \ -+ test $$am__dry = yes; \ -+ } - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ -- --top_builddir = . -- --ACLOCAL = @ACLOCAL@ --AUTOCONF = @AUTOCONF@ --AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -- --INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --transform = @program_transform_name@ -- -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) - NORMAL_INSTALL = : - PRE_INSTALL = : - POST_INSTALL = : - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : -+sbin_PROGRAMS = arpd$(EXEEXT) -+subdir = . -+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ -+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -+ $(top_srcdir)/configure acconfig.h config.guess config.sub \ -+ daemon.c install-sh missing mkinstalldirs -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/configure.in -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ -+ configure.lineno config.status.lineno -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = config.h -+CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = -+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" -+PROGRAMS = $(sbin_PROGRAMS) -+am_arpd_OBJECTS = arpd.$(OBJEXT) -+arpd_OBJECTS = $(am_arpd_OBJECTS) -+arpd_LDADD = $(LDADD) -+arpd_DEPENDENCIES = @LIBOBJS@ -+DEFAULT_INCLUDES = -I.@am__isrc@ -+depcomp = -+am__depfiles_maybe = -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+SOURCES = $(arpd_SOURCES) -+DIST_SOURCES = $(arpd_SOURCES) -+am__can_run_installinfo = \ -+ case $$AM_UPDATE_INFO_DIR in \ -+ n|no|NO) false;; \ -+ *) (install-info --version) >/dev/null 2>&1;; \ -+ esac -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } -+man8dir = $(mandir)/man8 -+NROFF = nroff -+MANS = $(man_MANS) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+distdir = $(PACKAGE)-$(VERSION) -+top_distdir = $(distdir) -+am__remove_distdir = \ -+ if test -d "$(distdir)"; then \ -+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ -+ && rm -rf "$(distdir)" \ -+ || { sleep 5 && rm -rf "$(distdir)"; }; \ -+ else :; fi -+DIST_ARCHIVES = $(distdir).tar.gz -+GZIP_ENV = --best -+distuninstallcheck_listfiles = find . -type f -print -+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ -+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -+distcleancheck_listfiles = find . -type f -print -+ACLOCAL = @ACLOCAL@ -+AMTAR = @AMTAR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ - DNETINC = @DNETINC@ - DNETLIB = @DNETLIB@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ - EVENTINC = @EVENTINC@ - EVENTLIB = @EVENTLIB@ -+EXEEXT = @EXEEXT@ -+GREP = @GREP@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ - LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+MKDIR_P = @MKDIR_P@ -+OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ - PCAPINC = @PCAPINC@ - PCAPLIB = @PCAPLIB@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ - VERSION = @VERSION@ -- -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build_alias = @build_alias@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host_alias = @host_alias@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign no-dependencies -- - INCLUDES = @DNETINC@ @EVENTINC@ @PCAPINC@ -- - LDADD = @LIBOBJS@ @DNETLIB@ @EVENTLIB@ @PCAPLIB@ -- --sbin_PROGRAMS = arpd -- - arpd_SOURCES = arpd.c err.h tree.h -- - man_MANS = arpd.8 -- - EXTRA_DIST = LICENSE $(man_MANS) -- - DISTCLEANFILES = *~ --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = --PROGRAMS = $(sbin_PROGRAMS) -- -- --DEFS = @DEFS@ -I. -I$(srcdir) -I. --CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ --arpd_OBJECTS = arpd.o --arpd_LDADD = $(LDADD) --arpd_DEPENDENCIES = @LIBOBJS@ --arpd_LDFLAGS = --CFLAGS = @CFLAGS@ --COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --CCLD = $(CC) --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ --man8dir = $(mandir)/man8 --MANS = $(man_MANS) -- --NROFF = nroff --DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in acconfig.h \ --aclocal.m4 config.h.in configure configure.in daemon.c install-sh \ --missing mkinstalldirs -- -+all: config.h -+ $(MAKE) $(AM_MAKEFLAGS) all-am - --DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -- --TAR = tar --GZIP_ENV = --best --SOURCES = $(arpd_SOURCES) --OBJECTS = $(arpd_OBJECTS) -- --all: all-redirect - .SUFFIXES: --.SUFFIXES: .S .c .o .s --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile -- --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) \ -- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -- --$(ACLOCAL_M4): configure.in -- cd $(srcdir) && $(ACLOCAL) -+.SUFFIXES: .c .o .obj -+am--refresh: Makefile -+ @: -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ -+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ echo ' $(SHELL) ./config.status'; \ -+ $(SHELL) ./config.status;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ -+ esac; - --config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck --$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) -- cd $(srcdir) && $(AUTOCONF) - --config.h: stamp-h -- @if test ! -f $@; then \ -- rm -f stamp-h; \ -- $(MAKE) stamp-h; \ -- else :; fi --stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status -- cd $(top_builddir) \ -- && CONFIG_FILES= CONFIG_HEADERS=config.h \ -- $(SHELL) ./config.status -- @echo timestamp > stamp-h 2> /dev/null --$(srcdir)/config.h.in: $(srcdir)/stamp-h.in -- @if test ! -f $@; then \ -- rm -f $(srcdir)/stamp-h.in; \ -- $(MAKE) $(srcdir)/stamp-h.in; \ -- else :; fi --$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h -- cd $(top_srcdir) && $(AUTOHEADER) -- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null -- --mostlyclean-hdr: -- --clean-hdr: -+$(top_srcdir)/configure: $(am__configure_deps) -+ $(am__cd) $(srcdir) && $(AUTOCONF) -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -+$(am__aclocal_m4_deps): -+ -+config.h: stamp-h1 -+ @if test ! -f $@; then rm -f stamp-h1; else :; fi -+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi -+ -+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status -+ @rm -f stamp-h1 -+ cd $(top_builddir) && $(SHELL) ./config.status config.h -+$(srcdir)/config.h.in: $(am__configure_deps) $(top_srcdir)/acconfig.h -+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) -+ rm -f stamp-h1 -+ touch $@ - - distclean-hdr: -- -rm -f config.h -- --maintainer-clean-hdr: -- --mostlyclean-sbinPROGRAMS: -- --clean-sbinPROGRAMS: -- -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -- --distclean-sbinPROGRAMS: -- --maintainer-clean-sbinPROGRAMS: -- -+ -rm -f config.h stamp-h1 - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -- @list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- if test -f $$p; then \ -- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -- else :; fi; \ -- done -+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed 's/$(EXEEXT)$$//' | \ -+ while read p p1; do if test -f $$p; \ -+ then echo "$$p"; echo "$$p"; else :; fi; \ -+ done | \ -+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ -+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ -+ sed 'N;N;N;s,\n, ,g' | \ -+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ -+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ -+ if ($$2 == $$4) files[d] = files[d] " " $$1; \ -+ else { print "f", $$3 "/" $$4, $$1; } } \ -+ END { for (d in files) print "f", d, files[d] }' | \ -+ while read type dir files; do \ -+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ -+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ -+ } \ -+ ; done - - uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) -- list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -- done -- --.c.o: -- $(COMPILE) -c $< -- --.s.o: -- $(COMPILE) -c $< -+ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ -+ files=`for p in $$list; do echo "$$p"; done | \ -+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ -+ -e 's/$$/$(EXEEXT)/' `; \ -+ test -n "$$list" || exit 0; \ -+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ -+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files - --.S.o: -- $(COMPILE) -c $< -+clean-sbinPROGRAMS: -+ -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) -+arpd$(EXEEXT): $(arpd_OBJECTS) $(arpd_DEPENDENCIES) $(EXTRA_arpd_DEPENDENCIES) -+ @rm -f arpd$(EXEEXT) -+ $(LINK) $(arpd_OBJECTS) $(arpd_LDADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.o core *.core -- --clean-compile: -+ -rm -f *.$(OBJEXT) - - distclean-compile: - -rm -f *.tab.c - --maintainer-clean-compile: -+.c.o: -+ $(COMPILE) -c $< - --arpd: $(arpd_OBJECTS) $(arpd_DEPENDENCIES) -- @rm -f arpd -- $(LINK) $(arpd_LDFLAGS) $(arpd_OBJECTS) $(arpd_LDADD) $(LIBS) -- --install-man8: -- $(mkinstalldirs) $(DESTDIR)$(man8dir) -- @list='$(man8_MANS)'; \ -- l2='$(man_MANS)'; for i in $$l2; do \ -- case "$$i" in \ -- *.8*) list="$$list $$i" ;; \ -- esac; \ -+.c.obj: -+ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+install-man8: $(man_MANS) -+ @$(NORMAL_INSTALL) -+ @list1=''; \ -+ list2='$(man_MANS)'; \ -+ test -n "$(man8dir)" \ -+ && test -n "`echo $$list1$$list2`" \ -+ || exit 0; \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ -+ { for i in $$list1; do echo "$$i"; done; \ -+ if test -n "$$list2"; then \ -+ for i in $$list2; do echo "$$i"; done \ -+ | sed -n '/\.8[a-z]*$$/p'; \ -+ fi; \ -+ } | while read p; do \ -+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; echo "$$p"; \ -+ done | \ -+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ -+ sed 'N;N;s,\n, ,g' | { \ -+ list=; while read file base inst; do \ -+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \ -+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ -+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ -+ fi; \ - done; \ -- for i in $$list; do \ -- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ -- else file=$$i; fi; \ -- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ -- done -+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \ -+ while read files; do \ -+ test -z "$$files" || { \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ -+ done; } - - uninstall-man8: -- @list='$(man8_MANS)'; \ -- l2='$(man_MANS)'; for i in $$l2; do \ -- case "$$i" in \ -- *.8*) list="$$list $$i" ;; \ -- esac; \ -- done; \ -- for i in $$list; do \ -- ext=`echo $$i | sed -e 's/^.*\\.//'`; \ -- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ -- inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ -- rm -f $(DESTDIR)$(man8dir)/$$inst; \ -- done --install-man: $(MANS) -- @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-man8 --uninstall-man: - @$(NORMAL_UNINSTALL) -- $(MAKE) $(AM_MAKEFLAGS) uninstall-man8 -- -+ @list=''; test -n "$(man8dir)" || exit 0; \ -+ files=`{ for i in $$list; do echo "$$i"; done; \ -+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ -+ sed -n '/\.8[a-z]*$$/p'; \ -+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ -+ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique - tags: TAGS - --ID: $(HEADERS) $(SOURCES) $(LISP) -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- here=`pwd` && cd $(srcdir) \ -- && mkid -f$$here/ID $$unique $(LISP) -- --TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) -- tags=; \ -+TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ set x; \ - here=`pwd`; \ -- list='$(SOURCES) $(HEADERS)'; \ -- unique=`for i in $$list; do echo $$i; done | \ -- awk ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) -- --mostlyclean-tags: -- --clean-tags: -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ test -z "$(CTAGS_ARGS)$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" - - distclean-tags: -- -rm -f TAGS ID -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - --maintainer-clean-tags: -- --distdir = $(PACKAGE)-$(VERSION) --top_distdir = $(distdir) -+distdir: $(DISTFILES) -+ @list='$(MANS)'; if test -n "$$list"; then \ -+ list=`for p in $$list; do \ -+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ -+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ -+ if test -n "$$list" && \ -+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ -+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ -+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ -+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ -+ echo " typically \`make maintainer-clean' will remove them" >&2; \ -+ exit 1; \ -+ else :; fi; \ -+ else :; fi -+ $(am__remove_distdir) -+ test -d "$(distdir)" || mkdir "$(distdir)" -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -+ else \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ -+ || exit 1; \ -+ fi; \ -+ done -+ -test -n "$(am__skip_mode_fix)" \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ -+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ -+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -+ || chmod -R a+r "$(distdir)" -+dist-gzip: distdir -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) -+ -+dist-bzip2: distdir -+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 -+ $(am__remove_distdir) -+ -+dist-lzip: distdir -+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz -+ $(am__remove_distdir) -+ -+dist-lzma: distdir -+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -+ $(am__remove_distdir) -+ -+dist-xz: distdir -+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz -+ $(am__remove_distdir) -+ -+dist-tarZ: distdir -+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z -+ $(am__remove_distdir) -+ -+dist-shar: distdir -+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz -+ $(am__remove_distdir) -+ -+dist-zip: distdir -+ -rm -f $(distdir).zip -+ zip -rq $(distdir).zip $(distdir) -+ $(am__remove_distdir) -+ -+dist dist-all: distdir -+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz -+ $(am__remove_distdir) - - # This target untars the dist file and tries a VPATH configuration. Then - # it guarantees that the distribution is self-contained by making another - # tarfile. - distcheck: dist -- -rm -rf $(distdir) -- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz -- mkdir $(distdir)/=build -- mkdir $(distdir)/=inst -- dc_install_base=`cd $(distdir)/=inst && pwd`; \ -- cd $(distdir)/=build \ -- && ../configure --srcdir=.. --prefix=$$dc_install_base \ -+ case '$(DIST_ARCHIVES)' in \ -+ *.tar.gz*) \ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ -+ *.tar.bz2*) \ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ -+ *.tar.lzma*) \ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ -+ *.tar.lz*) \ -+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ -+ *.tar.xz*) \ -+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ -+ *.tar.Z*) \ -+ uncompress -c $(distdir).tar.Z | $(a |