aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2015-11-27 20:38:16 -0500
committerLibravatar netblue30 <netblue30@yahoo.com>2015-11-27 20:38:16 -0500
commit265be08c2960a16fe47ea0a7b564ac4222a8d515 (patch)
treea46896c04205ceb36501949f3d51ecd0688fb1c4
parentMerge pull request #161 from pigmonkey/weechat (diff)
downloadfirejail-265be08c2960a16fe47ea0a7b564ac4222a8d515.tar.gz
firejail-265be08c2960a16fe47ea0a7b564ac4222a8d515.tar.zst
firejail-265be08c2960a16fe47ea0a7b564ac4222a8d515.zip
weechat profile integration
-rw-r--r--Makefile.in1
-rw-r--r--README2
-rw-r--r--RELNOTES2
-rw-r--r--platform/debian/conffiles1
-rw-r--r--todo3
5 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 7b95112b2..89383bb27 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,6 +118,7 @@ realinstall:
118 install -c -m 0644 .etc/nolocal.net $(DESTDIR)/$(sysconfdir)/firejail/. 118 install -c -m 0644 .etc/nolocal.net $(DESTDIR)/$(sysconfdir)/firejail/.
119 install -c -m 0644 .etc/webserver.net $(DESTDIR)/$(sysconfdir)/firejail/. 119 install -c -m 0644 .etc/webserver.net $(DESTDIR)/$(sysconfdir)/firejail/.
120 install -c -m 0644 .etc/bitlbee.profile $(DESTDIR)/$(sysconfdir)/firejail/. 120 install -c -m 0644 .etc/bitlbee.profile $(DESTDIR)/$(sysconfdir)/firejail/.
121 install -c -m 0644 .etc/weechat.profile $(DESTDIR)/$(sysconfdir)/firejail/.
121 bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;" 122 bash -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
122 rm -fr .etc 123 rm -fr .etc
123 # man pages 124 # man pages
diff --git a/README b/README
index 3d5373a0f..dcb95b133 100644
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ License: GPL v2
18Firejail Authors: 18Firejail Authors:
19 19
20netblue30 (netblue30@yahoo.com) 20netblue30 (netblue30@yahoo.com)
21Peter Hogg (https://github.com/pigmonkey)
22 - WeeChat profile
21rogshdo (https://github.com/rogshdo) 23rogshdo (https://github.com/rogshdo)
22 - BitlBee profile 24 - BitlBee profile
23avoidr (https://github.com/avoidr) 25avoidr (https://github.com/avoidr)
diff --git a/RELNOTES b/RELNOTES
index 82c58a414..ddd90218b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,5 +1,5 @@
1firejail (0.9.35) baseline; urgency=low 1firejail (0.9.35) baseline; urgency=low
2 * added unbound, dnscrypt-proxy, and BitlBee profiles 2 * added unbound, dnscrypt-proxy, BitlBee, and WeeChat profiles
3 * added --noblacklist option 3 * added --noblacklist option
4 * whitelist command enhancements 4 * whitelist command enhancements
5 * prevent leaking user information by modifying /home directory, 5 * prevent leaking user information by modifying /home directory,
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index df15b5992..fd82a4e8c 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -45,3 +45,4 @@
45/etc/firejail/nolocal.net 45/etc/firejail/nolocal.net
46/etc/firejail/webserver.net 46/etc/firejail/webserver.net
47/etc/firejail/bitlbee.profile 47/etc/firejail/bitlbee.profile
48/etc/firejail/weechat.profile
diff --git a/todo b/todo
index b7754f7ef..a55e12818 100644
--- a/todo
+++ b/todo
@@ -147,3 +147,6 @@ mount tmpfs on /sys/hypervisor
147mount tmpfs on /sys/fs 147mount tmpfs on /sys/fs
148mount tmpfs on /sys/module 148mount tmpfs on /sys/module
149mount tmpfs on /sys/power 149mount tmpfs on /sys/power
150
15120. Try --overlay on a Ubuntu 14.04 32bit.Without adding --dns, there will be no network connectivity - see issue 151
152