Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7528] branches/1.0
|
From: <abe...@us...> - 2016-02-13 00:28:45
|
Revision: 7528
http://sourceforge.net/p/astlinux/code/7528
Author: abelbeck
Date: 2016-02-13 00:28:43 +0000 (Sat, 13 Feb 2016)
Log Message:
-----------
arp-scan, new package, patched to share mac2vendor OUI database, only adds 55 KB uncompressed
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/arp-scan/
branches/1.0/package/arp-scan/Config.in
branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch
branches/1.0/package/arp-scan/arp-scan.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/astlinux-ast11.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:48 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -679,6 +679,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/astlinux-ast13.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:51 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -679,6 +679,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/astlinux18.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:45 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -679,6 +679,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/initrd.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:36:57 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -559,6 +559,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/package/Config.in 2016-02-13 00:28:43 UTC (rev 7528)
@@ -443,6 +443,7 @@
source "package/apcupsd/Config.in"
source "package/argus/Config.in"
source "package/arnofw/Config.in"
+source "package/arp-scan/Config.in"
source "package/avahi/Config.in"
source "package/axel/Config.in"
source "package/bluez_utils/Config.in"
Added: branches/1.0/package/arp-scan/Config.in
===================================================================
--- branches/1.0/package/arp-scan/Config.in (rev 0)
+++ branches/1.0/package/arp-scan/Config.in 2016-02-13 00:28:43 UTC (rev 7528)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_ARP_SCAN
+ bool "arp-scan"
+ default n
+ select BR2_PACKAGE_LIBPCAP
+ # mac2vendor is only a runtime dependency
+ select BR2_PACKAGE_MAC2VENDOR
+ help
+ The ARP scanner
+
+ https://github.com/royhills/arp-scan/
+
+ http://linux.die.net/man/1/arp-scan
+
Added: branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch
===================================================================
--- branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch (rev 0)
+++ branches/1.0/package/arp-scan/arp-scan-local-oui-db.patch 2016-02-13 00:28:43 UTC (rev 7528)
@@ -0,0 +1,54 @@
+--- arp-scan-1.9/arp-scan.c.orig 2016-02-12 16:06:08.000000000 -0600
++++ arp-scan-1.9/arp-scan.c 2016-02-12 16:48:27.000000000 -0600
+@@ -331,32 +331,21 @@
+ * Create MAC/Vendor hash table if quiet if not in effect.
+ */
+ if (!quiet_flag) {
+- char *fn;
++ const char *list = "0123456789ABCDEF";
++ const char *cp;
++ char fn[32];
+ int count;
+
+ if ((hash_table = hash_new()) == NULL)
+ err_sys("hash_new");
+
+- fn = get_mac_vendor_filename(ouifilename, DATADIR, OUIFILENAME);
+- count = add_mac_vendor(hash_table, fn);
+- if (verbose > 1 && count > 0)
+- warn_msg("DEBUG: Loaded %d IEEE OUI/Vendor entries from %s.",
+- count, fn);
+- free(fn);
+-
+- fn = get_mac_vendor_filename(iabfilename, DATADIR, IABFILENAME);
+- count = add_mac_vendor(hash_table, fn);
+- if (verbose > 1 && count > 0)
+- warn_msg("DEBUG: Loaded %d IEEE IAB/Vendor entries from %s.",
+- count, fn);
+- free(fn);
+-
+- fn = get_mac_vendor_filename(macfilename, DATADIR, MACFILENAME);
+- count = add_mac_vendor(hash_table, fn);
+- if (verbose > 1 && count > 0)
+- warn_msg("DEBUG: Loaded %d MAC/Vendor entries from %s.",
+- count, fn);
+- free(fn);
++ for (cp = list; *cp != '\0'; cp++) {
++ snprintf(fn, 32, "/usr/share/oui-db/xxxxx%c", *cp);
++ count = add_mac_vendor(hash_table, fn);
++ if (verbose > 1 && count > 0)
++ warn_msg("DEBUG: Loaded %d IEEE OUI/Vendor entries from %s.",
++ count, fn);
++ }
+ }
+ /*
+ * Populate the list from the specified file if --file was specified, or
+@@ -2269,7 +2258,7 @@
+ add_mac_vendor(struct hash_control *table, const char *map_filename) {
+ static int first_call=1;
+ FILE *fp; /* MAC/Vendor file handle */
+- static const char *oui_pat_str = "([^\t]+)\t[\t ]*([^\t\r\n]+)";
++ static const char *oui_pat_str = "([^~]+)~[\t ]*([^\t\r\n]+)";
+ static regex_t oui_pat;
+ regmatch_t pmatch[3];
+ size_t key_len;
Added: branches/1.0/package/arp-scan/arp-scan.mk
===================================================================
--- branches/1.0/package/arp-scan/arp-scan.mk (rev 0)
+++ branches/1.0/package/arp-scan/arp-scan.mk 2016-02-13 00:28:43 UTC (rev 7528)
@@ -0,0 +1,20 @@
+################################################################################
+#
+# arp-scan
+#
+################################################################################
+ARP_SCAN_VERSION = 1.9
+ARP_SCAN_SOURCE = arp-scan-$(ARP_SCAN_VERSION).tar.gz
+ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION)
+
+ARP_SCAN_DEPENDENCIES = libpcap
+
+define ARP_SCAN_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/arp-scan $(TARGET_DIR)/usr/bin/arp-scan
+endef
+
+define ARP_SCAN_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/arp-scan
+endef
+
+$(eval $(call AUTOTARGETS,package,arp-scan))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/runnix-iso.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:09 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -587,6 +587,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/runnix.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:03 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:26 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -588,6 +588,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:21 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -660,6 +660,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:23 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -660,6 +660,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:14 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -660,6 +660,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
BR2_PACKAGE_ARNOFW=y
+BR2_PACKAGE_ARP_SCAN=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-12 17:02:42 UTC (rev 7527)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-13 00:28:43 UTC (rev 7528)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7510-dirty Configuration
-# Tue Feb 9 12:37:26 2016
+# Buildroot 2011.08-svn7527-dirty Configuration
+# Fri Feb 12 18:21:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -540,6 +540,7 @@
# BR2_PACKAGE_APCUPSD is not set
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_ARP_SCAN is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BLUEZ_UTILS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
