aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar rusty-snake <print_hello_world+Public@protonmail.com>2019-08-26 09:23:04 +0200
committerLibravatar rusty-snake <print_hello_world+Public@protonmail.com>2019-08-26 09:23:04 +0200
commit282bab5ced6aececc4f999acf3c077887a47f341 (patch)
treed18890f8e9f06349059a8abb5360b097ac9e435b
parentmany profile fixes (1) (diff)
downloadfirejail-282bab5ced6aececc4f999acf3c077887a47f341.tar.gz
firejail-282bab5ced6aececc4f999acf3c077887a47f341.tar.zst
firejail-282bab5ced6aececc4f999acf3c077887a47f341.zip
misc fixes
- fix for #2038 - update RELNOTES - fix #2925
-rw-r--r--Makefile.in1
-rw-r--r--RELNOTES5
-rwxr-xr-xplatform/rpm/mkrpm.sh2
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index ebfbac318..44137c0bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,6 +193,7 @@ uninstall:
193 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail 193 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail
194 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon 194 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
195 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg 195 rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
196 @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)/$(sysconfdir)/firejail', see #2038."
196 197
197DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkdeb-apparmor.sh COPYING README RELNOTES" 198DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkdeb-apparmor.sh COPYING README RELNOTES"
198DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot" 199DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot"
diff --git a/RELNOTES b/RELNOTES
index 41a288bd0..a50f40926 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,7 +1,7 @@
1firejail (0.9.61) baseline; urgency=low 1firejail (0.9.61) baseline; urgency=low
2 * work in progress 2 * work in progress
3 * added file-copy-limit in /etc/firejail/firejail.config 3 * added file-copy-limit in /etc/firejail/firejail.config
4 * profile templates 4 * profile templates (/usr/share/doc/firejail)
5 * allow-debuggers support in profiles 5 * allow-debuggers support in profiles
6 * new scripts in conrib: gdb-firejail.sh and sort.py 6 * new scripts in conrib: gdb-firejail.sh and sort.py
7 * new profiles: qgis, klatexformula, klatexformula_cmdl, links, xlinks 7 * new profiles: qgis, klatexformula, klatexformula_cmdl, links, xlinks
@@ -13,7 +13,8 @@ firejail (0.9.61) baseline; urgency=low
13 * new profiles: mpg123-portaudio, mpg123-pulse, mpg123-strip, pavucontrol-qt 13 * new profiles: mpg123-portaudio, mpg123-pulse, mpg123-strip, pavucontrol-qt
14 * new profiles: gnome-characters, gnome-character-map, rsync, Whalebird, 14 * new profiles: gnome-characters, gnome-character-map, rsync, Whalebird,
15 * new profiles: tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat, 15 * new profiles: tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat,
16 * new profiles: kiwix-desktop 16 * new profiles: kiwix-desktop, bzcat, zstd, pzstd, zstdcat, zstdgrep, zstdless
17 * new profiles: zstdmt, unzstd, i2p
17 -- netblue30 <netblue30@yahoo.com> Sat, 1 Jun 2019 08:00:00 -0500 18 -- netblue30 <netblue30@yahoo.com> Sat, 1 Jun 2019 08:00:00 -0500
18 19
19firejail (0.9.60) baseline; urgency=low 20firejail (0.9.60) baseline; urgency=low
diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index b63340e43..351b92beb 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -33,7 +33,7 @@ sed -e "s/__NAME__/${name}/g" -e "s/__VERSION__/${version}/g" platform/rpm/${nam
33# FIXME: We could parse RELNOTES and create a %changelog section here 33# FIXME: We could parse RELNOTES and create a %changelog section here
34 34
35# Copy the source to build into a tarball 35# Copy the source to build into a tarball
36tar czf ${tmpdir}/SOURCES/${name}-${version}.tar.gz . --transform "s/^./${name}-${version}/" --exclude='./.git*' --exclude='./test*' 36tar --exclude='./.git*' --exclude='./test' --transform "s/^./${name}-${version}/" -czf ${tmpdir}/SOURCES/${name}-${version}.tar.gz .
37 37
38# Build the files (rpm, debug rpm and source rpm) 38# Build the files (rpm, debug rpm and source rpm)
39rpmbuild --quiet --define "_topdir ${tmpdir}" -ba ${tmp_spec_file} 39rpmbuild --quiet --define "_topdir ${tmpdir}" -ba ${tmp_spec_file}