summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-10-04 15:18:11 (GMT)
committer Jaromil <jaromil@dyne.org>2014-10-04 15:18:11 (GMT)
commit2d02d3a6e4285c46fee62ac0cc49616f1dc6af0a (patch)
tree473a9c8a9e9f7d44b76698d9c5c147c750809dae
parent98d931815773ef5ccdf345a7fba9db2f95007c99 (diff)
versioning moved to 1.0
- mongoose for http server - srm for secure file delete - steghide for steganograpy
-rw-r--r--VERSION2
-rw-r--r--build/conf.zsh4
-rw-r--r--build/config.site4
-rw-r--r--build/crypto/Sources9
-rw-r--r--build/crypto/conf.zsh23
-rw-r--r--build/media/conf.zsh1
-rw-r--r--build/network/Sources3
-rw-r--r--build/network/conf.zsh45
-rw-r--r--build/text/Sources1
-rw-r--r--build/text/conf.zsh1
-rw-r--r--pack/conf.zsh2
-rw-r--r--pack/dojos/0.10/crypto.tree8
-rw-r--r--pack/dojos/1.0/crypto.tree10
-rw-r--r--pack/dojos/1.0/gnomish.tree (renamed from pack/dojos/0.10/gnomish.tree)0
-rw-r--r--pack/dojos/1.0/lang.tree (renamed from pack/dojos/0.10/lang.tree)0
-rw-r--r--pack/dojos/1.0/media.tree (renamed from pack/dojos/0.10/media.tree)0
-rw-r--r--pack/dojos/1.0/network.tree (renamed from pack/dojos/0.10/network.tree)3
-rw-r--r--pack/dojos/1.0/system.aliases (renamed from pack/dojos/0.10/system.aliases)0
-rw-r--r--pack/dojos/1.0/system.tree (renamed from pack/dojos/0.10/system.tree)0
-rw-r--r--pack/dojos/1.0/text.aliases (renamed from pack/dojos/0.10/text.aliases)0
-rw-r--r--pack/dojos/1.0/text.tree (renamed from pack/dojos/0.10/text.tree)0
-rw-r--r--pack/dojos/1.0/toys.tree (renamed from pack/dojos/0.10/toys.tree)0
-rw-r--r--termapk/AndroidManifest.xml4
-rw-r--r--termapk/src/org/dyne/zshaolin/startup/installer.java4
24 files changed, 93 insertions, 31 deletions
diff --git a/VERSION b/VERSION
index 68c123c..d3827e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.10
+1.0
diff --git a/build/conf.zsh b/build/conf.zsh
index e7cb6ca..f4d5134 100644
--- a/build/conf.zsh
+++ b/build/conf.zsh
@@ -341,14 +341,14 @@ compile() {
}
- { test -r configure } && {
+# { test -r configure } && {
func "launching configure ${compile_args}"
zconfigure ${compile_args}
{ test $? = 0 } || {
error "error: $1 cannot configure, build left incomplete"
popd; return 1 }
- }
+# }
{ test "$nomake" = "1" } || {
diff --git a/build/config.site b/build/config.site
index c566cb3..ca0b054 100644
--- a/build/config.site
+++ b/build/config.site
@@ -23,3 +23,7 @@ glib_native_android=yes
glib_cv_stack_grows=yes
ac_cv_header_pwd_h=no
ac_cv_header_grp_h=no
+
+# mhash
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes
diff --git a/build/crypto/Sources b/build/crypto/Sources
index 0abb1f1..2f98137 100644
--- a/build/crypto/Sources
+++ b/build/crypto/Sources
@@ -12,3 +12,12 @@ libgcrypt -1.5.3 .tar.gz http://www.gnu.org/software/libgcrypt/
gnupg -1.4.15 .tar.bz2 http://gnupg.org
pinentry -0.8.3 .tar.bz2
+# steg
+libmcrypt -2.5.8 .tar.bz2
+mcrypt -2.6.8 .tar.gz
+mhash -0.9.9.9 .tar.bz2
+steghide -0.5.1-deb .tar.bz2
+
+# fs wipe
+#wipe -2.3.1 .tar.bz2
+srm -1.2.14 .tar.gz
diff --git a/build/crypto/conf.zsh b/build/crypto/conf.zsh
index b86c2bf..cb0d5bb 100644
--- a/build/crypto/conf.zsh
+++ b/build/crypto/conf.zsh
@@ -16,7 +16,7 @@ notice "Building GNUtls"
pushd gnutls
zconfigure default "--disable-shared --enable-static --disable-crywrap --without-p11-kit"
zmake -C lib
-{ test $? = 0 } && { touch ../gnutls.done }
+touch ../gnutls.done
popd }
{ test -r gnutls.installed } || {
pushd gnutls
@@ -41,3 +41,24 @@ compile gnupg default
zinstall gnupg
+# steghide
+compile libmcrypt default
+zinstall libmcrypt
+
+#compile mcrypt default
+#zinstall mcrypt
+
+compile mhash default
+zinstall mhash
+
+# steghide has an annoying libtool bug
+# pushd into src and make then run the command without libtool by hand
+compile steghide default
+zinstall steghide
+
+###################
+# filesystem wipers
+compile srm default
+zinstall srm
+
+
diff --git a/build/media/conf.zsh b/build/media/conf.zsh
index 7721a6d..6deaa42 100644
--- a/build/media/conf.zsh
+++ b/build/media/conf.zsh
@@ -56,6 +56,7 @@ zinstall freetype
pushd jhead
zmake
cp jhead $PREFIX/bin/
+cp jhead.1 $PREFIX/share/man/man1
popd
# DCRAW
diff --git a/build/network/Sources b/build/network/Sources
index b355683..dc8d04f 100644
--- a/build/network/Sources
+++ b/build/network/Sources
@@ -7,7 +7,8 @@ android-openssh -6.1 .tar.gz
rsync -3.1.0 .tar.gz http://rsync.samba.org
git -1.8.4.3 .tar.gz http://git-scm.com
-lighttpd -1.4.33 .tar.xz http://www.lighttpd.net/
+# lighttpd -1.4.33 .tar.xz http://www.lighttpd.net/
+mongoose -3bf82dd54 .tar.gz https://github.com/cesanta/mongoose
# slang -2.2.4 .tar.bz2
ncurses -5.9 .tar.gz
diff --git a/build/network/conf.zsh b/build/network/conf.zsh
index 86bbc31..0e2bc38 100644
--- a/build/network/conf.zsh
+++ b/build/network/conf.zsh
@@ -108,10 +108,17 @@ done
popd
}
-CFLAGS+=" -DOPENSSL_NO_ECDH " \
-compile lighttpd default "--enable-static --disable-shared --without-bzip2 --without-pcre --with-openssl"
-zinstall lighttpd
-
+{ test -r mongoose.done } || {
+ pushd mongoose
+ static-cc -c mongoose.c
+ static-cc -o mongoose mongoose.o examples/server.c -I .
+ [[ $? = 0 ]] && { touch ../mongoose.done }
+ popd
+}
+{ test -r mongoose.installed } || {
+ cp -v mongoose/mongoose $PREFIX/bin/
+ touch mongoose.installed
+}
compile ncurses default "--enable-ext-mouse --without-trace --without-tests --without-debug --disable-big-core --enable-widec --enable-ext-colors"
pushd ncurses
@@ -133,6 +140,25 @@ zinstall lynx
compile ncdu default
zinstall ncdu
+
+
+
+
+notice "copy all binaries from NDK in system"
+cp -v $PREFIX/bin/lynx $ZHOME/system/bin/
+cp -v $PREFIX/bin/curl $ZHOME/system/bin/
+cp -v $PREFIX/bin/ssh $ZHOME/system/bin/
+cp -v $PREFIX/bin/ssh-keygen $ZHOME/system/bin/
+cp -v $PREFIX/bin/scp $ZHOME/system/bin/
+cp -v $PREFIX/bin/sshd $ZHOME/system/bin/
+cp -v $PREFIX/bin/sftp $ZHOME/system/bin/
+cp -v $PREFIX/bin/rsync $ZHOME/system/bin/
+cp -v $PREFIX/bin/mongoose $ZHOME/system/bin/
+rsync -r $PREFIX/share/man/* $ZHOME/system/share/man/
+
+
+
+
######
# experimental zone
return
@@ -140,12 +166,6 @@ return
#############################
-# 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/
-
## s-lang
notice "Building S-Lang"
@@ -160,4 +180,9 @@ notice "Building S-Lang"
zinstall slang install-static
+CFLAGS+=" -DOPENSSL_NO_ECDH " \
+compile lighttpd default "--enable-static --disable-shared --without-bzip2 --without-pcre --with-openssl"
+zinstall lighttpd
+
+
diff --git a/build/text/Sources b/build/text/Sources
index 5b1e390..f2c8cc2 100644
--- a/build/text/Sources
+++ b/build/text/Sources
@@ -1,3 +1,4 @@
heirloom-doctools -080407 .tar.bz2
mdocml -1.12.1 .tar.gz
vim -7.3 .tar.bz2 http://www.vim.org
+discount -git .tar.gz
diff --git a/build/text/conf.zsh b/build/text/conf.zsh
index e084ee3..c34bccf 100644
--- a/build/text/conf.zsh
+++ b/build/text/conf.zsh
@@ -6,7 +6,6 @@
LOGS=build.log
rm -f $LOGS; touch $LOGS
-
# download and decompress all sources
prepare_sources
diff --git a/pack/conf.zsh b/pack/conf.zsh
index e179b29..dd717cb 100644
--- a/pack/conf.zsh
+++ b/pack/conf.zsh
@@ -20,7 +20,7 @@ streamline_zshaolin() {
mkdir -p floor/var/log
# now etc and the helper scripts (new since 0.9.1)
- rsync -ar $ZHOME/conf/aux floor/
+# rsync -ar $ZHOME/conf/aux floor/
rsync -ar $ZHOME/conf/etc floor/
rsync -ar $ZHOME/conf/helpers floor/
# eventually zcompile some helpers, still too small to need that
diff --git a/pack/dojos/0.10/crypto.tree b/pack/dojos/0.10/crypto.tree
deleted file mode 100644
index bd7d766..0000000
--- a/pack/dojos/0.10/crypto.tree
+++ /dev/null
@@ -1,8 +0,0 @@
-./bin/gpg
-./bin/gpgv
-./bin/gpg-error
-./bin/pinentry
-./bin/pinentry-curses
-./libexec/gnupg/gpgkeys_hkp
-./libexec/gnupg/gpgkeys_finger
-./libexec/gnupg/gpgkeys_curl
diff --git a/pack/dojos/1.0/crypto.tree b/pack/dojos/1.0/crypto.tree
new file mode 100644
index 0000000..75cd334
--- /dev/null
+++ b/pack/dojos/1.0/crypto.tree
@@ -0,0 +1,10 @@
+bin/gpg
+bin/gpgv
+bin/gpg-error
+bin/pinentry
+bin/pinentry-curses
+bin/steghide
+bin/srm
+libexec/gnupg/gpgkeys_hkp
+libexec/gnupg/gpgkeys_finger
+libexec/gnupg/gpgkeys_curl
diff --git a/pack/dojos/0.10/gnomish.tree b/pack/dojos/1.0/gnomish.tree
index 76cc88f..76cc88f 100644
--- a/pack/dojos/0.10/gnomish.tree
+++ b/pack/dojos/1.0/gnomish.tree
diff --git a/pack/dojos/0.10/lang.tree b/pack/dojos/1.0/lang.tree
index e249372..e249372 100644
--- a/pack/dojos/0.10/lang.tree
+++ b/pack/dojos/1.0/lang.tree
diff --git a/pack/dojos/0.10/media.tree b/pack/dojos/1.0/media.tree
index f6037ce..f6037ce 100644
--- a/pack/dojos/0.10/media.tree
+++ b/pack/dojos/1.0/media.tree
diff --git a/pack/dojos/0.10/network.tree b/pack/dojos/1.0/network.tree
index 984cf63..339e2f4 100644
--- a/pack/dojos/0.10/network.tree
+++ b/pack/dojos/1.0/network.tree
@@ -14,7 +14,6 @@ bin/ssh-keygen
bin/sshd
bin/lynx
bin/ncdu
-sbin/lighttpd
-sbin/lighttpd-angel
+bin/mongoose
etc/lynx.lss
etc/lynx.cfg
diff --git a/pack/dojos/0.10/system.aliases b/pack/dojos/1.0/system.aliases
index 74a7cd2..74a7cd2 100644
--- a/pack/dojos/0.10/system.aliases
+++ b/pack/dojos/1.0/system.aliases
diff --git a/pack/dojos/0.10/system.tree b/pack/dojos/1.0/system.tree
index 557bc7a..557bc7a 100644
--- a/pack/dojos/0.10/system.tree
+++ b/pack/dojos/1.0/system.tree
diff --git a/pack/dojos/0.10/text.aliases b/pack/dojos/1.0/text.aliases
index 3afc7e8..3afc7e8 100644
--- a/pack/dojos/0.10/text.aliases
+++ b/pack/dojos/1.0/text.aliases
diff --git a/pack/dojos/0.10/text.tree b/pack/dojos/1.0/text.tree
index 9bf6be4..9bf6be4 100644
--- a/pack/dojos/0.10/text.tree
+++ b/pack/dojos/1.0/text.tree
diff --git a/pack/dojos/0.10/toys.tree b/pack/dojos/1.0/toys.tree
index 1e9bfe3..1e9bfe3 100644
--- a/pack/dojos/0.10/toys.tree
+++ b/pack/dojos/1.0/toys.tree
diff --git a/termapk/AndroidManifest.xml b/termapk/AndroidManifest.xml
index e11da38..6ec3bae 100644
--- a/termapk/AndroidManifest.xml
+++ b/termapk/AndroidManifest.xml
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.dyne.zshaolin"
- android:versionName="0.10"
- android:versionCode="14">
+ android:versionName="1.0"
+ android:versionCode="15">
<!--android:installLocation="preferExternal" -->
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/termapk/src/org/dyne/zshaolin/startup/installer.java b/termapk/src/org/dyne/zshaolin/startup/installer.java
index 773e92f..ce5db86 100644
--- a/termapk/src/org/dyne/zshaolin/startup/installer.java
+++ b/termapk/src/org/dyne/zshaolin/startup/installer.java
@@ -30,8 +30,8 @@ import org.dyne.zshaolin.startup.setup.filemanager;
public class installer extends Activity implements OnClickListener{
//THE MAIN INSTALL VALUE
- public static int CURRENT_INSTALL_SYSTEM_NUM = 14;
- public static String CURRENT_INSTALL_SYSTEM = "System v0.10";
+ public static int CURRENT_INSTALL_SYSTEM_NUM = 15;
+ public static String CURRENT_INSTALL_SYSTEM = "System v1.0";
public static String CURRENT_INSTALL_ASSETFILE = "system.tar.lzma.mp3";
private ProgressDialog mInstallProgress;