diff options
| -rw-r--r-- | krebs/3modules/makefu/default.nix | 14 | ||||
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/wbob.nix | 45 | ||||
| -rw-r--r-- | makefu/5pkgs/awesomecfg/default.nix | 1 | ||||
| -rw-r--r-- | makefu/5pkgs/awesomecfg/kiosk.lua | 533 | ||||
| -rw-r--r-- | makefu/5pkgs/default.nix | 5 | ||||
| -rw-r--r-- | makefu/5pkgs/farpd/default.nix | 59 | ||||
| -rw-r--r-- | makefu/5pkgs/farpd/farpd_0.2-11.diff | 1606 | ||||
| -rw-r--r-- | makefu/5pkgs/honeyd/default.nix | 62 | ||||
| -rw-r--r-- | makefu/5pkgs/honeyd/fix-autogen.patch | 42 | ||||
| -rw-r--r-- | makefu/5pkgs/ps3netsrv/default.nix | 29 |
11 files changed, 2378 insertions, 20 deletions
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/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 <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 |