aboutsummaryrefslogtreecommitdiffstats
path: root/platform
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-09-11 17:01:20 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-09-11 17:01:20 -0400
commitbc31d4f362d871508fbb65230610949e75ec3760 (patch)
tree7769cc3a97bc0de16040e66ae416e65345fd10a1 /platform
parentImprove seccomp architecture support (diff)
downloadfirejail-bc31d4f362d871508fbb65230610949e75ec3760.tar.gz
firejail-bc31d4f362d871508fbb65230610949e75ec3760.tar.zst
firejail-bc31d4f362d871508fbb65230610949e75ec3760.zip
merge fixes from 0.9.50-bugfixes branch
Diffstat (limited to 'platform')
-rw-r--r--platform/debian/conffiles1
-rwxr-xr-xplatform/rpm/old-mkrpm.sh9
2 files changed, 8 insertions, 2 deletions
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index d87d1fc08..d0e236e61 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -356,3 +356,4 @@
356/etc/firejail/zathura.profile 356/etc/firejail/zathura.profile
357/etc/firejail/zoom.profile 357/etc/firejail/zoom.profile
358/etc/firejail/yandex-browser.profile 358/etc/firejail/yandex-browser.profile
359/etc/firejail/itch.profile
diff --git a/platform/rpm/old-mkrpm.sh b/platform/rpm/old-mkrpm.sh
index 7d817c7e2..50f9f0512 100755
--- a/platform/rpm/old-mkrpm.sh
+++ b/platform/rpm/old-mkrpm.sh
@@ -1,5 +1,5 @@
1#!/bin/bash 1#!/bin/bash
2VERSION="0.9.50~rc1" 2VERSION="0.9.50"
3rm -fr ~/rpmbuild 3rm -fr ~/rpmbuild
4rm -f firejail-$VERSION-1.x86_64.rpm 4rm -f firejail-$VERSION-1.x86_64.rpm
5 5
@@ -28,6 +28,7 @@ install -m 644 /usr/lib/firejail/firecfg.config firejail-$VERSION/usr/lib/firej
28#install -m 755 /usr/lib/firejail/fjclip.py firejail-$VERSION/usr/lib/firejail/. 28#install -m 755 /usr/lib/firejail/fjclip.py firejail-$VERSION/usr/lib/firejail/.
29#install -m 755 /usr/lib/firejail/fjdisplay.py firejail-$VERSION/usr/lib/firejail/. 29#install -m 755 /usr/lib/firejail/fjdisplay.py firejail-$VERSION/usr/lib/firejail/.
30#install -m 755 /usr/lib/firejail/fjresize.py firejail-$VERSION/usr/lib/firejail/. 30#install -m 755 /usr/lib/firejail/fjresize.py firejail-$VERSION/usr/lib/firejail/.
31install -m 755 /usr/lib/firejail/fldd firejail-$VERSION/usr/lib/firejail/.
31install -m 755 /usr/lib/firejail/fnet firejail-$VERSION/usr/lib/firejail/. 32install -m 755 /usr/lib/firejail/fnet firejail-$VERSION/usr/lib/firejail/.
32install -m 755 /usr/lib/firejail/fseccomp firejail-$VERSION/usr/lib/firejail/. 33install -m 755 /usr/lib/firejail/fseccomp firejail-$VERSION/usr/lib/firejail/.
33install -m 755 /usr/lib/firejail/fshaper.sh firejail-$VERSION/usr/lib/firejail/. 34install -m 755 /usr/lib/firejail/fshaper.sh firejail-$VERSION/usr/lib/firejail/.
@@ -466,6 +467,9 @@ rm -rf %{buildroot}
466%{_sysconfdir}/%{name}/unknown-horizons.profile 467%{_sysconfdir}/%{name}/unknown-horizons.profile
467%{_sysconfdir}/%{name}/wireshark-gtk.profile 468%{_sysconfdir}/%{name}/wireshark-gtk.profile
468%{_sysconfdir}/%{name}/wireshark-qt.profile 469%{_sysconfdir}/%{name}/wireshark-qt.profile
470%{_sysconfdir}/%{name}/itch.profile
471%{_sysconfdir}/%{name}/minetest.profile
472%{_sysconfdir}/%{name}/yandex-browser.profile
469 473
470 474
471 475
@@ -490,6 +494,7 @@ rm -rf %{buildroot}
490#/usr/lib/firejail/fjdisplay.py 494#/usr/lib/firejail/fjdisplay.py
491#/usr/lib/firejail/fjresize.py 495#/usr/lib/firejail/fjresize.py
492/usr/lib/firejail/fnet 496/usr/lib/firejail/fnet
497/usr/lib/firejail/fldd
493/usr/lib/firejail/fseccomp 498/usr/lib/firejail/fseccomp
494/usr/lib/firejail/seccomp 499/usr/lib/firejail/seccomp
495/usr/lib/firejail/seccomp.64 500/usr/lib/firejail/seccomp.64
@@ -514,7 +519,7 @@ rm -rf %{buildroot}
514chmod u+s /usr/bin/firejail 519chmod u+s /usr/bin/firejail
515 520
516%changelog 521%changelog
517* Mon Aug 28 2017 netblue30 <netblue30@yahoo.com> 0.9.50~rc1-1 522* Fri Sep 8 2017 netblue30 <netblue30@yahoo.com> 0.9.50-1
518 523
519* Mon Jun 12 2017 netblue30 <netblue30@yahoo.com> 0.9.48-1 524* Mon Jun 12 2017 netblue30 <netblue30@yahoo.com> 0.9.48-1
520 525