Hello community, here is the log from the commit of package EternalTerminal for openSUSE:Factory checked in at 2020-08-03 14:18:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/EternalTerminal (Old) and /work/SRC/openSUSE:Factory/.EternalTerminal.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "EternalTerminal" Mon Aug 3 14:18:41 2020 rev:8 rq:824072 version:6.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/EternalTerminal/EternalTerminal.changes 2020-07-31 16:06:16.744757547 +0200 +++ /work/SRC/openSUSE:Factory/.EternalTerminal.new.3592/EternalTerminal.changes 2020-08-03 14:19:29.764746383 +0200 @@ -1,0 +2,12 @@ +Mon Aug 3 06:45:53 UTC 2020 - Michael Vetter <mvet...@suse.com> + +- Update to 6.0.11: + * Fix version number + +------------------------------------------------------------------- +Mon Aug 3 06:45:45 UTC 2020 - Michael Vetter <mvet...@suse.com> + +- Update to 6.0.10: + * Fix --help and --version flags + +------------------------------------------------------------------- Old: ---- et-v6.0.9.tar.gz New: ---- et-v6.0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ EternalTerminal.spec ++++++ --- /var/tmp/diff_new_pack.2umU2i/_old 2020-08-03 14:19:31.412748035 +0200 +++ /var/tmp/diff_new_pack.2umU2i/_new 2020-08-03 14:19:31.416748040 +0200 @@ -18,7 +18,7 @@ %global _firewalld_dir %{_prefix}/lib/firewalld Name: EternalTerminal -Version: 6.0.9 +Version: 6.0.11 Release: 0 Summary: Remote shell that survives IP roaming and disconnect License: Apache-2.0 ++++++ et-v6.0.9.tar.gz -> et-v6.0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/CMakeLists.txt new/EternalTerminal-et-v6.0.11/CMakeLists.txt --- old/EternalTerminal-et-v6.0.9/CMakeLists.txt 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/CMakeLists.txt 2020-08-01 00:06:43.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 3.0.2) -project (EternalTCP VERSION 6.0.9) +project (EternalTCP VERSION 6.0.11) 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.9/README.md new/EternalTerminal-et-v6.0.11/README.md --- old/EternalTerminal-et-v6.0.9/README.md 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/README.md 2020-08-01 00:06:43.000000000 +0200 @@ -16,21 +16,28 @@ The easiest way to install is using Homebrew: - brew install MisterTea/et/et +``` +brew install MisterTea/et/et +``` Alternatively, a package is available in MacPorts: - sudo port install et +``` +sudo port install et +``` ### Ubuntu For Ubuntu, use our PPA: - sudo add-apt-repository ppa:jgmath2000/et - sudo apt-get update - sudo apt-get install et +``` +sudo add-apt-repository ppa:jgmath2000/et +sudo apt-get update +sudo apt-get install et +``` Install and build from source: + ``` sudo apt install build-essential libgflags-dev libprotobuf-dev protobuf-compiler libsodium-dev cmake git git clone --recurse-submodules https://github.com/MisterTea/EternalTerminal.git @@ -41,29 +48,40 @@ make && sudo make install sudo cp ../etc/et.cfg /etc/ ``` + Once built, the binary only requires `libgflags-dev` and `libprotobuf-dev`. ### Debian 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 - curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg | sudo apt-key add - - sudo apt update - sudo apt install et - +``` +echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ buster main" | sudo tee -a /etc/apt/sources.list +curl -sSL https://github.com/MisterTea/debian-et/raw/master/et.gpg | sudo apt-key add - +sudo apt update +sudo apt install et +``` ### CentOS 7 -Up to the present day the only way to install is to [build from source](#centos-7). +Up to the present day the only way to install is to [build from source](#centos-7-1). + +### CentOS 8 +``` +sudo dnf install epel-release +sudo dnf install et +``` ### FreeBSD On FreeBSD, use: - pkg install eternalterminal +``` +pkg install eternalterminal +``` ### Fedora (version 29 and later): + ``` sudo dnf install et ``` @@ -82,28 +100,38 @@ * Fedora (tested on 25): - sudo dnf install boost-devel libsodium-devel ncurses-devel protobuf-devel \ - protobuf-compiler cmake gflags-devel + ``` + sudo dnf install boost-devel libsodium-devel ncurses-devel protobuf-devel \ + protobuf-compiler cmake gflags-devel + ``` * Gentoo: - sudo emerge dev-libs/boost dev-libs/libsodium sys-libs/ncurses \ - dev-libs/protobuf dev-util/cmake dev-cpp/gflags + ``` + sudo emerge dev-libs/boost dev-libs/libsodium sys-libs/ncurses \ + dev-libs/protobuf dev-util/cmake dev-cpp/gflag + ``` Download and install from source: - git clone --recurse-submodules https://github.com/MisterTea/EternalTerminal.git - cd EternalTerminal - mkdir build - cd build - cmake ../ - make - sudo make install +``` +git clone --recurse-submodules https://github.com/MisterTea/EternalTerminal.git +cd EternalTerminal +mkdir build +cd build +cmake ../ +make +sudo make install +``` ### Windows Eternal Terminal works under WSL (Windows Subsystem for Linux). Follow the ubuntu instructions. +### Docker Image + +See [docker/README.md](docker/) + ## Verifying Verify that the client is installed correctly by looking for the `et` executable: `which et`. @@ -179,7 +207,7 @@ Debian/Ubuntu Dependencies: ``` sudo apt install libboost-dev libsodium-dev libncurses5-dev \ - libprotobuf-dev protobuf-compiler cmake libgflags-dev libutempter-dev cmake git + libprotobuf-dev protobuf-compiler cmake libgflags-dev libutempter-dev cmake git ``` Source and setup: @@ -247,6 +275,10 @@ sudo systemctl enable --now et.service ``` +## Building using Docker + +Builder Dockerfiles are located at [deployment/](deployment/). Supported OSes: CentOS 8, openSUSE and Ubuntu. + ## Reporting issues If you have any problems with installation or usage, please [file an issue on github](https://github.com/MisterTea/EternalTerminal/issues). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/deployment/centos.Dockerfile new/EternalTerminal-et-v6.0.11/deployment/centos.Dockerfile --- old/EternalTerminal-et-v6.0.9/deployment/centos.Dockerfile 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/deployment/centos.Dockerfile 2020-08-01 00:06:43.000000000 +0200 @@ -8,23 +8,18 @@ RUN chmod 0400 .ssh/id_rsa RUN dnf -y install dnf-plugins-core -RUN yum update -y -RUN yum groupinstall -y "Development Tools" -RUN yum install -y epel-release +RUN dnf update -y +RUN dnf groupinstall -y "Development Tools" +RUN dnf install -y epel-release RUN dnf config-manager --set-enabled PowerTools -RUN yum install --nogpgcheck -y openssh-server cmake3 gcc-c++ protobuf-devel libsodium-devel +RUN dnf install --nogpgcheck -y openssh-server cmake3 gcc-c++ protobuf-devel libsodium-devel RUN alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \ --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \ --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \ --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \ --family cmake -RUN git config --global user.email "jgmath2...@gmail.com" -RUN git config --global user.name "Jason Gauci" - -RUN echo -e "StrictHostKeyChecking no\n" >> ~/.ssh/config - -RUN git clone --branch release g...@github.com:MisterTea/EternalTerminal.git +RUN git clone --branch release https://github.com/MisterTea/EternalTerminal.git RUN mkdir -p EternalTerminal/build WORKDIR /root/EternalTerminal/build RUN cmake -DFULL_PROTOBUF=ON .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/deployment/debian/debian_SOURCE/changelog new/EternalTerminal-et-v6.0.11/deployment/debian/debian_SOURCE/changelog --- old/EternalTerminal-et-v6.0.9/deployment/debian/debian_SOURCE/changelog 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/deployment/debian/debian_SOURCE/changelog 2020-08-01 00:06:43.000000000 +0200 @@ -1,3 +1,9 @@ +et (6.0.11-##DISTRO##1) ##DISTRO##; urgency=medium + + * https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.0.11 + + -- Jason Gauci <jgmath2...@gmail.com> Thu, 30 Jul 2020 16:36:51 -0800 + et (6.0.9-##DISTRO##1) ##DISTRO##; urgency=medium * https://github.com/MisterTea/EternalTerminal/releases/tag/et-v6.0.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/deployment/opensuse.Dockerfile new/EternalTerminal-et-v6.0.11/deployment/opensuse.Dockerfile --- old/EternalTerminal-et-v6.0.9/deployment/opensuse.Dockerfile 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/deployment/opensuse.Dockerfile 2020-08-01 00:06:43.000000000 +0200 @@ -10,8 +10,4 @@ RUN zypper --non-interactive install -t pattern devel_C_C++ RUN zypper --non-interactive install git openssh cmake gcc-c++ protobuf-devel libsodium-devel -RUN git config --global user.email "jgmath2...@gmail.com" -RUN git config --global user.name "Jason Gauci" - -RUN ssh-keyscan github.com >> ~/.ssh/known_hosts -RUN git clone --branch release g...@github.com:MisterTea/EternalTerminal.git +RUN git clone --branch release https://github.com/MisterTea/EternalTerminal.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/deployment/ubuntu.Dockerfile new/EternalTerminal-et-v6.0.11/deployment/ubuntu.Dockerfile --- old/EternalTerminal-et-v6.0.9/deployment/ubuntu.Dockerfile 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/deployment/ubuntu.Dockerfile 2020-08-01 00:06:43.000000000 +0200 @@ -12,10 +12,6 @@ RUN apt update && apt upgrade -y && apt install -y distro-info build-essential git devscripts ubuntu-dev-tools aptly dput jq libsodium-dev libprotobuf-dev protobuf-compiler cmake libutempter-dev debhelper dh-systemd -RUN git config --global user.email "jgmath2...@gmail.com" -RUN git config --global user.name "Jason Gauci" - -RUN ssh-keyscan github.com >> ~/.ssh/known_hosts -RUN git clone --branch release g...@github.com:MisterTea/EternalTerminal.git +RUN git clone --branch release https://github.com/MisterTea/EternalTerminal.git COPY ubuntu/deploy_ubuntu_ppa.sh . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/src/terminal/TerminalClientMain.cpp new/EternalTerminal-et-v6.0.11/src/terminal/TerminalClientMain.cpp --- old/EternalTerminal-et-v6.0.9/src/terminal/TerminalClientMain.cpp 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/src/terminal/TerminalClientMain.cpp 2020-08-01 00:06:43.000000000 +0200 @@ -24,6 +24,7 @@ // Setup easylogging configurations el::Configurations defaultConf = LogHandler::setupLogHandler(&argc, &argv); + LogHandler::setupStdoutLogger(); // Parse command line arguments cxxopts::Options options("et", "Remote shell for the busy and impatient"); @@ -103,8 +104,6 @@ // set thread name el::Helpers::setThreadName("client-main"); - LogHandler::setupStdoutLogger(); - // Install log rotation callback el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/src/terminal/TerminalMain.cpp new/EternalTerminal-et-v6.0.11/src/terminal/TerminalMain.cpp --- old/EternalTerminal-et-v6.0.9/src/terminal/TerminalMain.cpp 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/src/terminal/TerminalMain.cpp 2020-08-01 00:06:43.000000000 +0200 @@ -20,6 +20,7 @@ int main(int argc, char** argv) { // Setup easylogging configurations el::Configurations defaultConf = LogHandler::setupLogHandler(&argc, &argv); + LogHandler::setupStdoutLogger(); // Parse command line arguments cxxopts::Options options("et", "Remote shell for the busy and impatient"); @@ -148,8 +149,6 @@ // Install log rotation callback el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler); - LogHandler::setupStdoutLogger(); - CLOG(INFO, "stdout") << "IDPASSKEY:" << idpasskey << endl; if (DaemonCreator::createSessionLeader() == -1) { STFATAL << "Error creating daemon: " << strerror(errno); @@ -183,8 +182,6 @@ // Install log rotation callback el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler); - LogHandler::setupStdoutLogger(); - SocketEndpoint routerEndpoint; routerEndpoint.set_name(result["serverfifo"].as<string>()); UserTerminalHandler uth(ipcSocketHandler, term, true, routerEndpoint, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/src/terminal/TerminalServerMain.cpp new/EternalTerminal-et-v6.0.11/src/terminal/TerminalServerMain.cpp --- old/EternalTerminal-et-v6.0.9/src/terminal/TerminalServerMain.cpp 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/src/terminal/TerminalServerMain.cpp 2020-08-01 00:06:43.000000000 +0200 @@ -9,6 +9,7 @@ int main(int argc, char **argv) { // Setup easylogging configurations el::Configurations defaultConf = LogHandler::setupLogHandler(&argc, &argv); + LogHandler::setupStdoutLogger(); cxxopts::Options options("etserver", "Remote shell for the busy and impatient"); @@ -137,8 +138,6 @@ // Install log rotation callback el::Helpers::installPreRollOutCallback(LogHandler::rolloutHandler); - LogHandler::setupStdoutLogger(); - std::shared_ptr<SocketHandler> tcpSocketHandler(new TcpSocketHandler()); std::shared_ptr<PipeSocketHandler> pipeSocketHandler( new PipeSocketHandler()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/EternalTerminal-et-v6.0.9/test/Main.cpp new/EternalTerminal-et-v6.0.11/test/Main.cpp --- old/EternalTerminal-et-v6.0.9/test/Main.cpp 2020-07-30 21:11:14.000000000 +0200 +++ new/EternalTerminal-et-v6.0.11/test/Main.cpp 2020-08-01 00:06:43.000000000 +0200 @@ -9,6 +9,7 @@ // Setup easylogging configurations el::Configurations defaultConf = et::LogHandler::setupLogHandler(&argc, &argv); + et::LogHandler::setupStdoutLogger(); defaultConf.setGlobally(el::ConfigurationType::ToStandardOutput, "true"); defaultConf.setGlobally(el::ConfigurationType::ToFile, "true"); // el::Loggers::setVerboseLevel(9); @@ -22,8 +23,6 @@ // Reconfigure default logger to apply settings above el::Loggers::reconfigureLogger("default", defaultConf); - et::LogHandler::setupStdoutLogger(); - int result = Catch::Session().run(argc, argv); FATAL_FAIL(::remove(logPath.c_str()));