2024.4 version

orrors · Dec 19, 2024 · 84c0238 · 84c0238
1 parent 4138f8b
commit 84c0238
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 15 deletions.
diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml
@@ -10,7 +10,7 @@ jobs:
       PACKER_CACHE_DIR: /var/tmp/packer_cache
       VAGRANT_CLOUD_USER: 0rr0rs
       NAME: kali
-      VAGRANT_CLOUD_BOX_FILE: kali-2024.3-amd64-libvirt.box
+      VAGRANT_CLOUD_BOX_FILE: kali-2024.4-amd64-libvirt.box
       DEBIAN_FRONTEND: noninteractive
       HCP_CLIENT_ID: ${{ secrets.HCP_CLIENT_ID }}
       HCP_CLIENT_SECRET: ${{ secrets.HCP_CLIENT_SECRET }}
@@ -37,7 +37,7 @@ jobs:
       - name: Build/Upload box
         run: |
           packer plugins install github.com/hashicorp/vagrant
-          make || cat kali-2024.3-amd64-libvirt.box.log
+          make || cat kali-2024.4-amd64-libvirt.box.log
       # - name: Upload to vagrant cloud
       #   run: |
       #     ./scripts/upload_to_vagrant_cloud.sh $VAGRANT_CLOUD_USER $NAME $VAGRANT_CLOUD_BOX_FILE
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SHELL=bash
 .SHELLFLAGS=-euo pipefail -c
 
-VERSION=2024.3
+VERSION=2024.4
 
 kali-${VERSION}-amd64-libvirt.box: clean preseed.cfg kali.pkr.hcl Vagrantfile.template \
 				provision/00-custom_software.sh \

diff --git a/Vagrantfile.template b/Vagrantfile.template
@@ -8,7 +8,7 @@ $post_up_message = <<MSG
                 |   |  |     |     |   |  |   \\__ \\
                \\___/  _|    _|    \\___/  _|   ____/
 
-                                         kali-2024.3
+                                         kali-2024.4
 
 MSG
 

diff --git a/provision/00-custom_software.sh b/provision/00-custom_software.sh
@@ -13,7 +13,7 @@ echo '* libraries/restart-without-asking boolean true' | sudo debconf-set-select
 echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | sudo tee /etc/apt/sources.list.d/docker.list
 curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 
-sudo apt update 
+sudo apt update
 
 # ====================================================================================================
 sudo NEEDRESTART_MODE=a apt install -qq --no-install-recommends -y \

diff --git a/provision/01-xfce.sh b/provision/01-xfce.sh
@@ -21,23 +21,93 @@ PICTURES=
 VIDEOS=
 EOF
 
-# set no icons on desktop
+# set desk icons on desktop with some pins
 cat <<EOF >/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <channel name="xfce4-desktop" version="1.0">
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
+      <property name="monitor0" type="empty">
+        <property name="brightness" type="empty"/>
+        <property name="color1" type="empty"/>
+        <property name="color2" type="empty"/>
+        <property name="color-style" type="empty"/>
+        <property name="image-path" type="empty"/>
+        <property name="image-show" type="empty"/>
+        <property name="last-image" type="empty"/>
+        <property name="last-single-image" type="empty"/>
+        <property name="workspace0" type="empty">
+          <property name="color-style" type="int" value="1"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        </property>
+        <property name="workspace1" type="empty">
+          <property name="color-style" type="int" value="1"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        </property>
+        <property name="workspace2" type="empty">
+          <property name="color-style" type="int" value="1"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        </property>
+        <property name="workspace3" type="empty">
+          <property name="color-style" type="int" value="1"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        </property>
+      </property>
+      <property name="monitor1" type="empty">
+        <property name="brightness" type="empty"/>
+        <property name="color1" type="empty"/>
+        <property name="color2" type="empty"/>
+        <property name="color-style" type="empty"/>
+        <property name="image-path" type="empty"/>
+        <property name="image-show" type="empty"/>
+        <property name="last-image" type="empty"/>
+        <property name="last-single-image" type="empty"/>
+      </property>
       <property name="monitorVirtual-1" type="empty">
         <property name="workspace0" type="empty">
+          <property name="color-style" type="empty"/>
+          <property name="image-style" type="empty"/>
+          <property name="last-image" type="empty"/>
+        </property>
+        <property name="workspace1" type="empty">
           <property name="color-style" type="int" value="1"/>
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/kali-16x9/kali-metal-dark.png"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        </property>
+        <property name="workspace2" type="empty">
+          <property name="color-style" type="int" value="1"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
+        </property>
+        <property name="workspace3" type="empty">
+          <property name="color-style" type="int" value="1"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
         </property>
       </property>
     </property>
   </property>
   <property name="desktop-icons" type="empty">
-    <property name="style" type="int" value="0"/>
+    <property name="style" type="int" value="2"/>
+    <property name="file-icons" type="empty">
+      <property name="show-trash" type="bool" value="false"/>
+      <property name="show-filesystem" type="bool" value="false"/>
+      <property name="show-removable" type="bool" value="false"/>
+      <property name="show-home" type="bool" value="false"/>
+    </property>
+    <property name="show-hidden-files" type="bool" value="false"/>
+    <property name="primary" type="bool" value="false"/>
+    <property name="gravity" type="int" value="0"/>
+    <property name="tooltip-size" type="double" value="52"/>
+    <property name="show-thumbnails" type="bool" value="false"/>
+  </property>
+  <property name="last" type="empty">
+    <property name="window-width" type="int" value="691"/>
+    <property name="window-height" type="int" value="649"/>
   </property>
 </channel>
 EOF
@@ -60,23 +130,26 @@ cat <<EOF >/etc/xdg/xfce4/panel/default.xml
         <value type="int" value="3"/>
         <value type="int" value="4"/>
         <value type="int" value="8"/>
+        <value type="int" value="11"/>
         <value type="int" value="12"/>
         <value type="int" value="9"/>
         <value type="int" value="10"/>
-        <value type="int" value="11"/>
         <value type="int" value="14"/>
         <value type="int" value="15"/>
         <value type="int" value="16"/>
         <value type="int" value="19"/>
         <value type="int" value="20"/>
       </property>
+      <property name="background-style" type="uint" value="0"/>
     </property>
     <property name="dark-mode" type="bool" value="false"/>
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="whiskermenu">
       <property name="recent" type="array">
+        <value type="string" value="kali-amass.desktop"/>
         <value type="string" value="kali-burpsuite.desktop"/>
+        <value type="string" value="xfce-settings-manager.desktop"/>
       </property>
       <property name="view-mode" type="int" value="2"/>
     </property>
@@ -90,7 +163,8 @@ cat <<EOF >/etc/xdg/xfce4/panel/default.xml
       <property name="base-directory" type="string" value="/home/vagrant"/>
     </property>
     <property name="plugin-8" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
+      <property name="style" type="uint" value="2"/>
+      <property name="expand" type="bool" value="false"/>
     </property>
     <property name="plugin-9" type="string" value="pager">
       <property name="miniature-view" type="bool" value="true"/>
@@ -105,9 +179,12 @@ cat <<EOF >/etc/xdg/xfce4/panel/default.xml
     </property>
     <property name="plugin-11" type="string" value="tasklist">
       <property name="show-handle" type="bool" value="false"/>
-      <property name="show-labels" type="bool" value="false"/>
+      <property name="show-labels" type="bool" value="true"/>
       <property name="middle-click" type="uint" value="1"/>
-      <property name="grouping" type="uint" value="1"/>
+      <property name="grouping" type="bool" value="false"/>
+      <property name="flat-buttons" type="bool" value="false"/>
+      <property name="show-tooltips" type="bool" value="true"/>
+      <property name="show-wireframes" type="bool" value="false"/>
     </property>
     <property name="plugin-12" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
@@ -124,6 +201,7 @@ cat <<EOF >/etc/xdg/xfce4/panel/default.xml
     <property name="plugin-15" type="string" value="genmon"/>
     <property name="plugin-16" type="string" value="pulseaudio">
       <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+      <property name="known-players" type="string" value="Chromium"/>
     </property>
     <property name="plugin-19" type="string" value="clock">
       <property name="digital-layout" type="uint" value="3"/>

diff --git a/scripts/bump-kali-version.sh b/scripts/bump-kali-version.sh
@@ -12,8 +12,6 @@ fi
 # get the current kali version
 VERSION=$(curl -s "https://cdimage.kali.org/current/" | sed -n 's@.*kali-linux-\([0-9]\+.[0-9]\)\+-installer-netinst-amd64.iso".*@\1@p')
 
-sed -i "/iso_url/ s/[0-9]\+.[0-9]/$VERSION/" kali.pkr.hcl
-sed -i "/iso_checksum/ s/[0-9]\+.[0-9]/$VERSION/" kali.pkr.hcl
 sed -i "/VERSION=[0-9]\+.[0-9]/ s/[0-9]\+.[0-9]/$VERSION/" Makefile
 sed -i "/BOX_VERSION=[0-9]\+.[0-9]/ s/[0-9]\+.[0-9]/$VERSION/" scripts/upload_to_vagrant_cloud.sh
 sed -i "/kali-[0-9]\+.[0-9]/ s/[0-9]\+.[0-9]/$VERSION/" Vagrantfile.template

diff --git a/scripts/upload_to_vagrant_cloud.sh b/scripts/upload_to_vagrant_cloud.sh
@@ -9,7 +9,7 @@ VAGRANT_BOX_FILE=$3
 # Vagrant cloud api documentation
 # https://developer.hashicorp.com/vagrant/vagrant-cloud/api/v2
 
-BOX_VERSION=2024.3
+BOX_VERSION=2024.4
 PROVIDER='libvirt'
 
 if [[ ! -f ${VAGRANT_BOX_FILE} ]] ; then