Revert 'Cleanup Debian packaging flow' - causing issues

This reverts commit b337f3d70de6b2cba8c6c8c9b9d59e8b8a8e8e8e.

Reverts the debug flag support and other changes from PR wolfSSL#278
that are causing workflow issues.

Author: aidangarske

.github/workflows/debian-package.yml

@@ -7,23 +7,13 @@ on:
     branches: [ '*' ]
 
 jobs:
-  build_wolfprovider:
-    uses: ./.github/workflows/build-wolfprovider.yml
-    with:
-      wolfssl_ref: master
-      openssl_ref: openssl-3.5.0
-
   libwolfprov-standalone:
     runs-on: ubuntu-22.04
     # Important: use Debian Bookworm for compatibility
     container:
       image: debian:bookworm   # or debian:bookworm-slim
       env:
         DEBIAN_FRONTEND: noninteractive
-    strategy:
-      matrix:
-        debug_flag: [ '', '--debug' ]
-    needs: build_wolfprovider
     steps:
     - name: Set up environment
       run: |
@@ -67,42 +57,34 @@ jobs:
         # List all tags
         git tag -l
 
-    - name: Download wolfSSL packages
-      uses: actions/download-artifact@v4
-      with:
-        name: wolfssl-debian-packages-${{ github.sha }}
-        path: /tmp/wolfssl-artifacts
-
-    - name: Download OpenSSL/wolfProvider packages
-      uses: actions/download-artifact@v4
-      with:
-        name: openssl-wolfprov-debian-packages-${{ github.sha }}
-        path: /tmp/openssl-wolfprov-artifacts
-
-    - name: Install wolfSSL debian packages from artifact
+    - name: Install wolfssl debian package
       run: |
-        set -e
-        echo "WolfSSL artifacts:"
-        ls -la /tmp/wolfssl-artifacts || true
-
-        # Install wolfSSL runtime and headers (from our artifact, not apt)
-        wolfssl_debs=$(ls -1 /tmp/wolfssl-artifacts/*.deb 2>/dev/null || true)
-        if [ -n "$wolfssl_debs" ]; then
-          echo "Installing wolfSSL packages: $wolfssl_debs"
-          apt install -y $wolfssl_debs
-        else
-          echo "ERROR: No wolfSSL .deb files found in artifact"
-          exit 1
-        fi
+        mkdir -p "/tmp/wolfssl-pkg"
+        cd "/tmp/wolfssl-pkg"
+        
+        # Install wolfssl packages
+        chmod +x $GITHUB_WORKSPACE/debian/install-wolfssl.sh
+        $GITHUB_WORKSPACE/debian/install-wolfssl.sh \
+          $GITHUB_WORKSPACE/.github/packages/debian-wolfssl.tar.gz \
+          "/tmp/wolfssl-pkg"
 
-        # Copy wolfSSL debs into the unified artifacts directory for later upload
+        # Create wolfprov-packages directory and move wolfssl files there
         mkdir -p "/tmp/wolfprov-packages"
-        cp -v /tmp/wolfssl-artifacts/*.deb /tmp/wolfprov-packages/ 2>/dev/null || true
+        echo "Moving wolfssl files to artifacts directory..."
+        
+        # Copy all wolfssl-related files (source and binary packages)
+        find /tmp/wolfssl-pkg -name "*wolfssl*" -type f -name "*.deb" -exec cp {} /tmp/wolfprov-packages/ \;
+        find /tmp/wolfssl-pkg -name "*wolfssl*" -type f -name "*.dsc" -exec cp {} /tmp/wolfprov-packages/ \;
+        find /tmp/wolfssl-pkg -name "*wolfssl*" -type f -name "*.tar.gz" -exec cp {} /tmp/wolfprov-packages/ \;
+        find /tmp/wolfssl-pkg -name "*wolfssl*" -type f -name "*.orig.tar.gz" -exec cp {} /tmp/wolfprov-packages/ \;
+        
+        echo "WolfSSL files in artifacts directory:"
+        ls -la /tmp/wolfprov-packages/*wolfssl* || true
 
     - name: Build Debian package
       run: |
         # Bypass the warning prompt with 'yes Y' 
-        yes Y | ./scripts/build-wolfprovider.sh --debian ${{ matrix.debug_flag }}
+        yes Y | ./scripts/build-wolfprovider.sh --debian $FIPS_FLAG
 
         # List generated packages
         echo "Generated Packages:"
@@ -220,12 +202,12 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: wolfprovider-debian-packages-${{ github.sha }}${{ matrix.debug_flag }}
+        name: wolfprovider-debian-packages
         path: |
           /tmp/wolfprov-packages/*.deb
           /tmp/wolfprov-packages/*.dsc
           /tmp/wolfprov-packages/*.tar.gz
-        retention-days: 2
+        retention-days: 7
 
   libwolfprov-with-openssl:
     runs-on: ubuntu-22.04
@@ -238,7 +220,7 @@ jobs:
     - name: Download artifacts from previous job
       uses: actions/download-artifact@v4
       with:
-        name: debian-package-test-artifacts-${{ github.sha }}
+        name: wolfprovider-debian-packages
         path: /tmp/artifacts
 
     - name: Set up environment

.gitignore

@@ -112,9 +112,20 @@ debian/libwolfprov*
 debian/libssl-dev*
 debian/openssl*
 debian/libssl3*
-!debian/*.install
-!debian/*.postinst
-!debian/*.postrm
-!debian/*.docs
-!debian/*.links
+!debian/libwolfprov.install
+!debian/libwolfprov.postinst
+!debian/libwolfprov.postrm
+!debian/libwolfprov-dev.docs
+!debian/libwolfprov-dev.install
+!debian/openssl.cnf
+!debian/openssl.install
+!debian/openssl.postinst
+!debian/openssl.postrm
+!debian/libssl3.postinst
+!debian/libssl3.postrm
+!debian/libssl3.install
+!debian/libssl3.docs
+!debian/libssl3.install
+!debian/libssl3.postinst
+!debian/libssl3.postrm
 

debian/control

@@ -8,6 +8,7 @@ Build-Depends:
  debhelper-compat (= 13),
  devscripts,
  dh-exec,
+ openssl,
  git,
  pkgconf,
  libwolfssl-dev

debian/libssl-dev.install

@@ -1,5 +1,7 @@
 #!/usr/bin/dh-exec
 usr/include/openssl/**
+usr/lib/${DEB_HOST_MULTIARCH}/libcrypto.so
+usr/lib/${DEB_HOST_MULTIARCH}/libssl.so
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/openssl.pc
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libcrypto.pc
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/libssl.pc

debian/libssl-dev.links

@@ -21,7 +21,7 @@ ifeq ($(WOLFSSL_ISFIPS),1)
   VARIANT           := fips
   VARIANT_DESC      := FIPS build
   VARIANT_PROVIDES  := libwolfprov-fips
-  VERSION           := $(BASEVER)-fips
+  VERSION           := $(BASEVER)+fips
   FIPS_FLAG         := --enable-fips
   PROVIDER_CONF     := provider-fips.conf
 else
@@ -33,21 +33,12 @@ else
   FIPS_FLAG         :=
 endif
 
-# Debug build flag
-WOLFPROV_DEBUG?=0
-ifeq ($(WOLFPROV_DEBUG),1)
-  VARIANT           := $(VARIANT)-debug
-  VARIANT_DESC      := $(VARIANT_DESC) with debug logs
-  VERSION           := $(VERSION)-debug
-endif
-
 override_dh_auto_configure:
 	# None, handled below
 
 override_dh_auto_build:
-	# Always build OpenSSL with wolfProvider as the default provider even 
-	# if we choose not to use it.
-	WOLFPROV_BUILD_DEBIAN=1 WOLFPROV_DEBUG=$(WOLFPROV_DEBUG) ./scripts/build-wolfprovider.sh --replace-default $(FIPS_FLAG)
+	# Always build OpenSSL with wolfProvider as the default provider
+	WOLFPROV_BUILD_DEBIAN=1 ./scripts/build-wolfprovider.sh --replace-default $(FIPS_FLAG)
 
 override_dh_auto_install:
 	# Detect OpenSSL library directory (lib or lib64)
@@ -60,8 +51,8 @@ override_dh_auto_install:
 
 	# Install OpenSSL shared libraries for libssl3 package
 	install -d $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)
-	install -m755 ./openssl-install/$(OPENSSL_LIB_DIR)/libssl.so.3 \
-		./openssl-install/$(OPENSSL_LIB_DIR)/libcrypto.so.3 \
+	install -m755 ./openssl-install/$(OPENSSL_LIB_DIR)/libssl.so* \
+		./openssl-install/$(OPENSSL_LIB_DIR)/libcrypto.so* \
 		$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/
 
 	# Install OpenSSL headers and dev files for libssl-dev package

debian/rules

@@ -20,9 +20,6 @@ set -euo pipefail
 
 PKG_NAME="libwolfprov"
 
-WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0}
-WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
-
 # Step 1: Determine the repo root
 REPO_ROOT=$(git rev-parse --show-toplevel)
 cd "$REPO_ROOT"
@@ -113,7 +110,7 @@ git archive --format=tar.gz --prefix="${TARBALL_PREFIX}/" \
 
 # Step 10: Build package
 echo "⚙️  Building package..."
-# Use nostrip to avoid building the -dbgsym package
-DEB_BUILD_OPTIONS="nostrip" debuild -e WOLFSSL_ISFIPS -e WOLFPROV_DEBUG -us -uc
+WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0}
+debuild -e WOLFSSL_ISFIPS -us -uc
 
 echo "✅ Build completed for version $VERSION"

scripts/build-debian.sh

@@ -144,7 +144,7 @@ fi
 
 if [ -n "$build_debian" ]; then
     echo "Building Debian package..."
-    WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0} WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0} ./scripts/build-debian.sh
+    WOLFSSL_ISFIPS=${WOLFSSL_ISFIPS:-0} ./scripts/build-debian.sh
     exit $?
 fi