Wyłączenie LibreWolf z immudex

diff --git a/files/mozilla.tgz b/files/mozilla.tgz
index 451af931777e7d0b7fc93c808af2327a16dcfe79..8a69268dc21002a51f48c0295eebe56cbdf20ae6 100644 (file)
Binary files a/files/mozilla.tgz and b/files/mozilla.tgz differ

diff --git a/files/mozilla.tgz_ b/files/mozilla.tgz_
new file mode 100644 (file)
index 0000000..451af93
Binary files /dev/null and b/files/mozilla.tgz_ differ

diff --git a/launchers/16844254192.desktop b/launchers/16844254192.desktop
index 7ef05a7087b6ba43f19750b1a7122a5423964daa..2ad97ce5150fd8c971054c8ae1fd1786c30b4a36 100644 (file)
--- a/launchers/16844254192.desktop
+++ b/launchers/16844254192.desktop
@@ -1,20 +1,19 @@
 [Desktop Entry]
-Name=LibreWolf (Firejailed)
-Name[pl]=LibreWolf (Firejailed)
-Comment=Secure the World Wide Web browsing
-Comment[pl]=Bezpieczne przeglądanie stron WWW
+Name=Firefox ESR (Firejailed)
+Name[pl]=Firefox ESR (Firejailed)
+Comment=Browse the World Wide Web
+Comment[pl]=Bezpieczne przeglądanie stron WWW 
 GenericName=Web Browser
 GenericName[pl]=Przeglądarka WWW
-X-GNOME-FullName=LibreWolf Web Browser
-X-GNOME-FullName[pl]=Przeglądarka WWW LibreWolf
-Exec=/usr/local/bin/immudex-secured-firefox
+X-GNOME-FullName=Firefox ESR Web Browser
+X-GNOME-FullName[pl]=Przeglądarka WWW Firefox ESR
+Exec=/usr/local/bin/secured-firefox
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=/usr/lib/librewolf/browser/chrome/icons/default/default128.png
+Icon=firefox-esr
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https;
 StartupWMClass=Firefox-esr
 StartupNotify=true
-X-XFCE-Source=file:///usr/share/applications/librewolf.desktop
-Path=
+X-XFCE-Source=file:///usr/share/applications/firefox-esr.desktop

diff --git a/launchers/16844254192.desktop_ b/launchers/16844254192.desktop_
new file mode 100644 (file)
index 0000000..7ef05a7
--- /dev/null
+++ b/launchers/16844254192.desktop_
@@ -0,0 +1,20 @@
+[Desktop Entry]
+Name=LibreWolf (Firejailed)
+Name[pl]=LibreWolf (Firejailed)
+Comment=Secure the World Wide Web browsing
+Comment[pl]=Bezpieczne przeglądanie stron WWW
+GenericName=Web Browser
+GenericName[pl]=Przeglądarka WWW
+X-GNOME-FullName=LibreWolf Web Browser
+X-GNOME-FullName[pl]=Przeglądarka WWW LibreWolf
+Exec=/usr/local/bin/immudex-secured-firefox
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=/usr/lib/librewolf/browser/chrome/icons/default/default128.png
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Firefox-esr
+StartupNotify=true
+X-XFCE-Source=file:///usr/share/applications/librewolf.desktop
+Path=

diff --git a/tools/immudex-secured-firefox b/tools/immudex-secured-firefox
index cfc6676d7fbb7fa6e0dc57b99a6b153a12e68152..4041e896bc961b9dc74a83ed8e8b0b1bfcaef180 100755 (executable)
--- a/tools/immudex-secured-firefox
+++ b/tools/immudex-secured-firefox
@@ -2,8 +2,8 @@
 
 if [ ! -d /tmp/${USER} ]; then
   mkdir /tmp/${USER}
-  cp -prvv /home/${USER}/.librewolf /tmp/${USER}
+  cp -prvv /home/${USER}/.mozilla /tmp/${USER}
 fi
 
 eth0=$(ip route show | grep 'default' | awk '{printf $5}');
-firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/librewolf
+firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/firefox

diff --git a/tools/immudex-secured-firefox_ b/tools/immudex-secured-firefox_
index 4041e896bc961b9dc74a83ed8e8b0b1bfcaef180..cfc6676d7fbb7fa6e0dc57b99a6b153a12e68152 100755 (executable)
--- a/tools/immudex-secured-firefox_
+++ b/tools/immudex-secured-firefox_
@@ -2,8 +2,8 @@
 
 if [ ! -d /tmp/${USER} ]; then
   mkdir /tmp/${USER}
-  cp -prvv /home/${USER}/.mozilla /tmp/${USER}
+  cp -prvv /home/${USER}/.librewolf /tmp/${USER}
 fi
 
 eth0=$(ip route show | grep 'default' | awk '{printf $5}');
-firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/firefox
+firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/librewolf

diff --git a/versions/base.sh b/versions/base.sh
index 8bea5e4f1661badee1d6715b1b36fe32efcc7bc0..f75400ef67df653a3cb876aa28f9fdfe9e64fa4d 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -4,8 +4,8 @@ set -e
 
 DEBVER="$1";
 ARCH=$(dpkg --print-architecture);
-LWVER='121.0-1';
-LWTEST=1;
+#LWVER='121.0-1';
+#LWTEST=1;
 
 if [ $ARCH = "amd64" ]; then
   KARCH="amd64";
@@ -13,17 +13,17 @@ else
   KARCH="686-pae";
 fi
 
-if [ $LWTEST -eq 0 ]; then
-  LWPATH="https://sourceforge.net/projects/immudex/files/immudex/software/librewolf/testing";
-else
-  LWPATH="https://sourceforge.net/projects/immudex/files/immudex/software/librewolf";
-fi
+#if [ $LWTEST -eq 0 ]; then
+#  LWPATH="https://sourceforge.net/projects/immudex/files/immudex/software/librewolf/testing";
+#else
+#  LWPATH="https://sourceforge.net/projects/immudex/files/immudex/software/librewolf";
+#fi
 
-if [ $ARCH = "amd64" ]; then
-  LWARCH="x86_64";
-else
-  LWARCH="i686";
-fi
+#if [ $ARCH = "amd64" ]; then
+#  LWARCH="x86_64";
+#else
+#  LWARCH="i686";
+#fi
 
 cd;
 if [ -x /usr/bin/git ]; then git clone https://git.morketsmerke.org/git/immudex;
@@ -73,14 +73,14 @@ fi
 if [ -f /usr/bin/youtube-dl ]; then rm /usr/bin/youtube-dl; fi
 ln -s /usr/bin/yt-dlp /usr/bin/youtube-dl;
 
-wget ${LWPATH}/librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2/download -O librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2;
-tar -xf librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2 -C /usr/lib;
-rm librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2;
+#wget ${LWPATH}/librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2/download -O librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2;
+#tar -xf librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2 -C /usr/lib;
+#rm librewolf-${LWVER}.en-US.linux-${LWARCH}.tar.bz2;
 
-ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
+#ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
 
-update-alternatives --remove x-www-browser /usr/bin/firefox-esr;
-update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/lib/librewolf/librewolf 70;
+#update-alternatives --remove x-www-browser /usr/bin/firefox-esr;
+#update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/lib/librewolf/librewolf 70;
 
 #head -1 /etc/apt/sources.list | tee /etc/apt/sources.list.d/xfce4-notes-plugin.list;
 #sed -i 's/testing/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
@@ -151,8 +151,8 @@ if [ -f /usr/share/applications/qmmp.desktop ]; then
 fi
 cp -vv ~/immudex/files/immudex_hostname.service /etc/systemd/system;
 
-tar -xzvf ~/immudex/files/mozilla.tgz -C /etc/skel;
-tar -xf ~/immudex/files/librewolf.tgz -C /etc/skel;
+tar -xf ~/immudex/files/mozilla.tgz -C /etc/skel;
+#tar -xf ~/immudex/files/librewolf.tgz -C /etc/skel;
 #cp -vv ~/immudex/images/${VERSION}/apply.png /usr/share/icons;
 #cp -vv ~/immudex/images/rss.png /usr/share/icons;