Skip to contentSkip to conversation

sngrep: bump version to v1.4.3

PATCH New Adam Duskett 2 participants 4 messages May 25, 2017 – May 31, 2017

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 1/1 sngrep: bump version to v1.4.3

The two patches were committed upstream.

Signed-off-by Adam Duskett <[email protected]>
---
 .../0001-src-Makefile.am-don-t-use-VPATH.patch     | 43 -------------
 ...e.ac-switch-to-pkg-config-to-find-openssl.patch | 75 ----------------------
 package/sngrep/sngrep.hash                         |  2 +-
 package/sngrep/sngrep.mk                           |  2 +-
 4 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100644 package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
 delete mode 100644 package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch
package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch deleted +0 -43
deleted file mode 100644
index 3d98203..0000000
@@ -1,43 +0,0 @@
-From b6dcae8ec4334e2436cfa19a8052c3473f57a586 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <[email protected]>
-Date: Sat, 4 Mar 2017 15:02:43 +0100
-Subject: [PATCH 1/2] src/Makefile.am: don't use VPATH
-
-VPATH is a mechanism used to allow out-of-tree build, not to use source
-code from a different directory. For this purpose, one should simply use
-the "subdir-objects" AUTOMAKE_OPTIONS, and reference the source code of
-the sub-directory in the <prog>_SOURCES variable.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Upstream-status: https://github.com/irontec/sngrep/pull/176
----
- src/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 931ee06..961f4a0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
-+AUTOMAKE_OPTIONS=subdir-objects
- bin_PROGRAMS=sngrep
--VPATH=curses
- sngrep_SOURCES=capture.c
- if USE_EEP
- sngrep_SOURCES+=capture_eep.c
-@@ -12,8 +12,8 @@ sngrep_SOURCES+=capture_openssl.c
- endif
- sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c
- sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c
--sngrep_SOURCES+=util.c hash.c vector.c ui_panel.c scrollbar.c
--sngrep_SOURCES+=ui_manager.c ui_call_list.c ui_call_flow.c ui_call_raw.c
--sngrep_SOURCES+=ui_stats.c ui_filter.c ui_save.c ui_msg_diff.c
--sngrep_SOURCES+=ui_column_select.c ui_settings.c
-+sngrep_SOURCES+=util.c hash.c vector.c curses/ui_panel.c curses/scrollbar.c
-+sngrep_SOURCES+=curses/ui_manager.c curses/ui_call_list.c curses/ui_call_flow.c curses/ui_call_raw.c
-+sngrep_SOURCES+=curses/ui_stats.c curses/ui_filter.c curses/ui_save.c curses/ui_msg_diff.c
-+sngrep_SOURCES+=curses/ui_column_select.c curses/ui_settings.c
- 
--- 
-2.7.4
-
package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch deleted +0 -75

75 lines not on this page · raw message

package/sngrep/sngrep.hash +1 -1
index dd75f89..bc28545 100644
@@ -1 +1 @@
-sha256 30fbfb4f90ed8805194b39683a8a2ed465776ffd60df4482bd029d63b316b3f1 sngrep-v1.4.2.tar.gz
+sha256 7385ac202de6d6a1feffb2fd514600563133d9dfa7fb47be052de839abcc1d52 sngrep-v1.4.3.tar.gz
package/sngrep/sngrep.mk +1 -1
index 74b05b1..560872f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SNGREP_VERSION = v1.4.2
+SNGREP_VERSION = v1.4.3
 SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
 SNGREP_LICENSE = GPL-3.0+
 SNGREP_LICENSE_FILES = LICENSE
Signature · 1 line
2.9.4
#1 lore raw

PATCH 1/1 sngrep: bump version to v1.4.3

Hello,

Quoted 3 lines · Adam Duskett

The two patches were committed upstream.

Signed-off-by Adam Duskett <[email protected]>

If both patches have been committed upstream, do we still need SNGREP_AUTORECONF = YES ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 sngrep: bump version to v1.4.3

Yes, as there is no configure script in the source.

Quoted 17 lines · Thomas Petazzoni

Hello,

Quoted 3 lines · Adam Duskett

The two patches were committed upstream.

Signed-off-by Adam Duskett <[email protected]>

If both patches have been committed upstream, do we still need SNGREP_AUTORECONF = YES ?

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Applied
#3 lore raw

PATCH 1/1 sngrep: bump version to v1.4.3

In reply to Adam Duskett

Hello,

Quoted 11 lines · Adam Duskett

The two patches were committed upstream.

Signed-off-by Adam Duskett <[email protected]>
---
 .../0001-src-Makefile.am-don-t-use-VPATH.patch     | 43 -------------
 ...e.ac-switch-to-pkg-config-to-find-openssl.patch | 75 ----------------------
 package/sngrep/sngrep.hash                         |  2 +-
 package/sngrep/sngrep.mk                           |  2 +-
 4 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100644 package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
 delete mode 100644 package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com