Commit 707927df authored by Sophie Brun's avatar Sophie Brun

Import new upstream release

parent a2e8a9ac
bettercap (2.11.1-0kali1) kali-dev; urgency=medium
* Import new upstream release
* Refresh patches and remove fix-ip-route-parser.patch and fix-lan.go.patch
merged upstream
-- Sophie Brun <sophie@offensive-security.com> Wed, 09 Jan 2019 15:01:02 +0100
bettercap (2.11-0kali3) kali-dev; urgency=medium
* Add fix-ip-route-parser.patch to fix tests on armel, armhf
......
Description: Fix ip route parser
IPv4RouteParser regular expression fails to match when there is nothing after
the interface name
Author: Raphael Hertzog <buxy@kali.org>
Forwarded: https://github.com/bettercap/bettercap/pull/395
Last-Update: 2018-11-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/network/net_linux.go
+++ b/network/net_linux.go
@@ -13,7 +13,7 @@ import (
)
// only matches gateway lines
-var IPv4RouteParser = regexp.MustCompile(`^(default|[0-9\.]+)\svia\s([0-9\.]+)\sdev\s(\w+)\s.*$`)
+var IPv4RouteParser = regexp.MustCompile(`^(default|[0-9\.]+)\svia\s([0-9\.]+)\sdev\s(\w+)(?:\s.*|)$`)
var IPv4RouteTokens = 4
var IPv4RouteCmd = "ip"
var IPv4RouteCmdOpts = []string{"route"}
From 85c2d0b4fa5136aab95043ab73296ca185f6824e Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Thu, 22 Nov 2018 13:06:29 +0100
Subject: [PATCH] fix: gracefully handling corrupted or not compatible alias
databases (fixes #391)
---
network/lan.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/network/lan.go
+++ b/network/lan.go
@@ -2,6 +2,7 @@ package network
import (
"encoding/json"
+ "fmt"
"net"
"strings"
"sync"
@@ -36,7 +37,7 @@ type lanJSON struct {
func NewLAN(iface, gateway *Endpoint, newcb EndpointNewCallback, lostcb EndpointLostCallback) *LAN {
aliases, err := data.NewUnsortedKV(aliasesFileName, data.FlushOnEdit)
if err != nil {
- panic(err)
+ fmt.Printf("error loading %s: %s", aliasesFileName, err)
}
return &LAN{
drop-failing-test-aliases.patch
fix-build-raw-i386.patch
fix-lan.go.patch
fix-ip-route-parser.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment