diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix index 0b58c75cb..e5cb0e7f6 100644 --- a/krebs/3modules/makefu/default.nix +++ b/krebs/3modules/makefu/default.nix @@ -56,6 +56,16 @@ with config.krebs.lib; }; }; }; + ossim = { # vm on darth + nets = { + siem = { + ip4.addr = "10.8.10.6"; + aliases = [ + "ossim.siem" + ]; + }; + }; + }; tsp = { cores = 1; nets = { @@ -291,6 +301,10 @@ with config.krebs.lib; wbob = rec { cores = 1; nets = { + siem = { + ip4.addr = "10.8.10.7"; + aliases = [ "display.siem" ]; + }; retiolum = { ip4.addr = "10.243.214.15"; ip6.addr = "42:5a02:2c30:c1b1:3f2e:7c19:2496:a732"; diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix index 51d2afe84..5f161d731 100644 --- a/lass/1systems/helios.nix +++ b/lass/1systems/helios.nix @@ -1,10 +1,11 @@ { config, pkgs, ... }: with builtins; +with config.krebs.lib; + { imports = [ ../. - ../2configs/baseX.nix ../2configs/exim-retiolum.nix ../2configs/browsers.nix ../2configs/programs.nix @@ -12,6 +13,36 @@ with builtins; ../2configs/pass.nix ../2configs/fetchWallpaper.nix ../2configs/backups.nix + + #{ + # # conflicting stuff with gnome setup + # # TODO: fix this + # imports = [ + # ../2configs/baseX.nix + # ]; + # networking.wireless.enable = true; + #} + { + # gnome3 for suja + imports = [ + ../2configs/default.nix + ]; + services.xserver.enable = true; + services.xserver.desktopManager.gnome3.enable = true; + users.users.suja = { + uid = genid "suja"; + home = "/home/suja"; + group = "users"; + createHome = true; + useDefaultShell = true; + extraGroups = [ + ]; + }; + environment.systemPackages = with pkgs; [ + firefox + chromium + ]; + } #{ # users.extraUsers = { # root = { @@ -21,11 +52,11 @@ with builtins; # }; # }; #} - { - services.elasticsearch = { - enable = true; - }; - } + #{ + # services.elasticsearch = { + # enable = true; + # }; + #} { lass.power-action.battery = "BAT1"; } @@ -33,7 +64,6 @@ with builtins; krebs.build.host = config.krebs.hosts.helios; - networking.wireless.enable = true; hardware.enableAllFirmware = true; nixpkgs.config.allowUnfree = true; diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index d065d4dfa..84191da0b 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -47,12 +47,15 @@ # ]; # }; #} - #{ - # services.postgresql = { - # enable = true; - # package = pkgs.postgresql; - # }; - #} + { + #zalando project + services.postgresql = { + enable = true; + package = pkgs.postgresql; + }; + virtualisation.docker.enable = true; + users.users.mainUser.extraGroups = [ "docker" ]; + } { lass.umts = { enable = true; diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 5477a8b86..270bb6fc2 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -1,5 +1,7 @@ { config, lib, pkgs, ... }: +with config.krebs.lib; + let ip = config.krebs.build.host.nets.internet.ip4.addr; @@ -24,11 +26,22 @@ in { { imports = [ ../2configs/git.nix - ( manageCerts [ "cgit.lassul.us" ]) - ]; - krebs.nginx.servers.cgit.server-names = [ - "cgit.lassul.us" ]; + krebs.nginx.servers.cgit = { + server-names = [ + "cgit.lassul.us" + ]; + locations = [ + (nameValuePair "/.well-known/acme-challenge" '' + root /var/lib/acme/challenges/cgit.lassul.us/; + '') + ]; + ssl = { + enable = true; + certificate = "/var/lib/acme/cgit.lassul.us/fullchain.pem"; + certificate_key = "/var/lib/acme/cgit.lassul.us/key.pem"; + }; + }; } { users.extraGroups = { @@ -189,7 +202,6 @@ in { lass.ejabberd = { enable = true; hosts = [ "lassul.us" ]; - certfile = "/var/lib/acme/lassul.us/full.pem"; }; krebs.iptables.tables.filter.INPUT.rules = [ { predicate = "-p tcp --dport xmpp-client"; target = "ACCEPT"; } @@ -206,6 +218,11 @@ in { '') ]; } + { + environment.systemPackages = with pkgs; [ + mk_sql_pair + ]; + } ]; krebs.build.host = config.krebs.hosts.prism; diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix index 83553f5ca..6b56419d7 100644 --- a/lass/1systems/uriel.nix +++ b/lass/1systems/uriel.nix @@ -39,8 +39,8 @@ with builtins; #loader.grub.version = 2; #loader.grub.device = "/dev/sda"; - loader.systemd-boot.enable = true; - loader.timeout = 5; + loader.gummiboot.enable = true; + loader.gummiboot.timeout = 5; initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ]; initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ]; diff --git a/lass/5pkgs/q/default.nix b/lass/5pkgs/q/default.nix index 644be0d17..571932b1d 100644 --- a/lass/5pkgs/q/default.nix +++ b/lass/5pkgs/q/default.nix @@ -123,7 +123,7 @@ let ''; q-online = '' - if ${pkgs.curl.bin}/bin/curl -s google.com >/dev/null; then + if ${pkgs.curl}/bin/curl -s google.com >/dev/null; then echo 'online' else echo offline diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 7b6c18342..2ab030916 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -64,7 +64,7 @@ # configure pulseAudio to provide a HDMI sink as well networking.firewall.enable = true; - networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowedTCPPorts = [ 80 24800 ]; networking.firewall.allowedUDPPorts = [ 665 ]; krebs.build.host = config.krebs.hosts.pornocauster; diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix index b4f7c9058..45b935af0 100644 --- a/makefu/1systems/wbob.nix +++ b/makefu/1systems/wbob.nix @@ -1,5 +1,10 @@ { config, pkgs, ... }: { + makefu.awesome = { + modkey = "Mod1"; + #TODO: integrate kiosk config into full config by templating the autostart + baseConfig = pkgs.awesomecfg.kiosk; + }; imports = [ # Include the results of the hardware scan. ../. @@ -10,6 +15,15 @@ retiolum.enable = true; build.host = config.krebs.hosts.wbob; }; + networking.firewall.allowedUDPPorts = [ 1655 ]; + networking.firewall.allowedTCPPorts = [ 1655 ]; + services.tinc.networks.siem = { + name = "display"; + extraConfig = '' + ConnectTo = sjump + Port = 1655 + ''; + }; # rt2870.bin wifi card, part of linux-unfree hardware.enableAllFirmware = true; @@ -39,23 +53,18 @@ xrandr --output HDMI2 --right-of HDMI1 ''; }; - ## TODO Awesomecfg + autostart chrome - # - #local current_screen = 1 - #awful.rules.rules = { - # { rule = { class = "chromium-browser" }, - # callback = function() - # awful.client.movetotag(tags[current_screen][1],c) - # if (current_screen == 1) then - # current_screen = current_screen+1 - # else - # current_screen = current_screen-1 - # end - # end - # }, - #} - #awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values") - # prevent Race Condition - #awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast") + # TODO: update synergy package with these extras (username) + # TODO: add crypto layer + systemd.services."synergy-client" = { + environment.DISPLAY = ":0"; + serviceConfig.User = "makefu"; + }; + services.synergy = { + client = { + enable = true; + screenName = "wbob"; + serverAddress = "pornocauster.r"; + }; + }; } diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix index 32f831cf7..c2276887e 100644 --- a/makefu/5pkgs/awesomecfg/default.nix +++ b/makefu/5pkgs/awesomecfg/default.nix @@ -2,4 +2,5 @@ _: { full = ./full.cfg; + kiosk = ./kiosk.lua; } diff --git a/makefu/5pkgs/awesomecfg/kiosk.lua b/makefu/5pkgs/awesomecfg/kiosk.lua new file mode 100644 index 000000000..81ec99225 --- /dev/null +++ b/makefu/5pkgs/awesomecfg/kiosk.lua @@ -0,0 +1,533 @@ +-- Standard awesome library +local gears = require("gears") +local awful = require("awful") +local vicious = require("vicious") +awful.rules = require("awful.rules") +require("awful.autofocus") +-- Widget and layout library +local wibox = require("wibox") +-- Theme handling library +local beautiful = require("beautiful") +-- Notification library +local naughty = require("naughty") +local menubar = require("menubar") + + + +-- {{{ Error handling +-- Check if awesome encountered an error during startup and fell back to +-- another config (This code will only ever execute for the fallback config) +if awesome.startup_errors then + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, there were errors during startup!", + text = awesome.startup_errors }) +end + +-- Handle runtime errors after startup +do + local in_error = false + awesome.connect_signal("debug::error", function (err) + -- Make sure we don't go into an endless error loop + if in_error then return end + in_error = true + + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, an error happened!", + text = err }) + in_error = false + end) +end +-- }}} + +-- {{{ Mails widget type +local function worker(format,warg) + local ncount = 0 + for line in io.popen("ls "..warg..'/new'):lines() do + ncount = ncount +1 + end + local count = 2 + --for line in io.popen("ls "..warg..'/new'):lines() do + -- count = count +1 + --end + return {ncount,count} +end + +vicious_mails = setmetatable({}, { __call = function(_, ...) return worker(...) end }) +mailwidget = wibox.widget.textbox() + +local function only_new (widget,args) + if args[1] > 0 then + return string.format("%s new",args[1]) + else + return "" + end +end + +vicious.register(mailwidget, vicious_mails,only_new ,60,"~/Mail/localhost") + +--mdirwidget = wibox.widget.textbox() +--vicious.register(mdirwidget, vicious.widgets.mdir, ) + +cpuwidget = awful.widget.graph() +-- Graph properties +cpuwidget:set_width(50) +cpuwidget:set_background_color("#494B4F") +cpuwidget:set_color({ type = "linear", from = { 0, 0 }, to = { 10,0 }, stops = { {0, "#FF5656"}, {0.5, "#88A175"}, + {1, "#AECF96" }}}) +vicious.register(cpuwidget, vicious.widgets.cpu, "$1") + +-- Register widget +batwidget = wibox.widget.textbox() +vicious.register(batwidget, vicious.widgets.bat, "$2%", 61, "BAT0") + +-- {{{ Variable definitions +-- Themes define colours, icons, and wallpapers +-- beautiful.init("/usr/share/awesome/themes/default/theme.lua") +-- ./qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/lib/beautiful.lua +-- +-- Find the default theme + +-- +-- beautiful.init("/nix/store/qbx8r72yzaxpz41zq00902zwajl31b5h-awesome-3.5.6/share/awesome/themes/default/theme.lua") + +function find_default_theme() + -- find the default lua theme in the package path + for path in package.path:gmatch('([^;]+);') do + if path:match('awesome.*share') then + theme_path = path:match('^([^?]*)') .. '../themes/default/theme.lua' + if awful.util.file_readable(theme_path) then return theme_path end + end + end +end + +beautiful.init(find_default_theme()) +client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) +client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) + +-- This is used later as the default terminal and editor to run. +terminal = "urxvt" +editor = os.getenv("EDITOR") or "vim" +editor_cmd = terminal .. " -e " .. editor +browser = "firefox" + +modkey = "@modkey@" + +-- Table of layouts to cover with awful.layout.inc, order matters. +local layouts = +{ + awful.layout.suit.tile, +-- awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, + awful.layout.suit.floating, +-- awful.layout.suit.tile.top, + awful.layout.suit.fair, +-- awful.layout.suit.fair.horizontal, +-- awful.layout.suit.spiral, +-- awful.layout.suit.spiral.dwindle, + awful.layout.suit.max, + awful.layout.suit.max.fullscreen +-- awful.layout.suit.magnifier +} +-- }}} + +-- {{{ Wallpaper +if beautiful.wallpaper then + for s = 1, screen.count() do + gears.wallpaper.maximized(beautiful.wallpaper, s, true) + end +end +-- }}} + +-- {{{ Tags +-- Define a tag table which hold all screen tags. +tags = {} +for s = 1, screen.count() do + -- Each screen has its own tag table. + tags[s] = awful.tag({ "tmp", "news", "www", "im", "work1","work2","net","misc","remote" }, s, layouts[1]) +end +-- }}} + +-- {{{ Menu +-- Create a laucher widget and a main menu +myawesomemenu = { + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awesome.conffile }, + { "restart", awesome.restart }, + { "quit", awesome.quit } +} + +mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal }, + { "pcmanfm", "pcmanfm"} + } + }) + +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, + menu = mymainmenu }) + +-- Menubar configuration +menubar.utils.terminal = terminal -- Set the terminal for applications that require it +-- }}} + +-- {{{ Wibox +-- Create a textclock widget +mytextclock = awful.widget.textclock() + +-- Create a wibox for each screen and add it +mywibox = {} +mypromptbox = {} +mylayoutbox = {} +mytaglist = {} +mytaglist.buttons = awful.util.table.join( + awful.button({ }, 1, awful.tag.viewonly), + awful.button({ modkey }, 1, awful.client.movetotag), + awful.button({ }, 3, awful.tag.viewtoggle), + awful.button({ modkey }, 3, awful.client.toggletag), + awful.button({ }, 4, function(t) awful.tag.viewnext(awful.tag.getscreen(t)) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(awful.tag.getscreen(t)) end) + ) +mytasklist = {} +mytasklist.buttons = awful.util.table.join( + awful.button({ }, 1, function (c) + if c == client.focus then + c.minimized = true + else + -- Without this, the following + -- :isvisible() makes no sense + c.minimized = false + if not c:isvisible() then + awful.tag.viewonly(c:tags()[1]) + end + -- This will also un-minimize + -- the client, if needed + client.focus = c + c:raise() + end + end), + awful.button({ }, 3, function () + if instance then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ width=250 }) + end + end), + awful.button({ }, 4, function () + awful.client.focus.byidx(1) + if client.focus then client.focus:raise() end + end), + awful.button({ }, 5, function () + awful.client.focus.byidx(-1) + if client.focus then client.focus:raise() end + end)) + +for s = 1, screen.count() do + -- Create a promptbox for each screen + mypromptbox[s] = awful.widget.prompt() + -- Create an imagebox widget which will contains an icon indicating which layout we're using. + -- We need one layoutbox per screen. + mylayoutbox[s] = awful.widget.layoutbox(s) + mylayoutbox[s]:buttons(awful.util.table.join( + awful.button({ }, 1, function () awful.layout.inc(layouts, 1) end), + awful.button({ }, 3, function () awful.layout.inc(layouts, -1) end), + awful.button({ }, 4, function () awful.layout.inc(layouts, 1) end), + awful.button({ }, 5, function () awful.layout.inc(layouts, -1) end))) + -- Create a taglist widget + mytaglist[s] = awful.widget.taglist(s, awful.widget.taglist.filter.all, mytaglist.buttons) + + -- Create a tasklist widget + mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons) + + -- Create the wibox + mywibox[s] = awful.wibox({ position = "top", screen = s }) + + -- Widgets that are aligned to the left + local left_layout = wibox.layout.fixed.horizontal() + left_layout:add(mylauncher) + left_layout:add(mytaglist[s]) + left_layout:add(mypromptbox[s]) + + -- Widgets that are aligned to the right + local right_layout = wibox.layout.fixed.horizontal() + right_layout:add(mailwidget) + if s == 1 then right_layout:add(wibox.widget.systray()) end + right_layout:add(cpuwidget) + right_layout:add(batwidget) + right_layout:add(mytextclock) + right_layout:add(mylayoutbox[s]) + + -- Now bring it all together (with the tasklist in the middle) + local layout = wibox.layout.align.horizontal() + layout:set_left(left_layout) + layout:set_middle(mytasklist[s]) + layout:set_right(right_layout) + + mywibox[s]:set_widget(layout) +end +-- }}} + +-- {{{ Mouse bindings +root.buttons(awful.util.table.join( + awful.button({ }, 3, function () mymainmenu:toggle() end), + awful.button({ }, 4, awful.tag.viewnext), + awful.button({ }, 5, awful.tag.viewprev) +)) +-- }}} + +-- {{{ Key bindings +globalkeys = awful.util.table.join( + awful.key({ modkey, }, "Left", awful.tag.viewprev ), + awful.key({ modkey, }, "Right", awful.tag.viewnext ), + awful.key({ modkey, }, "Escape", awful.tag.history.restore), + + awful.key({ modkey, }, "j", + function () + awful.client.focus.byidx( 1) + if client.focus then client.focus:raise() end + end), + awful.key({ modkey, }, "k", + function () + awful.client.focus.byidx(-1) + if client.focus then client.focus:raise() end + end), + awful.key({ modkey, }, "w", function () mymainmenu:show() end), + + -- Layout manipulation + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end), + awful.key({ modkey, }, "u", awful.client.urgent.jumpto), + awful.key({ modkey, }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end), + + -- Standard program + awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), + awful.key({ modkey, "Control" }, "r", awesome.restart), + awful.key({ modkey, "Shift" }, "q", awesome.quit), + + awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end), + awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1) end), + awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1) end), + awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1) end), + awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1) end), + awful.key({ modkey, }, "space", function () awful.layout.inc(layouts, 1) end), + awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), + + awful.key({ modkey, "Control" }, "n", awful.client.restore), + awful.key({ }, "XF86AudioRaiseVolume", function () + awful.util.spawn("amixer set Master 5%+", false) end), + awful.key({ }, "XF86AudioLowerVolume", function () + awful.util.spawn("amixer set Master 5%-", false) end), + awful.key({ }, "XF86AudioMute", function () + awful.util.spawn("amixer -q -D default sset Master toggle", false) end), + + -- Prompt + awful.key({ modkey }, "r", function () mypromptbox[mouse.screen]:run() end), + -- awful.key({ modkey }, "r", function () awful.util.spawn( "dmenu_run" ) end ), + awful.key({ modkey,"Control" }, "BackSpace", function () awful.util.spawn("xlock -mode blank") end), + awful.key({ }, "XF86ScreenSaver", function () awful.util.spawn("xlock -mode blank") end), + + awful.key({ modkey }, "x", + function () + awful.prompt.run({ prompt = "Run Lua code: " }, + mypromptbox[mouse.screen].widget, + awful.util.eval, nil, + awful.util.getdir("cache") .. "/history_eval") + end), + -- Menubar + awful.key({ modkey }, "p", function() menubar.show() end) +) + +clientkeys = awful.util.table.join( + awful.key({ modkey, }, "f", function (c) c.fullscreen = not c.fullscreen end), + awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end), + awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle ), + awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end), + awful.key({ modkey, }, "o", awful.client.movetoscreen ), + awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end), + awful.key({ modkey, }, "n", + function (c) + -- The client currently has the input focus, so it cannot be + -- minimized, since minimized clients can't have the focus. + c.minimized = true + end), + awful.key({ modkey, }, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c.maximized_vertical = not c.maximized_vertical + end) +) + +-- Compute the maximum number of digit we need, limited to 9 +keynumber = 0 +for s = 1, screen.count() do + keynumber = math.min(9, math.max(#tags[s], keynumber)) +end + +-- Bind all key numbers to tags. +-- Be careful: we use keycodes to make it works on any keyboard layout. +-- This should map on the top row of your keyboard, usually 1 to 9. +for i = 1, keynumber do + globalkeys = awful.util.table.join(globalkeys, + awful.key({ modkey }, "#" .. i + 9, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewonly(tags[screen][i]) + end + end), + awful.key({ modkey, "Control" }, "#" .. i + 9, + function () + local screen = mouse.screen + if tags[screen][i] then + awful.tag.viewtoggle(tags[screen][i]) + end + end), + awful.key({ modkey, "Shift" }, "#" .. i + 9, + function () + if client.focus and tags[client.focus.screen][i] then + awful.client.movetotag(tags[client.focus.screen][i]) + end + end), + awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, + function () + if client.focus and tags[client.focus.screen][i] then + awful.client.toggletag(tags[client.focus.screen][i]) + end + end)) +end + +clientbuttons = awful.util.table.join( + awful.button({ }, 1, function (c) client.focus = c; c:raise() end), + awful.button({ modkey }, 1, awful.mouse.client.move), + awful.button({ modkey }, 3, awful.mouse.client.resize)) + +-- Set keys +root.keys(globalkeys) +-- }}} + +-- {{{ Rules +awful.rules.rules = { + -- All clients will match this rule. + { rule = { }, + properties = { border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = awful.client.focus.filter, + keys = clientkeys, + buttons = clientbuttons } }, + { rule = { class = "MPlayer" }, + properties = { floating = true } }, + { rule = { class = "pinentry" }, + properties = { floating = true } }, + { rule = { class = "gimp" }, + properties = { floating = true } }, + { rule = { class = "Anamnesis" }, + properties = { floating = true } }, + -- Set Firefox to always map on tags number 2 of screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { tag = tags[1][2] } }, +} +-- }}} + +-- {{{ Signals +-- Signal function to execute when a new client appears. +client.connect_signal("manage", function (c, startup) + -- Enable sloppy focus + c:connect_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end + end) + + if not startup then + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- awful.client.setslave(c) + + -- Put windows in a smart way, only if they does not set an initial position. + if not c.size_hints.user_position and not c.size_hints.program_position then + awful.placement.no_overlap(c) + awful.placement.no_offscreen(c) + end + end + + local titlebars_enabled = false + if titlebars_enabled and (c.type == "normal" or c.type == "dialog") then + -- Widgets that are aligned to the left + local left_layout = wibox.layout.fixed.horizontal() + left_layout:add(awful.titlebar.widget.iconwidget(c)) + + -- Widgets that are aligned to the right + local right_layout = wibox.layout.fixed.horizontal() + right_layout:add(awful.titlebar.widget.floatingbutton(c)) + right_layout:add(awful.titlebar.widget.maximizedbutton(c)) + right_layout:add(awful.titlebar.widget.stickybutton(c)) + right_layout:add(awful.titlebar.widget.ontopbutton(c)) + right_layout:add(awful.titlebar.widget.closebutton(c)) + + -- The title goes in the middle + local title = awful.titlebar.widget.titlewidget(c) + title:buttons(awful.util.table.join( + awful.button({ }, 1, function() + client.focus = c + c:raise() + awful.mouse.client.move(c) + end), + awful.button({ }, 3, function() + client.focus = c + c:raise() + awful.mouse.client.resize(c) + end) + )) + + -- Now bring it all together + local layout = wibox.layout.align.horizontal() + layout:set_left(left_layout) + layout:set_right(right_layout) + layout:set_middle(title) + + awful.titlebar(c):set_widget(layout) + end +end) +local setmetatable = setmetatable +local os = { + date = os.date, + time = os.time +} + +-- }}} + +local current_screen = 1 +awful.rules.rules = { + { rule = { class = "chromium-browser" }, + callback = function() + -- TODO different tags, switch tag + awful.client.movetotag(tags[current_screen][1],c) + if (current_screen == 1) then + current_screen = current_screen+1 + else + current_screen = current_screen-1 + end + end + }, +} + +-- awful.util.spawn_with_shell("chromium --new-window --kiosk https://www.checkpoint.com/ThreatPortal/livemap.html") +awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values") +-- awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast") +--awful.util.spawn_with_shell("chromium --new-window --kiosk http://gast.aramark.de/thales-deutschland/menu/pdf/woche_de.php") + +awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://map.norsecorp.com") +--awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://threatmap.fortiguard.com") + + +-- }}} + diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index bb6290af2..f6a6b674b 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -9,12 +9,15 @@ in alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; awesomecfg = callPackage ./awesomecfg {}; + bintray-upload = callPackage ./bintray-upload {}; mycube-flask = callPackage ./mycube-flask {}; nodemcu-uploader = callPackage ./nodemcu-uploader {}; tw-upload-plugin = callPackage ./tw-upload-plugin {}; inherit (callPackage ./devpi {}) devpi-web devpi-server; skytraq-logger = callPackage ./skytraq-logger {}; taskserver = callPackage ./taskserver {}; - bintray-upload = callPackage ./bintray-upload {}; + ps3netsrv = callPackage ./ps3netsrv {}; + honeyd = callPackage ./honeyd {}; + farpd = callPackage ./farpd {}; }; } diff --git a/makefu/5pkgs/farpd/default.nix b/makefu/5pkgs/farpd/default.nix new file mode 100644 index 000000000..d58066ee5 --- /dev/null +++ b/makefu/5pkgs/farpd/default.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, + libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre, + ... }: +stdenv.mkDerivation rec { + name = "farpd-${version}"; + + + version = "0.2"; + src = fetchurl { + url = https://launchpad.net/ubuntu/+archive/primary/+files/farpd_0.2.orig.tar.gz ; + sha256 = "1m3pynvynr4vgkwh7z5i0yqlang2y0ph32cys3vbi2hx2apk9abd"; + }; + + buildInputs = with pkgs;[ + automake + gnugrep + libpcap + libdnet + pcre + libevent + readline + autoconf + libtool + zlib + coreutils + python + pythonPackages.sqlite3 + ]; + patches = [ + ./farpd_0.2-11.diff + ]; + # removes user install script from Makefile before automake + #patches = [ ./autoconf.patch ]; + preConfigure = '' + autoreconf -fi + + substituteInPlace configure \ + --replace "libpcap.a" "libpcap.so" \ + --replace "libevent.a" "libevent.so" \ + --replace "net/bpf.h" "pcap/bpf.h" + ''; + + makeFlags = [ "LIBS=-lz" ]; + configureFlags = [ + "--with-libpcap=${libpcap}" + "--with-libevent=${libevent}" + "--with-libdnet=${libdnet}" + ]; + postInstall = '' + mv $out/sbin/arpd $out/sbin/farpd + mv $out/share/man/man8/arpd.8 $out/share/man/man8/farpd.8 + ''; + + meta = { + homepage = https://launchpad.net/ubuntu/+source/farpd/ ; + description = "fake arp"; + license = lib.licenses.gpl2; + }; +} diff --git a/makefu/5pkgs/farpd/farpd_0.2-11.diff b/makefu/5pkgs/farpd/farpd_0.2-11.diff new file mode 100644 index 000000000..21c202254 --- /dev/null +++ b/makefu/5pkgs/farpd/farpd_0.2-11.diff @@ -0,0 +1,1606 @@ +--- 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 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 header file. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the header file. */ + #undef HAVE_PATHS_H + +-/* Define if you have the header file. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDLIB_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRING_H ++ ++/* Define to 1 if you have the header file. */ + #undef HAVE_SYSLOG_H + +-/* Define if you have the header file. */ ++/* Define to 1 if you have the header file. */ + #undef HAVE_SYS_IOCTL_H + +-/* Define if you have the header file. */ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the 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 and . */ ++/* Define to 1 if you can safely include both and . */ + #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 +-#include ++#include + #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 | $(am__untar) ;;\ ++ *.shar.gz*) \ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ ++ *.zip*) \ ++ unzip $(distdir).zip ;;\ ++ esac ++ chmod -R a-w $(distdir); chmod a+w $(distdir) ++ mkdir $(distdir)/_build ++ mkdir $(distdir)/_inst ++ chmod a-w $(distdir) ++ test -d $(distdir)/_build || exit 0; \ ++ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ ++ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ++ && am__cwd=`pwd` \ ++ && $(am__cd) $(distdir)/_build \ ++ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ ++ $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ +- && $(MAKE) $(AM_MAKEFLAGS) dist +- -rm -rf $(distdir) +- @banner="$(distdir).tar.gz is ready for distribution"; \ +- dashes=`echo "$$banner" | sed s/./=/g`; \ +- echo "$$dashes"; \ +- echo "$$banner"; \ +- echo "$$dashes" +-dist: distdir +- -chmod -R a+r $(distdir) +- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) +- -rm -rf $(distdir) +-dist-all: distdir +- -chmod -R a+r $(distdir) +- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) +- -rm -rf $(distdir) +-distdir: $(DISTFILES) +- -rm -rf $(distdir) +- mkdir $(distdir) +- -chmod 777 $(distdir) +- @for file in $(DISTFILES); do \ +- d=$(srcdir); \ +- if test -d $$d/$$file; then \ +- cp -pr $$d/$$file $(distdir)/$$file; \ +- else \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ +- fi; \ +- done +-info-am: +-info: info-am +-dvi-am: +-dvi: dvi-am ++ && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ++ distuninstallcheck \ ++ && chmod -R a-w "$$dc_install_base" \ ++ && ({ \ ++ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ++ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ++ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ++ } || { rm -rf "$$dc_destdir"; exit 1; }) \ ++ && rm -rf "$$dc_destdir" \ ++ && $(MAKE) $(AM_MAKEFLAGS) dist \ ++ && rm -rf $(DIST_ARCHIVES) \ ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ ++ && cd "$$am__cwd" \ ++ || exit 1 ++ $(am__remove_distdir) ++ @(echo "$(distdir) archives ready for distribution: "; \ ++ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ ++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' ++distuninstallcheck: ++ @test -n '$(distuninstallcheck_dir)' || { \ ++ echo 'ERROR: trying to run $@ with an empty' \ ++ '$$(distuninstallcheck_dir)' >&2; \ ++ exit 1; \ ++ }; \ ++ $(am__cd) '$(distuninstallcheck_dir)' || { \ ++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ ++ exit 1; \ ++ }; \ ++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left after uninstall:" ; \ ++ if test -n "$(DESTDIR)"; then \ ++ echo " (check DESTDIR support)"; \ ++ fi ; \ ++ $(distuninstallcheck_listfiles) ; \ ++ exit 1; } >&2 ++distcleancheck: distclean ++ @if test '$(srcdir)' = . ; then \ ++ echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ++ exit 1 ; \ ++ fi ++ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ++ || { echo "ERROR: files left in build directory after distclean:" ; \ ++ $(distcleancheck_listfiles) ; \ ++ exit 1; } >&2 + check-am: all-am + check: check-am +-installcheck-am: +-installcheck: installcheck-am +-all-recursive-am: config.h +- $(MAKE) $(AM_MAKEFLAGS) all-recursive +- +-install-exec-am: install-sbinPROGRAMS ++all-am: Makefile $(PROGRAMS) $(MANS) config.h ++installdirs: ++ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am + install-exec: install-exec-am +- +-install-data-am: install-man + install-data: install-data-am ++uninstall: uninstall-am + + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +-install: install-am +-uninstall-am: uninstall-sbinPROGRAMS uninstall-man +-uninstall: uninstall-am +-all-am: Makefile $(PROGRAMS) $(MANS) config.h +-all-redirect: all-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +-installdirs: +- $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8 +- + ++installcheck: installcheck-am ++install-strip: ++ if test -z '$(STRIP)'; then \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install; \ ++ else \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ ++ fi + mostlyclean-generic: + + clean-generic: + + distclean-generic: +- -rm -f Makefile $(CONFIG_CLEAN_FILES) +- -rm -f config.cache config.log stamp-h stamp-h[0-9]* ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +-mostlyclean-am: mostlyclean-hdr mostlyclean-sbinPROGRAMS \ +- mostlyclean-compile mostlyclean-tags \ +- mostlyclean-generic ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am + +-mostlyclean: mostlyclean-am ++clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am + +-clean-am: clean-hdr clean-sbinPROGRAMS clean-compile clean-tags \ +- clean-generic mostlyclean-am ++distclean: distclean-am ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -f Makefile ++distclean-am: clean-am distclean-compile distclean-generic \ ++ distclean-hdr distclean-tags + +-clean: clean-am ++dvi: dvi-am + +-distclean-am: distclean-hdr distclean-sbinPROGRAMS distclean-compile \ +- distclean-tags distclean-generic clean-am ++dvi-am: + +-distclean: distclean-am +- -rm -f config.status ++html: html-am + +-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-sbinPROGRAMS \ +- maintainer-clean-compile maintainer-clean-tags \ +- maintainer-clean-generic distclean-am +- @echo "This command is intended for maintainers to use;" +- @echo "it deletes files that may require special tools to rebuild." ++html-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-man ++ ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ ++install-exec-am: install-sbinPROGRAMS ++ ++install-html: install-html-am ++ ++install-html-am: ++ ++install-info: install-info-am ++ ++install-info-am: ++ ++install-man: install-man8 ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ ++installcheck-am: + + maintainer-clean: maintainer-clean-am +- -rm -f config.status ++ -rm -f $(am__CONFIG_DISTCLEAN_FILES) ++ -rm -rf $(top_srcdir)/autom4te.cache ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-compile mostlyclean-generic ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am + +-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +-mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS clean-sbinPROGRAMS \ +-maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \ +-install-sbinPROGRAMS mostlyclean-compile distclean-compile \ +-clean-compile maintainer-clean-compile install-man8 uninstall-man8 \ +-install-man uninstall-man tags mostlyclean-tags distclean-tags \ +-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +-check-am installcheck-am installcheck all-recursive-am install-exec-am \ +-install-exec install-data-am install-data install-am install \ +-uninstall-am uninstall all-redirect all-am all installdirs \ +-mostlyclean-generic distclean-generic clean-generic \ +-maintainer-clean-generic clean mostlyclean distclean maintainer-clean ++ps-am: ++ ++uninstall-am: uninstall-man uninstall-sbinPROGRAMS ++ ++uninstall-man: uninstall-man8 ++ ++.MAKE: all install-am install-strip ++ ++.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ ++ clean-generic clean-sbinPROGRAMS ctags dist dist-all \ ++ dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \ ++ dist-xz dist-zip distcheck distclean distclean-compile \ ++ distclean-generic distclean-hdr distclean-tags distcleancheck \ ++ distdir distuninstallcheck dvi dvi-am html html-am info \ ++ info-am install install-am install-data install-data-am \ ++ install-dvi install-dvi-am install-exec install-exec-am \ ++ install-html install-html-am install-info install-info-am \ ++ install-man install-man8 install-pdf install-pdf-am install-ps \ ++ install-ps-am install-sbinPROGRAMS install-strip installcheck \ ++ installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-compile \ ++ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ ++ uninstall-am uninstall-man uninstall-man8 \ ++ uninstall-sbinPROGRAMS + + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +--- farpd-0.2.orig/arpd.8 ++++ farpd-0.2/arpd.8 +@@ -4,10 +4,10 @@ + .Dd August 4, 2001 + .Dt ARPD 8 + .Sh NAME +-.Nm arpd ++.Nm farpd + .Nd ARP reply daemon + .Sh SYNOPSIS +-.Nm arpd ++.Nm farpd + .Op Fl d + .Op Fl i Ar interface + .Op Ar net ... +@@ -31,6 +31,11 @@ + .Nm + exits on an interrupt or termination signal. + .Pp ++Note: The program name ++.Nm ++has been changed in Debian GNU/Linux from the original name ++(\fBarpd\fR) to avoid name clash with other ARP daemons. ++.Pp + The options are as follows: + .Bl -tag -width Ds + .It Fl d +@@ -52,11 +57,31 @@ + .El + .Sh FILES + .Bl -tag -width /var/run/arpd.pid +-.It Pa /var/run/arpd.pid ++.It Pa /var/run/farpd.pid + .El + .Sh SEE ALSO + .Xr pcapd 8 , + .Xr synackd 8 ++.Sh BUGS ++.Nm ++will respond too slowly to ARP requests for some applications. In ++order to ensure that it does not claim existing IP addresses it will send two ++ARP request and wait for a reply. This slowness affects the \fBnmap\fR network ++scanning tool, and possibly others, which uses by default ARP when scanning ++local networks. The answers from ++.Nm ++will come after the tool has timeout waiting for the ARP replies and, ++consequently, IP addresses claimed by ++.Nm ++will not be discovered. ++.Pp ++Additionally, ++.Nm ++sends the ARP replies to the broadcast address of the network and not to the ++host that send the ARP request. Some systems and applications (notably ++\fBnmap\fR) will not handled these requests and expect directed ARP replies ++(i.e. targeted specifically to the host that sent the request and not to the ++network) + .Sh AUTHORS + Dug Song + .Aq dugsong@monkey.org , +--- farpd-0.2.orig/configure.in ++++ farpd-0.2/configure.in +@@ -19,33 +19,33 @@ + AC_CHECK_LIB(socket, socket) + AC_CHECK_LIB(nsl, gethostbyname) + +-dnl Checks for (installed) libdnet +-AC_MSG_CHECKING(for libdnet) +-AC_ARG_WITH(libdnet, +-[ --with-libdnet=DIR use libdnet in DIR], ++dnl Checks for (installed) libdnet ++AC_MSG_CHECKING(for libdnet) ++AC_ARG_WITH(libdnet, ++[ --with-libdnet=DIR use libdnet in DIR], + [ case "$withval" in + yes|no) + AC_MSG_RESULT(no) + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/src/libdnet.a; then ++ if test -f $withval/src/libdnet.a; then + DNETINC="-I$withval/include" +- DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`" +- elif test -x $withval/bin/dnet-config; then +- DNETINC="`$withval/bin/dnet-config --cflags`" +- DNETLIB="`$withval/bin/dnet-config --libs`" ++ DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`" ++ elif test -x $withval/bin/dnet-config; then ++ DNETINC="`$withval/bin/dnet-config --cflags`" ++ DNETLIB="`$withval/bin/dnet-config --libs`" + else +- AC_ERROR(dnet-config not found in $withval/bin) ++ AC_ERROR(dnet-config not found in $withval/bin) + fi + ;; + esac ], +-[ if test -x ${prefix}/bin/dnet-config; then +- DNETINC="`${prefix}/bin/dnet-config --cflags`" +- DNETLIB="`${prefix}/bin/dnet-config --libs`" ++[ if test -x ${prefix}/bin/dnet-config; then ++ DNETINC="`${prefix}/bin/dnet-config --cflags`" ++ DNETLIB="`${prefix}/bin/dnet-config --libs`" + else + AC_MSG_RESULT(no) +- AC_ERROR(libdnet not found) ++ AC_ERROR(libdnet not found) + fi + AC_MSG_RESULT(yes) ] + ) +@@ -77,7 +77,7 @@ + fi + ;; + esac ], +-[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.a; ++[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/${host}/libevent.a; + then + EVENTINC="-I${prefix}/include" + EVENTLIB="-L${prefix}/lib -levent" +@@ -161,12 +161,12 @@ + CFLAGS=$DNETINC + LIBS=$DNETLIB + +-dnl see if dnet works +- AC_MSG_CHECKING(for working addr_cmp in libdnet) ++dnl see if dnet works ++ AC_MSG_CHECKING(for working addr_cmp in libdnet) + AC_TRY_RUN( + #include + #include +-#include ++#include + int + main(int argc, char **argv) + { +--- farpd-0.2.orig/debian/farpd.init ++++ farpd-0.2/debian/farpd.init +@@ -0,0 +1,151 @@ ++#!/bin/sh -e ++# ++# /etc/init.d/farpd ++# ++# Originally written by Miquel van Smoorenburg . ++# Modified for Debian GNU/Linux by Ian Murdock . ++# Modified for nessusd by Luca Andreucci ++# Furter changes by Javier Fernandez-Sanguino for the ++# Debian GNU/Linux distribution ++# Modified for farpd by Javier Fernandez-Sanguino ++# ++### BEGIN INIT INFO ++# Provides: farpd ++# Required-Start: $network $syslog $remote_fs ++# Required-Stop: $network $syslog $remote_fs ++# Default-Start: ++# Default-Stop: 0 1 6 ++# Short-Description: Daemon that replies to any ARP requests ++# Description: Farpd ('fake ARPD') will reply to any ARP request for IP ++# addresses matching a destination net with the MAC ++# address of the specified interface if no hosts claims it. ++### END INIT INFO ++ ++# Default ++INTERFACE="" ++NETWORK="unconfigured" ++# time to wait for daemons death, in seconds ++# don't set it too low or you might not let it die gracefully ++DODTIME=1 ++[ -r /etc/default/farpd ] && . /etc/default/farpd ++ ++. /lib/lsb/init-functions ++ ++DAEMON=/usr/sbin/farpd ++PIDFILE=/var/run/farpd.pid ++NAME=farpd ++LABEL="Fake-arpd daemon" ++DAEMONOPTS="$NETWORK" ++if [ -n "$INTERFACE" ] ; then ++ DAEMONOPTS="-i $INTERFACE " ++fi ++if [ -n "$NETWORK" ] ; then ++ DAEMONOPTS="$DAEMONOPTS $NETWORK " ++fi ++ ++test -x $DAEMON || exit 0 ++ ++ ++configured() { ++# Check if the user has configured it ++ if [ "$NETWORK" = "unconfigured" ] ; then ++ log_failure_msg "Fake-arpd has not been configured, please review and configure /etc/default/farpd" ++ log_end_msg 1 ++ fi ++} ++ ++running() ++{ ++ # No pidfile, probably no daemon present ++ # ++ [ -r "$PIDFILE" ] && pid=`cat $PIDFILE` ++ ++ # No pid, probably no daemon present ++ [ -z "$pid" ] && return 1 ++ ++ [ ! -d /proc/$pid ] && return 1 ++ cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` ++ # No process? ++ [ "$cmd" != "$DAEMON" ] && return 1 ++ ++ return 0 ++} ++ ++ ++start() { ++ start-stop-daemon --start --exec $DAEMON -- $DAEMONOPTS 2>&1 >/dev/null ++ errcode=$? ++# If we don't sleep then running() might not see the pidfile ++ sleep $DODTIME ++ return $errcode ++} ++ ++force_stop() { ++ [ ! -e "$PIDFILE" ] && return ++ if running ; then ++ kill -15 $pid ++ # Is it really dead? ++ sleep "$DODTIME"s ++ if running ; then ++ kill -9 $pid ++ sleep "$DODTIME"s ++ if running ; then ++ log_failure_msg "Cannot kill $LABEL (pid=$pid)!" ++ log_end_msg 1 ++ fi ++ fi ++ fi ++ rm -f $PIDFILE ++} ++ ++case "$1" in ++ start) ++ configured ++ log_daemon_msg "Starting $LABEL" "$NAME" ++ if start && running ; then ++ log_end_msg 0 ++ else ++ log_end_msg 1 ++ fi ++ ;; ++ stop) ++ log_daemon_msg "Stopping $LABEL" "$NAME" ++ start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON ++ if running; then ++ force_stop ++ fi ++ log_end_msg 0 ++ ;; ++ reload|force-reload|restart) ++ configured ++ log_daemon_msg "Restarting $LABEL" "$NAME" ++ if running; then ++ start-stop-daemon --stop --pidfile $PIDFILE --quiet --oknodo --exec $DAEMON ++ sleep "$DODTIME"s ++ fi ++ if running; then ++ force_stop ++ fi ++ if start && running ; then ++ log_end_msg 0 ++ else ++ log_end_msg 1 ++ fi ++ ;; ++ status) ++ configured ++ echo -n "$LABEL is " ++ if running ; then ++ echo "running" ++ else ++ echo " not running." ++ exit 1 ++ fi ++ ;; ++ *) ++ log_action_msg "Usage: /etc/init.d/$NAME {start|stop|restart|reload|status}" ++ exit 2 ++ ;; ++esac ++ ++exit 0 +--- farpd-0.2.orig/debian/copyright ++++ farpd-0.2/debian/copyright +@@ -0,0 +1,38 @@ ++This package was debianized by Javier Fernandez-Sanguino on ++Thu, 27 Mar 2003 10:25:02 +0100. ++ ++It was downloaded from http://www.citi.umich.edu/u/provos/honeyd/ ++ ++Upstream Authors: Dug Song and Niels Provos ++ ++Copyright: ++ ++ ++ Copyright (c) 2000, 2001, 2002 Dug Song ++ Copyright (c) 2002 Niels Provos ++ All rights reserved, all wrongs reversed. ++ ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions ++ are met: ++ ++ 1. Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ 3. The names of the authors and copyright holders may not be used to ++ endorse or promote products derived from this software without ++ specific prior written permission. ++ ++ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ++ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY ++ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ++ THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ++ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ++ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; ++ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, ++ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR ++ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ++ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ +--- farpd-0.2.orig/debian/farpd.default ++++ farpd-0.2/debian/farpd.default +@@ -0,0 +1,16 @@ ++# Options for the Fake arp daemon ++# ++# Interface where farpd will listen in ++INTERFACE="" ++ ++# Network for which fake arp daemon will answer to ++# You can leave this empty but then the daemon will try to take over ++# all the network addresses in that interface ++# ++# Note: Default 'unconfigured' means that farpd will not startup, you ++# have to setup a valid value here (can be empty) ++NETWORK="unconfigured" ++ ++# Time to wait for the daemon to die before restarting it ++# (in seconds) ++# DODTIME=5 diff --git a/makefu/5pkgs/honeyd/default.nix b/makefu/5pkgs/honeyd/default.nix new file mode 100644 index 000000000..5dca35f33 --- /dev/null +++ b/makefu/5pkgs/honeyd/default.nix @@ -0,0 +1,62 @@ +{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, + libpcap, libdnet, libevent, readline, autoconf, automake, libtool, zlib, pcre, + ... }: +stdenv.mkDerivation rec { + name = "honeyd-${version}"; + + #version = "1.5c"; #original, does not compile due to libc errors + #src = fetchurl { + # url = "http://www.honeyd.org/uploads/honeyd-${version}.tar.gz"; + # sha256 = "0vcih16fk5pir5ssfil8x79nvi62faw0xvk8s5klnysv111db1ii"; + #}; + + #version = "64d087c"; # honeyd-1.6.7 + # sha256 = "0zhnn13r24y1q494xcfx64vyp84zqk8qmsl41fq2674230bn0p31"; + + version = "c135fea08"; #nova-13.09 + src = fetchFromGitHub { + owner = "DataSoft"; + repo = "honeyd"; + rev = version; + sha256 = "1r9qds7a1yp3nkccwh3isrizpr2njhpf1m6qp3lqkj0i9c4w6x44"; + }; + + buildInputs = with pkgs;[ + automake + gnugrep + libpcap + libdnet + pcre + libevent + readline + autoconf + libtool + zlib + coreutils + python + pythonPackages.sqlite3 + ]; + patches = [ ./fix-autogen.patch ]; + + # removes user install script from Makefile before automake + preConfigure = '' + sed -i '/init.py$/d' Makefile.am + sh ./autogen.sh + ''; + + makeFlags = [ "LIBS=-lz" ]; + configureFlags = [ + "--with-libpcap=${libpcap}" + "--with-libevent=${libevent}" + "--with-zlib=${zlib}" + "--with-python" + "--with-libpcre=${pcre}" + "--with-libreadline=${readline}" + ]; + + meta = { + homepage = http://www.honeyd.org/; + description = "virtual Honeypots"; + license = lib.licenses.gpl2; + }; +} diff --git a/makefu/5pkgs/honeyd/fix-autogen.patch b/makefu/5pkgs/honeyd/fix-autogen.patch new file mode 100644 index 000000000..9fccafa82 --- /dev/null +++ b/makefu/5pkgs/honeyd/fix-autogen.patch @@ -0,0 +1,42 @@ +--- ./configure.in 2016-06-27 18:36:06.640779048 +0200 ++++ ./configure.in 2016-06-27 18:34:53.968803854 +0200 +@@ -119,11 +119,11 @@ + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then ++ if test -f $withval/include/pcap.h -a -f $withval/lib/libpcap.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" ++ PCAPINC="-I$withval/include -I$withval/include/bpf" ++ PCAPLIB="-L$withval/lib -lpcap" + else + AC_ERROR(pcap.h or libpcap.a not found in $withval) + fi +@@ -230,7 +230,7 @@ + if cd $withval; then withval=`pwd`; cd $owd; fi + EVENTINC="-I$withval" + EVENTLIB="-L$withval -levent" +- elif test -f $withval/include/event.h -a -f $withval/lib/libevent.a; then ++ elif test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + EVENTINC="-I$withval/include" +@@ -354,12 +354,12 @@ + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/readline/readline.h -a -f $withval/libreadline.a; then ++ if test -f $withval/include/readline/readline.h -o -f $withval/lib/libreadline.so; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + AC_DEFINE(HAVE_LIBREADLINE, 1, [Define if you have libreadline]) +- EDITINC="-I$withval" +- EDITLIB="-L$withval -lreadline" ++ EDITINC="-I$withval/include" ++ EDITLIB="-L$withval/lib -lreadline" + else + AC_ERROR(readline/readline.h or libreadline.a not found in $withval) + fi diff --git a/makefu/5pkgs/ps3netsrv/default.nix b/makefu/5pkgs/ps3netsrv/default.nix new file mode 100644 index 000000000..904185934 --- /dev/null +++ b/makefu/5pkgs/ps3netsrv/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, clang, makeWrapper, gnugrep }: + +stdenv.mkDerivation rec { + name = "ps3netsrv-${version}"; + version = "1.1.0"; + + enableParallelBuilding = true; + + src = fetchgit { + url = "https://github.com/dirkvdb/ps3netsrv--"; + fetchSubmodules = true; + rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; # latest @ 2016-05-24 + sha256 = "0l7bp18cs3xr2qgsmcf18diccski49mj9whngxm9isi8wd4r9inj"; + }; + + nativeBuildInputs = [ gnugrep ]; + buildPhase = "make CXX=g++"; + installPhase = '' + mkdir -p $out/bin + cp ps3netsrv++ $out/bin + ''; + meta = { + description = "C++ implementation of the ps3netsrv server"; + homepage = https://github.com/dirkvdb/ps3netsrv--; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/shared/2configs/repo-sync.nix b/shared/2configs/repo-sync.nix index b23cb1675..d1d9ab3f8 100644 --- a/shared/2configs/repo-sync.nix +++ b/shared/2configs/repo-sync.nix @@ -7,7 +7,7 @@ with lib; mirror = "git@wolf:stockholm-mirror"; in { enable = true; - config = { + repos.stockholm = { makefu = { origin.url = http://cgit.gum/stockholm ; mirror.url = mirror;