Update et to 4.2.1

3 files changed, 15 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 19200f137cfe..c308eef60230 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 # Generated by mksrcinfo v8
 # Fri Jul  7 05:07:19 UTC 2017
 pkgbase = eternalterminal
-	pkgver = 3.1.1
+	pkgver = 4.2.1
 	pkgrel = 1
-	url = https://mistertea.github.io/EternalTCP/
+	url = https://mistertea.github.io/EternalTerminal/
 	arch = x86_64
 	license = Apache
-	makedepends = boost
 	makedepends = libsodium
 	makedepends = gflags
 	makedepends = google-glog
@@ -15,16 +14,14 @@ pkgbase = eternalterminal
 	makedepends = cmake
 	makedepends = unzip
 	makedepends = wget
-	depends = boost-libs
 	depends = libsodium
 	depends = gflags
 	depends = google-glog
 	depends = ncurses
 	depends = protobuf
-	source = https://github.com/MisterTea/EternalTCP/archive/et-v3.1.1.tar.gz
-	source = et.patch
-	sha256sums = 04c131b095d149b6dfc364b8f6984a8f68dab6eea5668392fc668ff147787615
-	sha256sums = 35961939cf852c327913e9fea698168966c7b492cb6f19e19321d9f9fa4fb292
+	depends = libutempter
+	source = https://github.com/MisterTea/EternalTCP/archive/et-v4.2.1.tar.gz
+	sha256sums = 86a3bc75a1cdc9c9d9078d0d33197817337779c07b12ba1240babe0717bf7aaa
 
 pkgname = eternalterminal-client
 	pkgdesc = Re-Connectable TCP connection. Includes only the client.
@@ -40,4 +37,3 @@ pkgname = eternalterminal
 	pkgdesc = Re-Connectable TCP connection. Includes both client and server.
 	conflicts = eternalterminal-client
 	conflicts = eternalterminal-server
-
diff --git a/PKGBUILD b/PKGBUILD
index e2e00cf14738..cb207f8f7aa0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
-# Maintainer: Joel Goguen <contact+aur@jgoguen.ca>
+# Maintainer: Jason Gauci <contact+jgmath2000@gmail.com>
+# Contributor: Joel Goguen <contact+aur@jgoguen.ca>
 
 _ghname='EternalTCP'
 _tarname='et'
 pkgbase='eternalterminal'
 pkgname=('eternalterminal-client' 'eternalterminal-server' 'eternalterminal')
-pkgver='3.1.1'
+pkgver='4.2.1'
 pkgrel=1
 arch=('x86_64')
 depends=(
-	'boost-libs' 'libsodium' 'gflags' 'google-glog' 'ncurses' 'protobuf'
+	'libsodium' 'gflags' 'google-glog' 'protobuf' 'libutempter'
 )
 makedepends=(
-	'boost' 'libsodium' 'gflags' 'google-glog' 'ncurses' 'protobuf' 'cmake'
-	'unzip' 'wget'
+	'libsodium' 'gflags' 'google-glog' 'protobuf' 'libutempter'
+	'cmake' 'unzip' 'wget'
 )
-url='https://mistertea.github.io/EternalTCP/'
+url='https://mistertea.github.io/EternalTerminal/'
 license=('Apache')
 
 source=(
 		"https://github.com/MisterTea/${_ghname}/archive/${_tarname}-v${pkgver}.tar.gz"
-		'et.patch'
 )
 sha256sums=(
-		'04c131b095d149b6dfc364b8f6984a8f68dab6eea5668392fc668ff147787615'
-		'35961939cf852c327913e9fea698168966c7b492cb6f19e19321d9f9fa4fb292'
+		'86a3bc75a1cdc9c9d9078d0d33197817337779c07b12ba1240babe0717bf7aaa'
 )
 
 prepare() {
@@ -31,9 +30,6 @@ prepare() {
 
 	msg2 'Preparing directories'
 	mkdir -p build
-
-	msg2 'Applying patches'
-	patch -p1 <"${srcdir}/et.patch"
 }
 
 build() {
@@ -53,8 +49,7 @@ package_eternalterminal-client() {
 	cd "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build"
 
 	msg2 "Installing ${_ghname} client to package root"
-	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build/etclient" "${pkgdir}/usr/bin/etclient"
-	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/launcher/et" "${pkgdir}/usr/bin/et"
+	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build/et" "${pkgdir}/usr/bin/et"
 }
 
 package_eternalterminal-server() {
@@ -76,8 +71,7 @@ package_eternalterminal() {
 	cd "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build"
 
 	msg2 "Installing ${_ghname} to package root"
-	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build/etclient" "${pkgdir}/usr/bin/etclient"
-	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/launcher/et" "${pkgdir}/usr/bin/et"
+	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build/et" "${pkgdir}/usr/bin/et"
 	install -D -m 0755 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/build/etserver" "${pkgdir}/usr/bin/etserver"
 	install -D -m 0644 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/debian/et.service" "${pkgdir}/usr/lib/systemd/system/et.service"
 	install -D -m 0644 "${srcdir}/${_ghname}-${_tarname}-v${pkgver}/etc/et.cfg" "${pkgdir}/etc/et.cfg"
diff --git a/et.patch b/et.patch
deleted file mode 100644
index 80b0bab67926..000000000000
--- a/et.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git i/launcher/et w/launcher/et
-index f46cd34..fd01b1c 100755
---- i/launcher/et
-+++ w/launcher/et
-@@ -5,7 +5,6 @@ USER=${USER}
- ET_COMMAND=""
- SSH_COMMAND=""
- TMP_DIR=${TMPDIR:-${TMP:-${TEMP:-/tmp}}}
--LOG_DIR=$TMP_DIR
- VERBOSITY=""
- INITIAL_COMMAND=""
- TUNNEL=""
-@@ -27,10 +26,6 @@ do
-             USER="${i#*=}"
-             shift
-             ;;
--        -l=*|--logdir=*)
--            LOG_DIR="${i#*=}"
--            shift
--            ;;
-         -v)
-             VERBOSITY="--v=9"
-             shift
-@@ -51,7 +46,6 @@ Options:
- -s Special ssh command if necessary, otherwise set to user@hostname:22
- -p Port for etserver to run on.  Don't set to the same port as ssh.  Default: 2022
- -u Username to connect to ssh & ET
---l Directory where log files will go
- -v verbose log files
- -c Initial command to execute upon connecting
- "
-@@ -120,5 +114,5 @@ else
-     echo "${PASSKEY}" > "${TMPFILE}"
-     PASSKEY=""
-     SSH_OUTPUT=""
--    $CLIENT_BINARY --idpasskeyfile="$TMPFILE" $VERBOSITY --host="$HOSTNAME" --port="$PORT" --log_dir="$LOG_DIR" --command="$INITIAL_COMMAND" --portforward="$TUNNEL" 2> /tmp/etclient_err
-+    $CLIENT_BINARY --idpasskeyfile="$TMPFILE" $VERBOSITY --host="$HOSTNAME" --port="$PORT" --command="$INITIAL_COMMAND" --portforward="$TUNNEL" 2> /tmp/etclient_err
- fi