chore: create a snap package for i386

Signed-off-by: Claudio André <[email protected]>

Author: claudioandre-br

.github/actions/spelling/expect.txt

@@ -115,6 +115,7 @@ google
 GOST
 gpg
 GPUs
+gui
 hashicorp
 hccap
 hicolor
@@ -238,6 +239,7 @@ sonarsource
 sonoma
 squashfs
 ssd
+sse
 SSSE
 stdlib
 strderr

deploy/snap/build.sh

@@ -70,7 +70,18 @@ fi
 echo ""
 echo "---------------------------- BUILDING -----------------------------"
 
-if [[ "$arch" == "x86_64" ]]; then
+if [[ "$arch" == "i686" ]]; then
+	# CPU (OMP and extensions fallback)
+	./configure "$X86_NO_OPENMP" --enable-simd=sse2 CPPFLAGS="-D_SNAP -D_BOXED" && do_build ../run/john-sse2
+	./configure "$X86_REGULAR" --enable-simd=sse2 CPPFLAGS="-D_SNAP -D_BOXED -DOMP_FALLBACK -DOMP_FALLBACK_BINARY=\"\\\"john-sse2\\\"\"" && do_build ../run/john-sse2-omp
+	./configure "$X86_NO_OPENMP" --enable-simd=avx CPPFLAGS="-D_SNAP -D_BOXED" && do_build ../run/john-avx
+	./configure "$X86_REGULAR" --enable-simd=avx CPPFLAGS="-D_SNAP -D_BOXED -DOMP_FALLBACK -DOMP_FALLBACK_BINARY=\"\\\"john-avx\\\"\" -DCPU_FALLBACK -DCPU_FALLBACK_BINARY=\"\\\"john-sse2-omp\\\"\"" && do_build ../run/john-avx-omp
+	./configure "$X86_NO_OPENMP" --enable-simd=avx2 CPPFLAGS="-D_SNAP -D_BOXED" && do_build ../run/john-avx2
+	./configure "$X86_REGULAR" --enable-simd=avx2 CPPFLAGS="-D_SNAP -D_BOXED -DOMP_FALLBACK -DOMP_FALLBACK_BINARY=\"\\\"john-avx2\\\"\" -DCPU_FALLBACK -DCPU_FALLBACK_BINARY=\"\\\"john-avx-omp\\\"\"" && do_build ../run/john-avx2-omp
+	BINARY="john-avx2-omp"
+	OPENCL_SUPPORT="Yes"
+
+elif [[ "$arch" == "x86_64" ]]; then
 	# x86_64 CPU (OMP and SIMD fallback)
 	do_configure "$X86_NO_OPENMP" --enable-simd=avx CPPFLAGS="-D_SNAP -D_BOXED" && do_build ../run/john-avx
 	do_configure "$X86_REGULAR" --enable-simd=avx CPPFLAGS="-D_SNAP -D_BOXED -DOMP_FALLBACK_BINARY=\"\\\"john-avx\\\"\"" && do_build ../run/john-avx-omp

deploy/snap/snapcraft.yaml

@@ -21,14 +21,13 @@
 # More info at https://github.com/openwall/john-packages
 ---
 name: john-the-ripper
-version: bleeding
+version: v2.0.0
 
-base: core24
+base: core18
 confinement: strict
 grade: stable #TODO: [stable or devel] edit before release (BLEEDING_RELEASE)
 
-assumes: [snapd2.65]
-adopt-info: john-the-ripper
+assumes: [snapd2.41]
 
 license: GPL-2.0
 title: John the Ripper CE Auditing Tool
@@ -50,42 +49,42 @@ apps:
   john-the-ripper:
     command: bin/john
     plugs: [home, removable-media]
-  opencl:
-    command: bin/john
-    plugs: [home, removable-media]
-  dmg2john:
-    command: bin/dmg2john
-    plugs: [home, removable-media]
-  hccap2john:
-    command: bin/hccap2john
-    plugs: [home, removable-media]
-  racf2john:
-    command: bin/racf2john
-    plugs: [home, removable-media]
-  vncpcap2john:
-    command: bin/vncpcap2john
-    plugs: [home, removable-media]
-  zip2john:
-    command: bin/zip2john
-    plugs: [home, removable-media]
-  gpg2john:
-    command: bin/gpg2john
-    plugs: [home, removable-media]
-  keepass2john:
-    command: bin/keepass2john
-    plugs: [home, removable-media]
-  putty2john:
-    command: bin/putty2john
-    plugs: [home, removable-media]
-  rar2john:
-    command: bin/rar2john
-    plugs: [home, removable-media]
-  uaf2john:
-    command: bin/uaf2john
-    plugs: [home, removable-media]
-  wpapcap2john:
-    command: bin/wpapcap2john
-    plugs: [home, removable-media]
+  # opencl:
+  #   command: bin/john
+  #   plugs: [home, removable-media]
+  # dmg2john:
+  #   command: bin/dmg2john
+  #   plugs: [home, removable-media]
+  # hccap2john:
+  #   command: bin/hccap2john
+  #   plugs: [home, removable-media]
+  # racf2john:
+  #   command: bin/racf2john
+  #   plugs: [home, removable-media]
+  # vncpcap2john:
+  #   command: bin/vncpcap2john
+  #   plugs: [home, removable-media]
+  # zip2john:
+  #   command: bin/zip2john
+  #   plugs: [home, removable-media]
+  # gpg2john:
+  #   command: bin/gpg2john
+  #   plugs: [home, removable-media]
+  # keepass2john:
+  #   command: bin/keepass2john
+  #   plugs: [home, removable-media]
+  # putty2john:
+  #   command: bin/putty2john
+  #   plugs: [home, removable-media]
+  # rar2john:
+  #   command: bin/rar2john
+  #   plugs: [home, removable-media]
+  # uaf2john:
+  #   command: bin/uaf2john
+  #   plugs: [home, removable-media]
+  # wpapcap2john:
+  #   command: bin/wpapcap2john
+  #   plugs: [home, removable-media]
   info:
     command: bin/run-john.sh
     desktop: com.openwall.John.desktop
@@ -100,13 +99,17 @@ parts:
 
     override-build: |
       cp "$SNAPCRAFT_STAGE"/build.sh .
-      ./build.sh
+      cp "$SNAPCRAFT_STAGE"/com.openwall.John.png ./icon.png
+      echo "" > run/john; chmod +x run/john #./build.sh
 
-      craftctl set version="$(cat version.txt)"
+      # craftctl set version="$(cat version.txt)"
 
       mkdir -p ../install/etc/bash_completion
       cp run/john.*_completion ../install/etc/bash_completion/
 
+      mkdir -p ../install/share/icons
+      cp icon.png ../install/share/icons/icon.png
+
     build-packages:
       - build-essential
       - libssl-dev
@@ -119,31 +122,24 @@ parts:
       - curl
       - patch
       # OpenCL stuff
-      - on amd64:
-          - libpocl-dev
-          - ocl-icd-opencl-dev
-          - pocl-opencl-icd
+      - libpocl-dev
+      - ocl-icd-opencl-dev
+      - pocl-opencl-icd
       - on arm64:
           - libpocl-dev
           - ocl-icd-opencl-dev
           - pocl-opencl-icd
 
+    stage-packages:
+      - libgomp1
+      - libpcap0.8
+      - ocl-icd-libopencl1
+
     organize:
       ../build/run/: bin/
       ../build/doc/: doc/
       ../build/README.md: README.md
 
-  libs:
-    plugin: nil
-
-    stage-packages:
-      - libgomp1
-      - libpcap0.8t64
-      - on amd64:
-          - ocl-icd-libopencl1
-      - on arm64:
-          - ocl-icd-libopencl1
-
   john-packages:
     plugin: nil
     source: .
@@ -152,6 +148,7 @@ parts:
       cp deploy/metadata/com.openwall.John.desktop .
       cp deploy/metadata/run-john.sh .
       cp deploy/snap/build.sh $SNAPCRAFT_STAGE
+      cp deploy/metadata/com.openwall.John.png $SNAPCRAFT_STAGE
 
     organize:
       ../build/com.openwall.John.desktop: com.openwall.John.desktop