aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar startx2017 <vradu.startx@yandex.com>2020-08-12 11:41:26 -0500
committerLibravatar GitHub <noreply@github.com>2020-08-12 11:41:26 -0500
commitd5b92ccdecf6bdbae5b4b81a495dc1db286aa0a9 (patch)
tree2f73b6dcf463d42bcca63d467b6f9f60b4aade7b
parentMerge pull request #3569 from topimiettinen/seccomp-log (diff)
parentmkdeb.sh should not use files outside $CODE_DIR (diff)
downloadfirejail-d5b92ccdecf6bdbae5b4b81a495dc1db286aa0a9.tar.gz
firejail-d5b92ccdecf6bdbae5b4b81a495dc1db286aa0a9.tar.zst
firejail-d5b92ccdecf6bdbae5b4b81a495dc1db286aa0a9.zip
Merge pull request #3573 from dandelionred/master
mkdeb.sh should not use files outside $CODE_DIR
-rwxr-xr-xmkdeb.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkdeb.sh.in b/mkdeb.sh.in
index efb477920..a19dee620 100755
--- a/mkdeb.sh.in
+++ b/mkdeb.sh.in
@@ -52,12 +52,12 @@ echo "*****************************************"
52mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian 52mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian
53gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian 53gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian
54rm $INSTALL_DIR/usr/share/doc/firejail/COPYING 54rm $INSTALL_DIR/usr/share/doc/firejail/COPYING
55install -m644 platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/. 55install -m644 $CODE_DIR/platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/.
56mkdir -p $DEBIAN_CTRL_DIR 56mkdir -p $DEBIAN_CTRL_DIR
57sed "s/FIREJAILVER/$VERSION/g" platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control 57sed "s/FIREJAILVER/$VERSION/g" $CODE_DIR/platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control
58 58
59mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/ 59mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/
60install -m644 platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail 60install -m644 $CODE_DIR/platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail
61 61
62find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles 62find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles
63chmod 644 $DEBIAN_CTRL_DIR/conffiles 63chmod 644 $DEBIAN_CTRL_DIR/conffiles