add git to ubuntu-setup.sh and Dockerfile,add corkscrew

diff --git a/Dockerfile b/Dockerfile
index 0e00c28781bb977dfd5886f6dc88086e0f0faafd..859563c236331b7efeb3ab210489fbef86175a76 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,7 @@ RUN dpkg-reconfigure locales
 
 RUN apt-get update && apt-get install -y \
         sudo \
 
 RUN apt-get update && apt-get install -y \
         sudo \

+        git \

         asciidoc \
         automake \
         bison \
         asciidoc \
         automake \
         bison \

diff --git a/packages/corkscrew/build.sh b/packages/corkscrew/build.sh
new file mode 100644 (file)
index 0000000..17e85a2
--- /dev/null
+++ b/packages/corkscrew/build.sh
@@ -0,0 +1,5 @@
+TERMUX_PKG_HOMEPAGE=http://www.agroman.net/corkscrew/
+TERMUX_PKG_DESCRIPTION="A tool for tunneling SSH through HTTP proxies"
+TERMUX_PKG_DEPENDS="openssh"
+TERMUX_PKG_VERSION=2.0
+TERMUX_PKG_SRCURL=http://agroman.net/corkscrew/corkscrew-${TERMUX_PKG_VERSION}.tar.gz

diff --git a/ubuntu-setup.sh b/ubuntu-setup.sh
index 28eb31b1b3d5220028e9889f56c5b92c1e4a588d..7622211081fe5565fdd27adac0474e7891bcaf92 100755 (executable)
--- a/ubuntu-setup.sh
+++ b/ubuntu-setup.sh
@@ -22,6 +22,7 @@ PACKAGES="$PACKAGES scons"
 PACKAGES="$PACKAGES texinfo"
 PACKAGES="$PACKAGES xmlto"
 PACKAGES="$PACKAGES xutils-dev"                        # Provides u'makedepend' which the openssl build uses
 PACKAGES="$PACKAGES texinfo"
 PACKAGES="$PACKAGES xmlto"
 PACKAGES="$PACKAGES xutils-dev"                        # Provides u'makedepend' which the openssl build uses

+PACKAGES="$PACKAGES git"

 sudo apt install $PACKAGES
 
 sudo mkdir -p /data/data/com.termux/files/usr
 sudo apt install $PACKAGES
 
 sudo mkdir -p /data/data/com.termux/files/usr