v3.1.0

3 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d46c535bbac..bcfce8590738 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Fri Jun 23 05:24:03 UTC 2017
+# Fri Jun 30 19:15:11 UTC 2017
 pkgbase = eternalterminal
-	pkgver = 3.0.6
+	pkgver = 3.1.0
 	pkgrel = 1
 	url = https://mistertea.github.io/EternalTCP/
 	arch = x86_64
@@ -21,10 +21,10 @@ pkgbase = eternalterminal
 	depends = google-glog
 	depends = ncurses
 	depends = protobuf
-	source = https://github.com/MisterTea/EternalTCP/archive/et-v3.0.6.tar.gz
+	source = https://github.com/MisterTea/EternalTCP/archive/et-v3.1.0.tar.gz
 	source = et.patch
-	sha256sums = 34860a8f75b3d1ed406a3d9eb73c1cf85435f639c0de4ef77d4b78e4b7812efc
-	sha256sums = a09f0b1f607e61e8242d42170a5abd8a76258dcfc1d11902e8a1b20a295bbfcd
+	sha256sums = 4194132b3c1f0a965ae8dc3651b1d1d4e197b8ffd193ffc05ab541bdf0145cd8
+	sha256sums = 35961939cf852c327913e9fea698168966c7b492cb6f19e19321d9f9fa4fb292
 
 pkgname = eternalterminal-client
 	pkgdesc = Re-Connectable TCP connection. Includes only the client.
diff --git a/PKGBUILD b/PKGBUILD
index 021336ab9c10..575e8fd73189 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _ghname='EternalTCP'
 _tarname='et'
 pkgbase='eternalterminal'
 pkgname=('eternalterminal-client' 'eternalterminal-server' 'eternalterminal')
-pkgver='3.0.6'
+pkgver='3.1.0'
 pkgrel=1
 arch=('x86_64')
 depends=(
@@ -22,8 +22,8 @@ source=(
 		'et.patch'
 )
 sha256sums=(
-		'34860a8f75b3d1ed406a3d9eb73c1cf85435f639c0de4ef77d4b78e4b7812efc'
-		'a09f0b1f607e61e8242d42170a5abd8a76258dcfc1d11902e8a1b20a295bbfcd'
+		'4194132b3c1f0a965ae8dc3651b1d1d4e197b8ffd193ffc05ab541bdf0145cd8'
+		'35961939cf852c327913e9fea698168966c7b492cb6f19e19321d9f9fa4fb292'
 )
 
 prepare() {
@@ -33,7 +33,7 @@ prepare() {
 	mkdir -p build
 
 	msg2 'Applying patches'
-	patch -p0 <"${srcdir}/et.patch"
+	patch -p1 <"${srcdir}/et.patch"
 }
 
 build() {
diff --git a/et.patch b/et.patch
index ab1a5099038b..80b0bab67926 100644
--- a/et.patch
+++ b/et.patch
@@ -1,7 +1,7 @@
 diff --git i/launcher/et w/launcher/et
-index 63daec5..50d3ce1 100755
---- launcher/et
-+++ launcher/et
+index f46cd34..fd01b1c 100755
+--- i/launcher/et
++++ w/launcher/et
 @@ -5,7 +5,6 @@ USER=${USER}
  ET_COMMAND=""
  SSH_COMMAND=""
@@ -9,8 +9,8 @@ index 63daec5..50d3ce1 100755
 -LOG_DIR=$TMP_DIR
  VERBOSITY=""
  INITIAL_COMMAND=""
- 
-@@ -24,10 +23,6 @@ do
+ TUNNEL=""
+@@ -27,10 +26,6 @@ do
              USER="${i#*=}"
              shift
              ;;
@@ -21,7 +21,7 @@ index 63daec5..50d3ce1 100755
          -v)
              VERBOSITY="--v=9"
              shift
-@@ -44,7 +39,6 @@ Options:
+@@ -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
@@ -29,10 +29,10 @@ index 63daec5..50d3ce1 100755
  -v verbose log files
  -c Initial command to execute upon connecting
  "
-@@ -116,5 +110,5 @@ else
+@@ -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" 2> /tmp/etclient_err
-+    $CLIENT_BINARY --idpasskeyfile="$TMPFILE" $VERBOSITY --host="$HOSTNAME" --port="$PORT" --command="$INITIAL_COMMAND" 2> /tmp/etclient_err
+-    $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