From 1e4463088fb266a9a6e5aa1f012df69151267dae Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 17:54:58 +0100 Subject: [PATCH 01/13] sipgrep: import from openwrt/packages Signed-off-by: Sebastian Kemper --- net/sipgrep/Makefile | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 net/sipgrep/Makefile diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile new file mode 100644 index 0000000..4329b82 --- /dev/null +++ b/net/sipgrep/Makefile @@ -0,0 +1,48 @@ +# +# Copyright (C) 2016 Daniel Engberg +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=sipgrep +PKG_VERSION:=20160914-devel +PKG_RELEASE:=1 +PKG_MAINTAINER:=Daniel Engberg +PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILES:=COPYING + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/sipcapture/sipgrep +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=df8a95b066569be92aa38cad01086ea595b36863 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MIRROR_HASH:=a9131ae443bdce760e3dadd83dcf115d51a894381fc18461cbe62522618418fa + +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/sipgrep + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libpcap +libpcre +libncursesw + TITLE:=Display and Troubleshoot SIP signaling in CLI + URL:=https://github.com/sipcapture/sipgrep +endef + +define Package/sipgrep/description + SipGrep is a utility for displaying and troubleshooting SIP signaling. +endef + +CONFIGURE_ARGS += \ + --enable-ncurses + +define Package/sipgrep/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sipgrep $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,sipgrep)) From adc9777fec31a883584962153d99e3959610ebf6 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 17:58:36 +0100 Subject: [PATCH 02/13] sipgrep: update maintainer and copyright messages Signed-off-by: Sebastian Kemper --- net/sipgrep/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile index 4329b82..38fe9ac 100644 --- a/net/sipgrep/Makefile +++ b/net/sipgrep/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2016 Daniel Engberg +# Copyright (C) 2016 - 2018 Daniel Engberg +# Copyright (C) 2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sipgrep PKG_VERSION:=20160914-devel PKG_RELEASE:=1 -PKG_MAINTAINER:=Daniel Engberg +PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING From 20aa96f16b0bf7154600e74d7e0590c91b75c1fb Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:03:07 +0100 Subject: [PATCH 03/13] sipgrep: move binary to /usr/bin - added PKG_INSTALL - upstream puts the binary into /usr/bin, now OpenWrt does the same Signed-off-by: Sebastian Kemper --- net/sipgrep/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile index 38fe9ac..f204e36 100644 --- a/net/sipgrep/Makefile +++ b/net/sipgrep/Makefile @@ -24,6 +24,8 @@ PKG_MIRROR_HASH:=a9131ae443bdce760e3dadd83dcf115d51a894381fc18461cbe62522618418f PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/sipgrep @@ -42,8 +44,8 @@ CONFIGURE_ARGS += \ --enable-ncurses define Package/sipgrep/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sipgrep $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sipgrep $(1)/usr/bin endef $(eval $(call BuildPackage,sipgrep)) From b601d73d6bf1d383a928bc285336bf5358eb5e6e Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:09:29 +0100 Subject: [PATCH 04/13] sipgrep: update descriptions - move the package to Utilities/Telephony - title/description shamelessly copied from Debian Signed-off-by: Sebastian Kemper --- net/sipgrep/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile index f204e36..c85085a 100644 --- a/net/sipgrep/Makefile +++ b/net/sipgrep/Makefile @@ -29,15 +29,18 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/sipgrep - SECTION:=net - CATEGORY:=Network + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Telephony DEPENDS:=+libpcap +libpcre +libncursesw - TITLE:=Display and Troubleshoot SIP signaling in CLI + TITLE:=Command line tool to sniff, capture, display SIP messages URL:=https://github.com/sipcapture/sipgrep endef define Package/sipgrep/description - SipGrep is a utility for displaying and troubleshooting SIP signaling. +Powerful pcap-aware command line tool to sniff, capture, display and +troubleshoot SIP signaling over IP networks, allowing the user to +specify extended regular expressions matching against SIP headers. endef CONFIGURE_ARGS += \ From 9396c38ef69b345b38af848766be9ecfa5d49916 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:12:42 +0100 Subject: [PATCH 05/13] sipgrep: drop ncurses dependency, add ipv6 support Following Debian's example, keeping it lean and mean. Signed-off-by: Sebastian Kemper --- net/sipgrep/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile index c85085a..86de271 100644 --- a/net/sipgrep/Makefile +++ b/net/sipgrep/Makefile @@ -32,7 +32,7 @@ define Package/sipgrep SECTION:=utils CATEGORY:=Utilities SUBMENU:=Telephony - DEPENDS:=+libpcap +libpcre +libncursesw + DEPENDS:=+libpcap +libpcre TITLE:=Command line tool to sniff, capture, display SIP messages URL:=https://github.com/sipcapture/sipgrep endef @@ -44,7 +44,7 @@ specify extended regular expressions matching against SIP headers. endef CONFIGURE_ARGS += \ - --enable-ncurses + --enable-ipv6 define Package/sipgrep/install $(INSTALL_DIR) $(1)/usr/bin From 487a3f4c67df632f43d355f34c814b17c6efacb9 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:16:01 +0100 Subject: [PATCH 06/13] sipgrep: update PKG_VERSION The source does not change, but reflect the real version (2.2.1) in PKG_VERSION. Also move from gz to xz to shave off a few Bytes. Signed-off-by: Sebastian Kemper --- net/sipgrep/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/sipgrep/Makefile b/net/sipgrep/Makefile index 86de271..73bd439 100644 --- a/net/sipgrep/Makefile +++ b/net/sipgrep/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sipgrep -PKG_VERSION:=20160914-devel +PKG_VERSION:=2.2.1-20160621 PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-3.0 @@ -19,8 +19,8 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/sipcapture/sipgrep PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=df8a95b066569be92aa38cad01086ea595b36863 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MIRROR_HASH:=a9131ae443bdce760e3dadd83dcf115d51a894381fc18461cbe62522618418fa +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_MIRROR_HASH:=9b40ecd7822c84740fcf0032ab5c54195df545162c623699232b78da6ae225d2 PKG_FIXUP:=autoreconf From 02a6be28b6fec92d831cdc6cf5293e2fcb773495 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:19:34 +0100 Subject: [PATCH 07/13] sngrep: import from openwrt/packages Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 net/sngrep/Makefile diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile new file mode 100644 index 0000000..7ebfe5d --- /dev/null +++ b/net/sngrep/Makefile @@ -0,0 +1,50 @@ +# +# Copyright (C) 2016 Daniel Engberg +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=sngrep +PKG_VERSION=1.4.4-rc2 +PKG_RELEASE:=1 +PKG_MAINTAINER:=Daniel Engberg +PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILES:=COPYING + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/irontec/sngrep +PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=cf5e1da49d00bc7ab1afe9d63daa240db2b9b19c +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_MIRROR_HASH:=a6cee2caa108a618134fe87d7c04862e93aa2fdf9647d81dfe4abe91a6c9c19f + +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/sngrep + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libpcap +libpthread +libpcre +libncursesw + TITLE:=Display SIP calls message flows + URL:=https://github.com/irontec/sngrep +endef + +define Package/sngrep/description + sngrep is a tool for displaying SIP calls message flows from terminal. + It supports live capture to display realtime SIP packets and can also be used as PCAP viewer. +endef + +CONFIGURE_ARGS += \ + --with-pcre \ + --enable-unicode \ + +define Package/sngrep/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sngrep $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,sngrep)) From b99814d95428cf0d6944045a212c1a8f94e813b2 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:37:52 +0100 Subject: [PATCH 08/13] sngrep: update maintainer and copyright messages Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index 7ebfe5d..c06889b 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -1,5 +1,6 @@ # -# Copyright (C) 2016 Daniel Engberg +# Copyright (C) 2016 - 2018 Daniel Engberg +# Copyright (C) 2018 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,8 +11,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sngrep PKG_VERSION=1.4.4-rc2 PKG_RELEASE:=1 -PKG_MAINTAINER:=Daniel Engberg -PKG_LICENSE:=GPL-3.0 +PKG_MAINTAINER:=Sebastian Kemper +PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=COPYING PKG_SOURCE_PROTO:=git From 81507d30bad487837abfa056962108e59be358dd Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:39:56 +0100 Subject: [PATCH 09/13] sngrep: move binary to /usr/bin - added PKG_INSTALL - upstream puts the binary into /usr/bin, now OpenWrt does the same Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index c06889b..e4f4063 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -24,6 +24,8 @@ PKG_MIRROR_HASH:=a6cee2caa108a618134fe87d7c04862e93aa2fdf9647d81dfe4abe91a6c9c19 PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/sngrep @@ -44,8 +46,8 @@ CONFIGURE_ARGS += \ --enable-unicode \ define Package/sngrep/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/sngrep $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sngrep $(1)/usr/bin endef $(eval $(call BuildPackage,sngrep)) From db5f1f36bd7deb1f8f833d9bba0ab1b0cd319874 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:42:00 +0100 Subject: [PATCH 10/13] sngrep: update descriptions - move the package to Utilities/Telephony - title/description shamelessly copied from Debian Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index e4f4063..3af8d04 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -29,16 +29,21 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/sngrep - SECTION:=net - CATEGORY:=Network + SECTION:=utils + CATEGORY:=Utilities + SUBMENU:=Telephony DEPENDS:=+libpcap +libpthread +libpcre +libncursesw - TITLE:=Display SIP calls message flows + TITLE:=Ncurses SIP messages flow viewer URL:=https://github.com/irontec/sngrep endef define Package/sngrep/description - sngrep is a tool for displaying SIP calls message flows from terminal. - It supports live capture to display realtime SIP packets and can also be used as PCAP viewer. +sngrep displays SIP messages grouped by Call-Id into flow diagrams. It +can be used as an offline pcap viewer or for online capture using +libpcap functions. + +It supports SIP UDP and TCP transports (when each message is delivered +in one packet). endef CONFIGURE_ARGS += \ From b56aec67e846a4901c914ec8e37258c6dd17bd5c Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:44:59 +0100 Subject: [PATCH 11/13] sngrep: add some features This commit enables support for: - IPv6 - Homer export - TLS Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index 3af8d04..d755ada 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -32,7 +32,7 @@ define Package/sngrep SECTION:=utils CATEGORY:=Utilities SUBMENU:=Telephony - DEPENDS:=+libpcap +libpthread +libpcre +libncursesw + DEPENDS:=+libncursesw +libopenssl +libpcap +libpcre TITLE:=Ncurses SIP messages flow viewer URL:=https://github.com/irontec/sngrep endef @@ -47,8 +47,11 @@ in one packet). endef CONFIGURE_ARGS += \ - --with-pcre \ + --enable-eep \ + --enable-ipv6 \ --enable-unicode \ + --with-openssl \ + --with-pcre define Package/sngrep/install $(INSTALL_DIR) $(1)/usr/bin From f338b3b27a63f1f9e635b26936c6f9e72bbc9dde Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:46:54 +0100 Subject: [PATCH 12/13] sngrep: install /etc/sngreprc Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index d755ada..053b5c1 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -46,6 +46,10 @@ It supports SIP UDP and TCP transports (when each message is delivered in one packet). endef +define Package/sngrep/conffiles +/etc/sngreprc +endef + CONFIGURE_ARGS += \ --enable-eep \ --enable-ipv6 \ @@ -54,6 +58,8 @@ CONFIGURE_ARGS += \ --with-pcre define Package/sngrep/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sngreprc $(1)/etc $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/sngrep $(1)/usr/bin endef From 66e06be8216fd899862cd8b3cf8ca966e3b52daa Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Sun, 21 Jan 2018 18:48:01 +0100 Subject: [PATCH 13/13] sngrep: version bump - use upstream release tarball instead of git checkout - update to recently released version 1.4.5 Signed-off-by: Sebastian Kemper --- net/sngrep/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/net/sngrep/Makefile b/net/sngrep/Makefile index 053b5c1..dfcb647 100644 --- a/net/sngrep/Makefile +++ b/net/sngrep/Makefile @@ -9,18 +9,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sngrep -PKG_VERSION=1.4.4-rc2 +PKG_VERSION=1.4.5 PKG_RELEASE:=1 PKG_MAINTAINER:=Sebastian Kemper PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=COPYING -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/irontec/sngrep -PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=cf5e1da49d00bc7ab1afe9d63daa240db2b9b19c -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_MIRROR_HASH:=a6cee2caa108a618134fe87d7c04862e93aa2fdf9647d81dfe4abe91a6c9c19f +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/irontec/$(PKG_NAME)/releases/download/v$(PKG_VERSION) +PKG_HASH:=16f1566f4507ba560c7461cc7ff1c1653beb14b8baf7846269bbb4880564e57f PKG_FIXUP:=autoreconf