From 06aa16e23490d03ef9098e61cdcf698af7317a96 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Sat, 14 Jan 2023 11:48:36 +0100 Subject: [PATCH] package/netopeer2: bump version to 2.1.42 Drop patch that is in upstream. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- ...X-use-DESTDIR-when-executing-scripts.patch | 47 ------------------- package/netopeer2/netopeer2.hash | 2 +- package/netopeer2/netopeer2.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch diff --git a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch b/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch deleted file mode 100644 index 99febb56ad..0000000000 --- a/package/netopeer2/0001-build-BUGFIX-use-DESTDIR-when-executing-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 696b6be8a623f4466def2a161baa26094e5592a4 Mon Sep 17 00:00:00 2001 -From: Michal Vasko -Date: Wed, 18 May 2022 09:14:35 +0200 -Subject: [PATCH] build BUGFIX use DESTDIR when executing scripts - -Fixes #1217 - -[Upstream accepted 696b6be8a623f4466def2a161baa26094e5592a4] -Signed-off-by: Heiko Thiery ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index efe922d..60e3150 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -351,7 +351,7 @@ if(INSTALL_MODULES) - set(ENV{NP2_MODULE_GROUP} \"${MODULES_GROUP}\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND \"${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/setup.sh\" RESULT_VARIABLE SETUP_RES) - if(NOT SETUP_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/setup.sh failed: \${SETUP_RES}\") - endif() -@@ -364,7 +364,7 @@ if(GENERATE_HOSTKEY) - message(STATUS \"Generating a new RSA host key \\\"genkey\\\" if not already added...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_hostkey.sh RESULT_VARIABLE MERGE_HOSTKEY_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_hostkey.sh\" RESULT_VARIABLE MERGE_HOSTKEY_RES) - if(NOT MERGE_HOSTKEY_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_hostkey.sh failed: \${MERGE_HOSTKEY_RES}\") - endif() -@@ -375,7 +375,7 @@ if(MERGE_LISTEN_CONFIG) - message(STATUS \"Merging default server listen configuration if there is none...\") - set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\") - set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\") -- execute_process(COMMAND ${SCRIPT_DIR}/merge_config.sh RESULT_VARIABLE MERGE_CONFIG_RES) -+ execute_process(COMMAND \"\$ENV{DESTDIR}${SCRIPT_DIR}/merge_config.sh\" RESULT_VARIABLE MERGE_CONFIG_RES) - if(NOT MERGE_CONFIG_RES EQUAL \"0\") - message(FATAL_ERROR \" scripts/merge_config.sh failed: \${MERGE_CONFIG_RES}\") - endif() --- -2.30.2 - diff --git a/package/netopeer2/netopeer2.hash b/package/netopeer2/netopeer2.hash index b352bbb239..cc71a2dab8 100644 --- a/package/netopeer2/netopeer2.hash +++ b/package/netopeer2/netopeer2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 89f7572d188e7b04be4b10656d7161d65fb557bac222d8c4596a97eaf833b691 netopeer2-2.1.23.tar.gz +sha256 b166fe3425bb55b5f330fb7f53158f613bffc07493925ac437193e4d2defb3e7 netopeer2-2.1.42.tar.gz sha256 b46f161fbdcf127d3ef22602e15958c3092fe3294f71a2dc8cdf8f6689cba95b LICENSE diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index d9a20d9969..7cb9202575 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETOPEER2_VERSION = 2.1.23 +NETOPEER2_VERSION = 2.1.42 NETOPEER2_SITE = $(call github,CESNET,Netopeer2,v$(NETOPEER2_VERSION)) NETOPEER2_DL_SUBDIR = netopeer2 NETOPEER2_LICENSE = BSD-3-Clause