summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-09-08 23:00:56 (GMT)
committer Jaromil <jaromil@dyne.org>2014-09-08 23:00:56 (GMT)
commitf33993cde0e7fe49c520722f7d68f9b54d1c7530 (patch)
treec143970e738ea7a5b8791e580676672b61ffc3ab
parent9978156ee4cadf1e8ed399337eaaa8924ee2ce97 (diff)
last fixes to sshd startup and cosmetics for new releasev0.9.1
-rw-r--r--README1
-rw-r--r--build/network/conf.zsh25
-rw-r--r--conf/etc/ssh/sshd_config4
-rwxr-xr-xconf/etc/zlogin3
-rw-r--r--termapk/res/layout-land/main.xml4
-rw-r--r--termapk/res/layout/main.xml4
6 files changed, 24 insertions, 17 deletions
diff --git a/README b/README
index c6a4ee0..ea9d2f2 100644
--- a/README
+++ b/README
@@ -1,6 +1,7 @@
ZShaolin - Interactive and scriptable console terminal on Android
+not yet a proper README sorry.
For more information see: http://www.dyne.org/software/zshaolin
diff --git a/build/network/conf.zsh b/build/network/conf.zsh
index 0505e47..71a58ea 100644
--- a/build/network/conf.zsh
+++ b/build/network/conf.zsh
@@ -1,5 +1,5 @@
# ZShaolin build script
-# (C) 2013 Denis Roio - GNU GPL v3
+# (C) 2013-2014 Denis Roio - GNU GPL v3
# refer to zmake for license details
# configure the logfile
@@ -31,6 +31,9 @@ rsync -r openssl-static/include/openssl $PREFIX/include
LIBS="$LIBS -ldl -lssl -lcrypto" compile curl default "--with-ssl=$PREFIX --disable-shared --enable-static"
}
zinstall curl
+# manual
+cp -v curl/lib/.libs/libcurl.a $PREFIX/lib
+
# make openssh
{ test -r android-openssh.done } || {
@@ -60,8 +63,9 @@ zinstall rsync
# make git
notice "Building git"
+cp -v git-read-cache.c git/read-cache.c
GIT_FLAGS=(prefix=${APKPATH}/files/system NO_INSTALL_HARDLINKS=1 NO_NSEC=1 NO_ICONV=1)
-GIT_FLAGS+=(CURLDIR=$PREFIX) # OPENSSLDIR=$PREFIX)
+GIT_FLAGS+=(CURLDIR=$PREFIX OPENSSLDIR=$PREFIX)
GIT_FLAGS+=(NO_PERL=1 NO_PYTHON=1)
{ test -r git.done } || {
pushd git
@@ -69,11 +73,10 @@ autoconf
# -lssl
LIBS="$LIBS -lz -ldl -lcurl -lcrypto" \
- zconfigure default "--without-iconv --with-curl=$PREFIX"
-# --with-openssl=$PREFIX
+ zconfigure default "--without-iconv --with-curl=$PREFIX --with-openssl=$PREFIX"
{ test $? = 0 } && {
- LIBS="$LIBS" make git ${GIT_FLAGS}
+ LIBS="$LIBS" make ${GIT_FLAGS}
pushd templates
LIBS="$LIBS" make install ${GIT_FLAGS}
popd
@@ -126,20 +129,20 @@ zinstall lynx
compile ncdu default
zinstall ncdu
+######
+# experimental zone
+return
+
+
#############################
-# copy all binaries in system
+# copy all binaries in system (uat?)
rsync -r $PREFIX/bin $ZHOME/system/
rsync -r $PREFIX/etc $ZHOME/system/
rsync -r $PREFIX/sbin $ZHOME/system/
rsync -r $PREFIX/share/man/* $ZHOME/system/share/man/
-######
-# experimental zone
-return
-
-
## s-lang
notice "Building S-Lang"
{ test -r slang.done } || {
diff --git a/conf/etc/ssh/sshd_config b/conf/etc/ssh/sshd_config
index 87dcf0e..a004825 100644
--- a/conf/etc/ssh/sshd_config
+++ b/conf/etc/ssh/sshd_config
@@ -21,8 +21,8 @@ Port 2222
# HostKey for protocol version 1
#HostKey /etc/ssh/ssh_host_key
# HostKeys for protocol version 2
-#HostKey /etc/ssh/ssh_host_rsa_key
-#HostKey /etc/ssh/ssh_host_dsa_key
+HostKey /data/data/org.dyne.zshaolin/files/.ssh/ssh_host_rsa_key
+HostKey /data/data/org.dyne.zshaolin/files/.ssh/ssh_host_dsa_key
#HostKey /etc/ssh/ssh_host_ecdsa_key
# Lifetime and size of ephemeral version 1 server key
diff --git a/conf/etc/zlogin b/conf/etc/zlogin
index 9dd68e9..a027628 100755
--- a/conf/etc/zlogin
+++ b/conf/etc/zlogin
@@ -30,6 +30,9 @@ function restore_rc() {
if [ "$res" = "1" ]; then echo " . restored: ~/.$rc"; fi
}
+# links vim if present
+{ test -r $SYS/bin/vim } && { alias vi=vim }
+
cd $HOME
echo "Welcome to ZShaolin"
restore_rc zshrc
diff --git a/termapk/res/layout-land/main.xml b/termapk/res/layout-land/main.xml
index 7db405e..cd1655a 100644
--- a/termapk/res/layout-land/main.xml
+++ b/termapk/res/layout-land/main.xml
@@ -72,8 +72,8 @@
android:gravity="center"
android:textColor="#ffffff"
android:textSize="12dip"
- android:text="ZShaolin.org\n
-by Jaromil @ dyne.org (2013)"/>
+ android:text="ZShaolin Nomadic GNU/Linux OS\n
+by Jaromil @ dyne.org (2012-2014)"/>
</LinearLayout>
diff --git a/termapk/res/layout/main.xml b/termapk/res/layout/main.xml
index 783e32c..0ad2bf3 100644
--- a/termapk/res/layout/main.xml
+++ b/termapk/res/layout/main.xml
@@ -67,8 +67,8 @@
android:gravity="center"
android:textColor="#ffffff"
android:textSize="12dip"
- android:text="ZShaolin.org\n
-by Jaromil @ dyne.org (2013)"/>
+ android:text="ZShaolin Nomadic GNU/Linux OS\n
+by Jaromil @ dyne.org (2012-2014)"/>
</LinearLayout>