From 9497bbce4227e9d942193c09f54ffc5fdda72613 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sun, 15 May 2011 19:24:42 +0200 Subject: [PATCH 1/6] better install in datadir this should be compatible with packaging --- share/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/Makefile.am b/share/Makefile.am index 139e0c6..064fd9e 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -30,8 +30,10 @@ MimePkg = tomb.mimepkg install-data-hook: @echo "installing mime type" + @install -t $(DESTDIR)$(datadir)/mime/packages dyne-tomb.xml @if ! [ -n `which xdg-mime` ]; then xdg-mime install dyne-tomb.xml; fi @echo "installing icons"; + @install -t $(DESTDIR)$(datadir)/pixmaps monmort.xpm @if ! [ -n `which xdg-icon-resource` ]; then \ xdg-icon-resource install --context mimetypes --size 32 ../src/monmort.xpm monmort; \ xdg-icon-resource install --size 32 ../src/monmort.xpm dyne-monmort; fi From dee6151215cffe6f2e4d3a254853dc7c2e9c0e68 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sun, 15 May 2011 19:29:46 +0200 Subject: [PATCH 2/6] new debian packaging --- .gitignore | 1 - debian/changelog | 26 ++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 36 ++++++++++++++++++++++++++++++++++++ debian/copyright | 18 ++++++++++++++++++ debian/dirs | 1 + debian/docs | 1 + debian/menu | 3 +++ debian/rules | 7 +++++++ debian/source/format | 1 + debian/tomb-gtk.install | 2 ++ debian/tomb.install | 6 ++++++ debian/tomb.mime | 1 + debian/tomb.sharedmimeinfo | 11 +++++++++++ debian/watch | 5 +++++ 15 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/dirs create mode 100644 debian/docs create mode 100644 debian/menu create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/tomb-gtk.install create mode 100644 debian/tomb.install create mode 100644 debian/tomb.mime create mode 100644 debian/tomb.sharedmimeinfo create mode 100644 debian/watch diff --git a/.gitignore b/.gitignore index d541184..4aff498 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,4 @@ stamp-h1 tags doc/web/public doc/web/dyne -debian share/gtkrc diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..26541ee --- /dev/null +++ b/debian/changelog @@ -0,0 +1,26 @@ +tomb (1.0-1) unstable; urgency=low + + * New upstream release + * Fixes to dependencies + * Split in 2 packages: tomb and tomb-gtk + + -- Denis Roio Mon, 21 Feb 2011 00:59:55 +0100 + +tomb (0.9.2-1) unstable; urgency=low + + * New upstream release + * Mentored fixes to debian packaging + + -- Denis Roio Thu, 10 Feb 2011 15:22:58 +0100 + +tomb (0.9.1-1) unstable; urgency=low + + * New upstream release + + -- Denis Roio Thu, 03 Feb 2011 22:32:23 +0100 + +tomb (0.9-1) unstable; urgency=low + + * Initial release. (Closes: #611660) + + -- Denis Roio Mon, 31 Jan 2011 19:39:06 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..29f5d04 --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +Source: tomb +Section: misc +Priority: extra +Maintainer: Denis Roio +Build-Depends: debhelper (>= 7), autotools-dev, cdbs, libgtk2.0-dev, libnotify-dev +Standards-Version: 3.9.1 +Homepage: http://tomb.dyne.org + +Package: tomb +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, zsh, cryptsetup, pinentry-curses, gnupg, sudo +Suggests: tomb-gtk, wipe, dcfldd, steghide +Description: the crypto undertaker + Derived from the dyne:bolic nesting mechanism, Tomb is a free and + easy to operate desktop application for fairly strong encryption of + personal files. A tomb is like a locked folder that can be + transported and hidden in filesystems; its keys are password + protected and can be kept separate, for instance keeping a tomb file + in your computer's harddisk and its key file on a USB stick. + Tomb relies on dm-crypt (and cryptsetup) as an encryption backend + using the aes-cbc-essiv:sha256 cypher. + +Package: tomb-gtk +Architecture: any +Depends: tomb, libnotify-bin, pinentry-gtk2, ${shlibs:Depends}, ${misc:Depends} +Description: the crypto undertaker - desktop integration + Derived from the dyne:bolic nesting mechanism, Tomb is a free and + easy to operate desktop application for fairly strong encryption of + personal files. A tomb is like a locked folder that can be + transported and hidden in filesystems; its keys are password + protected and can be kept separate, for instance keeping a tomb file + in your computer's harddisk and its key file on a USB stick. + Tomb relies on dm-crypt (and cryptsetup) as an encryption backend + using the aes-cbc-essiv:sha256 cypher. + . + This package contains a graphical interface to use Tomb on the desktop. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..b17146b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by Denis Roio +on Thu Jan 13 23:21:12 CET 2011 + +It was downloaded from the code.dyne.org source repository + +Upstream Author(s): Denis Roio + +Copyright: + + +License: + This software is available under the GNU General Public License. + http://www.opensource.org/licenses/gpl-license.php + +Packaging: + Copyright (C) 2011 by Denis Roio + released under the terms of GNU GPL version 3, + see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..db68deb --- /dev/null +++ b/debian/menu @@ -0,0 +1,3 @@ +?package(tomb):command="tomb-open" icon="/usr/share/pixmaps/monmort.xpm" needs="text" \ + section="Applications/System/Security" title="Tomb" hints="Crypto" \ + hotkey="Tomb" diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..5f4ce40 --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +# include /usr/share/cdbs/1/class/gnome.mk + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tomb-gtk.install b/debian/tomb-gtk.install new file mode 100644 index 0000000..44a858c --- /dev/null +++ b/debian/tomb-gtk.install @@ -0,0 +1,2 @@ +usr/bin/tomb-status +usr/share/man/man1/tomb-status.1 diff --git a/debian/tomb.install b/debian/tomb.install new file mode 100644 index 0000000..e9020a9 --- /dev/null +++ b/debian/tomb.install @@ -0,0 +1,6 @@ +usr/bin/tomb +usr/bin/tomb-open +usr/share/man/man1/tomb.1 +usr/share/man/man1/tomb-open.1 +usr/share/pixmaps/monmort.xpm +usr/share/icons/monmort.png diff --git a/debian/tomb.mime b/debian/tomb.mime new file mode 100644 index 0000000..ff3c4b9 --- /dev/null +++ b/debian/tomb.mime @@ -0,0 +1 @@ +application/x-tomb-volume; tomb-open '%s'; priority=8 diff --git a/debian/tomb.sharedmimeinfo b/debian/tomb.sharedmimeinfo new file mode 100644 index 0000000..c545eae --- /dev/null +++ b/debian/tomb.sharedmimeinfo @@ -0,0 +1,11 @@ + + + + Tomb crypto volume + + + + Tomb crypto key + + + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..24d1c31 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +version = 3 + +# Package mantained by upstream developer +# wishing there would be a way to watch git repos? +# however our ftp is on ftp://ftp.dyne.org/tomb/releases From bc96c5e95ef727c34ef2ad5c2e7e075a46156529 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sun, 15 May 2011 19:32:19 +0200 Subject: [PATCH 3/6] better datadir install again --- share/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/Makefile.am b/share/Makefile.am index 064fd9e..db2c747 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -30,10 +30,10 @@ MimePkg = tomb.mimepkg install-data-hook: @echo "installing mime type" - @install -t $(DESTDIR)$(datadir)/mime/packages dyne-tomb.xml + @install -D dyne-tomb.xml $(DESTDIR)$(datadir)/mime/packages @if ! [ -n `which xdg-mime` ]; then xdg-mime install dyne-tomb.xml; fi @echo "installing icons"; - @install -t $(DESTDIR)$(datadir)/pixmaps monmort.xpm + @install -D monmort.xpm $(DESTDIR)$(datadir)/pixmaps @if ! [ -n `which xdg-icon-resource` ]; then \ xdg-icon-resource install --context mimetypes --size 32 ../src/monmort.xpm monmort; \ xdg-icon-resource install --size 32 ../src/monmort.xpm dyne-monmort; fi From ddd41afc963c62933bd438c33aea6e26e3bdd7e0 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Sun, 15 May 2011 19:33:56 +0200 Subject: [PATCH 4/6] agian --- share/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/Makefile.am b/share/Makefile.am index db2c747..a93bfe9 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -33,7 +33,7 @@ install-data-hook: @install -D dyne-tomb.xml $(DESTDIR)$(datadir)/mime/packages @if ! [ -n `which xdg-mime` ]; then xdg-mime install dyne-tomb.xml; fi @echo "installing icons"; - @install -D monmort.xpm $(DESTDIR)$(datadir)/pixmaps + @install -D monmort.png $(DESTDIR)$(datadir)/pixmaps @if ! [ -n `which xdg-icon-resource` ]; then \ xdg-icon-resource install --context mimetypes --size 32 ../src/monmort.xpm monmort; \ xdg-icon-resource install --size 32 ../src/monmort.xpm dyne-monmort; fi From 2e2fcabb0aea7317fb81f74e29198518ef4c735a Mon Sep 17 00:00:00 2001 From: Jaromil Date: Mon, 23 May 2011 22:28:22 +0200 Subject: [PATCH 5/6] fix to close a tomb that is open twice on the same mountpoint --- src/tomb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tomb b/src/tomb index 9922e36..1d67d45 100755 --- a/src/tomb +++ b/src/tomb @@ -763,6 +763,9 @@ umount_tomb() { fi + # avoid block when the same tomb is mounted, take only the first + for tm in ${(f)tombmount}; do tombmount=${tm}; break; done + func "tomb close argument: $1" func "name:\t$tombname" func "mount:\t$tombmount" From eb9c45648a637a2e9af8eabdaf2c3475da5b6948 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Mon, 23 May 2011 22:29:38 +0200 Subject: [PATCH 6/6] small TODO update --- TODO.org | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/TODO.org b/TODO.org index 8da88e8..3281347 100644 --- a/TODO.org +++ b/TODO.org @@ -52,30 +52,43 @@ you are welcome to send patches to jaromil@dyne.org * TODO Release 2.0 :00%: -100% backward compatible with tombs created with 1.0 +Must be 100% backward compatible with tombs created with 1.0 -** [#A] use inotify on tomb +** Bugs to fix - inotify can also count when was the last time tomb was used and - unmount it automatically after a timeout +*** TODO [#A] Should refuse opening a tomb that is already open :jaromil: -** [#A] udev rules to avoid usb automount of keyplug in gnome +** New features -** [#A] sign and verify tomb script integrity (executed as root) +*** [#A] use inotify on tomb -** [#B] make a gnome tomb undertaker using gnome-druid in glade -** [#B] tomb locksmith for key management - a graphical tool or text wizard to move keys in/out steganography - as well split them -** [#B] system to split keys in parts (ssss) + inotify can also count when was the last time tomb was used and + unmount it automatically after a timeout, see how much free space + is left and warn when the space is almost finished -** [#B] transport keys and integrity checksums on qrcodes +*** [#A] udev rules to avoid usb automount of keyplug in gnome -** [#B] analyse and show tomb entropy using libdisorder +*** [#A] sign and verify tomb script integrity (executed as root) -** [#B] indeep security analysis of possible vulnerabilities +*** TODO [#B] Internationalization using gettext :jaromil: + + Started generating the strings, still need to figure out how to + install it + +*** [#B] make a gnome tomb undertaker using gnome-druid in glade +*** [#B] tomb locksmith for key management + a graphical tool or text wizard to move keys in/out steganography + as well split them +*** [#B] system to split keys in parts (ssss) + +*** [#B] transport keys and integrity checksums on qrcodes + +*** [#B] analyse and show tomb entropy using libdisorder + +*** [#B] indeep security analysis of possible vulnerabilities + +*** [#C] more gtk dialogs for configurations? keep it minimal! -** [#C] more gtk dialogs for configurations? keep it minimal! * TODO Porting to Win$loth