diff --git a/add-ons-tree.d/var/www/index.html b/add-ons-tree.d/var/www/index.html deleted file mode 120000 index f2f2b71..0000000 --- a/add-ons-tree.d/var/www/index.html +++ /dev/null @@ -1 +0,0 @@ -cgi-bin/cryptobox.pl \ No newline at end of file diff --git a/etc-defaults.d/cbox-dev.conf b/etc-defaults.d/cbox-dev.conf index a71d529..f4e0252 100644 --- a/etc-defaults.d/cbox-dev.conf +++ b/etc-defaults.d/cbox-dev.conf @@ -11,8 +11,7 @@ BUILD_DIR="$ROOT_DIR/_builddir" # the cryptobox development files -TEMPLATE_DIR="$ROOT_DIR/cbox-tree.d" -TEMPLATE_EXTRAS_DIR="$ROOT_DIR/add-ons-tree.d" +TEMPLATE_DIR="$ROOT_DIR/live-cd-tree.d" # the iso image IMAGE_FILE="$BUILD_DIR/cryptobox.iso" diff --git a/etc-defaults.d/dfs-cbox.conf b/etc-defaults.d/dfs-cbox.conf index b86c317..0c4d6e8 100644 --- a/etc-defaults.d/dfs-cbox.conf +++ b/etc-defaults.d/dfs-cbox.conf @@ -155,7 +155,8 @@ unpackdebs = packages/kernel-image-2.6.12.6_cryptobox0.3_i386.deb packages = %(allpackages)s # Debs from local fs to isntall on live fs -#installdebs = +installdebs = packages/cryptobox_0.3.0-1_all.deb + packages/perl-clearsilver_0.9.13-3.2_all.deb # Bootloader (see options under default) bootloader = grub-no-emul diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBox.html b/live-cd-tree.d/_offline/doc/de/CryptoBox.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBox.html rename to live-cd-tree.d/_offline/doc/de/CryptoBox.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDev.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDev.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDev.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDev.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevBackground.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevBackground.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevBackground.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevBackground.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevCustomBuild.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevCustomConfigure.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevKnownProblems.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevPreparation.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevValidation.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevValidation.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevValidation.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevValidation.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxDevWorkFlow.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxUser.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxUser.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxUser.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxUser.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxUserConfiguration.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxUserDailyUse.html diff --git a/add-ons-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html b/live-cd-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html similarity index 100% rename from add-ons-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html rename to live-cd-tree.d/_offline/doc/de/CryptoBoxUserGettingStarted.html diff --git a/add-ons-tree.d/_offline/doc/de/doc_footer.inc b/live-cd-tree.d/_offline/doc/de/doc_footer.inc similarity index 100% rename from add-ons-tree.d/_offline/doc/de/doc_footer.inc rename to live-cd-tree.d/_offline/doc/de/doc_footer.inc diff --git a/add-ons-tree.d/_offline/doc/de/doc_header.inc b/live-cd-tree.d/_offline/doc/de/doc_header.inc similarity index 100% rename from add-ons-tree.d/_offline/doc/de/doc_header.inc rename to live-cd-tree.d/_offline/doc/de/doc_header.inc diff --git a/add-ons-tree.d/_offline/doc/doc_footer.inc b/live-cd-tree.d/_offline/doc/doc_footer.inc similarity index 100% rename from add-ons-tree.d/_offline/doc/doc_footer.inc rename to live-cd-tree.d/_offline/doc/doc_footer.inc diff --git a/add-ons-tree.d/_offline/doc/doc_header.inc b/live-cd-tree.d/_offline/doc/doc_header.inc similarity index 100% rename from add-ons-tree.d/_offline/doc/doc_header.inc rename to live-cd-tree.d/_offline/doc/doc_header.inc diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBox.html b/live-cd-tree.d/_offline/doc/en/CryptoBox.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBox.html rename to live-cd-tree.d/_offline/doc/en/CryptoBox.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDev.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDev.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDev.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDev.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevBackground.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevBackground.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevBackground.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevBackground.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevCustomBuild.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevCustomConfigure.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevKnownProblems.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevPreparation.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevValidation.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevValidation.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevValidation.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevValidation.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxDevWorkFlow.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxUser.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxUser.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxUser.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxUser.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxUserConfiguration.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxUserDailyUse.html diff --git a/add-ons-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html b/live-cd-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html similarity index 100% rename from add-ons-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html rename to live-cd-tree.d/_offline/doc/en/CryptoBoxUserGettingStarted.html diff --git a/add-ons-tree.d/_offline/doc/en/doc_footer.inc b/live-cd-tree.d/_offline/doc/en/doc_footer.inc similarity index 100% rename from add-ons-tree.d/_offline/doc/en/doc_footer.inc rename to live-cd-tree.d/_offline/doc/en/doc_footer.inc diff --git a/add-ons-tree.d/_offline/doc/en/doc_header.inc b/live-cd-tree.d/_offline/doc/en/doc_header.inc similarity index 100% rename from add-ons-tree.d/_offline/doc/en/doc_header.inc rename to live-cd-tree.d/_offline/doc/en/doc_header.inc diff --git a/add-ons-tree.d/_offline/shellopn.exe b/live-cd-tree.d/_offline/shellopn.exe similarity index 100% rename from add-ons-tree.d/_offline/shellopn.exe rename to live-cd-tree.d/_offline/shellopn.exe diff --git a/add-ons-tree.d/_offline/shellopn.zip b/live-cd-tree.d/_offline/shellopn.zip similarity index 100% rename from add-ons-tree.d/_offline/shellopn.zip rename to live-cd-tree.d/_offline/shellopn.zip diff --git a/add-ons-tree.d/autorun.inf b/live-cd-tree.d/autorun.inf similarity index 100% rename from add-ons-tree.d/autorun.inf rename to live-cd-tree.d/autorun.inf diff --git a/add-ons-tree.d/etc/issue b/live-cd-tree.d/etc/issue similarity index 100% rename from add-ons-tree.d/etc/issue rename to live-cd-tree.d/etc/issue diff --git a/add-ons-tree.d/etc/samba/smb.conf b/live-cd-tree.d/etc/samba/smb.conf similarity index 100% rename from add-ons-tree.d/etc/samba/smb.conf rename to live-cd-tree.d/etc/samba/smb.conf diff --git a/add-ons-tree.d/start.html b/live-cd-tree.d/start.html similarity index 100% rename from add-ons-tree.d/start.html rename to live-cd-tree.d/start.html diff --git a/add-ons-tree.d/usr/lib/perl5/ClearSilver.pm b/live-cd-tree.d/usr/lib/perl5/ClearSilver.pm similarity index 100% rename from add-ons-tree.d/usr/lib/perl5/ClearSilver.pm rename to live-cd-tree.d/usr/lib/perl5/ClearSilver.pm diff --git a/add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist b/live-cd-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist similarity index 100% rename from add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist rename to live-cd-tree.d/usr/lib/perl5/auto/ClearSilver/.packlist diff --git a/add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs b/live-cd-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs similarity index 100% rename from add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs rename to live-cd-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs diff --git a/add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so b/live-cd-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so similarity index 100% rename from add-ons-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so rename to live-cd-tree.d/usr/lib/perl5/auto/ClearSilver/ClearSilver.so diff --git a/add-ons-tree.d/var/www/errors/err404.html b/live-cd-tree.d/var/www/errors/err404.html similarity index 100% rename from add-ons-tree.d/var/www/errors/err404.html rename to live-cd-tree.d/var/www/errors/err404.html diff --git a/add-ons-tree.d/var/www/favicon.ico b/live-cd-tree.d/var/www/favicon.ico similarity index 100% rename from add-ons-tree.d/var/www/favicon.ico rename to live-cd-tree.d/var/www/favicon.ico diff --git a/live-cd-tree.d/var/www/index.html b/live-cd-tree.d/var/www/index.html new file mode 120000 index 0000000..1b75fa1 --- /dev/null +++ b/live-cd-tree.d/var/www/index.html @@ -0,0 +1 @@ +cryptobox \ No newline at end of file diff --git a/packages/cryptobox_0.3.0-1_all.deb b/packages/cryptobox_0.3.0-1_all.deb new file mode 100644 index 0000000..8474888 Binary files /dev/null and b/packages/cryptobox_0.3.0-1_all.deb differ diff --git a/packages/perl-clearsilver_0.9.13-3.2_all.deb b/packages/perl-clearsilver_0.9.13-3.2_all.deb new file mode 100644 index 0000000..0afa3f5 Binary files /dev/null and b/packages/perl-clearsilver_0.9.13-3.2_all.deb differ diff --git a/packages/perl-clearsilver_debian_packaging.patch b/packages/perl-clearsilver_debian_packaging.patch new file mode 100644 index 0000000..94c3095 --- /dev/null +++ b/packages/perl-clearsilver_debian_packaging.patch @@ -0,0 +1,59 @@ +# how to build the perl-clearsilver package: +# apt-get source clearsilver +# cat THIS_FILE | patch -p0 +# cd clearsilver-* +# debian/rules binary +diff -ruN clearsilver-0.9.13.orig/debian/control clearsilver-0.9.13/debian/control +--- clearsilver-0.9.13.orig/debian/control 2005-11-30 23:09:24.000000000 +0100 ++++ clearsilver-0.9.13/debian/control 2005-11-30 23:38:10.000000000 +0100 +@@ -39,3 +39,13 @@ + This Debian package is an empty dummy package that always depends on + a package built for Debian's default Python version. + ++Package: perl-clearsilver ++Architecture: all ++Section: perl ++Priority: optional ++Depends: perl (>= 5.6) ++Description: perl bindings for clearsilver ++ Clearsilver is a fast, powerful, and language-neutral HTML template system. ++ In both static content sites and dynamic HTML applications, it ++ provides a separation between presentation code and application logic which ++ makes working with your project easier. +diff -ruN clearsilver-0.9.13.orig/debian/rules clearsilver-0.9.13/debian/rules +--- clearsilver-0.9.13.orig/debian/rules 2005-11-30 23:09:24.000000000 +0100 ++++ clearsilver-0.9.13/debian/rules 2005-11-30 23:49:57.000000000 +0100 +@@ -9,7 +9,7 @@ + include /usr/share/cdbs/1/rules/simple-patchsys.mk + + DEB_CONFIGURE_EXTRA_FLAGS := --with-python=/usr/bin/python2.3 \ +- --disable-perl \ ++ --with-perl=/usr/bin/perl \ + --disable-ruby \ + --disable-csharp \ + --disable-apache \ +@@ -18,6 +18,7 @@ + CFLAGS += -fPIC + + DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp ++DEB_SHLIBDEPS_INCLUDE_perl-clearsilver := debian/perl-clearsilver/usr/lib/perl5 + DEB_SHLIBDEPS_INCLUDE_python2.3-clearsilver := debian/python2.3-clearsilver/usr/lib/python2.3/site-packages + + build/python2.3-clearsilver:: +@@ -27,3 +28,16 @@ + + binary-post-install/python2.3-clearsilver:: + dh_movefiles --package=python2.3-clearsilver usr/lib/python2.3 ++ ++build/perl-clearsilver:: ++ install -d debian/tmp/usr/lib/perl5 ++ install -d debian/tmp/usr/lib/perl5/auto/ClearSilver ++ install -m644 $(DEB_BUILDDIR)/perl/ClearSilver.pm \ ++ debian/tmp/usr/lib/perl5/ClearSilver.pm ++ install -m755 $(DEB_BUILDDIR)/perl/blib/arch/auto/ClearSilver/ClearSilver.so \ ++ debian/tmp/usr/lib/perl5/auto/ClearSilver/ClearSilver.so ++ install -m644 $(DEB_BUILDDIR)/perl/ClearSilver.bs \ ++ debian/tmp/usr/lib/perl5/auto/ClearSilver/ClearSilver.bs ++ ++binary-post-install/perl-clearsilver:: ++ dh_movefiles --package=perl-clearsilver usr/lib/perl5 diff --git a/scripts/cbox-build.sh b/scripts/cbox-build.sh index 2a0cd69..0fb2093 100755 --- a/scripts/cbox-build.sh +++ b/scripts/cbox-build.sh @@ -97,12 +97,9 @@ function configure_cb() exit 1 fi -echo "Copying base files to the box ..." +echo "Copying files to the box ..." svn export --force "$TEMPLATE_DIR/." "$IMAGE_DIR" - echo "Copying add-on files to the box ..." - svn export --force "$TEMPLATE_EXTRAS_DIR/." "$IMAGE_DIR" - echo "Configuring the cryptobox ..." chroot "$IMAGE_DIR" "$CHROOT_START" /usr/lib/cryptobox/configure-cryptobox.sh normal diff --git a/scripts/common.sh.inc b/scripts/common.sh.inc index e692752..2718762 100644 --- a/scripts/common.sh.inc +++ b/scripts/common.sh.inc @@ -38,9 +38,6 @@ LOCALCONF_DIR="$ROOT_DIR/etc-local.d" # 'configure' CUSTOM_CONFIGURE_DIR="$ROOT_DIR/configure-local.d" -# template directory for cryptobox specific configuration -TEMPLATE_DIR="cbox-tree.d" - # the chroot-wrapper within the cryptobox CHROOT_START="/usr/lib/cryptobox/chroot-start.sh" diff --git a/scripts/debian b/scripts/debian index 519293f..bcfa4bd 100644 --- a/scripts/debian +++ b/scripts/debian @@ -31,11 +31,11 @@ ACTION=build case "$ACTION" in build ) # check for uid=0 (necessary for building) - [ "$(id -u)" -ne 0 ] && echo "this script ($0) has to be called as root" >&2 && exit 1 - svn export "$DEB_ROOT_DIR" "$DEB_BUILD_DIR" - svn export "$DEB_CONTROL_DIR" "$DEB_BUILD_DIR/DEBIAN" - chown -R root. "$DEB_BUILD_DIR/usr/share/doc/" - dpkg-deb --build "$DEB_BUILD_DIR" "$DEB_PACKAGE_DIR" + #[ "$(id -u)" -ne 0 ] && echo "this script ($0) has to be called as root" >&2 && exit 1 + svn export "$DEB_ROOT_DIR" "$DEB_BUILD_DIR" >/dev/null + svn export "$DEB_CONTROL_DIR" "$DEB_BUILD_DIR/DEBIAN" >/dev/null + #chown -R root. "$DEB_BUILD_DIR/usr/share/doc/" + fakeroot dpkg-deb --build "$DEB_BUILD_DIR" "$DEB_PACKAGE_DIR" rm -rf "$DEB_BUILD_DIR" ;; check ) diff --git a/scripts/userdocexport.sh b/scripts/userdocexport.sh index 1102afb..9593324 100755 --- a/scripts/userdocexport.sh +++ b/scripts/userdocexport.sh @@ -34,7 +34,7 @@ CBOX_CGI="/cryptobox?action=doc\&page=" LANGUAGES="de en" DEST_DIR="$ROOT_DIR/cbox-tree.d/usr/share/doc/cryptobox/html" -OFFLINE_DIR="$ROOT_DIR/cbox-tree.d/_offline/doc" +OFFLINE_DIR="$ROOT_DIR/live-cd-tree.d/_offline/doc" IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-img" TMP_DIR=/tmp/$(basename $0)-$$.d