Merge remote-tracking branch 'prism/master'

20 files changed, 106 insertions, 1678 deletions

diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index bd17c3765..5dde50ea4 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -3,15 +3,8 @@
 with config.krebs.lib;
 let
 
-  # https://github.com/NixOS/nixpkgs/issues/14026
-  nixpkgs-fix = import (pkgs.fetchgit {
-    url = https://github.com/nixos/nixpkgs;
-    rev = "e026b5c243ea39810826e68362718f5d703fb5d0";
-    sha256 = "87e0724910a6df0371f883f99a8cf42e366fb4119f676f6f74ffb404beca2632";
-  }) {};
-
-  buildbot = nixpkgs-fix.buildbot;
-  buildbot-master-config = pkgs.writeText "buildbot-master.cfg" ''
+  buildbot = pkgs.buildbot;
+  buildbot-master-config = pkgs.writePython2 "buildbot-master.cfg" ''
     # -*- python -*-
     from buildbot.plugins import *
     import re
diff --git a/krebs/5pkgs/apt-cacher-ng/default.nix b/krebs/5pkgs/apt-cacher-ng/default.nix
index abf8d677a..53736dcfb 100644
--- a/krebs/5pkgs/apt-cacher-ng/default.nix
+++ b/krebs/5pkgs/apt-cacher-ng/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "apt-cacher-ng-${version}";
-  version = "0.9.3";
+  version = "0.9.3.2";
 
   src = fetchurl {
     url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
-    sha256 = "1bd7l1wg0q1p9pg0v6lqflf2znydx8mrh2jxbvv6xsrp1473nfwg";
+    sha256 = "1bvng9mwrggvc93q2alj0x72i56wifnjs2dsycr17mapsv0f2gnc";
   };
 
   NIX_LDFLAGS = "-lpthread";
diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix
index 4c087bc44..841543819 100644
--- a/krebs/5pkgs/builders.nix
+++ b/krebs/5pkgs/builders.nix
@@ -253,5 +253,27 @@ rec {
       ${pkgs.cabal2nix}/bin/cabal2nix ${path} > $out
     '');
 
+  writePython2 = name: src: pkgs.runCommand name {} /* sh */ ''
+    name=${assert types.filename.check name; name}
+    src=${shell.escape src}
+
+    # syntax check
+    printf '%s' "$src" > src.py
+    ${pkgs.python2}/bin/python -m py_compile src.py
+
+    cp src.py "$out"
+  '';
+
+  writePython3 = name: src: pkgs.runCommand name {} /* sh */ ''
+    name=${assert types.filename.check name; name}
+    src=${shell.escape src}
+
+    # syntax check
+    printf '%s' "$src" > src.py
+    ${pkgs.python3}/bin/python -m py_compile src.py
+
+    cp src.py "$out"
+  '';
+
   writeSed = makeScriptWriter "${pkgs.gnused}/bin/sed -f";
 }
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 6d26ff89a..dce7dae40 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -16,7 +16,7 @@ in {
     systemWide = true;
   };
 
-  users.extraUsers.mainUser.extraGroups = [ "audio" ];
+  users.extraUsers.mainUser.extraGroups = [ "audio" "video" ];
 
   time.timeZone = "Europe/Berlin";
 
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 766fd715e..90a990339 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -8,9 +8,6 @@ let
     ControlPath /tmp/%u_sshmux_%r@%h:%p
     ControlPersist 4h
   '';
-  sshWrapper = pkgs.writeDash "ssh-wrapper" ''
-    ${pkgs.openssh}/bin/ssh -F ${sshHostConfig} -i ${shell.escape config.lass.build-ssh-privkey.path} "$@"
-  '';
 
 in {
   config.krebs.buildbot.master = let
@@ -66,10 +63,15 @@ in {
         "NIX_REMOTE": "daemon",
         "dummy_secrets": "true",
       }
+      env_shared = {
+        "LOGNAME": "shared",
+        "NIX_REMOTE": "daemon",
+        "dummy_secrets": "true",
+      }
 
       # prepare nix-shell
       # the dependencies which are used by the test script
-      deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate" ]
+      deps = [ "gnumake", "jq", "nix", "(import <stockholm>).pkgs.populate", "openssh" ]
       # TODO: --pure , prepare ENV in nix-shell command:
       #                   SSL_CERT_FILE,LOGNAME,NIX_REMOTE
       nixshell = ["nix-shell",
@@ -88,20 +90,20 @@ in {
         for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
           addShell(f,name="build-{}".format(i),env=env_lass,
                   command=nixshell + \
-                      ["make \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
                             test \
-                            ssh=${sshWrapper} \
-                            target=build@localhost${config.users.users.build.home}/testbuild \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
                             method=build \
                             system={}".format(i)])
 
         for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
           addShell(f,name="build-{}".format(i),env=env_makefu,
                   command=nixshell + \
-                      ["make \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
                             test \
-                            ssh=${sshWrapper} \
-                            target=build@localhost${config.users.users.build.home}/testbuild \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
                             method=build \
                             system={}".format(i)])
 
@@ -114,19 +116,35 @@ in {
       fast-tests = ''
         f = util.BuildFactory()
         f.addStep(grab_repo)
-        for i in [ "prism", "mors", "echelon" ]:
-          addShell(f,name="populate-{}".format(i),env=env_lass,
+        for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
+          addShell(f,name="build-{}".format(i),env=env_lass,
+                  command=nixshell + \
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
+                            test \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                            method=eval \
+                            system={}".format(i)])
+
+        for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
+          addShell(f,name="build-{}".format(i),env=env_makefu,
                   command=nixshell + \
-                            ["{}(make system={} populate debug=true)".format("!" if "failing" in i else "",i)])
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
+                            test \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                            method=eval \
+                            system={}".format(i)])
 
-        addShell(f,name="build-test-minimal",env=env_lass,
+        for i in [ "test-minimal-deploy", "test-all-krebs-modules", "wolf" ]:
+          addShell(f,name="build-{}".format(i),env=env_shared,
                   command=nixshell + \
-                            ["nix-instantiate \
-                                  --show-trace --eval --strict --json \
-                                  -I nixos-config=./shared/1systems/test-minimal-deploy.nix  \
-                                  -I secrets=. \
-                                  -A config.system.build.toplevel"]
-                )
+                      ["mkdir -p /tmp/testbuild/$LOGNAME && touch /tmp/testbuild/$LOGNAME/.populate; \
+                        make \
+                            test \
+                            target=$LOGNAME@${config.krebs.build.host.name}/tmp/testbuild/$LOGNAME \
+                            method=eval \
+                            system={}".format(i)])
 
         bu.append(util.BuilderConfig(name="fast-tests",
               slavenames=slavenames,
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 622ef1185..dbb2a853a 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -44,6 +44,11 @@ with config.krebs.lib;
         };
       };
     }
+    {
+      environment.variables = {
+        NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
+      };
+    }
   ];
 
   networking.hostName = config.krebs.build.host.name;
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index b758bc24a..576447542 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs.git = {
       url = https://github.com/lassulus/nixpkgs;
-      ref = "c6ca9c8c8b7eb8f8e68868e36fb90e162adf080f";
+      ref = "a75c0d9342ecb86dedd11f61a4e6f59ecc42d151";
     };
 }
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index c94f1be7d..7e4c87cfb 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -30,7 +30,7 @@ with config.krebs.lib;
           if getEnv "dummy_secrets" == "true"
             then toString <stockholm/makefu/6tests/data/secrets>
             else "/home/makefu/secrets/${host.name}";
-        stockholm.file = "/home/makefu/stockholm";
+        stockholm.file = getEnv "PWD";
 
         # Defaults for all stockholm users?
         nixos-config.symlink =
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: