Hello community,
here is the log from the commit of package EternalTerminal for openSUSE:Factory
checked in at 2020-11-19 16:46:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/EternalTerminal (Old)
and /work/SRC/openSUSE:Factory/.EternalTerminal.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "EternalTerminal"
Thu Nov 19 16:46:27 2020 rev:9 rq:849345 version:6.0.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/EternalTerminal/EternalTerminal.changes
2020-08-03 14:19:29.764746383 +0200
+++
/work/SRC/openSUSE:Factory/.EternalTerminal.new.5913/EternalTerminal.changes
2020-11-23 10:20:44.668702099 +0100
@@ -1,0 +2,8 @@
+Thu Nov 19 08:56:19 UTC 2020 - Michael Vetter <[email protected]>
+
+- Update to 6.0.13:
+ * Fix warning by systemctl (#346)
+ * Import UST
+ * Several documentation fixes
+
+-------------------------------------------------------------------
Old:
----
et-v6.0.11.tar.gz
New:
----
et-v6.0.13.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ EternalTerminal.spec ++++++
--- /var/tmp/diff_new_pack.0nhRvq/_old 2020-11-23 10:20:45.276702818 +0100
+++ /var/tmp/diff_new_pack.0nhRvq/_new 2020-11-23 10:20:45.280702823 +0100
@@ -18,7 +18,7 @@
%global _firewalld_dir %{_prefix}/lib/firewalld
Name: EternalTerminal
-Version: 6.0.11
+Version: 6.0.13
Release: 0
Summary: Remote shell that survives IP roaming and disconnect
License: Apache-2.0
++++++ et-v6.0.11.tar.gz -> et-v6.0.13.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/EternalTerminal-et-v6.0.11/.circleci/config.yml
new/EternalTerminal-et-v6.0.13/.circleci/config.yml
--- old/EternalTerminal-et-v6.0.11/.circleci/config.yml 2020-08-01
00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/.circleci/config.yml 2020-11-18
22:45:35.000000000 +0100
@@ -35,6 +35,34 @@
- run:
name: Kill server
command: pkill etserver
+
+ connect_with_jumphost:
+ docker:
+ - image: ubuntu:bionic
+ steps:
+ - run:
+ name: Avoid hosts unknown for github
+ command: mkdir -p ~/.ssh/ && echo -e "Host
github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+ - run:
+ name: Install system dependencies
+ command: apt-get update; apt-get install -y git cmake
protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev
g++ openssh-server
+ - checkout
+ - run:
+ name: Set up ssh & known_hosts
+ command: /etc/init.d/ssh start; rm -f ~/.ssh/id_rsa*;
ssh-keygen -q -N "" -f ~/.ssh/id_rsa; cp ~/.ssh/id_rsa.pub
~/.ssh/authorized_keys; rm -f ~/.ssh/known_hosts; ssh -o "StrictHostKeyChecking
no" localhost ls
+ - run:
+ name: Init submodules
+ command: if [ $CIRCLE_BRANCH != "release" ]; then git
submodule update --init; fi
+ - run:
+ name: Build the project
+ command: mkdir build; cd build; cmake
-DCMAKE_INSTALL_PREFIX=/usr ../; make -j4 install
+ - run:
+ name: Start Servers
+ command: build/etserver --daemon; build/etserver --port 2023
--serverfifo=/tmp/etserver.idpasskey.fifo2 --daemon; build/et -c "ls"
--serverfifo=/tmp/etserver.idpasskey.fifo2 --logtostdout --verbose=9 --jumphost
localhost --jport 2022 localhost:2023
+ - run:
+ name: Kill servers
+ command: pkill etserver
+
linux_msan:
docker:
- image: ubuntu:bionic
@@ -143,6 +171,7 @@
- linux_tsan
- linux_ubsan
- mac_tsan
+ - connect_with_jumphost
- connect_to_initial_version:
filters:
branches:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/EternalTerminal-et-v6.0.11/.github/ISSUE_TEMPLATE.md
new/EternalTerminal-et-v6.0.13/.github/ISSUE_TEMPLATE.md
--- old/EternalTerminal-et-v6.0.11/.github/ISSUE_TEMPLATE.md 2020-08-01
00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/.github/ISSUE_TEMPLATE.md 2020-11-18
22:45:35.000000000 +0100
@@ -1,6 +1,6 @@
If you have set up ET correctly and are having an issue connecting/maintaining
a session, please consider running in verbose mode and adding client & server
logs to your issue.
-To run in verbose mode, pass the --v=9 flag to et.
+To run in verbose mode, pass the --verbose=9 flag to et.
To collect logs, run the following on your client:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/EternalTerminal-et-v6.0.11/.github/workflows/linux_ci.yml
new/EternalTerminal-et-v6.0.13/.github/workflows/linux_ci.yml
--- old/EternalTerminal-et-v6.0.11/.github/workflows/linux_ci.yml
2020-08-01 00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/.github/workflows/linux_ci.yml
2020-11-18 22:45:35.000000000 +0100
@@ -5,7 +5,7 @@
pull_request:
jobs:
- ubsan:
+ ubsan_linux:
runs-on: ubuntu-18.04
steps:
@@ -13,15 +13,15 @@
- name: Setup
shell: bash
run: |
- auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
- git submodule sync --recursive
- git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
- git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
sudo apt-get update
sudo apt-get install -y git cmake gdb protobuf-compiler
libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
- sudo ACCEPT_EULA=Y apt-get -y upgrade
+ ACCEPT_EULA=Y sudo apt-get -y upgrade
+ auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
+ git submodule sync --recursive
+ git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
+ git submodule update --init
- name: Test with ubsan
run: |
@@ -33,7 +33,7 @@
popd
rm -Rf build
- asan:
+ asan_linux:
runs-on: ubuntu-18.04
steps:
@@ -41,15 +41,15 @@
- name: Setup
shell: bash
run: |
- auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
- git submodule sync --recursive
- git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
- git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
sudo apt-get update
sudo apt-get install -y git cmake gdb protobuf-compiler
libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
- sudo ACCEPT_EULA=Y apt-get -y upgrade
+ ACCEPT_EULA=Y sudo apt-get -y upgrade
+ auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
+ git submodule sync --recursive
+ git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
+ git submodule update --init
- name: Test with asan
run: |
@@ -61,7 +61,7 @@
popd
rm -Rf build
- msan:
+ msan_linux:
runs-on: ubuntu-18.04
steps:
@@ -69,15 +69,15 @@
- name: Setup
shell: bash
run: |
- auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
- git submodule sync --recursive
- git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
- git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
sudo apt-get update
sudo apt-get install -y git cmake gdb protobuf-compiler
libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
- sudo ACCEPT_EULA=Y apt-get -y upgrade
+ ACCEPT_EULA=Y sudo apt-get -y upgrade
+ auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
+ git submodule sync --recursive
+ git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
+ git submodule update --init
- name: Test with msan
run: |
@@ -89,7 +89,7 @@
popd
rm -Rf build
- tsan:
+ tsan_linux:
runs-on: ubuntu-18.04
steps:
@@ -97,15 +97,15 @@
- name: Setup
shell: bash
run: |
- auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
- git submodule sync --recursive
- git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
- git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
sudo apt-get update
sudo apt-get install -y git cmake gdb protobuf-compiler
libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
- sudo ACCEPT_EULA=Y apt-get -y upgrade
+ ACCEPT_EULA=Y sudo apt-get -y upgrade
+ auth_header="$(git config --local --get
http.https://github.com/.extraheader)"
+ git submodule sync --recursive
+ git -c "http.extraheader=$auth_header" -c protocol.version=2
submodule update --init --force --recursive --depth=1
+ git submodule update --init
- name: Test with tsan
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/EternalTerminal-et-v6.0.11/.github/workflows/mac_ci.yml
new/EternalTerminal-et-v6.0.13/.github/workflows/mac_ci.yml
--- old/EternalTerminal-et-v6.0.11/.github/workflows/mac_ci.yml 2020-08-01
00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/.github/workflows/mac_ci.yml 2020-11-18
22:45:35.000000000 +0100
@@ -19,7 +19,7 @@
git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
- brew remove python@2; brew upgrade python; brew install cmake; brew
install protobuf libsodium
+ brew install cmake; brew install protobuf libsodium
- name: Test with ubsan
run: |
@@ -45,7 +45,7 @@
git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
- brew remove python@2; brew upgrade python; brew install cmake; brew
install protobuf libsodium
+ brew install cmake; brew install protobuf libsodium
- name: Test with asan
run: |
@@ -71,7 +71,7 @@
git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
- brew remove python@2; brew upgrade python; brew install cmake; brew
install protobuf libsodium
+ brew install cmake; brew install protobuf libsodium
- name: Test with msan
run: |
@@ -97,7 +97,7 @@
git submodule update --init
mkdir -p ~/.ssh/
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >>
~/.ssh/config
- brew remove python@2; brew upgrade python; brew install cmake; brew
install protobuf libsodium
+ brew install cmake; brew install protobuf libsodium
- name: Test with tsan
run: |
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/EternalTerminal-et-v6.0.11/CMakeLists.txt
new/EternalTerminal-et-v6.0.13/CMakeLists.txt
--- old/EternalTerminal-et-v6.0.11/CMakeLists.txt 2020-08-01
00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/CMakeLists.txt 2020-11-18
22:45:35.000000000 +0100
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.0.2)
-project (EternalTCP VERSION 6.0.11)
+project (EternalTCP VERSION 6.0.13)
SET(CMAKE_MODULE_PATH
"${CMAKE_SOURCE_DIR}/external_imported/sanitizers-cmake/cmake"
${CMAKE_MODULE_PATH})
FIND_PACKAGE(Sanitizers)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/EternalTerminal-et-v6.0.11/README.md
new/EternalTerminal-et-v6.0.13/README.md
--- old/EternalTerminal-et-v6.0.11/README.md 2020-08-01 00:06:43.000000000
+0200
+++ new/EternalTerminal-et-v6.0.13/README.md 2020-11-18 22:45:35.000000000
+0100
@@ -56,7 +56,7 @@
For debian, use our deb repo. For buster:
```
-echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/
buster main" | sudo tee -a /etc/apt/sources.list
+echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/
buster main" | sudo tee -a /etc/apt/sources.list.d/et.list
curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg | sudo
apt-key add -
sudo apt update
sudo apt install et
@@ -256,7 +256,7 @@
Correct the service file (see
[#180](https://github.com/MisterTea/EternalTerminal/issues/180) for details).
```
-sudo sed -ie "s|ExecStart=.*[[:space:]]|ExecStart=$(which etserver) |"
/etc/systemd/system/et.service
+sudo sed -ie "s|ExecStart=[^[:space:]]*[[:space:]]|ExecStart=$(which etserver)
|" /etc/systemd/system/et.service
```
Alternativelly, open the file /etc/systemd/system/et.service in an editor and
correct the `ExectStart=...` line to point to the correct path of the
`etserver` binary.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/EternalTerminal-et-v6.0.11/deployment/debian/debian_SOURCE/changelog
new/EternalTerminal-et-v6.0.13/deployment/debian/debian_SOURCE/changelog
--- old/EternalTerminal-et-v6.0.11/deployment/debian/debian_SOURCE/changelog
2020-08-01 00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/deployment/debian/debian_SOURCE/changelog
2020-11-18 22:45:35.000000000 +0100
@@ -1,3 +1,9 @@
+et (6.0.13-##DISTRO##1) ##DISTRO##; urgency=medium
+
+ * https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.0.13
+
+ -- Jason Gauci <[email protected]> Wed, 18 Nov 2020 16:36:51 -0800
+
et (6.0.11-##DISTRO##1) ##DISTRO##; urgency=medium
* https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.0.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/EternalTerminal-et-v6.0.11/deployment/debian/debian_SOURCE/et.service
new/EternalTerminal-et-v6.0.13/deployment/debian/debian_SOURCE/et.service
--- old/EternalTerminal-et-v6.0.11/deployment/debian/debian_SOURCE/et.service
2020-08-01 00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/deployment/debian/debian_SOURCE/et.service
2020-11-18 22:45:35.000000000 +0100
@@ -4,7 +4,7 @@
[Service]
Type=forking
-PIDFile=/var/run/etserver.pid
+PIDFile=/run/etserver.pid
ExecStart=/usr/bin/etserver --daemon --cfgfile=/etc/et.cfg
[Install]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/EternalTerminal-et-v6.0.11/docker/Dockerfile.server
new/EternalTerminal-et-v6.0.13/docker/Dockerfile.server
--- old/EternalTerminal-et-v6.0.11/docker/Dockerfile.server 2020-08-01
00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/docker/Dockerfile.server 2020-11-18
22:45:35.000000000 +0100
@@ -2,7 +2,7 @@
ENV BUILD_REPOS="epel-release centos-release-scl" \
BUILD_DEPS="cmake3 boost-devel libsodium-devel ncurses-devel
protobuf-devel \
- protobuf-compiler gflags-devel protobuf-lite-devel git devtoolset-8"
+ protobuf-compiler gflags-devel protobuf-lite-devel git devtoolset-8"
WORKDIR /
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/EternalTerminal-et-v6.0.11/src/terminal/SshSetupHandler.cpp
new/EternalTerminal-et-v6.0.13/src/terminal/SshSetupHandler.cpp
--- old/EternalTerminal-et-v6.0.11/src/terminal/SshSetupHandler.cpp
2020-08-01 00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/src/terminal/SshSetupHandler.cpp
2020-11-18 22:45:35.000000000 +0100
@@ -89,16 +89,16 @@
CLOG(INFO, "stdout") << "Error initializing connection" << err.what()
<< endl;
}
+
// start jumpclient daemon on jumphost.
if (!jumphost.empty()) {
/* If jumphost is set, we need to pass dst host and port to jumphost
* and connect to jumphost here */
+ string cmdoptions{"--verbose=" + std::to_string(vlevel)};
string jump_cmdoptions = cmdoptions + " --jump --dsthost=" + host +
" --dstport=" + to_string(port);
string SSH_SCRIPT_JUMP = genCommand(passkey, id, clientTerm, user, kill,
cmd_prefix, jump_cmdoptions);
- // start command in interactive mode
- SSH_SCRIPT_JUMP = "$SHELL -lc \'" + SSH_SCRIPT_JUMP + "\'";
string sshLinkBuffer =
SubprocessToStringInteractive("ssh", {jumphost, SSH_SCRIPT_JUMP});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/EternalTerminal-et-v6.0.11/src/terminal/TerminalClientMain.cpp
new/EternalTerminal-et-v6.0.13/src/terminal/TerminalClientMain.cpp
--- old/EternalTerminal-et-v6.0.11/src/terminal/TerminalClientMain.cpp
2020-08-01 00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/src/terminal/TerminalClientMain.cpp
2020-11-18 22:45:35.000000000 +0100
@@ -227,7 +227,7 @@
}
string idpasskeypair = SshSetupHandler::SetupSsh(
username, destinationHost, host_alias, destinationPort, jumphost,
jport,
- result.count("x") > 0, result["v"].as<int>(),
+ result.count("x") > 0, result["verbose"].as<int>(),
result.count("prefix") ? result["prefix"].as<string>() : "",
serverFifo);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/EternalTerminal-et-v6.0.11/systemctl/et.service
new/EternalTerminal-et-v6.0.13/systemctl/et.service
--- old/EternalTerminal-et-v6.0.11/systemctl/et.service 2020-08-01
00:06:43.000000000 +0200
+++ new/EternalTerminal-et-v6.0.13/systemctl/et.service 2020-11-18
22:45:35.000000000 +0100
@@ -4,7 +4,7 @@
[Service]
Type=forking
-PIDFile=/var/run/etserver.pid
+PIDFile=/run/etserver.pid
ExecStart=/usr/bin/etserver --daemon --cfgfile=/etc/et.cfg
[Install]
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
