From 4bc2b1184eb52efdbf1892e2258ff617447b95f7 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Sat, 30 Jul 2016 15:22:27 +0200
Subject: Use xz compression for source tarball

---
 Makefile.in                  | 4 ++--
 mkdeb.sh                     | 4 ++--
 src/tools/mkcoverit.sh       | 6 +++---
 test/dist-compile/compile.sh | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 44833021e..b5b74c231 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -290,13 +290,13 @@ DISTFILES_TEST = "test/apps test/apps-x11 test/environment test/profiles test/ut
 
 dist:
 	make distclean
-	rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2
+	rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
 	mkdir -p $(NAME)-$(VERSION)/test
 	cp -a "$(DISTFILES)" $(NAME)-$(VERSION)
 	cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test
 	rm -rf $(NAME)-$(VERSION)/src/tools
 	find $(NAME)-$(VERSION) -name .svn -delete
-	tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
+	tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)
 	rm -fr $(NAME)-$(VERSION)
 
 deb: dist
diff --git a/mkdeb.sh b/mkdeb.sh
index 71c3b9a04..be8d618e1 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -3,7 +3,7 @@
 # a code archive should already be available
 
 TOP=`pwd`
-CODE_ARCHIVE="$1-$2.tar.bz2"
+CODE_ARCHIVE="$1-$2.tar.xz"
 CODE_DIR="$1-$2"
 INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
 DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN"
@@ -15,7 +15,7 @@ echo "install directory: $INSTALL_DIR"
 echo "debian control directory: $DEBIAN_CTRL_DIR"
 echo "*****************************************"
 
-tar -xjvf $CODE_ARCHIVE
+tar -xJvf $CODE_ARCHIVE
 #mkdir -p $INSTALL_DIR
 cd $CODE_DIR
 ./configure --prefix=/usr
diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh
index 4af84a7a1..65b06f9fa 100755
--- a/src/tools/mkcoverit.sh
+++ b/src/tools/mkcoverit.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # unpack firejail archive
-ARCFIREJAIL=`ls *.tar.bz2| grep firejail`
+ARCFIREJAIL=`ls *.tar.xz| grep firejail`
 if [ "$?" -eq 0 ];
 then
 	echo "preparing $ARCFIREJAIL"
-	DIRFIREJAIL=`basename $ARCFIREJAIL  .tar.bz2`
+	DIRFIREJAIL=`basename $ARCFIREJAIL  .tar.xz`
 	rm -fr $DIRFIREJAIL
-	tar -xjvf $ARCFIREJAIL
+	tar -xJvf $ARCFIREJAIL
 	cd $DIRFIREJAIL
 	./configure --prefix=/usr
 	cd ..
diff --git a/test/dist-compile/compile.sh b/test/dist-compile/compile.sh
index 2d055c1bd..6332bee9a 100755
--- a/test/dist-compile/compile.sh
+++ b/test/dist-compile/compile.sh
@@ -55,7 +55,7 @@ cleanup
 #*****************************************************************
 print_title "${arr[1]}"
 echo "$DIST"
-tar -xjvf ../../$DIST.tar.bz2
+tar -xJvf ../../$DIST.tar.xz
 mv $DIST firejail
 
 cd firejail
-- 
cgit v1.2.3-54-g00ecf


From 6d9b627bc2c9884068078842d941aa8daa78b777 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Sat, 30 Jul 2016 15:31:10 +0200
Subject: Create detached signature for source tarball (Closes #204)

---
 mkasc.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mkasc.sh b/mkasc.sh
index 2c9836f17..4d5b73e20 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -6,5 +6,6 @@ cd /transfer
 sha256sum * > firejail-$1-unsigned
 gpg --clearsign --digest-algo SHA256 < firejail-$1-unsigned > firejail-$1.asc
 gpg --verify firejail-$1.asc
+gpg --detach-sign --armor firejail-$1.tar.xz
 rm firejail-$1-unsigned
 
-- 
cgit v1.2.3-54-g00ecf