[PR PATCH] EternalTerminal: update to 6.0.5.

[PR PATCH] EternalTerminal: update to 6.0.5.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages EternalTerminal
https://github.com/void-linux/void-packages/pull/17807

EternalTerminal: update to 6.0.5.
Signed-off-by: Nathan Owens <ndowens04@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/17807.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-EternalTerminal-17807.patch --]
[-- Type: text/x-diff, Size: 5002 bytes --]

From 0ca956d5ae2f9c1027d492d6712698064fe28c62 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Thu, 26 Dec 2019 14:05:43 -0600
Subject: [PATCH] EternalTerminal: update to 6.0.5.

Signed-off-by: Nathan Owens <ndowens04@gmail.com>
---
 .../EternalTerminal/patches/execinfo.patch    | 47 +++++++++++++++++++
 srcpkgs/EternalTerminal/patches/musl.patch    | 21 ---------
 srcpkgs/EternalTerminal/template              | 12 ++---
 3 files changed, 51 insertions(+), 29 deletions(-)
 create mode 100644 srcpkgs/EternalTerminal/patches/execinfo.patch
 delete mode 100644 srcpkgs/EternalTerminal/patches/musl.patch

diff --git a/srcpkgs/EternalTerminal/patches/execinfo.patch b/srcpkgs/EternalTerminal/patches/execinfo.patch
new file mode 100644
index 00000000000..376ae6ed9ab
--- /dev/null
+++ b/srcpkgs/EternalTerminal/patches/execinfo.patch
@@ -0,0 +1,47 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index b277dff..9ee989c 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -12,6 +12,12 @@ endif()
+ 
+ option(CODE_COVERAGE "Enable code coverage" OFF)
+ option(DISABLE_CRASH_LOG "Disable installing easylogging crash handler" OFF)
++option(ENABLE_EXECINFO "Enable execinfo support" OFF)
++
++if(ENABLE_EXECINFO)
++	SET(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -lexecinfo")
++	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_EXECINFO")
++endif()
+ 
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DET_VERSION='\"${PROJECT_VERSION}\"'")
+ # For easylogging, disable default log file, enable crash log, ensure thread safe, and catch c++ exceptions
+diff --git external_imported/easyloggingpp/src/easylogging++.cc external_imported/easyloggingpp/src/easylogging++.cc
+index d763ee7..1237d9c 100644
+--- external_imported/easyloggingpp/src/easylogging++.cc
++++ external_imported/easyloggingpp/src/easylogging++.cc
+@@ -2786,7 +2786,7 @@ std::ostream& operator<<(std::ostream& os, const StackTrace& st) {
+ }
+ 
+ void StackTrace::generateNew(void) {
+-#if ELPP_STACKTRACE
++#ifdef ENABLE_EXECINFO
+   m_stack.clear();
+   void* stack[kMaxStack];
+   unsigned int size = backtrace(stack, kMaxStack);
+diff --git external_imported/easyloggingpp/src/easylogging++.h external_imported/easyloggingpp/src/easylogging++.h
+index 688d537..b4d754e 100644
+--- external_imported/easyloggingpp/src/easylogging++.h
++++ external_imported/easyloggingpp/src/easylogging++.h
+@@ -360,10 +360,10 @@ ELPP_INTERNAL_DEBUGGING_OUT_INFO << ELPP_INTERNAL_DEBUGGING_MSG(internalInfoStre
+ #      include <codecvt>
+ #  endif // ELPP_OS_WINDOWS
+ #endif  // defined(ELPP_UNICODE)
+-#if ELPP_STACKTRACE
++#ifdef ENABLE_EXECINFO
+ #   include <cxxabi.h>
+ #   include <execinfo.h>
+-#endif  // ELPP_STACKTRACE
++#endif // ENABLE_EXECINFO
+ #if ELPP_OS_ANDROID
+ #   include <sys/system_properties.h>
+ #endif  // ELPP_OS_ANDROID
diff --git a/srcpkgs/EternalTerminal/patches/musl.patch b/srcpkgs/EternalTerminal/patches/musl.patch
deleted file mode 100644
index 3c8bd66cd7d..00000000000
--- a/srcpkgs/EternalTerminal/patches/musl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index 3945f33..dd5b572 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -3,6 +3,7 @@ project (EternalTCP VERSION 5.1.8)
- 
- option(BUILD_TEST "Build all unit test" OFF)
- option(CODE_COVERAGE "Enable code coverage" OFF)
-+option(EXECINFO "Enable use of libexecinfo" OFF)
- 
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DET_VERSION='\"${PROJECT_VERSION}\"'")
- # For easylogging, disable default log file, enable crash log, ensure thread safe, and catch c++ exceptions
-@@ -88,6 +89,8 @@ IF(FREEBSD)
-   set(CORE_LIBRARIES util execinfo)
- ELSEIF(NETBSD)
-   set(CORE_LIBRARIES util resolv execinfo)
-+ELSEIF(EXECINFO)
-+  set(CORE_LIBRARIES util resolv execinfo)
- ELSE()
-   set(CORE_LIBRARIES util resolv)
- ENDIF()
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index bea3f6d109d..d5c6ef58283 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,27 +1,23 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
-version=6.0.4
+version=6.0.5
 revision=1
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"
 makedepends="gflags-devel libsodium-devel protobuf-devel"
-depends="gflags-devel libsodium-devel protobuf-devel"
 short_desc="Re-Connectable secure remote shell"
 maintainer="Nathan Owens <ndowens04@gmail.com>"
 license="Apache-2.0"
 homepage="https://eternalterminal.dev/"
 distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz"
-checksum=410dd72ade571c32c83302d38fba76e2c9dbe9916b61a4e9f673cb110f43c328
-
+checksum=c029bb0f2d474e13428d0a88853d6596a929814f6ffaa6d2ef4ad436c0127d57
 system_accounts="_eternal"
 
 LDFLAGS="-lgflags"
 
-case $XBPS_TARGET_MACHINE in
-	*-musl)
-	configure_args="-DEXECINFO=TRUE"
-	makedepends+=" libexecinfo-devel";;
+case "$XBPS_TARGET_LIBC" in
+	glibc) configure_args="-DENABLE_EXECINFO=ON";;
 esac
 
 post_install() {

Re: [PR PATCH] [Merged]: EternalTerminal: update to 6.0.5.

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

There's a merged pull request on the void-packages repository

EternalTerminal: update to 6.0.5.
https://github.com/void-linux/void-packages/pull/17807

Description:
Made libexecinfo not required anymore on MUSL, was semi-optional upstream, but they declared their conditional different and was always true no matter platform. Left libexecinfo enabled for GLIBC since there is support for it.

Signed-off-by: Nathan Owens <ndowens04@gmail.com>