Merge pull request #8607 from mmaraya/port-mirroring-1.4.4

Port mirroring 1.4.4

net/port-mirroring/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015 OpenWrt.org
+# Copyright (c) 2019 OpenWrt.org
 #
 # This is free software, licensed under the BSD 2-Clause License.
 #
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=port-mirroring
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mmaraya/port-mirroring/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=90603163fb086cc586a711e066360ccfa5b4735f67586e8f9254e93f3bebb97e
+PKG_HASH:=9fb259d24cee4fe1bed1a51c49e52a8eb05b692ba1b5debb75fdf54957cc8ed1
 
 PKG_MAINTAINER:=Mike Maraya <mike.maraya@gmail.com>
 PKG_LICENSE:=BSD-2-Clause

net/port-mirroring/patches/010-convert-to-unix.patch

@@ -1,143 +0,0 @@
-diff --git a/include/config.h b/include/config.h
-index 5212c69..ac948ba 100644
---- a/include/config.h
-+++ b/include/config.h
-@@ -1,69 +1,69 @@
--/* 
-- * Copyright (c) 2015 Mike Maraya <mike[dot]maraya[at]gmail[dot]com>
-- * All rights reserved.
-- *
-- * This file is subject to the terms and conditions defined in
-- * https://github.com/mmaraya/port-mirroring/blob/master/LICENSE,
-- * which is part of this software package.
-- *
-- */
--
--#ifndef PORT_MIRRORING_UTIL_H_
--#define PORT_MIRRORING_UTIL_H_
--
--#include <errno.h>
--#include <net/if.h>
--#include <netinet/in.h>
--#include <stdint.h>
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <syslog.h>
--#include <linux/limits.h>
--
--#define OPTION_MAX  254     /* max value for program options                */
--#define TIMEBUF     32      /* max timestamp length RFC3339                 */
--#define SRC_MAX     4       /* maxium number of source network interfaces   */
--#define PFE_MAX     80      /* maximum length of packet filter expression   */
--#define MACADDRLEN  6       /* length of a MAC address                      */
--
--// port-mirroring configuration bit flags
--#define PM_DAEMON   0x01    /* run as background process                    */
--#define PM_DEBUG    0x02    /* display debugging messages to console        */
--#define PM_TZSP     0x04    /* send packets using TaZmen Sniffer Protocol   */
--#define PM_DST_IF   0x08    /* destination is a network interface           */
--#define PM_DST_IP   0x10    /* destination is an internet protocol address  */
--#define PM_PROMISC  0x20    /* place source interface in promiscuous mode   */
--#define PM_SYSLOG   0x40    /* log messages to syslog facility              */
--
--// if no configuration file is specified, look through these in order
--#define CFG_PATH_1  "/etc/config/port-mirroring"
--#define CFG_PATH_2  "/etc/port-mirroring"
--#define CFG_PATH_3  "port-mirroring.conf"
--
--// default program id file
--#define PID_PATH    "/var/run/port-mirroring.pid"
--
--// program-wide configuration settings and variables
--struct pm_cfg
--{
--    char        *cfg_file;              /* path to configuration file       */
--    uint8_t     flags;                  /* boolean setting bitmask          */
--    char        src[SRC_MAX][IFNAMSIZ]; /* source network interfaces        */
--    char        dst_if[IFNAMSIZ];       /* destination network interface    */
--    in_addr_t   dst_ip;                 /* destination IP address           */
--    char        pfe[PFE_MAX];           /* tcpdump packet filter expression */
--    char        *pid_file;              /* path to process id file          */
--    int         src_count;              /* number of source ports           */
--    char        src_mac[MACADDRLEN];    /* source MAC address               */
--    char        dst_mac[MACADDRLEN];    /* destination MAC address          */
--    time_t      init_time;              /* used to check for timeouts       */
--    int         packet_count;           /* number of packets processed      */
--};
--
--void find_cfg(struct pm_cfg *cfg);
--char * printMACStr(const char *mac);
--char * getUCIItem(char *buf, char *item);
--int getUCIConf(char *buf, char *option, char *value);
--
--#endif  // PORT_MIRRORING_UTIL_H_
-+/* 
-+ * Copyright (c) 2015 Mike Maraya <mike[dot]maraya[at]gmail[dot]com>
-+ * All rights reserved.
-+ *
-+ * This file is subject to the terms and conditions defined in
-+ * https://github.com/mmaraya/port-mirroring/blob/master/LICENSE,
-+ * which is part of this software package.
-+ *
-+ */
-+
-+#ifndef PORT_MIRRORING_UTIL_H_
-+#define PORT_MIRRORING_UTIL_H_
-+
-+#include <errno.h>
-+#include <net/if.h>
-+#include <netinet/in.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <syslog.h>
-+#include <linux/limits.h>
-+
-+#define OPTION_MAX  254     /* max value for program options                */
-+#define TIMEBUF     32      /* max timestamp length RFC3339                 */
-+#define SRC_MAX     4       /* maxium number of source network interfaces   */
-+#define PFE_MAX     80      /* maximum length of packet filter expression   */
-+#define MACADDRLEN  6       /* length of a MAC address                      */
-+
-+// port-mirroring configuration bit flags
-+#define PM_DAEMON   0x01    /* run as background process                    */
-+#define PM_DEBUG    0x02    /* display debugging messages to console        */
-+#define PM_TZSP     0x04    /* send packets using TaZmen Sniffer Protocol   */
-+#define PM_DST_IF   0x08    /* destination is a network interface           */
-+#define PM_DST_IP   0x10    /* destination is an internet protocol address  */
-+#define PM_PROMISC  0x20    /* place source interface in promiscuous mode   */
-+#define PM_SYSLOG   0x40    /* log messages to syslog facility              */
-+
-+// if no configuration file is specified, look through these in order
-+#define CFG_PATH_1  "/etc/config/port-mirroring"
-+#define CFG_PATH_2  "/etc/port-mirroring"
-+#define CFG_PATH_3  "port-mirroring.conf"
-+
-+// default program id file
-+#define PID_PATH    "/var/run/port-mirroring.pid"
-+
-+// program-wide configuration settings and variables
-+struct pm_cfg
-+{
-+    char        *cfg_file;              /* path to configuration file       */
-+    uint8_t     flags;                  /* boolean setting bitmask          */
-+    char        src[SRC_MAX][IFNAMSIZ]; /* source network interfaces        */
-+    char        dst_if[IFNAMSIZ];       /* destination network interface    */
-+    in_addr_t   dst_ip;                 /* destination IP address           */
-+    char        pfe[PFE_MAX];           /* tcpdump packet filter expression */
-+    char        *pid_file;              /* path to process id file          */
-+    int         src_count;              /* number of source ports           */
-+    char        src_mac[MACADDRLEN];    /* source MAC address               */
-+    char        dst_mac[MACADDRLEN];    /* destination MAC address          */
-+    time_t      init_time;              /* used to check for timeouts       */
-+    int         packet_count;           /* number of packets processed      */
-+};
-+
-+void find_cfg(struct pm_cfg *cfg);
-+char * printMACStr(const char *mac);
-+char * getUCIItem(char *buf, char *item);
-+int getUCIConf(char *buf, char *option, char *value);
-+
-+#endif  // PORT_MIRRORING_UTIL_H_

net/port-mirroring/patches/020-fix-musl.patch

@@ -1,12 +0,0 @@
-diff --git a/include/config.h b/include/config.h
-index ac948ba..da93160 100644
---- a/include/config.h
-+++ b/include/config.h
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
-+#include <time.h>
- #include <linux/limits.h>
- 
- #define OPTION_MAX  254     /* max value for program options                */