- Moved snap and rock scripts into separate directories:

  - `scripts/snap` for Snap-related scripts
  - `scripts/rock` for Rock-related scripts
- Removed `--with-tls=gnutls` from both `snapcraft.yaml` and `rockcraft.yaml` as it is no longer needed
- Updated `.gitignore`

.gitignore

@@ -165,11 +165,11 @@
 /xcode/CUPS.xcodeproj/project.xcworkspace/
 /xcode/CUPS.xcodeproj/xcuserdata/
 .DS_store
-container-config
-packages/parts
-packages/stage
-packages/prime
+/container-config
+/packaging/parts
+/packaging/stage
+/packaging/prime
 *.snap
 *.tar*
-packages/snap/.snapcraft
+/packaging/snap/.snapcraft
 *.rock

packaging/rockcraft.yaml

@@ -50,16 +50,11 @@ parts:
       - --disable-systemd
       - --without-rcdir
       - --with-docdir=/share/cups/doc
-      # We use "--with-tls=gnutls" here, as current CUPS defaults to SSL here
-      # and this is buggy, causing a segfault when serving out a HTTPS web
-      # interface page.
-      - --with-tls=gnutls
     build-packages:
       - git
       - sed
       - curl
       - perl-base
-      - patch
       - autoconf
       - automake
       - libtool
@@ -393,7 +388,7 @@ parts:
 
   scripts:
     plugin: dump
-    source: scripts/
+    source: scripts/rock/
     organize:
       run-cupsd.sh: /scripts/run-cupsd.sh
       run-dbus.sh: /scripts/run-dbus.sh

packaging/scripts/run-cupsd.sh → packaging/scripts/rock/run-cupsd.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -eux
 
 # Ensure the lpadmin group exists

packaging/scripts/run-dbus.sh → packaging/scripts/rock/run-dbus.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 set -eux
 
 echo "Creating system users"

packaging/snapcraft.yaml

@@ -188,10 +188,6 @@ parts:
       - --without-rcdir
       - --with-docdir=/share/cups/doc
       - --with-container=snap
-      # We use "--with-tls=gnutls" here, as current CUPS defaults to SSL here
-      # and this is buggy, causing a segfault when serving out a HTTPS web
-      # interface page.
-      - --with-tls=gnutls
       #- --enable-debug-printfs
     override-pull: |
       set -eux
@@ -644,7 +640,7 @@ parts:
 
   scripts:
     plugin: dump
-    source: scripts/
+    source: scripts/snap
     override-build: |
       set -eux
       gcc -o port-occupied port-occupied.c