* [PR PATCH] EternalTerminal: update to 6.2.9.
@ 2024-08-11 1:27 Rooyca
2024-08-11 2:04 ` [PR PATCH] [Updated] " Rooyca
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Rooyca @ 2024-08-11 1:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is a new pull request by Rooyca against master on the void-packages repository
https://github.com/Rooyca/void-packages EternalTerminal629
https://github.com/void-linux/void-packages/pull/51777
EternalTerminal: update to 6.2.9.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51777.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-EternalTerminal629-51777.patch --]
[-- Type: text/x-diff, Size: 4925 bytes --]
From df45db5b57ae0822eba06f60f79e7a85a467222c Mon Sep 17 00:00:00 2001
From: rooyca <rooyca@gmail.com>
Date: Sat, 10 Aug 2024 20:26:36 -0500
Subject: [PATCH] EternalTerminal: update to 6.2.9.
---
.../patches/disable-tests.patch | 51 ++++++++++---------
srcpkgs/EternalTerminal/patches/limits.patch | 10 ----
srcpkgs/EternalTerminal/template | 16 +++---
3 files changed, 32 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/EternalTerminal/patches/limits.patch
diff --git a/srcpkgs/EternalTerminal/patches/disable-tests.patch b/srcpkgs/EternalTerminal/patches/disable-tests.patch
index f7dcee020b9bfe..4f99b3b68af210 100644
--- a/srcpkgs/EternalTerminal/patches/disable-tests.patch
+++ b/srcpkgs/EternalTerminal/patches/disable-tests.patch
@@ -1,30 +1,31 @@
---- a/EternalTerminal/CMakeLists.txt
-+++ b/EternalTerminal/CMakeLists.txt
-@@ -519,17 +519,8 @@
- ${CORE_LIBRARIES})
+--- a/EternalTerminal/CMakeLists.txt 2024-08-10 17:30:51.652565859 -0500
++++ b/EternalTerminal/CMakeLists.txt 2024-08-10 17:33:09.169478739 -0500
+@@ -536,18 +536,9 @@
decorate_target(htmd)
-- enable_testing()
+ if(BUILD_TESTING)
+- enable_testing()
+
+- file(GLOB TEST_SRCS test/*Test.cpp)
+- add_executable(
+- et-test
+- ${TEST_SRCS}
+- test/Main.cpp
+- )
-
-- file(GLOB TEST_SRCS test/*Test.cpp)
-- add_executable(
-- et-test
-- ${TEST_SRCS}
-- test/Main.cpp
-- )
-- add_dependencies(et-test TerminalCommon et-lib)
-+ add_dependencies(TerminalCommon et-lib)
- target_link_libraries(
-- et-test
- TerminalCommon
- et-lib
- ${CMAKE_THREAD_LIBS_INIT}
-@@ -539,8 +530,6 @@
- ${UTEMPTER_LIBRARIES}
- ${Boost_LIBRARIES}
+- add_dependencies(et-test generated-code TerminalCommon et-lib)
++ add_dependencies(generated-code TerminalCommon et-lib)
+ target_link_libraries(
+- et-test
+ LINK_PUBLIC
+ TerminalCommon
+ et-lib
+@@ -559,8 +550,6 @@
+ ${UTEMPTER_LIBRARIES}
+ ${Boost_LIBRARIES}
${CORE_LIBRARIES})
-- add_test(et-test et-test)
-- decorate_target(et-test)
+- add_test(et-test et-test)
+- add_sanitizers(et-test)
+ endif()
- if(FUZZING)
- add_executable(
+ if(BUILD_TESTING AND FUZZING)
diff --git a/srcpkgs/EternalTerminal/patches/limits.patch b/srcpkgs/EternalTerminal/patches/limits.patch
deleted file mode 100644
index 9226bd45001ac5..00000000000000
--- a/srcpkgs/EternalTerminal/patches/limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/EternalTerminal/external_imported/cxxopts/include/cxxopts.hpp 2022-05-05 17:20:44.000000000 +0200
-+++ - 2023-07-10 20:07:25.607948589 +0200
-@@ -37,6 +37,7 @@
- #include <unordered_map>
- #include <unordered_set>
- #include <vector>
-+#include <limits>
-
- #ifdef __cpp_lib_optional
- #include <optional>
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 8ed8bc13773418..3195e575dea9c7 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,17 +1,17 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
-version=6.2.1
-revision=6
+version=6.2.9
+revision=1
# revisions used for the specific versions of submodules.
# they can be found in the external/ directory of the source code.
_sanitizers_gitrev="99e159ec9bc8dd362b08d18436bd40ff0648417b"
_threadpool_gitrev="9a42ec1329f259a5f4881a291db1dcb8f2ad9040"
build_wrksrc=${pkgname}
build_style=cmake
-configure_args="-DDISABLE_VCPKG=ON -DDISABLE_TELEMETRY=ON -DDISABLE_SENTRY=ON"
-hostmakedepends="protobuf"
+configure_args="-DDISABLE_VCPKG=ON -DDISABLE_TELEMETRY=ON -DDISABLE_SENTRY=ON -DBUILD_TESTING=OFF"
+hostmakedepends="protobuf pkg-config"
makedepends="gflags-devel libsodium-devel protobuf-devel openssl-devel
- zlib-devel"
+ zlib-devel libunwind-devel libutempter-devel libselinux-devel libsepol-devel pcre-devel"
short_desc="Re-Connectable secure remote shell"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
@@ -19,7 +19,7 @@ homepage="https://eternalterminal.dev/"
distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz
https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_gitrev}.tar.gz
https://github.com/progschj/ThreadPool/archive/${_threadpool_gitrev}.tar.gz"
-checksum="fdf68a51cb8b62b3dbbacd1d2aeba5d5491e5142e65c97713c2f1ce61d4fdbed
+checksum="13bfb2722b011b5f0a28fa619508deca96deec9eee5e42b922add0c166d8185a
f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341
954e0ecdac1aa0da1e0fa78577ff0d352e53094df43762fbc1884f76a7e1dcd2"
system_accounts="_eternal"
@@ -46,10 +46,6 @@ post_patch() {
vsed -i CMakeLists.txt \
-e '/execinfo/!s/CORE_LIBRARIES$/& execinfo/'
fi
- if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Remove libatomic from LD if target arch supports atomics
- vsed -e '/ atomic$/d' -i CMakeLists.txt
- fi
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] EternalTerminal: update to 6.2.9.
2024-08-11 1:27 [PR PATCH] EternalTerminal: update to 6.2.9 Rooyca
@ 2024-08-11 2:04 ` Rooyca
2024-08-12 3:18 ` [PR REVIEW] " classabbyamp
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Rooyca @ 2024-08-11 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
There is an updated pull request by Rooyca against master on the void-packages repository
https://github.com/Rooyca/void-packages EternalTerminal629
https://github.com/void-linux/void-packages/pull/51777
EternalTerminal: update to 6.2.9.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51777.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-EternalTerminal629-51777.patch --]
[-- Type: text/x-diff, Size: 4307 bytes --]
From 1df829145f0d1c16d63cebe255f3a0ec309818c3 Mon Sep 17 00:00:00 2001
From: rooyca <rooyca@gmail.com>
Date: Sat, 10 Aug 2024 20:26:36 -0500
Subject: [PATCH] EternalTerminal: update to 6.2.9.
---
.../patches/disable-tests.patch | 30 -------------------
srcpkgs/EternalTerminal/patches/limits.patch | 10 -------
srcpkgs/EternalTerminal/template | 16 ++++------
3 files changed, 6 insertions(+), 50 deletions(-)
delete mode 100644 srcpkgs/EternalTerminal/patches/disable-tests.patch
delete mode 100644 srcpkgs/EternalTerminal/patches/limits.patch
diff --git a/srcpkgs/EternalTerminal/patches/disable-tests.patch b/srcpkgs/EternalTerminal/patches/disable-tests.patch
deleted file mode 100644
index f7dcee020b9bfe..00000000000000
--- a/srcpkgs/EternalTerminal/patches/disable-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/EternalTerminal/CMakeLists.txt
-+++ b/EternalTerminal/CMakeLists.txt
-@@ -519,17 +519,8 @@
- ${CORE_LIBRARIES})
- decorate_target(htmd)
-
-- enable_testing()
--
-- file(GLOB TEST_SRCS test/*Test.cpp)
-- add_executable(
-- et-test
-- ${TEST_SRCS}
-- test/Main.cpp
-- )
-- add_dependencies(et-test TerminalCommon et-lib)
-+ add_dependencies(TerminalCommon et-lib)
- target_link_libraries(
-- et-test
- TerminalCommon
- et-lib
- ${CMAKE_THREAD_LIBS_INIT}
-@@ -539,8 +530,6 @@
- ${UTEMPTER_LIBRARIES}
- ${Boost_LIBRARIES}
- ${CORE_LIBRARIES})
-- add_test(et-test et-test)
-- decorate_target(et-test)
-
- if(FUZZING)
- add_executable(
diff --git a/srcpkgs/EternalTerminal/patches/limits.patch b/srcpkgs/EternalTerminal/patches/limits.patch
deleted file mode 100644
index 9226bd45001ac5..00000000000000
--- a/srcpkgs/EternalTerminal/patches/limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/EternalTerminal/external_imported/cxxopts/include/cxxopts.hpp 2022-05-05 17:20:44.000000000 +0200
-+++ - 2023-07-10 20:07:25.607948589 +0200
-@@ -37,6 +37,7 @@
- #include <unordered_map>
- #include <unordered_set>
- #include <vector>
-+#include <limits>
-
- #ifdef __cpp_lib_optional
- #include <optional>
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 8ed8bc13773418..d470102bae7b37 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
-version=6.2.1
-revision=6
+version=6.2.9
+revision=1
# revisions used for the specific versions of submodules.
# they can be found in the external/ directory of the source code.
_sanitizers_gitrev="99e159ec9bc8dd362b08d18436bd40ff0648417b"
@@ -9,9 +9,9 @@ _threadpool_gitrev="9a42ec1329f259a5f4881a291db1dcb8f2ad9040"
build_wrksrc=${pkgname}
build_style=cmake
configure_args="-DDISABLE_VCPKG=ON -DDISABLE_TELEMETRY=ON -DDISABLE_SENTRY=ON"
-hostmakedepends="protobuf"
+hostmakedepends="protobuf pkg-config"
makedepends="gflags-devel libsodium-devel protobuf-devel openssl-devel
- zlib-devel"
+ zlib-devel libunwind-devel libutempter-devel libselinux-devel libsepol-devel pcre-devel"
short_desc="Re-Connectable secure remote shell"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
@@ -19,13 +19,13 @@ homepage="https://eternalterminal.dev/"
distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz
https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_gitrev}.tar.gz
https://github.com/progschj/ThreadPool/archive/${_threadpool_gitrev}.tar.gz"
-checksum="fdf68a51cb8b62b3dbbacd1d2aeba5d5491e5142e65c97713c2f1ce61d4fdbed
+checksum="13bfb2722b011b5f0a28fa619508deca96deec9eee5e42b922add0c166d8185a
f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341
954e0ecdac1aa0da1e0fa78577ff0d352e53094df43762fbc1884f76a7e1dcd2"
system_accounts="_eternal"
# UnixSocketHandler.cpp:53 Error reading: 104 Connection reset by peer
# SocketHandler.cpp:91 Failed a call to writeAll: Broken pipe
-make_check=no
+#make_check=no
LDFLAGS="-lgflags"
@@ -46,10 +46,6 @@ post_patch() {
vsed -i CMakeLists.txt \
-e '/execinfo/!s/CORE_LIBRARIES$/& execinfo/'
fi
- if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Remove libatomic from LD if target arch supports atomics
- vsed -e '/ atomic$/d' -i CMakeLists.txt
- fi
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR REVIEW] EternalTerminal: update to 6.2.9.
2024-08-11 1:27 [PR PATCH] EternalTerminal: update to 6.2.9 Rooyca
2024-08-11 2:04 ` [PR PATCH] [Updated] " Rooyca
@ 2024-08-12 3:18 ` classabbyamp
2024-08-12 11:44 ` [PR PATCH] [Updated] " Rooyca
2024-09-26 17:59 ` [PR PATCH] [Closed]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2024-08-12 3:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/51777#discussion_r1713136357
Comment:
remove these lines
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] EternalTerminal: update to 6.2.9.
2024-08-11 1:27 [PR PATCH] EternalTerminal: update to 6.2.9 Rooyca
2024-08-11 2:04 ` [PR PATCH] [Updated] " Rooyca
2024-08-12 3:18 ` [PR REVIEW] " classabbyamp
@ 2024-08-12 11:44 ` Rooyca
2024-09-26 17:59 ` [PR PATCH] [Closed]: " classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: Rooyca @ 2024-08-12 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 510 bytes --]
There is an updated pull request by Rooyca against master on the void-packages repository
https://github.com/Rooyca/void-packages EternalTerminal629
https://github.com/void-linux/void-packages/pull/51777
EternalTerminal: update to 6.2.9.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/51777.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-EternalTerminal629-51777.patch --]
[-- Type: text/x-diff, Size: 4292 bytes --]
From 08df0360da6d49890073c2c8c2fe5817db1fc2ae Mon Sep 17 00:00:00 2001
From: rooyca <rooyca@gmail.com>
Date: Sat, 10 Aug 2024 20:26:36 -0500
Subject: [PATCH] EternalTerminal: update to 6.2.9.
---
.../patches/disable-tests.patch | 30 -------------------
srcpkgs/EternalTerminal/patches/limits.patch | 10 -------
srcpkgs/EternalTerminal/template | 17 ++++-------
3 files changed, 5 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/EternalTerminal/patches/disable-tests.patch
delete mode 100644 srcpkgs/EternalTerminal/patches/limits.patch
diff --git a/srcpkgs/EternalTerminal/patches/disable-tests.patch b/srcpkgs/EternalTerminal/patches/disable-tests.patch
deleted file mode 100644
index f7dcee020b9bfe..00000000000000
--- a/srcpkgs/EternalTerminal/patches/disable-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/EternalTerminal/CMakeLists.txt
-+++ b/EternalTerminal/CMakeLists.txt
-@@ -519,17 +519,8 @@
- ${CORE_LIBRARIES})
- decorate_target(htmd)
-
-- enable_testing()
--
-- file(GLOB TEST_SRCS test/*Test.cpp)
-- add_executable(
-- et-test
-- ${TEST_SRCS}
-- test/Main.cpp
-- )
-- add_dependencies(et-test TerminalCommon et-lib)
-+ add_dependencies(TerminalCommon et-lib)
- target_link_libraries(
-- et-test
- TerminalCommon
- et-lib
- ${CMAKE_THREAD_LIBS_INIT}
-@@ -539,8 +530,6 @@
- ${UTEMPTER_LIBRARIES}
- ${Boost_LIBRARIES}
- ${CORE_LIBRARIES})
-- add_test(et-test et-test)
-- decorate_target(et-test)
-
- if(FUZZING)
- add_executable(
diff --git a/srcpkgs/EternalTerminal/patches/limits.patch b/srcpkgs/EternalTerminal/patches/limits.patch
deleted file mode 100644
index 9226bd45001ac5..00000000000000
--- a/srcpkgs/EternalTerminal/patches/limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/EternalTerminal/external_imported/cxxopts/include/cxxopts.hpp 2022-05-05 17:20:44.000000000 +0200
-+++ - 2023-07-10 20:07:25.607948589 +0200
-@@ -37,6 +37,7 @@
- #include <unordered_map>
- #include <unordered_set>
- #include <vector>
-+#include <limits>
-
- #ifdef __cpp_lib_optional
- #include <optional>
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 8ed8bc13773418..c4b220bda9b89b 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
-version=6.2.1
-revision=6
+version=6.2.9
+revision=1
# revisions used for the specific versions of submodules.
# they can be found in the external/ directory of the source code.
_sanitizers_gitrev="99e159ec9bc8dd362b08d18436bd40ff0648417b"
@@ -9,9 +9,9 @@ _threadpool_gitrev="9a42ec1329f259a5f4881a291db1dcb8f2ad9040"
build_wrksrc=${pkgname}
build_style=cmake
configure_args="-DDISABLE_VCPKG=ON -DDISABLE_TELEMETRY=ON -DDISABLE_SENTRY=ON"
-hostmakedepends="protobuf"
+hostmakedepends="protobuf pkg-config"
makedepends="gflags-devel libsodium-devel protobuf-devel openssl-devel
- zlib-devel"
+ zlib-devel libunwind-devel libutempter-devel libselinux-devel libsepol-devel pcre-devel"
short_desc="Re-Connectable secure remote shell"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
@@ -19,13 +19,10 @@ homepage="https://eternalterminal.dev/"
distfiles="https://github.com/MisterTea/EternalTerminal/archive/et-v${version}.tar.gz
https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_gitrev}.tar.gz
https://github.com/progschj/ThreadPool/archive/${_threadpool_gitrev}.tar.gz"
-checksum="fdf68a51cb8b62b3dbbacd1d2aeba5d5491e5142e65c97713c2f1ce61d4fdbed
+checksum="13bfb2722b011b5f0a28fa619508deca96deec9eee5e42b922add0c166d8185a
f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341
954e0ecdac1aa0da1e0fa78577ff0d352e53094df43762fbc1884f76a7e1dcd2"
system_accounts="_eternal"
-# UnixSocketHandler.cpp:53 Error reading: 104 Connection reset by peer
-# SocketHandler.cpp:91 Failed a call to writeAll: Broken pipe
-make_check=no
LDFLAGS="-lgflags"
@@ -46,10 +43,6 @@ post_patch() {
vsed -i CMakeLists.txt \
-e '/execinfo/!s/CORE_LIBRARIES$/& execinfo/'
fi
- if [ -z "$XBPS_TARGET_NO_ATOMIC8" ]; then
- # Remove libatomic from LD if target arch supports atomics
- vsed -e '/ atomic$/d' -i CMakeLists.txt
- fi
}
post_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: EternalTerminal: update to 6.2.9.
2024-08-11 1:27 [PR PATCH] EternalTerminal: update to 6.2.9 Rooyca
` (2 preceding siblings ...)
2024-08-12 11:44 ` [PR PATCH] [Updated] " Rooyca
@ 2024-09-26 17:59 ` classabbyamp
3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2024-09-26 17:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There's a closed pull request on the void-packages repository
EternalTerminal: update to 6.2.9.
https://github.com/void-linux/void-packages/pull/51777
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-26 17:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-11 1:27 [PR PATCH] EternalTerminal: update to 6.2.9 Rooyca
2024-08-11 2:04 ` [PR PATCH] [Updated] " Rooyca
2024-08-12 3:18 ` [PR REVIEW] " classabbyamp
2024-08-12 11:44 ` [PR PATCH] [Updated] " Rooyca
2024-09-26 17:59 ` [PR PATCH] [Closed]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).